diff options
| author | Rong-En Fan <rafan@FreeBSD.org> | 2007-03-06 07:49:55 +0000 |
|---|---|---|
| committer | Rong-En Fan <rafan@FreeBSD.org> | 2007-03-06 07:49:55 +0000 |
| commit | daf9e3e20f386a0f05b03bd53a70adc19ad7e191 (patch) | |
| tree | fb6f024dfe562e679ba37f81748eec782f375119 /misc/hotkeys/files/patch-src-hotkeys.c | |
| parent | - Update to 2.1.0 (diff) | |
- More xosd fix
- Correctly handle configuration files
- Add new features in example configuration
Submitted by: Alexey Privalov <lubeg at rootshell.be>
- Use USE_BDB, make it supports all supportted version in ports tree
Tested by: Alexey Privalov <lubeg at rootshell.be>
Notes
Notes:
svn path=/head/; revision=186654
Diffstat (limited to 'misc/hotkeys/files/patch-src-hotkeys.c')
| -rw-r--r-- | misc/hotkeys/files/patch-src-hotkeys.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/misc/hotkeys/files/patch-src-hotkeys.c b/misc/hotkeys/files/patch-src-hotkeys.c index 77b057adf370..2d36f65ab9be 100644 --- a/misc/hotkeys/files/patch-src-hotkeys.c +++ b/misc/hotkeys/files/patch-src-hotkeys.c @@ -1,5 +1,5 @@ --- src/hotkeys.c.orig Wed Dec 4 03:26:32 2002 -+++ src/hotkeys.c Fri Mar 2 19:27:17 2007 ++++ src/hotkeys.c Mon Mar 5 20:33:39 2007 @@ -54,7 +54,7 @@ #include <fcntl.h> #include <sys/ioctl.h> @@ -260,7 +260,7 @@ } #endif break; /* break the for loop */ -@@ -1435,15 +1450,17 @@ +@@ -1435,15 +1450,16 @@ #ifdef HAVE_LIBXOSD if ( osd ) { @@ -283,11 +283,10 @@ + xosd_set_vertical_offset(osd, atoi(getConfig("osd_voffset"))); + xosd_set_font(osd, xstrdup(getConfig("osd_font"))); + xosd_set_align(osd, strncmp(getConfig("osd_align"),"left",4)?((!strncmp(getConfig("osd_align"),"center",6))?XOSD_center:XOSD_right):XOSD_left); -+ xosd_set_align(osd, XOSD_center); } #endif } -@@ -1592,6 +1609,7 @@ +@@ -1592,6 +1608,7 @@ doMute(); } else /* APM stuffs */ @@ -295,7 +294,7 @@ if ( ev.message.keycode == (kbd.defCmds)[sleepKey].key || ev.message.keycode == (kbd.defCmds)[wakeupKey].key ) { sleepState(STANDBY); -@@ -1601,8 +1619,9 @@ +@@ -1601,14 +1618,15 @@ } else { @@ -306,3 +305,10 @@ } } + #ifdef HAVE_LIBXOSD + if (osd) +- xosd_uninit(osd); ++ xosd_destroy(osd); + #endif + XCloseDisplay(dpy); + closelog(); |