**************************************************************************/
#include <sys/stat.h>
-#include <sys/time.h>
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
+#include <stdint.h>
#include <string.h>
#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)
void init (int argc, char *argv[])
{
- int c;
+ 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
- while ((c = getopt(argc , argv, "c:j:v")) != -1) {
- switch (c) {
- case 'c':
- config_path = strdup (optarg);
- break;
- case 'j':
- thumbnail_path = strdup (optarg);
- break;
- case 'v':
- printf("tint2 version 0.7-svn\n");
+ for (i = 1; i < argc; ++i) {
+ if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help")) {
+ printf("Usage: tint2 [-c] <config_file>\n");
exit(0);
- break;
+ }
+ if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--version")) {
+ printf("tint2 version %s\n", VERSION_STRING);
+ exit(0);
+ }
+ if (!strcmp(argv[i], "-c")) {
+ i++;
+ if (i < argc)
+ config_path = strdup(argv[i]);
+ }
+ if (!strcmp(argv[i], "-s")) {
+ i++;
+ if (i < argc)
+ snapshot_path = strdup(argv[i]);
}
}
-
// Set signal handler
- signal(SIGUSR1, signal_handler);
- signal(SIGINT, signal_handler);
- signal(SIGTERM, signal_handler);
- signal(SIGHUP, signal_handler);
- signal(SIGCHLD, SIG_IGN); // don't have to wait() after fork()
- signal(SIGALRM, tooltip_sighandler);
-
- // set global data
- memset(&server, 0, sizeof(Server_global));
- memset(&systray, 0, sizeof(Systraybar));
+ 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);
+ 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);
+}
+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))
+ default_icon = imlib_load_image(path);
+ g_free(path);
+ }
+
+ // get monitor and desktop config
+ get_monitors();
+ get_desktops();
}
void cleanup()
{
- cleanup_panel();
-
- if (time1_font_desc) pango_font_description_free(time1_font_desc);
- if (time2_font_desc) pango_font_description_free(time2_font_desc);
- if (time1_format) g_free(time1_format);
- if (time2_format) g_free(time2_format);
+ cleanup_timeout();
+ cleanup_systray();
+ cleanup_tooltip();
+ cleanup_clock();
+ cleanup_launcher();
#ifdef ENABLE_BATTERY
- if (bat1_font_desc) pango_font_description_free(bat1_font_desc);
- if (bat2_font_desc) pango_font_description_free(bat2_font_desc);
- if (battery_low_cmd) g_free(battery_low_cmd);
- if (path_energy_now) g_free(path_energy_now);
- if (path_energy_full) g_free(path_energy_full);
- if (path_current_now) g_free(path_current_now);
- if (path_status) g_free(path_status);
+ cleanup_battery();
#endif
- if (clock_lclick_command) g_free(clock_lclick_command);
- if (clock_rclick_command) g_free(clock_rclick_command);
- if (config_path) g_free(config_path);
- if (thumbnail_path) g_free(thumbnail_path);
-
- if (server.monitor) free(server.monitor);
- XFreeGC(server.dsp, server.gc);
- XCloseDisplay(server.dsp);
-}
-
-
-Taskbar *click_taskbar (Panel *panel, int x, int y)
-{
- Taskbar *tskbar;
- int i;
+ cleanup_panel();
+ cleanup_config();
- if (panel_horizontal) {
- for (i=0; i < panel->nb_desktop ; i++) {
- tskbar = &panel->taskbar[i];
- if (!tskbar->area.on_screen) continue;
- if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
- return tskbar;
- }
+ if (default_icon) {
+ imlib_context_set_image(default_icon);
+ imlib_free_image();
}
- else {
- for (i=0; i < panel->nb_desktop ; i++) {
- tskbar = &panel->taskbar[i];
- if (!tskbar->area.on_screen) continue;
- if (y >= tskbar->area.posy && y <= (tskbar->area.posy + tskbar->area.height))
- return tskbar;
- }
- }
- return NULL;
+ imlib_context_disconnect_display();
+
+ cleanup_server();
+ if (server.dsp) XCloseDisplay(server.dsp);
}
-Task *click_task (Panel *panel, int x, int y)
+void get_snapshot(const char *path)
{
- GSList *l0;
- Taskbar *tskbar;
-
- if ( (tskbar = click_taskbar(panel, x, y)) ) {
- if (panel_horizontal) {
- Task *tsk;
- for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
- tsk = l0->data;
- if (x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) {
- return tsk;
- }
- }
- }
- else {
- Task *tsk;
- for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
- tsk = l0->data;
- if (y >= tsk->area.posy && y <= (tsk->area.posy + tsk->area.height)) {
- return tsk;
- }
- }
- }
- }
- return NULL;
-}
+ Panel *panel = &panel1[0];
+ if (panel->area.width > server.monitor[0].width)
+ panel->area.width = server.monitor[0].width;
-int click_padding(Panel *panel, int x, int y)
-{
- if (panel_horizontal) {
- if (x < panel->area.paddingxlr || x > panel->area.width-panel->area.paddingxlr)
- return 1;
- }
- else {
- if (y < panel->area.paddingxlr || y > panel->area.height-panel->area.paddingxlr)
- return 1;
- }
- return 0;
-}
+ 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);
-int click_clock(Panel *panel, int x, int y)
-{
- Clock clk = panel->clock;
- if (panel_horizontal) {
- if (clk.area.on_screen && x >= clk.area.posx && x <= (clk.area.posx + clk.area.width))
- return TRUE;
- } else {
- if (clk.area.on_screen && y >= clk.area.posy && y <= (clk.area.posy + clk.area.height))
- return TRUE;
+ imlib_context_set_image(img);
+ if (!panel_horizontal) {
+ // rotate 90° vertical panel
+ imlib_image_flip_horizontal();
+ imlib_image_flip_diagonal();
}
- return FALSE;
+ imlib_save_image(path);
+ imlib_free_image();
}
XIconifyWindow (server.dsp, tsk->win, server.screen);
break;
case TOGGLE_ICONIFY:
- if (tsk == task_active) XIconifyWindow (server.dsp, tsk->win, server.screen);
- else set_active (tsk->win);
+ if (task_active && tsk->win == task_active->win)
+ XIconifyWindow (server.dsp, tsk->win, server.screen);
+ else
+ set_active (tsk->win);
break;
case SHADE:
window_toggle_shade (tsk->win);
windows_set_desktop(tsk->win, desk);
if (desk == server.desktop)
set_active(tsk->win);
+ break;
+ case NEXT_TASK:
+ if (task_active) {
+ Task *tsk1;
+ tsk1 = next_task(task_active);
+ set_active(tsk1->win);
+ }
+ break;
+ case PREV_TASK:
+ if (task_active) {
+ Task *tsk1;
+ tsk1 = prev_task(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;
- if (panel_mode == MULTI_DESKTOP)
- 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)
+ 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)
{
Panel *panel = get_panel(e->xany.window);
if (!panel) return;
- if (wm_menu && click_padding(panel, e->xbutton.x, e->xbutton.y)) {
- // forward the click to the desktop window (thanks conky)
- e->xbutton.window = server.root_win;
- XSendEvent(server.dsp, e->xbutton.window, False, ButtonReleaseMask, e);
- 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;
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();
+ 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++) {
+ for (i=0 ; i < nb_panel ; i++) {
Panel *panel = &panel1[i];
- if (panel_mode == MULTI_DESKTOP) {
- Taskbar *tskbar, *tskbar_active;
- GSList *l;
- Task *tsk;
- char redraw_tasks;
-
- tskbar_active = &panel->taskbar[server.desktop];
- if (panel->g_taskbar.use_active) {
- tskbar_active->area.is_active = 1;
- tskbar_active->area.redraw = 1;
+ if (panel_mode == MULTI_DESKTOP && panel->g_taskbar.bg != panel->g_taskbar.bg_active) {
+ // redraw both taskbar
+ 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;
}
-
- for (j = 0; j < panel->nb_desktop; j++) {
- tskbar = &panel->taskbar[j];
-
- // need to redraw tasks only on taskbar, which was active, or which became active
- redraw_tasks = 0;
- if (panel->g_taskbar.use_active && tskbar->area.is_active && tskbar != tskbar_active) {
- tskbar->area.is_active = 0;
- tskbar->area.redraw = 1;
- redraw_tasks = 1;
- } else if (panel->g_taskbar.use_active && tskbar == tskbar_active) {
- redraw_tasks = 1;
- }
-
- for (l = tskbar->area.list; l;) {
- tsk = l->data;
- l = l->next;
-
- if (redraw_tasks) tsk->area.redraw = 1;
-
- if (tsk->desktop == ALLDESKTOP && tskbar != tskbar_active) {
- // move omnipresent tasks to current taskbar
- tskbar->area.list = g_slist_remove(tskbar->area.list, tsk);
- tskbar->area.resize = 1;
- tsk->area.parent = tskbar_active;
- tskbar_active->area.list = g_slist_append(tskbar_active->area.list, tsk);
- tskbar_active->area.resize = 1;
- }
- }
- }
+ panel->taskbar[server.desktop].area.bg = panel->g_taskbar.bg_active;
+ panel->taskbar[server.desktop].area.resize = 1;
panel_refresh = 1;
- }
- }
- if (panel_mode != MULTI_DESKTOP) {
- visible_object();
+ }
+ // check ALLDESKTOP task => resize taskbar
+ Taskbar *tskbar;
+ Task *tsk;
+ GSList *l;
+ 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];
+ for (l = tskbar->area.list; l ; l = l->next) {
+ tsk = l->data;
+ if (tsk->desktop == ALLDESKTOP) {
+ tsk->area.on_screen = 1;
+ tskbar->area.resize = 1;
+ }
+ }
+ if (panel_mode != MULTI_DESKTOP)
+ visible_taskbar(panel);
}
}
// Window list
}
// Change active
else if (at == server.atom._NET_ACTIVE_WINDOW) {
- GSList *l0;
- if (task_active) {
- 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) {
- tsk = l0->data;
- tsk->area.is_active = 0;
- }
- }
- }
- task_active = 0;
- }
- Window w1 = window_get_active ();
- Task *t = task_get_task(w1);
- if (!t) {
- Window w2;
- if (XGetTransientForHint(server.dsp, w1, &w2) != 0)
- if (w2) t = task_get_task(w2);
- }
- if (task_urgent == t) {
- init_precision();
- task_urgent = 0;
- }
- // put active state on all task (multi_desktop)
- if (t) {
- 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) {
- tsk = l0->data;
- if (tsk->win == t->win) {
- tsk->area.is_active = 1;
- //printf("active monitor %d, task %s\n", panel1[i].monitor, tsk->title);
- }
- }
- }
- }
- task_active = t;
- }
+ active_task();
panel_refresh = 1;
}
else if (at == server.atom._XROOTPMAP_ID) {
else {
tsk = task_get_task (win);
if (!tsk) {
- if ( at != server.atom._NET_WM_STATE)
- return;
- else if ( !(tsk = add_task(win)) )
+ if (at != server.atom._NET_WM_STATE)
return;
+ else {
+ // xfce4 sends _NET_WM_STATE after minimized to tray, so we need to check if window is mapped
+ // if it is mapped and not set as skip_taskbar, we must add it to our task list
+ XWindowAttributes wa;
+ XGetWindowAttributes(server.dsp, win, &wa);
+ if (wa.map_state == IsViewable && !window_is_skip_taskbar(win)) {
+ if ( (tsk = add_task(win)) )
+ panel_refresh = 1;
+ else
+ return;
+ }
+ else
+ return;
+ }
}
//printf("atom root_win = %s, %s\n", XGetAtomName(server.dsp, at), tsk->title);
// 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;
}
// Demand attention
else if (at == server.atom._NET_WM_STATE) {
if (window_is_urgent (win)) {
- task_urgent = tsk;
- tick_urgent = 0;
- time_precision = 1;
+ add_urgent(tsk);
}
if (window_is_skip_taskbar(win)) {
remove_task( tsk );
}
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;
- }
- }
- }
+ 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;
}
}
else if (at == server.atom.WM_HINTS) {
XWMHints* wmhints = XGetWMHints(server.dsp, win);
if (wmhints && wmhints->flags & XUrgencyHint) {
- task_urgent = tsk;
- tick_urgent = 0;
- time_precision = 1;
+ add_urgent(tsk);
}
XFree(wmhints);
}
void event_expose (XEvent *e)
{
- if (e->xany.window == g_tooltip.window)
- tooltip_update();
- else {
- Panel *panel;
- panel = get_panel(e->xany.window);
- if (!panel) return;
- // TODO : one panel_refresh per panel ?
- panel_refresh = 1;
- }
+ Panel *panel;
+ panel = get_panel(e->xany.window);
+ if (!panel) return;
+ // TODO : one panel_refresh per panel ?
+ panel_refresh = 1;
}
void event_configure_notify (Window win)
{
- // check 'win' move in systray
+ // change in root window (xrandr)
+ if (win == server.root_win) {
+ signal_pending = SIGUSR1;
+ return;
+ }
+
+ // 'win' is a trayer icon
TrayWindow *traywin;
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;
}
}
- // check 'win' move in another monitor
+ // 'win' move in another monitor
if (nb_panel == 1) return;
- if (server.nb_monitor == 1) return;
Task *tsk = task_get_task (win);
if (!tsk) 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 ()) {
- Task *tsk = task_get_task (win);
- tsk->area.is_active = 1;
+ set_task_state(tsk, TASK_ACTIVE);
task_active = tsk;
}
panel_refresh = 1;
}
-void event_timer()
-{
- struct timeval stv;
- int i;
-
- if (gettimeofday(&stv, 0)) return;
-
- if (abs(stv.tv_sec - time_clock.tv_sec) < time_precision) return;
- time_clock.tv_sec = stv.tv_sec;
- time_clock.tv_sec -= time_clock.tv_sec % time_precision;
-
- // urgent task
- if (task_urgent) {
- if (tick_urgent < max_tick_urgent) {
- task_urgent->area.is_active = !task_urgent->area.is_active;
- task_urgent->area.redraw = 1;
- tick_urgent++;
- }
- }
-
- // update battery
-#ifdef ENABLE_BATTERY
- if (panel1[0].battery.area.on_screen) {
- update_battery();
- for (i=0 ; i < nb_panel ; i++)
- panel1[i].battery.area.resize = 1;
- }
-#endif
-
- // update clock
- if (time1_format) {
- for (i=0 ; i < nb_panel ; i++)
- panel1[i].clock.area.resize = 1;
- }
- panel_refresh = 1;
-}
-
-
void dnd_message(XClientMessageEvent *e)
{
Panel *panel = get_panel(e->window);
int main (int argc, char *argv[])
{
XEvent e;
- fd_set fd;
+ XClientMessageEvent *ev;
+ fd_set fdset;
int x11_fd, i;
- struct timeval tv;
Panel *panel;
GSList *it;
+ struct timeval* timeout;
+ int hidden_dnd = 0;
+start:
init (argc, argv);
-load_config:
+ init_X11();
+
i = 0;
- init_config();
if (config_path)
i = config_read_file (config_path);
else
cleanup();
exit(1);
}
- config_finish();
- if (thumbnail_path) {
- // usage: tint2 -j <file> for internal use
- printf("file %s\n", thumbnail_path);
+
+ init_panel();
+ 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);
+
while (1) {
+ if (panel_refresh) {
+ panel_refresh = 0;
+
+ for (i=0 ; i < nb_panel ; i++) {
+ panel = &panel1[i];
+
+ 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);
+
+ panel = (Panel*)systray.area.panel;
+ if (refresh_systray && panel && !panel->is_hidden) {
+ refresh_systray = 0;
+ // tint2 doen't draw systray icons. it just redraw background.
+ XSetWindowBackgroundPixmap (server.dsp, panel->main_win, panel->temp_pmap);
+ // force icon's refresh
+ refresh_systray_icon();
+ }
+ }
+
// thanks to AngryLlama for the timer
// Create a File Description Set containing x11_fd
- FD_ZERO (&fd);
- FD_SET (x11_fd, &fd);
-
- tv.tv_usec = 500000;
- tv.tv_sec = 0;
+ FD_ZERO (&fdset);
+ FD_SET (x11_fd, &fdset);
+ update_next_timeout();
+ 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 (select(x11_fd+1, &fd, 0, 0, &tv)) {
+ 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);
- Task* task = click_task(panel, e.xmotion.x, e.xmotion.y);
- if (task)
- tooltip_trigger_show(task, e.xmotion.x_root, e.xmotion.y_root);
+ Area* area = click_area(panel, e.xmotion.x, e.xmotion.y);
+ if (area->_get_tooltip_text)
+ 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:
break;
case ConfigureNotify:
- //XMoveWindow(dpy, fen, pos_x, pos_y);
- //XResizeWindow(dpy, fen, largeur, hauteur);
- if (e.xconfigure.window == server.root_win)
- goto load_config;
- else
- event_configure_notify (e.xconfigure.window);
+ event_configure_notify (e.xconfigure.window);
break;
case ReparentNotify:
- if (!systray.area.on_screen)
+ if (!systray_enabled)
break;
panel = (Panel*)systray.area.panel;
if (e.xany.window == panel->main_win) // reparented to us
break;
case UnmapNotify:
case DestroyNotify:
- if (!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;
+ }
+ }
+ }
}
}
}
- event_timer();
-
- switch (signal_pending) {
- case SIGUSR1:
- signal_pending = 0;
- goto load_config;
- case SIGINT:
- case SIGTERM:
- case SIGHUP:
- cleanup ();
- return 0;
- }
- if (panel_refresh) {
- panel_refresh = 0;
+ callback_timeout_expired();
- if (refresh_systray) {
- panel = (Panel*)systray.area.panel;
- XSetWindowBackgroundPixmap (server.dsp, panel->main_win, None);
+ 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;
}
- 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);
- }
- XFlush (server.dsp);
-
- if (refresh_systray) {
- 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
- refresh_systray_icon();
+ else {
+ // SIGINT, SIGTERM, SIGHUP
+ return 0;
}
}
}
projects / chaz / tint2 / blobdiff