/[cebix]/SheepShaver/src/Unix/video_x.cpp
ViewVC logotype

Diff of /SheepShaver/src/Unix/video_x.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.21 by gbeauche, Mon May 10 16:42:37 2004 UTC revision 1.22 by gbeauche, Fri May 14 08:24:31 2004 UTC
# Line 57  using std::sort; Line 57  using std::sort;
57    
58  // Constants  // Constants
59  const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";  const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
60  static const bool mac_cursor_enabled = false;   // Flag: Enable MacOS to X11 copy of cursor?  static const bool hw_mac_cursor_accl = true;    // Flag: Enable MacOS to X11 copy of cursor?
61    
62  // Global variables  // Global variables
63  static int32 frame_skip;  static int32 frame_skip;
# Line 506  static bool open_window(int width, int h Line 506  static bool open_window(int width, int h
506          XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);          XSetState(x_display, the_gc, black_pixel, white_pixel, GXcopy, AllPlanes);
507    
508          // Create cursor          // Create cursor
509          if (mac_cursor_enabled) {          if (hw_mac_cursor_accl) {
510                  cursor_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)MacCursor + 4, 16, 16, 16, 2);                  cursor_image = XCreateImage(x_display, vis, 1, XYPixmap, 0, (char *)MacCursor + 4, 16, 16, 16, 2);
511                  cursor_image->byte_order = MSBFirst;                  cursor_image->byte_order = MSBFirst;
512                  cursor_image->bitmap_bit_order = MSBFirst;                  cursor_image->bitmap_bit_order = MSBFirst;
# Line 2092  void video_set_palette(void) Line 2092  void video_set_palette(void)
2092    
2093  bool video_can_change_cursor(void)  bool video_can_change_cursor(void)
2094  {  {
2095          return mac_cursor_enabled && (display_type != DIS_SCREEN);          return hw_mac_cursor_accl && (display_type != DIS_SCREEN);
2096  }  }
2097    
2098    
# Line 2341  static void *redraw_func(void *arg) Line 2341  static void *redraw_func(void *arg)
2341                                                  update_display();                                                  update_display();
2342    
2343                                          // Set new cursor image if it was changed                                          // Set new cursor image if it was changed
2344                                          if (mac_cursor_enabled && cursor_changed) {                                          if (hw_mac_cursor_accl && cursor_changed) {
2345                                                  cursor_changed = false;                                                  cursor_changed = false;
2346                                                  memcpy(cursor_image->data, MacCursor + 4, 32);                                                  memcpy(cursor_image->data, MacCursor + 4, 32);
2347                                                  memcpy(cursor_mask_image->data, MacCursor + 36, 32);                                                  memcpy(cursor_mask_image->data, MacCursor + 36, 32);
Legend:
Removed from v.1.21  
changed lines
  Added in v.1.22
Christian Bauer">Christian Bauer
 ViewVC Help
Powered by ViewVC 1.1.15