From d613fa7dee5b68f9d8cc432500c753c520fc2156 Mon Sep 17 00:00:00 2001 From: "mats.palmgren%bredband.net" Date: Sat, 11 Sep 2004 23:24:30 +0000 Subject: [PATCH] Add CSS3 cursors, bug 163174, r=lordpixel@mac.com r=pinkerton@aol.net sr=dbaron@dbaron.org git-svn-id: svn://10.0.0.236/trunk@162144 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/camino/Camino.xcode/project.pbxproj | 132 +++- .../events/src/nsEventStateManager.cpp | 46 +- .../content/shared/public/nsCSSKeywordList.h | 14 + mozilla/content/shared/src/nsCSSProps.cpp | 19 +- mozilla/layout/base/nsStyleConsts.h | 11 +- mozilla/layout/base/public/nsStyleConsts.h | 11 +- mozilla/layout/style/nsCSSKeywordList.h | 14 + mozilla/layout/style/nsCSSProps.cpp | 19 +- mozilla/widget/public/nsIWidget.h | 28 +- mozilla/widget/src/beos/nsWindow.cpp | 63 +- mozilla/widget/src/build/res/col_resize.cur | Bin 0 -> 326 bytes mozilla/widget/src/build/res/row_resize.cur | Bin 0 -> 326 bytes .../widget/src/build/res/vertical_text.cur | Bin 0 -> 326 bytes mozilla/widget/src/build/widget.rc | 3 + .../widget/src/cocoa/cursors/colResize.tiff | Bin 0 -> 1258 bytes .../widget/src/cocoa/cursors/contextMenu.tiff | Bin 1274 -> 0 bytes .../widget/src/cocoa/cursors/rowResize.tiff | Bin 0 -> 1258 bytes .../widget/src/cocoa/cursors/sizeNESW.tiff | Bin 0 -> 1258 bytes .../widget/src/cocoa/cursors/sizeNWSE.tiff | Bin 0 -> 1258 bytes mozilla/widget/src/cocoa/cursors/vtIBeam.tiff | Bin 0 -> 1258 bytes mozilla/widget/src/cocoa/nsCursorManager.mm | 86 ++- mozilla/widget/src/gtk/nsGtkCursors.h | 582 +++++++++++------ mozilla/widget/src/gtk/nsWidget.cpp | 82 ++- mozilla/widget/src/gtk/nsWindow.cpp | 144 ++-- mozilla/widget/src/gtk2/nsGtkCursors.h | 618 +++++++++++------- mozilla/widget/src/gtk2/nsWindow.cpp | 54 +- mozilla/widget/src/mac/nsMacWidget.r | 190 ++---- mozilla/widget/src/mac/nsWindow.cpp | 83 ++- mozilla/widget/src/os2/nsWindow.cpp | 60 +- mozilla/widget/src/photon/nsWidget.cpp | 215 +++--- mozilla/widget/src/windows/nsWindow.cpp | 62 +- mozilla/widget/src/windows/resource.h | 3 + mozilla/widget/src/xlib/nsWidget.cpp | 52 +- mozilla/widget/src/xlib/nsXlibCursors.h | 222 ++++++- 34 files changed, 1950 insertions(+), 863 deletions(-) create mode 100755 mozilla/widget/src/build/res/col_resize.cur create mode 100755 mozilla/widget/src/build/res/row_resize.cur create mode 100755 mozilla/widget/src/build/res/vertical_text.cur create mode 100644 mozilla/widget/src/cocoa/cursors/colResize.tiff delete mode 100644 mozilla/widget/src/cocoa/cursors/contextMenu.tiff create mode 100644 mozilla/widget/src/cocoa/cursors/rowResize.tiff create mode 100644 mozilla/widget/src/cocoa/cursors/sizeNESW.tiff create mode 100644 mozilla/widget/src/cocoa/cursors/sizeNWSE.tiff create mode 100644 mozilla/widget/src/cocoa/cursors/vtIBeam.tiff diff --git a/mozilla/camino/Camino.xcode/project.pbxproj b/mozilla/camino/Camino.xcode/project.pbxproj index 3271eebd098..3887822fd68 100644 --- a/mozilla/camino/Camino.xcode/project.pbxproj +++ b/mozilla/camino/Camino.xcode/project.pbxproj @@ -1668,7 +1668,6 @@ 3F42EFB405EC13FA0045A30C, E091C0E006225EA3007D9E8F, E091C0E106225EA3007D9E8F, - E091C0E206225EA3007D9E8F, E091C0E306225EA3007D9E8F, E091C0E406225EA3007D9E8F, E091C0E506225EA3007D9E8F, @@ -1689,6 +1688,11 @@ 3FF08F1806E7D3C2001C9B19, 3FF08F1906E7D3C2001C9B19, 3FF08F1A06E7D3C2001C9B19, + E010866906BCA2E500BD5DE0, + E010866C06BCA2E500BD5DE0, + E010866D06BCA2E500BD5DE0, + E010866E06BCA2E500BD5DE0, + E010866F06BCA2E500BD5DE0, ); isa = PBXResourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -5604,7 +5608,6 @@ 3F42EFBB05EC13FA0045A30C, E091C0EF06225EA3007D9E8F, E091C0F006225EA3007D9E8F, - E091C0F106225EA3007D9E8F, E091C0F206225EA3007D9E8F, E091C0F306225EA3007D9E8F, E091C0F406225EA3007D9E8F, @@ -5625,6 +5628,11 @@ 3FF08F1E06E7D3C2001C9B19, 3FF08F1F06E7D3C2001C9B19, 3FF08F2006E7D3C2001C9B19, + E010867006BCA2E500BD5DE0, + E010867306BCA2E500BD5DE0, + E010867406BCA2E500BD5DE0, + E010867506BCA2E500BD5DE0, + E010867606BCA2E500BD5DE0, ); isa = PBXResourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -9482,21 +9490,120 @@ //E02 //E03 //E04 + E010866206BCA2E500BD5DE0 = { + isa = PBXFileReference; + lastKnownFileType = image.tiff; + path = colResize.tiff; + refType = 4; + sourceTree = ""; + }; + E010866506BCA2E500BD5DE0 = { + isa = PBXFileReference; + lastKnownFileType = image.tiff; + path = rowResize.tiff; + refType = 4; + sourceTree = ""; + }; + E010866606BCA2E500BD5DE0 = { + isa = PBXFileReference; + lastKnownFileType = image.tiff; + path = sizeNESW.tiff; + refType = 4; + sourceTree = ""; + }; + E010866706BCA2E500BD5DE0 = { + isa = PBXFileReference; + lastKnownFileType = image.tiff; + path = sizeNWSE.tiff; + refType = 4; + sourceTree = ""; + }; + E010866806BCA2E500BD5DE0 = { + isa = PBXFileReference; + lastKnownFileType = image.tiff; + path = vtIBeam.tiff; + refType = 4; + sourceTree = ""; + }; + E010866906BCA2E500BD5DE0 = { + fileRef = E010866206BCA2E500BD5DE0; + isa = PBXBuildFile; + settings = { + }; + }; + E010866C06BCA2E500BD5DE0 = { + fileRef = E010866506BCA2E500BD5DE0; + isa = PBXBuildFile; + settings = { + }; + }; + E010866D06BCA2E500BD5DE0 = { + fileRef = E010866606BCA2E500BD5DE0; + isa = PBXBuildFile; + settings = { + }; + }; + E010866E06BCA2E500BD5DE0 = { + fileRef = E010866706BCA2E500BD5DE0; + isa = PBXBuildFile; + settings = { + }; + }; + E010866F06BCA2E500BD5DE0 = { + fileRef = E010866806BCA2E500BD5DE0; + isa = PBXBuildFile; + settings = { + }; + }; + E010867006BCA2E500BD5DE0 = { + fileRef = E010866206BCA2E500BD5DE0; + isa = PBXBuildFile; + settings = { + }; + }; + E010867306BCA2E500BD5DE0 = { + fileRef = E010866506BCA2E500BD5DE0; + isa = PBXBuildFile; + settings = { + }; + }; + E010867406BCA2E500BD5DE0 = { + fileRef = E010866606BCA2E500BD5DE0; + isa = PBXBuildFile; + settings = { + }; + }; + E010867506BCA2E500BD5DE0 = { + fileRef = E010866706BCA2E500BD5DE0; + isa = PBXBuildFile; + settings = { + }; + }; + E010867606BCA2E500BD5DE0 = { + fileRef = E010866806BCA2E500BD5DE0; + isa = PBXBuildFile; + settings = { + }; + }; E091C0D006225EA3007D9E8F = { children = ( E091C0D106225EA3007D9E8F, E091C0D206225EA3007D9E8F, - E091C0D306225EA3007D9E8F, + E010866206BCA2E500BD5DE0, E091C0D406225EA3007D9E8F, + E010866506BCA2E500BD5DE0, E091C0D506225EA3007D9E8F, E091C0D606225EA3007D9E8F, E091C0D706225EA3007D9E8F, E091C0D806225EA3007D9E8F, E091C0D906225EA3007D9E8F, + E010866606BCA2E500BD5DE0, + E010866706BCA2E500BD5DE0, E091C0DA06225EA3007D9E8F, E091C0DB06225EA3007D9E8F, E091C0DC06225EA3007D9E8F, E091C0DD06225EA3007D9E8F, + E010866806BCA2E500BD5DE0, E091C0DE06225EA3007D9E8F, E091C0DF06225EA3007D9E8F, ); @@ -9520,13 +9627,6 @@ refType = 4; sourceTree = ""; }; - E091C0D306225EA3007D9E8F = { - isa = PBXFileReference; - lastKnownFileType = image.tiff; - path = contextMenu.tiff; - refType = 4; - sourceTree = ""; - }; E091C0D406225EA3007D9E8F = { isa = PBXFileReference; lastKnownFileType = image.tiff; @@ -9623,12 +9723,6 @@ settings = { }; }; - E091C0E206225EA3007D9E8F = { - fileRef = E091C0D306225EA3007D9E8F; - isa = PBXBuildFile; - settings = { - }; - }; E091C0E306225EA3007D9E8F = { fileRef = E091C0D406225EA3007D9E8F; isa = PBXBuildFile; @@ -9713,12 +9807,6 @@ settings = { }; }; - E091C0F106225EA3007D9E8F = { - fileRef = E091C0D306225EA3007D9E8F; - isa = PBXBuildFile; - settings = { - }; - }; E091C0F206225EA3007D9E8F = { fileRef = E091C0D406225EA3007D9E8F; isa = PBXBuildFile; diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp index f0f25b49d39..4e1874ac3f8 100644 --- a/mozilla/content/events/src/nsEventStateManager.cpp +++ b/mozilla/content/events/src/nsEventStateManager.cpp @@ -2391,24 +2391,28 @@ nsEventStateManager::SetCursor(PRInt32 aCursor, nsIWidget* aWidget, PRBool aLock c = eCursor_help; break; case NS_STYLE_CURSOR_N_RESIZE: + c = eCursor_n_resize; + break; case NS_STYLE_CURSOR_S_RESIZE: - c = eCursor_sizeNS; + c = eCursor_s_resize; break; case NS_STYLE_CURSOR_W_RESIZE: + c = eCursor_w_resize; + break; case NS_STYLE_CURSOR_E_RESIZE: - c = eCursor_sizeWE; + c = eCursor_e_resize; break; case NS_STYLE_CURSOR_NW_RESIZE: - c = eCursor_sizeNW; + c = eCursor_nw_resize; break; case NS_STYLE_CURSOR_SE_RESIZE: - c = eCursor_sizeSE; + c = eCursor_se_resize; break; case NS_STYLE_CURSOR_NE_RESIZE: - c = eCursor_sizeNE; + c = eCursor_ne_resize; break; case NS_STYLE_CURSOR_SW_RESIZE: - c = eCursor_sizeSW; + c = eCursor_sw_resize; break; case NS_STYLE_CURSOR_COPY: // CSS3 c = eCursor_copy; @@ -2446,6 +2450,36 @@ nsEventStateManager::SetCursor(PRInt32 aCursor, nsIWidget* aWidget, PRBool aLock case NS_STYLE_CURSOR_MOZ_ZOOM_OUT: c = eCursor_zoom_out; break; + case NS_STYLE_CURSOR_NOT_ALLOWED: + c = eCursor_not_allowed; + break; + case NS_STYLE_CURSOR_COL_RESIZE: + c = eCursor_col_resize; + break; + case NS_STYLE_CURSOR_ROW_RESIZE: + c = eCursor_row_resize; + break; + case NS_STYLE_CURSOR_NO_DROP: + c = eCursor_no_drop; + break; + case NS_STYLE_CURSOR_VERTICAL_TEXT: + c = eCursor_vertical_text; + break; + case NS_STYLE_CURSOR_ALL_SCROLL: + c = eCursor_all_scroll; + break; + case NS_STYLE_CURSOR_NESW_RESIZE: + c = eCursor_nesw_resize; + break; + case NS_STYLE_CURSOR_NWSE_RESIZE: + c = eCursor_nwse_resize; + break; + case NS_STYLE_CURSOR_NS_RESIZE: + c = eCursor_ns_resize; + break; + case NS_STYLE_CURSOR_EW_RESIZE: + c = eCursor_ew_resize; + break; } aWidget->SetCursor(c); diff --git a/mozilla/content/shared/public/nsCSSKeywordList.h b/mozilla/content/shared/public/nsCSSKeywordList.h index f3bf65ad767..c487d8f6ec6 100644 --- a/mozilla/content/shared/public/nsCSSKeywordList.h +++ b/mozilla/content/shared/public/nsCSSKeywordList.h @@ -174,7 +174,9 @@ CSS_KEY(above, above) CSS_KEY(absolute, absolute) CSS_KEY(activeborder, activeborder) CSS_KEY(activecaption, activecaption) +CSS_KEY(alias, alias) CSS_KEY(all, all) +CSS_KEY(all-scroll, all_scroll) CSS_KEY(always, always) CSS_KEY(appworkspace, appworkspace) CSS_KEY(armenian, armenian) @@ -203,6 +205,7 @@ CSS_KEY(buttontext, buttontext) CSS_KEY(capitalize, capitalize) CSS_KEY(caption, caption) CSS_KEY(captiontext, captiontext) +CSS_KEY(cell, cell) CSS_KEY(center, center) CSS_KEY(center-left, center_left) CSS_KEY(center-right, center_right) @@ -212,11 +215,14 @@ CSS_KEY(cjk-ideographic, cjk_ideographic) CSS_KEY(close-quote, close_quote) CSS_KEY(cm, cm) CSS_KEY(code, code) +CSS_KEY(col-resize, col_resize) CSS_KEY(collapse, collapse) CSS_KEY(condensed, condensed) CSS_KEY(content, content) CSS_KEY(content-box, content_box) +CSS_KEY(context-menu, context_menu) CSS_KEY(continuous, continuous) +CSS_KEY(copy, copy) CSS_KEY(crop, crop) CSS_KEY(cross, cross) CSS_KEY(crosshair, crosshair) @@ -243,6 +249,7 @@ CSS_KEY(ex, ex) CSS_KEY(expanded, expanded) CSS_KEY(extra-condensed, extra_condensed) CSS_KEY(extra-expanded, extra_expanded) +CSS_KEY(ew-resize, ew_resize) CSS_KEY(far-left, far_left) CSS_KEY(far-right, far_right) CSS_KEY(fast, fast) @@ -316,13 +323,18 @@ CSS_KEY(ms, ms) CSS_KEY(n-resize, n_resize) CSS_KEY(narrower, narrower) CSS_KEY(ne-resize, ne_resize) +CSS_KEY(nesw-resize, nesw_resize) CSS_KEY(no-close-quote, no_close_quote) +CSS_KEY(no-drop, no_drop) CSS_KEY(no-open-quote, no_open_quote) CSS_KEY(no-repeat, no_repeat) CSS_KEY(none, none) CSS_KEY(normal, normal) +CSS_KEY(not-allowed, not_allowed) CSS_KEY(nowrap, nowrap) +CSS_KEY(ns-resize, ns_resize) CSS_KEY(nw-resize, nw_resize) +CSS_KEY(nwse-resize, nwse_resize) CSS_KEY(oblique, oblique) CSS_KEY(once, once) CSS_KEY(open-quote, open_quote) @@ -351,6 +363,7 @@ CSS_KEY(ridge, ridge) CSS_KEY(right, right) CSS_KEY(right-side, right_side) CSS_KEY(rightwards, rightwards) +CSS_KEY(row-resize, row_resize) CSS_KEY(rtl, rtl) CSS_KEY(s, s) CSS_KEY(s-resize, s_resize) @@ -415,6 +428,7 @@ CSS_KEY(upper-latin, upper_latin) CSS_KEY(upper-roman, upper_roman) CSS_KEY(uppercase, uppercase) CSS_KEY(vertical, vertical) +CSS_KEY(vertical-text, vertical_text) CSS_KEY(visible, visible) CSS_KEY(w-resize, w_resize) CSS_KEY(wait, wait) diff --git a/mozilla/content/shared/src/nsCSSProps.cpp b/mozilla/content/shared/src/nsCSSProps.cpp index 18f499fc901..50b6a74dfee 100644 --- a/mozilla/content/shared/src/nsCSSProps.cpp +++ b/mozilla/content/shared/src/nsCSSProps.cpp @@ -434,6 +434,7 @@ const PRInt32 nsCSSProps::kContentKTable[] = { }; const PRInt32 nsCSSProps::kCursorKTable[] = { + // CSS 2.0 eCSSKeyword_crosshair, NS_STYLE_CURSOR_CROSSHAIR, eCSSKeyword_default, NS_STYLE_CURSOR_DEFAULT, eCSSKeyword_pointer, NS_STYLE_CURSOR_POINTER, @@ -451,11 +452,27 @@ const PRInt32 nsCSSProps::kCursorKTable[] = { eCSSKeyword_help, NS_STYLE_CURSOR_HELP, // CSS 2.1 eCSSKeyword_progress, NS_STYLE_CURSOR_SPINNING, - // CSS3 proposed + // CSS3 basic user interface module + eCSSKeyword_copy, NS_STYLE_CURSOR_COPY, + eCSSKeyword_alias, NS_STYLE_CURSOR_ALIAS, + eCSSKeyword_context_menu, NS_STYLE_CURSOR_CONTEXT_MENU, + eCSSKeyword_cell, NS_STYLE_CURSOR_CELL, + eCSSKeyword_not_allowed, NS_STYLE_CURSOR_NOT_ALLOWED, + eCSSKeyword_col_resize, NS_STYLE_CURSOR_COL_RESIZE, + eCSSKeyword_row_resize, NS_STYLE_CURSOR_ROW_RESIZE, + eCSSKeyword_no_drop, NS_STYLE_CURSOR_NO_DROP, + eCSSKeyword_vertical_text, NS_STYLE_CURSOR_VERTICAL_TEXT, + eCSSKeyword_all_scroll, NS_STYLE_CURSOR_ALL_SCROLL, + eCSSKeyword_nesw_resize, NS_STYLE_CURSOR_NESW_RESIZE, + eCSSKeyword_nwse_resize, NS_STYLE_CURSOR_NWSE_RESIZE, + eCSSKeyword_ns_resize, NS_STYLE_CURSOR_NS_RESIZE, + eCSSKeyword_ew_resize, NS_STYLE_CURSOR_EW_RESIZE, + // -moz- prefixed aliases for some CSS3 cursors for backward compat eCSSKeyword__moz_copy, NS_STYLE_CURSOR_COPY, eCSSKeyword__moz_alias, NS_STYLE_CURSOR_ALIAS, eCSSKeyword__moz_context_menu, NS_STYLE_CURSOR_CONTEXT_MENU, eCSSKeyword__moz_cell, NS_STYLE_CURSOR_CELL, + // -moz- prefixed vendor specific eCSSKeyword__moz_grab, NS_STYLE_CURSOR_GRAB, eCSSKeyword__moz_grabbing, NS_STYLE_CURSOR_GRABBING, eCSSKeyword__moz_spinning, NS_STYLE_CURSOR_SPINNING, diff --git a/mozilla/layout/base/nsStyleConsts.h b/mozilla/layout/base/nsStyleConsts.h index de7115ac6a6..f52775a8ca7 100644 --- a/mozilla/layout/base/nsStyleConsts.h +++ b/mozilla/layout/base/nsStyleConsts.h @@ -302,7 +302,16 @@ #define NS_STYLE_CURSOR_COUNT_UP_DOWN 26 #define NS_STYLE_CURSOR_MOZ_ZOOM_IN 27 #define NS_STYLE_CURSOR_MOZ_ZOOM_OUT 28 - +#define NS_STYLE_CURSOR_NOT_ALLOWED 29 +#define NS_STYLE_CURSOR_COL_RESIZE 30 +#define NS_STYLE_CURSOR_ROW_RESIZE 31 +#define NS_STYLE_CURSOR_NO_DROP 32 +#define NS_STYLE_CURSOR_VERTICAL_TEXT 33 +#define NS_STYLE_CURSOR_ALL_SCROLL 34 +#define NS_STYLE_CURSOR_NESW_RESIZE 35 +#define NS_STYLE_CURSOR_NWSE_RESIZE 36 +#define NS_STYLE_CURSOR_NS_RESIZE 37 +#define NS_STYLE_CURSOR_EW_RESIZE 38 // See nsStyleDisplay #define NS_STYLE_DIRECTION_LTR 0 diff --git a/mozilla/layout/base/public/nsStyleConsts.h b/mozilla/layout/base/public/nsStyleConsts.h index de7115ac6a6..f52775a8ca7 100644 --- a/mozilla/layout/base/public/nsStyleConsts.h +++ b/mozilla/layout/base/public/nsStyleConsts.h @@ -302,7 +302,16 @@ #define NS_STYLE_CURSOR_COUNT_UP_DOWN 26 #define NS_STYLE_CURSOR_MOZ_ZOOM_IN 27 #define NS_STYLE_CURSOR_MOZ_ZOOM_OUT 28 - +#define NS_STYLE_CURSOR_NOT_ALLOWED 29 +#define NS_STYLE_CURSOR_COL_RESIZE 30 +#define NS_STYLE_CURSOR_ROW_RESIZE 31 +#define NS_STYLE_CURSOR_NO_DROP 32 +#define NS_STYLE_CURSOR_VERTICAL_TEXT 33 +#define NS_STYLE_CURSOR_ALL_SCROLL 34 +#define NS_STYLE_CURSOR_NESW_RESIZE 35 +#define NS_STYLE_CURSOR_NWSE_RESIZE 36 +#define NS_STYLE_CURSOR_NS_RESIZE 37 +#define NS_STYLE_CURSOR_EW_RESIZE 38 // See nsStyleDisplay #define NS_STYLE_DIRECTION_LTR 0 diff --git a/mozilla/layout/style/nsCSSKeywordList.h b/mozilla/layout/style/nsCSSKeywordList.h index f3bf65ad767..c487d8f6ec6 100644 --- a/mozilla/layout/style/nsCSSKeywordList.h +++ b/mozilla/layout/style/nsCSSKeywordList.h @@ -174,7 +174,9 @@ CSS_KEY(above, above) CSS_KEY(absolute, absolute) CSS_KEY(activeborder, activeborder) CSS_KEY(activecaption, activecaption) +CSS_KEY(alias, alias) CSS_KEY(all, all) +CSS_KEY(all-scroll, all_scroll) CSS_KEY(always, always) CSS_KEY(appworkspace, appworkspace) CSS_KEY(armenian, armenian) @@ -203,6 +205,7 @@ CSS_KEY(buttontext, buttontext) CSS_KEY(capitalize, capitalize) CSS_KEY(caption, caption) CSS_KEY(captiontext, captiontext) +CSS_KEY(cell, cell) CSS_KEY(center, center) CSS_KEY(center-left, center_left) CSS_KEY(center-right, center_right) @@ -212,11 +215,14 @@ CSS_KEY(cjk-ideographic, cjk_ideographic) CSS_KEY(close-quote, close_quote) CSS_KEY(cm, cm) CSS_KEY(code, code) +CSS_KEY(col-resize, col_resize) CSS_KEY(collapse, collapse) CSS_KEY(condensed, condensed) CSS_KEY(content, content) CSS_KEY(content-box, content_box) +CSS_KEY(context-menu, context_menu) CSS_KEY(continuous, continuous) +CSS_KEY(copy, copy) CSS_KEY(crop, crop) CSS_KEY(cross, cross) CSS_KEY(crosshair, crosshair) @@ -243,6 +249,7 @@ CSS_KEY(ex, ex) CSS_KEY(expanded, expanded) CSS_KEY(extra-condensed, extra_condensed) CSS_KEY(extra-expanded, extra_expanded) +CSS_KEY(ew-resize, ew_resize) CSS_KEY(far-left, far_left) CSS_KEY(far-right, far_right) CSS_KEY(fast, fast) @@ -316,13 +323,18 @@ CSS_KEY(ms, ms) CSS_KEY(n-resize, n_resize) CSS_KEY(narrower, narrower) CSS_KEY(ne-resize, ne_resize) +CSS_KEY(nesw-resize, nesw_resize) CSS_KEY(no-close-quote, no_close_quote) +CSS_KEY(no-drop, no_drop) CSS_KEY(no-open-quote, no_open_quote) CSS_KEY(no-repeat, no_repeat) CSS_KEY(none, none) CSS_KEY(normal, normal) +CSS_KEY(not-allowed, not_allowed) CSS_KEY(nowrap, nowrap) +CSS_KEY(ns-resize, ns_resize) CSS_KEY(nw-resize, nw_resize) +CSS_KEY(nwse-resize, nwse_resize) CSS_KEY(oblique, oblique) CSS_KEY(once, once) CSS_KEY(open-quote, open_quote) @@ -351,6 +363,7 @@ CSS_KEY(ridge, ridge) CSS_KEY(right, right) CSS_KEY(right-side, right_side) CSS_KEY(rightwards, rightwards) +CSS_KEY(row-resize, row_resize) CSS_KEY(rtl, rtl) CSS_KEY(s, s) CSS_KEY(s-resize, s_resize) @@ -415,6 +428,7 @@ CSS_KEY(upper-latin, upper_latin) CSS_KEY(upper-roman, upper_roman) CSS_KEY(uppercase, uppercase) CSS_KEY(vertical, vertical) +CSS_KEY(vertical-text, vertical_text) CSS_KEY(visible, visible) CSS_KEY(w-resize, w_resize) CSS_KEY(wait, wait) diff --git a/mozilla/layout/style/nsCSSProps.cpp b/mozilla/layout/style/nsCSSProps.cpp index 18f499fc901..50b6a74dfee 100644 --- a/mozilla/layout/style/nsCSSProps.cpp +++ b/mozilla/layout/style/nsCSSProps.cpp @@ -434,6 +434,7 @@ const PRInt32 nsCSSProps::kContentKTable[] = { }; const PRInt32 nsCSSProps::kCursorKTable[] = { + // CSS 2.0 eCSSKeyword_crosshair, NS_STYLE_CURSOR_CROSSHAIR, eCSSKeyword_default, NS_STYLE_CURSOR_DEFAULT, eCSSKeyword_pointer, NS_STYLE_CURSOR_POINTER, @@ -451,11 +452,27 @@ const PRInt32 nsCSSProps::kCursorKTable[] = { eCSSKeyword_help, NS_STYLE_CURSOR_HELP, // CSS 2.1 eCSSKeyword_progress, NS_STYLE_CURSOR_SPINNING, - // CSS3 proposed + // CSS3 basic user interface module + eCSSKeyword_copy, NS_STYLE_CURSOR_COPY, + eCSSKeyword_alias, NS_STYLE_CURSOR_ALIAS, + eCSSKeyword_context_menu, NS_STYLE_CURSOR_CONTEXT_MENU, + eCSSKeyword_cell, NS_STYLE_CURSOR_CELL, + eCSSKeyword_not_allowed, NS_STYLE_CURSOR_NOT_ALLOWED, + eCSSKeyword_col_resize, NS_STYLE_CURSOR_COL_RESIZE, + eCSSKeyword_row_resize, NS_STYLE_CURSOR_ROW_RESIZE, + eCSSKeyword_no_drop, NS_STYLE_CURSOR_NO_DROP, + eCSSKeyword_vertical_text, NS_STYLE_CURSOR_VERTICAL_TEXT, + eCSSKeyword_all_scroll, NS_STYLE_CURSOR_ALL_SCROLL, + eCSSKeyword_nesw_resize, NS_STYLE_CURSOR_NESW_RESIZE, + eCSSKeyword_nwse_resize, NS_STYLE_CURSOR_NWSE_RESIZE, + eCSSKeyword_ns_resize, NS_STYLE_CURSOR_NS_RESIZE, + eCSSKeyword_ew_resize, NS_STYLE_CURSOR_EW_RESIZE, + // -moz- prefixed aliases for some CSS3 cursors for backward compat eCSSKeyword__moz_copy, NS_STYLE_CURSOR_COPY, eCSSKeyword__moz_alias, NS_STYLE_CURSOR_ALIAS, eCSSKeyword__moz_context_menu, NS_STYLE_CURSOR_CONTEXT_MENU, eCSSKeyword__moz_cell, NS_STYLE_CURSOR_CELL, + // -moz- prefixed vendor specific eCSSKeyword__moz_grab, NS_STYLE_CURSOR_GRAB, eCSSKeyword__moz_grabbing, NS_STYLE_CURSOR_GRABBING, eCSSKeyword__moz_spinning, NS_STYLE_CURSOR_SPINNING, diff --git a/mozilla/widget/public/nsIWidget.h b/mozilla/widget/public/nsIWidget.h index cafa0e23d5a..aa03a7834ba 100644 --- a/mozilla/widget/public/nsIWidget.h +++ b/mozilla/widget/public/nsIWidget.h @@ -171,15 +171,17 @@ enum nsCursor { ///(normal cursor, usually rendered as an arrow) eCursor_select, ///(can hyper-link, usually rendered as a human hand) eCursor_hyperlink, - ///(west/east sizing, usually rendered as ->||<-) - eCursor_sizeWE, - ///(north/south sizing, usually rendered as sizeWE rotated 90 degrees) - eCursor_sizeNS, + ///(north/south/west/east edge sizing) + eCursor_n_resize, + eCursor_s_resize, + eCursor_w_resize, + eCursor_e_resize, ///(corner sizing) - eCursor_sizeNW, - eCursor_sizeSE, - eCursor_sizeNE, - eCursor_sizeSW, + eCursor_nw_resize, + eCursor_se_resize, + eCursor_ne_resize, + eCursor_sw_resize, + // The _arrow_ ones are not used AFAICT - can be removed? eCursor_arrow_north, eCursor_arrow_north_plus, eCursor_arrow_south, @@ -204,6 +206,16 @@ enum nsCursor { ///(normal cursor, usually rendered as an arrow) eCursor_count_up_down, eCursor_zoom_in, eCursor_zoom_out, + eCursor_not_allowed, + eCursor_col_resize, + eCursor_row_resize, + eCursor_no_drop, + eCursor_vertical_text, + eCursor_all_scroll, + eCursor_nesw_resize, + eCursor_nwse_resize, + eCursor_ns_resize, + eCursor_ew_resize, // This one better be the last one in this list. eCursorCount }; diff --git a/mozilla/widget/src/beos/nsWindow.cpp b/mozilla/widget/src/beos/nsWindow.cpp index 2578e530679..3426c34e99d 100644 --- a/mozilla/widget/src/beos/nsWindow.cpp +++ b/mozilla/widget/src/beos/nsWindow.cpp @@ -1355,27 +1355,29 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor) newCursor = (BCursor *)gCursorArray.SafeElementAt(0); break; - case eCursor_sizeWE: - newCursor = (BCursor *)gCursorArray.SafeElementAt(1); - break; - - case eCursor_sizeNS: + case eCursor_n_resize: + case eCursor_s_resize: newCursor = (BCursor *)gCursorArray.SafeElementAt(2); break; - case eCursor_sizeNW: + case eCursor_w_resize: + case eCursor_e_resize: + newCursor = (BCursor *)gCursorArray.SafeElementAt(1); + break; + + case eCursor_nw_resize: newCursor = (BCursor *)gCursorArray.SafeElementAt(3); break; - case eCursor_sizeSE: + case eCursor_se_resize: newCursor = (BCursor *)gCursorArray.SafeElementAt(4); break; - case eCursor_sizeNE: + case eCursor_ne_resize: newCursor = (BCursor *)gCursorArray.SafeElementAt(5); break; - case eCursor_sizeSW: + case eCursor_sw_resize: newCursor = (BCursor *)gCursorArray.SafeElementAt(6); break; @@ -1416,6 +1418,7 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor) break; case eCursor_context_menu: + // XXX: No suitable cursor, needs implementing break; case eCursor_cell: @@ -1454,6 +1457,48 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor) newCursor = (BCursor *)gCursorArray.SafeElementAt(23); break; + case eCursor_not_allowed: + case eCursor_no_drop: + // XXX: No suitable cursor, needs implementing + break; + + case eCursor_col_resize: + // XXX not 100% appropriate perhaps + newCursor = (BCursor *)gCursorArray.SafeElementAt(1); + break; + + case eCursor_row_resize: + // XXX not 100% appropriate perhaps + newCursor = (BCursor *)gCursorArray.SafeElementAt(2); + break; + + case eCursor_vertical_text: + // XXX not 100% appropriate perhaps + newCursor = B_CURSOR_I_BEAM; + break; + + case eCursor_all_scroll: + // XXX: No suitable cursor, needs implementing + break; + + case eCursor_nesw_resize: + // XXX not 100% appropriate perhaps + newCursor = (BCursor *)gCursorArray.SafeElementAt(1); + break; + + case eCursor_nwse_resize: + // XXX not 100% appropriate perhaps + newCursor = (BCursor *)gCursorArray.SafeElementAt(1); + break; + + case eCursor_ns_resize: + newCursor = (BCursor *)gCursorArray.SafeElementAt(2); + break; + + case eCursor_ew_resize: + newCursor = (BCursor *)gCursorArray.SafeElementAt(1); + break; + default: NS_ASSERTION(0, "Invalid cursor type"); break; diff --git a/mozilla/widget/src/build/res/col_resize.cur b/mozilla/widget/src/build/res/col_resize.cur new file mode 100755 index 0000000000000000000000000000000000000000..8f7f675122fae7ad797c6a209fddb18ad983f4f7 GIT binary patch literal 326 zcmZQzU}9ioP*7lG;9}rlFkob05My9q&;ViuAa(#^Mj!-%1~7?9{Qv(SQ;-yq0H9(t iED+$pU=WbNkPu+N@GtlWm1JKL^ s3=GT<7#P?#02KoHa13OE!2kaZC^VP@5`tooK9GKpIUq5h8wL~r06`9s)&Kwi literal 0 HcmV?d00001 diff --git a/mozilla/widget/src/build/res/vertical_text.cur b/mozilla/widget/src/build/res/vertical_text.cur new file mode 100755 index 0000000000000000000000000000000000000000..3de04ebec3b47247c1167ccccb554d11726c167e GIT binary patch literal 326 zcmZQzU}9ioP*7lG;ACKCFkob05My9q&;ViuAa(#^Mj!-%1~7?9{Qv(SQ;-HC4M5kx QaQ*)VI2$Aebi;rG0JL3-od5s; literal 0 HcmV?d00001 diff --git a/mozilla/widget/src/build/widget.rc b/mozilla/widget/src/build/widget.rc index 9bcb3366865..edcf521bc80 100644 --- a/mozilla/widget/src/build/widget.rc +++ b/mozilla/widget/src/build/widget.rc @@ -55,6 +55,9 @@ IDC_COPY CURSOR DISCARDABLE "res/copy.cur" IDC_ALIAS CURSOR DISCARDABLE "res/aliasb.cur" IDC_ZOOMIN CURSOR DISCARDABLE "res/zoom_in.cur" IDC_ZOOMOUT CURSOR DISCARDABLE "res/zoom_out.cur" +IDC_COLRESIZE CURSOR DISCARDABLE "res/col_resize.cur" +IDC_ROWRESIZE CURSOR DISCARDABLE "res/row_resize.cur" +IDC_VERTICALTEXT CURSOR DISCARDABLE "res/vertical_text.cur" OPTPROPSHEET DIALOG DISCARDABLE 32, 32, 288, 226 STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | diff --git a/mozilla/widget/src/cocoa/cursors/colResize.tiff b/mozilla/widget/src/cocoa/cursors/colResize.tiff new file mode 100644 index 0000000000000000000000000000000000000000..3e16818ce1746ab45376b5089e594cd5d5cf61d3 GIT binary patch literal 1258 zcmc&wITFG!3|u9^1R6rYF+f3?q2dXAAPq0(3A}?x5TrOVLSr)SaK_QDv@6SQTbu!0 zfa1Y%5o3k$0Z*W0O>qV2jwN20u#$MoPjO9TaDkG`Qrl74V-hjV23#;+^>s!#(R#?U zgEq0xoVHQZ&>qupBq};YT+`9?Z%qH&2eS`d*ZIw<(dG4?chWYr4t*T=de8smmtkd= zoby$yv+I4c{N`R7|ZkDYFaLR0O zL@l9}d*znHtj+vT;7D+n#M|~p}bs*o9x`!G}hnY;pVHpp~soNfyagZMvqFp@hHDg4btAat&(fpHNH-VIH^X2ysKQE0Yk%&wSg(1jCo1kS-BD9*>hX`_eyu68SWGb1x6bC9RDPz65jQM%kWuU znDY%M8e5ZDAtUJ(=1a~A$Q6CAjxv-G41EE0(2cn8GwQ-6~rFzE_gXe|8jVhO%+d1fE c{DCgIZ;nf5=e)W3vM*Q3l&UBXh5KoJ1FWFIh5!Hn literal 0 HcmV?d00001 diff --git a/mozilla/widget/src/cocoa/cursors/vtIBeam.tiff b/mozilla/widget/src/cocoa/cursors/vtIBeam.tiff new file mode 100644 index 0000000000000000000000000000000000000000..2472fbd2c7298b9e363128305ad539d32b35989c GIT binary patch literal 1258 zcmd^6IS#@w5S+0A1sX!ZA)ug)sCWV&NW+VH0`K4vnB6!rE^HJ?8ATh9cIU9xb&WHC z3t%2{F2Y&Bf4~#4!ZBBXcP#P3M3|J)Ux!OF!Uk5xI@{4Um`diX#YXU|nG3>+>$Wcn zZi3I8+rX)~$J9rn;343W$H>2m{BIvDIymP>U48}s?Lf6d^}7F@N3NgJDEF6&-#wR; Z>&N-uIB`Y_clS-r`t*im_wgSC=MBg5(RKg; literal 0 HcmV?d00001 diff --git a/mozilla/widget/src/cocoa/nsCursorManager.mm b/mozilla/widget/src/cocoa/nsCursorManager.mm index 42d445bbbb9..dbdee70eafe 100644 --- a/mozilla/widget/src/cocoa/nsCursorManager.mm +++ b/mozilla/widget/src/cocoa/nsCursorManager.mm @@ -132,30 +132,6 @@ static BOOL isPantherOrLater() return [nsMacCursor cursorWithCursor: [NSCursor IBeamCursor]]; case eCursor_hyperlink: return [nsCursorManager createNSCursor: @selector(pointingHandCursor) orThemeCursor: kThemePointingHandCursor]; - case eCursor_sizeWE: - return [nsCursorManager createNSCursor: @selector(resizeLeftRightCursor) orThemeCursor: kThemeResizeLeftRightCursor]; - case eCursor_sizeNS: - return [nsCursorManager createNSCursor: @selector(resizeUpDownCursor) orImageCursor: @"sizeNS" withHotspot: NSMakePoint(7,7)]; - case eCursor_sizeNW: - return [nsMacCursor cursorWithImageNamed: @"sizeNW" hotSpot: NSMakePoint(7,7)]; - case eCursor_sizeSE: - return [nsMacCursor cursorWithImageNamed: @"sizeSE" hotSpot: NSMakePoint(8,8)]; - case eCursor_sizeNE: - return [nsMacCursor cursorWithImageNamed: @"sizeNE" hotSpot: NSMakePoint(8,7)]; - case eCursor_sizeSW: - return [nsMacCursor cursorWithImageNamed: @"sizeSW" hotSpot: NSMakePoint(6,8)]; - case eCursor_arrow_north: - case eCursor_arrow_north_plus: - return [nsCursorManager createNSCursor: @selector(resizeUpCursor) orImageCursor: @"arrowN" withHotspot: NSMakePoint(7,7)]; - case eCursor_arrow_south: - case eCursor_arrow_south_plus: - return [nsCursorManager createNSCursor: @selector(resizeDownCursor) orImageCursor: @"arrowS" withHotspot: NSMakePoint(7,7)]; - case eCursor_arrow_west: - case eCursor_arrow_west_plus: - return [nsCursorManager createNSCursor: @selector(resizeLeftCursor) orThemeCursor: kThemeResizeLeftCursor]; - case eCursor_arrow_east: - case eCursor_arrow_east_plus: - return [nsCursorManager createNSCursor: @selector(resizeRightCursor) orThemeCursor: kThemeResizeRightCursor]; case eCursor_crosshair: return [nsCursorManager createNSCursor: @selector(crosshairCursor) orThemeCursor: kThemeCrossCursor]; case eCursor_move: @@ -167,7 +143,8 @@ static BOOL isPantherOrLater() case eCursor_alias: return [nsMacCursor cursorWithThemeCursor: kThemeAliasArrowCursor]; case eCursor_context_menu: - return [nsMacCursor cursorWithImageNamed: @"contextMenu" hotSpot: NSMakePoint(1,1)]; + return [nsMacCursor cursorWithThemeCursor: kThemeContextualMenuArrowCursor]; + case eCursor_cell: return [nsMacCursor cursorWithThemeCursor: kThemePlusCursor]; case eCursor_grab: @@ -186,6 +163,65 @@ static BOOL isPantherOrLater() return [nsMacCursor cursorWithImageNamed: @"zoomIn" hotSpot: NSMakePoint(6,6)]; case eCursor_zoom_out: return [nsMacCursor cursorWithImageNamed: @"zoomOut" hotSpot: NSMakePoint(6,6)]; + case eCursor_vertical_text: + return [nsMacCursor cursorWithImageNamed: @"vtIBeam" hotSpot: NSMakePoint(7,8)]; + case eCursor_all_scroll: + return [nsCursorManager createNSCursor: @selector(openHandCursor) orThemeCursor: kThemeOpenHandCursor]; + case eCursor_not_allowed: + case eCursor_no_drop: + return [nsMacCursor cursorWithThemeCursor: kThemeNotAllowedCursor]; + + // Arrow Cursors: + //North + case eCursor_n_resize: + case eCursor_arrow_north: + case eCursor_arrow_north_plus: + return [nsCursorManager createNSCursor: @selector(resizeUpCursor) orImageCursor: @"arrowN" withHotspot: NSMakePoint(7,7)]; + //North East + case eCursor_ne_resize: + return [nsMacCursor cursorWithImageNamed: @"sizeNE" hotSpot: NSMakePoint(8,7)]; + //East + case eCursor_e_resize: + case eCursor_arrow_east: + case eCursor_arrow_east_plus: + return [nsCursorManager createNSCursor: @selector(resizeRightCursor) orThemeCursor: kThemeResizeRightCursor]; + //South East + case eCursor_se_resize: + return [nsMacCursor cursorWithImageNamed: @"sizeSE" hotSpot: NSMakePoint(8,8)]; + //South + case eCursor_s_resize: + case eCursor_arrow_south: + case eCursor_arrow_south_plus: + return [nsCursorManager createNSCursor: @selector(resizeDownCursor) orImageCursor: @"arrowS" withHotspot: NSMakePoint(7,7)]; + //South West + case eCursor_sw_resize: + return [nsMacCursor cursorWithImageNamed: @"sizeSW" hotSpot: NSMakePoint(6,8)]; + //West + case eCursor_w_resize: + case eCursor_arrow_west: + case eCursor_arrow_west_plus: + return [nsCursorManager createNSCursor: @selector(resizeLeftCursor) orThemeCursor: kThemeResizeLeftCursor]; + //North West + case eCursor_nw_resize: + return [nsMacCursor cursorWithImageNamed: @"sizeNW" hotSpot: NSMakePoint(7,7)]; + //North & South + case eCursor_ns_resize: + return [nsCursorManager createNSCursor: @selector(resizeUpDownCursor) orImageCursor: @"sizeNS" withHotspot: NSMakePoint(7,7)]; + //East & West + case eCursor_ew_resize: + return [nsCursorManager createNSCursor: @selector(resizeLeftRightCursor) orThemeCursor: kThemeResizeLeftRightCursor]; + //North East & South West + case eCursor_nesw_resize: + return [nsMacCursor cursorWithImageNamed: @"sizeNESW" hotSpot: NSMakePoint(8,8)]; + //North West & South East + case eCursor_nwse_resize: + return [nsMacCursor cursorWithImageNamed: @"sizeNWSE" hotSpot: NSMakePoint(8,8)]; + //Column Resize + case eCursor_col_resize: + return [nsMacCursor cursorWithImageNamed: @"colResize" hotSpot: NSMakePoint(8,8)]; + //Row Resize + case eCursor_row_resize: + return [nsMacCursor cursorWithImageNamed: @"rowResize" hotSpot: NSMakePoint(8,8)]; default: return [nsMacCursor cursorWithCursor: [NSCursor arrowCursor]]; } diff --git a/mozilla/widget/src/gtk/nsGtkCursors.h b/mozilla/widget/src/gtk/nsGtkCursors.h index 2f2af634582..1f678fcae65 100644 --- a/mozilla/widget/src/gtk/nsGtkCursors.h +++ b/mozilla/widget/src/gtk/nsGtkCursors.h @@ -1,7 +1,7 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * vim:ts=2:et:sw=2 - * - * ***** BEGIN LICENSE BLOCK ***** +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim:expandtab:shiftwidth=2:tabstop=2: + */ +/* ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * * The contents of this file are subject to the Mozilla Public License Version @@ -50,246 +50,408 @@ typedef struct { /* MOZ_CURSOR_QUESTION_ARROW */ static const unsigned char moz_question_arrow_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x0c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, - 0x7c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, - 0xfc, 0xe3, 0x00, 0x00, 0x7c, 0xb0, 0x01, 0x00, 0x6c, 0x80, 0x01, 0x00, - 0xc4, 0xc0, 0x00, 0x00, 0xc0, 0x60, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, - 0x80, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x7c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, + 0xfc, 0xe3, 0x00, 0x00, 0x7c, 0xb0, 0x01, 0x00, 0x6c, 0x80, 0x01, 0x00, + 0xc4, 0xc0, 0x00, 0x00, 0xc0, 0x60, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, + 0x80, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const unsigned char moz_question_arrow_mask_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, - 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0xe3, 0x00, 0x00, - 0xfe, 0xf7, 0x01, 0x00, 0xfe, 0xfb, 0x03, 0x00, 0xfe, 0xf0, 0x03, 0x00, - 0xee, 0xe1, 0x01, 0x00, 0xe4, 0xf1, 0x00, 0x00, 0xc0, 0x63, 0x00, 0x00, - 0xc0, 0xf3, 0x00, 0x00, 0x80, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, + 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0xe3, 0x00, 0x00, + 0xfe, 0xf7, 0x01, 0x00, 0xfe, 0xfb, 0x03, 0x00, 0xfe, 0xf0, 0x03, 0x00, + 0xee, 0xe1, 0x01, 0x00, 0xe4, 0xf1, 0x00, 0x00, 0xc0, 0x63, 0x00, 0x00, + 0xc0, 0xf3, 0x00, 0x00, 0x80, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* MOZ_CURSOR_HAND_GRAB */ static const unsigned char moz_hand_grab_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, - 0x60, 0x39, 0x00, 0x00, 0x90, 0x49, 0x00, 0x00, 0x90, 0x49, 0x01, 0x00, - 0x20, 0xc9, 0x02, 0x00, 0x20, 0x49, 0x02, 0x00, 0x58, 0x40, 0x02, 0x00, - 0x64, 0x00, 0x02, 0x00, 0x44, 0x00, 0x01, 0x00, 0x08, 0x00, 0x01, 0x00, - 0x10, 0x00, 0x01, 0x00, 0x10, 0x80, 0x00, 0x00, 0x20, 0x80, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, + 0x60, 0x39, 0x00, 0x00, 0x90, 0x49, 0x00, 0x00, 0x90, 0x49, 0x01, 0x00, + 0x20, 0xc9, 0x02, 0x00, 0x20, 0x49, 0x02, 0x00, 0x58, 0x40, 0x02, 0x00, + 0x64, 0x00, 0x02, 0x00, 0x44, 0x00, 0x01, 0x00, 0x08, 0x00, 0x01, 0x00, + 0x10, 0x00, 0x01, 0x00, 0x10, 0x80, 0x00, 0x00, 0x20, 0x80, 0x00, 0x00, + 0x40, 0x40, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const unsigned char moz_hand_grab_mask_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x60, 0x3f, 0x00, 0x00, - 0xf0, 0x7f, 0x00, 0x00, 0xf8, 0xff, 0x01, 0x00, 0xf8, 0xff, 0x03, 0x00, - 0xf0, 0xff, 0x07, 0x00, 0xf8, 0xff, 0x07, 0x00, 0xfc, 0xff, 0x07, 0x00, - 0xfe, 0xff, 0x07, 0x00, 0xfe, 0xff, 0x03, 0x00, 0xfc, 0xff, 0x03, 0x00, - 0xf8, 0xff, 0x03, 0x00, 0xf8, 0xff, 0x01, 0x00, 0xf0, 0xff, 0x01, 0x00, - 0xe0, 0xff, 0x00, 0x00, 0xc0, 0xff, 0x00, 0x00, 0xc0, 0xff, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x60, 0x3f, 0x00, 0x00, + 0xf0, 0x7f, 0x00, 0x00, 0xf8, 0xff, 0x01, 0x00, 0xf8, 0xff, 0x03, 0x00, + 0xf0, 0xff, 0x07, 0x00, 0xf8, 0xff, 0x07, 0x00, 0xfc, 0xff, 0x07, 0x00, + 0xfe, 0xff, 0x07, 0x00, 0xfe, 0xff, 0x03, 0x00, 0xfc, 0xff, 0x03, 0x00, + 0xf8, 0xff, 0x03, 0x00, 0xf8, 0xff, 0x01, 0x00, 0xf0, 0xff, 0x01, 0x00, + 0xe0, 0xff, 0x00, 0x00, 0xc0, 0xff, 0x00, 0x00, 0xc0, 0xff, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* MOZ_CURSOR_HAND_GRABBING */ static const unsigned char moz_hand_grabbing_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xc0, 0x36, 0x00, 0x00, 0x20, 0xc9, 0x00, 0x00, 0x20, 0x40, 0x01, 0x00, - 0x40, 0x00, 0x01, 0x00, 0x60, 0x00, 0x01, 0x00, 0x10, 0x00, 0x01, 0x00, - 0x10, 0x00, 0x01, 0x00, 0x10, 0x80, 0x00, 0x00, 0x20, 0x80, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xc0, 0x36, 0x00, 0x00, 0x20, 0xc9, 0x00, 0x00, 0x20, 0x40, 0x01, 0x00, + 0x40, 0x00, 0x01, 0x00, 0x60, 0x00, 0x01, 0x00, 0x10, 0x00, 0x01, 0x00, + 0x10, 0x00, 0x01, 0x00, 0x10, 0x80, 0x00, 0x00, 0x20, 0x80, 0x00, 0x00, + 0x40, 0x40, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const unsigned char moz_hand_grabbing_mask_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x36, 0x00, 0x00, - 0xe0, 0xff, 0x00, 0x00, 0xf0, 0xff, 0x01, 0x00, 0xf0, 0xff, 0x03, 0x00, - 0xe0, 0xff, 0x03, 0x00, 0xf0, 0xff, 0x03, 0x00, 0xf8, 0xff, 0x03, 0x00, - 0xf8, 0xff, 0x03, 0x00, 0xf8, 0xff, 0x01, 0x00, 0xf0, 0xff, 0x01, 0x00, - 0xe0, 0xff, 0x00, 0x00, 0xc0, 0xff, 0x00, 0x00, 0xc0, 0x7f, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x36, 0x00, 0x00, + 0xe0, 0xff, 0x00, 0x00, 0xf0, 0xff, 0x01, 0x00, 0xf0, 0xff, 0x03, 0x00, + 0xe0, 0xff, 0x03, 0x00, 0xf0, 0xff, 0x03, 0x00, 0xf8, 0xff, 0x03, 0x00, + 0xf8, 0xff, 0x03, 0x00, 0xf8, 0xff, 0x01, 0x00, 0xf0, 0xff, 0x01, 0x00, + 0xe0, 0xff, 0x00, 0x00, 0xc0, 0xff, 0x00, 0x00, 0xc0, 0x7f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* MOZ_CURSOR_COPY */ static const unsigned char moz_copy_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x0c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, - 0x7c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, - 0xfc, 0x03, 0x00, 0x00, 0x7c, 0x30, 0x00, 0x00, 0x6c, 0x30, 0x00, 0x00, - 0xc4, 0xfc, 0x00, 0x00, 0xc0, 0xfc, 0x00, 0x00, 0x80, 0x31, 0x00, 0x00, - 0x80, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x7c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, + 0xfc, 0x03, 0x00, 0x00, 0x7c, 0x30, 0x00, 0x00, 0x6c, 0x30, 0x00, 0x00, + 0xc4, 0xfc, 0x00, 0x00, 0xc0, 0xfc, 0x00, 0x00, 0x80, 0x31, 0x00, 0x00, + 0x80, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const unsigned char moz_copy_mask_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, - 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x03, 0x00, 0x00, - 0xfe, 0x37, 0x00, 0x00, 0xfe, 0x7b, 0x00, 0x00, 0xfe, 0xfc, 0x00, 0x00, - 0xee, 0xff, 0x01, 0x00, 0xe4, 0xff, 0x01, 0x00, 0xc0, 0xff, 0x00, 0x00, - 0xc0, 0x7b, 0x00, 0x00, 0x80, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, + 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x03, 0x00, 0x00, + 0xfe, 0x37, 0x00, 0x00, 0xfe, 0x7b, 0x00, 0x00, 0xfe, 0xfc, 0x00, 0x00, + 0xee, 0xff, 0x01, 0x00, 0xe4, 0xff, 0x01, 0x00, 0xc0, 0xff, 0x00, 0x00, + 0xc0, 0x7b, 0x00, 0x00, 0x80, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* MOZ_CURSOR_ALIAS */ static const unsigned char moz_alias_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x0c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, - 0x7c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, - 0xfc, 0x03, 0x00, 0x00, 0x7c, 0xf0, 0x00, 0x00, 0x6c, 0xe0, 0x00, 0x00, - 0xc4, 0xf0, 0x00, 0x00, 0xc0, 0xb0, 0x00, 0x00, 0x80, 0x19, 0x00, 0x00, - 0x80, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x7c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, + 0xfc, 0x03, 0x00, 0x00, 0x7c, 0xf0, 0x00, 0x00, 0x6c, 0xe0, 0x00, 0x00, + 0xc4, 0xf0, 0x00, 0x00, 0xc0, 0xb0, 0x00, 0x00, 0x80, 0x19, 0x00, 0x00, + 0x80, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const unsigned char moz_alias_mask_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, - 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x03, 0x00, 0x00, - 0xfe, 0xf7, 0x00, 0x00, 0xfe, 0xfb, 0x01, 0x00, 0xfe, 0xf0, 0x01, 0x00, - 0xee, 0xf9, 0x01, 0x00, 0xe4, 0xf9, 0x01, 0x00, 0xc0, 0xbf, 0x00, 0x00, - 0xc0, 0x3f, 0x00, 0x00, 0x80, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, + 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x03, 0x00, 0x00, + 0xfe, 0xf7, 0x00, 0x00, 0xfe, 0xfb, 0x01, 0x00, 0xfe, 0xf0, 0x01, 0x00, + 0xee, 0xf9, 0x01, 0x00, 0xe4, 0xf9, 0x01, 0x00, 0xc0, 0xbf, 0x00, 0x00, + 0xc0, 0x3f, 0x00, 0x00, 0x80, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* MOZ_CURSOR_CONTEXT_MENU */ static const unsigned char moz_menu_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x0c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, - 0x7c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0xfc, 0xfd, 0x00, 0x00, - 0xfc, 0xff, 0x00, 0x00, 0x7c, 0x84, 0x00, 0x00, 0x6c, 0xfc, 0x00, 0x00, - 0xc4, 0x84, 0x00, 0x00, 0xc0, 0xfc, 0x00, 0x00, 0x80, 0x85, 0x00, 0x00, - 0x80, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x7c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0xfc, 0xfd, 0x00, 0x00, + 0xfc, 0xff, 0x00, 0x00, 0x7c, 0x84, 0x00, 0x00, 0x6c, 0xfc, 0x00, 0x00, + 0xc4, 0x84, 0x00, 0x00, 0xc0, 0xfc, 0x00, 0x00, 0x80, 0x85, 0x00, 0x00, + 0x80, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const unsigned char moz_menu_mask_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, - 0xfe, 0x00, 0x00, 0x00, 0xfe, 0xfd, 0x00, 0x00, 0xfe, 0xff, 0x01, 0x00, - 0xfe, 0xff, 0x01, 0x00, 0xfe, 0xff, 0x01, 0x00, 0xfe, 0xfe, 0x01, 0x00, - 0xee, 0xff, 0x01, 0x00, 0xe4, 0xff, 0x01, 0x00, 0xc0, 0xff, 0x01, 0x00, - 0xc0, 0xff, 0x01, 0x00, 0x80, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, + 0xfe, 0x00, 0x00, 0x00, 0xfe, 0xfd, 0x00, 0x00, 0xfe, 0xff, 0x01, 0x00, + 0xfe, 0xff, 0x01, 0x00, 0xfe, 0xff, 0x01, 0x00, 0xfe, 0xfe, 0x01, 0x00, + 0xee, 0xff, 0x01, 0x00, 0xe4, 0xff, 0x01, 0x00, 0xc0, 0xff, 0x01, 0x00, + 0xc0, 0xff, 0x01, 0x00, 0x80, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* MOZ_CURSOR_SPINNING */ static const unsigned char moz_spinning_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x0c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, - 0x7c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, - 0xfc, 0x3b, 0x00, 0x00, 0x7c, 0x38, 0x00, 0x00, 0x6c, 0x54, 0x00, 0x00, - 0xc4, 0xdc, 0x00, 0x00, 0xc0, 0x44, 0x00, 0x00, 0x80, 0x39, 0x00, 0x00, - 0x80, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x7c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, + 0xfc, 0x3b, 0x00, 0x00, 0x7c, 0x38, 0x00, 0x00, 0x6c, 0x54, 0x00, 0x00, + 0xc4, 0xdc, 0x00, 0x00, 0xc0, 0x44, 0x00, 0x00, 0x80, 0x39, 0x00, 0x00, + 0x80, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const unsigned char moz_spinning_mask_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, - 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x3b, 0x00, 0x00, - 0xfe, 0x7f, 0x00, 0x00, 0xfe, 0x7f, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, - 0xee, 0xff, 0x01, 0x00, 0xe4, 0xff, 0x00, 0x00, 0xc0, 0x7f, 0x00, 0x00, - 0xc0, 0x7f, 0x00, 0x00, 0x80, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, + 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x3b, 0x00, 0x00, + 0xfe, 0x7f, 0x00, 0x00, 0xfe, 0x7f, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, + 0xee, 0xff, 0x01, 0x00, 0xe4, 0xff, 0x00, 0x00, 0xc0, 0x7f, 0x00, 0x00, + 0xc0, 0x7f, 0x00, 0x00, 0x80, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* MOZ_CURSOR_ZOOM_IN */ static const unsigned char moz_zoom_in_bits[] = { - 0xf0, 0x00, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x00, 0x02, 0x04, 0x00, 0x00, - 0x62, 0x04, 0x00, 0x00, 0x61, 0x08, 0x00, 0x00, 0xf9, 0x09, 0x00, 0x00, - 0xf9, 0x09, 0x00, 0x00, 0x61, 0x08, 0x00, 0x00, 0x62, 0x04, 0x00, 0x00, - 0x02, 0x04, 0x00, 0x00, 0x0c, 0x0f, 0x00, 0x00, 0xf0, 0x1c, 0x00, 0x00, - 0x00, 0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, - 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0xf0, 0x00, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x00, 0x02, 0x04, 0x00, 0x00, + 0x62, 0x04, 0x00, 0x00, 0x61, 0x08, 0x00, 0x00, 0xf9, 0x09, 0x00, 0x00, + 0xf9, 0x09, 0x00, 0x00, 0x61, 0x08, 0x00, 0x00, 0x62, 0x04, 0x00, 0x00, + 0x02, 0x04, 0x00, 0x00, 0x0c, 0x0f, 0x00, 0x00, 0xf0, 0x1c, 0x00, 0x00, + 0x00, 0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, + 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const unsigned char moz_zoom_in_mask_bits[] = { - 0xf0, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, - 0xfe, 0x07, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, - 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, - 0xfe, 0x07, 0x00, 0x00, 0xfc, 0x0f, 0x00, 0x00, 0xf0, 0x1c, 0x00, 0x00, - 0x00, 0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, - 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0xf0, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, + 0xfe, 0x07, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, + 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, + 0xfe, 0x07, 0x00, 0x00, 0xfc, 0x0f, 0x00, 0x00, 0xf0, 0x1c, 0x00, 0x00, + 0x00, 0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, + 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* MOZ_CURSOR_ZOOM_OUT */ static const unsigned char moz_zoom_out_bits[] = { - 0xf0, 0x00, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x00, 0x02, 0x04, 0x00, 0x00, - 0x02, 0x04, 0x00, 0x00, 0x01, 0x08, 0x00, 0x00, 0xf9, 0x09, 0x00, 0x00, - 0xf9, 0x09, 0x00, 0x00, 0x01, 0x08, 0x00, 0x00, 0x02, 0x04, 0x00, 0x00, - 0x02, 0x04, 0x00, 0x00, 0x0c, 0x0f, 0x00, 0x00, 0xf0, 0x1c, 0x00, 0x00, - 0x00, 0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, - 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0xf0, 0x00, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x00, 0x02, 0x04, 0x00, 0x00, + 0x02, 0x04, 0x00, 0x00, 0x01, 0x08, 0x00, 0x00, 0xf9, 0x09, 0x00, 0x00, + 0xf9, 0x09, 0x00, 0x00, 0x01, 0x08, 0x00, 0x00, 0x02, 0x04, 0x00, 0x00, + 0x02, 0x04, 0x00, 0x00, 0x0c, 0x0f, 0x00, 0x00, 0xf0, 0x1c, 0x00, 0x00, + 0x00, 0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, + 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const unsigned char moz_zoom_out_mask_bits[] = { - 0xf0, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, - 0xfe, 0x07, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, - 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, - 0xfe, 0x07, 0x00, 0x00, 0xfc, 0x0f, 0x00, 0x00, 0xf0, 0x1c, 0x00, 0x00, - 0x00, 0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, - 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0xf0, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, + 0xfe, 0x07, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, + 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, + 0xfe, 0x07, 0x00, 0x00, 0xfc, 0x0f, 0x00, 0x00, 0xf0, 0x1c, 0x00, 0x00, + 0x00, 0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, + 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +/* MOZ_CURSOR_NOT_ALLOWED */ +static const unsigned char moz_not_allowed_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x80, 0x1f, 0x00, 0x00, 0xe0, 0x7f, 0x00, 0x00, + 0xf0, 0xf0, 0x00, 0x00, 0x38, 0xc0, 0x01, 0x00, 0x7c, 0x80, 0x03, 0x00, + 0xec, 0x00, 0x03, 0x00, 0xce, 0x01, 0x07, 0x00, 0x86, 0x03, 0x06, 0x00, + 0x06, 0x07, 0x06, 0x00, 0x06, 0x0e, 0x06, 0x00, 0x06, 0x1c, 0x06, 0x00, + 0x0e, 0x38, 0x07, 0x00, 0x0c, 0x70, 0x03, 0x00, 0x1c, 0xe0, 0x03, 0x00, + 0x38, 0xc0, 0x01, 0x00, 0xf0, 0xf0, 0x00, 0x00, 0xe0, 0x7f, 0x00, 0x00, + 0x80, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +static const unsigned char moz_not_allowed_mask_bits[] = { + 0x80, 0x1f, 0x00, 0x00, 0xe0, 0x7f, 0x00, 0x00, 0xf0, 0xff, 0x00, 0x00, + 0xf8, 0xff, 0x01, 0x00, 0xfc, 0xf0, 0x03, 0x00, 0xfe, 0xc0, 0x07, 0x00, + 0xfe, 0x81, 0x07, 0x00, 0xff, 0x83, 0x0f, 0x00, 0xcf, 0x07, 0x0f, 0x00, + 0x8f, 0x0f, 0x0f, 0x00, 0x0f, 0x1f, 0x0f, 0x00, 0x0f, 0x3e, 0x0f, 0x00, + 0x1f, 0xfc, 0x0f, 0x00, 0x1e, 0xf8, 0x07, 0x00, 0x3e, 0xf0, 0x07, 0x00, + 0xfc, 0xf0, 0x03, 0x00, 0xf8, 0xff, 0x01, 0x00, 0xf0, 0xff, 0x00, 0x00, + 0xe0, 0x7f, 0x00, 0x00, 0x80, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +/* MOZ_CURSOR_COL_RESIZE */ +static const unsigned char moz_col_resize_bits[] = { + 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, + 0x00, 0x05, 0x00, 0x00, 0x10, 0x45, 0x00, 0x00, 0x18, 0xc5, 0x00, 0x00, + 0x1c, 0xc5, 0x01, 0x00, 0x7e, 0xf5, 0x03, 0x00, 0x1c, 0xc5, 0x01, 0x00, + 0x18, 0xc5, 0x00, 0x00, 0x10, 0x45, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, + 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +static const unsigned char moz_col_resize_mask_bits[] = { + 0x80, 0x0f, 0x00, 0x00, 0x80, 0x0f, 0x00, 0x00, 0x80, 0x0f, 0x00, 0x00, + 0x90, 0x4f, 0x00, 0x00, 0xb8, 0xef, 0x00, 0x00, 0xbc, 0xef, 0x01, 0x00, + 0xbe, 0xef, 0x03, 0x00, 0xff, 0xff, 0x07, 0x00, 0xbe, 0xef, 0x03, 0x00, + 0xbc, 0xef, 0x01, 0x00, 0xb8, 0xef, 0x00, 0x00, 0x90, 0x4f, 0x00, 0x00, + 0x80, 0x0f, 0x00, 0x00, 0x80, 0x0f, 0x00, 0x00, 0x80, 0x0f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +/* MOZ_CURSOR_ROW_RESIZE */ +static const unsigned char moz_row_resize_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, + 0xe0, 0x03, 0x00, 0x00, 0xf0, 0x07, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0xf0, 0x07, 0x00, 0x00, + 0xe0, 0x03, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +static const unsigned char moz_row_resize_mask_bits[] = { + 0x80, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x00, + 0xf0, 0x07, 0x00, 0x00, 0xf8, 0x0f, 0x00, 0x00, 0xf0, 0x07, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, + 0xff, 0x7f, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0xf0, 0x07, 0x00, 0x00, 0xf8, 0x0f, 0x00, 0x00, + 0xf0, 0x07, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +/* MOZ_CURSOR_VERTICAL_TEXT */ +static const unsigned char moz_vertical_text_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00, + 0x06, 0x60, 0x00, 0x00, 0xfc, 0x3f, 0x00, 0x00, 0x06, 0x60, 0x00, 0x00, + 0x02, 0x40, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +static const unsigned char moz_vertical_text_mask_bits[] = { + 0x07, 0xe0, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, + 0xff, 0xff, 0x00, 0x00, 0xfe, 0x7f, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, + 0x0f, 0xf0, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +/* MOZ_CURSOR_NESW_RESIZE */ +static const unsigned char moz_nesw_resize_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, + 0x00, 0xbe, 0x00, 0x00, 0x00, 0xbc, 0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, + 0x02, 0xb4, 0x00, 0x00, 0x02, 0xa2, 0x00, 0x00, 0x02, 0x81, 0x00, 0x00, + 0x8a, 0x80, 0x00, 0x00, 0x5a, 0x80, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, + 0x7a, 0x00, 0x00, 0x00, 0xfa, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0xfe, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +static const unsigned char moz_nesw_resize_mask_bits[] = { + 0xc0, 0xff, 0x01, 0x00, 0xc0, 0xff, 0x01, 0x00, 0xc0, 0xff, 0x01, 0x00, + 0x00, 0xff, 0x01, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfc, 0x01, 0x00, + 0x07, 0xfe, 0x01, 0x00, 0x07, 0xf7, 0x01, 0x00, 0x8f, 0xe3, 0x01, 0x00, + 0xdf, 0xc1, 0x01, 0x00, 0xff, 0xc0, 0x01, 0x00, 0x7f, 0x00, 0x00, 0x00, + 0xff, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, + 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +/* MOZ_CURSOR_NWSE_RESIZE */ +static const unsigned char moz_nwse_resize_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0xfa, 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, + 0x5a, 0x80, 0x00, 0x00, 0x8a, 0x80, 0x00, 0x00, 0x02, 0x81, 0x00, 0x00, + 0x02, 0xa2, 0x00, 0x00, 0x02, 0xb4, 0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, + 0x00, 0xbc, 0x00, 0x00, 0x00, 0xbe, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, + 0xc0, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +static const unsigned char moz_nwse_resize_mask_bits[] = { + 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, + 0xff, 0x01, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, + 0xff, 0xc0, 0x01, 0x00, 0xdf, 0xc1, 0x01, 0x00, 0x8f, 0xe3, 0x01, 0x00, + 0x07, 0xf7, 0x01, 0x00, 0x07, 0xfe, 0x01, 0x00, 0x00, 0xfc, 0x01, 0x00, + 0x00, 0xfe, 0x01, 0x00, 0x00, 0xff, 0x01, 0x00, 0xc0, 0xff, 0x01, 0x00, + 0xc0, 0xff, 0x01, 0x00, 0xc0, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; enum { MOZ_CURSOR_QUESTION_ARROW = 0, @@ -300,7 +462,13 @@ enum { MOZ_CURSOR_CONTEXT_MENU, MOZ_CURSOR_SPINNING, MOZ_CURSOR_ZOOM_IN, - MOZ_CURSOR_ZOOM_OUT + MOZ_CURSOR_ZOOM_OUT, + MOZ_CURSOR_NOT_ALLOWED, + MOZ_CURSOR_COL_RESIZE, + MOZ_CURSOR_ROW_RESIZE, + MOZ_CURSOR_VERTICAL_TEXT, + MOZ_CURSOR_NESW_RESIZE, + MOZ_CURSOR_NWSE_RESIZE }; // create custom pixmap cursor from cursors in nsGTKCursorData.h @@ -313,7 +481,13 @@ static const nsGtkCursor GtkCursors[] = { { moz_menu_bits, moz_menu_mask_bits, 2, 2 }, { moz_spinning_bits, moz_spinning_mask_bits, 2, 2 }, { moz_zoom_in_bits, moz_zoom_in_mask_bits, 6, 6 }, - { moz_zoom_out_bits, moz_zoom_out_mask_bits, 6, 6 } + { moz_zoom_out_bits, moz_zoom_out_mask_bits, 6, 6 }, + { moz_not_allowed_bits, moz_not_allowed_mask_bits, 9, 9 }, + { moz_col_resize_bits, moz_col_resize_mask_bits, 9, 7 }, + { moz_row_resize_bits, moz_row_resize_mask_bits, 7, 9 }, + { moz_vertical_text_bits, moz_vertical_text_mask_bits, 8, 4 }, + { moz_nesw_resize_bits, moz_nesw_resize_mask_bits, 8, 8 }, + { moz_nwse_resize_bits, moz_nwse_resize_mask_bits, 8, 8 } }; #endif /* nsGtkCursors_h__ */ diff --git a/mozilla/widget/src/gtk/nsWidget.cpp b/mozilla/widget/src/gtk/nsWidget.cpp index cec8b240e6e..28df386ac3e 100644 --- a/mozilla/widget/src/gtk/nsWidget.cpp +++ b/mozilla/widget/src/gtk/nsWidget.cpp @@ -839,29 +839,35 @@ NS_IMETHODIMP nsWidget::SetCursor(nsCursor aCursor) newCursor = gdk_cursor_new(GDK_HAND2); break; - case eCursor_sizeWE: - /* GDK_SB_H_DOUBLE_ARROW <==>. The ideal choice is: =>||<= */ - newCursor = gdk_cursor_new(GDK_SB_H_DOUBLE_ARROW); - break; - - case eCursor_sizeNS: - /* Again, should be =>||<= rotated 90 degrees. */ - newCursor = gdk_cursor_new(GDK_SB_V_DOUBLE_ARROW); + case eCursor_n_resize: + newCursor = gdk_cursor_new(GDK_TOP_SIDE); break; - case eCursor_sizeNW: + case eCursor_s_resize: + newCursor = gdk_cursor_new(GDK_BOTTOM_SIDE); + break; + + case eCursor_w_resize: + newCursor = gdk_cursor_new(GDK_LEFT_SIDE); + break; + + case eCursor_e_resize: + newCursor = gdk_cursor_new(GDK_RIGHT_SIDE); + break; + + case eCursor_nw_resize: newCursor = gdk_cursor_new(GDK_TOP_LEFT_CORNER); break; - case eCursor_sizeSE: + case eCursor_se_resize: newCursor = gdk_cursor_new(GDK_BOTTOM_RIGHT_CORNER); break; - case eCursor_sizeNE: + case eCursor_ne_resize: newCursor = gdk_cursor_new(GDK_TOP_RIGHT_CORNER); break; - case eCursor_sizeSW: + case eCursor_sw_resize: newCursor = gdk_cursor_new(GDK_BOTTOM_LEFT_CORNER); break; @@ -897,12 +903,13 @@ NS_IMETHODIMP nsWidget::SetCursor(nsCursor aCursor) newCursor = gdk_cursor_new(GDK_QUESTION_ARROW); break; - case eCursor_copy: // CSS3 + case eCursor_copy: case eCursor_alias: - case eCursor_context_menu: // XXX: these CSS3 cursors need to be implemented - // For CSS3 Cursor Definitions, See: - // http://www.w3.org/TR/css3-ui/ + break; + + case eCursor_context_menu: + gdkcursor = gdk_cursor_new(GDK_RIGHTBUTTON); break; case eCursor_cell: @@ -921,11 +928,52 @@ NS_IMETHODIMP nsWidget::SetCursor(nsCursor aCursor) case eCursor_count_up: case eCursor_count_down: case eCursor_count_up_down: - // XXX: these CSS3 cursors need to be implemented + // XXX: these -moz- cursors need to be implemented break; case eCursor_zoom_in: + gdkcursor = gdk_cursor_new(GDK_PLUS); + break; + case eCursor_zoom_out: + gdkcursor = gdk_cursor_new(GDK_EXCHANGE); + break; + + case eCursor_not_allowed: + case eCursor_no_drop: + gdkcursor = gdk_cursor_new(GDK_X_CURSOR); + break; + + case eCursor_col_resize: + gdkcursor = gdk_cursor_new(GDK_SB_H_DOUBLE_ARROW); + break; + + case eCursor_row_resize: + gdkcursor = gdk_cursor_new(GDK_SB_V_DOUBLE_ARROW); + break; + + case eCursor_vertical_text: + gdkcursor = gdk_cursor_new(GDK_XTERM); + break; + + case eCursor_all_scroll: + gdkcursor = gdk_cursor_new(GDK_FLEUR); + break; + + case eCursor_nesw_resize: + gdkcursor = gdk_cursor_new(GDK_TOP_RIGHT_CORNER); + break; + + case eCursor_nwse_resize: + gdkcursor = gdk_cursor_new(GDK_TOP_LEFT_CORNER); + break; + + case eCursor_ns_resize: + gdkcursor = gdk_cursor_new(GDK_SB_V_DOUBLE_ARROW); + break; + + case eCursor_ew_resize: + gdkcursor = gdk_cursor_new(GDK_SB_H_DOUBLE_ARROW); break; default: diff --git a/mozilla/widget/src/gtk/nsWindow.cpp b/mozilla/widget/src/gtk/nsWindow.cpp index 73c77168443..eabc1636a09 100644 --- a/mozilla/widget/src/gtk/nsWindow.cpp +++ b/mozilla/widget/src/gtk/nsWindow.cpp @@ -1131,24 +1131,28 @@ GdkCursor *nsWindow::GtkCreateCursor(nsCursor aCursorType) case eCursor_hyperlink: gdkcursor = gdk_cursor_new(GDK_HAND2); break; - case eCursor_sizeWE: - /* GDK_SB_H_DOUBLE_ARROW <==>. The ideal choice is: =>||<= */ - gdkcursor = gdk_cursor_new(GDK_SB_H_DOUBLE_ARROW); + case eCursor_n_resize: + gdkcursor = gdk_cursor_new(GDK_TOP_SIDE); break; - case eCursor_sizeNS: - /* Again, should be =>||<= rotated 90 degrees. */ - gdkcursor = gdk_cursor_new(GDK_SB_V_DOUBLE_ARROW); + case eCursor_s_resize: + gdkcursor = gdk_cursor_new(GDK_BOTTOM_SIDE); break; - case eCursor_sizeNW: + case eCursor_w_resize: + gdkcursor = gdk_cursor_new(GDK_LEFT_SIDE); + break; + case eCursor_e_resize: + gdkcursor = gdk_cursor_new(GDK_RIGHT_SIDE); + break; + case eCursor_nw_resize: gdkcursor = gdk_cursor_new(GDK_TOP_LEFT_CORNER); break; - case eCursor_sizeSE: + case eCursor_se_resize: gdkcursor = gdk_cursor_new(GDK_BOTTOM_RIGHT_CORNER); break; - case eCursor_sizeNE: + case eCursor_ne_resize: gdkcursor = gdk_cursor_new(GDK_TOP_RIGHT_CORNER); break; - case eCursor_sizeSW: + case eCursor_sw_resize: gdkcursor = gdk_cursor_new(GDK_BOTTOM_LEFT_CORNER); break; case eCursor_arrow_north: @@ -1163,52 +1167,80 @@ GdkCursor *nsWindow::GtkCreateCursor(nsCursor aCursorType) case eCursor_arrow_west_plus: gdkcursor = gdk_cursor_new(GDK_LEFT_SIDE); break; - case eCursor_arrow_east: - case eCursor_arrow_east_plus: - gdkcursor = gdk_cursor_new(GDK_RIGHT_SIDE); - break; - case eCursor_crosshair: - gdkcursor = gdk_cursor_new(GDK_CROSSHAIR); - break; - case eCursor_move: - gdkcursor = gdk_cursor_new(GDK_FLEUR); - break; - case eCursor_help: - newType = MOZ_CURSOR_QUESTION_ARROW; - break; - case eCursor_copy: // CSS3 - newType = MOZ_CURSOR_COPY; - break; - case eCursor_alias: - newType = MOZ_CURSOR_ALIAS; - break; - case eCursor_context_menu: - newType = MOZ_CURSOR_CONTEXT_MENU; - break; - case eCursor_cell: - gdkcursor = gdk_cursor_new(GDK_PLUS); - break; - case eCursor_grab: - newType = MOZ_CURSOR_HAND_GRAB; - break; - case eCursor_grabbing: - newType = MOZ_CURSOR_HAND_GRABBING; - break; - case eCursor_spinning: - newType = MOZ_CURSOR_SPINNING; - break; - case eCursor_count_up: - case eCursor_count_down: - case eCursor_count_up_down: - // XXX: these CSS3 cursors need to be implemented - gdkcursor = gdk_cursor_new(GDK_LEFT_PTR); - break; - case eCursor_zoom_in: - newType = MOZ_CURSOR_ZOOM_IN; - break; - case eCursor_zoom_out: - newType = MOZ_CURSOR_ZOOM_OUT; - break; + case eCursor_arrow_east: + case eCursor_arrow_east_plus: + gdkcursor = gdk_cursor_new(GDK_RIGHT_SIDE); + break; + case eCursor_crosshair: + gdkcursor = gdk_cursor_new(GDK_CROSSHAIR); + break; + case eCursor_move: + gdkcursor = gdk_cursor_new(GDK_FLEUR); + break; + case eCursor_help: + newType = MOZ_CURSOR_QUESTION_ARROW; + break; + case eCursor_copy: // CSS3 + newType = MOZ_CURSOR_COPY; + break; + case eCursor_alias: + newType = MOZ_CURSOR_ALIAS; + break; + case eCursor_context_menu: + newType = MOZ_CURSOR_CONTEXT_MENU; + break; + case eCursor_cell: + gdkcursor = gdk_cursor_new(GDK_PLUS); + break; + case eCursor_grab: + newType = MOZ_CURSOR_HAND_GRAB; + break; + case eCursor_grabbing: + newType = MOZ_CURSOR_HAND_GRABBING; + break; + case eCursor_spinning: + newType = MOZ_CURSOR_SPINNING; + break; + case eCursor_count_up: + case eCursor_count_down: + case eCursor_count_up_down: + // XXX: these -moz- cursors need to be implemented + gdkcursor = gdk_cursor_new(GDK_LEFT_PTR); + break; + case eCursor_zoom_in: + newType = MOZ_CURSOR_ZOOM_IN; + break; + case eCursor_zoom_out: + newType = MOZ_CURSOR_ZOOM_OUT; + break; + case eCursor_not_allowed: + case eCursor_no_drop: + newType = MOZ_CURSOR_NOT_ALLOWED; + break; + case eCursor_col_resize: + newType = MOZ_CURSOR_COL_RESIZE; + break; + case eCursor_row_resize: + newType = MOZ_CURSOR_ROW_RESIZE; + break; + case eCursor_vertical_text: + newType = MOZ_CURSOR_VERTICAL_TEXT; + break; + case eCursor_all_scroll: + gdkcursor = gdk_cursor_new(GDK_FLEUR); + break; + case eCursor_nesw_resize: + newType = MOZ_CURSOR_NESW_RESIZE; + break; + case eCursor_nwse_resize: + newType = MOZ_CURSOR_NWSE_RESIZE; + break; + case eCursor_ns_resize: + gdkcursor = gdk_cursor_new(GDK_SB_V_DOUBLE_ARROW); + break; + case eCursor_ew_resize: + gdkcursor = gdk_cursor_new(GDK_SB_H_DOUBLE_ARROW); + break; default: NS_ASSERTION(aCursorType, "Invalid cursor type"); break; diff --git a/mozilla/widget/src/gtk2/nsGtkCursors.h b/mozilla/widget/src/gtk2/nsGtkCursors.h index 7813de67a3c..1f678fcae65 100644 --- a/mozilla/widget/src/gtk2/nsGtkCursors.h +++ b/mozilla/widget/src/gtk2/nsGtkCursors.h @@ -1,5 +1,5 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* vim:expandtab:shiftwidth=4:tabstop=4: +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim:expandtab:shiftwidth=2:tabstop=2: */ /* ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -42,278 +42,452 @@ #define nsGtkCursors_h__ typedef struct { - const unsigned char *bits; - const unsigned char *mask_bits; - int hot_x; - int hot_y; + const unsigned char *bits; + const unsigned char *mask_bits; + int hot_x; + int hot_y; } nsGtkCursor; /* MOZ_CURSOR_QUESTION_ARROW */ static const unsigned char moz_question_arrow_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x0c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, - 0x7c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, - 0xfc, 0xe3, 0x00, 0x00, 0x7c, 0xb0, 0x01, 0x00, 0x6c, 0x80, 0x01, 0x00, - 0xc4, 0xc0, 0x00, 0x00, 0xc0, 0x60, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, - 0x80, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x7c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, + 0xfc, 0xe3, 0x00, 0x00, 0x7c, 0xb0, 0x01, 0x00, 0x6c, 0x80, 0x01, 0x00, + 0xc4, 0xc0, 0x00, 0x00, 0xc0, 0x60, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, + 0x80, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const unsigned char moz_question_arrow_mask_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, - 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0xe3, 0x00, 0x00, - 0xfe, 0xf7, 0x01, 0x00, 0xfe, 0xfb, 0x03, 0x00, 0xfe, 0xf0, 0x03, 0x00, - 0xee, 0xe1, 0x01, 0x00, 0xe4, 0xf1, 0x00, 0x00, 0xc0, 0x63, 0x00, 0x00, - 0xc0, 0xf3, 0x00, 0x00, 0x80, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, + 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0xe3, 0x00, 0x00, + 0xfe, 0xf7, 0x01, 0x00, 0xfe, 0xfb, 0x03, 0x00, 0xfe, 0xf0, 0x03, 0x00, + 0xee, 0xe1, 0x01, 0x00, 0xe4, 0xf1, 0x00, 0x00, 0xc0, 0x63, 0x00, 0x00, + 0xc0, 0xf3, 0x00, 0x00, 0x80, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* MOZ_CURSOR_HAND_GRAB */ static const unsigned char moz_hand_grab_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, - 0x60, 0x39, 0x00, 0x00, 0x90, 0x49, 0x00, 0x00, 0x90, 0x49, 0x01, 0x00, - 0x20, 0xc9, 0x02, 0x00, 0x20, 0x49, 0x02, 0x00, 0x58, 0x40, 0x02, 0x00, - 0x64, 0x00, 0x02, 0x00, 0x44, 0x00, 0x01, 0x00, 0x08, 0x00, 0x01, 0x00, - 0x10, 0x00, 0x01, 0x00, 0x10, 0x80, 0x00, 0x00, 0x20, 0x80, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, + 0x60, 0x39, 0x00, 0x00, 0x90, 0x49, 0x00, 0x00, 0x90, 0x49, 0x01, 0x00, + 0x20, 0xc9, 0x02, 0x00, 0x20, 0x49, 0x02, 0x00, 0x58, 0x40, 0x02, 0x00, + 0x64, 0x00, 0x02, 0x00, 0x44, 0x00, 0x01, 0x00, 0x08, 0x00, 0x01, 0x00, + 0x10, 0x00, 0x01, 0x00, 0x10, 0x80, 0x00, 0x00, 0x20, 0x80, 0x00, 0x00, + 0x40, 0x40, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const unsigned char moz_hand_grab_mask_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x60, 0x3f, 0x00, 0x00, - 0xf0, 0x7f, 0x00, 0x00, 0xf8, 0xff, 0x01, 0x00, 0xf8, 0xff, 0x03, 0x00, - 0xf0, 0xff, 0x07, 0x00, 0xf8, 0xff, 0x07, 0x00, 0xfc, 0xff, 0x07, 0x00, - 0xfe, 0xff, 0x07, 0x00, 0xfe, 0xff, 0x03, 0x00, 0xfc, 0xff, 0x03, 0x00, - 0xf8, 0xff, 0x03, 0x00, 0xf8, 0xff, 0x01, 0x00, 0xf0, 0xff, 0x01, 0x00, - 0xe0, 0xff, 0x00, 0x00, 0xc0, 0xff, 0x00, 0x00, 0xc0, 0xff, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x60, 0x3f, 0x00, 0x00, + 0xf0, 0x7f, 0x00, 0x00, 0xf8, 0xff, 0x01, 0x00, 0xf8, 0xff, 0x03, 0x00, + 0xf0, 0xff, 0x07, 0x00, 0xf8, 0xff, 0x07, 0x00, 0xfc, 0xff, 0x07, 0x00, + 0xfe, 0xff, 0x07, 0x00, 0xfe, 0xff, 0x03, 0x00, 0xfc, 0xff, 0x03, 0x00, + 0xf8, 0xff, 0x03, 0x00, 0xf8, 0xff, 0x01, 0x00, 0xf0, 0xff, 0x01, 0x00, + 0xe0, 0xff, 0x00, 0x00, 0xc0, 0xff, 0x00, 0x00, 0xc0, 0xff, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* MOZ_CURSOR_HAND_GRABBING */ static const unsigned char moz_hand_grabbing_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xc0, 0x36, 0x00, 0x00, 0x20, 0xc9, 0x00, 0x00, 0x20, 0x40, 0x01, 0x00, - 0x40, 0x00, 0x01, 0x00, 0x60, 0x00, 0x01, 0x00, 0x10, 0x00, 0x01, 0x00, - 0x10, 0x00, 0x01, 0x00, 0x10, 0x80, 0x00, 0x00, 0x20, 0x80, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xc0, 0x36, 0x00, 0x00, 0x20, 0xc9, 0x00, 0x00, 0x20, 0x40, 0x01, 0x00, + 0x40, 0x00, 0x01, 0x00, 0x60, 0x00, 0x01, 0x00, 0x10, 0x00, 0x01, 0x00, + 0x10, 0x00, 0x01, 0x00, 0x10, 0x80, 0x00, 0x00, 0x20, 0x80, 0x00, 0x00, + 0x40, 0x40, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const unsigned char moz_hand_grabbing_mask_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x36, 0x00, 0x00, - 0xe0, 0xff, 0x00, 0x00, 0xf0, 0xff, 0x01, 0x00, 0xf0, 0xff, 0x03, 0x00, - 0xe0, 0xff, 0x03, 0x00, 0xf0, 0xff, 0x03, 0x00, 0xf8, 0xff, 0x03, 0x00, - 0xf8, 0xff, 0x03, 0x00, 0xf8, 0xff, 0x01, 0x00, 0xf0, 0xff, 0x01, 0x00, - 0xe0, 0xff, 0x00, 0x00, 0xc0, 0xff, 0x00, 0x00, 0xc0, 0x7f, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x36, 0x00, 0x00, + 0xe0, 0xff, 0x00, 0x00, 0xf0, 0xff, 0x01, 0x00, 0xf0, 0xff, 0x03, 0x00, + 0xe0, 0xff, 0x03, 0x00, 0xf0, 0xff, 0x03, 0x00, 0xf8, 0xff, 0x03, 0x00, + 0xf8, 0xff, 0x03, 0x00, 0xf8, 0xff, 0x01, 0x00, 0xf0, 0xff, 0x01, 0x00, + 0xe0, 0xff, 0x00, 0x00, 0xc0, 0xff, 0x00, 0x00, 0xc0, 0x7f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* MOZ_CURSOR_COPY */ static const unsigned char moz_copy_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x0c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, - 0x7c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, - 0xfc, 0x03, 0x00, 0x00, 0x7c, 0x30, 0x00, 0x00, 0x6c, 0x30, 0x00, 0x00, - 0xc4, 0xfc, 0x00, 0x00, 0xc0, 0xfc, 0x00, 0x00, 0x80, 0x31, 0x00, 0x00, - 0x80, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x7c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, + 0xfc, 0x03, 0x00, 0x00, 0x7c, 0x30, 0x00, 0x00, 0x6c, 0x30, 0x00, 0x00, + 0xc4, 0xfc, 0x00, 0x00, 0xc0, 0xfc, 0x00, 0x00, 0x80, 0x31, 0x00, 0x00, + 0x80, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const unsigned char moz_copy_mask_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, - 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x03, 0x00, 0x00, - 0xfe, 0x37, 0x00, 0x00, 0xfe, 0x7b, 0x00, 0x00, 0xfe, 0xfc, 0x00, 0x00, - 0xee, 0xff, 0x01, 0x00, 0xe4, 0xff, 0x01, 0x00, 0xc0, 0xff, 0x00, 0x00, - 0xc0, 0x7b, 0x00, 0x00, 0x80, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, + 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x03, 0x00, 0x00, + 0xfe, 0x37, 0x00, 0x00, 0xfe, 0x7b, 0x00, 0x00, 0xfe, 0xfc, 0x00, 0x00, + 0xee, 0xff, 0x01, 0x00, 0xe4, 0xff, 0x01, 0x00, 0xc0, 0xff, 0x00, 0x00, + 0xc0, 0x7b, 0x00, 0x00, 0x80, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* MOZ_CURSOR_ALIAS */ static const unsigned char moz_alias_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x0c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, - 0x7c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, - 0xfc, 0x03, 0x00, 0x00, 0x7c, 0xf0, 0x00, 0x00, 0x6c, 0xe0, 0x00, 0x00, - 0xc4, 0xf0, 0x00, 0x00, 0xc0, 0xb0, 0x00, 0x00, 0x80, 0x19, 0x00, 0x00, - 0x80, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x7c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, + 0xfc, 0x03, 0x00, 0x00, 0x7c, 0xf0, 0x00, 0x00, 0x6c, 0xe0, 0x00, 0x00, + 0xc4, 0xf0, 0x00, 0x00, 0xc0, 0xb0, 0x00, 0x00, 0x80, 0x19, 0x00, 0x00, + 0x80, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const unsigned char moz_alias_mask_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, - 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x03, 0x00, 0x00, - 0xfe, 0xf7, 0x00, 0x00, 0xfe, 0xfb, 0x01, 0x00, 0xfe, 0xf0, 0x01, 0x00, - 0xee, 0xf9, 0x01, 0x00, 0xe4, 0xf9, 0x01, 0x00, 0xc0, 0xbf, 0x00, 0x00, - 0xc0, 0x3f, 0x00, 0x00, 0x80, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, + 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x03, 0x00, 0x00, + 0xfe, 0xf7, 0x00, 0x00, 0xfe, 0xfb, 0x01, 0x00, 0xfe, 0xf0, 0x01, 0x00, + 0xee, 0xf9, 0x01, 0x00, 0xe4, 0xf9, 0x01, 0x00, 0xc0, 0xbf, 0x00, 0x00, + 0xc0, 0x3f, 0x00, 0x00, 0x80, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* MOZ_CURSOR_CONTEXT_MENU */ static const unsigned char moz_menu_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x0c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, - 0x7c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0xfc, 0xfd, 0x00, 0x00, - 0xfc, 0xff, 0x00, 0x00, 0x7c, 0x84, 0x00, 0x00, 0x6c, 0xfc, 0x00, 0x00, - 0xc4, 0x84, 0x00, 0x00, 0xc0, 0xfc, 0x00, 0x00, 0x80, 0x85, 0x00, 0x00, - 0x80, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x7c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0xfc, 0xfd, 0x00, 0x00, + 0xfc, 0xff, 0x00, 0x00, 0x7c, 0x84, 0x00, 0x00, 0x6c, 0xfc, 0x00, 0x00, + 0xc4, 0x84, 0x00, 0x00, 0xc0, 0xfc, 0x00, 0x00, 0x80, 0x85, 0x00, 0x00, + 0x80, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const unsigned char moz_menu_mask_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, - 0xfe, 0x00, 0x00, 0x00, 0xfe, 0xfd, 0x00, 0x00, 0xfe, 0xff, 0x01, 0x00, - 0xfe, 0xff, 0x01, 0x00, 0xfe, 0xff, 0x01, 0x00, 0xfe, 0xfe, 0x01, 0x00, - 0xee, 0xff, 0x01, 0x00, 0xe4, 0xff, 0x01, 0x00, 0xc0, 0xff, 0x01, 0x00, - 0xc0, 0xff, 0x01, 0x00, 0x80, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, + 0xfe, 0x00, 0x00, 0x00, 0xfe, 0xfd, 0x00, 0x00, 0xfe, 0xff, 0x01, 0x00, + 0xfe, 0xff, 0x01, 0x00, 0xfe, 0xff, 0x01, 0x00, 0xfe, 0xfe, 0x01, 0x00, + 0xee, 0xff, 0x01, 0x00, 0xe4, 0xff, 0x01, 0x00, 0xc0, 0xff, 0x01, 0x00, + 0xc0, 0xff, 0x01, 0x00, 0x80, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* MOZ_CURSOR_SPINNING */ static const unsigned char moz_spinning_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x0c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, - 0x7c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, - 0xfc, 0x3b, 0x00, 0x00, 0x7c, 0x38, 0x00, 0x00, 0x6c, 0x54, 0x00, 0x00, - 0xc4, 0xdc, 0x00, 0x00, 0xc0, 0x44, 0x00, 0x00, 0x80, 0x39, 0x00, 0x00, - 0x80, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x7c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, + 0xfc, 0x3b, 0x00, 0x00, 0x7c, 0x38, 0x00, 0x00, 0x6c, 0x54, 0x00, 0x00, + 0xc4, 0xdc, 0x00, 0x00, 0xc0, 0x44, 0x00, 0x00, 0x80, 0x39, 0x00, 0x00, + 0x80, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const unsigned char moz_spinning_mask_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, - 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x3b, 0x00, 0x00, - 0xfe, 0x7f, 0x00, 0x00, 0xfe, 0x7f, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, - 0xee, 0xff, 0x01, 0x00, 0xe4, 0xff, 0x00, 0x00, 0xc0, 0x7f, 0x00, 0x00, - 0xc0, 0x7f, 0x00, 0x00, 0x80, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x1e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, + 0xfe, 0x00, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x3b, 0x00, 0x00, + 0xfe, 0x7f, 0x00, 0x00, 0xfe, 0x7f, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, + 0xee, 0xff, 0x01, 0x00, 0xe4, 0xff, 0x00, 0x00, 0xc0, 0x7f, 0x00, 0x00, + 0xc0, 0x7f, 0x00, 0x00, 0x80, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* MOZ_CURSOR_ZOOM_IN */ static const unsigned char moz_zoom_in_bits[] = { - 0xf0, 0x00, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x00, 0x02, 0x04, 0x00, 0x00, - 0x62, 0x04, 0x00, 0x00, 0x61, 0x08, 0x00, 0x00, 0xf9, 0x09, 0x00, 0x00, - 0xf9, 0x09, 0x00, 0x00, 0x61, 0x08, 0x00, 0x00, 0x62, 0x04, 0x00, 0x00, - 0x02, 0x04, 0x00, 0x00, 0x0c, 0x0f, 0x00, 0x00, 0xf0, 0x1c, 0x00, 0x00, - 0x00, 0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, - 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0xf0, 0x00, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x00, 0x02, 0x04, 0x00, 0x00, + 0x62, 0x04, 0x00, 0x00, 0x61, 0x08, 0x00, 0x00, 0xf9, 0x09, 0x00, 0x00, + 0xf9, 0x09, 0x00, 0x00, 0x61, 0x08, 0x00, 0x00, 0x62, 0x04, 0x00, 0x00, + 0x02, 0x04, 0x00, 0x00, 0x0c, 0x0f, 0x00, 0x00, 0xf0, 0x1c, 0x00, 0x00, + 0x00, 0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, + 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const unsigned char moz_zoom_in_mask_bits[] = { - 0xf0, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, - 0xfe, 0x07, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, - 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, - 0xfe, 0x07, 0x00, 0x00, 0xfc, 0x0f, 0x00, 0x00, 0xf0, 0x1c, 0x00, 0x00, - 0x00, 0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, - 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0xf0, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, + 0xfe, 0x07, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, + 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, + 0xfe, 0x07, 0x00, 0x00, 0xfc, 0x0f, 0x00, 0x00, 0xf0, 0x1c, 0x00, 0x00, + 0x00, 0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, + 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; /* MOZ_CURSOR_ZOOM_OUT */ static const unsigned char moz_zoom_out_bits[] = { - 0xf0, 0x00, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x00, 0x02, 0x04, 0x00, 0x00, - 0x02, 0x04, 0x00, 0x00, 0x01, 0x08, 0x00, 0x00, 0xf9, 0x09, 0x00, 0x00, - 0xf9, 0x09, 0x00, 0x00, 0x01, 0x08, 0x00, 0x00, 0x02, 0x04, 0x00, 0x00, - 0x02, 0x04, 0x00, 0x00, 0x0c, 0x0f, 0x00, 0x00, 0xf0, 0x1c, 0x00, 0x00, - 0x00, 0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, - 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0xf0, 0x00, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x00, 0x02, 0x04, 0x00, 0x00, + 0x02, 0x04, 0x00, 0x00, 0x01, 0x08, 0x00, 0x00, 0xf9, 0x09, 0x00, 0x00, + 0xf9, 0x09, 0x00, 0x00, 0x01, 0x08, 0x00, 0x00, 0x02, 0x04, 0x00, 0x00, + 0x02, 0x04, 0x00, 0x00, 0x0c, 0x0f, 0x00, 0x00, 0xf0, 0x1c, 0x00, 0x00, + 0x00, 0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, + 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const unsigned char moz_zoom_out_mask_bits[] = { - 0xf0, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, - 0xfe, 0x07, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, - 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, - 0xfe, 0x07, 0x00, 0x00, 0xfc, 0x0f, 0x00, 0x00, 0xf0, 0x1c, 0x00, 0x00, - 0x00, 0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, - 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0xf0, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, + 0xfe, 0x07, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, + 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, + 0xfe, 0x07, 0x00, 0x00, 0xfc, 0x0f, 0x00, 0x00, 0xf0, 0x1c, 0x00, 0x00, + 0x00, 0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, + 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +/* MOZ_CURSOR_NOT_ALLOWED */ +static const unsigned char moz_not_allowed_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x80, 0x1f, 0x00, 0x00, 0xe0, 0x7f, 0x00, 0x00, + 0xf0, 0xf0, 0x00, 0x00, 0x38, 0xc0, 0x01, 0x00, 0x7c, 0x80, 0x03, 0x00, + 0xec, 0x00, 0x03, 0x00, 0xce, 0x01, 0x07, 0x00, 0x86, 0x03, 0x06, 0x00, + 0x06, 0x07, 0x06, 0x00, 0x06, 0x0e, 0x06, 0x00, 0x06, 0x1c, 0x06, 0x00, + 0x0e, 0x38, 0x07, 0x00, 0x0c, 0x70, 0x03, 0x00, 0x1c, 0xe0, 0x03, 0x00, + 0x38, 0xc0, 0x01, 0x00, 0xf0, 0xf0, 0x00, 0x00, 0xe0, 0x7f, 0x00, 0x00, + 0x80, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +static const unsigned char moz_not_allowed_mask_bits[] = { + 0x80, 0x1f, 0x00, 0x00, 0xe0, 0x7f, 0x00, 0x00, 0xf0, 0xff, 0x00, 0x00, + 0xf8, 0xff, 0x01, 0x00, 0xfc, 0xf0, 0x03, 0x00, 0xfe, 0xc0, 0x07, 0x00, + 0xfe, 0x81, 0x07, 0x00, 0xff, 0x83, 0x0f, 0x00, 0xcf, 0x07, 0x0f, 0x00, + 0x8f, 0x0f, 0x0f, 0x00, 0x0f, 0x1f, 0x0f, 0x00, 0x0f, 0x3e, 0x0f, 0x00, + 0x1f, 0xfc, 0x0f, 0x00, 0x1e, 0xf8, 0x07, 0x00, 0x3e, 0xf0, 0x07, 0x00, + 0xfc, 0xf0, 0x03, 0x00, 0xf8, 0xff, 0x01, 0x00, 0xf0, 0xff, 0x00, 0x00, + 0xe0, 0x7f, 0x00, 0x00, 0x80, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +/* MOZ_CURSOR_COL_RESIZE */ +static const unsigned char moz_col_resize_bits[] = { + 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, + 0x00, 0x05, 0x00, 0x00, 0x10, 0x45, 0x00, 0x00, 0x18, 0xc5, 0x00, 0x00, + 0x1c, 0xc5, 0x01, 0x00, 0x7e, 0xf5, 0x03, 0x00, 0x1c, 0xc5, 0x01, 0x00, + 0x18, 0xc5, 0x00, 0x00, 0x10, 0x45, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, + 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +static const unsigned char moz_col_resize_mask_bits[] = { + 0x80, 0x0f, 0x00, 0x00, 0x80, 0x0f, 0x00, 0x00, 0x80, 0x0f, 0x00, 0x00, + 0x90, 0x4f, 0x00, 0x00, 0xb8, 0xef, 0x00, 0x00, 0xbc, 0xef, 0x01, 0x00, + 0xbe, 0xef, 0x03, 0x00, 0xff, 0xff, 0x07, 0x00, 0xbe, 0xef, 0x03, 0x00, + 0xbc, 0xef, 0x01, 0x00, 0xb8, 0xef, 0x00, 0x00, 0x90, 0x4f, 0x00, 0x00, + 0x80, 0x0f, 0x00, 0x00, 0x80, 0x0f, 0x00, 0x00, 0x80, 0x0f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +/* MOZ_CURSOR_ROW_RESIZE */ +static const unsigned char moz_row_resize_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, + 0xe0, 0x03, 0x00, 0x00, 0xf0, 0x07, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0xf0, 0x07, 0x00, 0x00, + 0xe0, 0x03, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +static const unsigned char moz_row_resize_mask_bits[] = { + 0x80, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x00, + 0xf0, 0x07, 0x00, 0x00, 0xf8, 0x0f, 0x00, 0x00, 0xf0, 0x07, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, + 0xff, 0x7f, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0xf0, 0x07, 0x00, 0x00, 0xf8, 0x0f, 0x00, 0x00, + 0xf0, 0x07, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +/* MOZ_CURSOR_VERTICAL_TEXT */ +static const unsigned char moz_vertical_text_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00, + 0x06, 0x60, 0x00, 0x00, 0xfc, 0x3f, 0x00, 0x00, 0x06, 0x60, 0x00, 0x00, + 0x02, 0x40, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +static const unsigned char moz_vertical_text_mask_bits[] = { + 0x07, 0xe0, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, + 0xff, 0xff, 0x00, 0x00, 0xfe, 0x7f, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, + 0x0f, 0xf0, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +/* MOZ_CURSOR_NESW_RESIZE */ +static const unsigned char moz_nesw_resize_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, + 0x00, 0xbe, 0x00, 0x00, 0x00, 0xbc, 0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, + 0x02, 0xb4, 0x00, 0x00, 0x02, 0xa2, 0x00, 0x00, 0x02, 0x81, 0x00, 0x00, + 0x8a, 0x80, 0x00, 0x00, 0x5a, 0x80, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, + 0x7a, 0x00, 0x00, 0x00, 0xfa, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0xfe, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +static const unsigned char moz_nesw_resize_mask_bits[] = { + 0xc0, 0xff, 0x01, 0x00, 0xc0, 0xff, 0x01, 0x00, 0xc0, 0xff, 0x01, 0x00, + 0x00, 0xff, 0x01, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfc, 0x01, 0x00, + 0x07, 0xfe, 0x01, 0x00, 0x07, 0xf7, 0x01, 0x00, 0x8f, 0xe3, 0x01, 0x00, + 0xdf, 0xc1, 0x01, 0x00, 0xff, 0xc0, 0x01, 0x00, 0x7f, 0x00, 0x00, 0x00, + 0xff, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, + 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +/* MOZ_CURSOR_NWSE_RESIZE */ +static const unsigned char moz_nwse_resize_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0xfa, 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, + 0x5a, 0x80, 0x00, 0x00, 0x8a, 0x80, 0x00, 0x00, 0x02, 0x81, 0x00, 0x00, + 0x02, 0xa2, 0x00, 0x00, 0x02, 0xb4, 0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, + 0x00, 0xbc, 0x00, 0x00, 0x00, 0xbe, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, + 0xc0, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +static const unsigned char moz_nwse_resize_mask_bits[] = { + 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, + 0xff, 0x01, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, + 0xff, 0xc0, 0x01, 0x00, 0xdf, 0xc1, 0x01, 0x00, 0x8f, 0xe3, 0x01, 0x00, + 0x07, 0xf7, 0x01, 0x00, 0x07, 0xfe, 0x01, 0x00, 0x00, 0xfc, 0x01, 0x00, + 0x00, 0xfe, 0x01, 0x00, 0x00, 0xff, 0x01, 0x00, 0xc0, 0xff, 0x01, 0x00, + 0xc0, 0xff, 0x01, 0x00, 0xc0, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; enum { - MOZ_CURSOR_QUESTION_ARROW = 0, - MOZ_CURSOR_HAND_GRAB, - MOZ_CURSOR_HAND_GRABBING, - MOZ_CURSOR_COPY, - MOZ_CURSOR_ALIAS, - MOZ_CURSOR_CONTEXT_MENU, - MOZ_CURSOR_SPINNING, - MOZ_CURSOR_ZOOM_IN, - MOZ_CURSOR_ZOOM_OUT + MOZ_CURSOR_QUESTION_ARROW = 0, + MOZ_CURSOR_HAND_GRAB, + MOZ_CURSOR_HAND_GRABBING, + MOZ_CURSOR_COPY, + MOZ_CURSOR_ALIAS, + MOZ_CURSOR_CONTEXT_MENU, + MOZ_CURSOR_SPINNING, + MOZ_CURSOR_ZOOM_IN, + MOZ_CURSOR_ZOOM_OUT, + MOZ_CURSOR_NOT_ALLOWED, + MOZ_CURSOR_COL_RESIZE, + MOZ_CURSOR_ROW_RESIZE, + MOZ_CURSOR_VERTICAL_TEXT, + MOZ_CURSOR_NESW_RESIZE, + MOZ_CURSOR_NWSE_RESIZE }; // create custom pixmap cursor from cursors in nsGTKCursorData.h static const nsGtkCursor GtkCursors[] = { - { moz_question_arrow_bits, moz_question_arrow_mask_bits, 2, 2 }, - { moz_hand_grab_bits, moz_hand_grab_mask_bits, 10, 10 }, - { moz_hand_grabbing_bits, moz_hand_grabbing_mask_bits, 10, 10 }, - { moz_copy_bits, moz_copy_mask_bits, 2, 2 }, - { moz_alias_bits, moz_alias_mask_bits, 2, 2 }, - { moz_menu_bits, moz_menu_mask_bits, 2, 2 }, - { moz_spinning_bits, moz_spinning_mask_bits, 2, 2 }, - { moz_zoom_in_bits, moz_zoom_in_mask_bits, 6, 6 }, - { moz_zoom_out_bits, moz_zoom_out_mask_bits, 6, 6 } + { moz_question_arrow_bits, moz_question_arrow_mask_bits, 2, 2 }, + { moz_hand_grab_bits, moz_hand_grab_mask_bits, 10, 10 }, + { moz_hand_grabbing_bits, moz_hand_grabbing_mask_bits, 10, 10 }, + { moz_copy_bits, moz_copy_mask_bits, 2, 2 }, + { moz_alias_bits, moz_alias_mask_bits, 2, 2 }, + { moz_menu_bits, moz_menu_mask_bits, 2, 2 }, + { moz_spinning_bits, moz_spinning_mask_bits, 2, 2 }, + { moz_zoom_in_bits, moz_zoom_in_mask_bits, 6, 6 }, + { moz_zoom_out_bits, moz_zoom_out_mask_bits, 6, 6 }, + { moz_not_allowed_bits, moz_not_allowed_mask_bits, 9, 9 }, + { moz_col_resize_bits, moz_col_resize_mask_bits, 9, 7 }, + { moz_row_resize_bits, moz_row_resize_mask_bits, 7, 9 }, + { moz_vertical_text_bits, moz_vertical_text_mask_bits, 8, 4 }, + { moz_nesw_resize_bits, moz_nesw_resize_mask_bits, 8, 8 }, + { moz_nwse_resize_bits, moz_nwse_resize_mask_bits, 8, 8 } }; #endif /* nsGtkCursors_h__ */ diff --git a/mozilla/widget/src/gtk2/nsWindow.cpp b/mozilla/widget/src/gtk2/nsWindow.cpp index fb2414be4a7..e258c7da2d5 100644 --- a/mozilla/widget/src/gtk2/nsWindow.cpp +++ b/mozilla/widget/src/gtk2/nsWindow.cpp @@ -3235,24 +3235,28 @@ get_gtk_cursor(nsCursor aCursor) case eCursor_hyperlink: gdkcursor = gdk_cursor_new(GDK_HAND2); break; - case eCursor_sizeWE: - /* GDK_SB_H_DOUBLE_ARROW <==>. The ideal choice is: =>||<= */ - gdkcursor = gdk_cursor_new(GDK_SB_H_DOUBLE_ARROW); + case eCursor_n_resize: + gdkcursor = gdk_cursor_new(GDK_TOP_SIDE); break; - case eCursor_sizeNS: - /* Again, should be =>||<= rotated 90 degrees. */ - gdkcursor = gdk_cursor_new(GDK_SB_V_DOUBLE_ARROW); + case eCursor_s_resize: + gdkcursor = gdk_cursor_new(GDK_BOTTOM_SIDE); break; - case eCursor_sizeNW: + case eCursor_w_resize: + gdkcursor = gdk_cursor_new(GDK_LEFT_SIDE); + break; + case eCursor_e_resize: + gdkcursor = gdk_cursor_new(GDK_RIGHT_SIDE); + break; + case eCursor_nw_resize: gdkcursor = gdk_cursor_new(GDK_TOP_LEFT_CORNER); break; - case eCursor_sizeSE: + case eCursor_se_resize: gdkcursor = gdk_cursor_new(GDK_BOTTOM_RIGHT_CORNER); break; - case eCursor_sizeNE: + case eCursor_ne_resize: gdkcursor = gdk_cursor_new(GDK_TOP_RIGHT_CORNER); break; - case eCursor_sizeSW: + case eCursor_sw_resize: gdkcursor = gdk_cursor_new(GDK_BOTTOM_LEFT_CORNER); break; case eCursor_arrow_north: @@ -3304,7 +3308,7 @@ get_gtk_cursor(nsCursor aCursor) case eCursor_count_up: case eCursor_count_down: case eCursor_count_up_down: - // XXX: these CSS3 cursors need to be implemented + // XXX: these -moz- cursors need to be implemented gdkcursor = gdk_cursor_new(GDK_LEFT_PTR); break; case eCursor_zoom_in: @@ -3313,6 +3317,34 @@ get_gtk_cursor(nsCursor aCursor) case eCursor_zoom_out: newType = MOZ_CURSOR_ZOOM_OUT; break; + case eCursor_not_allowed: + case eCursor_no_drop: + newType = MOZ_CURSOR_NOT_ALLOWED; + break; + case eCursor_col_resize: + newType = MOZ_CURSOR_COL_RESIZE; + break; + case eCursor_row_resize: + newType = MOZ_CURSOR_ROW_RESIZE; + break; + case eCursor_vertical_text: + newType = MOZ_CURSOR_VERTICAL_TEXT; + break; + case eCursor_all_scroll: + gdkcursor = gdk_cursor_new(GDK_FLEUR); + break; + case eCursor_nesw_resize: + newType = MOZ_CURSOR_NESW_RESIZE; + break; + case eCursor_nwse_resize: + newType = MOZ_CURSOR_NWSE_RESIZE; + break; + case eCursor_ns_resize: + gdkcursor = gdk_cursor_new(GDK_SB_V_DOUBLE_ARROW); + break; + case eCursor_ew_resize: + gdkcursor = gdk_cursor_new(GDK_SB_H_DOUBLE_ARROW); + break; default: NS_ASSERTION(aCursor, "Invalid cursor type"); break; diff --git a/mozilla/widget/src/mac/nsMacWidget.r b/mozilla/widget/src/mac/nsMacWidget.r index 490685c7219..3ca2a6d76be 100644 --- a/mozilla/widget/src/mac/nsMacWidget.r +++ b/mozilla/widget/src/mac/nsMacWidget.r @@ -38,58 +38,58 @@ #include resource 'CURS' (128, locked, preload) { - $"0000 0180 0180 0180 0180 1188 318C 7FFE" - $"7FFE 318C 1188 0180 0180 0180 0180", - $"03C0 03C0 03C0 03C0 1BD8 3BDC 7FFE FFFF" - $"FFFF 7FFE 3BDC 1BD8 03C0 03C0 03C0 03C0", - {7, 7} + $"0000 4000 6000 7000 7800 7C00 7E00 7F00" + $"7F8E 7C1B 6C03 4606 060C 0300 030C", + $"C000 E000 F000 F800 FC00 FE00 FF00 FF80" + $"FFCE FFDB FE03 EF06 CF0C 8780 078C 0380", + {1, 1} }; resource 'CURS' (129, locked, preload) { - $"0000 0180 03C0 07E0 0180 0180 0180 7FFE" - $"7FFE 0180 0180 0180 07E0 03C0 0180", - $"0180 03C0 07E0 0FF0 0FF0 03C0 FFFF FFFF" - $"FFFF FFFF 03C0 0FF0 0FF0 07E0 03C0 0180", - {7, 7} + $"0F00 30C0 4020 4620 8610 9F90 9F90 8610" + $"4620 4020 30F0 0F38 001C 000E 0007 0002", + $"0F00 3FC0 7FE0 7FE0 FFF0 FFF0 FFF0 FFF0" + $"7FE0 7FE0 3FF0 0F38 001C 000E 0007 0002", + {6, 6} }; resource 'CURS' (130, locked, preload) { - $"0000 0000 0000 1E18 1C38 1E70 17E0 03C0" - $"0380 0700 0E00 1C00 18", - $"0000 0000 3F80 3F18 3E38 3E70 3FE0 33C0" - $"2380 0700 0E00 1C00 18", - {7, 7} + $"0F00 30C0 4020 4020 8010 9F90 9F90 8010" + $"4020 4020 30F0 0F38 001C 000E 0007 0002", + $"0F00 3FC0 7FE0 7FE0 FFF0 FFF0 FFF0 FFF0" + $"7FE0 7FE0 3FF0 0F38 001C 000E 0007 0002", + {6, 6} }; resource 'CURS' (131, locked, preload) { - $"0000 0000 0000 0018 0038 0070 00E0 01C0" - $"03C0 07E8 0E78 1C38 1878", - $"0000 0000 0000 0018 0038 0070 00E0 01C4" - $"03CC 07FC 0E7C 1C7C 18FC 01FC", - {8, 8} + $"0000 4000 6000 7000 7800 7C00 7E00 7F00" + $"7F80 7000 6600 4900 1480 1280 0900 06", + $"C000 E000 F000 F800 FC00 FE00 FF00 FF80" + $"FFC0 FF80 FF00 FF80 FFC0 3FC0 1F80 0F", + {0, 0} }; resource 'CURS' (132, locked, preload) { - $"0000 0000 0000 1878 1C38 0E78 07E8 03C0" - $"01C0 00E0 0070 0038 0018", - $"0000 0000 01FC 18FC 1C7C 0E7C 07FC 03CC" - $"01C4 00E0 0070 0038 0018", - {7, 8} + $"0000 0660 0660 0660 0660 2664 6666 FE7F" + $"FE7F 6666 2664 0660 0660 0660 0660", + $"0FF0 0FF0 0FF0 0FF0 2FF4 6FF6 FFFF FFFF" + $"FFFF FFFF 6FF6 2FF4 0FF0 0FF0 0FF0 0FF0", + {7, 7} }; resource 'CURS' (133, locked, preload) { - $"0000 0000 0000 1800 1C00 0E00 0700 0380" - $"03C0 17E0 1E70 1C38 1E18", - $"0000 0000 0000 1800 1C00 0E00 0700 2380" - $"33C0 3FE0 3E70 3E38 3F18 3F80", - {8, 6} + $"0180 03C0 07E0 0180 0180 7FFE 7FFE 0000" + $"0000 7FFE 7FFE 0180 0180 07E0 03C0 0180", + $"03C0 07E0 0FF0 03C0 FFFF FFFF FFFF FFFF" + $"FFFF FFFF FFFF FFFF 03C0 0FF0 07E0 03C0", + {7, 7} }; resource 'CURS' (134, locked, preload) { - $"0000 0180 03C0 07E0 0180 0180 0180 7FFE" - $"7FFE", - $"0180 03C0 07E0 0FF0 0FF0 03C0 FFFF FFFF" - $"FFFF FFFF", + $"0000 0000 0000 0000 8001 8001 4102 3FFC" + $"4102 8001 8001", + $"0000 0000 0000 0000 8001 8001 4102 3FFC" + $"4102 8001 8001", {7, 7} }; @@ -110,115 +110,59 @@ resource 'CURS' (136, locked, preload) { }; resource 'CURS' (137, locked, preload) { - $"0000 0000 0000 0000 0000 0000 0000 7FFE" - $"7FFE 0180 0180 0180 07E0 03C0 0180", - $"0000 0000 0000 0000 0000 0000 FFFF FFFF" - $"FFFF FFFF 03C0 0FF0 0FF0 07E0 03C0 0180", + $"0000 0000 0000 1E18 1C38 1E70 17E0 03C0" + $"0380 0700 0E00 1C00 18", + $"0000 0000 3F80 3F18 3E38 3E70 3FE0 33C0" + $"2380 0700 0E00 1C00 18", {7, 7} }; resource 'CURS' (138, locked, preload) { - $"0000 0180 0180 0180 0180 1180 3180 7F80" - $"7F80 3180 1180 0180 0180 0180 0180", - $"03C0 03C0 03C0 03C0 1BC0 3BC0 7FC0 FFC0" - $"FFC0 7FC0 3BC0 1BC0 03C0 03C0 03C0 03C0", - {7, 7} + $"0000 0000 0000 0018 0038 0070 00E0 01C0" + $"03C0 07E8 0E78 1C38 1878", + $"0000 0000 0000 0018 0038 0070 00E0 01C4" + $"03CC 07FC 0E7C 1C7C 18FC 01FC", + {8, 8} }; resource 'CURS' (139, locked, preload) { - $"0000 0180 0180 0180 0180 1180 3180 7F80" - $"7F80 3180 1180 0180 0180 0180 0180", - $"03C0 03C0 03C0 03C0 1BC0 3BC0 7FC0 FFC0" - $"FFC0 7FC0 3BC0 1BC0 03C0 03C0 03C0 03C0", - {7, 7} + $"0000 0000 0000 1878 1C38 0E78 07E8 03C0" + $"01C0 00E0 0070 0038 0018", + $"0000 0000 01FC 18FC 1C7C 0E7C 07FC 03CC" + $"01C4 00E0 0070 0038 0018", + {7, 8} }; resource 'CURS' (140, locked, preload) { - $"0000 0180 0180 0180 0180 0188 018C 01FE" - $"01FE 018C 0188 0180 0180 0180 0180", - $"03C0 03C0 03C0 03C0 03D8 03DC 03FE 03FF" - $"03FF 03FE 03DC 03D8 03C0 03C0 03C0 03C0", - {7, 7} + $"0000 0000 0000 1800 1C00 0E00 0700 0380" + $"03C0 17E0 1E70 1C38 1E18", + $"0000 0000 0000 1800 1C00 0E00 0700 2380" + $"33C0 3FE0 3E70 3E38 3F18 3F80", + {8, 6} }; resource 'CURS' (141, locked, preload) { - $"0000 0180 0180 0180 0180 0188 018C 01FE" - $"01FE 018C 0188 0180 0180 0180 0180", - $"03C0 03C0 03C0 03C0 03D8 03DC 03FE 03FF" - $"03FF 03FE 03DC 03D8 03C0 03C0 03C0 03C0", + $"0000 0180 03C0 07E0 0180 0180 0180 7FFE" + $"7FFE 0180 0180 0180 07E0 03C0 0180", + $"0180 03C0 07E0 0FF0 0FF0 03C0 FFFF FFFF" + $"FFFF FFFF 03C0 0FF0 0FF0 07E0 03C0 0180", {7, 7} }; resource 'CURS' (142, locked, preload) { - $"0180 1A70 2648 264A 124D 1249 6809 9801" - $"8802 4002 2002 2004 1004 0808 0408 0408", - $"0180 1BF0 3FF8 3FFA 1FFF 1FFF 6FFF FFFF" - $"FFFE 7FFE 3FFE 3FFC 1FFC 0FF8 07F8 07F8", - {9, 8} + $"0000 0000 0000 1878 1C38 0E78 07E8 03C0" + $"03C0 17E0 1E70 1C38 1E18", + $"0000 0000 387C 3CFC 3E7C 1FFC 0FFC 07E8" + $"17E0 3FF0 3FF8 3E7C 3F3C 3E1C", + {7, 7} }; resource 'CURS' (143, locked, preload) { - $"0000 4000 6000 7000 7800 7C00 7E00 7F00" - $"7F8E 7C1B 6C03 4606 060C 0300 030C", - $"C000 E000 F000 F800 FC00 FE00 FF00 FF80" - $"FFCE FFDB FE03 EF06 CF0C 8780 078C 0380", - {1, 1} -}; - -resource 'CURS' (144, locked, preload) { - $"0000 4000 6000 7000 7800 7C00 7E00 7F00" - $"7F80 7C18 6C18 467E 067E 0318 0318", - $"C000 E000 F000 F800 FC00 FE00 FF00 FF80" - $"FFFC FFFC FEFF EFFF CFFF 87FF 07BC 033C", - {1, 1} -}; - -resource 'CURS' (145, locked, preload) { - $"0000 4000 6000 7000 7800 7C00 7E00 7F00" - $"7F80 7C1E 6C0E 461E 061A 0330 0330", - $"C000 E000 F000 F800 FC00 FE00 FF00 FF80" - $"FFFF FFBF FE3F EF3F CFFF 87FB 07F8 03F0", - {1, 1} -}; - -resource 'CURS' (146, locked, preload) { - $"0000 4000 6000 7000 7800 7C00 7E00 7F7E" - $"7FFE 7C42 6C7E 4642 067E 0342 037E", - $"C000 E000 F000 F800 FC00 FE00 FFFF FFFF" - $"FFFF FFFF FEFF EFFF CFFF 87FF 07FF 03FF", - {1, 1} -}; - -resource 'CURS' (147, locked, preload) { - $"0180 1A70 2648 264A 124D 1249 6809 9801" - $"8802 4002 2002 2004 1004 0808 0408 0408", - $"0180 1BF0 3FF8 3FFA 1FFF 1FFF 6FFF FFFF" - $"FFFE 7FFE 3FFE 3FFC 1FFC 0FF8 07F8 07F8", - {9, 8} -}; - -resource 'CURS' (148, locked, preload) { - $"0000 0000 0000 0000 0DB0 124C 100A 0802" - $"1802 2002 2002 2004 1004 0808 0408 0408", - $"0000 0000 0000 0000 0DB0 1FFC 1FFE 0FFE" - $"1FFE 3FFE 3FFE 3FFC 1FFC 0FF8 07F8 07F8", - {9, 8} -}; - -resource 'CURS' (149, locked, preload) { - $"0F00 30C0 4020 4620 8610 9F90 9F90 8610" - $"4620 4020 30F0 0F38 001C 000E 0007 0002", - $"0F00 3FC0 7FE0 7FE0 FFF0 FFF0 FFF0 FFF0" - $"7FE0 7FE0 3FF0 0F38 001C 000E 0007 0002", - {6, 6} -}; - -resource 'CURS' (150, locked, preload) { - $"0F00 30C0 4020 4020 8010 9F90 9F90 8010" - $"4020 4020 30F0 0F38 001C 000E 0007 0002", - $"0F00 3FC0 7FE0 7FE0 FFF0 FFF0 FFF0 FFF0" - $"7FE0 7FE0 3FF0 0F38 001C 000E 0007 0002", - {6, 6} + $"0000 0000 0000 1E18 1C38 1E70 17E0 03C0" + $"03C0 07E8 0E78 1C38 1878", + $"0000 0000 3E1C 3F3C 3E7C 3FF8 3FF0 17E0" + $"07E8 0FFC 1FFC 3E7C 3CFC 387C", + {7, 7} }; resource 'CURS' (200, locked, preload) { diff --git a/mozilla/widget/src/mac/nsWindow.cpp b/mozilla/widget/src/mac/nsWindow.cpp index 786f06169b2..bd4e1b83a40 100644 --- a/mozilla/widget/src/mac/nsWindow.cpp +++ b/mozilla/widget/src/mac/nsWindow.cpp @@ -74,6 +74,20 @@ #include "profilerutils.h" #endif +#ifdef MAC_OS_X_VERSION_10_3 +const short PANTHER_RESIZE_UP_CURSOR = kThemeResizeUpCursor; +const short PANTHER_RESIZE_DOWN_CURSOR = kThemeResizeDownCursor; +const short PANTHER_RESIZE_UPDOWN_CURSOR = kThemeResizeUpDownCursor; +#else +//19, 20, 21 from Appearance.h in 10.3 +const short PANTHER_RESIZE_UP_CURSOR = 19; // kThemeResizeUpCursor +const short PANTHER_RESIZE_DOWN_CURSOR = 20; // kThemeResizeDownCursor +const short PANTHER_RESIZE_UPDOWN_CURSOR = 21; // kThemeResizeUpDownCursor +#endif + +const short JAGUAR_RESIZE_UP_CURSOR = 135; +const short JAGUAR_RESIZE_DOWN_CURSOR = 136; +const short JAGUAR_RESIZE_UPDOWN_CURSOR = 141; //////////////////////////////////////////////////// nsIRollupListener * gRollupListener = nsnull; @@ -693,6 +707,18 @@ PRBool OnJaguarOrLater() // Return true if we are on Mac OS X 10.2 or later return gOnJaguarOrLater; } +PRBool OnPantherOrLater() // Return true if we are on Mac OS X 10.3 or later +{ + static PRBool gInitVer1030 = PR_FALSE; + static PRBool gOnPantherOrLater = PR_FALSE; + if(!gInitVer1030) + { + gOnPantherOrLater = (nsToolkit::OSXVersion() >= 0x00001030); + gInitVer1030 = PR_TRUE; + } + return gOnPantherOrLater; +} + // // SetCursor // @@ -722,26 +748,12 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor) case eCursor_wait: cursor = kThemeWatchCursor; break; case eCursor_select: cursor = kThemeIBeamCursor; break; case eCursor_hyperlink: cursor = kThemePointingHandCursor; break; - case eCursor_sizeWE: cursor = kThemeResizeLeftRightCursor; break; - case eCursor_sizeNS: cursor = 129; break; - case eCursor_sizeNW: cursor = 130; break; - case eCursor_sizeSE: cursor = 131; break; - case eCursor_sizeNE: cursor = 132; break; - case eCursor_sizeSW: cursor = 133; break; - case eCursor_arrow_north: cursor = 134; break; - case eCursor_arrow_north_plus: cursor = 135; break; - case eCursor_arrow_south: cursor = 136; break; - case eCursor_arrow_south_plus: cursor = 137; break; - case eCursor_arrow_west: cursor = 138; break; - case eCursor_arrow_west_plus: cursor = 139; break; - case eCursor_arrow_east: cursor = 140; break; - case eCursor_arrow_east_plus: cursor = 141; break; case eCursor_crosshair: cursor = kThemeCrossCursor; break; case eCursor_move: cursor = kThemeOpenHandCursor; break; - case eCursor_help: cursor = 143; break; - case eCursor_copy: cursor = 144; break; // CSS3 - case eCursor_alias: cursor = 145; break; - case eCursor_context_menu: cursor = 146; break; + case eCursor_help: cursor = 128; break; + case eCursor_copy: cursor = kThemeCopyArrowCursor; break; + case eCursor_alias: cursor = kThemeAliasArrowCursor; break; + case eCursor_context_menu: cursor = kThemeContextualMenuArrowCursor; break; case eCursor_cell: cursor = kThemePlusCursor; break; case eCursor_grab: cursor = kThemeOpenHandCursor; break; case eCursor_grabbing: cursor = kThemeClosedHandCursor; break; @@ -749,9 +761,38 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor) case eCursor_count_up: cursor = kThemeCountingUpHandCursor; break; case eCursor_count_down: cursor = kThemeCountingDownHandCursor; break; case eCursor_count_up_down: cursor = kThemeCountingUpAndDownHandCursor; break; - case eCursor_zoom_in: cursor = 149; break; - case eCursor_zoom_out: cursor = 150; break; - default: cursor = kThemeArrowCursor; break; + case eCursor_zoom_in: cursor = 129; break; + case eCursor_zoom_out: cursor = 130; break; + case eCursor_not_allowed: + case eCursor_no_drop: cursor = OnJaguarOrLater() ? kThemeNotAllowedCursor : 131; break; + case eCursor_col_resize: cursor = 132; break; + case eCursor_row_resize: cursor = 133; break; + case eCursor_vertical_text: cursor = 134; break; + case eCursor_all_scroll: cursor = kThemeOpenHandCursor; break; + //arrows + case eCursor_n_resize: + case eCursor_arrow_north: + case eCursor_arrow_north_plus: cursor = OnPantherOrLater() ? PANTHER_RESIZE_UP_CURSOR : JAGUAR_RESIZE_UP_CURSOR; break; + case eCursor_arrow_south: + case eCursor_arrow_south_plus: + case eCursor_s_resize: cursor = OnPantherOrLater() ? PANTHER_RESIZE_DOWN_CURSOR : JAGUAR_RESIZE_DOWN_CURSOR; break; + case eCursor_w_resize: + case eCursor_arrow_west: + case eCursor_arrow_west_plus: cursor = kThemeResizeLeftCursor; break; + case eCursor_e_resize: + case eCursor_arrow_east: + case eCursor_arrow_east_plus: cursor = kThemeResizeRightCursor; break; + case eCursor_nw_resize: cursor = 137; break; + case eCursor_se_resize: cursor = 138; break; + case eCursor_ne_resize: cursor = 139; break; + case eCursor_sw_resize: cursor = 140; break; + case eCursor_ew_resize: cursor = kThemeResizeLeftRightCursor; break; + case eCursor_ns_resize: cursor = OnPantherOrLater() ? PANTHER_RESIZE_UPDOWN_CURSOR : JAGUAR_RESIZE_UPDOWN_CURSOR; break; + case eCursor_nesw_resize: cursor = 142; break; + case eCursor_nwse_resize: cursor = 143; break; + default: + cursor = kThemeArrowCursor; + break; } //animated cursors cause crash on Mac OS X 10.1 when Japanese Kotorei input method is enabled diff --git a/mozilla/widget/src/os2/nsWindow.cpp b/mozilla/widget/src/os2/nsWindow.cpp index d980b1b27a9..a3806dd76d3 100644 --- a/mozilla/widget/src/os2/nsWindow.cpp +++ b/mozilla/widget/src/os2/nsWindow.cpp @@ -1703,21 +1703,23 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor) newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_ARROW, FALSE); break; - case eCursor_sizeWE: - newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZEWE, FALSE); - break; - - case eCursor_sizeNS: + case eCursor_n_resize: + case eCursor_s_resize: newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZENS, FALSE); break; - case eCursor_sizeNW: - case eCursor_sizeSE: + case eCursor_w_resize: + case eCursor_e_resize: + newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZEWE, FALSE); + break; + + case eCursor_nw_resize: + case eCursor_se_resize: newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZENWSE, FALSE); break; - case eCursor_sizeNE: - case eCursor_sizeSW: + case eCursor_ne_resize: + case eCursor_sw_resize: newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZENESW, FALSE); break; @@ -1793,6 +1795,7 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor) case eCursor_count_up: case eCursor_count_down: case eCursor_count_up_down: + // XXX: No suitable cursor, needs implementing break; case eCursor_zoom_in: @@ -1803,6 +1806,45 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor) newPointer = gPtrArray[IDC_ZOOMOUT-IDC_BASE]; break; + case eCursor_not_allowed: + case eCursor_no_drop: + newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_ILLEGAL, FALSE); + break; + + case eCursor_col_resize: + // XXX not 100% appropriate perhaps + newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZEWE, FALSE); + break; + + case eCursor_row_resize: + // XXX not 100% appropriate perhaps + newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZENS, FALSE); + break; + + case eCursor_vertical_text: + // XXX: No suitable cursor, needs implementing + break; + + case eCursor_all_scroll: + newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZE, FALSE); + break; + + case eCursor_nesw_resize: + newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZENESW, FALSE); + break; + + case eCursor_nwse_resize: + newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZENWSE, FALSE); + break; + + case eCursor_ns_resize: + newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZENS, FALSE); + break; + + case eCursor_ew_resize: + newPointer = ::WinQuerySysPointer(HWND_DESKTOP, SPTR_SIZEWE, FALSE); + break; + default: NS_ASSERTION(0, "Invalid cursor type"); break; diff --git a/mozilla/widget/src/photon/nsWidget.cpp b/mozilla/widget/src/photon/nsWidget.cpp index 4644b9d542b..b2e40df30b1 100644 --- a/mozilla/widget/src/photon/nsWidget.cpp +++ b/mozilla/widget/src/photon/nsWidget.cpp @@ -433,106 +433,153 @@ NS_METHOD nsWidget::SetCursor( nsCursor aCursor ) { unsigned short curs = Ph_CURSOR_POINTER; PgColor_t color = Ph_CURSOR_DEFAULT_COLOR; - switch( aCursor ) { - case eCursor_sizeNW: - curs = Ph_CURSOR_DRAG_TL; - break; - case eCursor_sizeSE: - curs = Ph_CURSOR_DRAG_BR; - break; - case eCursor_sizeNE: - curs = Ph_CURSOR_DRAG_TL; - break; - case eCursor_sizeSW: - curs = Ph_CURSOR_DRAG_BL; - break; + switch( aCursor ) { + case eCursor_nw_resize: + curs = Ph_CURSOR_DRAG_TL; + break; + case eCursor_se_resize: + curs = Ph_CURSOR_DRAG_BR; + break; + case eCursor_ne_resize: + curs = Ph_CURSOR_DRAG_TL; + break; + case eCursor_sw_resize: + curs = Ph_CURSOR_DRAG_BL; + break; - case eCursor_crosshair: - curs = Ph_CURSOR_CROSSHAIR; - break; + case eCursor_crosshair: + curs = Ph_CURSOR_CROSSHAIR; + break; - case eCursor_copy: - case eCursor_alias: - case eCursor_context_menu: - break; + case eCursor_copy: + case eCursor_alias: + case eCursor_context_menu: + // XXX: No suitable cursor, needs implementing + break; - case eCursor_cell: - break; + case eCursor_cell: + // XXX: No suitable cursor, needs implementing + break; - case eCursor_spinning: - break; + case eCursor_spinning: + // XXX: No suitable cursor, needs implementing + break; - case eCursor_count_up: - case eCursor_count_down: - case eCursor_count_up_down: - break; + case eCursor_count_up: + case eCursor_count_down: + case eCursor_count_up_down: + // XXX: No suitable cursor, needs implementing + break; - case eCursor_move: - curs = Ph_CURSOR_MOVE; - break; - - case eCursor_help: - curs = Ph_CURSOR_QUESTION_POINT; - break; - - case eCursor_grab: - case eCursor_grabbing: - curs = Ph_CURSOR_FINGER; - break; - - case eCursor_select: - curs = Ph_CURSOR_INSERT; - color = Pg_BLACK; - break; - - case eCursor_wait: - curs = Ph_CURSOR_LONG_WAIT; - break; + case eCursor_move: + curs = Ph_CURSOR_MOVE; + break; + + case eCursor_help: + curs = Ph_CURSOR_QUESTION_POINT; + break; + + case eCursor_grab: + case eCursor_grabbing: + curs = Ph_CURSOR_FINGER; + break; + + case eCursor_select: + curs = Ph_CURSOR_INSERT; + color = Pg_BLACK; + break; + + case eCursor_wait: + curs = Ph_CURSOR_LONG_WAIT; + break; - case eCursor_hyperlink: - curs = Ph_CURSOR_FINGER; - break; + case eCursor_hyperlink: + curs = Ph_CURSOR_FINGER; + break; - case eCursor_standard: - curs = Ph_CURSOR_POINTER; - break; + case eCursor_standard: + curs = Ph_CURSOR_POINTER; + break; - case eCursor_sizeWE: - curs = Ph_CURSOR_DRAG_HORIZONTAL; - break; + case eCursor_n_resize: + case eCursor_s_resize: + curs = Ph_CURSOR_DRAG_VERTICAL; + break; - case eCursor_sizeNS: - curs = Ph_CURSOR_DRAG_VERTICAL; - break; + case eCursor_w_resize: + case eCursor_e_resize: + curs = Ph_CURSOR_DRAG_HORIZONTAL; + break; - // REVISIT - Photon does not have the following cursor types... - case eCursor_arrow_north: - case eCursor_arrow_north_plus: - curs = Ph_CURSOR_DRAG_TOP; - break; + // REVISIT - Photon does not have the following cursor types... + case eCursor_arrow_north: + case eCursor_arrow_north_plus: + curs = Ph_CURSOR_DRAG_TOP; + break; - case eCursor_arrow_south: - case eCursor_arrow_south_plus: - curs = Ph_CURSOR_DRAG_BOTTOM; - break; + case eCursor_arrow_south: + case eCursor_arrow_south_plus: + curs = Ph_CURSOR_DRAG_BOTTOM; + break; - case eCursor_arrow_east: - case eCursor_arrow_east_plus: - curs = Ph_CURSOR_DRAG_RIGHT; - break; + case eCursor_arrow_east: + case eCursor_arrow_east_plus: + curs = Ph_CURSOR_DRAG_RIGHT; + break; - case eCursor_arrow_west: - case eCursor_arrow_west_plus: - curs = Ph_CURSOR_DRAG_LEFT; - break; + case eCursor_arrow_west: + case eCursor_arrow_west_plus: + curs = Ph_CURSOR_DRAG_LEFT; + break; - case eCursor_zoom_in: - case eCursor_zoom_out: - break; + case eCursor_zoom_in: + case eCursor_zoom_out: + // XXX: No suitable cursor, needs implementing + break; - default: - NS_ASSERTION(0, "Invalid cursor type"); - break; + case eCursor_not_allowed: + case eCursor_no_drop: + curs = Ph_CURSOR_DONT; + break; + + case eCursor_col_resize: + // XXX: not 100% appropriate perhaps + curs = Ph_CURSOR_DRAG_HORIZONTAL; + break; + + case eCursor_row_resize: + // XXX: not 100% appropriate perhaps + curs = Ph_CURSOR_DRAG_VERTICAL; + break; + + case eCursor_vertical_text: + curs = Ph_CURSOR_INSERT; + color = Pg_BLACK; + break; + + case eCursor_all_scroll: + // XXX: No suitable cursor, needs implementing + break; + + case eCursor_nesw_resize: + curs = Ph_CURSOR_DRAG_FOREDIAG; + break; + + case eCursor_nwse_resize: + curs = Ph_CURSOR_DRAG_BACKDIAG; + break; + + case eCursor_ns_resize: + curs = Ph_CURSOR_DRAG_VERTICAL; + break; + + case eCursor_ew_resize: + curs = Ph_CURSOR_DRAG_HORIZONTAL; + break; + + default: + NS_ASSERTION(0, "Invalid cursor type"); + break; } if( mWidget ) { diff --git a/mozilla/widget/src/windows/nsWindow.cpp b/mozilla/widget/src/windows/nsWindow.cpp index c2fd1fa94b9..f909ec523bd 100644 --- a/mozilla/widget/src/windows/nsWindow.cpp +++ b/mozilla/widget/src/windows/nsWindow.cpp @@ -2397,21 +2397,23 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor) newCursor = ::LoadCursor(NULL, IDC_ARROW); break; - case eCursor_sizeWE: - newCursor = ::LoadCursor(NULL, IDC_SIZEWE); - break; - - case eCursor_sizeNS: + case eCursor_n_resize: + case eCursor_s_resize: newCursor = ::LoadCursor(NULL, IDC_SIZENS); break; - case eCursor_sizeNW: - case eCursor_sizeSE: + case eCursor_w_resize: + case eCursor_e_resize: + newCursor = ::LoadCursor(NULL, IDC_SIZEWE); + break; + + case eCursor_nw_resize: + case eCursor_se_resize: newCursor = ::LoadCursor(NULL, IDC_SIZENWSE); break; - case eCursor_sizeNE: - case eCursor_sizeSW: + case eCursor_ne_resize: + case eCursor_sw_resize: newCursor = ::LoadCursor(NULL, IDC_SIZENESW); break; @@ -2484,9 +2486,13 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor) break; case eCursor_context_menu: + // XXX this CSS3 cursor needs to be implemented + break; + case eCursor_count_up: case eCursor_count_down: case eCursor_count_up_down: + // XXX these -moz- cursors needs to be implemented break; case eCursor_zoom_in: @@ -2497,6 +2503,44 @@ NS_METHOD nsWindow::SetCursor(nsCursor aCursor) newCursor = ::LoadCursor(nsToolkit::mDllInstance, MAKEINTRESOURCE(IDC_ZOOMOUT)); break; + case eCursor_not_allowed: + case eCursor_no_drop: + newCursor = ::LoadCursor(NULL, IDC_NO); + break; + + case eCursor_col_resize: + newCursor = ::LoadCursor(nsToolkit::mDllInstance, MAKEINTRESOURCE(IDC_COLRESIZE)); + break; + + case eCursor_row_resize: + newCursor = ::LoadCursor(nsToolkit::mDllInstance, MAKEINTRESOURCE(IDC_ROWRESIZE)); + break; + + case eCursor_vertical_text: + newCursor = ::LoadCursor(nsToolkit::mDllInstance, MAKEINTRESOURCE(IDC_VERTICALTEXT)); + break; + + case eCursor_all_scroll: + // XXX not 100% appropriate perhaps + newCursor = ::LoadCursor(NULL, IDC_SIZEALL); + break; + + case eCursor_nesw_resize: + newCursor = ::LoadCursor(NULL, IDC_SIZENESW); + break; + + case eCursor_nwse_resize: + newCursor = ::LoadCursor(NULL, IDC_SIZENWSE); + break; + + case eCursor_ns_resize: + newCursor = ::LoadCursor(NULL, IDC_SIZENS); + break; + + case eCursor_ew_resize: + newCursor = ::LoadCursor(NULL, IDC_SIZEWE); + break; + default: NS_ASSERTION(0, "Invalid cursor type"); break; diff --git a/mozilla/widget/src/windows/resource.h b/mozilla/widget/src/windows/resource.h index 31fa8588e8d..0f3541ac342 100644 --- a/mozilla/widget/src/windows/resource.h +++ b/mozilla/widget/src/windows/resource.h @@ -50,3 +50,6 @@ #define IDC_ALIAS 4113 #define IDC_ZOOMIN 4114 #define IDC_ZOOMOUT 4115 +#define IDC_COLRESIZE 4116 +#define IDC_ROWRESIZE 4117 +#define IDC_VERTICALTEXT 4118 diff --git a/mozilla/widget/src/xlib/nsWidget.cpp b/mozilla/widget/src/xlib/nsWidget.cpp index 1a6bcac2c43..d3efc44197f 100644 --- a/mozilla/widget/src/xlib/nsWidget.cpp +++ b/mozilla/widget/src/xlib/nsWidget.cpp @@ -1372,22 +1372,28 @@ Cursor nsWidget::XlibCreateCursor(nsCursor aCursorType) case eCursor_standard: xcursor = XCreateFontCursor(mDisplay, XC_left_ptr); break; - case eCursor_sizeWE: - xcursor = XCreateFontCursor(mDisplay, XC_sb_h_double_arrow); + case eCursor_n_resize: + xcursor = XCreateFontCursor(mDisplay, XC_top_side); break; - case eCursor_sizeNS: - xcursor = XCreateFontCursor(mDisplay, XC_sb_v_double_arrow); + case eCursor_s_resize: + xcursor = XCreateFontCursor(mDisplay, XC_bottom_side); break; - case eCursor_sizeNW: + case eCursor_w_resize: + xcursor = XCreateFontCursor(mDisplay, XC_left_side); + break; + case eCursor_e_resize: + xcursor = XCreateFontCursor(mDisplay, XC_right_side); + break; + case eCursor_nw_resize: xcursor = XCreateFontCursor(mDisplay, XC_top_left_corner); break; - case eCursor_sizeSE: + case eCursor_se_resize: xcursor = XCreateFontCursor(mDisplay, XC_bottom_right_corner); break; - case eCursor_sizeNE: + case eCursor_ne_resize: xcursor = XCreateFontCursor(mDisplay, XC_top_right_corner); break; - case eCursor_sizeSW: + case eCursor_sw_resize: xcursor = XCreateFontCursor(mDisplay, XC_bottom_left_corner); break; case eCursor_arrow_south: @@ -1439,7 +1445,7 @@ Cursor nsWidget::XlibCreateCursor(nsCursor aCursorType) case eCursor_count_up: case eCursor_count_down: case eCursor_count_up_down: - // XXX: these CSS3 cursors need to be implemented + // XXX: these -moz- cursors need to be implemented // I simply have no idea how they should look like xcursor = XCreateFontCursor(mDisplay, XC_left_ptr); break; @@ -1449,6 +1455,34 @@ Cursor nsWidget::XlibCreateCursor(nsCursor aCursorType) case eCursor_zoom_out: newType = XLIB_ZOOM_OUT; break; + case eCursor_not_allowed: + case eCursor_no_drop: + newType = XLIB_NOT_ALLOWED; + break; + case eCursor_col_resize: + newType = XLIB_COL_RESIZE; + break; + case eCursor_row_resize: + newType = XLIB_ROW_RESIZE; + break; + case eCursor_vertical_text: + newType = XLIB_VERTICAL_TEXT; + break; + case eCursor_all_scroll: + xcursor = XCreateFontCursor(mDisplay, XC_fleur); + break; + case eCursor_nesw_resize: + newType = XLIB_NESW_RESIZE; + break; + case eCursor_nwse_resize: + newType = XLIB_NWSE_RESIZE; + break; + case eCursor_ns_resize: + xcursor = XCreateFontCursor(mDisplay, XC_sb_v_double_arrow); + break; + case eCursor_ew_resize: + xcursor = XCreateFontCursor(mDisplay, XC_sb_h_double_arrow); + break; default: break; } diff --git a/mozilla/widget/src/xlib/nsXlibCursors.h b/mozilla/widget/src/xlib/nsXlibCursors.h index d0e87843623..cfdbb40b018 100644 --- a/mozilla/widget/src/xlib/nsXlibCursors.h +++ b/mozilla/widget/src/xlib/nsXlibCursors.h @@ -266,30 +266,192 @@ static const unsigned char xlib_zoom_in_mask_bits[] = { /* XLIB_ZOOM_OUT */ static const unsigned char xlib_zoom_out_bits[] = { - 0xf0, 0x00, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x00, 0x02, 0x04, 0x00, 0x00, - 0x02, 0x04, 0x00, 0x00, 0x01, 0x08, 0x00, 0x00, 0xf9, 0x09, 0x00, 0x00, - 0xf9, 0x09, 0x00, 0x00, 0x01, 0x08, 0x00, 0x00, 0x02, 0x04, 0x00, 0x00, - 0x02, 0x04, 0x00, 0x00, 0x0c, 0x0f, 0x00, 0x00, 0xf0, 0x1c, 0x00, 0x00, - 0x00, 0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, - 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0xf0, 0x00, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x00, 0x02, 0x04, 0x00, 0x00, + 0x02, 0x04, 0x00, 0x00, 0x01, 0x08, 0x00, 0x00, 0xf9, 0x09, 0x00, 0x00, + 0xf9, 0x09, 0x00, 0x00, 0x01, 0x08, 0x00, 0x00, 0x02, 0x04, 0x00, 0x00, + 0x02, 0x04, 0x00, 0x00, 0x0c, 0x0f, 0x00, 0x00, 0xf0, 0x1c, 0x00, 0x00, + 0x00, 0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, + 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static const unsigned char xlib_zoom_out_mask_bits[] = { - 0xf0, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, - 0xfe, 0x07, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, - 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, - 0xfe, 0x07, 0x00, 0x00, 0xfc, 0x0f, 0x00, 0x00, 0xf0, 0x1c, 0x00, 0x00, - 0x00, 0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, - 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0xf0, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, + 0xfe, 0x07, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, + 0xff, 0x0f, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, + 0xfe, 0x07, 0x00, 0x00, 0xfc, 0x0f, 0x00, 0x00, 0xf0, 0x1c, 0x00, 0x00, + 0x00, 0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, + 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +/* XLIB_NOT_ALLOWED */ +static const unsigned char xlib_not_allowed_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x80, 0x1f, 0x00, 0x00, 0xe0, 0x7f, 0x00, 0x00, + 0xf0, 0xf0, 0x00, 0x00, 0x38, 0xc0, 0x01, 0x00, 0x7c, 0x80, 0x03, 0x00, + 0xec, 0x00, 0x03, 0x00, 0xce, 0x01, 0x07, 0x00, 0x86, 0x03, 0x06, 0x00, + 0x06, 0x07, 0x06, 0x00, 0x06, 0x0e, 0x06, 0x00, 0x06, 0x1c, 0x06, 0x00, + 0x0e, 0x38, 0x07, 0x00, 0x0c, 0x70, 0x03, 0x00, 0x1c, 0xe0, 0x03, 0x00, + 0x38, 0xc0, 0x01, 0x00, 0xf0, 0xf0, 0x00, 0x00, 0xe0, 0x7f, 0x00, 0x00, + 0x80, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +static const unsigned char xlib_not_allowed_mask_bits[] = { + 0x80, 0x1f, 0x00, 0x00, 0xe0, 0x7f, 0x00, 0x00, 0xf0, 0xff, 0x00, 0x00, + 0xf8, 0xff, 0x01, 0x00, 0xfc, 0xf0, 0x03, 0x00, 0xfe, 0xc0, 0x07, 0x00, + 0xfe, 0x81, 0x07, 0x00, 0xff, 0x83, 0x0f, 0x00, 0xcf, 0x07, 0x0f, 0x00, + 0x8f, 0x0f, 0x0f, 0x00, 0x0f, 0x1f, 0x0f, 0x00, 0x0f, 0x3e, 0x0f, 0x00, + 0x1f, 0xfc, 0x0f, 0x00, 0x1e, 0xf8, 0x07, 0x00, 0x3e, 0xf0, 0x07, 0x00, + 0xfc, 0xf0, 0x03, 0x00, 0xf8, 0xff, 0x01, 0x00, 0xf0, 0xff, 0x00, 0x00, + 0xe0, 0x7f, 0x00, 0x00, 0x80, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +/* XLIB_COL_RESIZE */ +static const unsigned char xlib_col_resize_bits[] = { + 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, + 0x00, 0x05, 0x00, 0x00, 0x10, 0x45, 0x00, 0x00, 0x18, 0xc5, 0x00, 0x00, + 0x1c, 0xc5, 0x01, 0x00, 0x7e, 0xf5, 0x03, 0x00, 0x1c, 0xc5, 0x01, 0x00, + 0x18, 0xc5, 0x00, 0x00, 0x10, 0x45, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, + 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +static const unsigned char xlib_col_resize_mask_bits[] = { + 0x80, 0x0f, 0x00, 0x00, 0x80, 0x0f, 0x00, 0x00, 0x80, 0x0f, 0x00, 0x00, + 0x90, 0x4f, 0x00, 0x00, 0xb8, 0xef, 0x00, 0x00, 0xbc, 0xef, 0x01, 0x00, + 0xbe, 0xef, 0x03, 0x00, 0xff, 0xff, 0x07, 0x00, 0xbe, 0xef, 0x03, 0x00, + 0xbc, 0xef, 0x01, 0x00, 0xb8, 0xef, 0x00, 0x00, 0x90, 0x4f, 0x00, 0x00, + 0x80, 0x0f, 0x00, 0x00, 0x80, 0x0f, 0x00, 0x00, 0x80, 0x0f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +/* XLIB_ROW_RESIZE */ +static const unsigned char xlib_row_resize_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, + 0xe0, 0x03, 0x00, 0x00, 0xf0, 0x07, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0xf0, 0x07, 0x00, 0x00, + 0xe0, 0x03, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +static const unsigned char xlib_row_resize_mask_bits[] = { + 0x80, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x00, + 0xf0, 0x07, 0x00, 0x00, 0xf8, 0x0f, 0x00, 0x00, 0xf0, 0x07, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, + 0xff, 0x7f, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0xf0, 0x07, 0x00, 0x00, 0xf8, 0x0f, 0x00, 0x00, + 0xf0, 0x07, 0x00, 0x00, 0xe0, 0x03, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +/* XLIB_VERTICAL_TEXT */ +static const unsigned char xlib_vertical_text_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00, + 0x06, 0x60, 0x00, 0x00, 0xfc, 0x3f, 0x00, 0x00, 0x06, 0x60, 0x00, 0x00, + 0x02, 0x40, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +static const unsigned char xlib_vertical_text_mask_bits[] = { + 0x07, 0xe0, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, + 0xff, 0xff, 0x00, 0x00, 0xfe, 0x7f, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, + 0x0f, 0xf0, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +/* XLIB_NESW_RESIZE */ +static const unsigned char xlib_nesw_resize_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, + 0x00, 0xbe, 0x00, 0x00, 0x00, 0xbc, 0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, + 0x02, 0xb4, 0x00, 0x00, 0x02, 0xa2, 0x00, 0x00, 0x02, 0x81, 0x00, 0x00, + 0x8a, 0x80, 0x00, 0x00, 0x5a, 0x80, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, + 0x7a, 0x00, 0x00, 0x00, 0xfa, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0xfe, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +static const unsigned char xlib_nesw_resize_mask_bits[] = { + 0xc0, 0xff, 0x01, 0x00, 0xc0, 0xff, 0x01, 0x00, 0xc0, 0xff, 0x01, 0x00, + 0x00, 0xff, 0x01, 0x00, 0x00, 0xfe, 0x01, 0x00, 0x00, 0xfc, 0x01, 0x00, + 0x07, 0xfe, 0x01, 0x00, 0x07, 0xf7, 0x01, 0x00, 0x8f, 0xe3, 0x01, 0x00, + 0xdf, 0xc1, 0x01, 0x00, 0xff, 0xc0, 0x01, 0x00, 0x7f, 0x00, 0x00, 0x00, + 0xff, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, + 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +/* XLIB_NWSE_RESIZE */ +static const unsigned char xlib_nwse_resize_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0xfa, 0x00, 0x00, 0x00, 0x7a, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, + 0x5a, 0x80, 0x00, 0x00, 0x8a, 0x80, 0x00, 0x00, 0x02, 0x81, 0x00, 0x00, + 0x02, 0xa2, 0x00, 0x00, 0x02, 0xb4, 0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, + 0x00, 0xbc, 0x00, 0x00, 0x00, 0xbe, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, + 0xc0, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +static const unsigned char xlib_nwse_resize_mask_bits[] = { + 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, 0xff, 0x07, 0x00, 0x00, + 0xff, 0x01, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, + 0xff, 0xc0, 0x01, 0x00, 0xdf, 0xc1, 0x01, 0x00, 0x8f, 0xe3, 0x01, 0x00, + 0x07, 0xf7, 0x01, 0x00, 0x07, 0xfe, 0x01, 0x00, 0x00, 0xfc, 0x01, 0x00, + 0x00, 0xfe, 0x01, 0x00, 0x00, 0xff, 0x01, 0x00, 0xc0, 0xff, 0x01, 0x00, + 0xc0, 0xff, 0x01, 0x00, 0xc0, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; enum { XLIB_QUESTION_ARROW = 0, @@ -300,7 +462,13 @@ enum { XLIB_CONTEXT_MENU, XLIB_SPINNING, XLIB_ZOOM_IN, - XLIB_ZOOM_OUT + XLIB_ZOOM_OUT, + XLIB_NOT_ALLOWED, + XLIB_COL_RESIZE, + XLIB_ROW_RESIZE, + XLIB_VERTICAL_TEXT, + XLIB_NESW_RESIZE, + XLIB_NWSE_RESIZE }; static const nsXlibCursor XlibCursors[] = { @@ -312,7 +480,13 @@ static const nsXlibCursor XlibCursors[] = { { xlib_menu_bits, xlib_menu_mask_bits, 2, 2 }, { xlib_spinning_bits, xlib_spinning_mask_bits, 2, 2 }, { xlib_zoom_in_bits, xlib_zoom_in_mask_bits, 6, 6 }, - { xlib_zoom_out_bits, xlib_zoom_out_mask_bits, 6, 6 } + { xlib_zoom_out_bits, xlib_zoom_out_mask_bits, 6, 6 }, + { xlib_not_allowed_bits, xlib_not_allowed_mask_bits, 9, 9 }, + { xlib_col_resize_bits, xlib_col_resize_mask_bits, 9, 7 }, + { xlib_row_resize_bits, xlib_row_resize_mask_bits, 7, 9 }, + { xlib_vertical_text_bits, xlib_vertical_text_mask_bits, 8, 4 }, + { xlib_nesw_resize_bits, xlib_nesw_resize_mask_bits, 8, 8 }, + { xlib_nwse_resize_bits, xlib_nwse_resize_mask_bits, 8, 8 } }; #endif /* nsXlibCursors_h__ */