diff options
Diffstat (limited to 'selbox.c')
-rw-r--r-- | selbox.c | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -1,6 +1,6 @@ #include <ctype.h> -#include "rfb.h" -#include "keysym.h" +#include <rfb/rfb.h> +#include <rfb/keysym.h> typedef struct { rfbScreenInfoPtr screen; @@ -12,9 +12,9 @@ typedef struct { int x1,y1,x2,y2,textH,pageH; int xhot,yhot; int buttonWidth,okBX,cancelBX,okX,cancelX,okY; - Bool okInverted,cancelInverted; + rfbBool okInverted,cancelInverted; int lastButtons; - Pixel colour,backColour; + rfbPixel colour,backColour; SelectionChangedHookPtr selChangedHook; enum { SELECTING, OK, CANCEL } state; } rfbSelectData; @@ -22,11 +22,11 @@ typedef struct { static const char* okStr="OK"; static const char* cancelStr="Cancel"; -static void selPaintButtons(rfbSelectData* m,Bool invertOk,Bool invertCancel) +static void selPaintButtons(rfbSelectData* m,rfbBool invertOk,rfbBool invertCancel) { rfbScreenInfoPtr s = m->screen; - Pixel bcolour = m->backColour; - Pixel colour = m->colour; + rfbPixel bcolour = m->backColour; + rfbPixel colour = m->colour; rfbFillRect(s,m->x1,m->okY-m->textH,m->x2,m->okY,bcolour); @@ -52,7 +52,7 @@ static void selPaintButtons(rfbSelectData* m,Bool invertOk,Bool invertCancel) } /* line is relative to displayStart */ -static void selPaintLine(rfbSelectData* m,int line,Bool invert) +static void selPaintLine(rfbSelectData* m,int line,rfbBool invert) { int y1 = m->y1+line*m->textH, y2 = y1+m->textH; if(y2>m->y2) @@ -122,7 +122,7 @@ static void selSelect(rfbSelectData* m,int _index) /* todo: scrollbars */ } -static void selKbdAddEvent(Bool down,KeySym keySym,rfbClientPtr cl) +static void selKbdAddEvent(rfbBool down,rfbKeySym keySym,rfbClientPtr cl) { if(down) { if(keySym>' ' && keySym<0xff) { @@ -203,7 +203,7 @@ static rfbCursorPtr selGetCursorPtr(rfbClientPtr cl) int rfbSelectBox(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font, char** list, int x1,int y1,int x2,int y2, - Pixel colour,Pixel backColour, + rfbPixel colour,rfbPixel backColour, int border,SelectionChangedHookPtr selChangedHook) { int bpp = rfbScreen->bitsPerPixel/8; |