projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ftp://ftp.linux.ncsu.edu/mirror/ftp.redhat.com/pub/redhat/linux/enterprise/4/en/os...
[xscreensaver]
/
hacks
/
xlockmore.c
diff --git
a/hacks/xlockmore.c
b/hacks/xlockmore.c
index 12d31ffef519a10e73872545b0fe98311809b0e4..7624b4875c904a16b5c97a1ac554365f9959f9d4 100644
(file)
--- a/
hacks/xlockmore.c
+++ b/
hacks/xlockmore.c
@@
-1,5
+1,5
@@
/* xlockmore.c --- xscreensaver compatibility layer for xlockmore modules.
/* xlockmore.c --- xscreensaver compatibility layer for xlockmore modules.
- * xscreensaver, Copyright (c) 1997, 1998, 2001, 2002
+ * xscreensaver, Copyright (c) 1997, 1998, 2001, 2002
, 2004
* Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@
-24,11
+24,13
@@
#include <sys/time.h>
#include "screenhack.h"
#include "xlockmoreI.h"
#include <sys/time.h>
#include "screenhack.h"
#include "xlockmoreI.h"
+#include <X11/Intrinsic.h>
#define countof(x) (sizeof((x))/sizeof(*(x)))
#define MAX_COLORS (1L<<13)
#define countof(x) (sizeof((x))/sizeof(*(x)))
#define MAX_COLORS (1L<<13)
+extern XtAppContext app;
extern ModeSpecOpt xlockmore_opts[];
extern const char *app_defaults;
extern ModeSpecOpt xlockmore_opts[];
extern const char *app_defaults;
@@
-217,6
+219,9
@@
xlockmore_handle_events (ModeInfo *mi,
void (*reshape) (ModeInfo *, int, int),
Bool (*hook) (ModeInfo *, XEvent *))
{
void (*reshape) (ModeInfo *, int, int),
Bool (*hook) (ModeInfo *, XEvent *))
{
+ if (XtAppPending (app) & (XtIMTimer|XtIMAlternateInput))
+ XtAppProcessEvent (app, XtIMTimer|XtIMAlternateInput);
+
while (XPending (mi->dpy))
{
XEvent event;
while (XPending (mi->dpy))
{
XEvent event;
@@
-329,7
+334,6
@@
xlockmore_screenhack (Display *dpy, Window window,
goto MONO;
else
{
goto MONO;
else
{
- int i;
mi.pixels = (unsigned long *)
calloc (mi.npixels, sizeof (*mi.pixels));
for (i = 0; i < mi.npixels; i++)
mi.pixels = (unsigned long *)
calloc (mi.npixels, sizeof (*mi.pixels));
for (i = 0; i < mi.npixels; i++)