From 27a884d2f3775cf4d97ea8f3d7433cbe2deebbfc Mon Sep 17 00:00:00 2001 From: runge Date: Tue, 21 Nov 2006 22:16:23 +0000 Subject: x11vnc: Mac OS X fb fixes and cuttext, -nodpms option, local user wireframing --- x11vnc/win_utils.c | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) (limited to 'x11vnc/win_utils.c') diff --git a/x11vnc/win_utils.c b/x11vnc/win_utils.c index aab05e7..c1da920 100644 --- a/x11vnc/win_utils.c +++ b/x11vnc/win_utils.c @@ -18,6 +18,8 @@ Bool xtranslate(Window src, Window dst, int src_x, int src_y, int *dst_x, int *dst_y, Window *child, int bequiet); int get_window_size(Window win, int *x, int *y); void snapshot_stack_list(int free_only, double allowed_age); +int get_boff(void); +int get_bwin(void); void update_stack_list(void); Window query_pointer(Window start); unsigned int mask_state(void); @@ -78,11 +80,12 @@ int valid_window(Window win, XWindowAttributes *attr_ret, int bequiet) { return 0; } #ifdef MACOSX - if (! dpy) { + if (macosx_console) { return macosx_valid_window(win, attr_ret); } #endif RAWFB_RET(0) + #if NO_X11 nox11_exit(1); return 0; @@ -184,9 +187,14 @@ void snapshot_stack_list(int free_only, double allowed_age) { stack_list_num = 0; last_free = now; -#ifndef MACOSX +#ifdef MACOSX + if (! macosx_console) { + RAWFB_RET_VOID + } +#else RAWFB_RET_VOID #endif + #if NO_X11 && !defined(MACOSX) return; #else @@ -220,13 +228,7 @@ void snapshot_stack_list(int free_only, double allowed_age) { j++; } for (i=0; i