Make no translation messages DEBUG_KBD.
Clean up includes, fix a few compile warnings, avoid rdesktop.h depending on X (at the expense of KeySym -> uint32 - maybe in the future we need a better proto scheme). git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@189 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Matt Chapman
parent
c0c6d24d16
commit
d2b051fb30
@ -139,12 +139,14 @@ static void
|
||||
licence_process_demand(STREAM s)
|
||||
{
|
||||
uint8 null_data[SEC_MODULUS_SIZE];
|
||||
uint8 hwid[LICENCE_HWID_SIZE];
|
||||
uint8 signature[LICENCE_SIGNATURE_SIZE];
|
||||
uint8 *server_random;
|
||||
#ifdef SAVE_LICENCE
|
||||
uint8 signature[LICENCE_SIGNATURE_SIZE];
|
||||
uint8 hwid[LICENCE_HWID_SIZE];
|
||||
uint8 *licence_data;
|
||||
int licence_size;
|
||||
RC4_KEY crypt_key;
|
||||
#endif
|
||||
|
||||
/* Retrieve the server random from the incoming packet */
|
||||
in_uint8p(s, server_random, SEC_RANDOM_SIZE);
|
||||
|
||||
45
proto.h
45
proto.h
@ -1,17 +1,14 @@
|
||||
/* bitmap.c */
|
||||
BOOL bitmap_decompress(unsigned char *output, int width, int height, unsigned char *input,
|
||||
int size);
|
||||
BOOL bitmap_decompress(unsigned char *output, int width, int height, unsigned char *input, int size);
|
||||
/* cache.c */
|
||||
HBITMAP cache_get_bitmap(uint8 cache_id, uint16 cache_idx);
|
||||
void cache_put_bitmap(uint8 cache_id, uint16 cache_idx, HBITMAP bitmap);
|
||||
FONTGLYPH *cache_get_font(uint8 font, uint16 character);
|
||||
void cache_put_font(uint8 font, uint16 character, uint16 offset, uint16 baseline, uint16 width,
|
||||
uint16 height, HGLYPH pixmap);
|
||||
void cache_put_font(uint8 font, uint16 character, uint16 offset, uint16 baseline, uint16 width, uint16 height, HGLYPH pixmap);
|
||||
DATABLOB *cache_get_text(uint8 cache_id);
|
||||
void cache_put_text(uint8 cache_id, void *data, int length);
|
||||
uint8 *cache_get_desktop(uint32 offset, int cx, int cy, int bytes_per_pixel);
|
||||
void cache_put_desktop(uint32 offset, int cx, int cy, int scanline, int bytes_per_pixel,
|
||||
uint8 * data);
|
||||
void cache_put_desktop(uint32 offset, int cx, int cy, int scanline, int bytes_per_pixel, uint8 *data);
|
||||
HCURSOR cache_get_cursor(uint16 cache_idx);
|
||||
void cache_put_cursor(uint16 cache_idx, HCURSOR cursor);
|
||||
/* iso.c */
|
||||
@ -40,15 +37,11 @@ void xfree(void *mem);
|
||||
void error(char *format, ...);
|
||||
void unimpl(char *format, ...);
|
||||
void hexdump(unsigned char *p, unsigned int len);
|
||||
int load_licence(unsigned char **data);
|
||||
void save_licence(unsigned char *data, int length);
|
||||
/* rdp.c */
|
||||
void rdp_out_unistr(STREAM s, char *string, int len);
|
||||
void rdp_send_input(uint32 time, uint16 message_type, uint16 device_flags, uint16 param1,
|
||||
uint16 param2);
|
||||
void rdp_send_input(uint32 time, uint16 message_type, uint16 device_flags, uint16 param1, uint16 param2);
|
||||
void rdp_main_loop(void);
|
||||
BOOL rdp_connect(char *server, uint32 flags, char *domain, char *password, char *command,
|
||||
char *directory);
|
||||
BOOL rdp_connect(char *server, uint32 flags, char *domain, char *password, char *command, char *directory);
|
||||
void rdp_disconnect(void);
|
||||
/* readpass.c */
|
||||
char *askpass(char *askpass, const char *msg);
|
||||
@ -56,8 +49,7 @@ char *askpass(char *askpass, const char *msg);
|
||||
void sec_hash_48(uint8 *out, uint8 *in, uint8 *salt1, uint8 *salt2, uint8 salt);
|
||||
void sec_hash_16(uint8 *out, uint8 *in, uint8 *salt1, uint8 *salt2);
|
||||
void buf_out_uint32(uint8 *buffer, uint32 value);
|
||||
void sec_sign(uint8 * signature, int siglen, uint8 * session_key, int keylen, uint8 * data,
|
||||
int datalen);
|
||||
void sec_sign(uint8 *signature, int siglen, uint8 *session_key, int keylen, uint8 *data, int datalen);
|
||||
STREAM sec_init(uint32 flags, int maxlen);
|
||||
void sec_send(STREAM s, uint32 flags);
|
||||
STREAM sec_recv(void);
|
||||
@ -71,16 +63,17 @@ BOOL tcp_connect(char *server);
|
||||
void tcp_disconnect(void);
|
||||
/* xkeymap.c */
|
||||
void xkeymap_init(void);
|
||||
BOOL handle_special_keys(KeySym keysym, uint32 ev_time, BOOL pressed);
|
||||
key_translation xkeymap_translate_key(KeySym keysym, unsigned int keycode, unsigned int state);
|
||||
BOOL handle_special_keys(uint32 keysym, uint32 ev_time, BOOL pressed);
|
||||
key_translation xkeymap_translate_key(uint32 keysym, unsigned int keycode, unsigned int state);
|
||||
uint16 xkeymap_translate_button(unsigned int button);
|
||||
char *get_ksname(KeySym keysym);
|
||||
char *get_ksname(uint32 keysym);
|
||||
void ensure_remote_modifiers(uint32 ev_time, key_translation tr);
|
||||
void reset_modifier_keys(void);
|
||||
void rdp_send_scancode(uint32 time, uint16 flags, uint16 scancode);
|
||||
/* xwin.c */
|
||||
BOOL get_key_state(int keysym);
|
||||
BOOL ui_init(void);
|
||||
void ui_create_window_obj(int xpos, int ypos, int width, int height, int valuemask);
|
||||
void ui_deinit(void);
|
||||
BOOL ui_create_window(void);
|
||||
void ui_destroy_window(void);
|
||||
void xwin_toggle_fullscreen(void);
|
||||
@ -91,8 +84,7 @@ void ui_paint_bitmap(int x, int y, int cx, int cy, int width, int height, uint8
|
||||
void ui_destroy_bitmap(HBITMAP bmp);
|
||||
HGLYPH ui_create_glyph(int width, int height, uint8 *data);
|
||||
void ui_destroy_glyph(HGLYPH glyph);
|
||||
HCURSOR ui_create_cursor(unsigned int x, unsigned int y, int width, int height, uint8 * andmask,
|
||||
uint8 * xormask);
|
||||
HCURSOR ui_create_cursor(unsigned int x, unsigned int y, int width, int height, uint8 *andmask, uint8 *xormask);
|
||||
void ui_set_cursor(HCURSOR cursor);
|
||||
void ui_destroy_cursor(HCURSOR cursor);
|
||||
HCOLOURMAP ui_create_colourmap(COLOURMAP *colours);
|
||||
@ -102,18 +94,13 @@ void ui_set_clip(int x, int y, int cx, int cy);
|
||||
void ui_reset_clip(void);
|
||||
void ui_bell(void);
|
||||
void ui_destblt(uint8 opcode, int x, int y, int cx, int cy);
|
||||
void ui_patblt(uint8 opcode, int x, int y, int cx, int cy, BRUSH * brush, int bgcolour,
|
||||
int fgcolour);
|
||||
void ui_patblt(uint8 opcode, int x, int y, int cx, int cy, BRUSH *brush, int bgcolour, int fgcolour);
|
||||
void ui_screenblt(uint8 opcode, int x, int y, int cx, int cy, int srcx, int srcy);
|
||||
void ui_memblt(uint8 opcode, int x, int y, int cx, int cy, HBITMAP src, int srcx, int srcy);
|
||||
void ui_triblt(uint8 opcode, int x, int y, int cx, int cy, HBITMAP src, int srcx, int srcy,
|
||||
BRUSH * brush, int bgcolour, int fgcolour);
|
||||
void ui_triblt(uint8 opcode, int x, int y, int cx, int cy, HBITMAP src, int srcx, int srcy, BRUSH *brush, int bgcolour, int fgcolour);
|
||||
void ui_line(uint8 opcode, int startx, int starty, int endx, int endy, PEN *pen);
|
||||
void ui_rect(int x, int y, int cx, int cy, int colour);
|
||||
void ui_draw_glyph(int mixmode, int x, int y, int cx, int cy, HGLYPH glyph, int srcx, int srcy,
|
||||
int bgcolour, int fgcolour);
|
||||
void ui_draw_text(uint8 font, uint8 flags, int mixmode, int x, int y, int clipx, int clipy,
|
||||
int clipcx, int clipcy, int boxx, int boxy, int boxcx, int boxcy, int bgcolour,
|
||||
int fgcolour, uint8 * text, uint8 length);
|
||||
void ui_draw_glyph(int mixmode, int x, int y, int cx, int cy, HGLYPH glyph, int srcx, int srcy, int bgcolour, int fgcolour);
|
||||
void ui_draw_text(uint8 font, uint8 flags, int mixmode, int x, int y, int clipx, int clipy, int clipcx, int clipcy, int boxx, int boxy, int boxcx, int boxcy, int bgcolour, int fgcolour, uint8 *text, uint8 length);
|
||||
void ui_desktop_save(uint32 offset, int x, int y, int cx, int cy);
|
||||
void ui_desktop_restore(uint32 offset, int x, int y, int cx, int cy);
|
||||
|
||||
@ -21,7 +21,6 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <X11/Xlib.h>
|
||||
|
||||
#define VERSION "1.1.0"
|
||||
|
||||
@ -31,7 +30,7 @@
|
||||
#define DEBUG(args)
|
||||
#endif
|
||||
|
||||
#if defined(WITH_DEBUG_KBD)
|
||||
#ifdef WITH_DEBUG_KBD
|
||||
#define DEBUG_KBD(args) printf args;
|
||||
#else
|
||||
#define DEBUG_KBD(args)
|
||||
|
||||
28
xkeymap.c
28
xkeymap.c
@ -19,13 +19,11 @@
|
||||
*/
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/keysym.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#define XK_MISCELLANY
|
||||
#include <X11/keysymdef.h>
|
||||
#include <ctype.h>
|
||||
#include <limits.h>
|
||||
#include <assert.h>
|
||||
#include <time.h>
|
||||
#include "rdesktop.h"
|
||||
#include "scancodes.h"
|
||||
|
||||
@ -206,7 +204,6 @@ void
|
||||
xkeymap_init(void)
|
||||
{
|
||||
unsigned int max_keycode;
|
||||
int i;
|
||||
|
||||
if (strcmp(keymapname, "none"))
|
||||
xkeymap_read(keymapname);
|
||||
@ -217,7 +214,7 @@ xkeymap_init(void)
|
||||
/* Handles, for example, multi-scancode keypresses (which is not
|
||||
possible via keymap-files) */
|
||||
BOOL
|
||||
handle_special_keys(KeySym keysym, uint32 ev_time, BOOL pressed)
|
||||
handle_special_keys(uint32 keysym, uint32 ev_time, BOOL pressed)
|
||||
{
|
||||
switch (keysym)
|
||||
{
|
||||
@ -253,7 +250,7 @@ handle_special_keys(KeySym keysym, uint32 ev_time, BOOL pressed)
|
||||
|
||||
|
||||
key_translation
|
||||
xkeymap_translate_key(KeySym keysym, unsigned int keycode, unsigned int state)
|
||||
xkeymap_translate_key(uint32 keysym, unsigned int keycode, unsigned int state)
|
||||
{
|
||||
key_translation tr = { 0, 0 };
|
||||
|
||||
@ -278,13 +275,12 @@ xkeymap_translate_key(KeySym keysym, unsigned int keycode, unsigned int state)
|
||||
|
||||
if (tr.scancode != 0)
|
||||
{
|
||||
DEBUG_KBD
|
||||
(("Found key translation, scancode=0x%x, modifiers=0x%x\n",
|
||||
DEBUG_KBD(("Found key translation, scancode=0x%x, modifiers=0x%x\n",
|
||||
tr.scancode, tr.modifiers));
|
||||
return tr;
|
||||
}
|
||||
|
||||
fprintf(stderr, "No translation for (keysym 0x%lx, %s)\n", keysym, get_ksname(keysym));
|
||||
DEBUG_KBD(("No translation for (keysym 0x%lx, %s)\n", keysym, get_ksname(keysym)));
|
||||
|
||||
/* not in keymap, try to interpret the raw scancode */
|
||||
if ((keycode >= min_keycode) && (keycode <= 0x60))
|
||||
@ -299,11 +295,11 @@ xkeymap_translate_key(KeySym keysym, unsigned int keycode, unsigned int state)
|
||||
tr.modifiers = MapLeftShiftMask;
|
||||
}
|
||||
|
||||
fprintf(stderr, "Sending guessed scancode 0x%x\n", tr.scancode);
|
||||
DEBUG_KBD(("Sending guessed scancode 0x%x\n", tr.scancode));
|
||||
}
|
||||
else
|
||||
{
|
||||
fprintf(stderr, "No good guess for keycode 0x%x found\n", keycode);
|
||||
DEBUG_KBD(("No good guess for keycode 0x%x found\n", keycode));
|
||||
}
|
||||
|
||||
return tr;
|
||||
@ -330,7 +326,7 @@ xkeymap_translate_button(unsigned int button)
|
||||
}
|
||||
|
||||
char *
|
||||
get_ksname(KeySym keysym)
|
||||
get_ksname(uint32 keysym)
|
||||
{
|
||||
char *ksname = NULL;
|
||||
|
||||
@ -385,13 +381,9 @@ ensure_remote_modifiers(uint32 ev_time, key_translation tr)
|
||||
/* Left shift is down */
|
||||
rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LSHIFT);
|
||||
else
|
||||
{
|
||||
assert(MASK_HAS_BITS(remote_modifier_state, MapRightShiftMask));
|
||||
/* Right shift is down */
|
||||
rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RSHIFT);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/* AltGr */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user