#include <X11/Xutil.h>
#include <X11/Xatom.h>
#include <X11/Xlocale.h>
+#include <X11/extensions/Xdamage.h>
#include <Imlib2.h>
#include <signal.h>
+#include <version.h>
#include "server.h"
#include "window.h"
#include "config.h"
#include "task.h"
#include "taskbar.h"
#include "systraybar.h"
+#include "launcher.h"
#include "panel.h"
#include "tooltip.h"
#include "timer.h"
+
void signal_handler(int sig)
{
// signal handler is light as it should be
{
int i;
+ // set global data
+ default_config();
+ default_timeout();
+ default_systray();
+ memset(&server, 0, sizeof(Server_global));
+#ifdef ENABLE_BATTERY
+ default_battery();
+#endif
+ default_clock();
+ default_launcher();
+ default_taskbar();
+ default_tooltip();
+ default_panel();
+
// read options
for (i = 1; i < argc; ++i) {
if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help")) {
exit(0);
}
if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--version")) {
- printf("tint2 version 0.8\n");
+ printf("tint2 version %s\n", VERSION_STRING);
exit(0);
}
- if (!strcmp(argv[i], "-c")) {
+ if (!strcmp(argv[i], "-c")) {
i++;
if (i < argc)
config_path = strdup(argv[i]);
snapshot_path = strdup(argv[i]);
}
}
-
// Set signal handler
+ signal_pending = 0;
struct sigaction sa = { .sa_handler = signal_handler };
+ struct sigaction sa_chld = { .sa_handler = SIG_DFL, .sa_flags = SA_NOCLDWAIT };
sigaction(SIGUSR1, &sa, 0);
sigaction(SIGINT, &sa, 0);
sigaction(SIGTERM, &sa, 0);
sigaction(SIGHUP, &sa, 0);
- signal(SIGCHLD, SIG_IGN); // don't have to wait() after fork()
- // block all signals, such that no race conditions occur before pselect in our main loop
- sigset_t block_mask;
- sigaddset(&block_mask, SIGINT);
- sigaddset(&block_mask, SIGTERM);
- sigaddset(&block_mask, SIGHUP);
- sigaddset(&block_mask, SIGUSR1);
- sigprocmask(SIG_BLOCK, &block_mask, 0);
-
+ sigaction(SIGCHLD, &sa_chld, 0);
- // set global data
- memset(&server, 0, sizeof(Server_global));
- memset(&systray, 0, sizeof(Systraybar));
+ // BSD does not support pselect(), therefore we have to use select and hope that we do not
+ // end up in a race condition there (see 'man select()' on a linux machine for more information)
+ // block all signals, such that no race conditions occur before pselect in our main loop
+// sigset_t block_mask;
+// sigaddset(&block_mask, SIGINT);
+// sigaddset(&block_mask, SIGTERM);
+// sigaddset(&block_mask, SIGHUP);
+// sigaddset(&block_mask, SIGUSR1);
+// sigprocmask(SIG_BLOCK, &block_mask, 0);
+}
+void init_X11()
+{
server.dsp = XOpenDisplay (NULL);
if (!server.dsp) {
fprintf(stderr, "tint2 exit : could not open display.\n");
server_init_atoms ();
server.screen = DefaultScreen (server.dsp);
server.root_win = RootWindow(server.dsp, server.screen);
- server.depth = DefaultDepth (server.dsp, server.screen);
- server.visual = DefaultVisual (server.dsp, server.screen);
server.desktop = server_get_current_desktop ();
- XGCValues gcv;
- server.gc = XCreateGC (server.dsp, server.root_win, (unsigned long)0, &gcv);
-
+ server_init_visual();
XSetErrorHandler ((XErrorHandler) server_catch_error);
imlib_context_set_display (server.dsp);
imlib_context_set_visual (server.visual);
- imlib_context_set_colormap (DefaultColormap (server.dsp, server.screen));
+ imlib_context_set_colormap (server.colormap);
/* Catch events */
XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask);
setlocale (LC_ALL, "");
+ // config file use '.' as decimal separator
+ setlocale(LC_NUMERIC, "POSIX");
// load default icon
gchar *path;
const gchar * const *data_dirs;
data_dirs = g_get_system_data_dirs ();
+ int i;
for (i = 0; data_dirs[i] != NULL; i++) {
path = g_build_filename(data_dirs[i], "tint2", "default_icon.png", NULL);
if (g_file_test (path, G_FILE_TEST_EXISTS))
void cleanup()
{
+ cleanup_timeout();
cleanup_systray();
- stop_net();
- cleanup_panel();
cleanup_tooltip();
cleanup_clock();
+ cleanup_launcher();
#ifdef ENABLE_BATTERY
cleanup_battery();
#endif
+ cleanup_panel();
+ cleanup_config();
if (default_icon) {
imlib_context_set_image(default_icon);
imlib_free_image();
}
- if (config_path) g_free(config_path);
- if (snapshot_path) g_free(snapshot_path);
+ imlib_context_disconnect_display();
- if (server.monitor) free(server.monitor);
- XFreeGC(server.dsp, server.gc);
- XCloseDisplay(server.dsp);
+ cleanup_server();
+ if (server.dsp) XCloseDisplay(server.dsp);
}
{
Panel *panel = &panel1[0];
- if (panel->temp_pmap) XFreePixmap(server.dsp, panel->temp_pmap);
- panel->temp_pmap = XCreatePixmap(server.dsp, server.root_win, panel->area.width, panel->area.height, server.depth);
+ if (panel->area.width > server.monitor[0].width)
+ panel->area.width = server.monitor[0].width;
- refresh(&panel->area);
+ panel->temp_pmap = XCreatePixmap(server.dsp, server.root_win, panel->area.width, panel->area.height, server.depth);
+ rendering(panel);
Imlib_Image img = NULL;
imlib_context_set_drawable(panel->temp_pmap);
img = imlib_create_image_from_drawable(0, 0, 0, panel->area.width, panel->area.height, 0);
imlib_context_set_image(img);
+ if (!panel_horizontal) {
+ // rotate 90° vertical panel
+ imlib_image_flip_horizontal();
+ imlib_image_flip_diagonal();
+ }
imlib_save_image(path);
imlib_free_image();
}
else
return 0;
}
- // no task clicked --> check if taskbar clicked
+ LauncherIcon *icon = click_launcher_icon(panel, e->x, e->y);
+ if (icon) {
+ if (e->button == 1) {
+ return 1;
+ } else {
+ return 0;
+ }
+ }
+ // no launcher/task clicked --> check if taskbar clicked
Taskbar *tskbar = click_taskbar(panel, e->x, e->y);
if (tskbar && e->button == 1 && panel_mode == MULTI_DESKTOP)
return 1;
if (click_clock(panel, e->x, e->y)) {
- if ( (e->button == 1 && clock_lclick_command) || (e->button == 2 && clock_rclick_command) )
+ if ( (e->button == 1 && clock_lclick_command) || (e->button == 3 && clock_rclick_command) )
return 1;
else
return 0;
}
task_drag = click_task(panel, e->xbutton.x, e->xbutton.y);
- XLowerWindow (server.dsp, panel->main_win);
+ if (panel_layer == BOTTOM_LAYER)
+ XLowerWindow (server.dsp, panel->main_win);
}
+void event_button_motion_notify (XEvent *e)
+{
+ Panel * panel = get_panel(e->xany.window);
+ if(!panel || !task_drag)
+ return;
+
+ // Find the taskbar on the event's location
+ Taskbar * event_taskbar = click_taskbar(panel, e->xbutton.x, e->xbutton.y);
+ if(event_taskbar == NULL)
+ return;
+
+ // Find the task on the event's location
+ Task * event_task = click_task(panel, e->xbutton.x, e->xbutton.y);
+
+ // If the event takes place on the same taskbar as the task being dragged
+ if(event_taskbar == task_drag->area.parent) {
+ // Swap the task_drag with the task on the event's location (if they differ)
+ if(event_task && event_task != task_drag) {
+ GSList * drag_iter = g_slist_find(event_taskbar->area.list, task_drag);
+ GSList * task_iter = g_slist_find(event_taskbar->area.list, event_task);
+ if(drag_iter && task_iter) {
+ gpointer temp = task_iter->data;
+ task_iter->data = drag_iter->data;
+ drag_iter->data = temp;
+ event_taskbar->area.resize = 1;
+ panel_refresh = 1;
+ task_dragged = 1;
+ }
+ }
+ }
+ else { // The event is on another taskbar than the task being dragged
+ if(task_drag->desktop == ALLDESKTOP || panel_mode != MULTI_DESKTOP)
+ return;
+
+ Taskbar * drag_taskbar = (Taskbar*)task_drag->area.parent;
+ drag_taskbar->area.list = g_slist_remove(drag_taskbar->area.list, task_drag);
+
+ if(event_taskbar->area.posx > drag_taskbar->area.posx || event_taskbar->area.posy > drag_taskbar->area.posy)
+ event_taskbar->area.list = g_slist_prepend(event_taskbar->area.list, task_drag);
+ else
+ event_taskbar->area.list = g_slist_append(event_taskbar->area.list, task_drag);
+
+ // Move task to other desktop (but avoid the 'Window desktop changed' code in 'event_property_notify')
+ task_drag->area.parent = event_taskbar;
+ task_drag->desktop = event_taskbar->desktop;
+
+ windows_set_desktop(task_drag->win, event_taskbar->desktop);
+
+ event_taskbar->area.resize = 1;
+ drag_taskbar->area.resize = 1;
+ task_dragged = 1;
+ panel_refresh = 1;
+ }
+}
void event_button_release (XEvent *e)
{
if (wm_menu && !tint2_handles_click(panel, &e->xbutton)) {
forward_click(e);
+ if (panel_layer == BOTTOM_LAYER)
+ XLowerWindow (server.dsp, panel->main_win);
task_drag = 0;
return;
}
if ( click_clock(panel, e->xbutton.x, e->xbutton.y)) {
clock_action(e->xbutton.button);
- XLowerWindow (server.dsp, panel->main_win);
+ if (panel_layer == BOTTOM_LAYER)
+ XLowerWindow (server.dsp, panel->main_win);
+ task_drag = 0;
+ return;
+ }
+
+ if ( click_launcher(panel, e->xbutton.x, e->xbutton.y)) {
+ LauncherIcon *icon = click_launcher_icon(panel, e->xbutton.x, e->xbutton.y);
+ if (icon) {
+ launcher_action(icon);
+ }
task_drag = 0;
return;
}
Taskbar *tskbar;
if ( !(tskbar = click_taskbar(panel, e->xbutton.x, e->xbutton.y)) ) {
// TODO: check better solution to keep window below
- XLowerWindow (server.dsp, panel->main_win);
+ if (panel_layer == BOTTOM_LAYER)
+ XLowerWindow (server.dsp, panel->main_win);
task_drag = 0;
return;
}
// drag and drop task
- if (task_drag) {
- if (tskbar != task_drag->area.parent && action == TOGGLE_ICONIFY) {
- if (task_drag->desktop != ALLDESKTOP && panel_mode == MULTI_DESKTOP) {
- windows_set_desktop(task_drag->win, tskbar->desktop);
- if (tskbar->desktop == server.desktop)
- set_active(task_drag->win);
- task_drag = 0;
- }
- return;
- }
- else task_drag = 0;
+ if (task_dragged) {
+ task_drag = 0;
+ task_dragged = 0;
+ return;
}
// switch desktop
window_action( click_task(panel, e->xbutton.x, e->xbutton.y), action);
// to keep window below
- XLowerWindow (server.dsp, panel->main_win);
+ if (panel_layer == BOTTOM_LAYER)
+ XLowerWindow (server.dsp, panel->main_win);
}
void event_property_notify (XEvent *e)
{
- int i, j;
+ int i;
Task *tsk;
Window win = e->xproperty.window;
Atom at = e->xproperty.atom;
// Change number of desktops
else if (at == server.atom._NET_NUMBER_OF_DESKTOPS) {
+ if (!taskbar_enabled) return;
server.nb_desktop = server_get_number_of_desktop ();
cleanup_taskbar();
init_taskbar();
- visible_object();
for (i=0 ; i < nb_panel ; i++) {
+ init_taskbar_panel(&panel1[i]);
+ set_panel_items_order(&panel1[i]);
+ visible_taskbar(&panel1[i]);
panel1[i].area.resize = 1;
}
task_refresh_tasklist();
}
// Change desktop
else if (at == server.atom._NET_CURRENT_DESKTOP) {
+ if (!taskbar_enabled) return;
int old_desktop = server.desktop;
server.desktop = server_get_current_desktop ();
for (i=0 ; i < nb_panel ; i++) {
Panel *panel = &panel1[i];
- if (panel_mode == MULTI_DESKTOP && panel->g_taskbar.use_active) {
+ if (panel_mode == MULTI_DESKTOP && panel->g_taskbar.bg != panel->g_taskbar.bg_active) {
// redraw both taskbar
- panel->taskbar[old_desktop].area.is_active = 0;
- panel->taskbar[old_desktop].area.resize = 1;
- panel->taskbar[server.desktop].area.is_active = 1;
+ if (server.nb_desktop > old_desktop) {
+ // can happen if last desktop is deleted and we've been on the last desktop
+ panel->taskbar[old_desktop].area.bg = panel->g_taskbar.bg;
+ panel->taskbar[old_desktop].area.resize = 1;
+ }
+ panel->taskbar[server.desktop].area.bg = panel->g_taskbar.bg_active;
panel->taskbar[server.desktop].area.resize = 1;
panel_refresh = 1;
}
Taskbar *tskbar;
Task *tsk;
GSList *l;
- tskbar = &panel->taskbar[old_desktop];
- for (l = tskbar->area.list; l ; l = l->next) {
- tsk = l->data;
- if (tsk->desktop == ALLDESKTOP) {
- tsk->area.on_screen = 0;
- tskbar->area.resize = 1;
- panel_refresh = 1;
+ if (server.nb_desktop > old_desktop) {
+ tskbar = &panel->taskbar[old_desktop];
+ for (l = tskbar->area.list; l ; l = l->next) {
+ tsk = l->data;
+ if (tsk->desktop == ALLDESKTOP) {
+ tsk->area.on_screen = 0;
+ tskbar->area.resize = 1;
+ panel_refresh = 1;
+ }
}
}
tskbar = &panel->taskbar[server.desktop];
tskbar->area.resize = 1;
}
}
- }
- if (panel_mode != MULTI_DESKTOP) {
- visible_object();
+ if (panel_mode != MULTI_DESKTOP)
+ visible_taskbar(panel);
}
}
// Window list
// Window title changed
if (at == server.atom._NET_WM_VISIBLE_NAME || at == server.atom._NET_WM_NAME || at == server.atom.WM_NAME) {
- Task *tsk2;
- GSList *l0;
get_title(tsk);
- // changed other tsk->title
- for (i=0 ; i < nb_panel ; i++) {
- for (j=0 ; j < panel1[i].nb_desktop ; j++) {
- for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
- tsk2 = l0->data;
- if (tsk->win == tsk2->win && tsk != tsk2) {
- tsk2->title = tsk->title;
- tsk2->area.redraw = 1;
- }
- }
- }
+ if (g_tooltip.mapped && (g_tooltip.area == (Area*)tsk)) {
+ tooltip_copy_text((Area*)tsk);
+ tooltip_update();
}
panel_refresh = 1;
}
panel_refresh = 1;
}
}
-// We do not check for the iconified state, since it only unsets our active window
-// but in openbox a shaded window is considered iconified. So we would loose the active window
-// property on unshading it again (commented 01.10.2009)
-// else if (at == server.atom.WM_STATE) {
-// // Iconic state
-// // TODO : try to delete following code
-// if (window_is_iconified (win)) {
-// if (task_active) {
-// if (task_active->win == tsk->win) {
-// Task *tsk2;
-// GSList *l0;
-// for (i=0 ; i < nb_panel ; i++) {
-// for (j=0 ; j < panel1[i].nb_desktop ; j++) {
-// for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
-// tsk2 = l0->data;
-// tsk2->area.is_active = 0;
-// }
-// }
-// }
-// task_active = 0;
-// }
-// }
-// }
-// }
+ else if (at == server.atom.WM_STATE) {
+ // Iconic state
+ int state = (task_active && tsk->win == task_active->win ? TASK_ACTIVE : TASK_NORMAL);
+ if (window_is_iconified(win))
+ state = TASK_ICONIFIED;
+ set_task_state(tsk, state);
+ panel_refresh = 1;
+ }
// Window icon changed
else if (at == server.atom._NET_WM_ICON) {
get_icon(tsk);
- Task *tsk2;
- GSList *l0;
- for (i=0 ; i < nb_panel ; i++) {
- for (j=0 ; j < panel1[i].nb_desktop ; j++) {
- for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
- tsk2 = l0->data;
- if (tsk->win == tsk2->win && tsk != tsk2) {
- tsk2->icon_width = tsk->icon_width;
- tsk2->icon_height = tsk->icon_height;
- tsk2->icon = tsk->icon;
- tsk2->icon_active = tsk->icon_active;
- tsk2->area.redraw = 1;
- }
- }
- }
- }
panel_refresh = 1;
}
// Window desktop changed
{
// change in root window (xrandr)
if (win == server.root_win) {
- get_monitors();
- init_config();
- config_read_file (config_path);
- init_panel();
- cleanup_config();
+ signal_pending = SIGUSR1;
return;
}
GSList *l;
for (l = systray.list_icons; l ; l = l->next) {
traywin = (TrayWindow*)l->data;
- if (traywin->id == win) {
+ if (traywin->tray_id == win) {
//printf("move tray %d\n", traywin->x);
XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, traywin->width, traywin->height);
+ XResizeWindow(server.dsp, traywin->tray_id, traywin->width, traywin->height);
panel_refresh = 1;
return;
}
Panel *p = tsk->area.panel;
if (p->monitor != window_get_monitor (win)) {
remove_task (tsk);
- add_task (win);
+ tsk = add_task (win);
if (win == window_get_active ()) {
- GSList* task_list = task_get_tasks(win);
- while (task_list) {
- Task *tsk = task_list->data;
- tsk->area.is_active = 1;
- task_active = tsk;
- task_list = task_list->next;
- }
+ set_task_state(tsk, TASK_ACTIVE);
+ task_active = tsk;
}
panel_refresh = 1;
}
int main (int argc, char *argv[])
{
XEvent e;
+ XClientMessageEvent *ev;
fd_set fdset;
int x11_fd, i;
Panel *panel;
GSList *it;
- const struct timespec* timeout;
+ struct timeval* timeout;
+ int hidden_dnd = 0;
+start:
init (argc, argv);
+ init_X11();
i = 0;
- init_config();
if (config_path)
i = config_read_file (config_path);
else
cleanup();
exit(1);
}
+
init_panel();
- cleanup_config();
if (snapshot_path) {
get_snapshot(snapshot_path);
cleanup();
exit(0);
}
+ int damage_event, damage_error;
+ XDamageQueryExtension(server.dsp, &damage_event, &damage_error);
x11_fd = ConnectionNumber(server.dsp);
XSync(server.dsp, False);
- sigset_t empty_mask;
- sigemptyset(&empty_mask);
+// sigset_t empty_mask;
+// sigemptyset(&empty_mask);
while (1) {
if (panel_refresh) {
panel_refresh = 0;
- if (refresh_systray) {
- panel = (Panel*)systray.area.panel;
- XSetWindowBackgroundPixmap (server.dsp, panel->main_win, None);
- }
for (i=0 ; i < nb_panel ; i++) {
panel = &panel1[i];
- if (panel->temp_pmap) XFreePixmap(server.dsp, panel->temp_pmap);
- panel->temp_pmap = XCreatePixmap(server.dsp, server.root_win, panel->area.width, panel->area.height, server.depth);
-
- refresh(&panel->area);
- XCopyArea(server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
+ if (panel->is_hidden) {
+ XCopyArea(server.dsp, panel->hidden_pixmap, panel->main_win, server.gc, 0, 0, panel->hidden_width, panel->hidden_height, 0, 0);
+ XSetWindowBackgroundPixmap(server.dsp, panel->main_win, panel->hidden_pixmap);
+ }
+ else {
+ if (panel->temp_pmap) XFreePixmap(server.dsp, panel->temp_pmap);
+ panel->temp_pmap = XCreatePixmap(server.dsp, server.root_win, panel->area.width, panel->area.height, server.depth);
+ rendering(panel);
+ XCopyArea(server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
+ }
}
XFlush (server.dsp);
- if (refresh_systray) {
+ panel = (Panel*)systray.area.panel;
+ if (refresh_systray && panel && !panel->is_hidden) {
refresh_systray = 0;
- panel = (Panel*)systray.area.panel;
// tint2 doen't draw systray icons. it just redraw background.
XSetWindowBackgroundPixmap (server.dsp, panel->main_win, panel->temp_pmap);
// force icon's refresh
FD_ZERO (&fdset);
FD_SET (x11_fd, &fdset);
update_next_timeout();
- if (next_timeout.tv_sec >= 0 && next_timeout.tv_nsec >= 0)
+ if (next_timeout.tv_sec >= 0 && next_timeout.tv_usec >= 0)
timeout = &next_timeout;
else
timeout = 0;
// Wait for X Event or a Timer
- if (pselect(x11_fd+1, &fdset, 0, 0, timeout, &empty_mask) > 0) {
+ if (select(x11_fd+1, &fdset, 0, 0, timeout) > 0) {
while (XPending (server.dsp)) {
XNextEvent(server.dsp, &e);
+ panel = get_panel(e.xany.window);
+ if (panel && panel_autohide) {
+ if (e.type == EnterNotify)
+ autohide_trigger_show(panel);
+ else if (e.type == LeaveNotify)
+ autohide_trigger_hide(panel);
+ if (panel->is_hidden) {
+ if (e.type == ClientMessage && e.xclient.message_type == server.atom.XdndPosition) {
+ hidden_dnd = 1;
+ autohide_show(panel);
+ }
+ else
+ continue; // discard further processing of this event because the panel is not visible yet
+ }
+ else if (hidden_dnd && e.type == ClientMessage && e.xclient.message_type == server.atom.XdndLeave) {
+ hidden_dnd = 0;
+ autohide_hide(panel);
+ }
+ }
+
switch (e.type) {
case ButtonPress:
- tooltip_hide();
+ tooltip_hide(0);
event_button_press (&e);
break;
break;
case MotionNotify: {
+ unsigned int button_mask = Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask;
+ if (e.xmotion.state & button_mask)
+ event_button_motion_notify (&e);
+
if (!g_tooltip.enabled) break;
Panel* panel = get_panel(e.xmotion.window);
Area* area = click_area(panel, e.xmotion.x, e.xmotion.y);
if (area->_get_tooltip_text)
- tooltip_trigger_show(area, panel, e.xmotion.x_root, e.xmotion.y_root);
+ tooltip_trigger_show(area, panel, &e);
else
tooltip_trigger_hide();
break;
}
case LeaveNotify:
- tooltip_trigger_hide();
+ if (g_tooltip.enabled)
+ tooltip_trigger_hide();
break;
case Expose:
event_expose(&e);
break;
- case MapNotify:
- if (e.xany.window == g_tooltip.window)
- tooltip_update();
- break;
-
case PropertyNotify:
event_property_notify(&e);
break;
break;
case UnmapNotify:
case DestroyNotify:
- if (e.xany.window == g_tooltip.window || !systray.area.on_screen)
+ if (e.xany.window == server.composite_manager) {
+ // Stop real_transparency
+ signal_pending = SIGUSR1;
+ break;
+ }
+ if (e.xany.window == g_tooltip.window || !systray_enabled)
break;
for (it = systray.list_icons; it; it = g_slist_next(it)) {
- if (((TrayWindow*)it->data)->id == e.xany.window) {
+ if (((TrayWindow*)it->data)->tray_id == e.xany.window) {
remove_icon((TrayWindow*)it->data);
break;
}
break;
case ClientMessage:
- if (!systray.area.on_screen) break;
- if (e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) {
+ ev = &e.xclient;
+ if (ev->data.l[1] == server.atom._NET_WM_CM_S0) {
+ if (ev->data.l[2] == None)
+ // Stop real_transparency
+ signal_pending = SIGUSR1;
+ else
+ // Start real_transparency
+ signal_pending = SIGUSR1;
+ }
+ if (systray_enabled && e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) {
net_message(&e.xclient);
}
else if (e.xclient.message_type == server.atom.XdndPosition) {
dnd_message(&e.xclient);
}
break;
+
+ default:
+ if (e.type == XDamageNotify+damage_event) {
+ // union needed to avoid strict-aliasing warnings by gcc
+ union { XEvent e; XDamageNotifyEvent de; } event_union = {.e=e};
+ TrayWindow *traywin;
+ GSList *l;
+ XDamageNotifyEvent* de = &event_union.de;
+ for (l = systray.list_icons; l ; l = l->next) {
+ traywin = (TrayWindow*)l->data;
+ if ( traywin->id == de->drawable ) {
+ systray_render_icon(traywin);
+ break;
+ }
+ }
+ }
}
}
}
callback_timeout_expired();
- switch (signal_pending) {
- case SIGUSR1: // reload config file
- signal_pending = 0;
- init_config();
- config_read_file (config_path);
- init_panel();
- cleanup_config();
- break;
- case SIGINT:
- case SIGTERM:
- case SIGHUP:
- cleanup ();
- return 0;
+ if (signal_pending) {
+ cleanup();
+ if (signal_pending == SIGUSR1) {
+ // restart tint2
+ // SIGUSR1 used when : user's signal, composite manager stop/start or xrandr
+ FD_CLR (x11_fd, &fdset); // not sure if needed
+ goto start;
+ }
+ else {
+ // SIGINT, SIGTERM, SIGHUP
+ return 0;
+ }
}
}
}
projects / chaz / tint2 / blobdiff