module idle can now my used under windows 2k / XP

This commit is contained in:
Yann Leboulanger 2005-02-15 22:53:54 +00:00
parent 427702e877
commit 43e123e796
2 changed files with 63 additions and 15 deletions

View File

@ -16,26 +16,51 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#ifndef _WIN32
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/extensions/scrnsaver.h> #include <X11/extensions/scrnsaver.h>
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#include <python2.3/Python.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#else
#define _WIN32_WINNT 0x0500
#include <windows.h>
#define EXPORT __declspec(dllexport)
#endif
#include <Python.h>
#ifdef _WIN32
typedef BOOL (WINAPI *GETLASTINPUTINFO)(LASTINPUTINFO *);
static HMODULE g_user32 = NULL;
static GETLASTINPUTINFO g_GetLastInputInfo = NULL;
#endif
static PyObject * idle_init(PyObject *self, PyObject *args) static PyObject * idle_init(PyObject *self, PyObject *args)
{ {
#ifndef _WIN32
gtk_init (NULL, NULL); gtk_init (NULL, NULL);
#else
g_user32 = LoadLibrary("user32.dll");
if (g_user32) {
g_GetLastInputInfo = (GETLASTINPUTINFO)GetProcAddress(g_user32, "GetLastInputInfo");
}
#endif
Py_INCREF(Py_None); Py_INCREF(Py_None);
return Py_None; return Py_None;
} }
static PyObject * idle_getIdleSec(PyObject *self, PyObject *args) static PyObject * idle_getIdleSec(PyObject *self, PyObject *args)
{ {
#ifndef _WIN32
static XScreenSaverInfo *mit_info = NULL; static XScreenSaverInfo *mit_info = NULL;
int idle_time, event_base, error_base; int idle_time, event_base, error_base;
#else
int idle_time = 0;
#endif
#ifndef _WIN32
gtk_init (NULL, NULL); gtk_init (NULL, NULL);
if (XScreenSaverQueryExtension(GDK_DISPLAY(), &event_base, &error_base)) if (XScreenSaverQueryExtension(GDK_DISPLAY(), &event_base, &error_base))
{ {
@ -46,12 +71,28 @@ static PyObject * idle_getIdleSec(PyObject *self, PyObject *args)
} }
else else
idle_time = 0; idle_time = 0;
#else
if (g_GetLastInputInfo != NULL) {
LASTINPUTINFO lii;
memset(&lii, 0, sizeof(lii));
lii.cbSize = sizeof(lii);
if (g_GetLastInputInfo(&lii)) {
idle_time = lii.dwTime;
}
idle_time = (GetTickCount() - idle_time) / 1000;
}
#endif
return Py_BuildValue("i", idle_time); return Py_BuildValue("i", idle_time);
} }
static PyObject * idle_close(PyObject *self, PyObject *args) static PyObject * idle_close(PyObject *self, PyObject *args)
{ {
#ifndef _WIN32
gtk_main_quit (); gtk_main_quit ();
#else
if (g_user32 != NULL)
FreeLibrary(g_user32);
#endif
Py_INCREF(Py_None); Py_INCREF(Py_None);
return Py_None; return Py_None;
} }

View File

@ -17,7 +17,9 @@
## ##
from distutils.core import setup, Extension from distutils.core import setup, Extension
import os
if os.name == 'posix':
module1 = Extension( 'idle', module1 = Extension( 'idle',
sources = ['idle.c'], sources = ['idle.c'],
# extra_compile_args = ['-W'], # extra_compile_args = ['-W'],
@ -25,5 +27,10 @@ module1 = Extension( 'idle',
library_dirs = ['/usr/X11R6/lib'], library_dirs = ['/usr/X11R6/lib'],
include_dirs = ['/usr/include/gtk-2.0', '/usr/include/glib-2.0','/usr/lib/gtk-2.0/include','/usr/lib/glib-2.0/include','/usr/include/pango-1.0','/usr/include/atk-1.0'] include_dirs = ['/usr/include/gtk-2.0', '/usr/include/glib-2.0','/usr/lib/gtk-2.0/include','/usr/lib/glib-2.0/include','/usr/include/pango-1.0','/usr/include/atk-1.0']
) )
elif os.name == 'nt':
module1 = Extension( 'idle',
sources = ['idle.c'],
# extra_compile_args = ['-W'],
)
setup (name = 'idle', version = '1.0', description = 'interface to X11/scrnserver.h', ext_modules = [module1]) setup (name = 'idle', version = '1.0', description = 'interface to X11/scrnserver.h', ext_modules = [module1])