Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

basic systray with some bugs, update tintrc sample file

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@64 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
lorthiois@bbsoft.fr
2009-02-28 23:04:53 +00:00
parent 2121a32916
commit 67f875338b
23 changed files with 365 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/clock/clock.c
View File

@@ -53,11 +53,11 @@ void init_clock()
clock->area.parent = panel;
clock->area.panel = panel;
if (!clock->area.visible) return;
clock->area._draw_foreground = draw_foreground_clock;
clock->area._draw_foreground = draw_clock;
clock->area._resize = resize_clock;
if (!clock->area.on_screen) continue;
if (strchr(time1_format, 'S') == NULL) time_precision = 60;
else time_precision = 1;
@@ -89,12 +89,12 @@ void init_clock()
}
void draw_foreground_clock (void *obj, cairo_t *c, int active)
void draw_clock (void *obj, cairo_t *c, int active)
{
Clock *clock = obj;
PangoLayout *layout;
//printf(" draw_foreground_clock : %s en (%d, %d)\n", buf_time, clock->area.posx, clock->area.width);
//printf(" draw_clock : %s en (%d, %d)\n", buf_time, clock->area.posx, clock->area.width);
layout = pango_cairo_create_layout (c);
// draw layout

2
src/clock/clock.h
View File

@@ -35,7 +35,7 @@ extern PangoFontDescription *time2_font_desc;
// initialize clock : y position, precision, ...
void init_clock();
void draw_foreground_clock (void *obj, cairo_t *c, int active);
void draw_clock (void *obj, cairo_t *c, int active);
void resize_clock (void *obj);

4
src/config.c
View File

@@ -311,7 +311,7 @@ void add_entry (char *key, char *value)
if (time1_format) g_free(time1_format);
if (strlen(value) > 0) time1_format = strdup (value);
else time1_format = 0;
panel_config->clock.area.visible = 1;
panel_config->clock.area.on_screen = 1;
}
else if (strcmp (key, "time2_format") == 0) {
if (time2_format) g_free(time2_format);
@@ -417,7 +417,7 @@ void add_entry (char *key, char *value)
systray.area.paddingxlr = systray.area.paddingx = atoi (value1);
if (value2) systray.area.paddingy = atoi (value2);
if (value3) systray.area.paddingx = atoi (value3);
systray.area.visible = 1;
systray.area.on_screen = 1;
}
else if (strcmp (key, "systray_background_id") == 0) {
int id = atoi (value);

15
src/panel.c
View File

@@ -61,7 +61,7 @@ void init_panel()
p->area.parent = p;
p->area.panel = p;
p->area.visible = 1;
p->area.on_screen = 1;
p->area.resize = 1;
p->area._resize = resize_panel;
p->g_taskbar.parent = p;
@@ -69,9 +69,9 @@ void init_panel()
p->g_task.area.panel = p;
// add childs
if (p->clock.area.visible)
if (p->clock.area.on_screen)
p->area.list = g_slist_append(p->area.list, &p->clock);
if (systray.area.visible && i == 0) {
if (systray.area.on_screen && i == 0) {
// systray only on first panel
p->area.list = g_slist_append(p->area.list, &systray);
}
@@ -177,9 +177,10 @@ void resize_panel(void *obj)
else taskbar_on_screen = 1;
taskbar_width = panel->area.width - (2 * panel->area.paddingxlr) - (2 * panel->area.pix.border.width);
if (panel->clock.area.visible && panel->clock.area.width)
if (panel->clock.area.on_screen && panel->clock.area.width)
taskbar_width -= (panel->clock.area.width + panel->area.paddingx);
if (systray.area.visible && systray.area.width)
// TODO : systray only on first panel. search better implementation !
if (systray.area.on_screen && systray.area.width && panel == &panel1[0])
taskbar_width -= (systray.area.width + panel->area.paddingx);
taskbar_width = (taskbar_width - ((taskbar_on_screen-1) * panel->area.paddingx)) / taskbar_on_screen;
@@ -222,10 +223,10 @@ void visible_object()
taskbar = &panel->taskbar[j];
if (panel_mode != MULTI_DESKTOP && taskbar->desktop != server.desktop) {
// (SINGLE_DESKTOP or SINGLE_MONITOR) and not current desktop
taskbar->area.visible = 0;
taskbar->area.on_screen = 0;
}
else {
taskbar->area.visible = 1;
taskbar->area.on_screen = 1;
}
}
}

183
src/systray/systraybar.c
View File

@@ -50,19 +50,20 @@ void init_systray()
Panel *panel = &panel1[0];
systray.area.parent = panel;
systray.area.panel = panel;
systray.area._draw_foreground = draw_systray;
systray.area._resize = resize_systray;
if (systray.area.visible) {
if (systray.area.on_screen) {
if (XGetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN) != None) {
fprintf(stderr, "tint2 : another systray is running\n");
systray.area.visible = 0;
systray.area.on_screen = 0;
}
}
if (systray.area.visible)
systray.area.visible = net_init();
if (systray.area.on_screen)
systray.area.on_screen = net_init();
if (!systray.area.visible)
if (!systray.area.on_screen)
return;
// configure systray
@@ -72,7 +73,7 @@ void init_systray()
systray.area.width = 0;
systray.area.posx = panel->area.width - panel->area.paddingxlr - panel->area.pix.border.width - systray.area.width;
if (panel->clock.area.visible)
if (panel->clock.area.on_screen)
systray.area.posx -= (panel->clock.area.width + panel->area.paddingx);
systray.area.redraw = 1;
@@ -94,6 +95,76 @@ void cleanup_systray()
}
void draw_systray(void *obj, cairo_t *c, int active)
{
Systraybar *sysbar = obj;
Panel *panel = sysbar->area.panel;
TrayWindow *traywin;
GSList *l;
int icon_size;
icon_size = sysbar->area.height - (2 * sysbar->area.pix.border.width) - (2 * sysbar->area.paddingy);
for (l = systray.list_icons; l ; l = l->next) {
traywin = (TrayWindow*)l->data;
printf("draw_systray %d %d\n", systray.area.posx, systray.area.width);
// watch for the icon trying to resize itself!
XSelectInput(server.dsp, traywin->id, StructureNotifyMask);
// position and size the icon window
XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, icon_size, icon_size);
// resize our window so that the new window can fit in it
//fix_geometry();
// flush before clearing, otherwise the clear isn't effective.
XFlush(server.dsp);
// make sure the new child will get the right stuff in its background
// for ParentRelative.
XClearWindow(server.dsp, panel->main_win);
// show the window
XMapRaised(server.dsp, traywin->id);
}
}
void resize_systray(void *obj)
{
Systraybar *sysbar = obj;
Panel *panel = sysbar->area.panel;
TrayWindow *traywin;
GSList *l;
int count, posx, posy;
int icon_size;
icon_size = sysbar->area.height - (2 * sysbar->area.pix.border.width) - (2 * sysbar->area.paddingy);
count = g_slist_length(systray.list_icons);
if (!count) systray.area.width = 0;
else systray.area.width = (2 * systray.area.pix.border.width) + (2 * systray.area.paddingxlr) + (icon_size * count) + ((count-1) * systray.area.paddingx);
systray.area.posx = panel->area.width - panel->area.pix.border.width - panel->area.paddingxlr - systray.area.width;
if (panel->clock.area.on_screen)
systray.area.posx -= (panel->clock.area.width + panel->area.paddingx);
systray.area.redraw = 1;
posy = panel->area.pix.border.width + panel->area.paddingy + systray.area.pix.border.width + systray.area.paddingy;
posx = systray.area.posx + systray.area.pix.border.width + systray.area.paddingxlr;
for (l = systray.list_icons; l ; l = l->next) {
traywin = (TrayWindow*)l->data;
traywin->y = posy;
traywin->x = posx;
posx += (icon_size + systray.area.paddingx);
}
// resize other objects on panel
printf("resize_systray %d %d\n", systray.area.posx, systray.area.width);
}
int net_init()
{
// init systray protocol
@@ -125,28 +196,7 @@ int net_init()
}
void resize_systray (void *obj)
{
Systraybar *sysbar = obj;
Panel *panel = sysbar->area.panel;
int count = g_slist_length(systray.list_icons);
if (!count) systray.area.width = 0;
else systray.area.width = 30 * count;
systray.area.posx = panel->area.width - panel->area.paddingxlr - panel->area.pix.border.width - systray.area.width;
if (panel->clock.area.visible)
systray.area.posx -= (panel->clock.area.width + panel->area.paddingx);
systray.area.redraw = 1;
// resize other objects on panel
printf("resize_systray %d %d\n", systray.area.posx, systray.area.width);
}
Window win, root;
//Window win, root;
int width, height;
int border;
int icon_size;
@@ -155,6 +205,7 @@ int icon_size;
void fix_geometry()
{
GSList *it;
Panel *panel = systray.area.panel;
// find the proper width and height
width = 0;
@@ -163,7 +214,7 @@ void fix_geometry()
width += icon_size;
}
XResizeWindow(server.dsp, win, width + border * 2, height + border * 2);
XResizeWindow(server.dsp, panel->main_win, width + border * 2, height + border * 2);
}
@@ -184,10 +235,11 @@ int window_error_handler(Display *d, XErrorEvent *e)
gboolean icon_swallow(TrayWindow *traywin)
{
XErrorHandler old;
Panel *panel = systray.area.panel;
error = FALSE;
old = XSetErrorHandler(window_error_handler);
XReparentWindow(server.dsp, traywin->id, win, 0, 0);
XReparentWindow(server.dsp, traywin->id, panel->main_win, 0, 0);
XSync(server.dsp, False);
XSetErrorHandler(old);
@@ -203,22 +255,27 @@ gboolean icon_add(Window id)
traywin = g_new0(TrayWindow, 1);
traywin->id = id;
systray.list_icons = g_slist_append(systray.list_icons, traywin);
systray.list_icons = g_slist_prepend(systray.list_icons, traywin);
printf("ajout d'un icone %d (%lx)\n", g_slist_length(systray.list_icons), id);
systray.area.resize = 1;
systray.area.redraw = 1;
// changed in systray force resize on panel
Panel *panel = systray.area.panel;
panel->area.resize = 1;
panel_refresh = 1;
return TRUE;
if (!icon_swallow(traywin)) {
printf("not icon_swallow\n");
g_free(traywin);
return FALSE;
}
else
printf("icon_swallow\n");
//return TRUE;
// => calcul x, y, width, height dans resize
/*
// find the positon for the systray app window
int count = g_slist_length(icons);
traywin->x = border + ((width % icon_size) / 2) +
@@ -228,24 +285,7 @@ gboolean icon_add(Window id)
// add the new icon to the list
icons = g_slist_append(icons, traywin);
// watch for the icon trying to resize itself!
//XSelectInput(server.dsp, traywin->id, StructureNotifyMask);
// position and size the icon window
XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, icon_size, icon_size);
// resize our window so that the new window can fit in it
fix_geometry();
// flush before clearing, otherwise the clear isn't effective.
XFlush(server.dsp);
// make sure the new child will get the right stuff in its background
// for ParentRelative.
XClearWindow(server.dsp, win);
// show the window
XMapRaised(server.dsp, traywin->id);
*/
return TRUE;
}
@@ -292,31 +332,28 @@ void net_message(XClientMessageEvent *e)
opcode = e->data.l[1];
switch (opcode) {
case SYSTEM_TRAY_REQUEST_DOCK:
panel_refresh = 1;
id = e->data.l[2];
if (id && icon_add(id)) {
XSelectInput(server.dsp, id, StructureNotifyMask);
}
break;
case SYSTEM_TRAY_REQUEST_DOCK:
id = e->data.l[2];
if (id) icon_add(id);
break;
case SYSTEM_TRAY_BEGIN_MESSAGE:
//g_printerr("Message From Dockapp\n");
id = e->window;
break;
case SYSTEM_TRAY_CANCEL_MESSAGE:
//g_printerr("Message Cancelled\n");
id = e->window;
break;
default:
if (opcode == server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA) {
printf("message from dockapp:\n %s\n", e->data.b);
case SYSTEM_TRAY_BEGIN_MESSAGE:
printf("message from dockapp\n");
id = e->window;
}
// unknown message type. not in the spec
break;
break;
case SYSTEM_TRAY_CANCEL_MESSAGE:
printf("message cancelled\n");
id = e->window;
break;
default:
if (opcode == server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA) {
printf("message from dockapp:\n %s\n", e->data.b);
id = e->window;
}
// unknown message type. not in the spec
break;
}
}

8
src/systray/systraybar.h
View File

@@ -9,9 +9,7 @@
#ifndef SYSTRAYBAR_H
#define SYSTRAYBAR_H
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
#include "common.h"
#include "area.h"
@@ -43,7 +41,9 @@ int net_init();
void net_message(XClientMessageEvent *e);
void icon_remove(TrayWindow *traywin);
void resize_systray (void *obj);
void draw_systray(void *obj, cairo_t *c, int active);
void resize_systray(void *obj);
#endif

2
src/taskbar/task.c
View File

@@ -283,7 +283,7 @@ void draw_task_icon (Task *tsk, int text_width, int active)
}
void draw_foreground_task (void *obj, cairo_t *c, int active)
void draw_task (void *obj, cairo_t *c, int active)
{
Task *tsk = obj;
PangoLayout *layout;

2
src/taskbar/task.h
View File

@@ -53,7 +53,7 @@ typedef struct {
void add_task (Window win);
void remove_task (Task *tsk);
void draw_foreground_task (void *obj, cairo_t *c, int active);
void draw_task (void *obj, cairo_t *c, int active);
void get_icon (Task *tsk);
void get_title(Task *tsk);

6
src/taskbar/taskbar.c
View File

@@ -52,15 +52,15 @@ void init_taskbar()
panel->g_taskbar.posy = panel->area.pix.border.width + panel->area.paddingy;
panel->g_taskbar.height = panel->area.height - (2 * panel->g_taskbar.posy);
panel->g_taskbar.redraw = 1;
panel->g_taskbar.visible = 1;
panel->g_taskbar.on_screen = 1;
// task
panel->g_task.area._draw_foreground = draw_foreground_task;
panel->g_task.area._draw_foreground = draw_task;
panel->g_task.area.posy = panel->g_taskbar.posy + panel->g_taskbar.pix.border.width + panel->g_taskbar.paddingy;
panel->g_task.area.height = panel->area.height - (2 * panel->g_task.area.posy);
panel->g_task.area.use_active = 1;
panel->g_task.area.redraw = 1;
panel->g_task.area.visible = 1;
panel->g_task.area.on_screen = 1;
if (panel->g_task.area.pix.border.rounded > panel->g_task.area.height/2) {
panel->g_task.area.pix.border.rounded = panel->g_task.area.height/2;

43
src/tint.c
View File

@@ -140,7 +140,7 @@ void event_button_press (XEvent *e)
int y = e->xbutton.y;
for (l0 = panel->area.list; l0 ; l0 = l0->next) {
tskbar = l0->data;
if (!tskbar->area.visible) continue;
if (!tskbar->area.on_screen) continue;
if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
break;
}
@@ -190,7 +190,7 @@ void event_button_release (XEvent *e)
GSList *l0;
for (l0 = panel->area.list; l0 ; l0 = l0->next) {
tskbar = l0->data;
if (!tskbar->area.visible) continue;
if (!tskbar->area.on_screen) continue;
if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
goto suite;
}
@@ -403,6 +403,37 @@ void event_property_notify (XEvent *e)
}
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)
{
if (panel_mode != SINGLE_MONITOR) return;
@@ -498,17 +529,15 @@ load_config:
break;
case ButtonRelease:
event_button_release (&e);
event_button_release(&e);
break;
case Expose:
panel = get_panel(e.xany.window);
if (!panel) break;
XCopyArea (server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
event_expose(&e);
break;
case PropertyNotify:
event_property_notify (&e);
event_property_notify(&e);
break;
case ConfigureNotify:

BIN
src/tint2
View File

Binary file not shown.

6
src/util/area.c
View File

@@ -35,10 +35,13 @@
// 4) redraw child
void refresh (Area *a)
{
if (!a->visible) return;
// don't draw and resize hide objects
if (!a->on_screen) return;
size(a);
// don't draw transparent objects (without foreground and without background)
if (a->redraw) {
a->redraw = 0;
//printf("draw area posx %d, width %d\n", a->posx, a->width);
@@ -49,6 +52,7 @@ void refresh (Area *a)
// draw current Area
Pixmap *pmap = (a->is_active == 0) ? (&a->pix.pmap) : (&a->pix_active.pmap);
if (*pmap == 0) printf("empty area posx %d, width %d\n", a->posx, a->width);
XCopyArea (server.dsp, *pmap, ((Panel *)a->panel)->temp_pmap, server.gc, 0, 0, a->width, a->height, a->posx, a->posy);
// and then refresh child object

2
src/util/area.h
View File

@@ -60,7 +60,7 @@ typedef struct {
// list of child : Area object
GSList *list;
int visible;
int on_screen;
// need compute position and width
int resize;
// need redraw Pixmap