diff options
| author | runge <runge@karlrunge.com> | 2010-09-10 14:26:58 -0400 |
|---|---|---|
| committer | runge <runge@karlrunge.com> | 2010-09-10 14:26:58 -0400 |
| commit | 067a88160c994e364ebb23900228633b84f99e91 (patch) | |
| tree | af2b04b5a044482e35fce85bc48b5504f5e8a2ea /x11vnc/x11vnc.c | |
| parent | ad254469783b4720db64d8ebeeb12aeb0533e542 (diff) | |
| download | libtdevnc-067a88160c994e364ebb23900228633b84f99e91.tar.gz libtdevnc-067a88160c994e364ebb23900228633b84f99e91.zip | |
update to x11vnc 0.9.12
Diffstat (limited to 'x11vnc/x11vnc.c')
| -rw-r--r-- | x11vnc/x11vnc.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/x11vnc/x11vnc.c b/x11vnc/x11vnc.c index 96238b6..3f965e2 100644 --- a/x11vnc/x11vnc.c +++ b/x11vnc/x11vnc.c @@ -992,6 +992,9 @@ static int limit_shm(void) { if (UT.sysname == NULL) { return 0; } + if (getenv("X11VNC_NO_LIMIT_SHM")) { + return 0; + } if (!strcmp(UT.sysname, "SunOS")) { char *r = UT.release; if (*r == '5' && *(r+1) == '.') { @@ -1554,6 +1557,7 @@ static void print_settings(int try_http, int bg, char *gui_str) { fprintf(stderr, " cursorshape:%d\n", cursor_shape_updates); fprintf(stderr, " cursorpos: %d\n", cursor_pos_updates); fprintf(stderr, " xwarpptr: %d\n", use_xwarppointer); + fprintf(stderr, " alwaysinj: %d\n", always_inject); fprintf(stderr, " buttonmap: %s\n", pointer_remap ? pointer_remap : "null"); fprintf(stderr, " dragging: %d\n", show_dragging); @@ -2280,7 +2284,7 @@ int main(int argc, char* argv[]) { } if (!strcmp(arg, "-reflect")) { CHECK_ARGC - raw_fb_str = (char *) malloc(4 + strlen(argv[i]) + 1); + raw_fb_str = (char *) malloc(4 + strlen(argv[i+1]) + 1); sprintf(raw_fb_str, "vnc:%s", argv[++i]); shared = 1; continue; @@ -3397,6 +3401,10 @@ int main(int argc, char* argv[]) { got_noxwarppointer = 1; continue; } + if (!strcmp(arg, "-always_inject")) { + always_inject = 1; + continue; + } if (!strcmp(arg, "-buttonmap")) { CHECK_ARGC pointer_remap = strdup(argv[++i]); |