| 1 |
swegener 10/08/28 10:31:14 |
| 2 |
|
| 3 |
Added: x11vnc-0.9.11-rename-pointer.patch |
| 4 |
Log: |
| 5 |
Version bump, bug #334483. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 x11-misc/x11vnc/files/x11vnc-0.9.11-rename-pointer.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/x11vnc/files/x11vnc-0.9.11-rename-pointer.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/x11vnc/files/x11vnc-0.9.11-rename-pointer.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: x11vnc-0.9.11-rename-pointer.patch |
| 15 |
=================================================================== |
| 16 |
From 8307143230b877b5e6ce1a667c977f7de6a465ce Mon Sep 17 00:00:00 2001 |
| 17 |
From: Johannes Schindelin <johannes.schindelin@×××.de> |
| 18 |
Date: Thu, 12 Aug 2010 14:27:41 +0200 |
| 19 |
Subject: [PATCH 1/1] Rename pointer() to do_pointer() to fix bug 3043646 |
| 20 |
|
| 21 |
[contains compile fixes by fk hp] |
| 22 |
|
| 23 |
Signed-off-by: Johannes Schindelin <johannes.schindelin@×××.de> |
| 24 |
--- |
| 25 |
x11vnc/connections.c | 2 +- |
| 26 |
x11vnc/keyboard.c | 4 ++-- |
| 27 |
x11vnc/pointer.c | 24 ++++++++++++------------ |
| 28 |
x11vnc/pointer.h | 2 +- |
| 29 |
x11vnc/remote.c | 6 +++--- |
| 30 |
x11vnc/scan.c | 4 ++-- |
| 31 |
x11vnc/screen.c | 2 +- |
| 32 |
x11vnc/userinput.c | 8 ++++---- |
| 33 |
8 files changed, 26 insertions(+), 26 deletions(-) |
| 34 |
|
| 35 |
diff --git a/x11vnc/connections.c b/x11vnc/connections.c |
| 36 |
index d1af60e..5dd80ba 100644 |
| 37 |
--- a/x11vnc/connections.c |
| 38 |
+++ b/x11vnc/connections.c |
| 39 |
@@ -3149,7 +3149,7 @@ static void pmove(int x, int y) { |
| 40 |
return; |
| 41 |
} |
| 42 |
rfbLog("pmove: x y: %d %d\n", x, y); |
| 43 |
- pointer(0, x, y, NULL); |
| 44 |
+ do_pointer(0, x, y, NULL); |
| 45 |
X_LOCK; |
| 46 |
XFlush_wr(dpy); |
| 47 |
X_UNLOCK; |
| 48 |
diff --git a/x11vnc/keyboard.c b/x11vnc/keyboard.c |
| 49 |
index edce680..212c8e8 100644 |
| 50 |
--- a/x11vnc/keyboard.c |
| 51 |
+++ b/x11vnc/keyboard.c |
| 52 |
@@ -2898,9 +2898,9 @@ static void pipe_keyboard(rfbBool down, rfbKeySym keysym, rfbClientPtr client) { |
| 53 |
t[1] = '\0'; |
| 54 |
if (sscanf(t, "%d", &butt) == 1) { |
| 55 |
mask = 1<<(butt-1); |
| 56 |
- pointer(mask, x, y, client); |
| 57 |
+ do_pointer(mask, x, y, client); |
| 58 |
mask = 0; |
| 59 |
- pointer(mask, x, y, client); |
| 60 |
+ do_pointer(mask, x, y, client); |
| 61 |
} |
| 62 |
b++; |
| 63 |
} |
| 64 |
diff --git a/x11vnc/pointer.c b/x11vnc/pointer.c |
| 65 |
index 097a43c..0c42dc8 100644 |
| 66 |
--- a/x11vnc/pointer.c |
| 67 |
+++ b/x11vnc/pointer.c |
| 68 |
@@ -54,7 +54,7 @@ int pointer_queued_sent = 0; |
| 69 |
|
| 70 |
void initialize_pointer_map(char *pointer_remap); |
| 71 |
void do_button_mask_change(int mask, int button); |
| 72 |
-void pointer(int mask, int x, int y, rfbClientPtr client); |
| 73 |
+void do_pointer(int mask, int x, int y, rfbClientPtr client); |
| 74 |
void initialize_pipeinput(void); |
| 75 |
int check_pipeinput(void); |
| 76 |
void update_x11_pointer_position(int x, int y); |
| 77 |
@@ -417,7 +417,7 @@ void do_button_mask_change(int mask, int button) { |
| 78 |
continue; |
| 79 |
} |
| 80 |
if (debug_pointer) { |
| 81 |
- rfbLog("pointer(): sending button %d" |
| 82 |
+ rfbLog("do_pointer(): sending button %d" |
| 83 |
" %s (event %d)\n", mb, bmask |
| 84 |
? "down" : "up", k+1); |
| 85 |
} |
| 86 |
@@ -436,7 +436,7 @@ void do_button_mask_change(int mask, int button) { |
| 87 |
if (debug_pointer && dpy) { |
| 88 |
char *str = XKeysymToString(XKeycodeToKeysym( |
| 89 |
dpy, key, 0)); |
| 90 |
- rfbLog("pointer(): sending button %d " |
| 91 |
+ rfbLog("do_pointer(): sending button %d " |
| 92 |
"down as keycode 0x%x (event %d)\n", |
| 93 |
i+1, key, k+1); |
| 94 |
rfbLog(" down=%d up=%d keysym: " |
| 95 |
@@ -569,7 +569,7 @@ if (debug_scroll > 1) fprintf(stderr, "internal scrollbar: %dx%d\n", w, h); |
| 96 |
for (i=0; i < MAX_BUTTONS; i++) { |
| 97 |
if ( (button_mask & (1<<i)) != (mask & (1<<i)) ) { |
| 98 |
if (debug_pointer) { |
| 99 |
- rfbLog("pointer(): mask change: mask: 0x%x -> " |
| 100 |
+ rfbLog("do_pointer(): mask change: mask: 0x%x -> " |
| 101 |
"0x%x button: %d\n", button_mask, mask,i+1); |
| 102 |
} |
| 103 |
do_button_mask_change(mask, i+1); /* button # is i+1 */ |
| 104 |
@@ -668,7 +668,7 @@ static void pipe_pointer(int mask, int x, int y, rfbClientPtr client) { |
| 105 |
* This may queue pointer events rather than sending them immediately |
| 106 |
* to the X server. (see update_x11_pointer*()) |
| 107 |
*/ |
| 108 |
-void pointer(int mask, int x, int y, rfbClientPtr client) { |
| 109 |
+void do_pointer(int mask, int x, int y, rfbClientPtr client) { |
| 110 |
allowed_input_t input; |
| 111 |
int sent = 0, buffer_it = 0; |
| 112 |
double now; |
| 113 |
@@ -698,7 +698,7 @@ void pointer(int mask, int x, int y, rfbClientPtr client) { |
| 114 |
dt = tnow - last_pointer; |
| 115 |
last_pointer = tnow; |
| 116 |
if (show_motion) { |
| 117 |
- rfbLog("# pointer(mask: 0x%x, x:%4d, y:%4d) " |
| 118 |
+ rfbLog("# do_pointer(mask: 0x%x, x:%4d, y:%4d) " |
| 119 |
"dx: %3d dy: %3d dt: %.4f t: %.4f\n", mask, x, y, |
| 120 |
x - last_x, y - last_y, dt, tnow); |
| 121 |
} |
| 122 |
@@ -789,7 +789,7 @@ void pointer(int mask, int x, int y, rfbClientPtr client) { |
| 123 |
} |
| 124 |
if (! ok) { |
| 125 |
if (debug_pointer) { |
| 126 |
- rfbLog("pointer(): blackout_ptr skipping " |
| 127 |
+ rfbLog("do_pointer(): blackout_ptr skipping " |
| 128 |
"x=%d y=%d in rectangle %d,%d %d,%d\n", x, y, |
| 129 |
blackr[b].x1, blackr[b].y1, |
| 130 |
blackr[b].x2, blackr[b].y2); |
| 131 |
@@ -860,7 +860,7 @@ void pointer(int mask, int x, int y, rfbClientPtr client) { |
| 132 |
ev[i][2] = -1; |
| 133 |
} |
| 134 |
if (debug_pointer) { |
| 135 |
- rfbLog("pointer(): deferring event %d" |
| 136 |
+ rfbLog("do_pointer(): deferring event %d" |
| 137 |
" %.4f\n", i, tmr - x11vnc_start); |
| 138 |
} |
| 139 |
POINTER_UNLOCK; |
| 140 |
@@ -883,7 +883,7 @@ void pointer(int mask, int x, int y, rfbClientPtr client) { |
| 141 |
} |
| 142 |
} |
| 143 |
if (debug_pointer) { |
| 144 |
- rfbLog("pointer(): sending event %d %.4f\n", |
| 145 |
+ rfbLog("do_pointer(): sending event %d %.4f\n", |
| 146 |
i+1, dnowx()); |
| 147 |
} |
| 148 |
if (ev[i][1] >= 0) { |
| 149 |
@@ -903,7 +903,7 @@ void pointer(int mask, int x, int y, rfbClientPtr client) { |
| 150 |
if (dpy) { /* raw_fb hack */ |
| 151 |
if (mask < 0) { |
| 152 |
if (debug_pointer) { |
| 153 |
- rfbLog("pointer(): calling XFlush " |
| 154 |
+ rfbLog("do_pointer(): calling XFlush " |
| 155 |
"%.4f\n", dnowx()); |
| 156 |
} |
| 157 |
X_LOCK; |
| 158 |
@@ -920,7 +920,7 @@ void pointer(int mask, int x, int y, rfbClientPtr client) { |
| 159 |
} |
| 160 |
if (mask < 0) { /* -1 just means flush the event queue */ |
| 161 |
if (debug_pointer) { |
| 162 |
- rfbLog("pointer(): flush only. %.4f\n", |
| 163 |
+ rfbLog("do_pointer(): flush only. %.4f\n", |
| 164 |
dnowx()); |
| 165 |
} |
| 166 |
INPUT_UNLOCK; |
| 167 |
@@ -953,7 +953,7 @@ void pointer(int mask, int x, int y, rfbClientPtr client) { |
| 168 |
X_UNLOCK; |
| 169 |
} else if (buffer_it) { |
| 170 |
if (debug_pointer) { |
| 171 |
- rfbLog("pointer(): calling XFlush+" |
| 172 |
+ rfbLog("do_pointer(): calling XFlush+" |
| 173 |
"%.4f\n", dnowx()); |
| 174 |
} |
| 175 |
X_LOCK; |
| 176 |
diff --git a/x11vnc/pointer.h b/x11vnc/pointer.h |
| 177 |
index 558f381..56f659c 100644 |
| 178 |
--- a/x11vnc/pointer.h |
| 179 |
+++ b/x11vnc/pointer.h |
| 180 |
@@ -39,7 +39,7 @@ extern int pointer_queued_sent; |
| 181 |
|
| 182 |
extern void initialize_pointer_map(char *pointer_remap); |
| 183 |
extern void do_button_mask_change(int mask, int button); |
| 184 |
-extern void pointer(int mask, int x, int y, rfbClientPtr client); |
| 185 |
+extern void do_pointer(int mask, int x, int y, rfbClientPtr client); |
| 186 |
extern int check_pipeinput(void); |
| 187 |
extern void initialize_pipeinput(void); |
| 188 |
extern void update_x11_pointer_position(int x, int y); |
| 189 |
diff --git a/x11vnc/remote.c b/x11vnc/remote.c |
| 190 |
index 6b2903b..dfa9aa4 100644 |
| 191 |
--- a/x11vnc/remote.c |
| 192 |
+++ b/x11vnc/remote.c |
| 193 |
@@ -4426,9 +4426,9 @@ char *process_remote_cmd(char *cmd, int stringonly) { |
| 194 |
p += strlen("ptr:"); |
| 195 |
rfbLog("remote_cmd: insert pointer event: %s\n", p); |
| 196 |
if (sscanf(p, "%d,%d,%d", &x, &y, &m) == 3) { |
| 197 |
- pointer(m, x, y, NULL); |
| 198 |
+ do_pointer(m, x, y, NULL); |
| 199 |
} else if (sscanf(p, "%d,%d", &x, &y) == 2) { |
| 200 |
- pointer(m, x, y, NULL); |
| 201 |
+ do_pointer(m, x, y, NULL); |
| 202 |
} else { |
| 203 |
rfbLog("remote_cmd: bad ptr:x,y,mask\n"); |
| 204 |
} |
| 205 |
@@ -4593,7 +4593,7 @@ char *process_remote_cmd(char *cmd, int stringonly) { |
| 206 |
} else if (strstr(res, "GRAB_FAIL") && try < max_tries) { |
| 207 |
rfbLog("bcx_xattach: failed grab check for '%s': %s. Retrying[%d]...\n", p, res, try); |
| 208 |
free(res); |
| 209 |
- pointer(0, dpy_x/2 + try, dpy_y/2 + try, NULL); |
| 210 |
+ do_pointer(0, dpy_x/2 + try, dpy_y/2 + try, NULL); |
| 211 |
#if !NO_X11 |
| 212 |
X_LOCK; |
| 213 |
XFlush_wr(dpy); |
| 214 |
diff --git a/x11vnc/scan.c b/x11vnc/scan.c |
| 215 |
index 7ef931c..23121f7 100644 |
| 216 |
--- a/x11vnc/scan.c |
| 217 |
+++ b/x11vnc/scan.c |
| 218 |
@@ -3550,7 +3550,7 @@ int scan_for_updates(int count_only) { |
| 219 |
fb_copy_in_progress = 0; |
| 220 |
SCAN_FATAL(cs); |
| 221 |
if (use_threads && pointer_mode != 1) { |
| 222 |
- pointer(-1, 0, 0, NULL); |
| 223 |
+ do_pointer(-1, 0, 0, NULL); |
| 224 |
} |
| 225 |
nap_check(tile_count); |
| 226 |
return tile_count; |
| 227 |
@@ -3637,7 +3637,7 @@ if (tile_count) fprintf(stderr, "XX copytile: %.4f tile_count: %d\n", dnow() - |
| 228 |
* tell the pointer handler it can process any queued |
| 229 |
* pointer events: |
| 230 |
*/ |
| 231 |
- pointer(-1, 0, 0, NULL); |
| 232 |
+ do_pointer(-1, 0, 0, NULL); |
| 233 |
} |
| 234 |
|
| 235 |
if (blackouts) { |
| 236 |
diff --git a/x11vnc/screen.c b/x11vnc/screen.c |
| 237 |
index c41774c..5988ace 100644 |
| 238 |
--- a/x11vnc/screen.c |
| 239 |
+++ b/x11vnc/screen.c |
| 240 |
@@ -3538,7 +3538,7 @@ void initialize_screen(int *argc, char **argv, XImage *fb) { |
| 241 |
/* event callbacks: */ |
| 242 |
screen->newClientHook = new_client; |
| 243 |
screen->kbdAddEvent = keyboard; |
| 244 |
- screen->ptrAddEvent = pointer; |
| 245 |
+ screen->ptrAddEvent = do_pointer; |
| 246 |
screen->setXCutText = xcut_receive; |
| 247 |
screen->setTranslateFunction = set_xlate_wrapper; |
| 248 |
|
| 249 |
diff --git a/x11vnc/userinput.c b/x11vnc/userinput.c |
| 250 |
index 8c83080..b4cb8fa 100644 |
| 251 |
--- a/x11vnc/userinput.c |
| 252 |
+++ b/x11vnc/userinput.c |
| 253 |
@@ -3008,12 +3008,12 @@ if (db) fprintf(stderr, "check_xrecord: BUTTON-UP-KEEP-GOING: %.3f/%.3f %d/%d % |
| 254 |
pointer_queued_sent = 0; |
| 255 |
last_x = cursor_x; |
| 256 |
last_y = cursor_y; |
| 257 |
- pointer(-1, 0, 0, NULL); |
| 258 |
+ do_pointer(-1, 0, 0, NULL); |
| 259 |
pointer_flush_delay = 0.0; |
| 260 |
|
| 261 |
if (xrecording && pointer_queued_sent && button_mask_save && |
| 262 |
(last_x != cursor_x || last_y != cursor_y) ) { |
| 263 |
-if (db) fprintf(stderr, " pointer() push yields events on: ret=%d\n", ret); |
| 264 |
+if (db) fprintf(stderr, " do_pointer() push yields events on: ret=%d\n", ret); |
| 265 |
if (ret == 2) { |
| 266 |
if (db) fprintf(stderr, " we decide to send ret=3\n"); |
| 267 |
want_back_in = 1; |
| 268 |
@@ -4509,7 +4509,7 @@ if (db) fprintf(stderr, "INTERIOR\n"); |
| 269 |
} |
| 270 |
|
| 271 |
/* |
| 272 |
- * pointer() should have snapped the stacking list for us, if |
| 273 |
+ * do_pointer() should have snapped the stacking list for us, if |
| 274 |
* not, do it now (if the XFakeButtonEvent has been flushed by |
| 275 |
* now the stacking order may be incorrect). |
| 276 |
*/ |
| 277 |
@@ -4565,7 +4565,7 @@ if (db) fprintf(stderr, "INTERIOR\n"); |
| 278 |
/* -threads support for check_wireframe() is rough... crash? */ |
| 279 |
if (use_threads) { |
| 280 |
/* purge any stored up pointer events: */ |
| 281 |
- pointer(-1, 0, 0, NULL); |
| 282 |
+ do_pointer(-1, 0, 0, NULL); |
| 283 |
} |
| 284 |
|
| 285 |
if (cursor_noshape_updates_clients(screen)) { |
| 286 |
-- |
| 287 |
1.6.3 |
Archives