diff options
| -rw-r--r-- | FL/fl_types.h | 3 | ||||
| -rw-r--r-- | ide/Xcode3.1/FLTK.xcodeproj/project.pbxproj | 4 | ||||
| -rw-r--r-- | test/menubar.cxx | 12 | ||||
| -rw-r--r-- | test/utf8.cxx | 10 |
4 files changed, 24 insertions, 5 deletions
diff --git a/FL/fl_types.h b/FL/fl_types.h index e676a621e..d87cd7387 100644 --- a/FL/fl_types.h +++ b/FL/fl_types.h @@ -52,6 +52,9 @@ typedef char *Fl_String; typedef const char *Fl_CString; /** 24-bit Unicode character + 8-bit indicator for keyboard flags */ +typedef unsigned int Fl_Shortcut; + +/** 24-bit Unicode character - upper 8-bits are unused */ typedef unsigned int Fl_Char; /*@}*/ /* group: Miscellaneous */ diff --git a/ide/Xcode3.1/FLTK.xcodeproj/project.pbxproj b/ide/Xcode3.1/FLTK.xcodeproj/project.pbxproj index e1d60772d..9440718d0 100644 --- a/ide/Xcode3.1/FLTK.xcodeproj/project.pbxproj +++ b/ide/Xcode3.1/FLTK.xcodeproj/project.pbxproj @@ -3928,9 +3928,9 @@ C9A3E9590DD6338B00486E4F /* Library Sources */ = { isa = PBXGroup; children = ( - C9A3EAD60DD634CC00486E4F /* Fl_get_system_colors.cxx */, - C9A3EAD70DD634CC00486E4F /* Fl_get_key_win32.cxx */, C9A3EAD80DD634CC00486E4F /* Fl_get_key_mac.cxx */, + C9A3EAD70DD634CC00486E4F /* Fl_get_key_win32.cxx */, + C9A3EAD60DD634CC00486E4F /* Fl_get_system_colors.cxx */, C9A3EAD90DD634CC00486E4F /* Fl_get_key.cxx */, C9A3EADA0DD634CC00486E4F /* fl_font_xft.cxx */, C9A3EADB0DD634CC00486E4F /* fl_font_x.cxx */, diff --git a/test/menubar.cxx b/test/menubar.cxx index eb80dd43b..6149a7ada 100644 --- a/test/menubar.cxx +++ b/test/menubar.cxx @@ -141,6 +141,16 @@ Fl_Menu_Item menutable[] = { {"Shadow", 0, 0, 0, 0, FL_SHADOW_LABEL}, {"@->", 0, 0, 0, 0, FL_SYMBOL_LABEL}, {0}, + {"&International",0,0,0,FL_SUBMENU}, + {"Sharp Ess",0x0000df}, + {"A Umlaut",0x0000c4}, + {"a Umlaut",0x0000e4}, + {"Euro currency",0x0020ac}, + {"the &ü Umlaut"}, + {"the capital &Ü"}, + {"convert ¥ to &£"}, + {"convert £ to &¥"}, + {0}, {"E&mpty",0,0,0,FL_SUBMENU}, {0}, {"&Inactive", 0, 0, 0, FL_MENU_INACTIVE|FL_SUBMENU}, @@ -167,7 +177,7 @@ Fl_Menu_Item pulldown[] = { {0} }; -#define WIDTH 600 +#define WIDTH 700 Fl_Menu_* menus[4]; diff --git a/test/utf8.cxx b/test/utf8.cxx index 40eb12c90..ee418b44b 100644 --- a/test/utf8.cxx +++ b/test/utf8.cxx @@ -490,9 +490,10 @@ public: case FL_DND_RELEASE: return 1; case FL_PASTE: { + static const char lut[] = "0123456789abcdef"; const char *t = Fl::event_text(); int i, n; - fl_utf8decode(t, t+Fl::event_length(), &n); + unsigned int ucode = fl_utf8decode(t, t+Fl::event_length(), &n); if (n==0) { value(""); return 1; @@ -501,10 +502,15 @@ public: for (i=0; i<n; i++) *d++ = t[i]; *d++ = ' '; for (i=0; i<n; i++) { - const char lut[] = "0123456789abcdef"; *d++ = '\\'; *d++ = 'x'; *d++ = lut[(t[i]>>4)&0x0f]; *d++ = lut[t[i]&0x0f]; } + *d++ = ' '; + *d++ = '0'; + *d++ = 'x'; + *d++ = lut[(ucode>>20)&0x0f]; *d++ = lut[(ucode>>16)&0x0f]; + *d++ = lut[(ucode>>12)&0x0f]; *d++ = lut[(ucode>>8)&0x0f]; + *d++ = lut[(ucode>>4)&0x0f]; *d++ = lut[ucode&0x0f]; *d++ = 0; value(buffer); } |