nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

*fix* calculate right struts for multiple monitors. fixes issue 148 and issue 178

Browse source 
*fix* uninstall all timers on reconfiguring



git-svn-id: http://tint2.googlecode.com/svn/trunk@291 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
Andreas.Fink85 2009-12-22 13:37:13 +00:00
parent c46e1341aa
commit dae6ee07f9
5 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/config.c
View file

@ -45,6 +45,7 @@
#include "config.h"
#include "window.h"
#include "tooltip.h"
#include "timer.h"
#ifdef ENABLE_BATTERY
#include "battery.h"
@ -74,6 +75,7 @@ void init_config()
list_back = g_slist_append(0, calloc(1, sizeof(Area)));
// tint2 could reload config, so we cleanup objects
uninstall_all_timer();
cleanup_systray();
#ifdef ENABLE_BATTERY
cleanup_battery();

13
src/panel.c
View file

@ -427,16 +427,21 @@ void set_panel_properties(Panel *p)
XChangeProperty(server.dsp, p->main_win, server.atom.XdndAware, XA_ATOM, 32, PropModeReplace, (unsigned char*)&version, 1);
// Reserved space
unsigned int d1, screen_width, screen_height;
Window d2;
int d3;
XGetGeometry(server.dsp, server.root_win, &d2, &d3, &d3, &screen_width, &screen_height, &d1, &d1);
Monitor monitor = server.monitor[p->monitor];
long struts [12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
if (panel_horizontal) {
if (panel_position & TOP) {
struts[2] = p->area.height + p->marginy;
struts[2] = p->area.height + p->marginy + monitor.y;
struts[8] = p->posx;
// p->area.width - 1 allowed full screen on monitor 2
struts[9] = p->posx + p->area.width - 1;
}
else {
struts[3] = p->area.height + p->marginy;
struts[3] = p->area.height + p->marginy + screen_height - monitor.y - monitor.height;
struts[10] = p->posx;
// p->area.width - 1 allowed full screen on monitor 2
struts[11] = p->posx + p->area.width - 1;
@ -444,13 +449,13 @@ void set_panel_properties(Panel *p)
}
else {
if (panel_position & LEFT) {
struts[0] = p->area.width + p->marginx;
struts[0] = p->area.width + p->marginx + monitor.x;
struts[4] = p->posy;
// p->area.width - 1 allowed full screen on monitor 2
struts[5] = p->posy + p->area.height - 1;
}
else {
struts[1] = p->area.width + p->marginx;
struts[1] = p->area.width + p->marginx + screen_width - monitor.x - monitor.width;
struts[6] = p->posy;
// p->area.width - 1 allowed full screen on monitor 2
struts[7] = p->posy + p->area.height - 1;

6
src/tooltip/tooltip.c
View file

@ -60,10 +60,8 @@ void init_tooltip()
if (!g_tooltip.font_desc)
g_tooltip.font_desc = pango_font_description_from_string("sans 10");
if (g_tooltip.show_timer_id == 0)
g_tooltip.show_timer_id = install_timer(0, 0, 0, 0, tooltip_show);
if (g_tooltip.hide_timer_id == 0)
g_tooltip.hide_timer_id = install_timer(0, 0, 0, 0, tooltip_hide);
g_tooltip.show_timer_id = install_timer(0, 0, 0, 0, tooltip_show);
g_tooltip.hide_timer_id = install_timer(0, 0, 0, 0, tooltip_hide);
XSetWindowAttributes attr;
attr.override_redirect = True;

9
src/util/timer.c
View file

@ -71,3 +71,12 @@ void uninstall_timer(int id)
timer_iter = timer_iter->next;
}
}
void uninstall_all_timer()
{
while (timer_list) {
struct timer* t = timer_list->data;
uninstall_timer(t->id);
}
}

3
src/util/timer.h
View file

@ -45,4 +45,7 @@ void reset_timer(int id, int value_sec, int value_nsec, int interval_sec, int in
/** uninstalls a timer with the given 'id'. If no timer is installed with this id nothing happens **/
void uninstall_timer(int id);
/** uninstalls all timer. Calls uninstall_timer for all available id's **/
void uninstall_all_timer();
#endif // TIMER_H