firefox2/moz310924.patch

   1 --- widget/src/gtk2/nsWindow.cpp        2006-01-09 05:48:56.000000000 +0000
   2 +++ widget/src/gtk2/nsWindow.cpp        2006-08-09 18:51:41.000000000 +0000
   3 @@ -3512,15 +3512,19 @@
   4          gdkcursor = gdk_cursor_new(GDK_FLEUR);
   5          break;
   6      case eCursor_help:
   7 +        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "help");
   8          newType = MOZ_CURSOR_QUESTION_ARROW;
   9          break;
  10      case eCursor_copy: // CSS3
  11 +        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "copy");
  12          newType = MOZ_CURSOR_COPY;
  13          break;
  14      case eCursor_alias:
  15 +        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "alias");
  16          newType = MOZ_CURSOR_ALIAS;
  17          break;
  18      case eCursor_context_menu:
  19 +        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "context-menu");
  20          newType = MOZ_CURSOR_CONTEXT_MENU;
  21          break;
  22      case eCursor_cell:
  23 @@ -3533,6 +3537,7 @@
  24          newType = MOZ_CURSOR_HAND_GRABBING;
  25          break;
  26      case eCursor_spinning:
  27 +        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "wait"); // or maybe "progress" ?
  28          newType = MOZ_CURSOR_SPINNING;
  29          break;
  30      case eCursor_zoom_in:
  31 @@ -3542,25 +3547,34 @@
  32          newType = MOZ_CURSOR_ZOOM_OUT;
  33          break;
  34      case eCursor_not_allowed:
  35 +        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "not-allowed");
  36 +        newType = MOZ_CURSOR_NOT_ALLOWED;
  37 +        break;
  38      case eCursor_no_drop:
  39 +        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "no-drop");
  40          newType = MOZ_CURSOR_NOT_ALLOWED;
  41          break;
  42      case eCursor_col_resize:
  43 +        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "col-resize");
  44          newType = MOZ_CURSOR_COL_RESIZE;
  45          break;
  46      case eCursor_row_resize:
  47 +        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "row-resize");
  48          newType = MOZ_CURSOR_ROW_RESIZE;
  49          break;
  50      case eCursor_vertical_text:
  51 +        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "vertical-text");
  52          newType = MOZ_CURSOR_VERTICAL_TEXT;
  53          break;
  54      case eCursor_all_scroll:
  55          gdkcursor = gdk_cursor_new(GDK_FLEUR);
  56          break;
  57      case eCursor_nesw_resize:
  58 +        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "nesw-resize");
  59          newType = MOZ_CURSOR_NESW_RESIZE;
  60          break;
  61      case eCursor_nwse_resize:
  62 +        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "nwse-resize");
  63          newType = MOZ_CURSOR_NWSE_RESIZE;
  64          break;
  65      case eCursor_ns_resize:
  66 @@ -3577,7 +3591,7 @@
  67
  68      // if by now we dont have a xcursor, this means we have to make a
  69      // custom one
  70 -    if (newType != 0xff) {
  71 +    if (!gdkcursor && newType != 0xff) {
  72          gdk_color_parse("#000000", &fg);
  73          gdk_color_parse("#ffffff", &bg);
  74