[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:59:07 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1c7ff8d14359a4cf38bbd56d47c1f6197b3448b5
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 1 23:27:11 2003 +0000
<rdar://problem/2942589>: CSS cursors are not implemented
Reviewed by Dave.
* Resources/eastCursor.tiff: Added.
* Resources/eastResizeCursor.tiff: Added.
* Resources/helpCursor.tiff: Added.
* Resources/moveCursor.tiff: Added.
* Resources/northEastResizeCursor.tiff: Added.
* Resources/northResizeCursor.tiff: Added.
* Resources/northWestResizeCursor.tiff: Added.
* Resources/southEastResizeCursor.tiff: Added.
* Resources/southResizeCursor.tiff: Added.
* Resources/southWestResizeCursor.tiff: Added.
* Resources/waitCursor.tiff: Added.
* Resources/westResizeCursor.tiff: Added.
* WebCore.pbproj/project.pbxproj:
* khtml/css/cssparser.cpp: special-case the hand cursor to mean pointer
(CSSParser::parseValue):
* khtml/css/cssvalues.c: generated changes
(hash_val):
(findValue):
* khtml/css/cssvalues.h: generated changes
* khtml/css/cssvalues.in: removed the progress cursor from the list because it was messing up the mapping
* khtml/khtmlview.cpp: call new cursor methods
* kwq/KWQKCursor.h:
* kwq/KWQKCursor.mm:
(+[NSCursor _WebCore_cursorWithName:hotSpot:]): new, loads and caches cursors
(KCursor::crossCursor): get the AppKit cross hair cursor
(KCursor::handCursor): call _WebCore_cursorWithName:hotSpot:
(KCursor::sizeAllCursor): ditto
(KCursor::waitCursor): ditto
(KCursor::whatsThisCursor): ditto
(KCursor::eastResizeCursor): new, call _WebCore_cursorWithName:hotSpot:
(KCursor::northResizeCursor): ditto
(KCursor::northEastResizeCursor): ditto
(KCursor::northWestResizeCursor): ditto
(KCursor::southResizeCursor): ditto
(KCursor::southEastResizeCursor): ditto
(KCursor::southWestResizeCursor): ditto
(KCursor::westResizeCursor): ditto
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5108 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ddab3d6..9482f2e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,47 @@
+2003-10-01 Chris Blumenberg <cblu at apple.com>
+
+ <rdar://problem/2942589>: CSS cursors are not implemented
+
+ Reviewed by Dave.
+
+ * Resources/eastCursor.tiff: Added.
+ * Resources/eastResizeCursor.tiff: Added.
+ * Resources/helpCursor.tiff: Added.
+ * Resources/moveCursor.tiff: Added.
+ * Resources/northEastResizeCursor.tiff: Added.
+ * Resources/northResizeCursor.tiff: Added.
+ * Resources/northWestResizeCursor.tiff: Added.
+ * Resources/southEastResizeCursor.tiff: Added.
+ * Resources/southResizeCursor.tiff: Added.
+ * Resources/southWestResizeCursor.tiff: Added.
+ * Resources/waitCursor.tiff: Added.
+ * Resources/westResizeCursor.tiff: Added.
+ * WebCore.pbproj/project.pbxproj:
+ * khtml/css/cssparser.cpp: special-case the hand cursor to mean pointer
+ (CSSParser::parseValue):
+ * khtml/css/cssvalues.c: generated changes
+ (hash_val):
+ (findValue):
+ * khtml/css/cssvalues.h: generated changes
+ * khtml/css/cssvalues.in: removed the progress cursor from the list because it was messing up the mapping
+ * khtml/khtmlview.cpp: call new cursor methods
+ * kwq/KWQKCursor.h:
+ * kwq/KWQKCursor.mm:
+ (+[NSCursor _WebCore_cursorWithName:hotSpot:]): new, loads and caches cursors
+ (KCursor::crossCursor): get the AppKit cross hair cursor
+ (KCursor::handCursor): call _WebCore_cursorWithName:hotSpot:
+ (KCursor::sizeAllCursor): ditto
+ (KCursor::waitCursor): ditto
+ (KCursor::whatsThisCursor): ditto
+ (KCursor::eastResizeCursor): new, call _WebCore_cursorWithName:hotSpot:
+ (KCursor::northResizeCursor): ditto
+ (KCursor::northEastResizeCursor): ditto
+ (KCursor::northWestResizeCursor): ditto
+ (KCursor::southResizeCursor): ditto
+ (KCursor::southEastResizeCursor): ditto
+ (KCursor::southWestResizeCursor): ditto
+ (KCursor::westResizeCursor): ditto
+
2003-10-01 David Hyatt <hyatt at apple.com>
Clean up our detach model so that you can always get to a document, even for
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ddab3d6..9482f2e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,47 @@
+2003-10-01 Chris Blumenberg <cblu at apple.com>
+
+ <rdar://problem/2942589>: CSS cursors are not implemented
+
+ Reviewed by Dave.
+
+ * Resources/eastCursor.tiff: Added.
+ * Resources/eastResizeCursor.tiff: Added.
+ * Resources/helpCursor.tiff: Added.
+ * Resources/moveCursor.tiff: Added.
+ * Resources/northEastResizeCursor.tiff: Added.
+ * Resources/northResizeCursor.tiff: Added.
+ * Resources/northWestResizeCursor.tiff: Added.
+ * Resources/southEastResizeCursor.tiff: Added.
+ * Resources/southResizeCursor.tiff: Added.
+ * Resources/southWestResizeCursor.tiff: Added.
+ * Resources/waitCursor.tiff: Added.
+ * Resources/westResizeCursor.tiff: Added.
+ * WebCore.pbproj/project.pbxproj:
+ * khtml/css/cssparser.cpp: special-case the hand cursor to mean pointer
+ (CSSParser::parseValue):
+ * khtml/css/cssvalues.c: generated changes
+ (hash_val):
+ (findValue):
+ * khtml/css/cssvalues.h: generated changes
+ * khtml/css/cssvalues.in: removed the progress cursor from the list because it was messing up the mapping
+ * khtml/khtmlview.cpp: call new cursor methods
+ * kwq/KWQKCursor.h:
+ * kwq/KWQKCursor.mm:
+ (+[NSCursor _WebCore_cursorWithName:hotSpot:]): new, loads and caches cursors
+ (KCursor::crossCursor): get the AppKit cross hair cursor
+ (KCursor::handCursor): call _WebCore_cursorWithName:hotSpot:
+ (KCursor::sizeAllCursor): ditto
+ (KCursor::waitCursor): ditto
+ (KCursor::whatsThisCursor): ditto
+ (KCursor::eastResizeCursor): new, call _WebCore_cursorWithName:hotSpot:
+ (KCursor::northResizeCursor): ditto
+ (KCursor::northEastResizeCursor): ditto
+ (KCursor::northWestResizeCursor): ditto
+ (KCursor::southResizeCursor): ditto
+ (KCursor::southEastResizeCursor): ditto
+ (KCursor::southWestResizeCursor): ditto
+ (KCursor::westResizeCursor): ditto
+
2003-10-01 David Hyatt <hyatt at apple.com>
Clean up our detach model so that you can always get to a document, even for
diff --git a/WebKit/Resources/missing_image.tiff b/WebCore/Resources/eastCursor.tiff
similarity index 77%
copy from WebKit/Resources/missing_image.tiff
copy to WebCore/Resources/eastCursor.tiff
index 4eb7cce..b634d14 100644
Binary files a/WebKit/Resources/missing_image.tiff and b/WebCore/Resources/eastCursor.tiff differ
diff --git a/WebKit/Resources/missing_image.tiff b/WebCore/Resources/eastResizeCursor.tiff
similarity index 77%
copy from WebKit/Resources/missing_image.tiff
copy to WebCore/Resources/eastResizeCursor.tiff
index 4eb7cce..d737268 100644
Binary files a/WebKit/Resources/missing_image.tiff and b/WebCore/Resources/eastResizeCursor.tiff differ
diff --git a/WebCore/Resources/helpCursor.tiff b/WebCore/Resources/helpCursor.tiff
new file mode 100644
index 0000000..b7470f8
Binary files /dev/null and b/WebCore/Resources/helpCursor.tiff differ
diff --git a/WebCore/Resources/moveCursor.tiff b/WebCore/Resources/moveCursor.tiff
new file mode 100644
index 0000000..7dc0318
Binary files /dev/null and b/WebCore/Resources/moveCursor.tiff differ
diff --git a/WebKit/Resources/missing_image.tiff b/WebCore/Resources/northEastResizeCursor.tiff
similarity index 77%
copy from WebKit/Resources/missing_image.tiff
copy to WebCore/Resources/northEastResizeCursor.tiff
index 4eb7cce..cad85f9 100644
Binary files a/WebKit/Resources/missing_image.tiff and b/WebCore/Resources/northEastResizeCursor.tiff differ
diff --git a/WebKit/Resources/missing_image.tiff b/WebCore/Resources/northResizeCursor.tiff
similarity index 77%
copy from WebKit/Resources/missing_image.tiff
copy to WebCore/Resources/northResizeCursor.tiff
index 4eb7cce..3860b03 100644
Binary files a/WebKit/Resources/missing_image.tiff and b/WebCore/Resources/northResizeCursor.tiff differ
diff --git a/WebKit/Resources/missing_image.tiff b/WebCore/Resources/northWestResizeCursor.tiff
similarity index 77%
copy from WebKit/Resources/missing_image.tiff
copy to WebCore/Resources/northWestResizeCursor.tiff
index 4eb7cce..947f0b3 100644
Binary files a/WebKit/Resources/missing_image.tiff and b/WebCore/Resources/northWestResizeCursor.tiff differ
diff --git a/WebKit/Resources/missing_image.tiff b/WebCore/Resources/southEastResizeCursor.tiff
similarity index 77%
copy from WebKit/Resources/missing_image.tiff
copy to WebCore/Resources/southEastResizeCursor.tiff
index 4eb7cce..f21ab73 100644
Binary files a/WebKit/Resources/missing_image.tiff and b/WebCore/Resources/southEastResizeCursor.tiff differ
diff --git a/WebKit/Resources/missing_image.tiff b/WebCore/Resources/southResizeCursor.tiff
similarity index 77%
copy from WebKit/Resources/missing_image.tiff
copy to WebCore/Resources/southResizeCursor.tiff
index 4eb7cce..2a86e23 100644
Binary files a/WebKit/Resources/missing_image.tiff and b/WebCore/Resources/southResizeCursor.tiff differ
diff --git a/WebKit/Resources/missing_image.tiff b/WebCore/Resources/southWestResizeCursor.tiff
similarity index 77%
copy from WebKit/Resources/missing_image.tiff
copy to WebCore/Resources/southWestResizeCursor.tiff
index 4eb7cce..0b83131 100644
Binary files a/WebKit/Resources/missing_image.tiff and b/WebCore/Resources/southWestResizeCursor.tiff differ
diff --git a/WebKit/Resources/missing_image.tiff b/WebCore/Resources/waitCursor.tiff
similarity index 77%
copy from WebKit/Resources/missing_image.tiff
copy to WebCore/Resources/waitCursor.tiff
index 4eb7cce..2d82ee7 100644
Binary files a/WebKit/Resources/missing_image.tiff and b/WebCore/Resources/waitCursor.tiff differ
diff --git a/WebKit/Resources/missing_image.tiff b/WebCore/Resources/westResizeCursor.tiff
similarity index 77%
copy from WebKit/Resources/missing_image.tiff
copy to WebCore/Resources/westResizeCursor.tiff
index 4eb7cce..9eb0aa4 100644
Binary files a/WebKit/Resources/missing_image.tiff and b/WebCore/Resources/westResizeCursor.tiff differ
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index a3dd2d9..0696c13 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -522,6 +522,18 @@
F5A1B04A02DE8ABA018635CA,
F5A1B05402DE8B46018635CA,
BC8F629A0405F45600A80004,
+ 84C0FA2F052B966D000440A1,
+ 84C0FA30052B966D000440A1,
+ 84C0FA31052B966D000440A1,
+ 84C0FA32052B966D000440A1,
+ 84C0FA33052B966D000440A1,
+ 84C0FA34052B966D000440A1,
+ 84C0FA35052B966D000440A1,
+ 84C0FA36052B966D000440A1,
+ 84C0FA37052B966D000440A1,
+ 84C0FA38052B966D000440A1,
+ 84C0FA39052B966D000440A1,
+ 84C0FA3A052B966D000440A1,
);
isa = PBXResourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -776,8 +788,8 @@
};
089C1665FE841158C02AAC07 = {
children = (
+ 84C0FA1E052B9652000440A1,
089C1666FE841158C02AAC07,
- F5A1B04902DE8ABA018635CA,
F5A1B05302DE8B46018635CA,
BC8F62990405F45600A80004,
);
@@ -992,6 +1004,205 @@
//552
//553
//554
+//840
+//841
+//842
+//843
+//844
+ 84C0FA1E052B9652000440A1 = {
+ children = (
+ 84C0FA23052B966D000440A1,
+ 84C0FA24052B966D000440A1,
+ 84C0FA25052B966D000440A1,
+ F5A1B04902DE8ABA018635CA,
+ 84C0FA26052B966D000440A1,
+ 84C0FA27052B966D000440A1,
+ 84C0FA28052B966D000440A1,
+ 84C0FA29052B966D000440A1,
+ 84C0FA2A052B966D000440A1,
+ 84C0FA2B052B966D000440A1,
+ 84C0FA2C052B966D000440A1,
+ 84C0FA2D052B966D000440A1,
+ 84C0FA2E052B966D000440A1,
+ );
+ isa = PBXGroup;
+ name = "Cursor Images";
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 84C0FA23052B966D000440A1 = {
+ expectedFileType = image.tiff;
+ isa = PBXFileReference;
+ name = eastCursor.tiff;
+ path = Resources/eastCursor.tiff;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 84C0FA24052B966D000440A1 = {
+ expectedFileType = image.tiff;
+ isa = PBXFileReference;
+ name = eastResizeCursor.tiff;
+ path = Resources/eastResizeCursor.tiff;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 84C0FA25052B966D000440A1 = {
+ expectedFileType = image.tiff;
+ isa = PBXFileReference;
+ name = helpCursor.tiff;
+ path = Resources/helpCursor.tiff;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 84C0FA26052B966D000440A1 = {
+ expectedFileType = image.tiff;
+ isa = PBXFileReference;
+ name = moveCursor.tiff;
+ path = Resources/moveCursor.tiff;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 84C0FA27052B966D000440A1 = {
+ expectedFileType = image.tiff;
+ isa = PBXFileReference;
+ name = northEastResizeCursor.tiff;
+ path = Resources/northEastResizeCursor.tiff;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 84C0FA28052B966D000440A1 = {
+ expectedFileType = image.tiff;
+ isa = PBXFileReference;
+ name = northResizeCursor.tiff;
+ path = Resources/northResizeCursor.tiff;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 84C0FA29052B966D000440A1 = {
+ expectedFileType = image.tiff;
+ isa = PBXFileReference;
+ name = northWestResizeCursor.tiff;
+ path = Resources/northWestResizeCursor.tiff;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 84C0FA2A052B966D000440A1 = {
+ expectedFileType = image.tiff;
+ isa = PBXFileReference;
+ name = southEastResizeCursor.tiff;
+ path = Resources/southEastResizeCursor.tiff;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 84C0FA2B052B966D000440A1 = {
+ expectedFileType = image.tiff;
+ isa = PBXFileReference;
+ name = southResizeCursor.tiff;
+ path = Resources/southResizeCursor.tiff;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 84C0FA2C052B966D000440A1 = {
+ expectedFileType = image.tiff;
+ isa = PBXFileReference;
+ name = southWestResizeCursor.tiff;
+ path = Resources/southWestResizeCursor.tiff;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 84C0FA2D052B966D000440A1 = {
+ expectedFileType = image.tiff;
+ isa = PBXFileReference;
+ name = waitCursor.tiff;
+ path = Resources/waitCursor.tiff;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 84C0FA2E052B966D000440A1 = {
+ expectedFileType = image.tiff;
+ isa = PBXFileReference;
+ name = westResizeCursor.tiff;
+ path = Resources/westResizeCursor.tiff;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 84C0FA2F052B966D000440A1 = {
+ fileRef = 84C0FA23052B966D000440A1;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 84C0FA30052B966D000440A1 = {
+ fileRef = 84C0FA24052B966D000440A1;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 84C0FA31052B966D000440A1 = {
+ fileRef = 84C0FA25052B966D000440A1;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 84C0FA32052B966D000440A1 = {
+ fileRef = 84C0FA26052B966D000440A1;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 84C0FA33052B966D000440A1 = {
+ fileRef = 84C0FA27052B966D000440A1;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 84C0FA34052B966D000440A1 = {
+ fileRef = 84C0FA28052B966D000440A1;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 84C0FA35052B966D000440A1 = {
+ fileRef = 84C0FA29052B966D000440A1;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 84C0FA36052B966D000440A1 = {
+ fileRef = 84C0FA2A052B966D000440A1;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 84C0FA37052B966D000440A1 = {
+ fileRef = 84C0FA2B052B966D000440A1;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 84C0FA38052B966D000440A1 = {
+ fileRef = 84C0FA2C052B966D000440A1;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 84C0FA39052B966D000440A1 = {
+ fileRef = 84C0FA2D052B966D000440A1;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 84C0FA3A052B966D000440A1 = {
+ fileRef = 84C0FA2E052B966D000440A1;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+//840
+//841
+//842
+//843
+//844
//930
//931
//932
diff --git a/WebCore/khtml/css/cssparser.cpp b/WebCore/khtml/css/cssparser.cpp
index 2b285d8..27b9250 100644
--- a/WebCore/khtml/css/cssparser.cpp
+++ b/WebCore/khtml/css/cssparser.cpp
@@ -745,9 +745,10 @@ bool CSSParser::parseValue( int propId, bool important )
// nw-resize | n-resize | se-resize | sw-resize | s-resize | w-resize | text |
// wait | help ] ] | inherit
// MSIE 5 compatibility :/
- if ( !strict && id == CSS_VAL_HAND )
+ if ( !strict && id == CSS_VAL_HAND ) {
+ id = CSS_VAL_POINTER;
valid_primitive = true;
- else if ( id >= CSS_VAL_AUTO && id <= CSS_VAL_HELP )
+ } else if ( id >= CSS_VAL_AUTO && id <= CSS_VAL_HELP )
valid_primitive = true;
break;
diff --git a/WebCore/khtml/css/cssvalues.c b/WebCore/khtml/css/cssvalues.c
index 47328e8..237be3f 100644
--- a/WebCore/khtml/css/cssvalues.c
+++ b/WebCore/khtml/css/cssvalues.c
@@ -25,15 +25,15 @@ hash_val (register const char *str, register unsigned int len)
1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
- 1719, 1719, 1719, 1719, 1719, 20, 1719, 1719, 0, 20,
- 25, 30, 35, 40, 45, 50, 10, 0, 1719, 1719,
+ 1719, 1719, 1719, 1719, 1719, 20, 1719, 1719, 0, 10,
+ 20, 25, 30, 35, 40, 45, 50, 0, 1719, 1719,
1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
1719, 1719, 1719, 1719, 1719, 1719, 1719, 0, 200, 95,
- 35, 170, 230, 4, 105, 0, 5, 198, 0, 4,
- 50, 205, 24, 30, 5, 10, 0, 255, 8, 142,
- 24, 29, 184, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
+ 35, 170, 230, 4, 105, 0, 5, 83, 0, 4,
+ 50, 205, 24, 45, 5, 10, 0, 255, 12, 186,
+ 24, 139, 184, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719,
@@ -110,7 +110,7 @@ findValue (register const char *str, register unsigned int len)
{
enum
{
- TOTAL_KEYWORDS = 242,
+ TOTAL_KEYWORDS = 241,
MIN_WORD_LENGTH = 3,
MAX_WORD_LENGTH = 22,
MIN_HASH_VALUE = 0,
@@ -122,411 +122,411 @@ findValue (register const char *str, register unsigned int len)
{"900", CSS_VAL_900},
{"ltr", CSS_VAL_LTR},
{"rtl", CSS_VAL_RTL},
- {"800", CSS_VAL_800},
+ {"100", CSS_VAL_100},
{"small", CSS_VAL_SMALL},
{"start", CSS_VAL_START},
- {"100", CSS_VAL_100},
{"200", CSS_VAL_200},
- {"mix", CSS_VAL_MIX},
{"300", CSS_VAL_300},
+ {"mix", CSS_VAL_MIX},
{"400", CSS_VAL_400},
- {"gray", CSS_VAL_GRAY},
{"500", CSS_VAL_500},
{"600", CSS_VAL_600},
{"700", CSS_VAL_700},
+ {"800", CSS_VAL_800},
{"x-small", CSS_VAL_X_SMALL},
{"xx-small", CSS_VAL_XX_SMALL},
- {"navy", CSS_VAL_NAVY},
{"italic", CSS_VAL_ITALIC},
{"static", CSS_VAL_STATIC},
{"right", CSS_VAL_RIGHT},
{"disc", CSS_VAL_DISC},
- {"wait", CSS_VAL_WAIT},
+ {"gray", CSS_VAL_GRAY},
{"thin", CSS_VAL_THIN},
{"small-caps", CSS_VAL_SMALL_CAPS},
{"hiragana", CSS_VAL_HIRAGANA},
{"teal", CSS_VAL_TEAL},
{"lime", CSS_VAL_LIME},
{"large", CSS_VAL_LARGE},
- {"always", CSS_VAL_ALWAYS},
{"larger", CSS_VAL_LARGER},
+ {"wait", CSS_VAL_WAIT},
{"smaller", CSS_VAL_SMALLER},
{"hand", CSS_VAL_HAND},
- {"silver", CSS_VAL_SILVER},
{"text", CSS_VAL_TEXT},
+ {"silver", CSS_VAL_SILVER},
{"pre", CSS_VAL_PRE},
+ {"navy", CSS_VAL_NAVY},
{"list-item", CSS_VAL_LIST_ITEM},
- {"grey", CSS_VAL_GREY},
{"red", CSS_VAL_RED},
{"ridge", CSS_VAL_RIDGE},
+ {"katakana", CSS_VAL_KATAKANA},
{"x-large", CSS_VAL_X_LARGE},
{"top", CSS_VAL_TOP},
{"inset", CSS_VAL_INSET},
- {"graytext", CSS_VAL_GRAYTEXT},
- {"invert", CSS_VAL_INVERT},
{"single", CSS_VAL_SINGLE},
+ {"invert", CSS_VAL_INVERT},
{"portrait", CSS_VAL_PORTRAIT},
{"middle", CSS_VAL_MIDDLE},
{"xx-large", CSS_VAL_XX_LARGE},
- {"avoid", CSS_VAL_AVOID},
{"solid", CSS_VAL_SOLID},
+ {"avoid", CSS_VAL_AVOID},
{"end", CSS_VAL_END},
{"normal", CSS_VAL_NORMAL},
{"inside", CSS_VAL_INSIDE},
{"inline", CSS_VAL_INLINE},
- {"vertical", CSS_VAL_VERTICAL},
{"armenian", CSS_VAL_ARMENIAN},
+ {"vertical", CSS_VAL_VERTICAL},
+ {"thick", CSS_VAL_THICK},
{"lighter", CSS_VAL_LIGHTER},
- {"aqua", CSS_VAL_AQUA},
{"help", CSS_VAL_HELP},
+ {"aqua", CSS_VAL_AQUA},
{"decimal", CSS_VAL_DECIMAL},
{"hide", CSS_VAL_HIDE},
{"transparent", CSS_VAL_TRANSPARENT},
{"scroll", CSS_VAL_SCROLL},
- {"fantasy", CSS_VAL_FANTASY},
+ {"grey", CSS_VAL_GREY},
{"highlight", CSS_VAL_HIGHLIGHT},
{"inline-axis", CSS_VAL_INLINE_AXIS},
{"cross", CSS_VAL_CROSS},
{"crop", CSS_VAL_CROP},
{"inherit", CSS_VAL_INHERIT},
- {"level", CSS_VAL_LEVEL},
+ {"blink", CSS_VAL_BLINK},
+ {"always", CSS_VAL_ALWAYS},
+ {"graytext", CSS_VAL_GRAYTEXT},
+ {"-khtml-right", CSS_VAL__KHTML_RIGHT},
{"icon", CSS_VAL_ICON},
- {"wider", CSS_VAL_WIDER},
- {"relative", CSS_VAL_RELATIVE},
+ {"level", CSS_VAL_LEVEL},
{"dashed", CSS_VAL_DASHED},
+ {"relative", CSS_VAL_RELATIVE},
{"circle", CSS_VAL_CIRCLE},
{"repeat", CSS_VAL_REPEAT},
{"table", CSS_VAL_TABLE},
{"caption", CSS_VAL_CAPTION},
+ {"black", CSS_VAL_BLACK},
{"separate", CSS_VAL_SEPARATE},
{"run-in", CSS_VAL_RUN_IN},
- {"olive", CSS_VAL_OLIVE},
{"landscape", CSS_VAL_LANDSCAPE},
{"stretch", CSS_VAL_STRETCH},
+ {"olive", CSS_VAL_OLIVE},
+ {"higher", CSS_VAL_HIGHER},
{"move", CSS_VAL_MOVE},
{"visible", CSS_VAL_VISIBLE},
- {"higher", CSS_VAL_HIGHER},
{"hidden", CSS_VAL_HIDDEN},
- {"thick", CSS_VAL_THICK},
+ {"wider", CSS_VAL_WIDER},
{"green", CSS_VAL_GREEN},
{"left", CSS_VAL_LEFT},
{"small-caption", CSS_VAL_SMALL_CAPTION},
{"repeat-x", CSS_VAL_REPEAT_X},
{"serif", CSS_VAL_SERIF},
- {"white", CSS_VAL_WHITE},
- {"repeat-y", CSS_VAL_REPEAT_Y},
{"compact", CSS_VAL_COMPACT},
- {"nowrap", CSS_VAL_NOWRAP},
- {"progress", CSS_VAL_PROGRESS},
+ {"-khtml-text", CSS_VAL__KHTML_TEXT},
+ {"fantasy", CSS_VAL_FANTASY},
{"orange", CSS_VAL_ORANGE},
{"crosshair", CSS_VAL_CROSSHAIR},
{"georgian", CSS_VAL_GEORGIAN},
{"bold", CSS_VAL_BOLD},
{"text-top", CSS_VAL_TEXT_TOP},
{"dotted", CSS_VAL_DOTTED},
- {"katakana", CSS_VAL_KATAKANA},
- {"blink", CSS_VAL_BLINK},
{"multiple", CSS_VAL_MULTIPLE},
{"pointer", CSS_VAL_POINTER},
{"fixed", CSS_VAL_FIXED},
{"auto", CSS_VAL_AUTO},
- {"-khtml-right", CSS_VAL__KHTML_RIGHT},
- {"show", CSS_VAL_SHOW},
+ {"white", CSS_VAL_WHITE},
{"super", CSS_VAL_SUPER},
{"sub", CSS_VAL_SUB},
{"medium", CSS_VAL_MEDIUM},
{"maroon", CSS_VAL_MAROON},
- {"square", CSS_VAL_SQUARE},
+ {"nowrap", CSS_VAL_NOWRAP},
{"capitalize", CSS_VAL_CAPITALIZE},
{"none", CSS_VAL_NONE},
{"purple", CSS_VAL_PURPLE},
{"menu", CSS_VAL_MENU},
+ {"square", CSS_VAL_SQUARE},
{"center", CSS_VAL_CENTER},
- {"black", CSS_VAL_BLACK},
{"loud", CSS_VAL_LOUD},
+ {"-khtml-normal", CSS_VAL__KHTML_NORMAL},
{"hiragana-iroha", CSS_VAL_HIRAGANA_IROHA},
{"status-bar", CSS_VAL_STATUS_BAR},
+ {"-khtml-xxx-large", CSS_VAL__KHTML_XXX_LARGE},
{"collapse", CSS_VAL_COLLAPSE},
{"sans-serif", CSS_VAL_SANS_SERIF},
+ {"show", CSS_VAL_SHOW},
{"expanded", CSS_VAL_EXPANDED},
{"both", CSS_VAL_BOTH},
{"highlighttext", CSS_VAL_HIGHLIGHTTEXT},
{"scrollbar", CSS_VAL_SCROLLBAR},
- {"lower", CSS_VAL_LOWER},
- {"justify", CSS_VAL_JUSTIFY},
+ {"repeat-y", CSS_VAL_REPEAT_Y},
{"reverse", CSS_VAL_REVERSE},
- {"-khtml-text", CSS_VAL__KHTML_TEXT},
{"cursive", CSS_VAL_CURSIVE},
- {"yellow", CSS_VAL_YELLOW},
{"upper-latin", CSS_VAL_UPPER_LATIN},
+ {"katakana-iroha", CSS_VAL_KATAKANA_IROHA},
+ {"lower", CSS_VAL_LOWER},
{"captiontext", CSS_VAL_CAPTIONTEXT},
{"s-resize", CSS_VAL_S_RESIZE},
- {"window", CSS_VAL_WINDOW},
{"embed", CSS_VAL_EMBED},
- {"narrower", CSS_VAL_NARROWER},
+ {"block", CSS_VAL_BLOCK},
{"above", CSS_VAL_ABOVE},
- {"lower-latin", CSS_VAL_LOWER_LATIN},
- {"groove", CSS_VAL_GROOVE},
{"baseline", CSS_VAL_BASELINE},
- {"overline", CSS_VAL_OVERLINE},
+ {"groove", CSS_VAL_GROOVE},
{"n-resize", CSS_VAL_N_RESIZE},
- {"-khtml-normal", CSS_VAL__KHTML_NORMAL},
+ {"overline", CSS_VAL_OVERLINE},
{"bottom", CSS_VAL_BOTTOM},
{"bolder", CSS_VAL_BOLDER},
- {"-khtml-xxx-large", CSS_VAL__KHTML_XXX_LARGE},
{"blue", CSS_VAL_BLUE},
+ {"narrower", CSS_VAL_NARROWER},
{"upper-alpha", CSS_VAL_UPPER_ALPHA},
+ {"-khtml-left", CSS_VAL__KHTML_LEFT},
+ {"lower-latin", CSS_VAL_LOWER_LATIN},
+ {"block-axis", CSS_VAL_BLOCK_AXIS},
+ {"justify", CSS_VAL_JUSTIFY},
{"outset", CSS_VAL_OUTSET},
{"no-repeat", CSS_VAL_NO_REPEAT},
{"activecaption", CSS_VAL_ACTIVECAPTION},
{"table-cell", CSS_VAL_TABLE_CELL},
{"inline-table", CSS_VAL_INLINE_TABLE},
- {"lower-alpha", CSS_VAL_LOWER_ALPHA},
+ {"-khtml-box", CSS_VAL__KHTML_BOX},
+ {"window", CSS_VAL_WINDOW},
{"menutext", CSS_VAL_MENUTEXT},
{"outside", CSS_VAL_OUTSIDE},
{"infotext", CSS_VAL_INFOTEXT},
{"default", CSS_VAL_DEFAULT},
+ {"-khtml-auto", CSS_VAL__KHTML_AUTO},
{"fuchsia", CSS_VAL_FUCHSIA},
+ {"yellow", CSS_VAL_YELLOW},
{"inactivecaption", CSS_VAL_INACTIVECAPTION},
- {"block", CSS_VAL_BLOCK},
- {"w-resize", CSS_VAL_W_RESIZE},
- {"sw-resize", CSS_VAL_SW_RESIZE},
+ {"-khtml-nowrap", CSS_VAL__KHTML_NOWRAP},
{"semi-expanded", CSS_VAL_SEMI_EXPANDED},
- {"below", CSS_VAL_BELOW},
+ {"lower-alpha", CSS_VAL_LOWER_ALPHA},
+ {"-khtml-center", CSS_VAL__KHTML_CENTER},
{"extra-expanded", CSS_VAL_EXTRA_EXPANDED},
{"e-resize", CSS_VAL_E_RESIZE},
{"underline", CSS_VAL_UNDERLINE},
{"se-resize", CSS_VAL_SE_RESIZE},
- {"table-row", CSS_VAL_TABLE_ROW},
- {"-khtml-left", CSS_VAL__KHTML_LEFT},
- {"nw-resize", CSS_VAL_NW_RESIZE},
- {"block-axis", CSS_VAL_BLOCK_AXIS},
+ {"w-resize", CSS_VAL_W_RESIZE},
{"uppercase", CSS_VAL_UPPERCASE},
{"horizontal", CSS_VAL_HORIZONTAL},
+ {"sw-resize", CSS_VAL_SW_RESIZE},
+ {"below", CSS_VAL_BELOW},
{"upper-roman", CSS_VAL_UPPER_ROMAN},
{"monospace", CSS_VAL_MONOSPACE},
{"table-caption", CSS_VAL_TABLE_CAPTION},
- {"windowtext", CSS_VAL_WINDOWTEXT},
- {"-khtml-nowrap", CSS_VAL__KHTML_NOWRAP},
- {"-khtml-box", CSS_VAL__KHTML_BOX},
{"ne-resize", CSS_VAL_NE_RESIZE},
- {"katakana-iroha", CSS_VAL_KATAKANA_IROHA},
+ {"table-row", CSS_VAL_TABLE_ROW},
{"ultra-expanded", CSS_VAL_ULTRA_EXPANDED},
- {"hebrew", CSS_VAL_HEBREW},
- {"lowercase", CSS_VAL_LOWERCASE},
- {"lower-roman", CSS_VAL_LOWER_ROMAN},
- {"-khtml-auto", CSS_VAL__KHTML_AUTO},
+ {"nw-resize", CSS_VAL_NW_RESIZE},
{"threedhighlight", CSS_VAL_THREEDHIGHLIGHT},
{"-khtml-body", CSS_VAL__KHTML_BODY},
{"message-box", CSS_VAL_MESSAGE_BOX},
{"condensed", CSS_VAL_CONDENSED},
+ {"appworkspace", CSS_VAL_APPWORKSPACE},
{"text-bottom", CSS_VAL_TEXT_BOTTOM},
- {"-khtml-center", CSS_VAL__KHTML_CENTER},
+ {"hebrew", CSS_VAL_HEBREW},
{"absolute", CSS_VAL_ABSOLUTE},
+ {"lowercase", CSS_VAL_LOWERCASE},
+ {"cjk-ideographic", CSS_VAL_CJK_IDEOGRAPHIC},
+ {"lower-roman", CSS_VAL_LOWER_ROMAN},
+ {"windowtext", CSS_VAL_WINDOWTEXT},
{"bidi-override", CSS_VAL_BIDI_OVERRIDE},
- {"oblique", CSS_VAL_OBLIQUE},
{"double", CSS_VAL_DOUBLE},
+ {"inline-block", CSS_VAL_INLINE_BLOCK},
+ {"oblique", CSS_VAL_OBLIQUE},
{"inactivecaptiontext", CSS_VAL_INACTIVECAPTIONTEXT},
{"activeborder", CSS_VAL_ACTIVEBORDER},
- {"appworkspace", CSS_VAL_APPWORKSPACE},
{"buttontext", CSS_VAL_BUTTONTEXT},
{"line-through", CSS_VAL_LINE_THROUGH},
+ {"background", CSS_VAL_BACKGROUND},
{"inactiveborder", CSS_VAL_INACTIVEBORDER},
- {"cjk-ideographic", CSS_VAL_CJK_IDEOGRAPHIC},
+ {"-khtml-inline-box", CSS_VAL__KHTML_INLINE_BOX},
{"threedface", CSS_VAL_THREEDFACE},
- {"threedshadow", CSS_VAL_THREEDSHADOW},
- {"windowframe", CSS_VAL_WINDOWFRAME},
- {"inline-block", CSS_VAL_INLINE_BLOCK},
{"table-column", CSS_VAL_TABLE_COLUMN},
+ {"lower-greek", CSS_VAL_LOWER_GREEK},
{"semi-condensed", CSS_VAL_SEMI_CONDENSED},
+ {"threedshadow", CSS_VAL_THREEDSHADOW},
{"buttonhighlight", CSS_VAL_BUTTONHIGHLIGHT},
{"extra-condensed", CSS_VAL_EXTRA_CONDENSED},
- {"background", CSS_VAL_BACKGROUND},
- {"-khtml-inline-box", CSS_VAL__KHTML_INLINE_BOX},
- {"lower-greek", CSS_VAL_LOWER_GREEK},
- {"threedlightshadow", CSS_VAL_THREEDLIGHTSHADOW},
+ {"windowframe", CSS_VAL_WINDOWFRAME},
+ {"-khtml-baseline-middle", CSS_VAL__KHTML_BASELINE_MIDDLE},
{"ultra-condensed", CSS_VAL_ULTRA_CONDENSED},
+ {"threedlightshadow", CSS_VAL_THREEDLIGHTSHADOW},
{"open-quote", CSS_VAL_OPEN_QUOTE},
- {"close-quote", CSS_VAL_CLOSE_QUOTE},
+ {"threeddarkshadow", CSS_VAL_THREEDDARKSHADOW},
{"decimal-leading-zero", CSS_VAL_DECIMAL_LEADING_ZERO},
+ {"close-quote", CSS_VAL_CLOSE_QUOTE},
{"buttonface", CSS_VAL_BUTTONFACE},
+ {"-khtml-around-floats", CSS_VAL__KHTML_AROUND_FLOATS},
{"buttonshadow", CSS_VAL_BUTTONSHADOW},
- {"-khtml-baseline-middle", CSS_VAL__KHTML_BASELINE_MIDDLE},
- {"threeddarkshadow", CSS_VAL_THREEDDARKSHADOW},
{"table-row-group", CSS_VAL_TABLE_ROW_GROUP},
- {"-khtml-around-floats", CSS_VAL__KHTML_AROUND_FLOATS},
{"table-header-group", CSS_VAL_TABLE_HEADER_GROUP},
+ {"infobackground", CSS_VAL_INFOBACKGROUND},
{"no-open-quote", CSS_VAL_NO_OPEN_QUOTE},
{"no-close-quote", CSS_VAL_NO_CLOSE_QUOTE},
{"table-column-group", CSS_VAL_TABLE_COLUMN_GROUP},
- {"infobackground", CSS_VAL_INFOBACKGROUND},
{"table-footer-group", CSS_VAL_TABLE_FOOTER_GROUP}
};
static const short lookup[] =
{
- 0, -1, -1, -1, -1, -249, -241, -2,
+ 0, -1, -1, -1, -1, -248, -240, -2,
-1, -1, 3, -1, -1, -1, 4, 5,
-1, -1, -1, -1, 6, -1, -1, -1,
-1, 7, -1, -1, 8, -1, 9, -1,
- -1, -1, -1, 10, -1, -1, 11, -1,
- 12, -1, -1, -1, -1, 13, -1, -1,
+ -1, -1, -1, 10, -1, -1, -1, -1,
+ 11, -1, -1, -1, -1, 12, -1, -1,
+ -1, -1, 13, -1, -1, -1, -1, -1,
-1, -1, 14, -1, -1, -1, -1, -1,
- -1, -1, 15, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 16, -1, -1, -1, -1, 17,
- -1, -1, -1, -1, -1, -1, -1, 18,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 19, -1, -1, -1, -1, -1, -1,
- -1, -1, 20, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 21, -1, 22, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 23, -1, -1, -1, -1,
- -1, -1, -1, 24, 25, -1, -1, -1,
- -1, -1, 26, -1, -1, -1, 27, -1,
- -1, -1, -1, 28, -1, 29, -1, -1,
- 30, -1, -1, -1, -1, 31, 32, -1,
- -1, 33, 34, -1, -1, -1, -1, 35,
- -1, -1, -1, -1, 36, -1, -1, -1,
- 37, -1, 38, -1, -1, -1, 39, -1,
- -1, -1, -1, -1, -1, -1, -1, 40,
- -1, -1, -1, -1, -1, 41, 42, -1,
- 43, 44, 45, -1, -1, -1, -1, 46,
- -1, -1, -1, -1, 47, -1, -1, 48,
- 49, -1, 50, -1, -1, -1, -1, 51,
- -1, -1, -1, -1, -1, -1, -1, -1,
- 52, 53, -1, -1, -1, -1, 54, -1,
- -1, -1, -1, -1, -1, -1, 55, 56,
- -1, -1, -1, -1, 57, 58, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 59, -1, -1, -1, -1,
- 60, -1, -1, -1, -1, -1, 61, -1,
- -1, -1, 62, 63, -1, -1, -1, 64,
- -1, -1, -1, 65, 66, 67, -1, -1,
- -1, 68, 69, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 70, -1, 71, -1,
- 72, 73, -1, 74, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 75, -1, -1,
- -1, 76, 77, -1, -1, -1, 78, -1,
- -1, -1, -1, 79, 80, -1, -1, 81,
- 82, 83, -1, 84, 85, 86, -1, -1,
- -1, -1, -1, 87, -1, -1, 88, 89,
- 90, -1, -1, -1, -1, -1, -1, -1,
- 91, -1, -1, -1, -1, 92, -1, 93,
- -1, 94, 95, -1, -1, -1, -1, 96,
- -1, -1, 97, -1, -1, -1, -1, -1,
- -1, 98, 99, 100, -1, -1, 101, -1,
- 102, -1, -1, 103, -1, 104, 105, -1,
- 106, -1, -1, -1, -1, 107, 108, -1,
- -1, -1, -1, 109, 110, 111, 112, -1,
- 113, 114, -1, -1, 115, 116, 117, -1,
- -1, 118, -1, 119, -1, -1, 120, 121,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 122, -1, -1, 123, -1, 124,
- -1, -1, -1, 125, 126, -1, -1, -1,
- 127, 128, -1, -1, 129, -1, 130, -1,
- -1, -1, -1, -1, -1, 131, -1, -1,
- 132, -1, 133, -1, -1, -1, -1, -1,
- -1, 134, -1, -1, -1, -1, -1, -1,
- -1, -1, 135, -1, -1, 136, -1, 137,
- -1, -1, 138, -1, 139, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- 140, 141, -1, -1, -1, -1, 142, -1,
- -1, -1, -1, 143, -1, -1, 144, 145,
- -1, -1, -1, -1, -1, -1, -1, -1,
- 146, -1, -1, -1, -1, 147, -1, -1,
- 148, -1, -1, -1, -1, -1, -1, -1,
- 149, 150, -1, 151, -1, -1, 152, 153,
- -1, -1, 154, -1, -1, -1, -1, -1,
- -1, 155, -1, 156, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- 157, -1, -1, -1, 158, -1, -1, 159,
- -1, -1, -1, -1, -1, -1, -1, 160,
- -1, -1, -1, -1, 161, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 162,
- -1, 163, -1, 164, -1, -1, -1, 165,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 166, -1, -1, -1, -1, 167,
- -1, 168, 169, -1, -1, 170, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 171,
- 172, -1, -1, -1, -1, 173, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 174,
- -1, 175, -1, -1, -1, -1, -1, 176,
- -1, -1, -1, 177, -1, -1, 178, -1,
- -1, -1, -1, 179, -1, -1, -1, 180,
- 181, 182, 183, -1, -1, -1, -1, -1,
- -1, -1, 184, 185, 186, -1, -1, -1,
- 187, -1, -1, -1, -1, 188, -1, -1,
- 189, -1, -1, 190, -1, 191, -1, -1,
- -1, -1, -1, -1, 192, -1, -1, -1,
- 193, -1, -1, -1, -1, 194, -1, -1,
- -1, -1, -1, -1, -1, -1, 195, 196,
- 197, -1, -1, -1, -1, -1, -1, -1,
- 198, 199, -1, -1, 200, -1, -1, -1,
- -1, -1, -1, -1, 201, -1, -1, -1,
- -1, -1, -1, -1, -1, 202, -1, -1,
- 203, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 204, -1, -1,
- -1, -1, -1, -1, 205, -1, -1, -1,
+ -1, -1, 15, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 16,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 17, -1, -1, -1, -1, -1, -1,
+ -1, -1, 18, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 19, -1, -1, -1,
+ -1, -1, -1, -1, 20, -1, -1, -1,
+ -1, -1, -1, 21, -1, -1, -1, -1,
+ -1, -1, -1, 22, 23, -1, -1, -1,
+ -1, -1, 24, -1, -1, -1, 25, -1,
+ -1, -1, -1, 26, -1, -1, -1, -1,
+ 27, -1, 28, -1, -1, 29, 30, -1,
+ -1, -1, 31, -1, -1, 32, -1, 33,
+ -1, 34, -1, -1, 35, -1, -1, -1,
+ -1, -1, 36, -1, -1, -1, 37, -1,
+ 38, -1, -1, -1, -1, -1, -1, 39,
+ -1, -1, -1, -1, -1, 40, 41, -1,
+ -1, -1, 42, -1, -1, 43, -1, 44,
+ -1, -1, -1, -1, 45, -1, -1, 46,
+ -1, -1, 47, -1, 48, -1, -1, 49,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ 50, 51, -1, -1, -1, -1, 52, -1,
+ -1, -1, -1, -1, -1, -1, -1, 53,
+ -1, -1, 54, 55, 56, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 57, 58, -1, -1, -1,
+ 59, -1, -1, -1, -1, -1, 60, -1,
+ -1, -1, 61, 62, -1, -1, 63, -1,
+ -1, -1, -1, 64, 65, 66, -1, -1,
+ -1, 67, 68, -1, -1, 69, -1, 70,
+ -1, -1, -1, -1, -1, -1, 71, -1,
+ -1, -1, 72, -1, -1, -1, 73, -1,
+ 74, -1, -1, 75, -1, 76, -1, -1,
+ -1, -1, -1, -1, -1, 77, -1, -1,
+ -1, 78, 79, -1, -1, -1, 80, -1,
+ -1, -1, 81, 82, 83, -1, -1, -1,
+ 84, 85, -1, 86, -1, 87, -1, 88,
+ 89, -1, -1, 90, 91, -1, -1, 92,
+ 93, -1, -1, -1, -1, -1, -1, -1,
+ 94, -1, -1, -1, -1, 95, -1, 96,
+ -1, -1, -1, -1, -1, -1, -1, 97,
+ -1, -1, 98, -1, -1, 99, -1, -1,
+ -1, -1, 100, 101, -1, -1, 102, -1,
+ 103, -1, -1, 104, -1, 105, -1, -1,
+ -1, -1, -1, -1, -1, 106, 107, -1,
+ -1, -1, -1, 108, 109, 110, -1, -1,
+ 111, 112, -1, -1, 113, 114, 115, -1,
+ -1, 116, -1, 117, -1, -1, 118, 119,
+ -1, -1, -1, -1, -1, 120, -1, -1,
+ -1, -1, 121, -1, -1, -1, -1, 122,
+ 123, -1, -1, 124, 125, -1, -1, 126,
+ 127, 128, 129, -1, 130, -1, 131, -1,
+ -1, -1, -1, -1, -1, 132, -1, -1,
+ 133, -1, -1, -1, -1, -1, -1, -1,
+ 134, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 135, -1,
+ -1, -1, -1, 136, 137, -1, -1, 138,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 139, -1,
+ 140, 141, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 142, -1, -1, -1, 143,
+ -1, -1, -1, 144, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ 145, 146, -1, -1, -1, -1, -1, -1,
+ -1, 147, -1, -1, 148, -1, 149, 150,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 151, 152, 153, -1, -1, -1, -1,
+ 154, -1, -1, -1, 155, 156, -1, 157,
+ 158, -1, -1, -1, 159, -1, -1, -1,
+ -1, -1, -1, 160, -1, -1, -1, 161,
+ -1, -1, -1, -1, 162, 163, 164, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 165, -1, 166, -1, -1, -1, 167,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 168, -1, 169, -1, -1, 170,
+ -1, -1, -1, -1, 171, 172, 173, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ 174, -1, -1, 175, -1, -1, -1, -1,
+ -1, -1, 176, -1, -1, -1, -1, 177,
+ -1, 178, -1, -1, -1, -1, -1, 179,
+ -1, -1, -1, 180, -1, -1, -1, -1,
+ -1, 181, -1, -1, -1, -1, -1, -1,
+ -1, 182, 183, 184, -1, -1, -1, -1,
+ -1, 185, 186, 187, 188, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 189, -1, -1, -1, -1,
+ -1, -1, 190, -1, 191, -1, -1, -1,
+ -1, -1, -1, 192, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ 193, -1, -1, 194, -1, -1, -1, -1,
+ -1, 195, -1, -1, 196, -1, -1, -1,
+ -1, -1, 197, -1, 198, -1, -1, -1,
+ -1, -1, -1, -1, 199, -1, -1, -1,
+ 200, 201, -1, -1, -1, -1, 202, -1,
+ -1, -1, 203, -1, -1, -1, -1, -1,
+ 204, 205, -1, -1, -1, -1, -1, -1,
-1, 206, -1, -1, -1, -1, -1, -1,
+ -1, 207, -1, 208, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 209,
+ -1, 210, -1, -1, -1, -1, -1, -1,
+ 211, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 212,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 207, -1, 208, -1, -1,
- -1, 209, -1, -1, -1, -1, -1, -1,
- 210, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 211,
+ -1, -1, -1, -1, 213, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 214, -1, -1, -1, 215,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 212,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, 213, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 216, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 214, -1, 215, 216,
- -1, -1, -1, -1, 217, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 218,
+ -1, -1, -1, -1, -1, -1, -1, 217,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 218, -1, -1, -1, -1, -1,
+ 219, -1, 220, -1, -1, -1, -1, -1,
+ -1, 221, -1, -1, -1, -1, -1, 222,
-1, -1, -1, -1, -1, -1, -1, -1,
- 219, -1, -1, -1, -1, -1, -1, -1,
- -1, 220, -1, -1, -1, -1, -1, 221,
- -1, -1, -1, -1, -1, -1, -1, 222,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 223, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 223,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, 224, -1, 225, -1, -1, -1, -1,
- -1, -1, -1, -1, 226, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ 224, -1, -1, -1, 225, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, 227, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 226,
-1, -1, -1, -1, -1, -1, -1, -1,
+ 227, -1, -1, -1, -1, 228, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- 228, -1, -1, -1, -1, -1, -1, 229,
+ -1, -1, -1, -1, -1, -1, -1, 229,
+ -1, -1, -1, -1, -1, -1, -1, 230,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 231, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 230, -1, 231,
- -1, -1, -1, 232, -1, -1, -1, -1,
- -1, -1, -1, -1, 233, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 234,
+ -1, -1, -1, -1, -1, -1, -1, 232,
+ -1, -1, -1, 233, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 234, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
@@ -535,18 +535,17 @@ findValue (register const char *str, register unsigned int len)
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 235, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 236, -1, -1, -1,
+ -1, -1, -1, -1, 235, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 237, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 236, -1, 237, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 238, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 238, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
@@ -556,7 +555,6 @@ findValue (register const char *str, register unsigned int len)
-1, -1, -1, -1, -1, -1, -1, -1,
239, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 240, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
@@ -579,7 +577,8 @@ findValue (register const char *str, register unsigned int len)
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 241
+ -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 240
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -789,7 +788,6 @@ static const char * const valueList[] = {
"crosshair",
"default",
"pointer",
-"progress",
"move",
"e-resize",
"ne-resize",
diff --git a/WebCore/khtml/css/cssvalues.h b/WebCore/khtml/css/cssvalues.h
index f176aec..6afc366 100644
--- a/WebCore/khtml/css/cssvalues.h
+++ b/WebCore/khtml/css/cssvalues.h
@@ -180,78 +180,77 @@ DOM::DOMString getValueName(unsigned short id);
#define CSS_VAL_CROSSHAIR 169
#define CSS_VAL_DEFAULT 170
#define CSS_VAL_POINTER 171
-#define CSS_VAL_PROGRESS 172
-#define CSS_VAL_MOVE 173
-#define CSS_VAL_E_RESIZE 174
-#define CSS_VAL_NE_RESIZE 175
-#define CSS_VAL_NW_RESIZE 176
-#define CSS_VAL_N_RESIZE 177
-#define CSS_VAL_SE_RESIZE 178
-#define CSS_VAL_SW_RESIZE 179
-#define CSS_VAL_S_RESIZE 180
-#define CSS_VAL_W_RESIZE 181
-#define CSS_VAL_TEXT 182
-#define CSS_VAL_WAIT 183
-#define CSS_VAL_HELP 184
-#define CSS_VAL_LTR 185
-#define CSS_VAL_RTL 186
-#define CSS_VAL_CAPITALIZE 187
-#define CSS_VAL_UPPERCASE 188
-#define CSS_VAL_LOWERCASE 189
-#define CSS_VAL_VISIBLE 190
-#define CSS_VAL_COLLAPSE 191
-#define CSS_VAL_ABOVE 192
-#define CSS_VAL_ABSOLUTE 193
-#define CSS_VAL_ALWAYS 194
-#define CSS_VAL_AVOID 195
-#define CSS_VAL_BELOW 196
-#define CSS_VAL_BIDI_OVERRIDE 197
-#define CSS_VAL_BLINK 198
-#define CSS_VAL_BOTH 199
-#define CSS_VAL_CLOSE_QUOTE 200
-#define CSS_VAL_CROP 201
-#define CSS_VAL_CROSS 202
-#define CSS_VAL_EMBED 203
-#define CSS_VAL_FIXED 204
-#define CSS_VAL_HAND 205
-#define CSS_VAL_HIDE 206
-#define CSS_VAL_HIGHER 207
-#define CSS_VAL_INVERT 208
-#define CSS_VAL_LANDSCAPE 209
-#define CSS_VAL_LEVEL 210
-#define CSS_VAL_LINE_THROUGH 211
-#define CSS_VAL_LOUD 212
-#define CSS_VAL_LOWER 213
-#define CSS_VAL_MIX 214
-#define CSS_VAL_NO_CLOSE_QUOTE 215
-#define CSS_VAL_NO_OPEN_QUOTE 216
-#define CSS_VAL_NOWRAP 217
-#define CSS_VAL_OPEN_QUOTE 218
-#define CSS_VAL_OVERLINE 219
-#define CSS_VAL_PORTRAIT 220
-#define CSS_VAL_PRE 221
-#define CSS_VAL_RELATIVE 222
-#define CSS_VAL_SCROLL 223
-#define CSS_VAL_SEPARATE 224
-#define CSS_VAL_SHOW 225
-#define CSS_VAL_STATIC 226
-#define CSS_VAL_THICK 227
-#define CSS_VAL_THIN 228
-#define CSS_VAL_UNDERLINE 229
-#define CSS_VAL__KHTML_NOWRAP 230
-#define CSS_VAL__KHTML_NORMAL 231
-#define CSS_VAL__KHTML_AROUND_FLOATS 232
-#define CSS_VAL_STRETCH 233
-#define CSS_VAL_START 234
-#define CSS_VAL_END 235
-#define CSS_VAL_REVERSE 236
-#define CSS_VAL_HORIZONTAL 237
-#define CSS_VAL_VERTICAL 238
-#define CSS_VAL_INLINE_AXIS 239
-#define CSS_VAL_BLOCK_AXIS 240
-#define CSS_VAL_SINGLE 241
-#define CSS_VAL_MULTIPLE 242
+#define CSS_VAL_MOVE 172
+#define CSS_VAL_E_RESIZE 173
+#define CSS_VAL_NE_RESIZE 174
+#define CSS_VAL_NW_RESIZE 175
+#define CSS_VAL_N_RESIZE 176
+#define CSS_VAL_SE_RESIZE 177
+#define CSS_VAL_SW_RESIZE 178
+#define CSS_VAL_S_RESIZE 179
+#define CSS_VAL_W_RESIZE 180
+#define CSS_VAL_TEXT 181
+#define CSS_VAL_WAIT 182
+#define CSS_VAL_HELP 183
+#define CSS_VAL_LTR 184
+#define CSS_VAL_RTL 185
+#define CSS_VAL_CAPITALIZE 186
+#define CSS_VAL_UPPERCASE 187
+#define CSS_VAL_LOWERCASE 188
+#define CSS_VAL_VISIBLE 189
+#define CSS_VAL_COLLAPSE 190
+#define CSS_VAL_ABOVE 191
+#define CSS_VAL_ABSOLUTE 192
+#define CSS_VAL_ALWAYS 193
+#define CSS_VAL_AVOID 194
+#define CSS_VAL_BELOW 195
+#define CSS_VAL_BIDI_OVERRIDE 196
+#define CSS_VAL_BLINK 197
+#define CSS_VAL_BOTH 198
+#define CSS_VAL_CLOSE_QUOTE 199
+#define CSS_VAL_CROP 200
+#define CSS_VAL_CROSS 201
+#define CSS_VAL_EMBED 202
+#define CSS_VAL_FIXED 203
+#define CSS_VAL_HAND 204
+#define CSS_VAL_HIDE 205
+#define CSS_VAL_HIGHER 206
+#define CSS_VAL_INVERT 207
+#define CSS_VAL_LANDSCAPE 208
+#define CSS_VAL_LEVEL 209
+#define CSS_VAL_LINE_THROUGH 210
+#define CSS_VAL_LOUD 211
+#define CSS_VAL_LOWER 212
+#define CSS_VAL_MIX 213
+#define CSS_VAL_NO_CLOSE_QUOTE 214
+#define CSS_VAL_NO_OPEN_QUOTE 215
+#define CSS_VAL_NOWRAP 216
+#define CSS_VAL_OPEN_QUOTE 217
+#define CSS_VAL_OVERLINE 218
+#define CSS_VAL_PORTRAIT 219
+#define CSS_VAL_PRE 220
+#define CSS_VAL_RELATIVE 221
+#define CSS_VAL_SCROLL 222
+#define CSS_VAL_SEPARATE 223
+#define CSS_VAL_SHOW 224
+#define CSS_VAL_STATIC 225
+#define CSS_VAL_THICK 226
+#define CSS_VAL_THIN 227
+#define CSS_VAL_UNDERLINE 228
+#define CSS_VAL__KHTML_NOWRAP 229
+#define CSS_VAL__KHTML_NORMAL 230
+#define CSS_VAL__KHTML_AROUND_FLOATS 231
+#define CSS_VAL_STRETCH 232
+#define CSS_VAL_START 233
+#define CSS_VAL_END 234
+#define CSS_VAL_REVERSE 235
+#define CSS_VAL_HORIZONTAL 236
+#define CSS_VAL_VERTICAL 237
+#define CSS_VAL_INLINE_AXIS 238
+#define CSS_VAL_BLOCK_AXIS 239
+#define CSS_VAL_SINGLE 240
+#define CSS_VAL_MULTIPLE 241
-#define CSS_VAL_TOTAL 243
+#define CSS_VAL_TOTAL 242
#endif
diff --git a/WebCore/khtml/css/cssvalues.in b/WebCore/khtml/css/cssvalues.in
index 0ca1c6d..ad506b7 100644
--- a/WebCore/khtml/css/cssvalues.in
+++ b/WebCore/khtml/css/cssvalues.in
@@ -243,7 +243,6 @@ auto
crosshair
default
pointer
-progress
move
e-resize
ne-resize
diff --git a/WebCore/khtml/khtmlview.cpp b/WebCore/khtml/khtmlview.cpp
index eaafe0f..64165db 100644
--- a/WebCore/khtml/khtmlview.cpp
+++ b/WebCore/khtml/khtmlview.cpp
@@ -780,20 +780,52 @@ void KHTMLView::viewportMouseMoveEvent( QMouseEvent * _mouse )
c = KCursor::sizeAllCursor();
break;
case CURSOR_E_RESIZE:
+#if APPLE_CHANGES
+ c = KCursor::eastResizeCursor();
+ break;
+#endif
case CURSOR_W_RESIZE:
+#if APPLE_CHANGES
+ c = KCursor::westResizeCursor();
+#else
c = KCursor::sizeHorCursor();
+#endif
break;
case CURSOR_N_RESIZE:
+#if APPLE_CHANGES
+ c = KCursor::northResizeCursor();
+ break;
+#endif
case CURSOR_S_RESIZE:
+#if APPLE_CHANGES
+ c = KCursor::southResizeCursor();
+#else
c = KCursor::sizeVerCursor();
+#endif
break;
case CURSOR_NE_RESIZE:
+#if APPLE_CHANGES
+ c = KCursor::northEastResizeCursor();
+ break;
+#endif
case CURSOR_SW_RESIZE:
+#if APPLE_CHANGES
+ c = KCursor::southWestResizeCursor();
+#else
c = KCursor::sizeBDiagCursor();
+#endif
break;
case CURSOR_NW_RESIZE:
+#if APPLE_CHANGES
+ c = KCursor::northWestResizeCursor();
+ break;
+#endif
case CURSOR_SE_RESIZE:
+#if APPLE_CHANGES
+ c = KCursor::southEastResizeCursor();
+#else
c = KCursor::sizeFDiagCursor();
+#endif
break;
case CURSOR_TEXT:
c = KCursor::ibeamCursor();
diff --git a/WebCore/kwq/KWQKCursor.h b/WebCore/kwq/KWQKCursor.h
index 22deb83..ad962df 100644
--- a/WebCore/kwq/KWQKCursor.h
+++ b/WebCore/kwq/KWQKCursor.h
@@ -44,6 +44,15 @@ public:
static QCursor ibeamCursor();
static QCursor waitCursor();
static QCursor whatsThisCursor();
+
+ static QCursor eastResizeCursor();
+ static QCursor northResizeCursor();
+ static QCursor northEastResizeCursor();
+ static QCursor northWestResizeCursor();
+ static QCursor southResizeCursor();
+ static QCursor southEastResizeCursor();
+ static QCursor southWestResizeCursor();
+ static QCursor westResizeCursor();
};
diff --git a/WebCore/kwq/KWQKCursor.mm b/WebCore/kwq/KWQKCursor.mm
index 2596e60..0f02c70 100644
--- a/WebCore/kwq/KWQKCursor.mm
+++ b/WebCore/kwq/KWQKCursor.mm
@@ -31,24 +31,32 @@
@end
@interface NSCursor (WebCoreCursorAdditions)
-+ (NSCursor *)_WebCore_linkCursor;
++ (NSCursor *)_WebCore_cursorWithName:(NSString *)name hotSpot:(NSPoint)hotSpot;
@end
@implementation NSCursor (WebCoreCursorAdditions)
-+ (NSCursor *)_WebCore_linkCursor
++ (NSCursor *)_WebCore_cursorWithName:(NSString *)name hotSpot:(NSPoint)hotSpot
{
- static NSCursor *linkCursor = nil;
+ static NSMutableDictionary *nameToCursor = nil;
+ if (!nameToCursor) {
+ nameToCursor = [[NSMutableDictionary alloc] init];
+ }
- if (linkCursor == nil) {
- NSImage *linkCursorImage = [[NSImage alloc] initWithContentsOfFile:
+ NSCursor *cursor = [nameToCursor objectForKey:name];
+ if (!cursor) {
+ NSImage *cursorImage = [[NSImage alloc] initWithContentsOfFile:
[[NSBundle bundleForClass:[KWQKCursorBundleDummy class]]
- pathForResource:@"linkCursor" ofType:@"tiff"]];
- linkCursor = [[NSCursor alloc] initWithImage:linkCursorImage hotSpot:NSMakePoint(6.0,1.0)];
- [linkCursorImage release];
+ pathForResource:name ofType:@"tiff"]];
+ if (cursorImage) {
+ cursor = [[NSCursor alloc] initWithImage:cursorImage hotSpot:hotSpot];
+ [cursorImage release];
+ [nameToCursor setObject:cursor forKey:name];
+ [cursor release];
+ }
}
-
- return linkCursor;
+
+ return cursor;
}
@end
@@ -56,13 +64,22 @@
void KCursor::setAutoHideCursor(QWidget *w, bool enable) {}
QCursor KCursor::arrowCursor() { return QCursor(); }
-QCursor KCursor::crossCursor() { return QCursor(); }
-QCursor KCursor::handCursor() { return QCursor([NSCursor _WebCore_linkCursor]); }
-QCursor KCursor::sizeAllCursor() { return QCursor(); }
+QCursor KCursor::crossCursor() { return QCursor([NSCursor crosshairCursor]); }
+QCursor KCursor::handCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"linkCursor" hotSpot:NSMakePoint(6.0, 1.0)]); }
+QCursor KCursor::sizeAllCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"moveCursor" hotSpot:NSMakePoint(7.0, 7.0)]); }
QCursor KCursor::sizeHorCursor() { return QCursor(); }
QCursor KCursor::sizeVerCursor() { return QCursor(); }
QCursor KCursor::sizeBDiagCursor() { return QCursor(); }
QCursor KCursor::sizeFDiagCursor() { return QCursor(); }
QCursor KCursor::ibeamCursor() { return QCursor([NSCursor IBeamCursor]); }
-QCursor KCursor::waitCursor() { return QCursor(); }
-QCursor KCursor::whatsThisCursor() { return QCursor(); }
+QCursor KCursor::waitCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"waitCursor" hotSpot:NSMakePoint(7.0, 7.0)]); }
+QCursor KCursor::whatsThisCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"helpCursor" hotSpot:NSMakePoint(8.0, 8.0)]); }
+
+QCursor KCursor::eastResizeCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"eastResizeCursor" hotSpot:NSMakePoint(14.0, 7.0)]); }
+QCursor KCursor::northResizeCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"northResizeCursor" hotSpot:NSMakePoint(7.0, 1.0)]); }
+QCursor KCursor::northEastResizeCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"northEastResizeCursor" hotSpot:NSMakePoint(14.0, 1.0)]); }
+QCursor KCursor::northWestResizeCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"northWestResizeCursor" hotSpot:NSMakePoint(0.0, 0.0)]); }
+QCursor KCursor::southResizeCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"southResizeCursor" hotSpot:NSMakePoint(7.0, 14.0)]); }
+QCursor KCursor::southEastResizeCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"southEastResizeCursor" hotSpot:NSMakePoint(14.0, 14.0)]); }
+QCursor KCursor::southWestResizeCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"southWestResizeCursor" hotSpot:NSMakePoint(1.0, 14.0)]); }
+QCursor KCursor::westResizeCursor() { return QCursor([NSCursor _WebCore_cursorWithName:@"westResizeCursor" hotSpot:NSMakePoint(1.0, 7.0)]); }
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list