| version 1.10, 2007/02/05 14:08:19 | version 1.11, 2007/02/05 14:35:55 | 
| Line 33 | Line 33 | 
 | #include <stdlib.h> | #include <stdlib.h> | 
 | #include <string.h> | #include <string.h> | 
 | #include <unistd.h> | #include <unistd.h> | 
 |  | #include <signal.h> | 
 |  |  | 
 | #include <X11/Xlib.h> | #include <X11/Xlib.h> | 
 | #include <X11/Xatom.h> | #include <X11/Xatom.h> | 
| Line 42 | Line 43 | 
 | #include <gdk/gdkx.h> | #include <gdk/gdkx.h> | 
 |  |  | 
 | extern int verbose; | extern int verbose; | 
 |  | extern volatile sig_atomic_t np2running; | 
 |  |  | 
 | #ifndef VERBOSE | #ifndef VERBOSE | 
 | #define VERBOSE(s)      if (verbose) printf s | #define VERBOSE(s)      if (verbose) printf s | 
| Line 339  gtk_window_restore_mode(GtkWidget *widge | Line 341  gtk_window_restore_mode(GtkWidget *widge | 
 |  |  | 
 | #ifdef HAVE_XF86VIDMODE | #ifdef HAVE_XF86VIDMODE | 
 | if (use_xvid) { | if (use_xvid) { | 
 | GtkWindow *window; |  | 
 | XF86VidModeModeInfo mode; | XF86VidModeModeInfo mode; | 
 | int rv; | int rv; | 
 |  |  | 
 | if ((orig_mode.hdisplay == 0) || (orig_mode.vdisplay == 0)) | if ((orig_mode.hdisplay == 0) || (orig_mode.vdisplay == 0)) | 
 | return; | return; | 
 |  |  | 
 | window = GTK_WINDOW(widget); |  | 
 |  |  | 
 | XLockDisplay(fs_xdisplay); | XLockDisplay(fs_xdisplay); | 
 |  |  | 
 | rv = XF86VidModeGetModeInfo(fs_xdisplay, fs_xscreen, &mode); | rv = XF86VidModeGetModeInfo(fs_xdisplay, fs_xscreen, &mode); | 
| Line 365  gtk_window_restore_mode(GtkWidget *widge | Line 364  gtk_window_restore_mode(GtkWidget *widge | 
 | } | } | 
 | } | } | 
 |  |  | 
| if (window != NULL) { | if (np2running) { | 
| gtk_window_move(window, orig_x, orig_y); | gtk_window_move(GTK_WINDOW(widget), orig_x, orig_y); | 
 | } | } | 
 |  |  | 
 | XUnlockDisplay(fs_xdisplay); | XUnlockDisplay(fs_xdisplay); |