Skip to content

L
libvncserver
Commit 94f04a86 authored by dscho's avatar dscho
Browse files
Options

fix cursor bug; missing keysym; fix align problem on SGI; clean up cursor.c 

clean up rfb.h a bit; endian issues
parent cb3b9c77
Hide whitespace changes
Inline Side-by-side
Showing with 1868 additions and 260 deletions
Makefile
View file @ 94f04a86
......@@ -28,6 +28,8 @@ OBJS=main.o rfbserver.o miregion.o auth.o sockets.o xalloc.o \
all: example pnmshow storepasswd
$(OBJS): rfb.h
install_OSX: OSXvnc-server
cp OSXvnc-server storepasswd ../OSXvnc/build/OSXvnc.app/Contents/MacOS
......
TODO
View file @ 94f04a86
fix bug with odd width
immediate:
----------
fix bug with odd width (depends on client depth: width has to be multiple of server.bytesPerPixel/client.bytesPerPixel). only raw!!
fix bug in http (java) client with big endian server: byte swapping is broken
in the works:
-------------
adapt rdp2vnc (rdesktop)
dont draw rich cursors as xcursors
optionally dont draw rich cursors as xcursors
later:
------
udp
rfbCloseClient, rfbConnect, ConnectToTcpAddr
CORBA
translate.c: warning about non 8-bit colourmaps
set colourmap
documentation
done:
-----
.cursors
.cutpaste
......
cursor.c
View file @ 94f04a86
......@@ -22,53 +22,8 @@
* USA.
*/
#include <stdio.h>
#include "rfb.h"
/*
#include "mipointer.h"
#include "sprite.h"
#include "cursorstr.h"
#include "servermd.h"
*/
/* Copied from Xvnc/lib/font/util/utilbitmap.c */
static unsigned char _reverse_byte[0x100] = {
0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff
};
/*
* Send cursor shape either in X-style format or in client pixel format.
*/
......@@ -98,12 +53,6 @@ rfbSendCursorShape(cl)
rect.encoding = Swap32IfLE(rfbEncodingXCursor);
}
/*{
rfbScreenInfoPtr s=cl->screen;
SetXCutTextProcPtr sx=cl->screen->setXCutText;
GetCursorProcPtr g=cl->screen->getCursorPtr;
}*/
/* If there is no cursor, send update with empty cursor data. */
if ( pCursor->width == 1 &&
......@@ -228,7 +177,43 @@ rfbSendCursorShape(cl)
return TRUE;
}
/* if you have a cursor in LSB order you have to convert it */
/* conversion routine for predefined cursors in LSB order */
static unsigned char _reverse_byte[0x100] = {
/* copied from Xvnc/lib/font/util/utilbitmap.c */
0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff
};
void rfbConvertLSBCursorBitmapOrMask(int width,int height,unsigned char* bitmap)
{
int i,t=(width+7)/8*height;
......@@ -236,6 +221,8 @@ void rfbConvertLSBCursorBitmapOrMask(int width,int height,unsigned char* bitmap)
bitmap[i]=_reverse_byte[(int)bitmap[i]];
}
/* Cursor creation. You "paint" a cursor and let these routines do the work */
rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* maskString)
{
int i,j,w=(width+7)/8;
......@@ -347,6 +334,8 @@ void MakeRichCursorFromXCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr cursor)
else memcpy(cp,back,bpp);
}
/* functions to draw/hide cursor directly in the frame buffer */
void rfbUndrawCursor(rfbClientPtr cl)
{
rfbScreenInfoPtr s=cl->screen;
......@@ -396,12 +385,12 @@ void rfbDrawCursor(rfbClientPtr cl)
x2=x1+c->width;
if(x1<0) { i1=-x1; x1=0; }
if(x2>=s->width) x2=s->width-1;
x2-=x1;
x2-=x1; if(x2<=0) return; /* nothing to do */
y1=s->cursorY-c->yhot;
y2=y1+c->height;
if(y1<0) { j1=-y1; y1=0; }
if(y2>=s->height) y2=s->height-1;
y2-=y1;
y2-=y1; if(y2<=0) return; /* nothing to do */
for(j=0;j<y2;j++)
memcpy(s->underCursorBuffer+j*x2*bpp,
s->frameBuffer+(y1+j)*rowstride+x1*bpp,
......@@ -421,6 +410,8 @@ void rfbDrawCursor(rfbClientPtr cl)
s->cursorIsDrawn = TRUE;
}
/* for debugging */
void rfbPrintXCursor(rfbCursorPtr cursor)
{
int i,i1,j,w=(cursor->width+7)/8;
......
example.c
View file @ 94f04a86
......@@ -30,7 +30,7 @@
#include "rfb.h"
#include "keysym.h"
const int maxx=640, maxy=480, bpp=4;
const int maxx=641, maxy=480, bpp=4;
/* TODO: odd maxx doesn't work */
/* This initializes a nice (?) background */
......@@ -40,9 +40,9 @@ void initBuffer(unsigned char* buffer)
int i,j;
for(i=0;i<maxx;++i)
for(j=0;j<maxy;++j) {
buffer[(j*maxx+i)*bpp+1]=(i+j)*128/(maxx+maxy); /* red */
buffer[(j*maxx+i)*bpp+2]=i*128/maxx; /* green */
buffer[(j*maxx+i)*bpp+3]=j*256/maxy; /* blue */
buffer[(j*maxx+i)*bpp+0]=(i+j)*128/(maxx+maxy); /* red */
buffer[(j*maxx+i)*bpp+1]=i*128/maxx; /* green */
buffer[(j*maxx+i)*bpp+2]=j*256/maxy; /* blue */
}
}
......@@ -65,6 +65,7 @@ void newclient(rfbClientPtr cl)
}
/* aux function to draw a line */
void drawline(unsigned char* buffer,int rowstride,int bpp,int x1,int y1,int x2,int y2)
{
int i,j;
......@@ -194,15 +195,15 @@ void dokey(Bool down,KeySym key,rfbClientPtr cl)
if(key==XK_Escape)
rfbCloseClient(cl);
else if(key==XK_Page_Up) {
//if(cl->screen->cursorIsDrawn)
//rfbUndrawCursor(cl);
if(cl->screen->cursorIsDrawn)
rfbUndrawCursor(cl);
initBuffer(cl->screen->frameBuffer);
rfbMarkRectAsModified(cl->screen,0,0,maxx,maxy);
} else if(key>=' ' && key<0x100) {
ClientData* cd=cl->clientData;
int x1=cd->oldx,y1=cd->oldy,x2,y2;
//if(cl->screen->cursorIsDrawn)
//rfbUndrawCursor(cl);
if(cl->screen->cursorIsDrawn)
rfbUndrawCursor(cl);
cd->oldx+=drawchar(cl->screen->frameBuffer,
cl->screen->paddedWidthInBytes,bpp,cd->oldx,cd->oldy,
key);
......@@ -212,10 +213,10 @@ void dokey(Bool down,KeySym key,rfbClientPtr cl)
}
}
/*
extern void rfbPrintXCursor(rfbCursorPtr cursor);
int exampleCursorWidth=9,exampleCursorHeight=7;
char exampleCursor[]=
/* Example for an XCursor (foreground/background only) */
int exampleXCursorWidth=9,exampleXCursorHeight=7;
char exampleXCursor[]=
" "
" xx xx "
" xx xx "
......@@ -223,12 +224,59 @@ char exampleCursor[]=
" xx xx "
" xx xx "
" ";
rfbCursorPtr exampleCurse;
rfbCursorPtr exampleGetCursor(rfbClientPtr cl)
/* Example for a rich cursor (full-colour) */
void MakeRichCursor(rfbScreenInfoPtr rfbScreen)
{
return(exampleCurse);
int i,j,w=32,h=32;
rfbCursorPtr c = rfbScreen->cursor;
char bitmap[]=
" "
" xxxxxx "
" xxxxxxxxxxxxxxxxx "
" xxxxxxxxxxxxxxxxxxxxxx "
" xxxxxxxxxxxxxxxxxxxxxxxxx "
" xxxxxxxxxxxxxxxxxxxxxxxxxxx "
" xxxxxxxxxxxxxxxxxxxxxxxxxxxxx "
" xxxxxxxxxxxxxxxxxxxxxxxxxxxxx "
" xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx "
" xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx "
" xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx "
" xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx "
" xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx "
" xxxxxxxxxxxxxxxxxxxxxxxxxxxx "
" xxxxxxxxxxxxxxxxxxxxxxxxxxx "
" xxxxxxxxxxxxxxxxxxxxxxxxxx "
" xxxxxxxxxxxxxxxxxxxxxxxxxx "
" xxxxxxxxxxxxxxxxxxxxxxxx "
" xxxxxxxxxxxxxxxxxxxxxx "
" xxxxxxxxxxxxxxxxxxx "
" xxxxxxxxxxxxxxxxx "
" xxxxxxxxxxxxxxx "
" xxxxxxxxxxxxxx "
" xxxxxxxxxxxx "
" xxxxxxxxxxxx "
" xx xxxxxxxxxxx "
" xxx xxxxxxxxxxx "
" xxxx xxxxxxxxxxx "
" xxxxxx xxxxxxxxxxxxx "
" xxxxxxxxxxxxxxxxxxxxxx "
" xxxxxxxxxxxxxxxx "
" ";
c=rfbScreen->cursor = rfbMakeXCursor(w,h,bitmap,0);
c->xhot = 2; c->yhot = 10;
c->richSource = malloc(w*h*bpp);
for(j=0;j<h;j++) {
for(i=0;i<w;i++) {
c->richSource[j*w*bpp+i*bpp+0]=0; //i*0xff/w;
c->richSource[j*w*bpp+i*bpp+1]=0;
c->richSource[j*w*bpp+i*bpp+2]=j*0xff/h;
c->richSource[j*w*bpp+i*bpp+3]=0;
}
}
}
*/
/* Initialization */
......@@ -247,30 +295,12 @@ int main(int argc,char** argv)
initBuffer(rfbScreen->frameBuffer);
drawstring(rfbScreen->frameBuffer,maxx*bpp,bpp,20,100,"Hello, World!");
//exampleCurse = rfbMakeXCursor(exampleCursorWidth,exampleCursorHeight,exampleCursor,0);
{
int i,j,w=32,h=32;
rfbCursorPtr c = rfbScreen->cursor;
char x[32*32],mask[32*32/8];
c=rfbScreen->cursor = rfbMakeXCursor(w,h,x,mask);
c->xhot = 2; c->yhot = 10;
c->mask[0]=0xff; c->mask[1]=0x0;
memset(c->mask,255,h*w/8);
c->richSource = malloc(w*h*bpp);
for(j=0;j<h;j++) {
for(i=0;i<w;i++) {
c->richSource[j*w*bpp+i*bpp+0]=0;
c->richSource[j*w*bpp+i*bpp+1]=0;
c->richSource[j*w*bpp+i*bpp+2]=j*0xff/h;
c->richSource[j*w*bpp+i*bpp+3]=0;
}
c->richSource[j*w*bpp+(w-1)*bpp+0]=0xff;
c->richSource[j*w*bpp+(w-1)*bpp+1]=0xff;
c->richSource[j*w*bpp+(w-1)*bpp+2]=0xff;
c->richSource[j*w*bpp+(w-1)*bpp+3]=0xff;
}
//memset(c->richSource,0xff,w*h*bpp);
}
/* This call creates a mask and then a cursor: */
/* rfbScreen->defaultCursor =
rfbMakeXCursor(exampleCursorWidth,exampleCursorHeight,exampleCursor,0);
*/
MakeRichCursor(rfbScreen);
/* this is the blocking event loop, i.e. it never returns */
/* 40000 are the microseconds, i.e. 0.04 seconds */
......
keysym.h 0 → 100755
View file @ 94f04a86
/* $XConsortium: keysym.h,v 1.15 94/04/17 20:10:55 rws Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of the X Consortium shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from the X Consortium.
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
All Rights Reserved
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* default keysyms */
#define XK_MISCELLANY
#define XK_XKB_KEYS
#define XK_LATIN1
#define XK_LATIN2
#define XK_LATIN3
#define XK_LATIN4
#define XK_GREEK
/* $TOG: keysymdef.h /main/25 1997/06/21 10:54:51 kaleb $ */
/***********************************************************
Copyright (c) 1987, 1994 X Consortium
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of the X Consortium shall
not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from the X Consortium.
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts
All Rights Reserved
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
#define XK_VoidSymbol 0xFFFFFF /* void symbol */
#ifdef XK_MISCELLANY
/*
* TTY Functions, cleverly chosen to map to ascii, for convenience of
* programming, but could have been arbitrary (at the cost of lookup
* tables in client code.
*/
#define XK_BackSpace 0xFF08 /* back space, back char */
#define XK_Tab 0xFF09
#define XK_Linefeed 0xFF0A /* Linefeed, LF */
#define XK_Clear 0xFF0B
#define XK_Return 0xFF0D /* Return, enter */
#define XK_Pause 0xFF13 /* Pause, hold */
#define XK_Scroll_Lock 0xFF14
#define XK_Sys_Req 0xFF15
#define XK_Escape 0xFF1B
#define XK_Delete 0xFFFF /* Delete, rubout */
/* International & multi-key character composition */
#define XK_Multi_key 0xFF20 /* Multi-key character compose */
#define XK_SingleCandidate 0xFF3C
#define XK_MultipleCandidate 0xFF3D
#define XK_PreviousCandidate 0xFF3E
/* Japanese keyboard support */
#define XK_Kanji 0xFF21 /* Kanji, Kanji convert */
#define XK_Muhenkan 0xFF22 /* Cancel Conversion */
#define XK_Henkan_Mode 0xFF23 /* Start/Stop Conversion */
#define XK_Henkan 0xFF23 /* Alias for Henkan_Mode */
#define XK_Romaji 0xFF24 /* to Romaji */
#define XK_Hiragana 0xFF25 /* to Hiragana */
#define XK_Katakana 0xFF26 /* to Katakana */
#define XK_Hiragana_Katakana 0xFF27 /* Hiragana/Katakana toggle */
#define XK_Zenkaku 0xFF28 /* to Zenkaku */
#define XK_Hankaku 0xFF29 /* to Hankaku */
#define XK_Zenkaku_Hankaku 0xFF2A /* Zenkaku/Hankaku toggle */
#define XK_Touroku 0xFF2B /* Add to Dictionary */
#define XK_Massyo 0xFF2C /* Delete from Dictionary */
#define XK_Kana_Lock 0xFF2D /* Kana Lock */
#define XK_Kana_Shift 0xFF2E /* Kana Shift */
#define XK_Eisu_Shift 0xFF2F /* Alphanumeric Shift */
#define XK_Eisu_toggle 0xFF30 /* Alphanumeric toggle */
#define XK_Zen_Koho 0xFF3D /* Multiple/All Candidate(s) */
#define XK_Mae_Koho 0xFF3E /* Previous Candidate */
/* 0xFF31 thru 0xFF3F are under XK_KOREAN */
/* Cursor control & motion */
#define XK_Home 0xFF50
#define XK_Left 0xFF51 /* Move left, left arrow */
#define XK_Up 0xFF52 /* Move up, up arrow */
#define XK_Right 0xFF53 /* Move right, right arrow */
#define XK_Down 0xFF54 /* Move down, down arrow */
#define XK_Prior 0xFF55 /* Prior, previous */
#define XK_Page_Up 0xFF55
#define XK_Next 0xFF56 /* Next */
#define XK_Page_Down 0xFF56
#define XK_End 0xFF57 /* EOL */
#define XK_Begin 0xFF58 /* BOL */
/* Misc Functions */
#define XK_Select 0xFF60 /* Select, mark */
#define XK_Print 0xFF61
#define XK_Execute 0xFF62 /* Execute, run, do */
#define XK_Insert 0xFF63 /* Insert, insert here */
#define XK_Undo 0xFF65 /* Undo, oops */
#define XK_Redo 0xFF66 /* redo, again */
#define XK_Menu 0xFF67
#define XK_Find 0xFF68 /* Find, search */
#define XK_Cancel 0xFF69 /* Cancel, stop, abort, exit */
#define XK_Help 0xFF6A /* Help */
#define XK_Break 0xFF6B
#define XK_Mode_switch 0xFF7E /* Character set switch */
#define XK_script_switch 0xFF7E /* Alias for mode_switch */
#define XK_Num_Lock 0xFF7F
/* Keypad Functions, keypad numbers cleverly chosen to map to ascii */
#define XK_KP_Space 0xFF80 /* space */
#define XK_KP_Tab 0xFF89
#define XK_KP_Enter 0xFF8D /* enter */
#define XK_KP_F1 0xFF91 /* PF1, KP_A, ... */
#define XK_KP_F2 0xFF92
#define XK_KP_F3 0xFF93
#define XK_KP_F4 0xFF94
#define XK_KP_Home 0xFF95
#define XK_KP_Left 0xFF96
#define XK_KP_Up 0xFF97
#define XK_KP_Right 0xFF98
#define XK_KP_Down 0xFF99
#define XK_KP_Prior 0xFF9A
#define XK_KP_Page_Up 0xFF9A
#define XK_KP_Next 0xFF9B
#define XK_KP_Page_Down 0xFF9B
#define XK_KP_End 0xFF9C
#define XK_KP_Begin 0xFF9D
#define XK_KP_Insert 0xFF9E
#define XK_KP_Delete 0xFF9F
#define XK_KP_Equal 0xFFBD /* equals */
#define XK_KP_Multiply 0xFFAA
#define XK_KP_Add 0xFFAB
#define XK_KP_Separator 0xFFAC /* separator, often comma */
#define XK_KP_Subtract 0xFFAD
#define XK_KP_Decimal 0xFFAE
#define XK_KP_Divide 0xFFAF
#define XK_KP_0 0xFFB0
#define XK_KP_1 0xFFB1
#define XK_KP_2 0xFFB2
#define XK_KP_3 0xFFB3
#define XK_KP_4 0xFFB4
#define XK_KP_5 0xFFB5
#define XK_KP_6 0xFFB6
#define XK_KP_7 0xFFB7
#define XK_KP_8 0xFFB8
#define XK_KP_9 0xFFB9
/*
* Auxilliary Functions; note the duplicate definitions for left and right
* function keys; Sun keyboards and a few other manufactures have such
* function key groups on the left and/or right sides of the keyboard.
* We've not found a keyboard with more than 35 function keys total.
*/
#define XK_F1 0xFFBE
#define XK_F2 0xFFBF
#define XK_F3 0xFFC0
#define XK_F4 0xFFC1
#define XK_F5 0xFFC2
#define XK_F6 0xFFC3
#define XK_F7 0xFFC4
#define XK_F8 0xFFC5
#define XK_F9 0xFFC6
#define XK_F10 0xFFC7
#define XK_F11 0xFFC8
#define XK_L1 0xFFC8
#define XK_F12 0xFFC9
#define XK_L2 0xFFC9
#define XK_F13 0xFFCA
#define XK_L3 0xFFCA
#define XK_F14 0xFFCB
#define XK_L4 0xFFCB
#define XK_F15 0xFFCC
#define XK_L5 0xFFCC
#define XK_F16 0xFFCD
#define XK_L6 0xFFCD
#define XK_F17 0xFFCE
#define XK_L7 0xFFCE
#define XK_F18 0xFFCF
#define XK_L8 0xFFCF
#define XK_F19 0xFFD0
#define XK_L9 0xFFD0
#define XK_F20 0xFFD1
#define XK_L10 0xFFD1
#define XK_F21 0xFFD2
#define XK_R1 0xFFD2
#define XK_F22 0xFFD3
#define XK_R2 0xFFD3
#define XK_F23 0xFFD4
#define XK_R3 0xFFD4
#define XK_F24 0xFFD5
#define XK_R4 0xFFD5
#define XK_F25 0xFFD6
#define XK_R5 0xFFD6
#define XK_F26 0xFFD7
#define XK_R6 0xFFD7
#define XK_F27 0xFFD8
#define XK_R7 0xFFD8
#define XK_F28 0xFFD9
#define XK_R8 0xFFD9
#define XK_F29 0xFFDA
#define XK_R9 0xFFDA
#define XK_F30 0xFFDB
#define XK_R10 0xFFDB
#define XK_F31 0xFFDC
#define XK_R11 0xFFDC
#define XK_F32 0xFFDD
#define XK_R12 0xFFDD
#define XK_F33 0xFFDE
#define XK_R13 0xFFDE
#define XK_F34 0xFFDF
#define XK_R14 0xFFDF
#define XK_F35 0xFFE0
#define XK_R15 0xFFE0
/* Modifiers */
#define XK_Shift_L 0xFFE1 /* Left shift */
#define XK_Shift_R 0xFFE2 /* Right shift */
#define XK_Control_L 0xFFE3 /* Left control */
#define XK_Control_R 0xFFE4 /* Right control */
#define XK_Caps_Lock 0xFFE5 /* Caps lock */
#define XK_Shift_Lock 0xFFE6 /* Shift lock */
#define XK_Meta_L 0xFFE7 /* Left meta */
#define XK_Meta_R 0xFFE8 /* Right meta */
#define XK_Alt_L 0xFFE9 /* Left alt */
#define XK_Alt_R 0xFFEA /* Right alt */
#define XK_Super_L 0xFFEB /* Left super */
#define XK_Super_R 0xFFEC /* Right super */
#define XK_Hyper_L 0xFFED /* Left hyper */
#define XK_Hyper_R 0xFFEE /* Right hyper */
#endif /* XK_MISCELLANY */
/*
* ISO 9995 Function and Modifier Keys
* Byte 3 = 0xFE
*/
#ifdef XK_XKB_KEYS
#define XK_ISO_Lock 0xFE01
#define XK_ISO_Level2_Latch 0xFE02
#define XK_ISO_Level3_Shift 0xFE03
#define XK_ISO_Level3_Latch 0xFE04
#define XK_ISO_Level3_Lock 0xFE05
#define XK_ISO_Group_Shift 0xFF7E /* Alias for mode_switch */
#define XK_ISO_Group_Latch 0xFE06
#define XK_ISO_Group_Lock 0xFE07
#define XK_ISO_Next_Group 0xFE08
#define XK_ISO_Next_Group_Lock 0xFE09
#define XK_ISO_Prev_Group 0xFE0A
#define XK_ISO_Prev_Group_Lock 0xFE0B
#define XK_ISO_First_Group 0xFE0C
#define XK_ISO_First_Group_Lock 0xFE0D
#define XK_ISO_Last_Group 0xFE0E
#define XK_ISO_Last_Group_Lock 0xFE0F
#define XK_ISO_Left_Tab 0xFE20
#define XK_ISO_Move_Line_Up 0xFE21
#define XK_ISO_Move_Line_Down 0xFE22
#define XK_ISO_Partial_Line_Up 0xFE23
#define XK_ISO_Partial_Line_Down 0xFE24
#define XK_ISO_Partial_Space_Left 0xFE25
#define XK_ISO_Partial_Space_Right 0xFE26
#define XK_ISO_Set_Margin_Left 0xFE27
#define XK_ISO_Set_Margin_Right 0xFE28
#define XK_ISO_Release_Margin_Left 0xFE29
#define XK_ISO_Release_Margin_Right 0xFE2A
#define XK_ISO_Release_Both_Margins 0xFE2B
#define XK_ISO_Fast_Cursor_Left 0xFE2C
#define XK_ISO_Fast_Cursor_Right 0xFE2D
#define XK_ISO_Fast_Cursor_Up 0xFE2E
#define XK_ISO_Fast_Cursor_Down 0xFE2F
#define XK_ISO_Continuous_Underline 0xFE30
#define XK_ISO_Discontinuous_Underline 0xFE31
#define XK_ISO_Emphasize 0xFE32
#define XK_ISO_Center_Object 0xFE33
#define XK_ISO_Enter 0xFE34
#define XK_dead_grave 0xFE50
#define XK_dead_acute 0xFE51
#define XK_dead_circumflex 0xFE52
#define XK_dead_tilde 0xFE53
#define XK_dead_macron 0xFE54
#define XK_dead_breve 0xFE55
#define XK_dead_abovedot 0xFE56
#define XK_dead_diaeresis 0xFE57
#define XK_dead_abovering 0xFE58
#define XK_dead_doubleacute 0xFE59
#define XK_dead_caron 0xFE5A
#define XK_dead_cedilla 0xFE5B
#define XK_dead_ogonek 0xFE5C
#define XK_dead_iota 0xFE5D
#define XK_dead_voiced_sound 0xFE5E
#define XK_dead_semivoiced_sound 0xFE5F
#define XK_dead_belowdot 0xFE60
#define XK_First_Virtual_Screen 0xFED0
#define XK_Prev_Virtual_Screen 0xFED1
#define XK_Next_Virtual_Screen 0xFED2
#define XK_Last_Virtual_Screen 0xFED4
#define XK_Terminate_Server 0xFED5
#define XK_AccessX_Enable 0xFE70
#define XK_AccessX_Feedback_Enable 0xFE71
#define XK_RepeatKeys_Enable 0xFE72
#define XK_SlowKeys_Enable 0xFE73
#define XK_BounceKeys_Enable 0xFE74
#define XK_StickyKeys_Enable 0xFE75
#define XK_MouseKeys_Enable 0xFE76
#define XK_MouseKeys_Accel_Enable 0xFE77
#define XK_Overlay1_Enable 0xFE78
#define XK_Overlay2_Enable 0xFE79
#define XK_AudibleBell_Enable 0xFE7A
#define XK_Pointer_Left 0xFEE0
#define XK_Pointer_Right 0xFEE1
#define XK_Pointer_Up 0xFEE2
#define XK_Pointer_Down 0xFEE3
#define XK_Pointer_UpLeft 0xFEE4
#define XK_Pointer_UpRight 0xFEE5
#define XK_Pointer_DownLeft 0xFEE6
#define XK_Pointer_DownRight 0xFEE7
#define XK_Pointer_Button_Dflt 0xFEE8
#define XK_Pointer_Button1 0xFEE9
#define XK_Pointer_Button2 0xFEEA
#define XK_Pointer_Button3 0xFEEB
#define XK_Pointer_Button4 0xFEEC
#define XK_Pointer_Button5 0xFEED
#define XK_Pointer_DblClick_Dflt 0xFEEE
#define XK_Pointer_DblClick1 0xFEEF
#define XK_Pointer_DblClick2 0xFEF0
#define XK_Pointer_DblClick3 0xFEF1
#define XK_Pointer_DblClick4 0xFEF2
#define XK_Pointer_DblClick5 0xFEF3
#define XK_Pointer_Drag_Dflt 0xFEF4
#define XK_Pointer_Drag1 0xFEF5
#define XK_Pointer_Drag2 0xFEF6
#define XK_Pointer_Drag3 0xFEF7
#define XK_Pointer_Drag4 0xFEF8
#define XK_Pointer_Drag5 0xFEFD
#define XK_Pointer_EnableKeys 0xFEF9
#define XK_Pointer_Accelerate 0xFEFA
#define XK_Pointer_DfltBtnNext 0xFEFB
#define XK_Pointer_DfltBtnPrev 0xFEFC
#endif
/*
* 3270 Terminal Keys
* Byte 3 = 0xFD
*/
#ifdef XK_3270
#define XK_3270_Duplicate 0xFD01
#define XK_3270_FieldMark 0xFD02
#define XK_3270_Right2 0xFD03
#define XK_3270_Left2 0xFD04
#define XK_3270_BackTab 0xFD05
#define XK_3270_EraseEOF 0xFD06
#define XK_3270_EraseInput 0xFD07
#define XK_3270_Reset 0xFD08
#define XK_3270_Quit 0xFD09
#define XK_3270_PA1 0xFD0A
#define XK_3270_PA2 0xFD0B
#define XK_3270_PA3 0xFD0C
#define XK_3270_Test 0xFD0D
#define XK_3270_Attn 0xFD0E
#define XK_3270_CursorBlink 0xFD0F
#define XK_3270_AltCursor 0xFD10
#define XK_3270_KeyClick 0xFD11
#define XK_3270_Jump 0xFD12
#define XK_3270_Ident 0xFD13
#define XK_3270_Rule 0xFD14
#define XK_3270_Copy 0xFD15
#define XK_3270_Play 0xFD16
#define XK_3270_Setup 0xFD17
#define XK_3270_Record 0xFD18
#define XK_3270_ChangeScreen 0xFD19
#define XK_3270_DeleteWord 0xFD1A
#define XK_3270_ExSelect 0xFD1B
#define XK_3270_CursorSelect 0xFD1C
#define XK_3270_PrintScreen 0xFD1D
#define XK_3270_Enter 0xFD1E
#endif
/*
* Latin 1
* Byte 3 = 0
*/
#ifdef XK_LATIN1
#define XK_space 0x020
#define XK_exclam 0x021
#define XK_quotedbl 0x022
#define XK_numbersign 0x023
#define XK_dollar 0x024
#define XK_percent 0x025
#define XK_ampersand 0x026
#define XK_apostrophe 0x027
#define XK_quoteright 0x027 /* deprecated */
#define XK_parenleft 0x028
#define XK_parenright 0x029
#define XK_asterisk 0x02a
#define XK_plus 0x02b
#define XK_comma 0x02c
#define XK_minus 0x02d
#define XK_period 0x02e
#define XK_slash 0x02f
#define XK_0 0x030
#define XK_1 0x031
#define XK_2 0x032
#define XK_3 0x033
#define XK_4 0x034
#define XK_5 0x035
#define XK_6 0x036
#define XK_7 0x037
#define XK_8 0x038
#define XK_9 0x039
#define XK_colon 0x03a
#define XK_semicolon 0x03b
#define XK_less 0x03c
#define XK_equal 0x03d
#define XK_greater 0x03e
#define XK_question 0x03f
#define XK_at 0x040
#define XK_A 0x041
#define XK_B 0x042
#define XK_C 0x043
#define XK_D 0x044
#define XK_E 0x045
#define XK_F 0x046
#define XK_G 0x047
#define XK_H 0x048
#define XK_I 0x049
#define XK_J 0x04a
#define XK_K 0x04b
#define XK_L 0x04c
#define XK_M 0x04d
#define XK_N 0x04e
#define XK_O 0x04f
#define XK_P 0x050
#define XK_Q 0x051
#define XK_R 0x052
#define XK_S 0x053
#define XK_T 0x054
#define XK_U 0x055
#define XK_V 0x056
#define XK_W 0x057
#define XK_X 0x058
#define XK_Y 0x059
#define XK_Z 0x05a
#define XK_bracketleft 0x05b
#define XK_backslash 0x05c
#define XK_bracketright 0x05d
#define XK_asciicircum 0x05e
#define XK_underscore 0x05f
#define XK_grave 0x060
#define XK_quoteleft 0x060 /* deprecated */
#define XK_a 0x061
#define XK_b 0x062
#define XK_c 0x063
#define XK_d 0x064
#define XK_e 0x065
#define XK_f 0x066
#define XK_g 0x067
#define XK_h 0x068
#define XK_i 0x069
#define XK_j 0x06a
#define XK_k 0x06b
#define XK_l 0x06c
#define XK_m 0x06d
#define XK_n 0x06e
#define XK_o 0x06f
#define XK_p 0x070
#define XK_q 0x071
#define XK_r 0x072
#define XK_s 0x073
#define XK_t 0x074
#define XK_u 0x075
#define XK_v 0x076
#define XK_w 0x077
#define XK_x 0x078
#define XK_y 0x079
#define XK_z 0x07a
#define XK_braceleft 0x07b
#define XK_bar 0x07c
#define XK_braceright 0x07d
#define XK_asciitilde 0x07e
#define XK_nobreakspace 0x0a0
#define XK_exclamdown 0x0a1
#define XK_cent 0x0a2
#define XK_sterling 0x0a3
#define XK_currency 0x0a4
#define XK_yen 0x0a5
#define XK_brokenbar 0x0a6
#define XK_section 0x0a7
#define XK_diaeresis 0x0a8
#define XK_copyright 0x0a9
#define XK_ordfeminine 0x0aa
#define XK_guillemotleft 0x0ab /* left angle quotation mark */
#define XK_notsign 0x0ac
#define XK_hyphen 0x0ad
#define XK_registered 0x0ae
#define XK_macron 0x0af
#define XK_degree 0x0b0
#define XK_plusminus 0x0b1
#define XK_twosuperior 0x0b2
#define XK_threesuperior 0x0b3
#define XK_acute 0x0b4
#define XK_mu 0x0b5
#define XK_paragraph 0x0b6
#define XK_periodcentered 0x0b7
#define XK_cedilla 0x0b8
#define XK_onesuperior 0x0b9
#define XK_masculine 0x0ba
#define XK_guillemotright 0x0bb /* right angle quotation mark */
#define XK_onequarter 0x0bc
#define XK_onehalf 0x0bd
#define XK_threequarters 0x0be
#define XK_questiondown 0x0bf
#define XK_Agrave 0x0c0
#define XK_Aacute 0x0c1
#define XK_Acircumflex 0x0c2
#define XK_Atilde 0x0c3
#define XK_Adiaeresis 0x0c4
#define XK_Aring 0x0c5
#define XK_AE 0x0c6
#define XK_Ccedilla 0x0c7
#define XK_Egrave 0x0c8
#define XK_Eacute 0x0c9
#define XK_Ecircumflex 0x0ca
#define XK_Ediaeresis 0x0cb
#define XK_Igrave 0x0cc
#define XK_Iacute 0x0cd
#define XK_Icircumflex 0x0ce
#define XK_Idiaeresis 0x0cf
#define XK_ETH 0x0d0
#define XK_Eth 0x0d0 /* deprecated */
#define XK_Ntilde 0x0d1
#define XK_Ograve 0x0d2
#define XK_Oacute 0x0d3
#define XK_Ocircumflex 0x0d4
#define XK_Otilde 0x0d5
#define XK_Odiaeresis 0x0d6
#define XK_multiply 0x0d7
#define XK_Ooblique 0x0d8
#define XK_Ugrave 0x0d9
#define XK_Uacute 0x0da
#define XK_Ucircumflex 0x0db
#define XK_Udiaeresis 0x0dc
#define XK_Yacute 0x0dd
#define XK_THORN 0x0de
#define XK_Thorn 0x0de /* deprecated */
#define XK_ssharp 0x0df
#define XK_agrave 0x0e0
#define XK_aacute 0x0e1
#define XK_acircumflex 0x0e2
#define XK_atilde 0x0e3
#define XK_adiaeresis 0x0e4
#define XK_aring 0x0e5
#define XK_ae 0x0e6
#define XK_ccedilla 0x0e7
#define XK_egrave 0x0e8
#define XK_eacute 0x0e9
#define XK_ecircumflex 0x0ea
#define XK_ediaeresis 0x0eb
#define XK_igrave 0x0ec
#define XK_iacute 0x0ed
#define XK_icircumflex 0x0ee
#define XK_idiaeresis 0x0ef
#define XK_eth 0x0f0
#define XK_ntilde 0x0f1
#define XK_ograve 0x0f2
#define XK_oacute 0x0f3
#define XK_ocircumflex 0x0f4
#define XK_otilde 0x0f5
#define XK_odiaeresis 0x0f6
#define XK_division 0x0f7
#define XK_oslash 0x0f8
#define XK_ugrave 0x0f9
#define XK_uacute 0x0fa
#define XK_ucircumflex 0x0fb
#define XK_udiaeresis 0x0fc
#define XK_yacute 0x0fd
#define XK_thorn 0x0fe
#define XK_ydiaeresis 0x0ff
#endif /* XK_LATIN1 */
/*
* Latin 2
* Byte 3 = 1
*/
#ifdef XK_LATIN2
#define XK_Aogonek 0x1a1
#define XK_breve 0x1a2
#define XK_Lstroke 0x1a3
#define XK_Lcaron 0x1a5
#define XK_Sacute 0x1a6
#define XK_Scaron 0x1a9
#define XK_Scedilla 0x1aa
#define XK_Tcaron 0x1ab
#define XK_Zacute 0x1ac
#define XK_Zcaron 0x1ae
#define XK_Zabovedot 0x1af
#define XK_aogonek 0x1b1
#define XK_ogonek 0x1b2
#define XK_lstroke 0x1b3
#define XK_lcaron 0x1b5
#define XK_sacute 0x1b6
#define XK_caron 0x1b7
#define XK_scaron 0x1b9
#define XK_scedilla 0x1ba
#define XK_tcaron 0x1bb
#define XK_zacute 0x1bc
#define XK_doubleacute 0x1bd
#define XK_zcaron 0x1be
#define XK_zabovedot 0x1bf
#define XK_Racute 0x1c0
#define XK_Abreve 0x1c3
#define XK_Lacute 0x1c5
#define XK_Cacute 0x1c6
#define XK_Ccaron 0x1c8
#define XK_Eogonek 0x1ca
#define XK_Ecaron 0x1cc
#define XK_Dcaron 0x1cf
#define XK_Dstroke 0x1d0
#define XK_Nacute 0x1d1
#define XK_Ncaron 0x1d2
#define XK_Odoubleacute 0x1d5
#define XK_Rcaron 0x1d8
#define XK_Uring 0x1d9
#define XK_Udoubleacute 0x1db
#define XK_Tcedilla 0x1de
#define XK_racute 0x1e0
#define XK_abreve 0x1e3
#define XK_lacute 0x1e5
#define XK_cacute 0x1e6
#define XK_ccaron 0x1e8
#define XK_eogonek 0x1ea
#define XK_ecaron 0x1ec
#define XK_dcaron 0x1ef
#define XK_dstroke 0x1f0
#define XK_nacute 0x1f1
#define XK_ncaron 0x1f2
#define XK_odoubleacute 0x1f5
#define XK_udoubleacute 0x1fb
#define XK_rcaron 0x1f8
#define XK_uring 0x1f9
#define XK_tcedilla 0x1fe
#define XK_abovedot 0x1ff
#endif /* XK_LATIN2 */
/*
* Latin 3
* Byte 3 = 2
*/
#ifdef XK_LATIN3
#define XK_Hstroke 0x2a1
#define XK_Hcircumflex 0x2a6
#define XK_Iabovedot 0x2a9
#define XK_Gbreve 0x2ab
#define XK_Jcircumflex 0x2ac
#define XK_hstroke 0x2b1
#define XK_hcircumflex 0x2b6
#define XK_idotless 0x2b9
#define XK_gbreve 0x2bb
#define XK_jcircumflex 0x2bc
#define XK_Cabovedot 0x2c5
#define XK_Ccircumflex 0x2c6
#define XK_Gabovedot 0x2d5
#define XK_Gcircumflex 0x2d8
#define XK_Ubreve 0x2dd
#define XK_Scircumflex 0x2de
#define XK_cabovedot 0x2e5
#define XK_ccircumflex 0x2e6
#define XK_gabovedot 0x2f5
#define XK_gcircumflex 0x2f8
#define XK_ubreve 0x2fd
#define XK_scircumflex 0x2fe
#endif /* XK_LATIN3 */
/*
* Latin 4
* Byte 3 = 3
*/
#ifdef XK_LATIN4
#define XK_kra 0x3a2
#define XK_kappa 0x3a2 /* deprecated */
#define XK_Rcedilla 0x3a3
#define XK_Itilde 0x3a5
#define XK_Lcedilla 0x3a6
#define XK_Emacron 0x3aa
#define XK_Gcedilla 0x3ab
#define XK_Tslash 0x3ac
#define XK_rcedilla 0x3b3
#define XK_itilde 0x3b5
#define XK_lcedilla 0x3b6
#define XK_emacron 0x3ba
#define XK_gcedilla 0x3bb
#define XK_tslash 0x3bc
#define XK_ENG 0x3bd
#define XK_eng 0x3bf
#define XK_Amacron 0x3c0
#define XK_Iogonek 0x3c7
#define XK_Eabovedot 0x3cc
#define XK_Imacron 0x3cf
#define XK_Ncedilla 0x3d1
#define XK_Omacron 0x3d2
#define XK_Kcedilla 0x3d3
#define XK_Uogonek 0x3d9
#define XK_Utilde 0x3dd
#define XK_Umacron 0x3de
#define XK_amacron 0x3e0
#define XK_iogonek 0x3e7
#define XK_eabovedot 0x3ec
#define XK_imacron 0x3ef
#define XK_ncedilla 0x3f1
#define XK_omacron 0x3f2
#define XK_kcedilla 0x3f3
#define XK_uogonek 0x3f9
#define XK_utilde 0x3fd
#define XK_umacron 0x3fe
#endif /* XK_LATIN4 */
/*
* Katakana
* Byte 3 = 4
*/
#ifdef XK_KATAKANA
#define XK_overline 0x47e
#define XK_kana_fullstop 0x4a1
#define XK_kana_openingbracket 0x4a2
#define XK_kana_closingbracket 0x4a3
#define XK_kana_comma 0x4a4
#define XK_kana_conjunctive 0x4a5
#define XK_kana_middledot 0x4a5 /* deprecated */
#define XK_kana_WO 0x4a6
#define XK_kana_a 0x4a7
#define XK_kana_i 0x4a8
#define XK_kana_u 0x4a9
#define XK_kana_e 0x4aa
#define XK_kana_o 0x4ab
#define XK_kana_ya 0x4ac
#define XK_kana_yu 0x4ad
#define XK_kana_yo 0x4ae
#define XK_kana_tsu 0x4af
#define XK_kana_tu 0x4af /* deprecated */
#define XK_prolongedsound 0x4b0
#define XK_kana_A 0x4b1
#define XK_kana_I 0x4b2
#define XK_kana_U 0x4b3
#define XK_kana_E 0x4b4
#define XK_kana_O 0x4b5
#define XK_kana_KA 0x4b6
#define XK_kana_KI 0x4b7
#define XK_kana_KU 0x4b8
#define XK_kana_KE 0x4b9
#define XK_kana_KO 0x4ba
#define XK_kana_SA 0x4bb
#define XK_kana_SHI 0x4bc
#define XK_kana_SU 0x4bd
#define XK_kana_SE 0x4be
#define XK_kana_SO 0x4bf
#define XK_kana_TA 0x4c0
#define XK_kana_CHI 0x4c1
#define XK_kana_TI 0x4c1 /* deprecated */
#define XK_kana_TSU 0x4c2
#define XK_kana_TU 0x4c2 /* deprecated */
#define XK_kana_TE 0x4c3
#define XK_kana_TO 0x4c4
#define XK_kana_NA 0x4c5
#define XK_kana_NI 0x4c6
#define XK_kana_NU 0x4c7
#define XK_kana_NE 0x4c8
#define XK_kana_NO 0x4c9
#define XK_kana_HA 0x4ca
#define XK_kana_HI 0x4cb
#define XK_kana_FU 0x4cc
#define XK_kana_HU 0x4cc /* deprecated */
#define XK_kana_HE 0x4cd
#define XK_kana_HO 0x4ce
#define XK_kana_MA 0x4cf
#define XK_kana_MI 0x4d0
#define XK_kana_MU 0x4d1
#define XK_kana_ME 0x4d2
#define XK_kana_MO 0x4d3
#define XK_kana_YA 0x4d4
#define XK_kana_YU 0x4d5
#define XK_kana_YO 0x4d6
#define XK_kana_RA 0x4d7
#define XK_kana_RI 0x4d8
#define XK_kana_RU 0x4d9
#define XK_kana_RE 0x4da
#define XK_kana_RO 0x4db
#define XK_kana_WA 0x4dc
#define XK_kana_N 0x4dd
#define XK_voicedsound 0x4de
#define XK_semivoicedsound 0x4df
#define XK_kana_switch 0xFF7E /* Alias for mode_switch */
#endif /* XK_KATAKANA */
/*
* Arabic
* Byte 3 = 5
*/
#ifdef XK_ARABIC
#define XK_Arabic_comma 0x5ac
#define XK_Arabic_semicolon 0x5bb
#define XK_Arabic_question_mark 0x5bf
#define XK_Arabic_hamza 0x5c1
#define XK_Arabic_maddaonalef 0x5c2
#define XK_Arabic_hamzaonalef 0x5c3
#define XK_Arabic_hamzaonwaw 0x5c4
#define XK_Arabic_hamzaunderalef 0x5c5
#define XK_Arabic_hamzaonyeh 0x5c6
#define XK_Arabic_alef 0x5c7
#define XK_Arabic_beh 0x5c8
#define XK_Arabic_tehmarbuta 0x5c9
#define XK_Arabic_teh 0x5ca
#define XK_Arabic_theh 0x5cb
#define XK_Arabic_jeem 0x5cc
#define XK_Arabic_hah 0x5cd
#define XK_Arabic_khah 0x5ce
#define XK_Arabic_dal 0x5cf
#define XK_Arabic_thal 0x5d0
#define XK_Arabic_ra 0x5d1
#define XK_Arabic_zain 0x5d2
#define XK_Arabic_seen 0x5d3
#define XK_Arabic_sheen 0x5d4
#define XK_Arabic_sad 0x5d5
#define XK_Arabic_dad 0x5d6
#define XK_Arabic_tah 0x5d7
#define XK_Arabic_zah 0x5d8
#define XK_Arabic_ain 0x5d9
#define XK_Arabic_ghain 0x5da
#define XK_Arabic_tatweel 0x5e0
#define XK_Arabic_feh 0x5e1
#define XK_Arabic_qaf 0x5e2
#define XK_Arabic_kaf 0x5e3
#define XK_Arabic_lam 0x5e4
#define XK_Arabic_meem 0x5e5
#define XK_Arabic_noon 0x5e6
#define XK_Arabic_ha 0x5e7
#define XK_Arabic_heh 0x5e7 /* deprecated */
#define XK_Arabic_waw 0x5e8
#define XK_Arabic_alefmaksura 0x5e9
#define XK_Arabic_yeh 0x5ea
#define XK_Arabic_fathatan 0x5eb
#define XK_Arabic_dammatan 0x5ec
#define XK_Arabic_kasratan 0x5ed
#define XK_Arabic_fatha 0x5ee
#define XK_Arabic_damma 0x5ef
#define XK_Arabic_kasra 0x5f0
#define XK_Arabic_shadda 0x5f1
#define XK_Arabic_sukun 0x5f2
#define XK_Arabic_switch 0xFF7E /* Alias for mode_switch */
#endif /* XK_ARABIC */
/*
* Cyrillic
* Byte 3 = 6
*/
#ifdef XK_CYRILLIC
#define XK_Serbian_dje 0x6a1
#define XK_Macedonia_gje 0x6a2
#define XK_Cyrillic_io 0x6a3
#define XK_Ukrainian_ie 0x6a4
#define XK_Ukranian_je 0x6a4 /* deprecated */
#define XK_Macedonia_dse 0x6a5
#define XK_Ukrainian_i 0x6a6
#define XK_Ukranian_i 0x6a6 /* deprecated */
#define XK_Ukrainian_yi 0x6a7
#define XK_Ukranian_yi 0x6a7 /* deprecated */
#define XK_Cyrillic_je 0x6a8
#define XK_Serbian_je 0x6a8 /* deprecated */
#define XK_Cyrillic_lje 0x6a9
#define XK_Serbian_lje 0x6a9 /* deprecated */
#define XK_Cyrillic_nje 0x6aa
#define XK_Serbian_nje 0x6aa /* deprecated */
#define XK_Serbian_tshe 0x6ab
#define XK_Macedonia_kje 0x6ac
#define XK_Byelorussian_shortu 0x6ae
#define XK_Cyrillic_dzhe 0x6af
#define XK_Serbian_dze 0x6af /* deprecated */
#define XK_numerosign 0x6b0
#define XK_Serbian_DJE 0x6b1
#define XK_Macedonia_GJE 0x6b2
#define XK_Cyrillic_IO 0x6b3
#define XK_Ukrainian_IE 0x6b4
#define XK_Ukranian_JE 0x6b4 /* deprecated */
#define XK_Macedonia_DSE 0x6b5
#define XK_Ukrainian_I 0x6b6
#define XK_Ukranian_I 0x6b6 /* deprecated */
#define XK_Ukrainian_YI 0x6b7
#define XK_Ukranian_YI 0x6b7 /* deprecated */
#define XK_Cyrillic_JE 0x6b8
#define XK_Serbian_JE 0x6b8 /* deprecated */
#define XK_Cyrillic_LJE 0x6b9
#define XK_Serbian_LJE 0x6b9 /* deprecated */
#define XK_Cyrillic_NJE 0x6ba
#define XK_Serbian_NJE 0x6ba /* deprecated */
#define XK_Serbian_TSHE 0x6bb
#define XK_Macedonia_KJE 0x6bc
#define XK_Byelorussian_SHORTU 0x6be
#define XK_Cyrillic_DZHE 0x6bf
#define XK_Serbian_DZE 0x6bf /* deprecated */
#define XK_Cyrillic_yu 0x6c0
#define XK_Cyrillic_a 0x6c1
#define XK_Cyrillic_be 0x6c2
#define XK_Cyrillic_tse 0x6c3
#define XK_Cyrillic_de 0x6c4
#define XK_Cyrillic_ie 0x6c5
#define XK_Cyrillic_ef 0x6c6
#define XK_Cyrillic_ghe 0x6c7
#define XK_Cyrillic_ha 0x6c8
#define XK_Cyrillic_i 0x6c9
#define XK_Cyrillic_shorti 0x6ca
#define XK_Cyrillic_ka 0x6cb
#define XK_Cyrillic_el 0x6cc
#define XK_Cyrillic_em 0x6cd
#define XK_Cyrillic_en 0x6ce
#define XK_Cyrillic_o 0x6cf
#define XK_Cyrillic_pe 0x6d0
#define XK_Cyrillic_ya 0x6d1
#define XK_Cyrillic_er 0x6d2
#define XK_Cyrillic_es 0x6d3
#define XK_Cyrillic_te 0x6d4
#define XK_Cyrillic_u 0x6d5
#define XK_Cyrillic_zhe 0x6d6
#define XK_Cyrillic_ve 0x6d7
#define XK_Cyrillic_softsign 0x6d8
#define XK_Cyrillic_yeru 0x6d9
#define XK_Cyrillic_ze 0x6da
#define XK_Cyrillic_sha 0x6db
#define XK_Cyrillic_e 0x6dc
#define XK_Cyrillic_shcha 0x6dd
#define XK_Cyrillic_che 0x6de
#define XK_Cyrillic_hardsign 0x6df
#define XK_Cyrillic_YU 0x6e0
#define XK_Cyrillic_A 0x6e1
#define XK_Cyrillic_BE 0x6e2
#define XK_Cyrillic_TSE 0x6e3
#define XK_Cyrillic_DE 0x6e4
#define XK_Cyrillic_IE 0x6e5
#define XK_Cyrillic_EF 0x6e6
#define XK_Cyrillic_GHE 0x6e7
#define XK_Cyrillic_HA 0x6e8
#define XK_Cyrillic_I 0x6e9
#define XK_Cyrillic_SHORTI 0x6ea
#define XK_Cyrillic_KA 0x6eb
#define XK_Cyrillic_EL 0x6ec
#define XK_Cyrillic_EM 0x6ed
#define XK_Cyrillic_EN 0x6ee
#define XK_Cyrillic_O 0x6ef
#define XK_Cyrillic_PE 0x6f0
#define XK_Cyrillic_YA 0x6f1
#define XK_Cyrillic_ER 0x6f2
#define XK_Cyrillic_ES 0x6f3
#define XK_Cyrillic_TE 0x6f4
#define XK_Cyrillic_U 0x6f5
#define XK_Cyrillic_ZHE 0x6f6
#define XK_Cyrillic_VE 0x6f7
#define XK_Cyrillic_SOFTSIGN 0x6f8
#define XK_Cyrillic_YERU 0x6f9
#define XK_Cyrillic_ZE 0x6fa
#define XK_Cyrillic_SHA 0x6fb
#define XK_Cyrillic_E 0x6fc
#define XK_Cyrillic_SHCHA 0x6fd
#define XK_Cyrillic_CHE 0x6fe
#define XK_Cyrillic_HARDSIGN 0x6ff
#endif /* XK_CYRILLIC */
/*
* Greek
* Byte 3 = 7
*/
#ifdef XK_GREEK
#define XK_Greek_ALPHAaccent 0x7a1
#define XK_Greek_EPSILONaccent 0x7a2
#define XK_Greek_ETAaccent 0x7a3
#define XK_Greek_IOTAaccent 0x7a4
#define XK_Greek_IOTAdiaeresis 0x7a5
#define XK_Greek_OMICRONaccent 0x7a7
#define XK_Greek_UPSILONaccent 0x7a8
#define XK_Greek_UPSILONdieresis 0x7a9
#define XK_Greek_OMEGAaccent 0x7ab
#define XK_Greek_accentdieresis 0x7ae
#define XK_Greek_horizbar 0x7af
#define XK_Greek_alphaaccent 0x7b1
#define XK_Greek_epsilonaccent 0x7b2
#define XK_Greek_etaaccent 0x7b3
#define XK_Greek_iotaaccent 0x7b4
#define XK_Greek_iotadieresis 0x7b5
#define XK_Greek_iotaaccentdieresis 0x7b6
#define XK_Greek_omicronaccent 0x7b7
#define XK_Greek_upsilonaccent 0x7b8
#define XK_Greek_upsilondieresis 0x7b9
#define XK_Greek_upsilonaccentdieresis 0x7ba
#define XK_Greek_omegaaccent 0x7bb
#define XK_Greek_ALPHA 0x7c1
#define XK_Greek_BETA 0x7c2
#define XK_Greek_GAMMA 0x7c3
#define XK_Greek_DELTA 0x7c4
#define XK_Greek_EPSILON 0x7c5
#define XK_Greek_ZETA 0x7c6
#define XK_Greek_ETA 0x7c7
#define XK_Greek_THETA 0x7c8
#define XK_Greek_IOTA 0x7c9
#define XK_Greek_KAPPA 0x7ca
#define XK_Greek_LAMDA 0x7cb
#define XK_Greek_LAMBDA 0x7cb
#define XK_Greek_MU 0x7cc
#define XK_Greek_NU 0x7cd
#define XK_Greek_XI 0x7ce
#define XK_Greek_OMICRON 0x7cf
#define XK_Greek_PI 0x7d0
#define XK_Greek_RHO 0x7d1
#define XK_Greek_SIGMA 0x7d2
#define XK_Greek_TAU 0x7d4
#define XK_Greek_UPSILON 0x7d5
#define XK_Greek_PHI 0x7d6
#define XK_Greek_CHI 0x7d7
#define XK_Greek_PSI 0x7d8
#define XK_Greek_OMEGA 0x7d9
#define XK_Greek_alpha 0x7e1
#define XK_Greek_beta 0x7e2
#define XK_Greek_gamma 0x7e3
#define XK_Greek_delta 0x7e4
#define XK_Greek_epsilon 0x7e5
#define XK_Greek_zeta 0x7e6
#define XK_Greek_eta 0x7e7
#define XK_Greek_theta 0x7e8
#define XK_Greek_iota 0x7e9
#define XK_Greek_kappa 0x7ea
#define XK_Greek_lamda 0x7eb
#define XK_Greek_lambda 0x7eb
#define XK_Greek_mu 0x7ec
#define XK_Greek_nu 0x7ed
#define XK_Greek_xi 0x7ee
#define XK_Greek_omicron 0x7ef
#define XK_Greek_pi 0x7f0
#define XK_Greek_rho 0x7f1
#define XK_Greek_sigma 0x7f2
#define XK_Greek_finalsmallsigma 0x7f3
#define XK_Greek_tau 0x7f4
#define XK_Greek_upsilon 0x7f5
#define XK_Greek_phi 0x7f6
#define XK_Greek_chi 0x7f7
#define XK_Greek_psi 0x7f8
#define XK_Greek_omega 0x7f9
#define XK_Greek_switch 0xFF7E /* Alias for mode_switch */
#endif /* XK_GREEK */
/*
* Technical
* Byte 3 = 8
*/
#ifdef XK_TECHNICAL
#define XK_leftradical 0x8a1
#define XK_topleftradical 0x8a2
#define XK_horizconnector 0x8a3
#define XK_topintegral 0x8a4
#define XK_botintegral 0x8a5
#define XK_vertconnector 0x8a6
#define XK_topleftsqbracket 0x8a7
#define XK_botleftsqbracket 0x8a8
#define XK_toprightsqbracket 0x8a9
#define XK_botrightsqbracket 0x8aa
#define XK_topleftparens 0x8ab
#define XK_botleftparens 0x8ac
#define XK_toprightparens 0x8ad
#define XK_botrightparens 0x8ae
#define XK_leftmiddlecurlybrace 0x8af
#define XK_rightmiddlecurlybrace 0x8b0
#define XK_topleftsummation 0x8b1
#define XK_botleftsummation 0x8b2
#define XK_topvertsummationconnector 0x8b3
#define XK_botvertsummationconnector 0x8b4
#define XK_toprightsummation 0x8b5
#define XK_botrightsummation 0x8b6
#define XK_rightmiddlesummation 0x8b7
#define XK_lessthanequal 0x8bc
#define XK_notequal 0x8bd
#define XK_greaterthanequal 0x8be
#define XK_integral 0x8bf
#define XK_therefore 0x8c0
#define XK_variation 0x8c1
#define XK_infinity 0x8c2
#define XK_nabla 0x8c5
#define XK_approximate 0x8c8
#define XK_similarequal 0x8c9
#define XK_ifonlyif 0x8cd
#define XK_implies 0x8ce
#define XK_identical 0x8cf
#define XK_radical 0x8d6
#define XK_includedin 0x8da
#define XK_includes 0x8db
#define XK_intersection 0x8dc
#define XK_union 0x8dd
#define XK_logicaland 0x8de
#define XK_logicalor 0x8df
#define XK_partialderivative 0x8ef
#define XK_function 0x8f6
#define XK_leftarrow 0x8fb
#define XK_uparrow 0x8fc
#define XK_rightarrow 0x8fd
#define XK_downarrow 0x8fe
#endif /* XK_TECHNICAL */
/*
* Special
* Byte 3 = 9
*/
#ifdef XK_SPECIAL
#define XK_blank 0x9df
#define XK_soliddiamond 0x9e0
#define XK_checkerboard 0x9e1
#define XK_ht 0x9e2
#define XK_ff 0x9e3
#define XK_cr 0x9e4
#define XK_lf 0x9e5
#define XK_nl 0x9e8
#define XK_vt 0x9e9
#define XK_lowrightcorner 0x9ea
#define XK_uprightcorner 0x9eb
#define XK_upleftcorner 0x9ec
#define XK_lowleftcorner 0x9ed
#define XK_crossinglines 0x9ee
#define XK_horizlinescan1 0x9ef
#define XK_horizlinescan3 0x9f0
#define XK_horizlinescan5 0x9f1
#define XK_horizlinescan7 0x9f2
#define XK_horizlinescan9 0x9f3
#define XK_leftt 0x9f4
#define XK_rightt 0x9f5
#define XK_bott 0x9f6
#define XK_topt 0x9f7
#define XK_vertbar 0x9f8
#endif /* XK_SPECIAL */
/*
* Publishing
* Byte 3 = a
*/
#ifdef XK_PUBLISHING
#define XK_emspace 0xaa1
#define XK_enspace 0xaa2
#define XK_em3space 0xaa3
#define XK_em4space 0xaa4
#define XK_digitspace 0xaa5
#define XK_punctspace 0xaa6
#define XK_thinspace 0xaa7
#define XK_hairspace 0xaa8
#define XK_emdash 0xaa9
#define XK_endash 0xaaa
#define XK_signifblank 0xaac
#define XK_ellipsis 0xaae
#define XK_doubbaselinedot 0xaaf
#define XK_onethird 0xab0
#define XK_twothirds 0xab1
#define XK_onefifth 0xab2
#define XK_twofifths 0xab3
#define XK_threefifths 0xab4
#define XK_fourfifths 0xab5
#define XK_onesixth 0xab6
#define XK_fivesixths 0xab7
#define XK_careof 0xab8
#define XK_figdash 0xabb
#define XK_leftanglebracket 0xabc
#define XK_decimalpoint 0xabd
#define XK_rightanglebracket 0xabe
#define XK_marker 0xabf
#define XK_oneeighth 0xac3
#define XK_threeeighths 0xac4
#define XK_fiveeighths 0xac5
#define XK_seveneighths 0xac6
#define XK_trademark 0xac9
#define XK_signaturemark 0xaca
#define XK_trademarkincircle 0xacb
#define XK_leftopentriangle 0xacc
#define XK_rightopentriangle 0xacd
#define XK_emopencircle 0xace
#define XK_emopenrectangle 0xacf
#define XK_leftsinglequotemark 0xad0
#define XK_rightsinglequotemark 0xad1
#define XK_leftdoublequotemark 0xad2
#define XK_rightdoublequotemark 0xad3
#define XK_prescription 0xad4
#define XK_minutes 0xad6
#define XK_seconds 0xad7
#define XK_latincross 0xad9
#define XK_hexagram 0xada
#define XK_filledrectbullet 0xadb
#define XK_filledlefttribullet 0xadc
#define XK_filledrighttribullet 0xadd
#define XK_emfilledcircle 0xade
#define XK_emfilledrect 0xadf
#define XK_enopencircbullet 0xae0
#define XK_enopensquarebullet 0xae1
#define XK_openrectbullet 0xae2
#define XK_opentribulletup 0xae3
#define XK_opentribulletdown 0xae4
#define XK_openstar 0xae5
#define XK_enfilledcircbullet 0xae6
#define XK_enfilledsqbullet 0xae7
#define XK_filledtribulletup 0xae8
#define XK_filledtribulletdown 0xae9
#define XK_leftpointer 0xaea
#define XK_rightpointer 0xaeb
#define XK_club 0xaec
#define XK_diamond 0xaed
#define XK_heart 0xaee
#define XK_maltesecross 0xaf0
#define XK_dagger 0xaf1
#define XK_doubledagger 0xaf2
#define XK_checkmark 0xaf3
#define XK_ballotcross 0xaf4
#define XK_musicalsharp 0xaf5
#define XK_musicalflat 0xaf6
#define XK_malesymbol 0xaf7
#define XK_femalesymbol 0xaf8
#define XK_telephone 0xaf9
#define XK_telephonerecorder 0xafa
#define XK_phonographcopyright 0xafb
#define XK_caret 0xafc
#define XK_singlelowquotemark 0xafd
#define XK_doublelowquotemark 0xafe
#define XK_cursor 0xaff
#endif /* XK_PUBLISHING */
/*
* APL
* Byte 3 = b
*/
#ifdef XK_APL
#define XK_leftcaret 0xba3
#define XK_rightcaret 0xba6
#define XK_downcaret 0xba8
#define XK_upcaret 0xba9
#define XK_overbar 0xbc0
#define XK_downtack 0xbc2
#define XK_upshoe 0xbc3
#define XK_downstile 0xbc4
#define XK_underbar 0xbc6
#define XK_jot 0xbca
#define XK_quad 0xbcc
#define XK_uptack 0xbce
#define XK_circle 0xbcf
#define XK_upstile 0xbd3
#define XK_downshoe 0xbd6
#define XK_rightshoe 0xbd8
#define XK_leftshoe 0xbda
#define XK_lefttack 0xbdc
#define XK_righttack 0xbfc
#endif /* XK_APL */
/*
* Hebrew
* Byte 3 = c
*/
#ifdef XK_HEBREW
#define XK_hebrew_doublelowline 0xcdf
#define XK_hebrew_aleph 0xce0
#define XK_hebrew_bet 0xce1
#define XK_hebrew_beth 0xce1 /* deprecated */
#define XK_hebrew_gimel 0xce2
#define XK_hebrew_gimmel 0xce2 /* deprecated */
#define XK_hebrew_dalet 0xce3
#define XK_hebrew_daleth 0xce3 /* deprecated */
#define XK_hebrew_he 0xce4
#define XK_hebrew_waw 0xce5
#define XK_hebrew_zain 0xce6
#define XK_hebrew_zayin 0xce6 /* deprecated */
#define XK_hebrew_chet 0xce7
#define XK_hebrew_het 0xce7 /* deprecated */
#define XK_hebrew_tet 0xce8
#define XK_hebrew_teth 0xce8 /* deprecated */
#define XK_hebrew_yod 0xce9
#define XK_hebrew_finalkaph 0xcea
#define XK_hebrew_kaph 0xceb
#define XK_hebrew_lamed 0xcec
#define XK_hebrew_finalmem 0xced
#define XK_hebrew_mem 0xcee
#define XK_hebrew_finalnun 0xcef
#define XK_hebrew_nun 0xcf0
#define XK_hebrew_samech 0xcf1
#define XK_hebrew_samekh 0xcf1 /* deprecated */
#define XK_hebrew_ayin 0xcf2
#define XK_hebrew_finalpe 0xcf3
#define XK_hebrew_pe 0xcf4
#define XK_hebrew_finalzade 0xcf5
#define XK_hebrew_finalzadi 0xcf5 /* deprecated */
#define XK_hebrew_zade 0xcf6
#define XK_hebrew_zadi 0xcf6 /* deprecated */
#define XK_hebrew_qoph 0xcf7
#define XK_hebrew_kuf 0xcf7 /* deprecated */
#define XK_hebrew_resh 0xcf8
#define XK_hebrew_shin 0xcf9
#define XK_hebrew_taw 0xcfa
#define XK_hebrew_taf 0xcfa /* deprecated */
#define XK_Hebrew_switch 0xFF7E /* Alias for mode_switch */
#endif /* XK_HEBREW */
/*
* Thai
* Byte 3 = d
*/
#ifdef XK_THAI
#define XK_Thai_kokai 0xda1
#define XK_Thai_khokhai 0xda2
#define XK_Thai_khokhuat 0xda3
#define XK_Thai_khokhwai 0xda4
#define XK_Thai_khokhon 0xda5
#define XK_Thai_khorakhang 0xda6
#define XK_Thai_ngongu 0xda7
#define XK_Thai_chochan 0xda8
#define XK_Thai_choching 0xda9
#define XK_Thai_chochang 0xdaa
#define XK_Thai_soso 0xdab
#define XK_Thai_chochoe 0xdac
#define XK_Thai_yoying 0xdad
#define XK_Thai_dochada 0xdae
#define XK_Thai_topatak 0xdaf
#define XK_Thai_thothan 0xdb0
#define XK_Thai_thonangmontho 0xdb1
#define XK_Thai_thophuthao 0xdb2
#define XK_Thai_nonen 0xdb3
#define XK_Thai_dodek 0xdb4
#define XK_Thai_totao 0xdb5
#define XK_Thai_thothung 0xdb6
#define XK_Thai_thothahan 0xdb7
#define XK_Thai_thothong 0xdb8
#define XK_Thai_nonu 0xdb9
#define XK_Thai_bobaimai 0xdba
#define XK_Thai_popla 0xdbb
#define XK_Thai_phophung 0xdbc
#define XK_Thai_fofa 0xdbd
#define XK_Thai_phophan 0xdbe
#define XK_Thai_fofan 0xdbf
#define XK_Thai_phosamphao 0xdc0
#define XK_Thai_moma 0xdc1
#define XK_Thai_yoyak 0xdc2
#define XK_Thai_rorua 0xdc3
#define XK_Thai_ru 0xdc4
#define XK_Thai_loling 0xdc5
#define XK_Thai_lu 0xdc6
#define XK_Thai_wowaen 0xdc7
#define XK_Thai_sosala 0xdc8
#define XK_Thai_sorusi 0xdc9
#define XK_Thai_sosua 0xdca
#define XK_Thai_hohip 0xdcb
#define XK_Thai_lochula 0xdcc
#define XK_Thai_oang 0xdcd
#define XK_Thai_honokhuk 0xdce
#define XK_Thai_paiyannoi 0xdcf
#define XK_Thai_saraa 0xdd0
#define XK_Thai_maihanakat 0xdd1
#define XK_Thai_saraaa 0xdd2
#define XK_Thai_saraam 0xdd3
#define XK_Thai_sarai 0xdd4
#define XK_Thai_saraii 0xdd5
#define XK_Thai_saraue 0xdd6
#define XK_Thai_sarauee 0xdd7
#define XK_Thai_sarau 0xdd8
#define XK_Thai_sarauu 0xdd9
#define XK_Thai_phinthu 0xdda
#define XK_Thai_maihanakat_maitho 0xdde
#define XK_Thai_baht 0xddf
#define XK_Thai_sarae 0xde0
#define XK_Thai_saraae 0xde1
#define XK_Thai_sarao 0xde2
#define XK_Thai_saraaimaimuan 0xde3
#define XK_Thai_saraaimaimalai 0xde4
#define XK_Thai_lakkhangyao 0xde5
#define XK_Thai_maiyamok 0xde6
#define XK_Thai_maitaikhu 0xde7
#define XK_Thai_maiek 0xde8
#define XK_Thai_maitho 0xde9
#define XK_Thai_maitri 0xdea
#define XK_Thai_maichattawa 0xdeb
#define XK_Thai_thanthakhat 0xdec
#define XK_Thai_nikhahit 0xded
#define XK_Thai_leksun 0xdf0
#define XK_Thai_leknung 0xdf1
#define XK_Thai_leksong 0xdf2
#define XK_Thai_leksam 0xdf3
#define XK_Thai_leksi 0xdf4
#define XK_Thai_lekha 0xdf5
#define XK_Thai_lekhok 0xdf6
#define XK_Thai_lekchet 0xdf7
#define XK_Thai_lekpaet 0xdf8
#define XK_Thai_lekkao 0xdf9
#endif /* XK_THAI */
/*
* Korean
* Byte 3 = e
*/
#ifdef XK_KOREAN
#define XK_Hangul 0xff31 /* Hangul start/stop(toggle) */
#define XK_Hangul_Start 0xff32 /* Hangul start */
#define XK_Hangul_End 0xff33 /* Hangul end, English start */
#define XK_Hangul_Hanja 0xff34 /* Start Hangul->Hanja Conversion */
#define XK_Hangul_Jamo 0xff35 /* Hangul Jamo mode */
#define XK_Hangul_Romaja 0xff36 /* Hangul Romaja mode */
#define XK_Hangul_Codeinput 0xff37 /* Hangul code input mode */
#define XK_Hangul_Jeonja 0xff38 /* Jeonja mode */
#define XK_Hangul_Banja 0xff39 /* Banja mode */
#define XK_Hangul_PreHanja 0xff3a /* Pre Hanja conversion */
#define XK_Hangul_PostHanja 0xff3b /* Post Hanja conversion */
#define XK_Hangul_SingleCandidate 0xff3c /* Single candidate */
#define XK_Hangul_MultipleCandidate 0xff3d /* Multiple candidate */
#define XK_Hangul_PreviousCandidate 0xff3e /* Previous candidate */
#define XK_Hangul_Special 0xff3f /* Special symbols */
#define XK_Hangul_switch 0xFF7E /* Alias for mode_switch */
/* Hangul Consonant Characters */
#define XK_Hangul_Kiyeog 0xea1
#define XK_Hangul_SsangKiyeog 0xea2
#define XK_Hangul_KiyeogSios 0xea3
#define XK_Hangul_Nieun 0xea4
#define XK_Hangul_NieunJieuj 0xea5
#define XK_Hangul_NieunHieuh 0xea6
#define XK_Hangul_Dikeud 0xea7
#define XK_Hangul_SsangDikeud 0xea8
#define XK_Hangul_Rieul 0xea9
#define XK_Hangul_RieulKiyeog 0xeaa
#define XK_Hangul_RieulMieum 0xeab
#define XK_Hangul_RieulPieub 0xeac
#define XK_Hangul_RieulSios 0xead
#define XK_Hangul_RieulTieut 0xeae
#define XK_Hangul_RieulPhieuf 0xeaf
#define XK_Hangul_RieulHieuh 0xeb0
#define XK_Hangul_Mieum 0xeb1
#define XK_Hangul_Pieub 0xeb2
#define XK_Hangul_SsangPieub 0xeb3
#define XK_Hangul_PieubSios 0xeb4
#define XK_Hangul_Sios 0xeb5
#define XK_Hangul_SsangSios 0xeb6
#define XK_Hangul_Ieung 0xeb7
#define XK_Hangul_Jieuj 0xeb8
#define XK_Hangul_SsangJieuj 0xeb9
#define XK_Hangul_Cieuc 0xeba
#define XK_Hangul_Khieuq 0xebb
#define XK_Hangul_Tieut 0xebc
#define XK_Hangul_Phieuf 0xebd
#define XK_Hangul_Hieuh 0xebe
/* Hangul Vowel Characters */
#define XK_Hangul_A 0xebf
#define XK_Hangul_AE 0xec0
#define XK_Hangul_YA 0xec1
#define XK_Hangul_YAE 0xec2
#define XK_Hangul_EO 0xec3
#define XK_Hangul_E 0xec4
#define XK_Hangul_YEO 0xec5
#define XK_Hangul_YE 0xec6
#define XK_Hangul_O 0xec7
#define XK_Hangul_WA 0xec8
#define XK_Hangul_WAE 0xec9
#define XK_Hangul_OE 0xeca
#define XK_Hangul_YO 0xecb
#define XK_Hangul_U 0xecc
#define XK_Hangul_WEO 0xecd
#define XK_Hangul_WE 0xece
#define XK_Hangul_WI 0xecf
#define XK_Hangul_YU 0xed0
#define XK_Hangul_EU 0xed1
#define XK_Hangul_YI 0xed2
#define XK_Hangul_I 0xed3
/* Hangul syllable-final (JongSeong) Characters */
#define XK_Hangul_J_Kiyeog 0xed4
#define XK_Hangul_J_SsangKiyeog 0xed5
#define XK_Hangul_J_KiyeogSios 0xed6
#define XK_Hangul_J_Nieun 0xed7
#define XK_Hangul_J_NieunJieuj 0xed8
#define XK_Hangul_J_NieunHieuh 0xed9
#define XK_Hangul_J_Dikeud 0xeda
#define XK_Hangul_J_Rieul 0xedb
#define XK_Hangul_J_RieulKiyeog 0xedc
#define XK_Hangul_J_RieulMieum 0xedd
#define XK_Hangul_J_RieulPieub 0xede
#define XK_Hangul_J_RieulSios 0xedf
#define XK_Hangul_J_RieulTieut 0xee0
#define XK_Hangul_J_RieulPhieuf 0xee1
#define XK_Hangul_J_RieulHieuh 0xee2
#define XK_Hangul_J_Mieum 0xee3
#define XK_Hangul_J_Pieub 0xee4
#define XK_Hangul_J_PieubSios 0xee5
#define XK_Hangul_J_Sios 0xee6
#define XK_Hangul_J_SsangSios 0xee7
#define XK_Hangul_J_Ieung 0xee8
#define XK_Hangul_J_Jieuj 0xee9
#define XK_Hangul_J_Cieuc 0xeea
#define XK_Hangul_J_Khieuq 0xeeb
#define XK_Hangul_J_Tieut 0xeec
#define XK_Hangul_J_Phieuf 0xeed
#define XK_Hangul_J_Hieuh 0xeee
/* Ancient Hangul Consonant Characters */
#define XK_Hangul_RieulYeorinHieuh 0xeef
#define XK_Hangul_SunkyeongeumMieum 0xef0
#define XK_Hangul_SunkyeongeumPieub 0xef1
#define XK_Hangul_PanSios 0xef2
#define XK_Hangul_KkogjiDalrinIeung 0xef3
#define XK_Hangul_SunkyeongeumPhieuf 0xef4
#define XK_Hangul_YeorinHieuh 0xef5
/* Ancient Hangul Vowel Characters */
#define XK_Hangul_AraeA 0xef6
#define XK_Hangul_AraeAE 0xef7
/* Ancient Hangul syllable-final (JongSeong) Characters */
#define XK_Hangul_J_PanSios 0xef8
#define XK_Hangul_J_KkogjiDalrinIeung 0xef9
#define XK_Hangul_J_YeorinHieuh 0xefa
/* Korean currency symbol */
#define XK_Korean_Won 0xeff
#endif /* XK_KOREAN */
main.c
View file @ 94f04a86
/*
* OSXvnc Copyright (C) 2001 Dan McGuirk <mcguirk@incompleteness.net>.
* Original Xvnc code Copyright (C) 1999 AT&T Laboratories Cambridge.
* All Rights Reserved.
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
* This file is called main.c, because it contains most of the new functions
* for use with LibVNCServer.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* LibVNCServer (C) 2001 Johannes E. Schindelin <Johannes.Schindelin@gmx.de>
* Original OSXvnc (C) 2001 Dan McGuirk <mcguirk@incompleteness.net>.
* Original Xvnc (C) 1999 AT&T Laboratories Cambridge.
* All Rights Reserved.
*
* You should have received a copy of the GNU General Public License
* along with this software; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
* see GPL (latest version) for full details
*/
#include <stdio.h>
......@@ -273,9 +264,6 @@ processArguments(rfbScreenInfoPtr rfbScreen,int argc, char *argv[])
} else if (strcmp(argv[i], "-rfbauth") == 0) { /* -rfbauth passwd-file */
if (i + 1 >= argc) usage();
rfbScreen->rfbAuthPasswdFile = argv[++i];
} else if (strcmp(argv[i], "-deferupdate") == 0) { /* -deferupdate ms */
if (i + 1 >= argc) usage();
rfbScreen->rfbDeferUpdateTime = atoi(argv[++i]);
} else if (strcmp(argv[i], "-desktop") == 0) { /* -desktop desktop-name */
if (i + 1 >= argc) usage();
rfbScreen->desktopName = argv[++i];
......@@ -314,6 +302,8 @@ void defaultSetXCutText(char* text, int len, rfbClientPtr cl)
{
}
/* TODO: add a nice VNC or RFB cursor */
static rfbCursor myCursor =
{
//width: 8, height: 7, xhot: 3, yhot: 3,
......@@ -353,6 +343,8 @@ void doNothingWithClient(rfbClientPtr cl)
rfbScreenInfoPtr rfbDefaultScreenInit(int argc,char** argv,int width,int height,int bitsPerSample,int samplesPerPixel,int bytesPerPixel)
{
rfbScreenInfoPtr rfbScreen=malloc(sizeof(rfbScreenInfo));
rfbPixelFormat* format=&rfbScreen->rfbServerFormat;
rfbScreen->rfbPort=5900;
rfbScreen->socketInitDone=FALSE;
rfbScreen->inetdSock=-1;
......@@ -379,56 +371,44 @@ rfbScreenInfoPtr rfbDefaultScreenInit(int argc,char** argv,int width,int height,
rfbScreen->bitsPerPixel = rfbScreen->depth = 8*bytesPerPixel;
gethostname(rfbScreen->rfbThisHost, 255);
rfbScreen->paddedWidthInBytes = width*bytesPerPixel;
rfbScreen->rfbServerFormat.bitsPerPixel = rfbScreen->bitsPerPixel;
rfbScreen->rfbServerFormat.depth = rfbScreen->depth;
rfbScreen->rfbServerFormat.bigEndian = !(*(char *)&rfbEndianTest);
rfbScreen->rfbServerFormat.trueColour = TRUE;
/* Why? (TODO)
if (samplesPerPixel != 3) {
rfbLog("screen format not supported. exiting.\n");
exit(1);
/* format */
format->bitsPerPixel = rfbScreen->bitsPerPixel;
format->depth = rfbScreen->depth;
format->bigEndian = rfbEndianTest?FALSE:TRUE;
format->trueColour = TRUE;
if(bytesPerPixel == 8) {
format->redMax = 7;
format->greenMax = 7;
format->blueMax = 3;
format->redShift = 0;
format->greenShift = 3;
format->blueShift = 6;
} else {
format->redMax = (1 << bitsPerSample) - 1;
format->greenMax = (1 << bitsPerSample) - 1;
format->blueMax = (1 << bitsPerSample) - 1;
if(rfbEndianTest) {
format->redShift = 0;
format->greenShift = bitsPerSample;
format->blueShift = bitsPerSample * 2;
} else {
format->redShift = bitsPerSample*3;
format->greenShift = bitsPerSample*2;
format->blueShift = bitsPerSample;
}
}
*/
/* This works for 16 and 32-bit, but not for 8-bit.
What should it be for 8-bit? (Shouldn't 8-bit use a colormap?) */
rfbScreen->rfbServerFormat.redMax = (1 << bitsPerSample) - 1;
rfbScreen->rfbServerFormat.greenMax = (1 << bitsPerSample) - 1;
rfbScreen->rfbServerFormat.blueMax = (1 << bitsPerSample) - 1;
rfbScreen->rfbServerFormat.redShift = bitsPerSample * 2;
rfbScreen->rfbServerFormat.greenShift = bitsPerSample;
rfbScreen->rfbServerFormat.blueShift = 0;
/* cursor */
rfbScreen->cursorIsDrawn = FALSE;
rfbScreen->dontSendFramebufferUpdate = FALSE;
rfbScreen->cursorX=rfbScreen->cursorY=rfbScreen->underCursorBufferLen=0;
rfbScreen->underCursorBuffer=NULL;
/* We want to use the X11 REGION_* macros without having an actual
X11 ScreenPtr, so we do this. Pretty ugly, but at least it lets us
avoid hacking up regionstr.h, or changing every call to REGION_*
(which actually I should probably do eventually). */
/*
rfbScreen->screen.RegionCreate = miRegionCreate;
rfbScreen->screen.RegionInit = miRegionInit;
rfbScreen->screen.RegionCopy = miRegionCopy;
rfbScreen->screen.RegionDestroy = miRegionDestroy;
rfbScreen->screen.RegionUninit = miRegionUninit;
rfbScreen->screen.Intersect = miIntersect;
rfbScreen->screen.Union = miUnion;
rfbScreen->screen.Subtract = miSubtract;
rfbScreen->screen.Inverse = miInverse;
rfbScreen->screen.RegionReset = miRegionReset;
rfbScreen->screen.TranslateRegion = miTranslateRegion;
rfbScreen->screen.RectIn = miRectIn;
rfbScreen->screen.PointInRegion = miPointInRegion;
rfbScreen->screen.RegionNotEmpty = miRegionNotEmpty;
rfbScreen->screen.RegionEmpty = miRegionEmpty;
rfbScreen->screen.RegionExtents = miRegionExtents;
rfbScreen->screen.RegionAppend = miRegionAppend;
rfbScreen->screen.RegionValidate = miRegionValidate;
*/
/* proc's and hook's */
rfbScreen->kbdAddEvent = defaultKbdAddEvent;
rfbScreen->kbdReleaseAllKeys = doNothingWithClient;
......
pnmshow.c
View file @ 94f04a86
......@@ -48,6 +48,9 @@ int main(int argc,char** argv)
rfbScreen->rfbAlwaysShared = TRUE;
rfbScreen->kbdAddEvent = HandleKey;
/* enable http */
rfbScreen->httpDir = "./classes";
/* allocate picture and read it */
rfbScreen->frameBuffer = (char*)malloc(width*height*4);
fread(rfbScreen->frameBuffer,width*3,height,in);
......@@ -55,16 +58,9 @@ int main(int argc,char** argv)
/* correct the format to 4 bytes instead of 3 */
for(i=width*height-1;i>=0;i--) {
rfbScreen->frameBuffer[i*4+2]=rfbScreen->frameBuffer[i*3+0];
rfbScreen->frameBuffer[i*4+2]=rfbScreen->frameBuffer[i*3+2];
rfbScreen->frameBuffer[i*4+1]=rfbScreen->frameBuffer[i*3+1];
rfbScreen->frameBuffer[i*4+0]=rfbScreen->frameBuffer[i*3+2];
}
for(i=0;i<200;i++) {
rfbScreen->frameBuffer[i*4+i*width*4]=0;
rfbScreen->frameBuffer[i*4+i*width*4+1]=0;
rfbScreen->frameBuffer[i*4+i*width*4+2]=0;
rfbScreen->frameBuffer[i*4+i*width*4+3]=0;
rfbScreen->frameBuffer[i*4+0]=rfbScreen->frameBuffer[i*3+0];
}
/* run event loop */
......
region.h
View file @ 94f04a86
/*#define KeySym ___KeySym
#define Bool ___Bool
#define _Box ___Box
#define BoxRec ___BoxRec
#define _RegData ___RegData
#define RegDataRec ___RegDataRec
#define RegDataPtr ___RegDataPtr
#define _Region ___Region
#define RegionRec ___RegionRec
#define RegionPtr ___RegionPtr
#define CARD8 ___CARD8
#define CARD16 ___CARD16
#define CARD32 ___CARD32
#include "X11/Xalloca.h"
#include "Xserver/regionstr.h"
#undef KeySym
#undef Bool
#undef _Box
#undef BoxRec
#undef _RegData
#undef RegDataRec
#undef RegDataPtr
#undef _Region
#undef RegionRec
#undef RegionPtr
#undef CARD8
#undef CARD16
#undef CARD32
#ifndef REGION_H
#define REGION_H
#undef REGION_INTERSECT
#undef REGION_UNION
#undef REGION_SUBTRACT
#undef REGION_TRANSLATE
#undef REGION_INIT
#undef REGION_UNINIT
#undef REGION_EMPTY
#undef REGION_NOTEMPTY
#undef FALSE
#undef TRUE
*/
#define NullRegion ((RegionPtr)0)
#define NullBox ((BoxPtr)0)
typedef struct RegDataRec {
long size;
long numRects;
/* BoxRec rects[size]; in memory but not explicitly declared */
} RegDataRec;
extern void miRegionInit(RegionPtr,BoxPtr,int);
extern void miRegionUninit(RegionPtr);
......@@ -47,3 +18,25 @@ extern Bool miIntersect(RegionPtr,RegionPtr,RegionPtr);
extern Bool miSubtract(RegionPtr,RegionPtr,RegionPtr);
extern Bool miUnion(RegionPtr,RegionPtr,RegionPtr);
extern void miTranslateRegion(RegionPtr,int,int);
#define REGION_NIL(reg) ((reg)->data && !(reg)->data->numRects)
#define REGION_NUM_RECTS(reg) ((reg)->data ? (reg)->data->numRects : 1)
#define REGION_SIZE(reg) ((reg)->data ? (reg)->data->size : 0)
#define REGION_RECTS(reg) ((reg)->data ? (BoxPtr)((reg)->data + 1) \
: &(reg)->extents)
#define REGION_BOXPTR(reg) ((BoxPtr)((reg)->data + 1))
#define REGION_BOX(reg,i) (&REGION_BOXPTR(reg)[i])
#define REGION_TOP(reg) REGION_BOX(reg, (reg)->data->numRects)
#define REGION_END(reg) REGION_BOX(reg, (reg)->data->numRects - 1)
#define REGION_SZOF(n) (sizeof(RegDataRec) + ((n) * sizeof(BoxRec)))
#define REGION_INIT(s,pReg,rect,size) miRegionInit(pReg,rect,size)
#define REGION_EMPTY(s,pReg) miRegionEmpty(pReg)
#define REGION_UNINIT(s,pReg) miRegionUninit(pReg)
#define REGION_NOTEMPTY(s,pReg) miRegionNotEmpty(pReg)
#define REGION_INTERSECT(s,newReg,reg1,reg2) miIntersect(newReg,reg1,reg2)
#define REGION_SUBTRACT(s,newReg,reg1,reg2) miSubtract(newReg,reg1,reg2)
#define REGION_UNION(s,newReg,reg1,reg2) miUnion(newReg,reg1,reg2)
#define REGION_TRANSLATE(s,pReg,x,y) miTranslateRegion(pReg,x,y)
#endif
rfb.h
View file @ 94f04a86
......@@ -23,64 +23,22 @@
* USA.
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
//#include "scrnintstr.h"
#include "keysym.h"
/* trying to replace the above with some more minimal set of includes */
//#include "misc.h"
//#include "Xmd.h"
/* TODO: this stuff has to go into autoconf */
typedef unsigned char CARD8;
typedef unsigned short CARD16;
typedef unsigned int CARD32;
typedef CARD32 Pixel;
typedef CARD32 KeySym;
typedef signed char Bool;
/* for some strange reason, "typedef signed char Bool;" yields a four byte
signed int on an SGI, but only for rfbserver.o!!! */
#define Bool signed char
#define FALSE 0
#define TRUE -1
#include "keysym.h"
/* region stuff */
#define NullRegion ((RegionPtr)0)
#define NullBox ((BoxPtr)0)
typedef struct _Box {
short x1, y1, x2, y2;
} BoxRec, *BoxPtr;
typedef struct _RegData {
long size;
long numRects;
/* BoxRec rects[size]; in memory but not explicitly declared */
} RegDataRec, *RegDataPtr;
typedef struct _Region {
BoxRec extents;
RegDataPtr data;
} RegionRec, *RegionPtr;
#define REGION_NIL(reg) ((reg)->data && !(reg)->data->numRects)
#define REGION_NUM_RECTS(reg) ((reg)->data ? (reg)->data->numRects : 1)
#define REGION_SIZE(reg) ((reg)->data ? (reg)->data->size : 0)
#define REGION_RECTS(reg) ((reg)->data ? (BoxPtr)((reg)->data + 1) \
: &(reg)->extents)
#define REGION_BOXPTR(reg) ((BoxPtr)((reg)->data + 1))
#define REGION_BOX(reg,i) (&REGION_BOXPTR(reg)[i])
#define REGION_TOP(reg) REGION_BOX(reg, (reg)->data->numRects)
#define REGION_END(reg) REGION_BOX(reg, (reg)->data->numRects - 1)
#define REGION_SZOF(n) (sizeof(RegDataRec) + ((n) * sizeof(BoxRec)))
#define REGION_INIT(s,pReg,rect,size) miRegionInit(pReg,rect,size)
#define REGION_EMPTY(s,pReg) miRegionEmpty(pReg)
#define REGION_UNINIT(s,pReg) miRegionUninit(pReg)
#define REGION_NOTEMPTY(s,pReg) miRegionNotEmpty(pReg)
#define REGION_INTERSECT(s,newReg,reg1,reg2) miIntersect(newReg,reg1,reg2)
#define REGION_SUBTRACT(s,newReg,reg1,reg2) miSubtract(newReg,reg1,reg2)
#define REGION_UNION(s,newReg,reg1,reg2) miUnion(newReg,reg1,reg2)
#define REGION_TRANSLATE(s,pReg,x,y) miTranslateRegion(pReg,x,y)
//#include "regionstr.h"
#define xalloc malloc
#define xrealloc realloc
......@@ -266,6 +224,19 @@ typedef void (*rfbTranslateFnType)(char *table, rfbPixelFormat *in,
int width, int height);
/* region stuff */
typedef struct BoxRec {
short x1, y1, x2, y2;
} BoxRec, *BoxPtr;
typedef struct RegDataRec* RegDataPtr;
typedef struct RegionRec {
BoxRec extents;
RegDataPtr data;
} RegionRec, *RegionPtr;
/*
* Per-client structure.
*/
......@@ -457,9 +428,9 @@ typedef struct rfbClientRec {
static const int rfbEndianTest = (_BYTE_ORDER == _LITTLE_ENDIAN);
#define Swap16IfLE(s) (*(const char *)&rfbEndianTest ? Swap16(s) : (s))
#define Swap16IfLE(s) (rfbEndianTest ? Swap16(s) : (s))
#define Swap32IfLE(l) (*(const char *)&rfbEndianTest ? Swap32(l) : (l))
#define Swap32IfLE(l) (rfbEndianTest ? Swap32(l) : (l))
/* main.c */
......
rfbserver.c
View file @ 94f04a86
......@@ -25,6 +25,8 @@
#include <stdio.h>
#include <stdlib.h>
#include "rfb.h"
#include "region.h"
#include <unistd.h>
#include <pwd.h>
#include <sys/types.h>
......@@ -34,8 +36,6 @@
#ifdef HAVE_PTHREADS
#include <pthread.h>
#endif
#include "rfb.h"
#include "region.h"
rfbClientPtr pointerClient = NULL; /* Mutex for pointer events */
......@@ -273,7 +273,7 @@ rfbClientConnectionGone(cl)
free(cl->host);
/* Release the compression state structures if any. */
if ( cl->compStreamInited == TRUE ) {
if ( cl->compStreamInited ) {
deflateEnd( &(cl->compStream) );
}
......@@ -523,8 +523,8 @@ rfbProcessClientNormalMessage(cl)
cl->format.bitsPerPixel = msg.spf.format.bitsPerPixel;
cl->format.depth = msg.spf.format.depth;
cl->format.bigEndian = (msg.spf.format.bigEndian ? 1 : 0);
cl->format.trueColour = (msg.spf.format.trueColour ? 1 : 0);
cl->format.bigEndian = (msg.spf.format.bigEndian ? TRUE : FALSE);
cl->format.trueColour = (msg.spf.format.trueColour ? TRUE : FALSE);
cl->format.redMax = Swap16IfLE(msg.spf.format.redMax);
cl->format.greenMax = Swap16IfLE(msg.spf.format.greenMax);
cl->format.blueMax = Swap16IfLE(msg.spf.format.blueMax);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment