* Patch for x11idle
@ 2012-07-18 20:39 Nicolas Calderon
2012-07-24 15:09 ` Bastien
0 siblings, 1 reply; 2+ messages in thread
From: Nicolas Calderon @ 2012-07-18 20:39 UTC (permalink / raw)
To: emacs-orgmode
From c4856a35a2118efb16d6b8eb674ff9e05fc7f65a Mon Sep 17 00:00:00 2001
From: Nicolas Calderon Asselin <nicolas.calderon.asselin@gmail.com>
Date: Wed, 18 Jul 2012 14:19:10 -0400
Subject: [PATCH 1/2] Made x11idle more robust
* UTILITIES/x11idle.c (org-clock-idle-time): Added multiple checks to
functions return values to prevent segfault. Also "fixed" return codes
to fail unless the value could be printed, in which case the program
succeeds.
TINYCHANGE
---
| 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
--git a/UTILITIES/x11idle.c b/UTILITIES/x11idle.c
index 33d0035..8d54468 100644
--- a/UTILITIES/x11idle.c
+++ b/UTILITIES/x11idle.c
@@ -8,14 +8,25 @@
* path
*/
main() {
+ Status querry = 0;
XScreenSaverInfo *info = XScreenSaverAllocInfo();
+ //open the display specified by the DISPLAY environment variable
Display *display = XOpenDisplay(0);
- //check that X11 is running or else you get a segafult/coredump
- if (display != NULL) {
- XScreenSaverQueryInfo(display, DefaultRootWindow(display), info);
+ //display could be null if there is no X server running
+ if (info == NULL || display == NULL) {
+ return -1;
}
- XScreenSaverQueryInfo(display, DefaultRootWindow(display), info);
+
+ //X11 is running, retrieve and print idle time
+ querry = XScreenSaverQueryInfo(display, DefaultRootWindow(display), info);
+
+ if (querry == 0) {
+ return -1;
+ }
+
+ //idle time was retrieved successfully, print it
printf("%u\n", info->idle);
return 0;
}
+
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: Patch for x11idle
2012-07-18 20:39 Patch for x11idle Nicolas Calderon
@ 2012-07-24 15:09 ` Bastien
0 siblings, 0 replies; 2+ messages in thread
From: Bastien @ 2012-07-24 15:09 UTC (permalink / raw)
To: Nicolas Calderon; +Cc: emacs-orgmode
Nicolas Calderon <nicolas.calderon.asselin@gmail.com> writes:
> From c4856a35a2118efb16d6b8eb674ff9e05fc7f65a Mon Sep 17 00:00:00 2001
> From: Nicolas Calderon Asselin <nicolas.calderon.asselin@gmail.com>
> Date: Wed, 18 Jul 2012 14:19:10 -0400
> Subject: [PATCH 1/2] Made x11idle more robust
>
> * UTILITIES/x11idle.c (org-clock-idle-time): Added multiple checks to
> functions return values to prevent segfault. Also "fixed" return codes
> to fail unless the value could be printed, in which case the program
> succeeds.
Applied, thanks!
--
Bastien
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-07-24 15:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-18 20:39 Patch for x11idle Nicolas Calderon
2012-07-24 15:09 ` Bastien
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).