Merge pull request #124 from bschaef14/rawfb-doublebuffer-support

Support for double buffered raw framebuffers Closes#106

Author: bk138

README

@@ -16858,22 +16858,33 @@ er
  discussion below where the framebuffer is taken as that
  of another remote VNC server.
 
- Optional suffixes are ":R/G/B" and "+O" to specify
- red, green, and blue masks (in hex) and an offset into
- the memory object. If the masks are not provided x11vnc
- guesses them based on the bpp (if the colors look wrong,
- you need to provide the masks.)
+ Optional suffixes are ":R/G/B", "+O", and "#VWxVH" to
+ specify red, green, and blue masks (in hex), offset into
+ the memory object, and virtual width and height.
+
+ If the masks are not provided x11vnc guesses them based on
+ the bpp (if the colors look wrong, you need to provide the
+ masks.)
 
  Another optional suffix is the Bytes Per Line which in
  some cases is not WxB/8. Specify it as WxHxB-BPL
  e.g. 800x600x16-2048. This could be a normal width
  1024 at 16bpp fb, but only width 800 shows up.
 
- So the full format is: mode:file@WxHxB:R/G/B+O-BPL
+ The last optional suffix is virtual dimensions VWxVH. Some
+ devices will double buffer the display in the framebuffer,
+ allowing updating contents of display and then "panning"
+ to the buffer via yoffset. x11vnc will map the virutal
+ size specified by the options stead of just WxH, and track
+ yoffset appropriately so remote clients get all updates to
+ the frame buffer.
+
+ So the full format is: mode:file@WxHxB:R/G/B+O-BPL#VWxVH
 
  Examples:
  -rawfb shm:210337933@800x600x32:ff/ff00/ff0000
  -rawfb map:/dev/fb0@1024x768x32
+ -rawfb map:/dev/fb0@800x480x16#800x960
  -rawfb map:/tmp/Xvfb_screen0@640x480x8+3232
  -rawfb file:/tmp/my.pnm@250x200x24+37
  -rawfb file:/dev/urandom@128x128x8

src/linuxfb.c

@@ -53,9 +53,31 @@ so, delete this exception statement from your version.
 char*console_guess(char*str, int*fd);
 voidconsole_key_command(rfbBooldown, rfbKeySymkeysym, rfbClientPtrclient);
 voidconsole_pointer_command(intmask, intx, inty, rfbClientPtrclient);
+voidlinux_dev_fb_msg(char*);
 
+/* Returns offset into fb memory based on yoffset. */
+intrawfb_get_offset(int*fd)
+{
+#ifHAVE_LINUX_FB_H
+intoffset;
+structfb_var_screeninfovar_info;
+if (ioctl(*fd, FBIOGET_VSCREENINFO, &var_info)){
+perror("ioctl");
+return0;
+ }
 
-voidlinux_dev_fb_msg(char*);
+/* todo: How should x offset be handled? */
+if (var_info.xoffset!=0){
+rfbLog("rawfb xoffset handling not implemented");
+ }
+
+if (var_info.yoffset!=0){
+offset=main_bytes_per_line*var_info.yoffset;
+returnoffset;
+ }
+#endif
+return0;
+}
 
 char*console_guess(char*str, int*fd){
 char*q, *in=strdup(str);

src/linuxfb.h

@@ -37,6 +37,7 @@ so, delete this exception statement from your version.
 externchar*console_guess(char*str, int*fd);
 externvoidconsole_key_command(rfbBooldown, rfbKeySymkeysym, rfbClientPtrclient);
 externvoidconsole_pointer_command(intmask, intx, inty, rfbClientPtrclient);
+externintrawfb_get_offset(int*fd);
 
 
 #endif/* _X11VNC_LINUXFB_H */

src/screen.c

@@ -109,6 +109,7 @@ static int choose_delay(double dt);
 intrawfb_reset=-1;
 intrawfb_dev_video=0;
 intrawfb_vnc_reflect=0;
+intrawfb_double_buffer=0;
 
 /*
  * X11 and rfb display/screen related routines
@@ -1942,14 +1943,25 @@ if (db) fprintf(stderr, "initialize_raw_fb reset\n");
 
 
 /* +O offset */
+char*end;
 if ((q=strrchr(str, '+')) !=NULL){
-if (sscanf(q, "+%d", &raw_fb_offset) ==1){
-*q='\0';
- } else{
+end=q;
+if (sscanf(q, "+%d", &raw_fb_offset) !=1){
 raw_fb_offset=0;
  }
  }
-/* :R/G/B masks */
+
+/* #VWxVH virtual dimensions */
+if ((q=strrchr(str, '#')) !=NULL){
+if (q<end) end=q;
+if (sscanf(q, "#%dx%d", &raw_fb_virt_x, &raw_fb_virt_y) !=2){
+raw_fb_virt_x=0;
+raw_fb_virt_y=0;
+ }
+ }
+
+if (end!=NULL) *end='\0';
+
 if ((q=strrchr(str, ':')) !=NULL){
 if (sscanf(q, ":%lx/%lx/%lx", &rm, &gm, &bm) ==3){
 *q='\0';
@@ -2138,7 +2150,7 @@ if (db) fprintf(stderr, "initialize_raw_fb reset\n");
  } elseif (strstr(str, "map:") ==str||strstr(str, "mmap:") ==str
 ||strstr(str, "file:") ==str){
 /* map:/path/... or file:/path */
-intfd, do_mmap=1, size;
+intfd, do_mmap=1, size, vsize;
 structstatsbuf;
 
 if (*str=='f'){
@@ -2178,9 +2190,15 @@ if (db) fprintf(stderr, "initialize_raw_fb reset\n");
 size=w*h*raw_fb_native_bpp/8+raw_fb_offset;
  } elseif (xform24to32){
 size=w*h*24/8+raw_fb_offset;
+ } elseif (raw_fb_virt_x!=0&&raw_fb_virt_y!=0){
+size=w*h*b/8;
+vsize=raw_fb_virt_x*raw_fb_virt_y*b/8;
+rawfb_double_buffer=1;
+rfbLog("virtual size: %d", vsize);
  } else{
 size=w*h*b/8+raw_fb_offset;
  }
+
 if (fstat(fd, &sbuf) ==0){
 if (S_ISREG(sbuf.st_mode)){
 if (0) size=sbuf.st_size;
@@ -2205,8 +2223,11 @@ if (db) fprintf(stderr, "initialize_raw_fb reset\n");
 
  } elseif (do_mmap){
 #ifLIBVNCSERVER_HAVE_MMAP
-raw_fb_addr=mmap(0, size, PROT_READ, MAP_SHARED,
-fd, 0);
+if (vsize!=0){
+raw_fb_addr=mmap(0, vsize, PROT_READ, MAP_SHARED, fd, 0);
+ } else{
+raw_fb_addr=mmap(0, size, PROT_READ, MAP_SHARED, fd, 0);
+ }
 
 if (raw_fb_addr==MAP_FAILED||raw_fb_addr==NULL){
 rfbLogEnable(1);
@@ -2223,8 +2244,13 @@ if (db) fprintf(stderr, "initialize_raw_fb reset\n");
 raw_fb_mmap=size;
 
 rfbLog("rawfb: mmap file: %s\n", q);
-rfbLog(" w: %d h: %d b: %d addr: %p sz: %d\n", w, h,
-b, raw_fb_addr, size);
+if (vsize!=0){
+rfbLog(" w: %d h: %d b: %d addr: %p sz: %d\n", w, h,
+b, raw_fb_addr, vsize);
+ } else{
+rfbLog(" w: %d h: %d b: %d addr: %p sz: %d\n", w, h,
+b, raw_fb_addr, size);
+ }
 last_mode=RAWFB_MMAP;
  }
 #else
@@ -4652,6 +4678,12 @@ void watch_loop(void){
 /* Now, for scanning and drawing soft cursors (i.e. writing to the framebuffer),
  make sure we're not sending any updates to clients (i.e. reading the framebuffer).
  Otherwise we get flicker! */
+
+/* Update offset in case local framebuffer is double buffered */
+if (rawfb_double_buffer){
+raw_fb_offset=rawfb_get_offset(&raw_fb_fd);
+ }
+
 if(use_threads){
 rfbClientPtrcl;
 rfbClientIteratorPtriter=rfbGetClientIterator(screen);

src/x11vnc.h

@@ -541,6 +541,8 @@ extern char *rot_fb; /* used under -rotate */
 externchar*raw_fb;
 externchar*raw_fb_addr;
 externintraw_fb_offset;
+externintraw_fb_virt_x;
+externintraw_fb_virt_y;
 externintraw_fb_shm;
 externintraw_fb_mmap;
 externintraw_fb_seek;

src/x11vnc_defs.c

@@ -105,6 +105,8 @@ char *rot_fb = NULL;
 char*raw_fb=NULL; /* when used should be main_fb */
 char*raw_fb_addr=NULL;
 intraw_fb_offset=0;
+intraw_fb_virt_x=0;
+intraw_fb_virt_y=0;
 intraw_fb_shm=0;
 intraw_fb_mmap=0;
 intraw_fb_seek=0;