comparison src/video/SDL_sysvideo.h @ 4755:436183eb30c8

Merge with main repo (mainly for non-printable character fix)
author dewyatt
date Sun, 18 Jul 2010 13:48:23 -0400
parents 11b0a6a3eb4d dbbfdb9ea716
children 518d1679d2d0
comparison
equal deleted inserted replaced
4754:2072fed2f583 4755:436183eb30c8
301 /* Text input */ 301 /* Text input */
302 void (*StartTextInput) (_THIS); 302 void (*StartTextInput) (_THIS);
303 void (*StopTextInput) (_THIS); 303 void (*StopTextInput) (_THIS);
304 void (*SetTextInputRect) (_THIS, SDL_Rect *rect); 304 void (*SetTextInputRect) (_THIS, SDL_Rect *rect);
305 305
306 /* Clipboard */
307 int (*SetClipboardText) (_THIS, const char *text);
308 char * (*GetClipboardText) (_THIS);
309 SDL_bool (*HasClipboardText) (_THIS);
310
306 /* * * */ 311 /* * * */
307 /* Data common to all drivers */ 312 /* Data common to all drivers */
308 SDL_bool suspend_screensaver; 313 SDL_bool suspend_screensaver;
309 int num_displays; 314 int num_displays;
310 SDL_VideoDisplay *displays; 315 SDL_VideoDisplay *displays;
311 int current_display; 316 int current_display;
312 Uint8 window_magic; 317 Uint8 window_magic;
313 Uint8 texture_magic; 318 Uint8 texture_magic;
314 Uint32 next_object_id; 319 Uint32 next_object_id;
320 char * clipboard_text;
315 321
316 /* * * */ 322 /* * * */
317 /* Data used by the GL drivers */ 323 /* Data used by the GL drivers */
318 struct 324 struct
319 { 325 {