X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftint.c;h=5767f2b53bd4704606b9968634ed6ec542959106;hb=827f5d6fc955e7071351716d7d0d41b66ed65a76;hp=a91f8cc38267d1110376dfd61f3ed30b596fb20b;hpb=35e206acc0a7b9dca7611fe4a7e17c7acc381ad0;p=chaz%2Ftint2 diff --git a/src/tint.c b/src/tint.c index a91f8cc..5767f2b 100644 --- a/src/tint.c +++ b/src/tint.c @@ -3,7 +3,7 @@ * Tint2 panel * * Copyright (C) 2007 Pål Staurland (staura@gmail.com) -* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) +* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 @@ -27,18 +27,36 @@ #include #include #include +#include #include #include +#ifdef HAVE_SN +#include +#include +#endif + +#include #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" +#include "xsettings-client.h" + +// Drag and Drop state variables +Window dnd_source_window; +Window dnd_target_window; +int dnd_version; +Atom dnd_selection; +Atom dnd_atom; +int dnd_sent_request; +char *dnd_launcher_exec; void signal_handler(int sig) { @@ -51,6 +69,20 @@ void init (int argc, char *argv[]) { 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")) { @@ -58,10 +90,10 @@ void init (int argc, char *argv[]) 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]); @@ -72,27 +104,81 @@ void init (int argc, char *argv[]) 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() + sigaction(SIGCHLD, &sa_chld, 0); + + // 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); +// 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); +} +#ifdef HAVE_SN +static int error_trap_depth = 0; - // set global data - memset(&server, 0, sizeof(Server_global)); - memset(&systray, 0, sizeof(Systraybar)); +static void +error_trap_push (SnDisplay *display, + Display *xdisplay) +{ + ++error_trap_depth; +} + +static void +error_trap_pop (SnDisplay *display, + Display *xdisplay) +{ + if (error_trap_depth == 0) + { + fprintf(stderr, "Error trap underflow!\n"); + return; + } + + XSync(xdisplay, False); /* get all errors out of the queue */ + --error_trap_depth; +} + +static void sigchld_handler(int sig) { + // Wait for all dead processes + pid_t pid; + while ((pid = waitpid(-1, NULL, WNOHANG)) > 0) { + SnLauncherContext *ctx; + ctx = (SnLauncherContext *) g_tree_lookup (server.pids, GINT_TO_POINTER (pid)); + if (ctx == NULL) { + fprintf(stderr, "Unknown child %d terminated!\n", pid); + } + else { + g_tree_remove (server.pids, GINT_TO_POINTER (pid)); + sn_launcher_context_complete (ctx); + sn_launcher_context_unref (ctx); + } + } +} +static gint cmp_ptr(gconstpointer a, gconstpointer b) { + if (a < b) + return -1; + else if (a == b) + return 0; + else + return 1; +} + +#endif // HAVE_SN + +void init_X11() +{ server.dsp = XOpenDisplay (NULL); if (!server.dsp) { fprintf(stderr, "tint2 exit : could not open display.\n"); @@ -101,27 +187,39 @@ void init (int argc, char *argv[]) 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); +#ifdef HAVE_SN + // Initialize startup-notification + server.sn_dsp = sn_display_new (server.dsp, error_trap_push, error_trap_pop); + server.pids = g_tree_new (cmp_ptr); + // Setup a handler for child termination + struct sigaction act; + memset (&act, 0, sizeof (struct sigaction)); + act.sa_handler = sigchld_handler; + if (sigaction(SIGCHLD, &act, 0)) { + perror("sigaction"); + } +#endif // HAVE_SN + 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)) @@ -138,24 +236,24 @@ void init (int argc, char *argv[]) void cleanup() { 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(); + cleanup_timeout(); + if (server.dsp) XCloseDisplay(server.dsp); } @@ -163,16 +261,22 @@ void get_snapshot(const char *path) { 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(); } @@ -227,50 +331,158 @@ void window_action (Task *tsk, int action) case NEXT_TASK: if (task_active) { Task *tsk1; - tsk1 = next_task(task_active); + tsk1 = next_task(find_active_task(tsk, task_active)); set_active(tsk1->win); } break; case PREV_TASK: if (task_active) { Task *tsk1; - tsk1 = prev_task(task_active); + tsk1 = prev_task(find_active_task(tsk, task_active)); set_active(tsk1->win); } } } +int tint2_handles_click(Panel* panel, XButtonEvent* e) +{ + Task* task = click_task(panel, e->x, e->y); + if (task) { + if( (e->button == 1) + || (e->button == 2 && mouse_middle != 0) + || (e->button == 3 && mouse_right != 0) + || (e->button == 4 && mouse_scroll_up != 0) + || (e->button == 5 && mouse_scroll_down !=0) ) + { + return 1; + } + else + return 0; + } + 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 == 3 && clock_rclick_command) ) + return 1; + else + return 0; + } + return 0; +} + + +void forward_click(XEvent* e) +{ + // forward the click to the desktop window (thanks conky) + XUngrabPointer(server.dsp, e->xbutton.time); + e->xbutton.window = server.root_win; + // icewm doesn't open under the mouse. + // and xfce doesn't open at all. + e->xbutton.x = e->xbutton.x_root; + e->xbutton.y = e->xbutton.y_root; + //printf("**** %d, %d\n", e->xbutton.x, e->xbutton.y); + //XSetInputFocus(server.dsp, e->xbutton.window, RevertToParent, e->xbutton.time); + XSendEvent(server.dsp, e->xbutton.window, False, ButtonPressMask, e); +} + + void event_button_press (XEvent *e) { Panel *panel = get_panel(e->xany.window); if (!panel) return; - task_drag = click_task(panel, e->xbutton.x, e->xbutton.y); - if (wm_menu && !task_drag && !click_clock(panel, e->xbutton.x, e->xbutton.y) && (e->xbutton.button != 1) ) { - // forward the click to the desktop window (thanks conky) - XUngrabPointer(server.dsp, e->xbutton.time); - e->xbutton.window = server.root_win; - // icewm doesn't open under the mouse. - // and xfce doesn't open at all. - e->xbutton.x = e->xbutton.x_root; - e->xbutton.y = e->xbutton.y_root; - //printf("**** %d, %d\n", e->xbutton.x, e->xbutton.y); - //XSetInputFocus(server.dsp, e->xbutton.window, RevertToParent, e->xbutton.time); - XSendEvent(server.dsp, e->xbutton.window, False, ButtonPressMask, e); + if (wm_menu && !tint2_handles_click(panel, &e->xbutton) ) { + forward_click(e); return; } + 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) { + int i = (taskbarname_enabled) ? 1 : 0; + event_taskbar->area.list = g_slist_insert(event_taskbar->area.list, task_drag, i); + } + 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) { Panel *panel = get_panel(e->xany.window); if (!panel) return; + 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; + } + int action = TOGGLE_ICONIFY; switch (e->xbutton.button) { case 2: @@ -295,7 +507,17 @@ void event_button_release (XEvent *e) 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, e); + } task_drag = 0; return; } @@ -303,23 +525,17 @@ void event_button_release (XEvent *e) 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 @@ -332,64 +548,105 @@ void event_button_release (XEvent *e) 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; + if (xsettings_client) + xsettings_client_process_event(xsettings_client, e); if (win == server.root_win) { if (!server.got_root_win) { XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask); server.got_root_win = 1; } + // Change name of desktops + else if (at == server.atom._NET_DESKTOP_NAMES) { + if (!taskbarname_enabled) return; + GSList *l, *list = server_get_name_of_desktop(); + int j; + gchar *name; + Taskbar *tskbar; + for (i=0 ; i < nb_panel ; i++) { + for (j=0, l=list ; j < panel1[i].nb_desktop ; j++) { + if (l) { + name = g_strdup(l->data); + l = l->next; + } + else + name = g_strdup_printf("%d", j+1); + tskbar = &panel1[i].taskbar[j]; + if (strcmp(name, tskbar->bar_name.name) != 0) { + g_free(tskbar->bar_name.name); + tskbar->bar_name.name = name; + tskbar->bar_name.area.resize = 1; + } + else + g_free(name); + } + } + for (l=list ; l ; l = l->next) + g_free(l->data); + g_slist_free(list); + panel_refresh = 1; + } // 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 (); + if (server.nb_desktop <= server.desktop) { + server.desktop = server.nb_desktop-1; + } 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(); + active_task(); panel_refresh = 1; } // 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) { - // 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; - panel->taskbar[server.desktop].area.resize = 1; - panel_refresh = 1; - } + set_taskbar_state(&panel->taskbar[old_desktop], TASKBAR_NORMAL); + set_taskbar_state(&panel->taskbar[server.desktop], TASKBAR_ACTIVE); // check ALLDESKTOP task => resize taskbar 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]; + l = tskbar->area.list; + if (taskbarname_enabled) l = l->next; + for (; 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]; - for (l = tskbar->area.list; l ; l = l->next) { + l = tskbar->area.list; + if (taskbarname_enabled) l = l->next; + for (; l ; l = l->next) { tsk = l->data; if (tsk->desktop == ALLDESKTOP) { tsk->area.on_screen = 1; @@ -397,9 +654,6 @@ void event_property_notify (XEvent *e) } } } - if (panel_mode != MULTI_DESKTOP) { - visible_object(); - } } // Window list else if (at == server.atom._NET_CLIENT_LIST) { @@ -411,7 +665,7 @@ void event_property_notify (XEvent *e) active_task(); panel_refresh = 1; } - else if (at == server.atom._XROOTPMAP_ID) { + else if (at == server.atom._XROOTPMAP_ID || at == server.atom._XROOTMAP_ID) { // change Wallpaper for (i=0 ; i < nb_panel ; i++) { set_panel_background(&panel1[i]); @@ -443,22 +697,13 @@ void event_property_notify (XEvent *e) // 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 (get_title(tsk)) { + if (g_tooltip.mapped && (g_tooltip.area == (Area*)tsk)) { + tooltip_copy_text((Area*)tsk); + tooltip_update(); } + panel_refresh = 1; } - panel_refresh = 1; } // Demand attention else if (at == server.atom._NET_WM_STATE) { @@ -470,64 +715,28 @@ void event_property_notify (XEvent *e) 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 else if (at == server.atom._NET_WM_DESKTOP) { int desktop = window_get_desktop (win); - int active = tsk->area.is_active; //printf(" Window desktop changed %d, %d\n", tsk->desktop, desktop); // bug in windowmaker : send unecessary 'desktop changed' when focus changed if (desktop != tsk->desktop) { remove_task (tsk); tsk = add_task (win); - if (tsk && active) { - tsk->area.is_active = 1; - task_active = tsk; - } + active_task(); panel_refresh = 1; } } @@ -558,11 +767,7 @@ void event_configure_notify (Window win) { // 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; } @@ -571,9 +776,10 @@ void event_configure_notify (Window win) 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; } @@ -587,19 +793,159 @@ void event_configure_notify (Window win) 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 ()) { - Task *tsk = task_get_task (win); - tsk->area.is_active = 1; + set_task_state(tsk, TASK_ACTIVE); task_active = tsk; } panel_refresh = 1; } } +char *GetAtomName(Display* disp, Atom a) +{ + if (a == None) + return "None"; + else + return XGetAtomName(disp, a); +} + +typedef struct Property +{ + unsigned char *data; + int format, nitems; + Atom type; +} Property; + +//This fetches all the data from a property +struct Property read_property(Display* disp, Window w, Atom property) +{ + Atom actual_type; + int actual_format; + unsigned long nitems; + unsigned long bytes_after; + unsigned char *ret=0; + + int read_bytes = 1024; + + //Keep trying to read the property until there are no + //bytes unread. + do { + if (ret != 0) + XFree(ret); + XGetWindowProperty(disp, w, property, 0, read_bytes, False, AnyPropertyType, + &actual_type, &actual_format, &nitems, &bytes_after, + &ret); + read_bytes *= 2; + } while (bytes_after != 0); + + fprintf(stderr, "DnD %s:%d: Property:\n", __FILE__, __LINE__); + fprintf(stderr, "DnD %s:%d: Actual type: %s\n", __FILE__, __LINE__, GetAtomName(disp, actual_type)); + fprintf(stderr, "DnD %s:%d: Actual format: %d\n", __FILE__, __LINE__, actual_format); + fprintf(stderr, "DnD %s:%d: Number of items: %lu\n", __FILE__, __LINE__, nitems); + + Property p; + p.data = ret; + p.format = actual_format; + p.nitems = nitems; + p.type = actual_type; + + return p; +} + +// This function takes a list of targets which can be converted to (atom_list, nitems) +// and a list of acceptable targets with prioritees (datatypes). It returns the highest +// entry in datatypes which is also in atom_list: ie it finds the best match. +Atom pick_target_from_list(Display* disp, Atom* atom_list, int nitems) +{ + Atom to_be_requested = None; + int i; + for (i = 0; i < nitems; i++) { + char *atom_name = GetAtomName(disp, atom_list[i]); + fprintf(stderr, "DnD %s:%d: Type %d = %s\n", __FILE__, __LINE__, i, atom_name); + + //See if this data type is allowed and of higher priority (closer to zero) + //than the present one. + if (strcmp(atom_name, "STRING") == 0) { + to_be_requested = atom_list[i]; + } + } + + return to_be_requested; +} + +// Finds the best target given up to three atoms provided (any can be None). +// Useful for part of the Xdnd protocol. +Atom pick_target_from_atoms(Display* disp, Atom t1, Atom t2, Atom t3) +{ + Atom atoms[3]; + int n = 0; + + if (t1 != None) + atoms[n++] = t1; + + if (t2 != None) + atoms[n++] = t2; + + if (t3 != None) + atoms[n++] = t3; + + return pick_target_from_list(disp, atoms, n); +} + +// Finds the best target given a local copy of a property. +Atom pick_target_from_targets(Display* disp, Property p) +{ + //The list of targets is a list of atoms, so it should have type XA_ATOM + //but it may have the type TARGETS instead. + + if ((p.type != XA_ATOM && p.type != server.atom.TARGETS) || p.format != 32) { + //This would be really broken. Targets have to be an atom list + //and applications should support this. Nevertheless, some + //seem broken (MATLAB 7, for instance), so ask for STRING + //next instead as the lowest common denominator + return XA_STRING; + } else { + Atom *atom_list = (Atom*)p.data; + + return pick_target_from_list(disp, atom_list, p.nitems); + } +} + +void dnd_enter(XClientMessageEvent *e) +{ + dnd_atom = None; + int more_than_3 = e->data.l[1] & 1; + dnd_source_window = e->data.l[0]; + dnd_version = (e->data.l[1] >> 24); + + fprintf(stderr, "DnD %s:%d: DnDEnter\n", __FILE__, __LINE__); + fprintf(stderr, "DnD %s:%d: DnDEnter. Supports > 3 types = %s\n", __FILE__, __LINE__, more_than_3 ? "yes" : "no"); + fprintf(stderr, "DnD %s:%d: Protocol version = %d\n", __FILE__, __LINE__, dnd_version); + fprintf(stderr, "DnD %s:%d: Type 1 = %s\n", __FILE__, __LINE__, GetAtomName(server.dsp, e->data.l[2])); + fprintf(stderr, "DnD %s:%d: Type 2 = %s\n", __FILE__, __LINE__, GetAtomName(server.dsp, e->data.l[3])); + fprintf(stderr, "DnD %s:%d: Type 3 = %s\n", __FILE__, __LINE__, GetAtomName(server.dsp, e->data.l[4])); + + //Query which conversions are available and pick the best + + if (more_than_3) { + //Fetch the list of possible conversions + //Notice the similarity to TARGETS with paste. + Property p = read_property(server.dsp, dnd_source_window, server.atom.XdndTypeList); + dnd_atom = pick_target_from_targets(server.dsp, p); + XFree(p.data); + } else { + //Use the available list + dnd_atom = pick_target_from_atoms(server.dsp, e->data.l[2], e->data.l[3], e->data.l[4]); + } + + fprintf(stderr, "DnD %s:%d: Requested type = %s\n", __FILE__, __LINE__, GetAtomName(server.dsp, dnd_atom)); +} -void dnd_message(XClientMessageEvent *e) +void dnd_position(XClientMessageEvent *e) { + dnd_target_window = e->window; + int accept = 0; Panel *panel = get_panel(e->window); int x, y, mapX, mapY; Window child; @@ -611,6 +957,14 @@ void dnd_message(XClientMessageEvent *e) if (task->desktop != server.desktop ) set_desktop (task->desktop); window_action(task, TOGGLE); + } else { + LauncherIcon *icon = click_launcher_icon(panel, mapX, mapY); + if (icon) { + accept = 1; + dnd_launcher_exec = icon->cmd; + } else { + dnd_launcher_exec = 0; + } } // send XdndStatus event to get more XdndPosition events @@ -620,27 +974,59 @@ void dnd_message(XClientMessageEvent *e) se.message_type = server.atom.XdndStatus; se.format = 32; se.data.l[0] = e->window; // XID of the target window - se.data.l[1] = 0; // bit 0: accept drop bit 1: send XdndPosition events if inside rectangle + se.data.l[1] = accept ? 1 : 0; // bit 0: accept drop bit 1: send XdndPosition events if inside rectangle se.data.l[2] = 0; // Rectangle x,y for which no more XdndPosition events se.data.l[3] = (1 << 16) | 1; // Rectangle w,h for which no more XdndPosition events - se.data.l[4] = None; // None = drop will not be accepted + if (accept) { + se.data.l[4] = dnd_version >= 2 ? e->data.l[4] : server.atom.XdndActionCopy; + } else { + se.data.l[4] = None; // None = drop will not be accepted + } + XSendEvent(server.dsp, e->data.l[0], False, NoEventMask, (XEvent*)&se); } +void dnd_drop(XClientMessageEvent *e) +{ + if (dnd_target_window && dnd_launcher_exec) { + if (dnd_version >= 1) { + XConvertSelection(server.dsp, server.atom.XdndSelection, XA_STRING, dnd_selection, dnd_target_window, e->data.l[2]); + } else { + XConvertSelection(server.dsp, server.atom.XdndSelection, XA_STRING, dnd_selection, dnd_target_window, CurrentTime); + } + } else { + //The source is sending anyway, despite instructions to the contrary. + //So reply that we're not interested. + XClientMessageEvent m; + memset(&m, sizeof(m), 0); + m.type = ClientMessage; + m.display = e->display; + m.window = e->data.l[0]; + m.message_type = server.atom.XdndFinished; + m.format = 32; + m.data.l[0] = dnd_target_window; + m.data.l[1] = 0; + m.data.l[2] = None; //Failed. + XSendEvent(server.dsp, e->data.l[0], False, NoEventMask, (XEvent*)&m); + } +} 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 @@ -650,42 +1036,54 @@ int main (int argc, char *argv[]) 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); + // XDND initialization + dnd_source_window = 0; + dnd_target_window = 0; + dnd_version = 0; + dnd_selection = XInternAtom(server.dsp, "PRIMARY", 0); + dnd_atom = None; + dnd_sent_request = 0; + dnd_launcher_exec = 0; + +// 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 @@ -698,19 +1096,42 @@ int main (int argc, char *argv[]) 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); +#if HAVE_SN + sn_display_process_event (server.sn_dsp, &e); +#endif // HAVE_SN + + 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; @@ -719,11 +1140,14 @@ int main (int argc, char *argv[]) break; case MotionNotify: { - if (!g_tooltip.enabled) break; + unsigned int button_mask = Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask; + if (e.xmotion.state & button_mask) + event_button_motion_notify (&e); + 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; @@ -737,11 +1161,6 @@ int main (int argc, char *argv[]) event_expose(&e); break; - case MapNotify: - if (e.xany.window == g_tooltip.window) - tooltip_update(); - break; - case PropertyNotify: event_property_notify(&e); break; @@ -760,44 +1179,183 @@ int main (int argc, char *argv[]) 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; + 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.XdndEnter) { + dnd_enter(&e.xclient); + } else if (e.xclient.message_type == server.atom.XdndPosition) { - dnd_message(&e.xclient); + dnd_position(&e.xclient); + } + else if (e.xclient.message_type == server.atom.XdndDrop) { + dnd_drop(&e.xclient); } break; + + case SelectionNotify: + { + Atom target = e.xselection.target; + + fprintf(stderr, "DnD %s:%d: A selection notify has arrived!\n", __FILE__, __LINE__); + fprintf(stderr, "DnD %s:%d: Requestor = %lu\n", __FILE__, __LINE__, e.xselectionrequest.requestor); + fprintf(stderr, "DnD %s:%d: Selection atom = %s\n", __FILE__, __LINE__, GetAtomName(server.dsp, e.xselection.selection)); + fprintf(stderr, "DnD %s:%d: Target atom = %s\n", __FILE__, __LINE__, GetAtomName(server.dsp, target)); + fprintf(stderr, "DnD %s:%d: Property atom = %s\n", __FILE__, __LINE__, GetAtomName(server.dsp, e.xselection.property)); + + if (e.xselection.property != None && dnd_launcher_exec) { + Property prop = read_property(server.dsp, dnd_target_window, dnd_selection); + + //If we're being given a list of targets (possible conversions) + if (target == server.atom.TARGETS && !dnd_sent_request) { + dnd_sent_request = 1; + dnd_atom = pick_target_from_targets(server.dsp, prop); + + if (dnd_atom == None) { + fprintf(stderr, "No matching datatypes.\n"); + } else { + //Request the data type we are able to select + fprintf(stderr, "Now requsting type %s", GetAtomName(server.dsp, dnd_atom)); + XConvertSelection(server.dsp, dnd_selection, dnd_atom, dnd_selection, dnd_target_window, CurrentTime); + } + } else if (target == dnd_atom) { + //Dump the binary data + fprintf(stderr, "DnD %s:%d: Data begins:\n", __FILE__, __LINE__); + fprintf(stderr, "--------\n"); + int i; + for (i = 0; i < prop.nitems * prop.format/8; i++) + fprintf(stderr, "%c", ((char*)prop.data)[i]); + fprintf(stderr, "--------\n"); + + int cmd_length = 0; + cmd_length += 1; // ( + cmd_length += strlen(dnd_launcher_exec) + 1; // exec + space + cmd_length += 1; // open double quotes + for (i = 0; i < prop.nitems * prop.format/8; i++) { + char c = ((char*)prop.data)[i]; + if (c == '\n') { + if (i < prop.nitems * prop.format/8 - 1) { + cmd_length += 3; // close double quotes, space, open double quotes + } + } else if (c == '\r') { + } else { + cmd_length += 1; // 1 character + if (c == '`' || c == '$' || c == '\\') { + cmd_length += 1; // escape with one backslash + } + } + } + cmd_length += 1; // close double quotes + cmd_length += 2; // &) + cmd_length += 1; // terminator + + char *cmd = malloc(cmd_length); + cmd[0] = '\0'; + strcat(cmd, "("); + strcat(cmd, dnd_launcher_exec); + strcat(cmd, " \""); + for (i = 0; i < prop.nitems * prop.format/8; i++) { + char c = ((char*)prop.data)[i]; + if (c == '\n') { + if (i < prop.nitems * prop.format/8 - 1) { + strcat(cmd, "\" \""); + } + } else if (c == '\r') { + } else { + if (c == '`' || c == '$' || c == '\\') { + strcat(cmd, "\\"); + } + char sc[2]; + sc[0] = c; + sc[1] = '\0'; + strcat(cmd, sc); + } + } + strcat(cmd, "\""); + strcat(cmd, "&)"); + fprintf(stderr, "DnD %s:%d: Running command: %s\n", __FILE__, __LINE__, cmd); + tint_exec(cmd); + free(cmd); + + // Reply OK. + XClientMessageEvent m; + memset(&m, sizeof(m), 0); + m.type = ClientMessage; + m.display = server.dsp; + m.window = dnd_source_window; + m.message_type = server.atom.XdndFinished; + m.format = 32; + m.data.l[0] = dnd_target_window; + m.data.l[1] = 1; + m.data.l[2] = server.atom.XdndActionCopy; //We only ever copy. + XSendEvent(server.dsp, dnd_source_window, False, NoEventMask, (XEvent*)&m); + XSync(server.dsp, False); + } + + XFree(prop.data); + } + + 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; + } } } }