summaryrefslogtreecommitdiffstats
path: root/x11vnc/scan.c
diff options
context:
space:
mode:
authorrunge <runge>2006-07-04 16:09:22 +0000
committerrunge <runge>2006-07-04 16:09:22 +0000
commita7726a6f970f49c2bedac4926aa30de18d96ae41 (patch)
tree79c23911a3acba751461bcdc3db5d6b59364a433 /x11vnc/scan.c
parent9992160105b0433484bca804d62eb672aff113de (diff)
downloadlibtdevnc-a7726a6f970f49c2bedac4926aa30de18d96ae41.tar.gz
libtdevnc-a7726a6f970f49c2bedac4926aa30de18d96ae41.zip
x11vnc: more -unixpw work. add -license, etc. options
Diffstat (limited to 'x11vnc/scan.c')
-rw-r--r--x11vnc/scan.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/x11vnc/scan.c b/x11vnc/scan.c
index 4dbc47a..05e0aae 100644
--- a/x11vnc/scan.c
+++ b/x11vnc/scan.c
@@ -1294,6 +1294,8 @@ static int copy_tiles(int tx, int ty, int nt) {
char *src, *dst, *s_src, *s_dst, *m_src, *m_dst;
char *h_src, *h_dst;
+ if (unixpw_in_progress) return 0;
+
if (! first_line) {
/* allocate arrays first time in. */
int n = ntiles_x + 1;
@@ -1626,6 +1628,8 @@ static int copy_all_tiles(void) {
int x, y, n, m;
int diffs = 0, ct;
+ if (unixpw_in_progress) return 0;
+
for (y=0; y < ntiles_y; y++) {
for (x=0; x < ntiles_x; x++) {
n = x + y * ntiles_x;
@@ -1672,6 +1676,8 @@ static int copy_all_tile_runs(void) {
int in_run = 0, run = 0;
int ntave = 0, ntcnt = 0;
+ if (unixpw_in_progress) return 0;
+
for (y=0; y < ntiles_y; y++) {
for (x=0; x < ntiles_x + 1; x++) {
n = x + y * ntiles_x;
@@ -1742,6 +1748,8 @@ static int copy_tiles_backward_pass(void) {
int x, y, n, m;
int diffs = 0, ct;
+ if (unixpw_in_progress) return 0;
+
for (y = ntiles_y - 1; y >= 0; y--) {
for (x = ntiles_x - 1; x >= 0; x--) {
n = x + y * ntiles_x; /* number of this tile */
@@ -1783,6 +1791,8 @@ static int copy_tiles_additional_pass(void) {
int x, y, n;
int diffs = 0, ct;
+ if (unixpw_in_progress) return 0;
+
for (y=0; y < ntiles_y; y++) {
for (x=0; x < ntiles_x; x++) {
n = x + y * ntiles_x; /* number of this tile */
@@ -1974,6 +1984,7 @@ int copy_screen(void) {
if (! fs_factor) {
return 0;
}
+
if (unixpw_in_progress) return 0;
block_size = (dpy_x * (dpy_y/fs_factor) * pixelsize);
@@ -2686,6 +2697,9 @@ int scan_for_updates(int count_only) {
*/
old_copy_tile = 0;
}
+
+ if (unixpw_in_progress) return 0;
+
if (old_copy_tile) {
tile_diffs = copy_all_tiles();
} else {