/**************************************************************************
*
* Tint2 panel
-*
+*
* Copyright (C) 2007 Pål Staurland (staura@gmail.com)
* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
-*
+*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2
* as published by the Free Software Foundation.
#include "config.h"
#include "task.h"
#include "taskbar.h"
+#include "systraybar.h"
#include "panel.h"
-#include "docker.h"
-#include "net.h"
-#include "kde.h"
void signal_handler(int sig)
{
// signal handler is light as it should be
- panel.signal_pending = sig;
+ signal_pending = sig;
}
signal(SIGTERM, signal_handler);
// set global data
- memset(&panel, 0, sizeof(Panel));
memset(&server, 0, sizeof(Server_global));
- memset(&g_task, 0, sizeof(Global_task));
- memset(&g_taskbar, 0, sizeof(Area));
- panel.clock.area.draw_foreground = draw_foreground_clock;
- g_task.area.draw_foreground = draw_foreground_task;
- window.main_win = 0;
-
- // append full transparency background
- //Area *back = calloc(1, sizeof(Area));
- list_back = g_slist_append(0, calloc(1, sizeof(Area)));
-
+ memset(&systray, 0, sizeof(Systraybar));
+
server.dsp = XOpenDisplay (NULL);
if (!server.dsp) {
- fprintf(stderr, "Could not open display.\n");
+ fprintf(stderr, "tint2 exit : could not open display.\n");
exit(0);
}
server_init_atoms ();
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) ;
XSetErrorHandler ((XErrorHandler) server_catch_error);
- // init systray
- display = server.dsp;
- root = RootWindow(display, DefaultScreen(display));
- //create_main_window();
- //kde_init();
- //net_init();
- //printf("ici 4\n");
-
imlib_context_set_display (server.dsp);
imlib_context_set_visual (server.visual);
imlib_context_set_colormap (DefaultColormap (server.dsp, server.screen));
/* Catch events */
XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask);
- setlocale(LC_ALL, "");
+ setlocale (LC_ALL, "");
+}
+
+
+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);
+ 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);
+ if (clock_lclick_command) g_free(clock_lclick_command);
+ if (clock_rclick_command) g_free(clock_rclick_command);
+
+ if (server.monitor) free(server.monitor);
+ XFreeGC(server.dsp, server.gc);
+ XCloseDisplay(server.dsp);
}
XIconifyWindow (server.dsp, tsk->win, server.screen);
break;
case TOGGLE_ICONIFY:
- if (tsk == panel.task_active) XIconifyWindow (server.dsp, tsk->win, server.screen);
+ if (tsk == task_active) XIconifyWindow (server.dsp, tsk->win, server.screen);
else set_active (tsk->win);
break;
case SHADE:
}
-void event_button_press (int x, int y)
-{
- if (panel.mode == SINGLE_DESKTOP) {
+void event_button_press (XEvent *e)
+{
+ Panel *panel = get_panel(e->xany.window);
+ if (!panel) return;
+
+ if (wm_menu) {
+ if ((e->xbutton.x < panel->area.paddingxlr) || (e->xbutton.x > panel->area.width-panel->area.paddingxlr) || (e->xbutton.y < panel->area.paddingy) || (e->xbutton.y > panel->area.paddingy+panel->g_taskbar.height)) {
+ // forward the click to the desktop window (thanks conky)
+ XUngrabPointer(server.dsp, e->xbutton.time);
+ e->xbutton.window = server.root_win;
+ XSetInputFocus(server.dsp, e->xbutton.window, RevertToParent, e->xbutton.time);
+ XSendEvent(server.dsp, e->xbutton.window, False, ButtonPressMask, e);
+ return;
+ }
+ }
+
+ if (e->xbutton.button != 1) return;
+
+ if (panel_mode != MULTI_DESKTOP) {
// drag and drop disabled
- XLowerWindow (server.dsp, window.main_win);
+ XLowerWindow (server.dsp, panel->main_win);
return;
}
-
- Taskbar *tskbar;
+
GSList *l0;
- for (l0 = panel.area.list; l0 ; l0 = l0->next) {
+ Taskbar *tskbar;
+ int x = e->xbutton.x;
+ for (l0 = panel->area.list; l0 ; l0 = l0->next) {
tskbar = l0->data;
+ if (!tskbar->area.on_screen) continue;
if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
break;
}
for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
tsk = l0->data;
if (x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) {
- panel.task_drag = tsk;
+ task_drag = tsk;
break;
}
}
}
-
- XLowerWindow (server.dsp, window.main_win);
+
+ XLowerWindow (server.dsp, panel->main_win);
}
-void event_button_release (int button, int x, int y)
+void event_button_release (XEvent *e)
{
- int action = TOGGLE_ICONIFY;
- // TODO: convert event_button_press(int x, int y) to area->event_button_press()
- // if systray is ok
+ Panel *panel = get_panel(e->xany.window);
+ if (!panel) return;
+
+ if (wm_menu) {
+ if ((e->xbutton.x < panel->area.paddingxlr) || (e->xbutton.x > panel->area.width-panel->area.paddingxlr) || (e->xbutton.y < panel->area.paddingy) || (e->xbutton.y > panel->area.paddingy+panel->g_taskbar.height)) {
+ // 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;
+ }
+ }
- switch (button) {
+ int action = TOGGLE_ICONIFY;
+ int x = e->xbutton.x;
+ //int y = e->xbutton.y; // unused
+ switch (e->xbutton.button) {
case 2:
- action = panel.mouse_middle;
+ action = mouse_middle;
break;
case 3:
- action = panel.mouse_right;
+ action = mouse_right;
break;
case 4:
- action = panel.mouse_scroll_up;
+ action = mouse_scroll_up;
break;
case 5:
- action = panel.mouse_scroll_down;
+ action = mouse_scroll_down;
break;
}
-
+
// search taskbar
Taskbar *tskbar;
GSList *l0;
- for (l0 = panel.area.list; l0 ; l0 = l0->next) {
- tskbar = l0->data;
- if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
- goto suite;
- }
+ Clock clk = panel->clock;
+ if (clk.area.on_screen && x >= clk.area.posx && x <= (clk.area.posx + clk.area.width))
+ clock_action(e->xbutton.button);
+ else {
+ for (l0 = panel->area.list; l0 ; l0 = l0->next) {
+ tskbar = l0->data;
+ if (!tskbar->area.on_screen) continue;
+ if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
+ goto suite;
+ }
+ }
// TODO: check better solution to keep window below
- XLowerWindow (server.dsp, window.main_win);
- panel.task_drag = 0;
+ XLowerWindow (server.dsp, panel->main_win);
+ task_drag = 0;
return;
suite:
// drag and drop task
- if (panel.task_drag) {
- if (tskbar != panel.task_drag->area.parent && action == TOGGLE_ICONIFY) {
- windows_set_desktop(panel.task_drag->win, tskbar->desktop);
- if (tskbar->desktop == server.desktop)
- set_active(panel.task_drag->win);
- panel.task_drag = 0;
+ 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 panel.task_drag = 0;
+ else task_drag = 0;
}
-
+
// switch desktop
- if (panel.mode == MULTI_DESKTOP)
+ if (panel_mode == MULTI_DESKTOP)
if (tskbar->desktop != server.desktop && action != CLOSE)
set_desktop (tskbar->desktop);
break;
}
}
-
+
// to keep window below
- XLowerWindow (server.dsp, window.main_win);
+ XLowerWindow (server.dsp, panel->main_win);
}
-void event_property_notify (Window win, Atom at)
-{
-
+void event_property_notify (XEvent *e)
+{
+ int i, j;
+ Task *tsk;
+ Window win = e->xproperty.window;
+ Atom at = e->xproperty.atom;
+
if (win == server.root_win) {
if (!server.got_root_win) {
XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask);
server.got_root_win = 1;
}
- /* Change number of desktops */
+ // Change number of desktops
else if (at == server.atom._NET_NUMBER_OF_DESKTOPS) {
- config_taskbar();
- visible_object();
- redraw(&panel.area);
+ server.nb_desktop = server_get_number_of_desktop ();
+ cleanup_taskbar();
+ init_taskbar();
+ visible_object();
+ for (i=0 ; i < nb_panel ; i++) {
+ panel1[i].area.resize = 1;
+ }
+ task_refresh_tasklist();
+ panel_refresh = 1;
}
- /* Change desktop */
+ // Change desktop
else if (at == server.atom._NET_CURRENT_DESKTOP) {
server.desktop = server_get_current_desktop ();
- if (panel.mode != MULTI_DESKTOP) {
- visible_object();
+ if (panel_mode != MULTI_DESKTOP) {
+ visible_object();
}
}
- /* Window list */
+ // Window list
else if (at == server.atom._NET_CLIENT_LIST) {
- task_refresh_tasklist ();
- panel.refresh = 1;
+ task_refresh_tasklist();
+ panel_refresh = 1;
}
- /* Active */
+ // 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) panel.task_active = t;
- else {
+ if (!t) {
Window w2;
if (XGetTransientForHint(server.dsp, w1, &w2) != 0)
- if (w2) panel.task_active = task_get_task(w2);
+ if (w2) t = task_get_task(w2);
}
- panel.refresh = 1;
+ if (task_urgent == t) {
+ init_precision();
+ task_urgent = 0;
+ }
+ 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;
+ }
+ panel_refresh = 1;
}
- /* Wallpaper changed */
+ // Wallpaper changed
else if (at == server.atom._XROOTPMAP_ID) {
- XFreePixmap (server.dsp, server.root_pmap);
- server.root_pmap = 0;
- redraw(&panel.area);
- panel.clock.area.redraw = 1;
- panel.refresh = 1;
+ for (i=0 ; i < nb_panel ; i++) {
+ set_panel_background(&panel1[i]);
+ }
+ panel_refresh = 1;
}
}
else {
- Task *tsk;
tsk = task_get_task (win);
if (!tsk) return;
//printf("atom root_win = %s, %s\n", XGetAtomName(server.dsp, at), tsk->title);
- /* Window title changed */
+ // Window title changed
if (at == server.atom._NET_WM_VISIBLE_NAME || at == server.atom._NET_WM_NAME || at == server.atom.WM_NAME) {
- get_title(tsk);
- tsk->area.redraw = 1;
- panel.refresh = 1;
+ 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;
+ }
+ }
+ }
+ }
+ panel_refresh = 1;
}
- /* Iconic state */
+ // Demand attention
+ else if (at == server.atom._NET_WM_STATE) {
+ if (window_is_urgent (win)) {
+ task_urgent = tsk;
+ time_precision = 1;
+ }
+ }
else if (at == server.atom.WM_STATE) {
- if (window_is_iconified (win))
- if (panel.task_active == tsk) panel.task_active = 0;
- }
- /* Window icon changed */
+ // 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;
+ }
+ }
+ }
+ }
+ // Window icon changed
else if (at == server.atom._NET_WM_ICON) {
- if (tsk->icon_data != 0) XFree (tsk->icon_data);
- tsk->area.redraw = 1;
- tsk->icon_data = 0;
- panel.refresh = 1;
+ 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_data = tsk->icon_data;
+ tsk2->area.redraw = 1;
+ }
+ }
+ }
+ }
+ panel_refresh = 1;
}
- /* Window desktop changed */
+ // Window desktop changed
else if (at == server.atom._NET_WM_DESKTOP) {
- add_task (tsk->win);
- remove_task (tsk);
- panel.refresh = 1;
+ int desktop = window_get_desktop (win);
+ //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);
+ add_task (win);
+ panel_refresh = 1;
+ }
}
if (!server.got_root_win) server.root_win = RootWindow (server.dsp, server.screen);
}
+void event_expose (XEvent *e)
+{
+ Panel *panel;
+
+ panel = get_panel(e->xany.window);
+ if (!panel) return;
+/*
+ if (systray.area.on_screen) {
+ // force trayer refresh
+ //XClearWindow(tray_data.dpy, ti->mid_parent);
+ //x11_send_visibility(tray_data.dpy, dst, VisibilityFullyObscured);
+ //x11_send_visibility(tray_data.dpy, dst, VisibilityUnobscured);
+
+ GSList *l;
+ TrayWindow *traywin;
+ for (l = systray.list_icons; l ; l = l->next) {
+ traywin = (TrayWindow*)l->data;
+ // send Expose event
+ XClearArea(server.dsp, traywin->id, 0, 0, systray.area.width, systray.area.height, True);
+ //printf("expose %lx\n", traywin->id);
+ }
+
+ //x11_refresh_window(tray_data.dpy, ti->wid, ti->l.wnd_sz.x, ti->l.wnd_sz.y, True);
+ }
+*/
+ panel_refresh = 1;
+ //XCopyArea (server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
+
+}
+
+
void event_configure_notify (Window win)
-{
- Task *tsk;
+{
+ if (nb_panel == 1) return;
+ if (server.nb_monitor == 1) return;
- tsk = task_get_task (win);
+ Task *tsk = task_get_task (win);
if (!tsk) return;
-
- Taskbar *tskbar = tsk->area.parent;
- if (tskbar->monitor != window_get_monitor (win)) {
+
+ Panel *p = tsk->area.panel;
+ if (p->monitor != window_get_monitor (win)) {
// task on another monitor
- add_task (tsk->win);
remove_task (tsk);
- panel.refresh = 1;
+ add_task (win);
+ if (win == window_get_active ()) {
+ Task *tsk = task_get_task (win);
+ tsk->area.is_active = 1;
+ task_active = tsk;
+ }
+ panel_refresh = 1;
}
}
void event_timer()
{
struct timeval stv;
+ int i;
- if (!panel.clock.time1_format) return;
-
if (gettimeofday(&stv, 0)) return;
-
- if (abs(stv.tv_sec - panel.clock.clock.tv_sec) < panel.clock.time_precision) return;
-
- // update clock
- panel.clock.clock.tv_sec = stv.tv_sec;
- panel.clock.clock.tv_sec -= panel.clock.clock.tv_sec % panel.clock.time_precision;
- panel.clock.area.redraw = 1;
- panel.refresh = 1;
+
+ 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;
+printf("event_timer %d\n", time_precision);
+
+ // urgent task
+ if (task_urgent) {
+ task_urgent->area.is_active = !task_urgent->area.is_active;
+ task_urgent->area.redraw = 1;
+ }
+
+ // update battery
+ if (panel1[0].battery.area.on_screen) {
+ update_battery(&battery_state);
+ for (i=0 ; i < nb_panel ; i++)
+ panel1[i].battery.area.resize = 1;
+ }
+
+ // update clock
+ if (time1_format) {
+ for (i=0 ; i < nb_panel ; i++)
+ panel1[i].clock.area.resize = 1;
+ }
+ panel_refresh = 1;
}
fd_set fd;
int x11_fd, i, c;
struct timeval tv;
+ Panel *panel;
+ GSList *it;
c = getopt (argc, argv, "c:");
init ();
load_config:
- if (server.root_pmap) XFreePixmap (server.dsp, server.root_pmap);
- server.root_pmap = 0;
- // read tint2rc config
i = 0;
+ init_config();
if (c != -1)
i = config_read_file (optarg);
if (!i)
cleanup();
exit(1);
}
- config_finish ();
-
- window_draw_panel ();
-
- // BUG: draw(clock) is needed here, but 'on the paper' it's not necessary.
- draw(&panel.clock.area);
-
- x11_fd = ConnectionNumber (server.dsp);
- XSync (server.dsp, False);
-
+ config_finish();
+
+ x11_fd = ConnectionNumber(server.dsp);
+ XSync(server.dsp, False);
+
while (1) {
// thanks to AngryLlama for the timer
// Create a File Description Set containing x11_fd
tv.tv_usec = 500000;
tv.tv_sec = 0;
-
+
// Wait for X Event or a Timer
if (select(x11_fd+1, &fd, 0, 0, &tv)) {
while (XPending (server.dsp)) {
XNextEvent(server.dsp, &e);
-
+
switch (e.type) {
case ButtonPress:
- if (e.xbutton.button == 1) event_button_press (e.xbutton.x, e.xbutton.y);
+ event_button_press (&e);
break;
case ButtonRelease:
- event_button_release (e.xbutton.button, e.xbutton.x, e.xbutton.y);
+ event_button_release(&e);
break;
-
+
case Expose:
- XCopyArea (server.dsp, server.pmap, window.main_win, server.gc, 0, 0, panel.area.width, panel.area.height, 0, 0);
+ event_expose(&e);
break;
case PropertyNotify:
- //printf("PropertyNotify\n");
- event_property_notify (e.xproperty.window, e.xproperty.atom);
+ event_property_notify(&e);
break;
case ConfigureNotify:
if (e.xconfigure.window == server.root_win)
goto load_config;
else
- if (panel.mode == MULTI_MONITOR)
- event_configure_notify (e.xconfigure.window);
+ event_configure_notify (e.xconfigure.window);
+ break;
+
+ case UnmapNotify:
+ case DestroyNotify:
+ if (!systray.area.on_screen) break;
+ for (it = systray.list_icons; it; it = g_slist_next(it)) {
+ if (((TrayWindow*)it->data)->id == e.xany.window) {
+ remove_icon((TrayWindow*)it->data);
+ break;
+ }
+ }
+ break;
+
+ case ClientMessage:
+ if (!systray.area.on_screen) break;
+ //printf("ClientMessage\n");
+ if (e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) {
+ net_message(&e.xclient);
+ }
break;
}
}
}
- else event_timer();
+ event_timer();
- switch (panel.signal_pending) {
+ switch (signal_pending) {
case SIGUSR1:
goto load_config;
case SIGINT:
return 0;
}
- if (panel.refresh && !panel.sleep_mode) {
- visual_refresh ();
- //printf(" *** visual_refresh\n");
- }
+ if (panel_refresh) {
+ panel_refresh = 0;
+
+ 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);
+ }
}
}
projects / chaz / tint2 / blobdiff