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

*add* clock tooltip finished, see issue 115

Browse Source 
*fix* reset sigmask before forking



git-svn-id: http://tint2.googlecode.com/svn/trunk@272 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
Andreas.Fink85
2009-11-16 17:54:46 +00:00
parent 7fa58c0552
commit db83997eae
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/clock/clock.c
View File

@@ -23,6 +23,7 @@
#include <cairo-xlib.h> #include <cairo-xlib.h>
#include <pango/pangocairo.h> #include <pango/pangocairo.h>
#include <unistd.h> #include <unistd.h>
#include <signal.h>
#include "window.h" #include "window.h"
#include "server.h" #include "server.h"
@@ -61,6 +62,7 @@ void update_clocks()
const char* clock_get_tooltip(void* obj) const char* clock_get_tooltip(void* obj)
{ {
strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, localtime(&time_clock.tv_sec));
return buf_tooltip; return buf_tooltip;
} }
@@ -261,7 +263,11 @@ void clock_action(int button)
} }
if (command) { if (command) {
pid_t pid; pid_t pid;
sigset_t sigset;
sigprocmask(SIG_SETMASK, &sigset, 0);
sigprocmask(SIG_UNBLOCK, &sigset, 0);
pid = fork(); pid = fork();
sigprocmask(SIG_BLOCK, &sigset, 0);
if (pid == 0) { if (pid == 0) {
execl("/bin/sh", "/bin/sh", "-c", command, NULL); execl("/bin/sh", "/bin/sh", "-c", command, NULL);
_exit(0); _exit(0);

1
src/clock/clock.h
View File

@@ -26,6 +26,7 @@ typedef struct Clock {
extern char *time1_format; extern char *time1_format;
extern char *time2_format; extern char *time2_format;
extern char *time_tooltip_format;
extern PangoFontDescription *time1_font_desc; extern PangoFontDescription *time1_font_desc;
extern PangoFontDescription *time2_font_desc; extern PangoFontDescription *time2_font_desc;
extern char *clock_lclick_command; extern char *clock_lclick_command;

4
src/config.c
View File

@@ -382,6 +382,10 @@ void add_entry (char *key, char *value)
memcpy(&panel_config.clock.area.pix.back, &a->pix.back, sizeof(Color)); memcpy(&panel_config.clock.area.pix.back, &a->pix.back, sizeof(Color));
memcpy(&panel_config.clock.area.pix.border, &a->pix.border, sizeof(Border)); memcpy(&panel_config.clock.area.pix.border, &a->pix.border, sizeof(Border));
} }
else if (strcmp(key, "clock_tooltip") == 0) {
if (strlen(value) > 0)
time_tooltip_format = strdup (value);
}
else if (strcmp(key, "clock_lclick_command") == 0) { else if (strcmp(key, "clock_lclick_command") == 0) {
if (strlen(value) > 0) if (strlen(value) > 0)
clock_lclick_command = strdup(value); clock_lclick_command = strdup(value);