From: Thierry Lorthiois Date: Wed, 1 Apr 2009 20:19:09 +0000 (+0000) Subject: cleanup config file X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Ftint2;a=commitdiff_plain;h=565d032023e504460e639606930482e0f7c6c6d9 cleanup config file --- diff --git a/ChangeLog b/ChangeLog index ecdfc58..272059f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-03-14 +- add systray option when convert tint-0.6 config file + but you need to stop other systemtray program + 2009-03-07 - fixed segfault when time1_format empty - fixed systray : when clock change size diff --git a/doc/tint2-0.7.pdf b/doc/tint2-0.7.pdf index 2454e22..d1a4a7f 100644 Binary files a/doc/tint2-0.7.pdf and b/doc/tint2-0.7.pdf differ diff --git a/src/Makefile b/src/Makefile index a08c75a..cc79c83 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,6 +1,6 @@ CFLAGS= -O2 CC = gcc -FLAGS=-Wall -g `pkg-config --cflags --libs cairo pangocairo x11 xinerama imlib2 glib-2.0` +FLAGS=-Wall -g `pkg-config --cflags --libs cairo pangocairo x11 xinerama xrandr imlib2 glib-2.0` PROGNAME=tint2 FILES=tint.c server.c panel.c config.c taskbar/task.c taskbar/taskbar.c clock/clock.c systray/systraybar.c util/window.c util/area.c diff --git a/src/config.c b/src/config.c index 272bdcf..ab84eb5 100644 --- a/src/config.c +++ b/src/config.c @@ -758,6 +758,12 @@ void save_config () fputs("task_background_id = 2\n", fp); fputs("task_active_background_id = 3\n", fp); + fputs("\n#---------------------------------------------\n", fp); + fputs("# SYSTRAYBAR\n", fp); + fputs("#---------------------------------------------\n", fp); + fputs("systray_padding = 4 3 4\n", fp); + fputs("systray_background_id = 0\n", fp); + fputs("\n#---------------------------------------------\n", fp); fputs("# CLOCK\n", fp); fputs("#---------------------------------------------\n", fp); diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c index 927f9cb..160cbca 100644 --- a/src/systray/systraybar.c +++ b/src/systray/systraybar.c @@ -37,7 +37,7 @@ GSList *icons; #define SYSTEM_TRAY_CANCEL_MESSAGE 2 // selection window -Window net_sel_win = None; +Window net_sel_win = None, hint_win = None; // freedesktop specification doesn't allow multi systray Systraybar systray; @@ -158,6 +158,29 @@ void resize_systray(void *obj) printf("resize_systray %d %d\n", systray.area.posx, systray.area.width); } +/* +void create_hint_win() +{ + XWMHints hints; + XClassHint classhints; + Panel *panel = systray.area.panel; + + hint_win = XCreateSimpleWindow(server.dsp, server.root_win, 0, 0, 1, 1, 0, 0, 0); + + hints.flags = StateHint | WindowGroupHint | IconWindowHint; + hints.initial_state = WithdrawnState; + hints.window_group = hint_win; + hints.icon_window = panel->main_win; + + classhints.res_name = "docker"; + classhints.res_class = "Docker"; + + XSetWMProperties(server.dsp, hint_win, NULL, NULL, NULL, 0, + NULL, &hints, &classhints); + + XMapWindow(server.dsp, hint_win); +} +*/ int init_net() { @@ -166,6 +189,8 @@ int init_net() return 0; } + //create_hint_win(); + // init systray protocol net_sel_win = XCreateSimpleWindow(server.dsp, server.root_win, -1, -1, 1, 1, 0, 0, 0); @@ -203,6 +228,7 @@ void cleanup_net() } } + /* void fix_geometry() { diff --git a/src/tint2 b/src/tint2 index afcfa53..93633a7 100755 Binary files a/src/tint2 and b/src/tint2 differ diff --git a/tintrc01 b/tintrc01 index 513724a..49978ba 100644 --- a/tintrc01 +++ b/tintrc01 @@ -6,7 +6,7 @@ # BACKGROUND AND BORDER #--------------------------------------------- rounded = 7 -border_width = 1 +border_width = 2 background_color = #000000 60 border_color = #ffffff 18 @@ -25,7 +25,7 @@ border_color = #ffffff 70 #--------------------------------------------- panel_monitor = all panel_position = bottom center -panel_size = 90% 28 +panel_size = 92% 30 panel_margin = 0 0 panel_padding = 7 0 font_shadow = 0 diff --git a/tintrc02 b/tintrc02 index 006516d..8b72566 100644 --- a/tintrc02 +++ b/tintrc02 @@ -7,13 +7,13 @@ #--------------------------------------------- rounded = 1 border_width = 0 -background_color = #282828 40 +background_color = #282828 60 border_color = #000000 0 rounded = 1 border_width = 1 background_color = #cccccc 0 -border_color = #cccccc 30 +border_color = #cccccc 55 rounded = 1 border_width = 0 @@ -25,7 +25,7 @@ border_color = #cccccc 40 #--------------------------------------------- panel_monitor = all panel_position = bottom center -panel_size = 92% 30 +panel_size = 95% 30 panel_margin = 0 0 panel_padding = 7 3 7 font_shadow = 0 @@ -57,7 +57,7 @@ task_active_background_id = 3 #--------------------------------------------- # SYSTRAYBAR #--------------------------------------------- -systray_padding = 0 2 3 +systray_padding = 0 4 3 systray_background_id = 0 #--------------------------------------------- diff --git a/tintrc05 b/tintrc05 index 78a90f2..8b076e0 100644 --- a/tintrc05 +++ b/tintrc05 @@ -12,7 +12,7 @@ border_color = #000000 0 rounded = 1 border_width = 0 -background_color = #cccccc 20 +background_color = #f6b655 90 border_color = #cccccc 40 #--------------------------------------------- @@ -20,7 +20,7 @@ border_color = #cccccc 40 #--------------------------------------------- panel_monitor = all panel_position = bottom center -panel_size = 95% 22 +panel_size = 100% 22 panel_margin = 0 0 panel_padding = 0 0 0 font_shadow = 0 @@ -41,9 +41,9 @@ task_text = 1 task_width = 160 task_centered = 1 task_padding = 5 0 -task_font = sans 9 +task_font = sans 7.5 task_font_color = #ffffff 60 -task_active_font_color = #ffffff 100 +task_active_font_color = #000000 100 task_background_id = 0 task_active_background_id = 2 @@ -56,7 +56,7 @@ systray_background_id = 0 #--------------------------------------------- # CLOCK #--------------------------------------------- -time1_format = %H:%M:%S +time1_format = %H:%M time1_font = sans 13 #time2_format = %A %d %B time2_font = sans 7