From c2c315e11feb622194be0a9c8de7e4852a831d55 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Thu, 16 Jun 2011 00:04:24 +0200 Subject: [PATCH] ZynAddSubFX/FLTK: updated to SVN revision 8805 Updated FLTK to SVN revision 8805 of branch-1.3. --- plugins/zynaddsubfx/fltk/FL/Enumerations.H | 555 +- plugins/zynaddsubfx/fltk/FL/Fl.H | 299 +- plugins/zynaddsubfx/fltk/FL/Fl_Adjuster.H | 10 +- plugins/zynaddsubfx/fltk/FL/Fl_Bitmap.H | 6 +- plugins/zynaddsubfx/fltk/FL/Fl_Box.H | 6 +- plugins/zynaddsubfx/fltk/FL/Fl_Browser.H | 8 +- plugins/zynaddsubfx/fltk/FL/Fl_Browser_.H | 12 +- plugins/zynaddsubfx/fltk/FL/Fl_Button.H | 12 +- plugins/zynaddsubfx/fltk/FL/Fl_Chart.H | 10 +- .../zynaddsubfx/fltk/FL/Fl_Check_Browser.H | 6 +- plugins/zynaddsubfx/fltk/FL/Fl_Check_Button.H | 10 +- plugins/zynaddsubfx/fltk/FL/Fl_Choice.H | 10 +- plugins/zynaddsubfx/fltk/FL/Fl_Clock.H | 22 +- .../zynaddsubfx/fltk/FL/Fl_Color_Chooser.H | 26 +- plugins/zynaddsubfx/fltk/FL/Fl_Counter.H | 10 +- plugins/zynaddsubfx/fltk/FL/Fl_Device.H | 326 +- plugins/zynaddsubfx/fltk/FL/Fl_Dial.H | 10 +- .../zynaddsubfx/fltk/FL/Fl_Double_Window.H | 6 +- plugins/zynaddsubfx/fltk/FL/Fl_Export.H | 8 +- plugins/zynaddsubfx/fltk/FL/Fl_File_Browser.H | 10 +- plugins/zynaddsubfx/fltk/FL/Fl_File_Chooser.H | 26 +- plugins/zynaddsubfx/fltk/FL/Fl_File_Icon.H | 10 +- plugins/zynaddsubfx/fltk/FL/Fl_File_Input.H | 22 +- plugins/zynaddsubfx/fltk/FL/Fl_Fill_Dial.H | 8 +- plugins/zynaddsubfx/fltk/FL/Fl_Fill_Slider.H | 8 +- plugins/zynaddsubfx/fltk/FL/Fl_Float_Input.H | 17 +- plugins/zynaddsubfx/fltk/FL/Fl_FormsBitmap.H | 6 +- plugins/zynaddsubfx/fltk/FL/Fl_FormsPixmap.H | 6 +- plugins/zynaddsubfx/fltk/FL/Fl_Free.H | 6 +- plugins/zynaddsubfx/fltk/FL/Fl_Group.H | 22 +- plugins/zynaddsubfx/fltk/FL/Fl_Help_Dialog.H | 10 +- plugins/zynaddsubfx/fltk/FL/Fl_Help_View.H | 30 +- plugins/zynaddsubfx/fltk/FL/Fl_Hold_Browser.H | 16 +- .../zynaddsubfx/fltk/FL/Fl_Hor_Fill_Slider.H | 8 +- .../zynaddsubfx/fltk/FL/Fl_Hor_Nice_Slider.H | 8 +- plugins/zynaddsubfx/fltk/FL/Fl_Hor_Slider.H | 26 +- .../zynaddsubfx/fltk/FL/Fl_Hor_Value_Slider.H | 8 +- plugins/zynaddsubfx/fltk/FL/Fl_Image.H | 71 +- plugins/zynaddsubfx/fltk/FL/Fl_Input.H | 433 +- plugins/zynaddsubfx/fltk/FL/Fl_Input_.H | 88 +- plugins/zynaddsubfx/fltk/FL/Fl_Input_Choice.H | 8 +- plugins/zynaddsubfx/fltk/FL/Fl_Int_Input.H | 20 +- plugins/zynaddsubfx/fltk/FL/Fl_Light_Button.H | 12 +- plugins/zynaddsubfx/fltk/FL/Fl_Line_Dial.H | 8 +- plugins/zynaddsubfx/fltk/FL/Fl_Menu.H | 6 +- plugins/zynaddsubfx/fltk/FL/Fl_Menu_.H | 21 +- plugins/zynaddsubfx/fltk/FL/Fl_Menu_Bar.H | 10 +- plugins/zynaddsubfx/fltk/FL/Fl_Menu_Button.H | 32 +- plugins/zynaddsubfx/fltk/FL/Fl_Menu_Item.H | 132 +- plugins/zynaddsubfx/fltk/FL/Fl_Menu_Window.H | 6 +- .../zynaddsubfx/fltk/FL/Fl_Multi_Browser.H | 12 +- plugins/zynaddsubfx/fltk/FL/Fl_Multi_Label.H | 6 +- .../zynaddsubfx/fltk/FL/Fl_Multiline_Input.H | 25 +- .../zynaddsubfx/fltk/FL/Fl_Multiline_Output.H | 24 +- .../fltk/FL/Fl_Native_File_Chooser.H | 266 +- .../fltk/FL/Fl_Native_File_Chooser_FLTK.H | 142 - .../fltk/FL/Fl_Native_File_Chooser_MAC.H | 122 - .../fltk/FL/Fl_Native_File_Chooser_WIN32.H | 120 - plugins/zynaddsubfx/fltk/FL/Fl_Nice_Slider.H | 8 +- plugins/zynaddsubfx/fltk/FL/Fl_Object.H | 6 +- plugins/zynaddsubfx/fltk/FL/Fl_Output.H | 41 +- .../zynaddsubfx/fltk/FL/Fl_Overlay_Window.H | 6 +- plugins/zynaddsubfx/fltk/FL/Fl_Pack.H | 6 +- plugins/zynaddsubfx/fltk/FL/Fl_Paged_Device.H | 107 +- plugins/zynaddsubfx/fltk/FL/Fl_Pixmap.H | 6 +- plugins/zynaddsubfx/fltk/FL/Fl_Plugin.H | 8 +- plugins/zynaddsubfx/fltk/FL/Fl_Positioner.H | 10 +- plugins/zynaddsubfx/fltk/FL/Fl_PostScript.H | 190 +- plugins/zynaddsubfx/fltk/FL/Fl_Preferences.H | 43 +- plugins/zynaddsubfx/fltk/FL/Fl_Printer.H | 162 +- plugins/zynaddsubfx/fltk/FL/Fl_Progress.H | 10 +- plugins/zynaddsubfx/fltk/FL/Fl_RGB_Image.H | 6 +- plugins/zynaddsubfx/fltk/FL/Fl_Radio_Button.H | 8 +- .../fltk/FL/Fl_Radio_Light_Button.H | 8 +- .../fltk/FL/Fl_Radio_Round_Button.H | 8 +- .../zynaddsubfx/fltk/FL/Fl_Repeat_Button.H | 6 +- .../zynaddsubfx/fltk/FL/Fl_Return_Button.H | 10 +- plugins/zynaddsubfx/fltk/FL/Fl_Roller.H | 10 +- plugins/zynaddsubfx/fltk/FL/Fl_Round_Button.H | 10 +- plugins/zynaddsubfx/fltk/FL/Fl_Round_Clock.H | 8 +- plugins/zynaddsubfx/fltk/FL/Fl_Scroll.H | 10 +- plugins/zynaddsubfx/fltk/FL/Fl_Scrollbar.H | 10 +- plugins/zynaddsubfx/fltk/FL/Fl_Secret_Input.H | 24 +- .../zynaddsubfx/fltk/FL/Fl_Select_Browser.H | 20 +- plugins/zynaddsubfx/fltk/FL/Fl_Shared_Image.H | 12 +- .../zynaddsubfx/fltk/FL/Fl_Simple_Counter.H | 12 +- .../zynaddsubfx/fltk/FL/Fl_Single_Window.H | 6 +- plugins/zynaddsubfx/fltk/FL/Fl_Slider.H | 10 +- plugins/zynaddsubfx/fltk/FL/Fl_Spinner.H | 24 +- plugins/zynaddsubfx/fltk/FL/Fl_Sys_Menu_Bar.H | 6 +- plugins/zynaddsubfx/fltk/FL/Fl_Table.H | 250 +- plugins/zynaddsubfx/fltk/FL/Fl_Table_Row.H | 18 +- plugins/zynaddsubfx/fltk/FL/Fl_Tabs.H | 18 +- plugins/zynaddsubfx/fltk/FL/Fl_Text_Buffer.H | 496 +- plugins/zynaddsubfx/fltk/FL/Fl_Text_Display.H | 724 +- plugins/zynaddsubfx/fltk/FL/Fl_Text_Editor.H | 6 +- plugins/zynaddsubfx/fltk/FL/Fl_Tile.H | 10 +- plugins/zynaddsubfx/fltk/FL/Fl_Tiled_Image.H | 6 +- plugins/zynaddsubfx/fltk/FL/Fl_Timer.H | 6 +- .../zynaddsubfx/fltk/FL/Fl_Toggle_Button.H | 8 +- .../fltk/FL/Fl_Toggle_Light_Button.H | 6 +- .../fltk/FL/Fl_Toggle_Round_Button.H | 6 +- plugins/zynaddsubfx/fltk/FL/Fl_Tooltip.H | 21 +- plugins/zynaddsubfx/fltk/FL/Fl_Tree.H | 725 +- plugins/zynaddsubfx/fltk/FL/Fl_Tree_Item.H | 46 +- .../zynaddsubfx/fltk/FL/Fl_Tree_Item_Array.H | 12 +- plugins/zynaddsubfx/fltk/FL/Fl_Tree_Prefs.H | 74 +- plugins/zynaddsubfx/fltk/FL/Fl_Valuator.H | 10 +- plugins/zynaddsubfx/fltk/FL/Fl_Value_Input.H | 44 +- plugins/zynaddsubfx/fltk/FL/Fl_Value_Output.H | 10 +- plugins/zynaddsubfx/fltk/FL/Fl_Value_Slider.H | 10 +- plugins/zynaddsubfx/fltk/FL/Fl_Widget.H | 145 +- plugins/zynaddsubfx/fltk/FL/Fl_Window.H | 99 +- plugins/zynaddsubfx/fltk/FL/Fl_Wizard.H | 10 +- plugins/zynaddsubfx/fltk/FL/Fl_XBM_Image.H | 6 +- plugins/zynaddsubfx/fltk/FL/Fl_XPM_Image.H | 6 +- plugins/zynaddsubfx/fltk/FL/Xutf8.h | 65 +- plugins/zynaddsubfx/fltk/FL/dirent.h | 8 +- plugins/zynaddsubfx/fltk/FL/filename.H | 26 +- plugins/zynaddsubfx/fltk/FL/fl_ask.H | 15 +- plugins/zynaddsubfx/fltk/FL/fl_draw.H | 298 +- plugins/zynaddsubfx/fltk/FL/fl_message.H | 6 +- .../zynaddsubfx/fltk/FL/fl_show_colormap.H | 27 +- plugins/zynaddsubfx/fltk/FL/fl_show_input.H | 6 +- plugins/zynaddsubfx/fltk/FL/fl_types.h | 6 +- plugins/zynaddsubfx/fltk/FL/fl_utf8.h | 14 +- plugins/zynaddsubfx/fltk/FL/mac.H | 173 +- plugins/zynaddsubfx/fltk/FL/math.h | 6 +- plugins/zynaddsubfx/fltk/FL/names.h | 6 +- plugins/zynaddsubfx/fltk/FL/win32.H | 51 +- plugins/zynaddsubfx/fltk/FL/x.H | 100 +- plugins/zynaddsubfx/fltk/src/CMakeLists.txt | 32 +- plugins/zynaddsubfx/fltk/src/Fl.cxx | 636 +- plugins/zynaddsubfx/fltk/src/Fl_Adjuster.cxx | 6 +- plugins/zynaddsubfx/fltk/src/Fl_Bitmap.cxx | 10 +- plugins/zynaddsubfx/fltk/src/Fl_Box.cxx | 6 +- plugins/zynaddsubfx/fltk/src/Fl_Browser.cxx | 45 +- plugins/zynaddsubfx/fltk/src/Fl_Browser_.cxx | 6 +- .../zynaddsubfx/fltk/src/Fl_Browser_load.cxx | 6 +- plugins/zynaddsubfx/fltk/src/Fl_Button.cxx | 57 +- plugins/zynaddsubfx/fltk/src/Fl_Chart.cxx | 6 +- .../zynaddsubfx/fltk/src/Fl_Check_Browser.cxx | 17 +- .../zynaddsubfx/fltk/src/Fl_Check_Button.cxx | 4 +- plugins/zynaddsubfx/fltk/src/Fl_Choice.cxx | 6 +- plugins/zynaddsubfx/fltk/src/Fl_Clock.cxx | 6 +- .../zynaddsubfx/fltk/src/Fl_Color_Chooser.cxx | 37 +- plugins/zynaddsubfx/fltk/src/Fl_Counter.cxx | 6 +- plugins/zynaddsubfx/fltk/src/Fl_Device.cxx | 56 +- plugins/zynaddsubfx/fltk/src/Fl_Dial.cxx | 6 +- .../zynaddsubfx/fltk/src/Fl_Double_Window.cxx | 88 +- .../zynaddsubfx/fltk/src/Fl_File_Browser.cxx | 8 +- .../zynaddsubfx/fltk/src/Fl_File_Chooser.cxx | 138 +- .../zynaddsubfx/fltk/src/Fl_File_Chooser.fl | 33 +- .../zynaddsubfx/fltk/src/Fl_File_Chooser2.cxx | 178 +- plugins/zynaddsubfx/fltk/src/Fl_File_Icon.cxx | 6 +- .../zynaddsubfx/fltk/src/Fl_File_Input.cxx | 9 +- plugins/zynaddsubfx/fltk/src/Fl_Font.H | 25 +- .../zynaddsubfx/fltk/src/Fl_GDI_Printer.cxx | 37 +- plugins/zynaddsubfx/fltk/src/Fl_Gl_Choice.H | 6 +- plugins/zynaddsubfx/fltk/src/Fl_Group.cxx | 151 +- .../zynaddsubfx/fltk/src/Fl_Help_Dialog.fl | 6 +- plugins/zynaddsubfx/fltk/src/Fl_Help_View.cxx | 20 +- plugins/zynaddsubfx/fltk/src/Fl_Image.cxx | 13 +- plugins/zynaddsubfx/fltk/src/Fl_Input.cxx | 789 ++- plugins/zynaddsubfx/fltk/src/Fl_Input_.cxx | 28 +- .../zynaddsubfx/fltk/src/Fl_Light_Button.cxx | 6 +- plugins/zynaddsubfx/fltk/src/Fl_Menu.cxx | 138 +- plugins/zynaddsubfx/fltk/src/Fl_Menu_.cxx | 6 +- plugins/zynaddsubfx/fltk/src/Fl_Menu_Bar.cxx | 8 +- .../zynaddsubfx/fltk/src/Fl_Menu_Button.cxx | 6 +- .../zynaddsubfx/fltk/src/Fl_Menu_Window.cxx | 8 +- plugins/zynaddsubfx/fltk/src/Fl_Menu_add.cxx | 58 +- .../zynaddsubfx/fltk/src/Fl_Menu_global.cxx | 6 +- .../zynaddsubfx/fltk/src/Fl_Multi_Label.cxx | 6 +- .../fltk/src/Fl_Native_File_Chooser.cxx | 10 +- .../fltk/src/Fl_Native_File_Chooser_FLTK.cxx | 50 +- ..._MAC.cxx => Fl_Native_File_Chooser_MAC.mm} | 125 +- .../fltk/src/Fl_Native_File_Chooser_WIN32.cxx | 21 +- .../src/Fl_Native_File_Chooser_common.cxx | 8 +- .../fltk/src/Fl_Overlay_Window.cxx | 8 +- plugins/zynaddsubfx/fltk/src/Fl_Pack.cxx | 6 +- .../zynaddsubfx/fltk/src/Fl_Paged_Device.cxx | 144 +- plugins/zynaddsubfx/fltk/src/Fl_Pixmap.cxx | 10 +- .../zynaddsubfx/fltk/src/Fl_Positioner.cxx | 6 +- .../zynaddsubfx/fltk/src/Fl_PostScript.cxx | 607 +- .../zynaddsubfx/fltk/src/Fl_Preferences.cxx | 627 +- plugins/zynaddsubfx/fltk/src/Fl_Printer.cxx | 122 +- plugins/zynaddsubfx/fltk/src/Fl_Progress.cxx | 6 +- .../zynaddsubfx/fltk/src/Fl_Repeat_Button.cxx | 6 +- .../zynaddsubfx/fltk/src/Fl_Return_Button.cxx | 7 +- plugins/zynaddsubfx/fltk/src/Fl_Roller.cxx | 6 +- .../zynaddsubfx/fltk/src/Fl_Round_Button.cxx | 6 +- plugins/zynaddsubfx/fltk/src/Fl_Scroll.cxx | 31 +- plugins/zynaddsubfx/fltk/src/Fl_Scrollbar.cxx | 6 +- .../zynaddsubfx/fltk/src/Fl_Shared_Image.cxx | 31 +- .../zynaddsubfx/fltk/src/Fl_Single_Window.cxx | 6 +- plugins/zynaddsubfx/fltk/src/Fl_Slider.cxx | 29 +- plugins/zynaddsubfx/fltk/src/Fl_Table.cxx | 69 +- plugins/zynaddsubfx/fltk/src/Fl_Table_Row.cxx | 25 +- plugins/zynaddsubfx/fltk/src/Fl_Tabs.cxx | 201 +- .../zynaddsubfx/fltk/src/Fl_Text_Buffer.cxx | 2077 ++---- .../zynaddsubfx/fltk/src/Fl_Text_Display.cxx | 4197 ++++++----- .../zynaddsubfx/fltk/src/Fl_Text_Editor.cxx | 74 +- plugins/zynaddsubfx/fltk/src/Fl_Tile.cxx | 14 +- .../zynaddsubfx/fltk/src/Fl_Tiled_Image.cxx | 6 +- plugins/zynaddsubfx/fltk/src/Fl_Tooltip.cxx | 107 +- plugins/zynaddsubfx/fltk/src/Fl_Tree.cxx | 876 ++- plugins/zynaddsubfx/fltk/src/Fl_Tree_Item.cxx | 230 +- .../fltk/src/Fl_Tree_Item_Array.cxx | 6 +- .../zynaddsubfx/fltk/src/Fl_Tree_Prefs.cxx | 12 +- plugins/zynaddsubfx/fltk/src/Fl_Valuator.cxx | 6 +- .../zynaddsubfx/fltk/src/Fl_Value_Input.cxx | 6 +- .../zynaddsubfx/fltk/src/Fl_Value_Output.cxx | 6 +- .../zynaddsubfx/fltk/src/Fl_Value_Slider.cxx | 6 +- plugins/zynaddsubfx/fltk/src/Fl_Widget.cxx | 7 +- plugins/zynaddsubfx/fltk/src/Fl_Window.cxx | 119 +- .../fltk/src/Fl_Window_fullscreen.cxx | 15 +- .../fltk/src/Fl_Window_hotspot.cxx | 6 +- .../fltk/src/Fl_Window_iconize.cxx | 8 +- plugins/zynaddsubfx/fltk/src/Fl_Wizard.cxx | 6 +- plugins/zynaddsubfx/fltk/src/Fl_XBM_Image.cxx | 6 +- plugins/zynaddsubfx/fltk/src/Fl_XColor.H | 6 +- plugins/zynaddsubfx/fltk/src/Fl_XPM_Image.cxx | 8 +- plugins/zynaddsubfx/fltk/src/Fl_abort.cxx | 6 +- plugins/zynaddsubfx/fltk/src/Fl_add_idle.cxx | 6 +- plugins/zynaddsubfx/fltk/src/Fl_arg.cxx | 225 +- plugins/zynaddsubfx/fltk/src/Fl_compose.cxx | 264 +- plugins/zynaddsubfx/fltk/src/Fl_display.cxx | 6 +- plugins/zynaddsubfx/fltk/src/Fl_get_key.cxx | 6 +- .../zynaddsubfx/fltk/src/Fl_get_key_mac.cxx | 40 +- .../zynaddsubfx/fltk/src/Fl_get_key_win32.cxx | 6 +- .../fltk/src/Fl_get_system_colors.cxx | 6 +- plugins/zynaddsubfx/fltk/src/Fl_grab.cxx | 9 +- plugins/zynaddsubfx/fltk/src/Fl_lock.cxx | 62 +- plugins/zynaddsubfx/fltk/src/Fl_mac.cxx | 6 +- .../zynaddsubfx/fltk/src/Fl_own_colormap.cxx | 6 +- plugins/zynaddsubfx/fltk/src/Fl_visual.cxx | 6 +- plugins/zynaddsubfx/fltk/src/Fl_win32.cxx | 207 +- plugins/zynaddsubfx/fltk/src/Fl_x.cxx | 453 +- plugins/zynaddsubfx/fltk/src/aimm.h | 6 +- .../fltk/src/filename_absolute.cxx | 64 +- .../zynaddsubfx/fltk/src/filename_expand.cxx | 6 +- plugins/zynaddsubfx/fltk/src/filename_ext.cxx | 6 +- .../zynaddsubfx/fltk/src/filename_isdir.cxx | 8 +- .../zynaddsubfx/fltk/src/filename_list.cxx | 132 +- .../zynaddsubfx/fltk/src/filename_match.cxx | 6 +- .../zynaddsubfx/fltk/src/filename_setext.cxx | 8 +- plugins/zynaddsubfx/fltk/src/fl_arc.cxx | 6 +- plugins/zynaddsubfx/fltk/src/fl_arci.cxx | 6 +- plugins/zynaddsubfx/fltk/src/fl_ask.cxx | 183 +- plugins/zynaddsubfx/fltk/src/fl_boxtype.cxx | 22 +- plugins/zynaddsubfx/fltk/src/fl_call_main.c | 6 +- plugins/zynaddsubfx/fltk/src/fl_color.cxx | 36 +- plugins/zynaddsubfx/fltk/src/fl_color_mac.cxx | 16 +- .../zynaddsubfx/fltk/src/fl_color_win32.cxx | 16 +- plugins/zynaddsubfx/fltk/src/fl_cursor.cxx | 28 +- plugins/zynaddsubfx/fltk/src/fl_curve.cxx | 6 +- .../zynaddsubfx/fltk/src/fl_diamond_box.cxx | 6 +- plugins/zynaddsubfx/fltk/src/fl_dnd.cxx | 8 +- plugins/zynaddsubfx/fltk/src/fl_dnd_mac.cxx | 58 - plugins/zynaddsubfx/fltk/src/fl_dnd_win32.cxx | 100 +- plugins/zynaddsubfx/fltk/src/fl_dnd_x.cxx | 11 +- plugins/zynaddsubfx/fltk/src/fl_draw.cxx | 20 +- .../zynaddsubfx/fltk/src/fl_draw_image.cxx | 24 +- .../fltk/src/fl_draw_image_mac.cxx | 47 +- .../fltk/src/fl_draw_image_win32.cxx | 24 +- .../zynaddsubfx/fltk/src/fl_draw_pixmap.cxx | 12 +- .../fltk/src/fl_encoding_latin1.cxx | 6 +- .../fltk/src/fl_encoding_mac_roman.cxx | 6 +- .../fltk/src/fl_engraved_label.cxx | 6 +- plugins/zynaddsubfx/fltk/src/fl_file_dir.cxx | 30 +- plugins/zynaddsubfx/fltk/src/fl_font.cxx | 24 +- plugins/zynaddsubfx/fltk/src/fl_font_mac.cxx | 340 +- .../zynaddsubfx/fltk/src/fl_font_win32.cxx | 289 +- plugins/zynaddsubfx/fltk/src/fl_font_x.cxx | 118 +- plugins/zynaddsubfx/fltk/src/fl_font_xft.cxx | 281 +- plugins/zynaddsubfx/fltk/src/fl_gtk.cxx | 6 +- plugins/zynaddsubfx/fltk/src/fl_labeltype.cxx | 6 +- .../zynaddsubfx/fltk/src/fl_line_style.cxx | 17 +- plugins/zynaddsubfx/fltk/src/fl_open_uri.cxx | 14 +- plugins/zynaddsubfx/fltk/src/fl_oval_box.cxx | 6 +- plugins/zynaddsubfx/fltk/src/fl_overlay.cxx | 6 +- .../fltk/src/fl_overlay_visual.cxx | 6 +- plugins/zynaddsubfx/fltk/src/fl_plastic.cxx | 66 +- .../zynaddsubfx/fltk/src/fl_read_image.cxx | 14 +- .../fltk/src/fl_read_image_mac.cxx | 11 +- .../fltk/src/fl_read_image_win32.cxx | 95 +- plugins/zynaddsubfx/fltk/src/fl_rect.cxx | 226 +- plugins/zynaddsubfx/fltk/src/fl_round_box.cxx | 10 +- .../zynaddsubfx/fltk/src/fl_rounded_box.cxx | 6 +- .../zynaddsubfx/fltk/src/fl_scroll_area.cxx | 9 +- plugins/zynaddsubfx/fltk/src/fl_set_font.cxx | 6 +- plugins/zynaddsubfx/fltk/src/fl_set_fonts.cxx | 6 +- .../zynaddsubfx/fltk/src/fl_set_fonts_mac.cxx | 31 +- .../fltk/src/fl_set_fonts_win32.cxx | 6 +- .../zynaddsubfx/fltk/src/fl_set_fonts_x.cxx | 8 +- .../zynaddsubfx/fltk/src/fl_set_fonts_xft.cxx | 8 +- .../zynaddsubfx/fltk/src/fl_shadow_box.cxx | 6 +- plugins/zynaddsubfx/fltk/src/fl_shortcut.cxx | 97 +- .../zynaddsubfx/fltk/src/fl_show_colormap.cxx | 6 +- plugins/zynaddsubfx/fltk/src/fl_symbols.cxx | 6 +- plugins/zynaddsubfx/fltk/src/fl_utf.c | 170 +- plugins/zynaddsubfx/fltk/src/fl_utf8.cxx | 57 +- plugins/zynaddsubfx/fltk/src/fl_vertex.cxx | 126 +- plugins/zynaddsubfx/fltk/src/flstring.c | 6 +- plugins/zynaddsubfx/fltk/src/flstring.h | 6 +- plugins/zynaddsubfx/fltk/src/numericsort.c | 10 +- plugins/zynaddsubfx/fltk/src/print_panel.cxx | 9 +- plugins/zynaddsubfx/fltk/src/print_panel.h | 6 +- plugins/zynaddsubfx/fltk/src/ps_image.cxx | 196 +- plugins/zynaddsubfx/fltk/src/scandir.c | 5 +- plugins/zynaddsubfx/fltk/src/scandir_win32.c | 18 +- plugins/zynaddsubfx/fltk/src/screen_xywh.cxx | 265 +- plugins/zynaddsubfx/fltk/src/vsnprintf.c | 6 +- plugins/zynaddsubfx/fltk/src/xutf8/README | 1 + plugins/zynaddsubfx/fltk/src/xutf8/case.c | 5 +- .../fltk/src/xutf8/is_right2left.c | 2 +- .../zynaddsubfx/fltk/src/xutf8/is_spacing.c | 2 +- .../fltk/src/xutf8/lcUniConv/README | 2 +- .../fltk/src/xutf8/lcUniConv/big5.h | 5 +- .../fltk/src/xutf8/lcUniConv/cp1251.h | 4 + .../fltk/src/xutf8/lcUniConv/cp936ext.h | 6259 +++++++++++++++++ .../fltk/src/xutf8/lcUniConv/gb2312.h | 5 +- .../fltk/src/xutf8/lcUniConv/gbk_tab_to_h.c | 1020 +++ .../fltk/src/xutf8/lcUniConv/iso8859_10.h | 4 + .../fltk/src/xutf8/lcUniConv/iso8859_11.h | 4 + .../fltk/src/xutf8/lcUniConv/iso8859_13.h | 4 + .../fltk/src/xutf8/lcUniConv/iso8859_14.h | 4 + .../fltk/src/xutf8/lcUniConv/iso8859_15.h | 4 + .../fltk/src/xutf8/lcUniConv/iso8859_2.h | 6 + .../fltk/src/xutf8/lcUniConv/iso8859_3.h | 4 + .../fltk/src/xutf8/lcUniConv/iso8859_4.h | 4 + .../fltk/src/xutf8/lcUniConv/iso8859_5.h | 4 + .../fltk/src/xutf8/lcUniConv/iso8859_6.h | 4 + .../fltk/src/xutf8/lcUniConv/iso8859_7.h | 4 + .../fltk/src/xutf8/lcUniConv/iso8859_8.h | 4 + .../fltk/src/xutf8/lcUniConv/iso8859_9.h | 4 + .../fltk/src/xutf8/lcUniConv/jisx0201.h | 5 + .../fltk/src/xutf8/lcUniConv/jisx0208.h | 4 + .../fltk/src/xutf8/lcUniConv/jisx0212.h | 4 + .../fltk/src/xutf8/lcUniConv/koi8_r.h | 4 + .../fltk/src/xutf8/lcUniConv/koi8_u.h | 5 +- .../fltk/src/xutf8/lcUniConv/ksc5601.h | 5 +- .../zynaddsubfx/fltk/src/xutf8/ucs2fontmap.c | 14 +- .../zynaddsubfx/fltk/src/xutf8/utf8Input.c | 55 +- plugins/zynaddsubfx/fltk/src/xutf8/utf8Wrap.c | 340 +- 346 files changed, 22057 insertions(+), 10836 deletions(-) delete mode 100644 plugins/zynaddsubfx/fltk/FL/Fl_Native_File_Chooser_FLTK.H delete mode 100644 plugins/zynaddsubfx/fltk/FL/Fl_Native_File_Chooser_MAC.H delete mode 100644 plugins/zynaddsubfx/fltk/FL/Fl_Native_File_Chooser_WIN32.H rename plugins/zynaddsubfx/fltk/src/{Fl_Native_File_Chooser_MAC.cxx => Fl_Native_File_Chooser_MAC.mm} (87%) delete mode 100644 plugins/zynaddsubfx/fltk/src/fl_dnd_mac.cxx create mode 100644 plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/cp936ext.h create mode 100644 plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/gbk_tab_to_h.c diff --git a/plugins/zynaddsubfx/fltk/FL/Enumerations.H b/plugins/zynaddsubfx/fltk/FL/Enumerations.H index 53c32e0a2..093422bfd 100644 --- a/plugins/zynaddsubfx/fltk/FL/Enumerations.H +++ b/plugins/zynaddsubfx/fltk/FL/Enumerations.H @@ -1,9 +1,9 @@ // -// "$Id: Enumerations.H 7476 2010-04-09 22:18:05Z matt $" +// "$Id: Enumerations.H 8710 2011-05-21 21:55:59Z manolo $" // // Enumerations for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -26,7 +26,7 @@ // /** \file - * This file contains type definitions and general enumerations. + This file contains type definitions and general enumerations. */ #ifndef Fl_Enumerations_H @@ -45,39 +45,35 @@ /*@{*/ /** - * The major release version of this FLTK library. + The major release version of this FLTK library. \sa FL_VERSION */ #define FL_MAJOR_VERSION 1 /** - * The minor release version for this library. - * - * FLTK remains mostly source-code compatible between minor version changes. + The minor release version for this library. + + FLTK remains mostly source-code compatible between minor version changes. */ #define FL_MINOR_VERSION 3 /** - * The patch version for this library. - * - * FLTK remains binary compatible between patches. + The patch version for this library. + + FLTK remains binary compatible between patches. */ #define FL_PATCH_VERSION 0 /** - * The FLTK version number as a \em double. - * - * This is changed slightly from the beta versions - * because the old "const double" definition would not allow for conditional - * compilation... - * - * FL_VERSION is a double that describes the major and minor version numbers. - * Version 1.1 is actually stored as 1.01 to allow for more than 9 minor - * releases. - * - * The FL_MAJOR_VERSION, FL_MINOR_VERSION, and FL_PATCH_VERSION constants - * give the integral values for the major, minor, and patch releases - * respectively. + The FLTK version number as a \em double. + + FL_VERSION is a double that describes the major and minor version numbers. + Version 1.1 is actually stored as 1.01 to allow for more than 9 minor + releases. + + The FL_MAJOR_VERSION, FL_MINOR_VERSION, and FL_PATCH_VERSION constants + give the integral values for the major, minor, and patch releases + respectively. */ #define FL_VERSION ((double)FL_MAJOR_VERSION + \ (double)FL_MINOR_VERSION * 0.01 + \ @@ -86,203 +82,205 @@ /*@}*/ // group: Version Numbers /** - * Every time a user moves the mouse pointer, clicks a button, - * or presses a key, an event is generated and sent to your - * application. Events can also come from other programs like the - * window manager. - * - * Events are identified by the integer argument passed to the - * Fl_Widget::handle() virtual method. Other information about the - * most recent event is stored in static locations and acquired by - * calling the Fl::event_*() methods. This static information remains - * valid until the next event is read from the window system, so it - * is ok to look at it outside of the handle() method. - * - * \sa Fl::event_text(), Fl::event_key(), class Fl:: + Every time a user moves the mouse pointer, clicks a button, + or presses a key, an event is generated and sent to your + application. Events can also come from other programs like the + window manager. + + Events are identified by the integer argument passed to the + Fl_Widget::handle() virtual method. Other information about the + most recent event is stored in static locations and acquired by + calling the Fl::event_*() methods. This static information remains + valid until the next event is read from the window system, so it + is ok to look at it outside of the handle() method. + + \sa Fl::event_text(), Fl::event_key(), class Fl:: */ enum Fl_Event { // events /** No event. */ FL_NO_EVENT = 0, /** A mouse button has gone down with the mouse pointing at this - * widget. You can find out what button by calling Fl::event_button(). - * You find out the mouse position by calling Fl::event_x() and - * Fl::event_y(). - * - * A widget indicates that it "wants" the mouse click by returning non-zero - * from its Fl_Widget::handle() method. It will then become the - * Fl::pushed() widget and will get FL_DRAG and the matching FL_RELEASE events. - * If Fl_Widget::handle() returns zero then FLTK will try sending the FL_PUSH - * to another widget. + widget. You can find out what button by calling Fl::event_button(). + You find out the mouse position by calling Fl::event_x() and + Fl::event_y(). + + A widget indicates that it "wants" the mouse click by returning non-zero + from its Fl_Widget::handle() method. It will then become the + Fl::pushed() widget and will get FL_DRAG and the matching FL_RELEASE events. + If Fl_Widget::handle() returns zero then FLTK will try sending the FL_PUSH + to another widget. */ FL_PUSH = 1, /** A mouse button has been released. You can find out what button by - * calling Fl::event_button(). - * - * In order to receive the FL_RELEASE event, the widget must return - * non-zero when handling FL_PUSH. + calling Fl::event_button(). + + In order to receive the FL_RELEASE event, the widget must return + non-zero when handling FL_PUSH. */ FL_RELEASE = 2, /** The mouse has been moved to point at this widget. This can - * be used for highlighting feedback. If a widget wants to - * highlight or otherwise track the mouse, it indicates this by - * returning non-zero from its handle() method. It then - * becomes the Fl::belowmouse() widget and will receive - * FL_MOVE and FL_LEAVE events. + be used for highlighting feedback. If a widget wants to + highlight or otherwise track the mouse, it indicates this by + returning non-zero from its handle() method. It then + becomes the Fl::belowmouse() widget and will receive + FL_MOVE and FL_LEAVE events. */ FL_ENTER = 3, /** The mouse has moved out of the widget. - * In order to receive the FL_LEAVE event, the widget must - * return non-zero when handling FL_ENTER. + In order to receive the FL_LEAVE event, the widget must + return non-zero when handling FL_ENTER. */ FL_LEAVE = 4, /** The mouse has moved with a button held down. The current button state - * is in Fl::event_state(). The mouse position is in Fl::event_x() and - * Fl::event_y(). - * - * In order to receive FL_DRAG events, the widget must return non-zero - * when handling FL_PUSH. + is in Fl::event_state(). The mouse position is in Fl::event_x() and + Fl::event_y(). + + In order to receive FL_DRAG events, the widget must return non-zero + when handling FL_PUSH. */ FL_DRAG = 5, /** This indicates an attempt to give a widget the keyboard focus. - * - * If a widget wants the focus, it should change itself to display the - * fact that it has the focus, and return non-zero from its handle() method. - * It then becomes the Fl::focus() widget and gets FL_KEYDOWN, FL_KEYUP, - * and FL_UNFOCUS events. - * - * The focus will change either because the window manager changed which - * window gets the focus, or because the user tried to navigate using tab, - * arrows, or other keys. You can check Fl::event_key() to figure out why - * it moved. For navigation it will be the key pressed and interaction - * with the window manager it will be zero. + + If a widget wants the focus, it should change itself to display the + fact that it has the focus, and return non-zero from its handle() method. + It then becomes the Fl::focus() widget and gets FL_KEYDOWN, FL_KEYUP, + and FL_UNFOCUS events. + + The focus will change either because the window manager changed which + window gets the focus, or because the user tried to navigate using tab, + arrows, or other keys. You can check Fl::event_key() to figure out why + it moved. For navigation it will be the key pressed and for interaction + with the window manager it will be zero. */ FL_FOCUS = 6, /** This event is sent to the previous Fl::focus() widget when another - * widget gets the focus or the window loses focus. + widget gets the focus or the window loses focus. */ FL_UNFOCUS = 7, - /** A key was pressed or released. The key can be found in Fl::event_key(). - * The text that the key should insert can be found with Fl::event_text() - * and its length is in Fl::event_length(). If you use the key handle() - * should return 1. If you return zero then FLTK assumes you ignored the - * key and will then attempt to send it to a parent widget. If none of - * them want it, it will change the event into a FL_SHORTCUT event. - * - * To receive FL_KEYBOARD events you must also respond to the FL_FOCUS - * and FL_UNFOCUS events. - * - * If you are writing a text-editing widget you may also want to call - * the Fl::compose() function to translate individual keystrokes into - * foreign characters. - * - * FL_KEYUP events are sent to the widget that currently has focus. This - * is not necessarily the same widget that received the corresponding - * FL_KEYDOWN event because focus may have changed between events. + /** A key was pressed (FL_KEYDOWN) or released (FL_KEYUP). + Fl_KEYBOARD is a synonym for FL_KEYDOWN. + The key can be found in Fl::event_key(). + The text that the key should insert can be found with Fl::event_text() + and its length is in Fl::event_length(). If you use the key handle() + should return 1. If you return zero then FLTK assumes you ignored the + key and will then attempt to send it to a parent widget. If none of + them want it, it will change the event into a FL_SHORTCUT event. + + To receive FL_KEYBOARD events you must also respond to the FL_FOCUS + and FL_UNFOCUS events. + + If you are writing a text-editing widget you may also want to call + the Fl::compose() function to translate individual keystrokes into + non-ASCII characters. + + FL_KEYUP events are sent to the widget that currently has focus. This + is not necessarily the same widget that received the corresponding + FL_KEYDOWN event because focus may have changed between events. */ FL_KEYDOWN = 8, - /** Equvalent to FL_KEYDOWN. - * \see FL_KEYDOWN + /** Equivalent to FL_KEYDOWN. + \see FL_KEYDOWN */ FL_KEYBOARD = 8, /** Key release event. - * \see FL_KEYDOWN + \see FL_KEYDOWN */ FL_KEYUP = 9, /** The user clicked the close button of a window. - * This event is used internally only to trigger the callback of - * Fl_Window derived classed. The default callback closes the - * window calling Fl_Window::hide(). + This event is used internally only to trigger the callback of + Fl_Window derived classed. The default callback closes the + window calling Fl_Window::hide(). */ FL_CLOSE = 10, /** The mouse has moved without any mouse buttons held down. - * This event is sent to the Fl::belowmouse() widget. - * - * In order to receive FL_MOVE events, the widget must return - * non-zero when handling FL_ENTER. + This event is sent to the Fl::belowmouse() widget. + + In order to receive FL_MOVE events, the widget must return + non-zero when handling FL_ENTER. */ FL_MOVE = 11, /** If the Fl::focus() widget is zero or ignores an FL_KEYBOARD - * event then FLTK tries sending this event to every widget it - * can, until one of them returns non-zero. FL_SHORTCUT is first - * sent to the Fl::belowmouse() widget, then its parents and siblings, - * and eventually to every widget in the window, trying to find an - * object that returns non-zero. FLTK tries really hard to not to ignore - * any keystrokes! - * - * You can also make "global" shortcuts by using Fl::add_handler(). A - * global shortcut will work no matter what windows are displayed or - * which one has the focus. + event then FLTK tries sending this event to every widget it + can, until one of them returns non-zero. FL_SHORTCUT is first + sent to the Fl::belowmouse() widget, then its parents and siblings, + and eventually to every widget in the window, trying to find an + object that returns non-zero. FLTK tries really hard to not to ignore + any keystrokes! + + You can also make "global" shortcuts by using Fl::add_handler(). A + global shortcut will work no matter what windows are displayed or + which one has the focus. */ FL_SHORTCUT = 12, /** This widget is no longer active, due to Fl_Widget::deactivate() - * being called on it or one of its parents. Fl_Widget::active() may - * still be true after this, the widget is only active if Fl_Widget::active() - * is true on it and all its parents (use Fl_Widget::active_r() to check this). + being called on it or one of its parents. Fl_Widget::active() may + still be true after this, the widget is only active if Fl_Widget::active() + is true on it and all its parents (use Fl_Widget::active_r() to check this). */ FL_DEACTIVATE = 13, /** This widget is now active, due to Fl_Widget::activate() being - * called on it or one of its parents. + called on it or one of its parents. */ FL_ACTIVATE = 14, /** This widget is no longer visible, due to Fl_Widget::hide() being - * called on it or one of its parents, or due to a parent window being - * minimized. Fl_Widget::visible() may still be true after this, but the - * widget is visible only if visible() is true for it and all its - * parents (use Fl_Widget::visible_r() to check this). + called on it or one of its parents, or due to a parent window being + minimized. Fl_Widget::visible() may still be true after this, but the + widget is visible only if visible() is true for it and all its + parents (use Fl_Widget::visible_r() to check this). */ FL_HIDE = 15, /** This widget is visible again, due to Fl_Widget::show() being called on - * it or one of its parents, or due to a parent window being restored. - * Child Fl_Windows respond to this by actually creating the window if not - * done already, so if you subclass a window, be sure to pass FL_SHOW - * to the base class Fl_Widget::handle() method! + it or one of its parents, or due to a parent window being restored. + Child Fl_Windows respond to this by actually creating the window if not + done already, so if you subclass a window, be sure to pass FL_SHOW + to the base class Fl_Widget::handle() method! */ FL_SHOW = 16, /** You should get this event some time after you call Fl::paste(). - * The contents of Fl::event_text() is the text to insert and the number - * of characters is in Fl::event_length(). + The contents of Fl::event_text() is the text to insert and the number + of characters is in Fl::event_length(). */ FL_PASTE = 17, /** The Fl::selection_owner() will get this event before the selection is - * moved to another widget. This indicates that some other widget or program - * has claimed the selection. Motif programs used this to clear the selection - * indication. Most modern programs ignore this. + moved to another widget. This indicates that some other widget or program + has claimed the selection. Motif programs used this to clear the selection + indication. Most modern programs ignore this. */ FL_SELECTIONCLEAR = 18, /** The user has moved the mouse wheel. The Fl::event_dx() and Fl::event_dy() - * methods can be used to find the amount to scroll horizontally and vertically. + methods can be used to find the amount to scroll horizontally and vertically. */ FL_MOUSEWHEEL = 19, /** The mouse has been moved to point at this widget. A widget that is - * interested in receiving drag'n'drop data must return 1 to receive - * FL_DND_DRAG, FL_DND_LEAVE and FL_DND_RELEASE events. + interested in receiving drag'n'drop data must return 1 to receive + FL_DND_DRAG, FL_DND_LEAVE and FL_DND_RELEASE events. */ FL_DND_ENTER = 20, /** The mouse has been moved inside a widget while dragging data. A - * widget that is interested in receiving drag'n'drop data should - * indicate the possible drop position. + widget that is interested in receiving drag'n'drop data should + indicate the possible drop position. */ FL_DND_DRAG = 21, @@ -291,8 +289,8 @@ enum Fl_Event { // events FL_DND_LEAVE = 22, /** The user has released the mouse button dropping data into the widget. - * If the widget returns 1, it will receive the data in the immediately - * following FL_PASTE event. + If the widget returns 1, it will receive the data in the immediately + following FL_PASTE event. */ FL_DND_RELEASE = 23 }; @@ -300,9 +298,9 @@ enum Fl_Event { // events /** \name When Conditions */ /*@{*/ /** These constants determine when a callback is performed. - * - * \sa Fl_Widget::when(); - * \todo doxygen comments for values are incomplete and maybe wrong or unclear + + \sa Fl_Widget::when(); + \todo doxygen comments for values are incomplete and maybe wrong or unclear */ enum Fl_When { // Fl_Widget::when(): FL_WHEN_NEVER = 0, ///< Never call the callback @@ -368,6 +366,27 @@ enum Fl_When { // Fl_Widget::when(): #define FL_Alt_R 0xffea ///< The right alt key. #define FL_Delete 0xffff ///< The delete key. +// These use the Private Use Area (PUA) of the Basic Multilingual Plane +// of Unicode. Guaranteed not to conflict with a proper Unicode character. + +// These primarily map to the XFree86 keysym range +#define FL_Volume_Down 0xEF11 /* Volume control down */ +#define FL_Volume_Mute 0xEF12 /* Mute sound from the system */ +#define FL_Volume_Up 0xEF13 /* Volume control up */ +#define FL_Media_Play 0xEF14 /* Start playing of audio */ +#define FL_Media_Stop 0xEF15 /* Stop playing audio */ +#define FL_Media_Prev 0xEF16 /* Previous track */ +#define FL_Media_Next 0xEF17 /* Next track */ +#define FL_Home_Page 0xEF18 /* Display user's home page */ +#define FL_Mail 0xEF19 /* Invoke user's mail program */ +#define FL_Search 0xEF1B /* Search */ +#define FL_Back 0xEF26 /* Like back on a browser */ +#define FL_Forward 0xEF27 /* Like forward on a browser */ +#define FL_Stop 0xEF28 /* Stop current operation */ +#define FL_Refresh 0xEF29 /* Refresh the page */ +#define FL_Sleep 0xEF2F /* Put system to sleep */ +#define FL_Favorites 0xEF30 /* Show favorite locations */ + /*@}*/ // group: Mouse and Keyboard Events /** \name Mouse Buttons @@ -412,15 +431,15 @@ enum Fl_When { // Fl_Widget::when(): #define FL_BUTTONS 0x7f000000 ///< Any mouse button is pushed #define FL_BUTTON(n) (0x00800000<<(n)) ///< Mouse button n (n > 0) is pushed -#define FL_KEY_MASK 0x0000ffff ///< All keys are 16 bit for now - // FIXME: Unicode needs 24 bits! +#define FL_KEY_MASK 0x0000ffff ///< All keys are 16 bit for now + // FIXME: Unicode needs 24 bits! #ifdef __APPLE__ -# define FL_COMMAND FL_META ///< An alias for FL_CTRL on WIN32 and X11, or FL_META on MacOS X -# define FL_CONTROL FL_CTRL ///< An alias for FL_META on WIN32 and X11, or FL_META on MacOS X +# define FL_COMMAND FL_META ///< An alias for FL_CTRL on WIN32 and X11, or FL_META on MacOS X +# define FL_CONTROL FL_CTRL ///< An alias for FL_META on WIN32 and X11, or FL_CTRL on MacOS X #else # define FL_COMMAND FL_CTRL ///< An alias for FL_CTRL on WIN32 and X11, or FL_META on MacOS X -# define FL_CONTROL FL_META ///< An alias for FL_META on WIN32 and X11, or FL_META on MacOS X +# define FL_CONTROL FL_META ///< An alias for FL_META on WIN32 and X11, or FL_CTRL on MacOS X #endif // __APPLE__ /*@}*/ // group: Event States @@ -435,8 +454,8 @@ enum Fl_When { // Fl_Widget::when(): leaving the interior unchanged. The blue color in Figure 1 is the area that is not drawn by the frame types. - \image html boxtypes.gif "Figure 1: FLTK standard box types" - \image latex boxtypes.eps "FLTK standard box types" width=10cm + \image html boxtypes.png "Figure 1: FLTK standard box types" + \image latex boxtypes.png "FLTK standard box types" width=10cm \todo Description of boxtypes is incomplete. See below for the defined enum Fl_Boxtype. \see src/Fl_get_system_colors.cxx @@ -542,24 +561,24 @@ extern FL_EXPORT Fl_Boxtype fl_define_FL_GTK_UP_BOX(); /** Get the filled version of a frame. If no filled version of a given frame exists, the behavior of this function - is undefined and some random box or frame is returned, - */ + is undefined and some random box or frame is returned. + */ inline Fl_Boxtype fl_box(Fl_Boxtype b) { return (Fl_Boxtype)((b1)?b:(b-2)); } /** Get the "pressed" or "down" version of a box. If no "down" version of a given box exists, the behavior of this function - is undefined and some random box or frame is returned, - */ + is undefined and some random box or frame is returned. + */ inline Fl_Boxtype fl_down(Fl_Boxtype b) { return (Fl_Boxtype)((b Fl_Color => 0xrrggbbii | | | | @@ -745,12 +759,13 @@ extern FL_EXPORT Fl_Fontsize FL_NORMAL_SIZE; ///< normal font size | +------- green component (8 bit) +--------- red component (8 bit) - + A color can have either an index or an rgb value. Colors with rgb set and an index >0 are reserved for special use. - - */ + */ +/*@{*/ +/** an FLTK color value */ typedef unsigned int Fl_Color; // Standard colors. These are used as default colors in widgets and altered as necessary @@ -762,14 +777,14 @@ const Fl_Color FL_SELECTION_COLOR = 15; ///< the default selection/highlight c // boxtypes generally limit themselves to these colors so // the whole ramp is not allocated: -const Fl_Color FL_GRAY0 = 32; // 'A' -const Fl_Color FL_DARK3 = 39; // 'H' -const Fl_Color FL_DARK2 = 45; // 'N' -const Fl_Color FL_DARK1 = 47; // 'P' +const Fl_Color FL_GRAY0 = 32; // 'A' +const Fl_Color FL_DARK3 = 39; // 'H' +const Fl_Color FL_DARK2 = 45; // 'N' +const Fl_Color FL_DARK1 = 47; // 'P' const Fl_Color FL_BACKGROUND_COLOR = 49; // 'R' default background color -const Fl_Color FL_LIGHT1 = 50; // 'S' -const Fl_Color FL_LIGHT2 = 52; // 'U' -const Fl_Color FL_LIGHT3 = 54; // 'W' +const Fl_Color FL_LIGHT1 = 50; // 'S' +const Fl_Color FL_LIGHT2 = 52; // 'U' +const Fl_Color FL_LIGHT3 = 54; // 'W' // FLTK provides a 5x8x5 color cube that is used with colormap visuals @@ -807,74 +822,99 @@ FL_EXPORT Fl_Color fl_contrast(Fl_Color fg, Fl_Color bg); FL_EXPORT Fl_Color fl_color_average(Fl_Color c1, Fl_Color c2, float weight); +/** Returns a lighter version of the specified color. */ inline Fl_Color fl_lighter(Fl_Color c) { return fl_color_average(c, FL_WHITE, .67f); } +/** Returns a darker version of the specified color. */ inline Fl_Color fl_darker(Fl_Color c) { return fl_color_average(c, FL_BLACK, .67f); } -/** return 24-bit color value closest to \p r, \p g, \p b. */ +/** Returns the 24-bit color value closest to \p r, \p g, \p b. */ inline Fl_Color fl_rgb_color(uchar r, uchar g, uchar b) { if (!r && !g && !b) return FL_BLACK; else return (Fl_Color)(((((r << 8) | g) << 8) | b) << 8); } -/** return 24-bit color value closest to \p grayscale */ +/** Returns the 24-bit color value closest to \p g (grayscale). */ inline Fl_Color fl_rgb_color(uchar g) { if (!g) return FL_BLACK; else return (Fl_Color)(((((g << 8) | g) << 8) | g) << 8); } +/** Returns a gray color value from black (i == 0) to white (i == FL_NUM_GRAY - 1). + FL_NUM_GRAY is defined to be 24 in the current FLTK release. + To get the closest FLTK gray value to an 8-bit grayscale color 'I' use: + + \code + fl_gray_ramp(I * (FL_NUM_GRAY - 1) / 255) + \endcode +*/ inline Fl_Color fl_gray_ramp(int i) {return (Fl_Color)(i+FL_GRAY_RAMP);} +/** Returns a color out of the color cube. + + \p r must be in the range 0 to FL_NUM_RED (5) minus 1, + \p g must be in the range 0 to FL_NUM_GREEN (8) minus 1, + \p b must be in the range 0 to FL_NUM_BLUE (5) minus 1. + + To get the closest color to a 8-bit set of R,G,B values use: + + \code + fl_color_cube(R * (FL_NUM_RED - 1) / 255, + G * (FL_NUM_GREEN - 1) / 255, + B * (FL_NUM_BLUE - 1) / 255); + \endcode + */ inline Fl_Color fl_color_cube(int r, int g, int b) { return (Fl_Color)((b*FL_NUM_RED + r) * FL_NUM_GREEN + g + FL_COLOR_CUBE);} -//*@}*/ // group: Colors +/*@}*/ // group: Colors -/** \name Cursors +/** \name Cursors */ +/*@{*/ + +/** The following constants define the mouse cursors that are available in FLTK. - The following constants define the mouse cursors that are available in FLTK. - The double-headed arrows are bitmaps provided by FLTK on X, the others are provided by system-defined cursors. - - \todo enum Fl_Cursor needs some more comments for values - (and maybe an image), see Fl/Enumerations.H + + \todo enum Fl_Cursor needs maybe an image. */ -enum Fl_Cursor { // standard cursors - FL_CURSOR_DEFAULT = 0, - FL_CURSOR_ARROW = 35, - FL_CURSOR_CROSS = 66, - FL_CURSOR_WAIT = 76, - FL_CURSOR_INSERT = 77, - FL_CURSOR_HAND = 31, - FL_CURSOR_HELP = 47, - FL_CURSOR_MOVE = 27, +enum Fl_Cursor { + FL_CURSOR_DEFAULT = 0, /**< the default cursor, usually an arrow. */ + FL_CURSOR_ARROW = 35, /**< an arrow pointer. */ + FL_CURSOR_CROSS = 66, /**< crosshair. */ + FL_CURSOR_WAIT = 76, /**< watch or hourglass. */ + FL_CURSOR_INSERT = 77, /**< I-beam. */ + FL_CURSOR_HAND = 31, /**< hand (uparrow on MSWindows). */ + FL_CURSOR_HELP = 47, /**< question mark. */ + FL_CURSOR_MOVE = 27, /**< 4-pointed arrow. */ // fltk provides bitmaps for these: - FL_CURSOR_NS = 78, - FL_CURSOR_WE = 79, - FL_CURSOR_NWSE = 80, - FL_CURSOR_NESW = 81, - FL_CURSOR_NONE = 255, - // for back compatability (non MSWindows ones): - FL_CURSOR_N = 70, - FL_CURSOR_NE = 69, - FL_CURSOR_E = 49, - FL_CURSOR_SE = 8, - FL_CURSOR_S = 9, - FL_CURSOR_SW = 7, - FL_CURSOR_W = 36, - FL_CURSOR_NW = 68 - //FL_CURSOR_NS = 22, - //FL_CURSOR_WE = 55, + FL_CURSOR_NS = 78, /**< up/down arrow. */ + FL_CURSOR_WE = 79, /**< left/right arrow. */ + FL_CURSOR_NWSE = 80, /**< diagonal arrow. */ + FL_CURSOR_NESW = 81, /**< diagonal arrow. */ + FL_CURSOR_NONE =255, /**< invisible. */ + // for back compatibility (non MSWindows ones): + FL_CURSOR_N = 70, /**< for back compatibility. */ + FL_CURSOR_NE = 69, /**< for back compatibility. */ + FL_CURSOR_E = 49, /**< for back compatibility. */ + FL_CURSOR_SE = 8, /**< for back compatibility. */ + FL_CURSOR_S = 9, /**< for back compatibility. */ + FL_CURSOR_SW = 7, /**< for back compatibility. */ + FL_CURSOR_W = 36, /**< for back compatibility. */ + FL_CURSOR_NW = 68 /**< for back compatibility. */ }; +/*@}*/ // group: Cursors +/** FD "when" conditions */ enum { // values for "when" passed to Fl::add_fd() - FL_READ = 1, - FL_WRITE = 4, - FL_EXCEPT = 8 + FL_READ = 1, /**< Call the callback when there is data to be read. */ + FL_WRITE = 4, /**< Call the callback when data can be written without blocking. */ + FL_EXCEPT = 8 /**< Call the callback if an exception occurs on the file. */ }; -enum Fl_Mode { // visual types and Fl_Gl_Window::mode() (values match Glut) +/** visual types and Fl_Gl_Window::mode() (values match Glut) */ +enum Fl_Mode { FL_RGB = 0, FL_INDEX = 1, FL_SINGLE = 0, @@ -893,16 +933,15 @@ enum Fl_Mode { // visual types and Fl_Gl_Window::mode() (values match Glut) #define FL_IMAGE_WITH_ALPHA 0x40000000 -// damage masks - +/** Damage masks */ enum Fl_Damage { - FL_DAMAGE_CHILD = 0x01, - FL_DAMAGE_EXPOSE = 0x02, - FL_DAMAGE_SCROLL = 0x04, - FL_DAMAGE_OVERLAY = 0x08, - FL_DAMAGE_USER1 = 0x10, - FL_DAMAGE_USER2 = 0x20, - FL_DAMAGE_ALL = 0x80 + FL_DAMAGE_CHILD = 0x01, /**< A child needs to be redrawn. */ + FL_DAMAGE_EXPOSE = 0x02, /**< The window was exposed. */ + FL_DAMAGE_SCROLL = 0x04, /**< The Fl_Scroll widget was scrolled. */ + FL_DAMAGE_OVERLAY = 0x08, /**< The overlay planes need to be redrawn. */ + FL_DAMAGE_USER1 = 0x10, /**< First user-defined damage bit. */ + FL_DAMAGE_USER2 = 0x20, /**< Second user-defined damage bit. */ + FL_DAMAGE_ALL = 0x80 /**< Everything needs to be redrawn. */ }; // FLTK 1.0.x compatibility definitions... @@ -916,5 +955,5 @@ enum Fl_Damage { #endif // -// End of "$Id: Enumerations.H 7476 2010-04-09 22:18:05Z matt $". +// End of "$Id: Enumerations.H 8710 2011-05-21 21:55:59Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl.H b/plugins/zynaddsubfx/fltk/FL/Fl.H index 6fd660a85..9aaa1edd4 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl.H @@ -1,9 +1,9 @@ // -// "$Id: Fl.H 7334 2010-03-25 14:37:46Z AlbrechtS $" +// "$Id: Fl.H 8724 2011-05-23 18:01:29Z manolo $" // // Main header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -25,14 +25,14 @@ // http://www.fltk.org/str.php // -/* \file +/** \file Fl static class. */ #ifndef Fl_H # define Fl_H -#ifdef HAVE_CAIRO +#ifdef FLTK_HAVE_CAIRO # include #endif @@ -54,7 +54,7 @@ struct Fl_Label; /** \defgroup callback_functions Callback function typedefs - \brief Typedefs for callback or handler functions passed as function parameters. + \brief Typedefs defined in for callback or handler functions passed as function parameters. FLTK uses callback functions as parameters for some function calls, e.g. to set up global event handlers (Fl::add_handler()), to add a timeout handler @@ -68,51 +68,56 @@ struct Fl_Label; Fl::remove_timeout() and others @{ */ -/** signature of some label drawing functions passed as parameters */ +/** Signature of some label drawing functions passed as parameters */ typedef void (Fl_Label_Draw_F)(const Fl_Label *label, int x, int y, int w, int h, Fl_Align align); -/** signature of some label measurement functions passed as parameters */ +/** Signature of some label measurement functions passed as parameters */ typedef void (Fl_Label_Measure_F)(const Fl_Label *label, int &width, int &height); -/** signature of some box drawing functions passed as parameters */ +/** Signature of some box drawing functions passed as parameters */ typedef void (Fl_Box_Draw_F)(int x, int y, int w, int h, Fl_Color color); -/** signature of some timeout callback functions passed as parameters */ +/** Signature of some timeout callback functions passed as parameters */ typedef void (*Fl_Timeout_Handler)(void *data); -/** signature of some wakeup callback functions passed as parameters */ +/** Signature of some wakeup callback functions passed as parameters */ typedef void (*Fl_Awake_Handler)(void *data); -/** signature of add_idle callback functions passed as parameters */ +/** Signature of add_idle callback functions passed as parameters */ typedef void (*Fl_Idle_Handler)(void *data); -/** signature of set_idle callback functions passed as parameters */ +/** Signature of set_idle callback functions passed as parameters */ typedef void (*Fl_Old_Idle_Handler)(); -/** signature of add_fd functions passed as parameters */ +/** Signature of add_fd functions passed as parameters */ typedef void (*Fl_FD_Handler)(int fd, void *data); -/** signature of add_handler functions passed as parameters */ +/** Signature of add_handler functions passed as parameters */ typedef int (*Fl_Event_Handler)(int event); -/** signature of set_abort functions passed as parameters */ +/** Signature of set_abort functions passed as parameters */ typedef void (*Fl_Abort_Handler)(const char *format,...); -/** signature of set_atclose functions passed as parameters */ +/** Signature of set_atclose functions passed as parameters */ typedef void (*Fl_Atclose_Handler)(Fl_Window *window, void *data); -/** signature of args functions passed as parameters */ +/** Signature of args functions passed as parameters */ typedef int (*Fl_Args_Handler)(int argc, char **argv, int &i); +/** Signature of event_dispatch functions passed as parameters. + \see Fl::event_dispatch(Fl_Event_Dispatch) */ +typedef int (*Fl_Event_Dispatch)(int event, Fl_Window *w); + /** @} */ /* group callback_functions */ + /** - The Fl is the FLTK global (static) containing + The Fl is the FLTK global (static) class containing state information and global methods for the current application. */ class FL_EXPORT Fl { Fl() {}; // no constructor! - + public: // should be private! #ifndef FL_DOXYGEN static int e_number; @@ -128,6 +133,7 @@ public: // should be private! static int e_keysym; static char* e_text; static int e_length; + static Fl_Event_Dispatch e_dispatch; static Fl_Widget* belowmouse_; static Fl_Widget* pushed_; static Fl_Widget* focus_; @@ -136,14 +142,69 @@ public: // should be private! static Fl_Window* modal_; static Fl_Window* grab_; static int compose_state; - static int visible_focus_; - static int dnd_text_ops_; #endif /** If true then flush() will do something. */ static void damage(int d) {damage_ = d;} + +public: + /** Enumerator for global FLTK options. + These options can be set system wide, per user, or for the running + application only. + \see Fl::option(Fl_Option, bool) + \see Fl::option(Fl_Option) + */ + typedef enum { + /// When switched on, moving the text cursor beyond the start or end of + /// a text in a text widget will change focus to the next text widget. + /// When switched off, the cursor will stop at the end of the text. + /// Pressing Tab or Ctrl-Tab will advance the keyboard focus. + OPTION_ARROW_FOCUS = 0, + // When switched on, FLTK will use the file chooser dialog that comes + // with your operating system whenever possible. When switched off, FLTK + // will present its own file chooser. + // \todo implement me + // OPTION_NATIVE_FILECHOOSER, + // When Filechooser Preview is enabled, the FLTK or native file chooser + // will show a preview of a selected file (if possible) before the user + // decides to choose the file. + // \todo implement me + //OPTION_FILECHOOSER_PREVIEW, + /// If visible focus is switched on, FLTK will draw a dotted rectangle + /// inside the widget that will receive the next keystroke. If switched + /// off, no such indicator will be drawn and keyboard navigation + /// is disabled. + OPTION_VISIBLE_FOCUS, + /// If text drag-and-drop is enabled, the user can select and drag text + /// from any text widget. If disabled, no dragging is possible, however + /// dropping text from other applications still works. + OPTION_DND_TEXT, + /// If tooltips are enabled, hovering the mouse over a widget with a + /// tooltip text will open a little tooltip window until the mouse leaves + /// the widget. If disabled, no tooltip is shown. + OPTION_SHOW_TOOLTIPS, + // don't change this, leave it always as the last element + /// For internal use only. + OPTION_LAST + } Fl_Option; +private: + static unsigned char options_[OPTION_LAST]; + static unsigned char options_read_; + +public: + /* + Return a global setting for all FLTK applications, possibly overridden + by a setting specifically for this application. + */ + static bool option(Fl_Option opt); + + /* + Override an option while the application is running. + */ + static void option(Fl_Option opt, bool val); + /** The currently executing idle callback function: DO NOT USE THIS DIRECTLY! @@ -176,9 +237,9 @@ public: static double version(); // argument parsers: - static int arg(int, char**, int&); - static int args(int, char**, int&, Fl_Args_Handler ah = 0); - static void args(int, char**); + static int arg(int argc, char **argv, int& i); + static int args(int argc, char **argv, int& i, Fl_Args_Handler cb = 0); + static void args(int argc, char **argv); /** Usage string displayed if Fl::args() detects an invalid argument. This may be changed to point to customized text at run-time. @@ -329,6 +390,7 @@ public: be messed up, but the user can probably keep working - all X protocol errors call this, for example. The default implementation returns after displaying the message. + \note \#include */ static void (*warning)(const char*, ...); /** @@ -343,6 +405,7 @@ public: Fl::error() means there is a recoverable error such as the inability to read an image file. The default implementation returns after displaying the message. + \note \#include */ static void (*error)(const char*, ...); /** @@ -359,12 +422,13 @@ public: version may be able to use longjmp or an exception to continue, as long as it does not call FLTK again. The default implementation exits with status 1 after displaying the message. + \note \#include */ static void (*fatal)(const char*, ...); /** @} */ /** \defgroup fl_windows Windows handling functions - Windows and standard dialogs handling + \brief Windows and standard dialogs handling declared in @{ */ static Fl_Window* first_window(); static void first_window(Fl_Window*); @@ -380,37 +444,41 @@ public: called (grab() overrides this). */ static Fl_Window* modal() {return modal_;} - /** - This is used when pop-up menu systems are active. - - Send all events to the passed window no matter where the pointer or - focus is (including in other programs). The window does not have - to be shown() , this lets the handle() method of a - "dummy" window override all event handling and allows you to - map and unmap a complex set of windows (under both X and WIN32 - some window must be mapped because the system interface needs a - window id). - - If grab() is on it will also affect show() of windows by doing - system-specific operations (on X it turns on override-redirect). - These are designed to make menus popup reliably - and faster on the system. - - To turn off grabbing do Fl::grab(0). - - Be careful that your program does not enter an infinite loop - while grab() is on. On X this will lock up your screen! - To avoid this potential lockup, all newer operating systems seem to - limit mouse pointer grabbing to the time during which a mouse button - is held down. Some OS's may not support grabbing at all. + /** Returns the window that currently receives all events. + + \return The window that currently receives all events, + or NULL if event grabbing is currently OFF. */ static Fl_Window* grab() {return grab_;} - /** Selects the window to grab. See Fl_Window* Fl::grab() */ + /** Selects the window to grab. + This is used when pop-up menu systems are active. + + Send all events to the passed window no matter where the pointer or + focus is (including in other programs). The window does not have + to be shown() , this lets the handle() method of a + "dummy" window override all event handling and allows you to + map and unmap a complex set of windows (under both X and WIN32 + some window must be mapped because the system interface needs a + window id). + + If grab() is on it will also affect show() of windows by doing + system-specific operations (on X it turns on override-redirect). + These are designed to make menus popup reliably + and faster on the system. + + To turn off grabbing do Fl::grab(0). + + Be careful that your program does not enter an infinite loop + while grab() is on. On X this will lock up your screen! + To avoid this potential lockup, all newer operating systems seem to + limit mouse pointer grabbing to the time during which a mouse button + is held down. Some OS's may not support grabbing at all. + */ static void grab(Fl_Window*); // platform dependent /** @} */ /** \defgroup fl_events Events handling functions - Fl class events handling API + Fl class events handling API declared in @{ */ // event information: @@ -481,18 +549,18 @@ public: */ static void event_clicks(int i) {e_clicks = i;} /** - The first form returns non-zero if the mouse has not moved far enough - and not enough time has passed since the last FL_PUSH or - FL_KEYBOARD event for it to be considered a "drag" rather than a - "click". You can test this on FL_DRAG, FL_RELEASE, - and FL_MOVE events. The second form clears the value returned - by Fl::event_is_click(). Useful to prevent the next - click from being counted as a double-click or to make a popup menu - pick an item with a single click. Don't pass non-zero to this. + Returns non-zero if the mouse has not moved far enough + and not enough time has passed since the last FL_PUSH or + FL_KEYBOARD event for it to be considered a "drag" rather than a + "click". You can test this on FL_DRAG, FL_RELEASE, + and FL_MOVE events. */ static int event_is_click() {return e_is_click;} /** - Only i=0 works! See int event_is_click(). + Clears the value returned by Fl::event_is_click(). + Useful to prevent the next + click from being counted as a double-click or to make a popup menu + pick an item with a single click. Don't pass non-zero to this. */ static void event_is_click(int i) {e_is_click = i;} /** @@ -618,19 +686,14 @@ public: static int event_length() {return e_length;} static int compose(int &del); - /** - If the user moves the cursor, be sure to call Fl::compose_reset(). - The next call to Fl::compose() will start out in an initial state. In - particular it will not set "del" to non-zero. This call is very fast - so it is ok to call it many times and in many places. - */ - static void compose_reset() {compose_state = 0;} + static void compose_reset(); static int event_inside(int,int,int,int); static int event_inside(const Fl_Widget*); static int test_shortcut(Fl_Shortcut); // event destinations: static int handle(int, Fl_Window*); + static int handle_(int, Fl_Window*); /** Gets the widget that is below the mouse. \see belowmouse(Fl_Widget*) */ static Fl_Widget* belowmouse() {return belowmouse_;} @@ -644,31 +707,50 @@ public: static void focus(Fl_Widget*); static void add_handler(Fl_Event_Handler h); static void remove_handler(Fl_Event_Handler h); + static void event_dispatch(Fl_Event_Dispatch d); + static Fl_Event_Dispatch event_dispatch(); /** @} */ /** \defgroup fl_clipboard Selection & Clipboard functions - fl global copy/cut/paste functions + FLTK global copy/cut/paste functions declared in @{ */ // cut/paste: /** - Copies the data pointed to by \p stuff to the selection (0) or - primary (1) clipboard. The selection clipboard is used for - middle-mouse pastes and for drag-and-drop selections. The primary - clipboard is used for traditional copy/cut/paste operations. + Copies the data pointed to by \p stuff to the selection buffer + (\p destination is 0) or + the clipboard (\p destination is 1); \p len is the number of relevant + bytes in \p stuff. + The selection buffer is used for + middle-mouse pastes and for drag-and-drop selections. The + clipboard is used for traditional copy/cut/paste operations. */ - static void copy(const char* stuff, int len, int clipboard = 0); // platform dependent + static void copy(const char* stuff, int len, int destination = 0); // platform dependent /** - Pastes the data from the selection (0) or primary (1) clipboard into receiver. - The selection clipboard is used for middle-mouse pastes and for - drag-and-drop selections. The primary clipboard is used for - traditional copy/cut/paste operations. + Pastes the data from the selection buffer (\p source is 0) or the clipboard + (\p source is 1) into \p receiver. + Set things up so the receiver widget will be called with an FL_PASTE event some + time in the future with the data from the specified \p source in Fl::event_text() + and the number of characters in Fl::event_length(). + The receiver + should be prepared to be called \e directly by this, or for + it to happen \e later, or possibly not at all. This + allows the window system to take as long as necessary to retrieve + the paste buffer (or even to screw up completely) without complex + and error-prone synchronization code in FLTK. + + The selection buffer is used for middle-mouse pastes and for + drag-and-drop selections. The clipboard is used for traditional + copy/cut/paste operations. */ - static void paste(Fl_Widget &receiver, int clipboard /*=0*/); // platform dependent + static void paste(Fl_Widget &receiver, int source /*=0*/); // platform dependent /** - Initiate a Drag And Drop operation. The clipboard should be + Initiate a Drag And Drop operation. The selection buffer should be filled with relevant data before calling this method. FLTK will then initiate the system wide drag and drop handling. Dropped data will be marked as text. + + Create a selection first using: + Fl::copy(const char *stuff, int len, 0) */ static int dnd(); // platform dependent @@ -681,16 +763,16 @@ public: static void paste(Fl_Widget &receiver); /** @} */ /** \defgroup fl_screen Screen functions - fl global screen functions + fl global screen functions declared in @{ */ // screen size: - /** Returns the origin of the current screen, where 0 indicates the left side of the screen. */ + /** Returns the origin of the current screen work area, where 0 indicates the left side of the screen. */ static int x(); // platform dependent - /** Returns the origin of the current screen, where 0 indicates the top edge of the screen. */ + /** Returns the origin of the current screen work area, where 0 indicates the top edge of the screen. */ static int y(); // platform dependent - /** Returns the width of the screen in pixels. */ + /** Returns the width of the screen work area in pixels. */ static int w(); // platform dependent - /** Returns the height of the screen in pixels. */ + /** Returns the height of the screen work area in pixels. */ static int h(); // platform dependent // multi-head support: @@ -704,12 +786,15 @@ public: screen_xywh(X, Y, W, H, e_x_root, e_y_root); } static void screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my); - static void screen_xywh(int &X, int &Y, int &W, int &H, int n); + static void screen_xywh(int &X, int &Y, int &W, int &H, int n); + static void screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my, int mw, int mh); + static void screen_dpi(float &h, float &v, int n=0); /** @} */ /** \defgroup fl_attributes Color & Font functions - fl global color, font functions + fl global color, font functions. + These functions are declared in or . @{ */ // color map: @@ -718,15 +803,15 @@ public: Sets an entry in the fl_color index table. You can set it to any 8-bit RGB color. The color is not allocated until fl_color(i) is used. */ - static void set_color(Fl_Color, unsigned); // platform dependent - static Fl_Color get_color(Fl_Color); - static void get_color(Fl_Color, uchar&, uchar&, uchar&); + static void set_color(Fl_Color i, unsigned c); // platform dependent + static unsigned get_color(Fl_Color i); + static void get_color(Fl_Color i, uchar &red, uchar &green, uchar &blue); /** Frees the specified color from the colormap, if applicable. If overlay is non-zero then the color is freed from the overlay colormap. */ - static void free_color(Fl_Color, int overlay = 0); // platform dependent + static void free_color(Fl_Color i, int overlay = 0); // platform dependent // fonts: static const char* get_font(Fl_Font); @@ -779,7 +864,9 @@ public: /** @} */ /** \defgroup fl_drawings Drawing functions - fl global graphics and gui drawing functions + FLTK global graphics and GUI drawing functions. + These functions are declared in , + and in for offscreen buffer-related ones. @{ */ // /** @} */ @@ -854,11 +941,11 @@ public: \deprecated This method is obsolete - use the add_idle() method instead. */ static void set_idle(Fl_Old_Idle_Handler cb) {idle = cb;} - /** See Fl_Window* grab() */ - static void grab(Fl_Window&win) {grab(&win);} + /** See grab(Fl_Window*) */ + static void grab(Fl_Window& win) {grab(&win);} /** Releases the current grabbed window, equals grab(0). \deprecated Use Fl::grab(0) instead. - \see Fl_Window* grab() */ + \see grab(Fl_Window*) */ static void release() {grab(0);} // Visible focus methods... @@ -867,13 +954,13 @@ public: non-text widgets. The default mode is to enable keyboard focus for all widgets. */ - static void visible_focus(int v) { visible_focus_ = v; } + static void visible_focus(int v) { option(OPTION_VISIBLE_FOCUS, (v!=0)); } /** Gets or sets the visible keyboard focus on buttons and other non-text widgets. The default mode is to enable keyboard focus for all widgets. */ - static int visible_focus() { return visible_focus_; } + static int visible_focus() { return option(OPTION_VISIBLE_FOCUS); } // Drag-n-drop text operation methods... /** @@ -882,20 +969,20 @@ public: be dragged from text fields or dragged within a text field as a cut/paste shortcut. */ - static void dnd_text_ops(int v) { dnd_text_ops_ = v; } + static void dnd_text_ops(int v) { option(OPTION_DND_TEXT, (v!=0)); } /** Gets or sets whether drag and drop text operations are supported. This specifically affects whether selected text can be dragged from text fields or dragged within a text field as a cut/paste shortcut. */ - static int dnd_text_ops() { return dnd_text_ops_; } + static int dnd_text_ops() { return option(OPTION_DND_TEXT); } /** \defgroup fl_multithread Multithreading support functions - fl multithreading support functions + fl multithreading support functions declared in @{ */ // Multithreading support: - static void lock(); + static int lock(); static void unlock(); static void awake(void* message = 0); /** See void awake(void* message=0). */ @@ -904,14 +991,14 @@ public: The thread_message() method returns the last message that was sent from a child by the awake() method. - See also: multithreading + See also: \ref advanced_multithreading */ static void* thread_message(); // platform dependent /** @} */ /** \defgroup fl_del_widget Safe widget deletion support functions - These functions support deletion of widgets inside callbacks. + These functions, declared in , support deletion of widgets inside callbacks. Fl::delete_widget() should be called when deleting widgets or complete widget trees (Fl_Group, Fl_Window, ...) inside @@ -946,14 +1033,14 @@ public: static void clear_widget_pointer(Fl_Widget const *w); /** @} */ -#ifdef HAVE_CAIRO +#ifdef FLTK_HAVE_CAIRO /** \defgroup group_cairo Cairo support functions and classes @{ */ public: // Cairo support API static cairo_t * cairo_make_current(Fl_Window* w); - /** when HAVE_CAIRO is defined and cairo_autolink_context() is true, + /** when FLTK_HAVE_CAIRO is defined and cairo_autolink_context() is true, any current window dc is linked to a current context. This is not the default, because it may not be necessary to add cairo support to all fltk supported windows. @@ -991,7 +1078,7 @@ private: public: /** @} */ -#endif // HAVE_CAIRO +#endif // FLTK_HAVE_CAIRO }; @@ -1076,12 +1163,12 @@ public: }; /** \defgroup fl_unicode Unicode and UTF-8 functions - fl global Unicode and UTF-8 handling functions + fl global Unicode and UTF-8 handling functions declared in @{ */ /** @} */ #endif // !Fl_H // -// End of "$Id: Fl.H 7334 2010-03-25 14:37:46Z AlbrechtS $". +// End of "$Id: Fl.H 8724 2011-05-23 18:01:29Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Adjuster.H b/plugins/zynaddsubfx/fltk/FL/Fl_Adjuster.H index 8f3c68550..d0c661737 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Adjuster.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Adjuster.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Adjuster.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Adjuster.H 7981 2010-12-08 23:53:04Z greg.ercolano $" // // Adjuster widget header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -40,8 +40,8 @@ /** The Fl_Adjuster widget was stolen from Prisms, and has proven to be very useful for values that need a large dynamic range. - \image html adjuster1.gif - \image latex adjuster1.eps "Fl_Adjuster" width=4cm + \image html adjuster1.png + \image latex adjuster1.png "Fl_Adjuster" width=4cm

When you press a button and drag to the right the value increases. When you drag to the left it decreases. The largest button adjusts by 100 * step(), the next by 10 * step() and that @@ -78,5 +78,5 @@ public: #endif // -// End of "$Id: Fl_Adjuster.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Adjuster.H 7981 2010-12-08 23:53:04Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Bitmap.H b/plugins/zynaddsubfx/fltk/FL/Fl_Bitmap.H index aeaee42b7..35256c747 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Bitmap.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Bitmap.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Bitmap.H 7617 2010-05-27 17:20:18Z manolo $" +// "$Id: Fl_Bitmap.H 7903 2010-11-28 21:06:39Z matt $" // // Bitmap header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -81,5 +81,5 @@ public: #endif // -// End of "$Id: Fl_Bitmap.H 7617 2010-05-27 17:20:18Z manolo $". +// End of "$Id: Fl_Bitmap.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Box.H b/plugins/zynaddsubfx/fltk/FL/Fl_Box.H index f9e09effb..9de875dfc 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Box.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Box.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Box.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Box.H 7903 2010-11-28 21:06:39Z matt $" // // Box header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -65,5 +65,5 @@ public: #endif // -// End of "$Id: Fl_Box.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Box.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Browser.H b/plugins/zynaddsubfx/fltk/FL/Fl_Browser.H index a2f8b00ce..b7cc06563 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Browser.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Browser.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Browser.H 6850 2009-09-07 02:25:51Z greg.ercolano $" +// "$Id: Fl_Browser.H 8623 2011-04-24 17:09:41Z AlbrechtS $" // // Browser header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -28,7 +28,7 @@ /* \file Fl_Browser widget . */ -// Forms-compatable browser. Probably useful for other +// Forms-compatible browser. Probably useful for other // lists of textual data. Notice that the line numbers // start from 1, and 0 means "no line". @@ -320,5 +320,5 @@ public: #endif // -// End of "$Id: Fl_Browser.H 6850 2009-09-07 02:25:51Z greg.ercolano $". +// End of "$Id: Fl_Browser.H 8623 2011-04-24 17:09:41Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Browser_.H b/plugins/zynaddsubfx/fltk/FL/Fl_Browser_.H index 4068ae48b..5bcf7e164 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Browser_.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Browser_.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Browser_.H 6902 2009-09-27 11:06:56Z matt $" +// "$Id: Fl_Browser_.H 8275 2011-01-13 22:07:31Z manolo $" // // Common browser header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -138,20 +138,20 @@ protected: \param[in] item The item whose label text is returned. \returns The item's text label. (Can be NULL if blank) */ - virtual const char *item_text(void *item) const { return 0L; } + virtual const char *item_text(void *item) const { (void)item; return 0L; } /** This optional method should be provided by the subclass to efficiently swap browser items \p a and \p b, such as for sorting. \param[in] a,b The two items to be swapped. */ - virtual void item_swap(void *a,void *b) { } + virtual void item_swap(void *a,void *b) { (void)a; (void)b; } /** This method must be provided by the subclass to return the item for the specified \p index. \param[in] index The \p index of the item to be returned \returns The item at the specified \p index. */ - virtual void *item_at(int index) const { return 0L; } + virtual void *item_at(int index) const { (void)index; return 0L; } // you don't have to provide these but it may help speed it up: virtual int full_width() const ; // current width of all items virtual int full_height() const ; // current height of all items @@ -374,5 +374,5 @@ public: #endif // -// End of "$Id: Fl_Browser_.H 6902 2009-09-27 11:06:56Z matt $". +// End of "$Id: Fl_Browser_.H 8275 2011-01-13 22:07:31Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Button.H b/plugins/zynaddsubfx/fltk/FL/Fl_Button.H index 23547be05..39050dc44 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Button.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Button.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Button.H 7499 2010-04-14 08:07:53Z manolo $" +// "$Id: Fl_Button.H 7903 2010-11-28 21:06:39Z matt $" // // Button header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -46,6 +46,8 @@ extern FL_EXPORT Fl_Shortcut fl_old_shortcut(const char*); +class Fl_Widget_Tracker; + /** \class Fl_Button \brief Buttons generate callbacks when they are clicked by the user. @@ -88,6 +90,10 @@ class FL_EXPORT Fl_Button : public Fl_Widget { protected: + static Fl_Widget_Tracker *key_release_tracker; + static void key_release_timeout(void*); + void simulate_key_action(); + virtual void draw(); public: @@ -170,5 +176,5 @@ public: #endif // -// End of "$Id: Fl_Button.H 7499 2010-04-14 08:07:53Z manolo $". +// End of "$Id: Fl_Button.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Chart.H b/plugins/zynaddsubfx/fltk/FL/Fl_Chart.H index e94c1a02a..97bd8eeba 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Chart.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Chart.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Chart.H 6902 2009-09-27 11:06:56Z matt $" +// "$Id: Fl_Chart.H 7981 2010-12-08 23:53:04Z greg.ercolano $" // // Forms chart header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -61,8 +61,8 @@ struct FL_CHART_ENTRY { \brief Fl_Chart displays simple charts. It is provided for Forms compatibility. - \image html charts.gif - \image latex charts.eps "Fl_Chart" width=10cm + \image html charts.png + \image latex charts.png "Fl_Chart" width=10cm \todo Refactor Fl_Chart::type() information. The type of an Fl_Chart object can be set using type(uchar t) to: @@ -156,5 +156,5 @@ public: #endif // -// End of "$Id: Fl_Chart.H 6902 2009-09-27 11:06:56Z matt $". +// End of "$Id: Fl_Chart.H 7981 2010-12-08 23:53:04Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Check_Browser.H b/plugins/zynaddsubfx/fltk/FL/Fl_Check_Browser.H index c61c690ab..57cd96188 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Check_Browser.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Check_Browser.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Check_Browser.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Check_Browser.H 7903 2010-11-28 21:06:39Z matt $" // // Fl_Check_Browser header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -117,6 +117,6 @@ class FL_EXPORT Fl_Check_Browser : public Fl_Browser_ { #endif // Fl_Check_Browser_H // -// End of "$Id: Fl_Check_Browser.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Check_Browser.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Check_Button.H b/plugins/zynaddsubfx/fltk/FL/Fl_Check_Button.H index 38eecb9a1..67fb01310 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Check_Button.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Check_Button.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Check_Button.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Check_Button.H 7981 2010-12-08 23:53:04Z greg.ercolano $" // // Check button header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -37,8 +37,8 @@ \class Fl_Check_Button \brief A button with an "checkmark" to show its status. - \image html Fl_Check_Button.gif - \image latex Fl_Check_Button.eps "Fl_Check_Button" width=4cm + \image html Fl_Check_Button.png + \image latex Fl_Check_Button.png "Fl_Check_Button" width=4cm Buttons generate callbacks when they are clicked by the user. You control exactly when and how by changing the values for type() and when(). @@ -56,5 +56,5 @@ public: #endif // -// End of "$Id: Fl_Check_Button.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Check_Button.H 7981 2010-12-08 23:53:04Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Choice.H b/plugins/zynaddsubfx/fltk/FL/Fl_Choice.H index 50bb1e4e1..006364f3b 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Choice.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Choice.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Choice.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Choice.H 7981 2010-12-08 23:53:04Z greg.ercolano $" // // Choice header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -64,8 +64,8 @@ you pick the item with the mouse. The '\&' character in item names are only looked at when the menu is popped up, however. - \image html choice.gif - \image latex choice.eps "Fl_Choice" width=4cm + \image html choice.png + \image latex choice.png "Fl_Choice" width=4cm \todo Refactor the doxygen comments for Fl_Choice changed() documentation. \li int Fl_Widget::changed() const @@ -104,5 +104,5 @@ public: #endif // -// End of "$Id: Fl_Choice.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Choice.H 7981 2010-12-08 23:53:04Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Clock.H b/plugins/zynaddsubfx/fltk/FL/Fl_Clock.H index c4cf6c21b..0b631a8bf 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Clock.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Clock.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Clock.H 6812 2009-07-01 07:27:25Z AlbrechtS $" +// "$Id: Fl_Clock.H 7981 2010-12-08 23:53:04Z greg.ercolano $" // // Clock header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -53,12 +53,12 @@ \htmlonly
type() FL_SQUARE_CLOCK and FL_ROUND_CLOCK
\endhtmlonly - \image html clock.gif + \image html clock.png \htmlonly \endhtmlonly - \image html round_clock.gif + \image html round_clock.png \htmlonly
\endhtmlonly - \image latex clock.eps "FL_SQUARE_CLOCK type" width=4cm - \image latex round_clock.eps "FL_ROUND_CLOCK type" width=4cm + \image latex clock.png "FL_SQUARE_CLOCK type" width=4cm + \image latex round_clock.png "FL_ROUND_CLOCK type" width=4cm */ class FL_EXPORT Fl_Clock_Output : public Fl_Widget { int hour_, minute_, second_; @@ -112,12 +112,12 @@ public: You can choose the rounded or square type of the clock with type(), see below. \htmlonly
type() FL_SQUARE_CLOCK and FL_ROUND_CLOCK
\endhtmlonly - \image html clock.gif + \image html clock.png \htmlonly \endhtmlonly - \image html round_clock.gif + \image html round_clock.png \htmlonly
\endhtmlonly - \image latex clock.eps "FL_SQUARE_CLOCK type" width=4cm - \image latex round_clock.eps "FL_ROUND_CLOCK type" width=4cm + \image latex clock.png "FL_SQUARE_CLOCK type" width=4cm + \image latex round_clock.png "FL_ROUND_CLOCK type" width=4cm */ class FL_EXPORT Fl_Clock : public Fl_Clock_Output { public: @@ -133,5 +133,5 @@ public: #endif // -// End of "$Id: Fl_Clock.H 6812 2009-07-01 07:27:25Z AlbrechtS $". +// End of "$Id: Fl_Clock.H 7981 2010-12-08 23:53:04Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Color_Chooser.H b/plugins/zynaddsubfx/fltk/FL/Fl_Color_Chooser.H index 890c67cc2..180ee002a 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Color_Chooser.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Color_Chooser.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Color_Chooser.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Color_Chooser.H 7981 2010-12-08 23:53:04Z greg.ercolano $" // // Color chooser header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -84,7 +84,7 @@ public: \brief The Fl_Color_Chooser widget provides a standard RGB color chooser. \image html fl_color_chooser.jpg - \image latex fl_color_chooser.eps "fl_color_chooser()" width=5cm + \image latex fl_color_chooser.jpg "fl_color_chooser()" width=5cm You can place any number of the widgets into a panel of your own design. The diagram shows the widget as part of a color chooser dialog created by @@ -127,9 +127,19 @@ class FL_EXPORT Fl_Color_Chooser : public Fl_Group { static void rgb_cb(Fl_Widget*, void*); static void mode_cb(Fl_Widget*, void*); public: - /** Returns which Fl_Color_Chooser variant is currently active */ + + /** + Returns which Fl_Color_Chooser variant is currently active + \return color modes are rgb(0), byte(1), hex(2), or hsv(3) + */ int mode() {return choice.value();} - + + /** + Set which Fl_Color_Chooser variant is currently active + \param[in] newMode color modes are rgb(0), byte(1), hex(2), or hsv(3) + */ + void mode(int newMode); + /** Returns the current hue. 0 <= hue < 6. Zero is red, one is yellow, two is green, etc. @@ -179,11 +189,11 @@ public: Fl_Color_Chooser(int X, int Y, int W, int H, const char *L = 0); }; -FL_EXPORT int fl_color_chooser(const char* name, double& r, double& g, double& b); -FL_EXPORT int fl_color_chooser(const char* name, uchar& r, uchar& g, uchar& b); +FL_EXPORT int fl_color_chooser(const char* name, double& r, double& g, double& b, int m=-1); +FL_EXPORT int fl_color_chooser(const char* name, uchar& r, uchar& g, uchar& b, int m=-1); #endif // -// End of "$Id: Fl_Color_Chooser.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Color_Chooser.H 7981 2010-12-08 23:53:04Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Counter.H b/plugins/zynaddsubfx/fltk/FL/Fl_Counter.H index e6f1fad0d..419715bea 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Counter.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Counter.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Counter.H 6939 2009-11-17 14:45:36Z matt $" +// "$Id: Fl_Counter.H 7981 2010-12-08 23:53:04Z greg.ercolano $" // // Counter header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -45,8 +45,8 @@ Controls a single floating point value with button (or keyboard) arrows. Double arrows buttons achieve larger steps than simple arrows. \see Fl_Spinner for value input with vertical step arrows. -

\image html counter.gif

- \image latex counter.eps "Fl_Counter" width=4cm +

\image html counter.png

+ \image latex counter.png "Fl_Counter" width=4cm \todo Refactor the doxygen comments for Fl_Counter type() documentation. @@ -120,5 +120,5 @@ public: #endif // -// End of "$Id: Fl_Counter.H 6939 2009-11-17 14:45:36Z matt $". +// End of "$Id: Fl_Counter.H 7981 2010-12-08 23:53:04Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Device.H b/plugins/zynaddsubfx/fltk/FL/Fl_Device.H index 2cb9e66d1..5b96dc8b1 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Device.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Device.H @@ -1,10 +1,10 @@ // -// "$Id: Fl_Device.H 7666 2010-07-04 17:19:38Z AlbrechtS $" +// "$Id: Fl_Device.H 8529 2011-03-23 12:49:30Z AlbrechtS $" // // Definition of classes Fl_Device, Fl_Graphics_Driver, Fl_Surface_Device, Fl_Display_Device // for the Fast Light Tool Kit (FLTK). // -// Copyright 2010 by Bill Spitzak and others. +// Copyright 2010-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -26,7 +26,8 @@ // http://www.fltk.org/str.php // /** \file Fl_Device.H - \brief declaration of classes Fl_Device, Fl_Graphics_Driver, Fl_Surface_Device, Fl_Display_Device. + \brief declaration of classes Fl_Device, Fl_Graphics_Driver, Fl_Surface_Device, + Fl_Display_Device, Fl_Device_Plugin. */ #ifndef Fl_Device_H @@ -38,22 +39,11 @@ #include #include #include -#ifdef WIN32 -#include -#elif defined(__APPLE__) -#else -#include -#endif class Fl_Graphics_Driver; -class Fl_Display_Device; -class Fl_Surface_Device; +class Fl_Font_Descriptor; /** \brief Points to the driver that currently receives all graphics requests */ FL_EXPORT extern Fl_Graphics_Driver *fl_graphics_driver; -/** \brief Points to the surface that currently receives all graphics requests */ -FL_EXPORT extern Fl_Surface_Device *fl_surface; -/** \brief Points to the platform's display */ -FL_EXPORT extern Fl_Display_Device *fl_display_device; /** signature of image generation callback function. @@ -65,47 +55,86 @@ FL_EXPORT extern Fl_Display_Device *fl_display_device; */ typedef void (*Fl_Draw_Image_Cb)(void* data,int x,int y,int w,uchar* buf); +// typedef what the x,y fields in a point are: +#ifdef WIN32 +typedef int COORD_T; +# define XPOINT XPoint +#elif defined(__APPLE__) +typedef float COORD_T; +typedef struct { float x; float y; } QPoint; +# define XPOINT QPoint +extern float fl_quartz_line_width_; +#else +typedef short COORD_T; +# define XPOINT XPoint +#endif + /** \brief All graphical output devices and all graphics systems. */ -class Fl_Device { -protected: - /** \brief The device type */ - const char *type_; - /** \brief A string that identifies each subclass of Fl_Device. - * - Function type() applied to a device of this class returns this string. - */ - static const char *device_type; +class FL_EXPORT Fl_Device { public: + /** A string that identifies each subclass of Fl_Device. + Function class_name() applied to a device of this class returns this string. + */ + static const char *class_id; /** - @brief An RTTI emulation of device classes. - * - The type of an instance of an Fl_Device subclass can be checked with code such as: + Returns the name of the class of this object. + The class of an instance of an Fl_Device subclass can be checked with code such as: \code - if ( instance->type() == Fl_Printer::device_type ) { ... } + if ( instance->class_name() == Fl_Printer::class_id ) { ... } \endcode */ - inline const char *type() {return type_;}; + virtual const char *class_name() {return class_id;}; + /** + Virtual destructor. + + The destructor of Fl_Device must be virtual to make the destructors of + derived classes being called correctly on destruction. + */ + virtual ~Fl_Device() {}; }; +#define FL_REGION_STACK_SIZE 10 +#define FL_MATRIX_STACK_SIZE 32 /** \brief A virtual class subclassed for each graphics driver FLTK uses. * - The protected virtual methods of this class are those that a graphics driver should implement to + The virtual methods of this class are those that a graphics driver should implement to support all of FLTK drawing functions. -
The preferred FLTK API for drawing operations is the function collection of the - \ref fl_drawings and \ref fl_attributes modules. -
Alternatively, methods of the Fl_Graphics_Driver class can be called - using the global variable Fl_Graphics_Driver * \ref fl_graphics_driver that points at all time to - the single driver (an instance of an Fl_Graphics_Driver subclass) that's currently receiving graphics - requests. For example: - \code fl_graphics_driver->rect(x, y, w, h); \endcode -
Each protected method of the Fl_Graphics_Driver class has the same effect as the - function of the \ref fl_drawings and \ref fl_attributes modules which bears the same name - prefixed with fl_ and has the same parameter list. +
The public API for drawing operations is functionally presented in \ref drawing and as function lists + in the \ref fl_drawings and \ref fl_attributes modules. */ -class Fl_Graphics_Driver : public Fl_Device { +class FL_EXPORT Fl_Graphics_Driver : public Fl_Device { +public: + /** A 2D coordinate transformation matrix + */ + struct matrix {double a, b, c, d, x, y;}; +private: + static const matrix m0; + Fl_Font font_; // current font + Fl_Fontsize size_; // current font size + Fl_Color color_; // current color + enum {LINE, LOOP, POLYGON, POINT_}; + int sptr; + static const int matrix_stack_size = FL_MATRIX_STACK_SIZE; + matrix stack[FL_MATRIX_STACK_SIZE]; + matrix m; + int n, p_size, gap_; + XPOINT *p; + int what; + int fl_clip_state_number; + int rstackptr; + static const int region_stack_max = FL_REGION_STACK_SIZE - 1; + Fl_Region rstack[FL_REGION_STACK_SIZE]; +#ifdef WIN32 + int numcount; + int counts[20]; +#endif + Fl_Font_Descriptor *font_descriptor_; + void transformed_vertex0(COORD_T x, COORD_T y); + void fixloop(); + protected: /* ** \brief red color for background and/or mixing if device does not support masking or alpha * uchar bg_r_; @@ -116,7 +145,6 @@ protected: friend class Fl_Pixmap; friend class Fl_Bitmap; friend class Fl_RGB_Image; - friend class Fl_PostScript_Graphics_Driver; friend void fl_rect(int x, int y, int w, int h); friend void fl_rectf(int x, int y, int w, int h); friend void fl_line_style(int style, int width, char* dashes); @@ -165,13 +193,31 @@ protected: friend void fl_begin_complex_polygon(); friend void fl_gap(); friend void fl_end_complex_polygon(); + friend void fl_push_matrix(); + friend void fl_pop_matrix(); + friend void fl_mult_matrix(double a, double b, double c, double d, double x, double y); + friend void fl_scale(double x, double y); + friend void fl_scale(double x); + friend void fl_translate(double x, double y); + friend void fl_rotate(double d); + friend double fl_transform_x(double x, double y); + friend double fl_transform_y(double x, double y); + friend double fl_transform_dx(double x, double y); + friend double fl_transform_dy(double x, double y); + friend Fl_Region fl_clip_region(); + friend void fl_clip_region(Fl_Region r); + friend void fl_restore_clip(); + friend void fl_draw_image(const uchar* buf, int X,int Y,int W,int H, int D, int L); friend void fl_draw_image_mono(const uchar* buf, int X,int Y,int W,int H, int D, int L); friend void fl_draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D); friend FL_EXPORT void fl_draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D); - + friend FL_EXPORT void gl_start(); + + matrix *fl_matrix; /**< Points to the current coordinate transformation matrix */ + /** \brief The constructor. */ - Fl_Graphics_Driver() {}; + Fl_Graphics_Driver(); /** \brief see fl_rect(int x, int y, int w, int h). */ virtual void rect(int x, int y, int w, int h); /** \brief see fl_rectf(int x, int y, int w, int h). */ @@ -195,17 +241,18 @@ protected: /** \brief see fl_line(int x, int y, int x1, int y1, int x2, int y2). */ virtual void line(int x, int y, int x1, int y1, int x2, int y2); /** \brief see fl_draw(const char *str, int n, int x, int y). */ - virtual void draw(const char *str, int n, int x, int y); + virtual void draw(const char *str, int n, int x, int y) = 0; +#ifdef __APPLE__ + virtual void draw(const char *str, int n, float x, float y) = 0; +#endif /** \brief see fl_draw(int angle, const char *str, int n, int x, int y). */ - virtual void draw(int angle, const char *str, int n, int x, int y); + virtual void draw(int angle, const char *str, int n, int x, int y) = 0; /** \brief see fl_rtl_draw(const char *str, int n, int x, int y). */ - virtual void rtl_draw(const char *str, int n, int x, int y); - /** \brief see fl_font(Fl_Font face, Fl_Fontsize size). */ - virtual void font(Fl_Font face, Fl_Fontsize size); + virtual void rtl_draw(const char *str, int n, int x, int y) = 0; /** \brief see fl_color(Fl_Color c). */ - virtual void color(Fl_Color c); + virtual void color(Fl_Color c) {color_ = c;} /** \brief see fl_color(uchar r, uchar g, uchar b). */ - virtual void color(uchar r, uchar g, uchar b); + virtual void color(uchar r, uchar g, uchar b) = 0; /** \brief see fl_point(int x, int y). */ virtual void point(int x, int y); /** \brief see fl_loop(int x0, int y0, int x1, int y1, int x2, int y2). */ @@ -262,37 +309,90 @@ protected: virtual void push_no_clip(); /** \brief see fl_pop_clip(). */ virtual void pop_clip(); + + /** \brief see fl_push_matrix(). */ + void push_matrix(); + /** \brief see fl_pop_matrix(). */ + void pop_matrix(); + /** \brief see fl_mult_matrix(double a, double b, double c, double d, double x, double y). */ + void mult_matrix(double a, double b, double c, double d, double x, double y); + /** \brief see fl_scale(double x, double y). */ + inline void scale(double x, double y) { mult_matrix(x,0,0,y,0,0); } + /** \brief see fl_scale(double x). */ + inline void scale(double x) { mult_matrix(x,0,0,x,0,0); } + /** \brief see fl_translate(double x, double y). */ + inline void translate(double x,double y) { mult_matrix(1,0,0,1,x,y); } + /** \brief see fl_rotate(double d). */ + void rotate(double d); + /** \brief see fl_transform_x(double x, double y). */ + double transform_x(double x, double y); + /** \brief see fl_transform_y(double x, double y). */ + double transform_y(double x, double y); + /** \brief see fl_transform_dx(double x, double y). */ + double transform_dx(double x, double y); + /** \brief see fl_transform_dy(double x, double y). */ + double transform_dy(double x, double y); + /** \brief see fl_clip_region(). */ + Fl_Region clip_region(); + /** \brief see fl_clip_region(Fl_Region r). */ + void clip_region(Fl_Region r); + /** \brief see fl_restore_clip(). */ + void restore_clip(); + // Images /** \brief see fl_draw_image(const uchar* buf, int X,int Y,int W,int H, int D, int L). */ - virtual void draw_image(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0); + virtual void draw_image(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0) = 0; /** \brief see fl_draw_image_mono(const uchar* buf, int X,int Y,int W,int H, int D, int L). */ - virtual void draw_image_mono(const uchar* buf, int X,int Y,int W,int H, int D=1, int L=0); + virtual void draw_image_mono(const uchar* buf, int X,int Y,int W,int H, int D=1, int L=0) = 0; /** \brief see fl_draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D). */ - virtual void draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3); + virtual void draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3) = 0; /** \brief see fl_draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D). */ - virtual void draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1); + virtual void draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1) = 0; // Image classes /** \brief Draws an Fl_RGB_Image object to the device. * Specifies a bounding box for the image, with the origin (upper left-hand corner) of the image offset by the cx and cy arguments. */ - virtual void draw(Fl_RGB_Image * rgb,int XP, int YP, int WP, int HP, int cx, int cy) {}; + virtual void draw(Fl_RGB_Image * rgb,int XP, int YP, int WP, int HP, int cx, int cy) = 0; /** \brief Draws an Fl_Pixmap object to the device. * Specifies a bounding box for the image, with the origin (upper left-hand corner) of the image offset by the cx and cy arguments. */ - virtual void draw(Fl_Pixmap * pxm,int XP, int YP, int WP, int HP, int cx, int cy) {}; + virtual void draw(Fl_Pixmap * pxm,int XP, int YP, int WP, int HP, int cx, int cy) = 0; /** \brief Draws an Fl_Bitmap object to the device. * Specifies a bounding box for the image, with the origin (upper left-hand corner) of the image offset by the cx and cy arguments. */ - virtual void draw(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, int cx, int cy) {}; + virtual void draw(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, int cx, int cy) = 0; public: - static const char *device_type; + static const char *class_id; + virtual const char *class_name() {return class_id;}; + /** \brief see fl_font(Fl_Font face, Fl_Fontsize size). */ + virtual void font(Fl_Font face, Fl_Fontsize size) {font_ = face; size_ = size;} + /** \brief see fl_font(void). */ + Fl_Font font() {return font_; } + /** \brief see fl_size(). */ + Fl_Fontsize size() {return size_; } + /** \brief see fl_width(const char *str, int n). */ + virtual double width(const char *str, int n) = 0; + /** \brief see fl_width(unsigned int n). */ + virtual inline double width(unsigned int c) { char ch = (char)c; return width(&ch, 1); } + /** \brief see fl_text_extents(const char*, int n, int& dx, int& dy, int& w, int& h). */ + virtual void text_extents(const char*, int n, int& dx, int& dy, int& w, int& h); + /** \brief see fl_height(). */ + virtual int height() = 0; + /** \brief see fl_descent(). */ + virtual int descent() = 0; + /** \brief see fl_color(void). */ + Fl_Color color() {return color_;} + /** Returns a pointer to the current Fl_Font_Descriptor for the graphics driver */ + inline Fl_Font_Descriptor *font_descriptor() { return font_descriptor_;} + /** Sets the current Fl_Font_Descriptor for the graphics driver */ + inline void font_descriptor(Fl_Font_Descriptor *d) { font_descriptor_ = d;} /** \brief The destructor */ virtual ~Fl_Graphics_Driver() {}; }; @@ -303,13 +403,31 @@ public: * This class is implemented only on the Mac OS X platform. */ -class Fl_Quartz_Graphics_Driver : public Fl_Graphics_Driver { +class FL_EXPORT Fl_Quartz_Graphics_Driver : public Fl_Graphics_Driver { public: - Fl_Quartz_Graphics_Driver() { type_ = device_type; }; - static const char *device_type; + static const char *class_id; + const char *class_name() {return class_id;}; + void color(Fl_Color c); + void color(uchar r, uchar g, uchar b); + void draw(const char* str, int n, int x, int y); +#ifdef __APPLE__ + void draw(const char *str, int n, float x, float y); +#endif + void draw(int angle, const char *str, int n, int x, int y); + void rtl_draw(const char* str, int n, int x, int y); + void font(Fl_Font face, Fl_Fontsize size); void draw(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy); void draw(Fl_Bitmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy); void draw(Fl_RGB_Image *img, int XP, int YP, int WP, int HP, int cx, int cy); + void draw_image(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0); + void draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3); + void draw_image_mono(const uchar* buf, int X,int Y,int W,int H, int D=1, int L=0); + void draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1); + double width(const char *str, int n); + double width(unsigned int c); + void text_extents(const char*, int n, int& dx, int& dy, int& w, int& h); + int height(); + int descent(); }; #endif #if defined(WIN32) || defined(FL_DOXYGEN) @@ -318,13 +436,28 @@ public: * This class is implemented only on the MSWindows platform. */ -class Fl_GDI_Graphics_Driver : public Fl_Graphics_Driver { +class FL_EXPORT Fl_GDI_Graphics_Driver : public Fl_Graphics_Driver { public: - Fl_GDI_Graphics_Driver() { type_ = device_type; }; - static const char *device_type; + static const char *class_id; + const char *class_name() {return class_id;}; + void color(Fl_Color c); + void color(uchar r, uchar g, uchar b); + void draw(const char* str, int n, int x, int y); + void draw(int angle, const char *str, int n, int x, int y); + void rtl_draw(const char* str, int n, int x, int y); + void font(Fl_Font face, Fl_Fontsize size); void draw(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy); void draw(Fl_Bitmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy); void draw(Fl_RGB_Image *img, int XP, int YP, int WP, int HP, int cx, int cy); + void draw_image(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0); + void draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3); + void draw_image_mono(const uchar* buf, int X,int Y,int W,int H, int D=1, int L=0); + void draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1); + double width(const char *str, int n); + double width(unsigned int c); + void text_extents(const char*, int n, int& dx, int& dy, int& w, int& h); + int height(); + int descent(); }; #endif #if !(defined(__APPLE__) || defined(WIN32)) @@ -335,32 +468,49 @@ public: */ class Fl_Xlib_Graphics_Driver : public Fl_Graphics_Driver { public: - Fl_Xlib_Graphics_Driver() { type_ = device_type; }; - static const char *device_type; + static const char *class_id; + const char *class_name() {return class_id;}; + void color(Fl_Color c); + void color(uchar r, uchar g, uchar b); + void draw(const char* str, int n, int x, int y); + void draw(int angle, const char *str, int n, int x, int y); + void rtl_draw(const char* str, int n, int x, int y); + void font(Fl_Font face, Fl_Fontsize size); void draw(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy); void draw(Fl_Bitmap *pxm, int XP, int YP, int WP, int HP, int cx, int cy); void draw(Fl_RGB_Image *img, int XP, int YP, int WP, int HP, int cx, int cy); + void draw_image(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0); + void draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3); + void draw_image_mono(const uchar* buf, int X,int Y,int W,int H, int D=1, int L=0); + void draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1); + double width(const char *str, int n); + double width(unsigned int c); + void text_extents(const char*, int n, int& dx, int& dy, int& w, int& h); + int height(); + int descent(); }; #endif /** \brief A surface that's susceptible to receive graphical output. */ -class Fl_Surface_Device : public Fl_Device { +class FL_EXPORT Fl_Surface_Device : public Fl_Device { /** \brief The graphics driver in use by this surface. */ Fl_Graphics_Driver *_driver; + static Fl_Surface_Device *_surface; // the surface that currently receives graphics output protected: /** \brief Constructor that sets the graphics driver to use for the created surface. */ Fl_Surface_Device(Fl_Graphics_Driver *graphics_driver) {_driver = graphics_driver; }; public: - static const char *device_type; + static const char *class_id; + const char *class_name() {return class_id;}; virtual void set_current(void); /** \brief Sets the graphics driver of this drawing surface. */ inline void driver(Fl_Graphics_Driver *graphics_driver) {_driver = graphics_driver;}; /** \brief Returns the graphics driver of this drawing surface. */ inline Fl_Graphics_Driver *driver() {return _driver; }; /** \brief the surface that currently receives graphics output */ - static Fl_Surface_Device *surface() {return fl_surface; }; + static inline Fl_Surface_Device *surface() {return _surface; }; /** \brief The destructor. */ virtual ~Fl_Surface_Device() {} }; @@ -368,19 +518,41 @@ public: /** \brief A display to which the computer can draw. */ -class Fl_Display_Device : public Fl_Surface_Device { +class FL_EXPORT Fl_Display_Device : public Fl_Surface_Device { + static Fl_Display_Device *_display; // the platform display device public: - static const char *device_type; + static const char *class_id; + const char *class_name() {return class_id;}; /** \brief A constructor that sets the graphics driver used by the display */ - Fl_Display_Device(Fl_Graphics_Driver *graphics_driver) : Fl_Surface_Device( graphics_driver) { type_ = device_type; }; - /** - @brief Returns the platform's display device. + Fl_Display_Device(Fl_Graphics_Driver *graphics_driver); + /** Returns the platform display device. */ + static inline Fl_Display_Device *display_device() {return _display;}; +}; + +/** + This plugin socket allows the integration of new device drivers for special + window or screen types. It is currently used to provide an automated printing + service for OpenGL windows, if linked with fltk_gl. + */ +class FL_EXPORT Fl_Device_Plugin : public Fl_Plugin { +public: + /** \brief The constructor */ + Fl_Device_Plugin(const char *name) + : Fl_Plugin(klass(), name) { } + /** \brief Returns the class name */ + virtual const char *klass() { return "fltk:device"; } + /** \brief Returns the plugin name */ + virtual const char *name() = 0; + /** \brief Prints a widget + \param w the widget + \param x,y offsets where to print relatively to coordinates origin + \param height height of the current drawing area */ - static Fl_Display_Device *display_device() { return fl_display_device; }; + virtual int print(Fl_Widget* w, int x, int y, int height) = 0; }; #endif // Fl_Device_H // -// End of "$Id: Fl_Device.H 7666 2010-07-04 17:19:38Z AlbrechtS $". +// End of "$Id: Fl_Device.H 8529 2011-03-23 12:49:30Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Dial.H b/plugins/zynaddsubfx/fltk/FL/Fl_Dial.H index 5ca33ec0c..96de59fc4 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Dial.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Dial.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Dial.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Dial.H 7981 2010-12-08 23:53:04Z greg.ercolano $" // // Dial header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -43,8 +43,8 @@ /** The Fl_Dial widget provides a circular dial to control a single floating point value. -

\image html dial.gif - \image latex dial.eps "Fl_Dial" width=4cm +

\image html dial.png + \image latex dial.png "Fl_Dial" width=4cm Use type() to set the type of the dial to:

  • FL_NORMAL_DIAL - Draws a normal dial with a knob.
    • @@ -93,5 +93,5 @@ public: #endif // -// End of "$Id: Fl_Dial.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Dial.H 7981 2010-12-08 23:53:04Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Double_Window.H b/plugins/zynaddsubfx/fltk/FL/Fl_Double_Window.H index f67e9f245..20ab25b30 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Double_Window.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Double_Window.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Double_Window.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Double_Window.H 7903 2010-11-28 21:06:39Z matt $" // // Double-buffered window header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -77,5 +77,5 @@ public: #endif // -// End of "$Id: Fl_Double_Window.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Double_Window.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Export.H b/plugins/zynaddsubfx/fltk/FL/Fl_Export.H index 73887dc46..875a2789e 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Export.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Export.H @@ -1,9 +1,9 @@ /* - * "$Id: Fl_Export.H 6614 2009-01-01 16:11:32Z matt $" + * "$Id: Fl_Export.H 7903 2010-11-28 21:06:39Z matt $" * * WIN32 DLL export . * - * Copyright 1998-2009 by Bill Spitzak and others. + * Copyright 1998-2010 by Bill Spitzak and others. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -32,7 +32,7 @@ * The following is only used when building DLLs under WIN32... */ -# if defined(FL_DLL) && (defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__) || __GNUC__ >= 3) +# if defined(FL_DLL) # ifdef FL_LIBRARY # define FL_EXPORT __declspec(dllexport) # else @@ -45,5 +45,5 @@ #endif /* !Fl_Export_H */ /* - * End of "$Id: Fl_Export.H 6614 2009-01-01 16:11:32Z matt $". + * End of "$Id: Fl_Export.H 7903 2010-11-28 21:06:39Z matt $". */ diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_File_Browser.H b/plugins/zynaddsubfx/fltk/FL/Fl_File_Browser.H index 9de6851d9..cc7fc96f5 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_File_Browser.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_File_Browser.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_File_Browser.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_File_Browser.H 8306 2011-01-24 17:04:22Z matt $" // // FileBrowser definitions. // -// Copyright 1999-2009 by Michael Sweet. +// Copyright 1999-2010 by Michael Sweet. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -45,8 +45,8 @@ // /** The Fl_File_Browser widget displays a list of filenames, optionally with file-specific icons. */ -class FL_EXPORT Fl_File_Browser : public Fl_Browser -{ +class FL_EXPORT Fl_File_Browser : public Fl_Browser { + int filetype_; const char *directory_; uchar iconsize_; @@ -116,5 +116,5 @@ public: #endif // !_Fl_File_Browser_H_ // -// End of "$Id: Fl_File_Browser.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_File_Browser.H 8306 2011-01-24 17:04:22Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_File_Chooser.H b/plugins/zynaddsubfx/fltk/FL/Fl_File_Chooser.H index 92471beec..3816621ca 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_File_Chooser.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_File_Chooser.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_File_Chooser.H 7007 2010-01-14 23:08:06Z greg.ercolano $" +// "$Id: Fl_File_Chooser.H 8786 2011-06-07 11:41:36Z manolo $" // // Fl_File_Chooser dialog for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -54,8 +54,8 @@ private: static Fl_Preferences prefs_; void (*callback_)(Fl_File_Chooser*, void *); void *data_; - char directory_[1024]; - char pattern_[1024]; + char directory_[FL_PATH_MAX]; + char pattern_[FL_PATH_MAX]; char preview_text_[2048]; int type_; void favoritesButtonCB(); @@ -95,6 +95,11 @@ public: private: void cb_previewButton_i(Fl_Check_Button*, void*); static void cb_previewButton(Fl_Check_Button*, void*); +public: + Fl_Check_Button *showHiddenButton; +private: + void cb_showHiddenButton_i(Fl_Check_Button*, void*); + static void cb_showHiddenButton(Fl_Check_Button*, void*); Fl_File_Input *fileName; void cb_fileName_i(Fl_File_Input*, void*); static void cb_fileName(Fl_File_Input*, void*); @@ -144,9 +149,13 @@ public: const char * ok_label(); void preview(int e); int preview() const { return previewButton->value(); }; +private: + void showHidden(int e); + void remove_hidden_files(); +public: void rescan(); void rescan_keep_filename(); - void show(); + void show(); int shown(); void textcolor(Fl_Color c); Fl_Color textcolor(); @@ -213,6 +222,10 @@ public: [standard text may be customized at run-time] */ static const char *show_label; + /** + [standard text may be customized at run-time] + */ + static const char *hidden_label; /** the sort function that is used when loading the contents of a directory. @@ -222,7 +235,6 @@ private: Fl_Widget* ext_group; public: Fl_Widget* add_extra(Fl_Widget* gr); - Fl_File_Browser *browser(void) {return fileList; }; }; FL_EXPORT char *fl_dir_chooser(const char *message,const char *fname,int relative=0); FL_EXPORT char *fl_file_chooser(const char *message,const char *pat,const char *fname,int relative=0); @@ -231,5 +243,5 @@ FL_EXPORT void fl_file_chooser_ok_label(const char*l); #endif // -// End of "$Id: Fl_File_Chooser.H 7007 2010-01-14 23:08:06Z greg.ercolano $". +// End of "$Id: Fl_File_Chooser.H 8786 2011-06-07 11:41:36Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_File_Icon.H b/plugins/zynaddsubfx/fltk/FL/Fl_File_Icon.H index 174c7604e..7e67f0276 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_File_Icon.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_File_Icon.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_File_Icon.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_File_Icon.H 8306 2011-01-24 17:04:22Z matt $" // // Fl_File_Icon definitions. // -// Copyright 1999-2009 by Michael Sweet. +// Copyright 1999-2010 by Michael Sweet. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -53,8 +53,8 @@ The Fl_File_Icon class manages icon images that can be used as labels in other widgets and as icons in the FileBrowser widget. */ -class FL_EXPORT Fl_File_Icon //// Icon data -{ +class FL_EXPORT Fl_File_Icon { //// Icon data + static Fl_File_Icon *first_; // Pointer to first icon/filetype Fl_File_Icon *next_; // Pointer to next icon/filetype const char *pattern_; // Pattern string @@ -164,5 +164,5 @@ class FL_EXPORT Fl_File_Icon //// Icon data #endif // !_Fl_Fl_File_Icon_H_ // -// End of "$Id: Fl_File_Icon.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_File_Icon.H 8306 2011-01-24 17:04:22Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_File_Input.H b/plugins/zynaddsubfx/fltk/FL/Fl_File_Input.H index cb45acf06..e3d27fabc 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_File_Input.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_File_Input.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_File_Input.H 6716 2009-03-24 01:40:44Z fabien $" +// "$Id: Fl_File_Input.H 8712 2011-05-22 09:45:40Z AlbrechtS $" // // File_Input header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // Original version Copyright 1998 by Curtis Edwards. // // This library is free software; you can redistribute it and/or @@ -42,17 +42,19 @@ navigate upward in the directory tree. You may want to handle FL_WHEN_CHANGED events for tracking text changes and also FL_WHEN_RELEASE for button release when changing to parent dir. - FL_WHEN_RELEASE callback won't be called if the directory clicked - is the same that the current one. -

    \image html Fl_File_Input.gif

    - \image latex Fl_File_Input.eps "Fl_File_Input" width=6cm + FL_WHEN_RELEASE callback won't be called if the directory clicked + is the same as the current one. + +

    \image html Fl_File_Input.png

    + \image latex Fl_File_Input.png "Fl_File_Input" width=6cm + \note As all Fl_Input derived objects, Fl_File_Input may call its callback - when loosing focus (see FL_UNFOCUS) to update its state like its cursor shape. + when losing focus (see FL_UNFOCUS) to update its state like its cursor shape. One resulting side effect is that you should call clear_changed() early in your callback to avoid reentrant calls if you plan to show another window or dialog box in the callback. */ -class FL_EXPORT Fl_File_Input : public Fl_Input -{ +class FL_EXPORT Fl_File_Input : public Fl_Input { + Fl_Color errorcolor_; char ok_entry_; uchar down_box_; @@ -100,5 +102,5 @@ public: // -// End of "$Id: Fl_File_Input.H 6716 2009-03-24 01:40:44Z fabien $". +// End of "$Id: Fl_File_Input.H 8712 2011-05-22 09:45:40Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Fill_Dial.H b/plugins/zynaddsubfx/fltk/FL/Fl_Fill_Dial.H index b2a27fbe6..e3b8444cd 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Fill_Dial.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Fill_Dial.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Fill_Dial.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Fill_Dial.H 8022 2010-12-12 23:21:03Z AlbrechtS $" // // Filled dial header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -34,7 +34,7 @@ #include "Fl_Dial.H" /** Draws a dial with a filled arc */ -class Fl_Fill_Dial : public Fl_Dial { +class FL_EXPORT Fl_Fill_Dial : public Fl_Dial { public: /** Creates a filled dial, also setting its type to FL_FILL_DIAL. */ Fl_Fill_Dial(int x,int y,int w,int h, const char *l = 0) @@ -44,5 +44,5 @@ public: #endif // -// End of "$Id: Fl_Fill_Dial.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Fill_Dial.H 8022 2010-12-12 23:21:03Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Fill_Slider.H b/plugins/zynaddsubfx/fltk/FL/Fl_Fill_Slider.H index 92a49fed8..05e22b191 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Fill_Slider.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Fill_Slider.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Fill_Slider.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Fill_Slider.H 8022 2010-12-12 23:21:03Z AlbrechtS $" // // Filled slider header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -33,7 +33,7 @@ #include "Fl_Slider.H" /** Widget that draws a filled horizontal slider, useful as a progress or value meter*/ -class Fl_Fill_Slider : public Fl_Slider { +class FL_EXPORT Fl_Fill_Slider : public Fl_Slider { public: /** Creates the slider from its position,size and optional title. */ Fl_Fill_Slider(int x,int y,int w,int h,const char *l=0) @@ -43,5 +43,5 @@ public: #endif // -// End of "$Id: Fl_Fill_Slider.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Fill_Slider.H 8022 2010-12-12 23:21:03Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Float_Input.H b/plugins/zynaddsubfx/fltk/FL/Fl_Float_Input.H index 2a312308a..f774dd379 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Float_Input.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Float_Input.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Float_Input.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Float_Input.H 8726 2011-05-23 18:32:47Z AlbrechtS $" // // Floating point input header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -39,19 +39,24 @@ that only allows the user to type floating point numbers (sign, digits, decimal point, more digits, 'E' or 'e', sign, digits). */ -class Fl_Float_Input : public Fl_Input { +class FL_EXPORT Fl_Float_Input : public Fl_Input { public: /** - Creates a new Fl_Float_Input widget using the given position, + Creates a new Fl_Float_Input widget using the given position, size, and label string. The default boxtype is FL_DOWN_BOX. -

    Inherited destructor destroys the widget and any value associated with it + + Inherited destructor destroys the widget and any value associated with it. */ +#if defined(FL_DLL) // implementation in src/Fl_Input.cxx + Fl_Float_Input(int X,int Y,int W,int H,const char *l = 0); +#else Fl_Float_Input(int X,int Y,int W,int H,const char *l = 0) : Fl_Input(X,Y,W,H,l) {type(FL_FLOAT_INPUT);} +#endif }; #endif // -// End of "$Id: Fl_Float_Input.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Float_Input.H 8726 2011-05-23 18:32:47Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_FormsBitmap.H b/plugins/zynaddsubfx/fltk/FL/Fl_FormsBitmap.H index fe3347526..55582629d 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_FormsBitmap.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_FormsBitmap.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_FormsBitmap.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_FormsBitmap.H 7903 2010-11-28 21:06:39Z matt $" // // Forms bitmap header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -52,5 +52,5 @@ public: #endif // -// End of "$Id: Fl_FormsBitmap.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_FormsBitmap.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_FormsPixmap.H b/plugins/zynaddsubfx/fltk/FL/Fl_FormsPixmap.H index 23b8a8ce7..1eb01dee3 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_FormsPixmap.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_FormsPixmap.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_FormsPixmap.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_FormsPixmap.H 7903 2010-11-28 21:06:39Z matt $" // // Forms pixmap header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -59,5 +59,5 @@ public: #endif // -// End of "$Id: Fl_FormsPixmap.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_FormsPixmap.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Free.H b/plugins/zynaddsubfx/fltk/FL/Fl_Free.H index 4bab575e0..367443ca0 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Free.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Free.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Free.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Free.H 7903 2010-11-28 21:06:39Z matt $" // // Forms free header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -85,5 +85,5 @@ public: #endif // -// End of "$Id: Fl_Free.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Free.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Group.H b/plugins/zynaddsubfx/fltk/FL/Fl_Group.H index 2c6e6f946..0056e1035 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Group.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Group.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Group.H 7280 2010-03-16 22:51:31Z matt $" +// "$Id: Fl_Group.H 8157 2011-01-01 14:01:53Z AlbrechtS $" // // Group header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -106,6 +106,7 @@ public: widget if \p before is not in the group. */ void insert(Fl_Widget& o, Fl_Widget* before) {insert(o,find(before));} + void remove(int index); void remove(Fl_Widget&); /** Removes the widget \p o from the group. @@ -127,13 +128,13 @@ public: In these examples the gray area is the resizable: - \image html resizebox1.gif + \image html resizebox1.png - \image html resizebox2.gif + \image html resizebox2.png - \image latex resizebox1.eps "before resize" width=4cm + \image latex resizebox1.png "before resize" width=4cm - \image latex resizebox2.eps "after resize" width=4cm + \image latex resizebox2.png "after resize" width=4cm The resizable may be set to the group itself, in which case all the contents are resized. This is the default value for Fl_Group, @@ -176,12 +177,7 @@ public: */ unsigned int clip_children() { return (flags() & CLIP_CHILDREN) != 0; } - /** Returns an Fl_Group pointer if this widget is an Fl_Group. - - \retval NULL if this widget is not derived from Fl_Group. - \note This method is provided to avoid dynamic_cast. - \todo More documentation ... - */ + // Note: Doxygen docs in Fl_Widget.H to avoid redundancy. virtual Fl_Group* as_group() { return this; } // back compatibility functions: @@ -230,5 +226,5 @@ public: #endif // -// End of "$Id: Fl_Group.H 7280 2010-03-16 22:51:31Z matt $". +// End of "$Id: Fl_Group.H 8157 2011-01-01 14:01:53Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Help_Dialog.H b/plugins/zynaddsubfx/fltk/FL/Fl_Help_Dialog.H index 3b8fe4c31..7cb2aef5f 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Help_Dialog.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Help_Dialog.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Help_Dialog.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Help_Dialog.H 8063 2010-12-19 21:20:10Z matt $" // // Fl_Help_Dialog dialog for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -43,8 +43,8 @@ class FL_EXPORT Fl_Help_Dialog { int index_; int max_; - int line_[100]; - char file_[100][256]; + int line_[100]; // FIXME: we must remove those static numbers + char file_[100][FL_PATH_MAX]; // FIXME: we must remove those static numbers int find_pos_; public: Fl_Help_Dialog(); @@ -91,5 +91,5 @@ public: #endif // -// End of "$Id: Fl_Help_Dialog.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Help_Dialog.H 8063 2010-12-19 21:20:10Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Help_View.H b/plugins/zynaddsubfx/fltk/FL/Fl_Help_View.H index f30dc6b44..c0ee66db3 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Help_View.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Help_View.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Help_View.H 7139 2010-02-23 15:55:22Z greg.ercolano $" +// "$Id: Fl_Help_View.H 8306 2011-01-24 17:04:22Z matt $" // // Help Viewer widget definitions. // -// Copyright 1997-2009 by Easy Software Products. +// Copyright 1997-2010 by Easy Software Products. // Image support by Matthias Melcher, Copyright 2000-2009. // // This library is free software; you can redistribute it and/or @@ -42,6 +42,7 @@ # include "Fl_Scrollbar.H" # include "fl_draw.H" # include "Fl_Shared_Image.H" +# include "filename.H" // @@ -56,8 +57,7 @@ typedef const char *(Fl_Help_Func)(Fl_Widget *, const char *); // Fl_Help_Block structure... // -struct Fl_Help_Block -{ +struct Fl_Help_Block { const char *start, // Start of text *end; // End of text uchar border; // Draw border? @@ -73,8 +73,7 @@ struct Fl_Help_Block // Fl_Help_Link structure... // /** Definition of a link for the html viewer. */ -struct Fl_Help_Link -{ +struct Fl_Help_Link { char filename[192], ///< Reference filename name[32]; ///< Link target (blank if none) int x, ///< X offset of link text @@ -88,7 +87,7 @@ struct Fl_Help_Link */ /** Fl_Help_View font stack element definition. */ -struct Fl_Help_Font_Style { +struct FL_EXPORT Fl_Help_Font_Style { Fl_Font f; ///< Font Fl_Fontsize s; ///< Font Size Fl_Color c; ///< Font Color @@ -101,7 +100,7 @@ struct Fl_Help_Font_Style { /** Fl_Help_View font stack definition. */ const size_t MAX_FL_HELP_FS_ELTS = 100; -struct Fl_Help_Font_Stack { +struct FL_EXPORT Fl_Help_Font_Stack { /** font stack construction, initialize attributes. */ Fl_Help_Font_Stack() { nfonts_ = 0; @@ -137,8 +136,7 @@ protected: /** Fl_Help_Target structure */ -struct Fl_Help_Target -{ +struct Fl_Help_Target { char name[32]; ///< Target name int y; ///< Y offset of target }; @@ -208,8 +206,8 @@ struct Fl_Help_Target - yen Yuml yuml */ -class FL_EXPORT Fl_Help_View : public Fl_Group // Help viewer widget -{ +class FL_EXPORT Fl_Help_View : public Fl_Group { // Help viewer widget + enum { RIGHT = -1, CENTER, LEFT }; ///< Alignments char title_[1024]; ///< Title string @@ -220,7 +218,7 @@ class FL_EXPORT Fl_Help_View : public Fl_Group // Help viewer widget Fl_Font textfont_; ///< Default font for text Fl_Fontsize textsize_; ///< Default font size const char *value_; ///< HTML text value - Fl_Help_Font_Stack fstack_; ///< font stack management + Fl_Help_Font_Stack fstack_; ///< font stack management int nblocks_, ///< Number of blocks/paragraphs ablocks_; ///< Allocated blocks Fl_Help_Block *blocks_; ///< Blocks @@ -235,8 +233,8 @@ class FL_EXPORT Fl_Help_View : public Fl_Group // Help viewer widget atargets_; ///< Allocated targets Fl_Help_Target *targets_; ///< Targets - char directory_[1024]; ///< Directory for current file - char filename_[1024]; ///< Current filename + char directory_[FL_PATH_MAX];///< Directory for current file + char filename_[FL_PATH_MAX]; ///< Current filename int topline_, ///< Top line in document leftline_, ///< Lefthand position size_, ///< Total document length @@ -394,5 +392,5 @@ public: #endif // !Fl_Help_View_H // -// End of "$Id: Fl_Help_View.H 7139 2010-02-23 15:55:22Z greg.ercolano $". +// End of "$Id: Fl_Help_View.H 8306 2011-01-24 17:04:22Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Hold_Browser.H b/plugins/zynaddsubfx/fltk/FL/Fl_Hold_Browser.H index f4cb3979d..37d05b5ae 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Hold_Browser.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Hold_Browser.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Hold_Browser.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Hold_Browser.H 8736 2011-05-24 20:00:56Z AlbrechtS $" // // Hold browser header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -42,7 +42,7 @@ user releases the mouse, but you can change this with when().

    See Fl_Browser for methods to add and remove lines from the browser. */ -class Fl_Hold_Browser : public Fl_Browser { +class FL_EXPORT Fl_Hold_Browser : public Fl_Browser { public: /** Creates a new Fl_Hold_Browser widget using the given @@ -50,12 +50,16 @@ public: The constructor specializes Fl_Browser() by setting the type to FL_HOLD_BROWSER. The destructor destroys the widget and frees all memory that has been allocated. */ - Fl_Hold_Browser(int X,int Y,int W,int H,const char *l=0) - : Fl_Browser(X,Y,W,H,l) {type(FL_HOLD_BROWSER);} +#if defined(FL_DLL) // implementation in src/Fl_Browser.cxx + Fl_Hold_Browser(int X,int Y,int W,int H,const char *L=0); +#else + Fl_Hold_Browser(int X,int Y,int W,int H,const char *L=0) + : Fl_Browser(X,Y,W,H,L) {type(FL_HOLD_BROWSER);} +#endif }; #endif // -// End of "$Id: Fl_Hold_Browser.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Hold_Browser.H 8736 2011-05-24 20:00:56Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Hor_Fill_Slider.H b/plugins/zynaddsubfx/fltk/FL/Fl_Hor_Fill_Slider.H index e7ebc6d4b..3c5a06312 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Hor_Fill_Slider.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Hor_Fill_Slider.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Hor_Fill_Slider.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Hor_Fill_Slider.H 8022 2010-12-12 23:21:03Z AlbrechtS $" // // Horizontal fill slider header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -33,7 +33,7 @@ #include "Fl_Slider.H" -class Fl_Hor_Fill_Slider : public Fl_Slider { +class FL_EXPORT Fl_Hor_Fill_Slider : public Fl_Slider { public: Fl_Hor_Fill_Slider(int x,int y,int w,int h,const char *l=0) : Fl_Slider(x,y,w,h,l) {type(FL_HOR_FILL_SLIDER);} @@ -42,5 +42,5 @@ public: #endif // -// End of "$Id: Fl_Hor_Fill_Slider.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Hor_Fill_Slider.H 8022 2010-12-12 23:21:03Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Hor_Nice_Slider.H b/plugins/zynaddsubfx/fltk/FL/Fl_Hor_Nice_Slider.H index 6e6fce9db..1305a54e8 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Hor_Nice_Slider.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Hor_Nice_Slider.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Hor_Nice_Slider.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Hor_Nice_Slider.H 8022 2010-12-12 23:21:03Z AlbrechtS $" // // Horizontal "nice" slider header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -33,7 +33,7 @@ #include "Fl_Slider.H" -class Fl_Hor_Nice_Slider : public Fl_Slider { +class FL_EXPORT Fl_Hor_Nice_Slider : public Fl_Slider { public: Fl_Hor_Nice_Slider(int x,int y,int w,int h,const char *l=0) : Fl_Slider(x,y,w,h,l) {type(FL_HOR_NICE_SLIDER); box(FL_FLAT_BOX);} @@ -42,5 +42,5 @@ public: #endif // -// End of "$Id: Fl_Hor_Nice_Slider.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Hor_Nice_Slider.H 8022 2010-12-12 23:21:03Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Hor_Slider.H b/plugins/zynaddsubfx/fltk/FL/Fl_Hor_Slider.H index 9bbee8f2c..82a88cbc8 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Hor_Slider.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Hor_Slider.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Hor_Slider.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Hor_Slider.H 8726 2011-05-23 18:32:47Z AlbrechtS $" // // Horizontal slider header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -33,14 +33,28 @@ #include "Fl_Slider.H" -class Fl_Hor_Slider : public Fl_Slider { +/** Horizontal Slider class. + + \see class Fl_Slider. +*/ +class FL_EXPORT Fl_Hor_Slider : public Fl_Slider { public: - Fl_Hor_Slider(int X,int Y,int W,int H,const char *l=0) - : Fl_Slider(X,Y,W,H,l) {type(FL_HOR_SLIDER);} + + /** + Creates a new Fl_Hor_Slider widget using the given position, + size, and label string. + */ + +#if defined(FL_DLL) // implementation in src/Fl_Slider.cxx + Fl_Hor_Slider(int X,int Y,int W,int H,const char *l=0); +#else + Fl_Hor_Slider(int X,int Y,int W,int H,const char *l=0) + : Fl_Slider(X,Y,W,H,l) { type(FL_HOR_SLIDER); } +#endif }; #endif // -// End of "$Id: Fl_Hor_Slider.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Hor_Slider.H 8726 2011-05-23 18:32:47Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Hor_Value_Slider.H b/plugins/zynaddsubfx/fltk/FL/Fl_Hor_Value_Slider.H index a02a50c31..299944848 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Hor_Value_Slider.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Hor_Value_Slider.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Hor_Value_Slider.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Hor_Value_Slider.H 8022 2010-12-12 23:21:03Z AlbrechtS $" // // Horizontal value slider header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -33,7 +33,7 @@ #include "Fl_Value_Slider.H" -class Fl_Hor_Value_Slider : public Fl_Value_Slider { +class FL_EXPORT Fl_Hor_Value_Slider : public Fl_Value_Slider { public: Fl_Hor_Value_Slider(int X,int Y,int W,int H,const char *l=0) : Fl_Value_Slider(X,Y,W,H,l) {type(FL_HOR_SLIDER);} @@ -42,5 +42,5 @@ public: #endif // -// End of "$Id: Fl_Hor_Value_Slider.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Hor_Value_Slider.H 8022 2010-12-12 23:21:03Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Image.H b/plugins/zynaddsubfx/fltk/FL/Fl_Image.H index 278d70d7d..eb1e7e3fc 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Image.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Image.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Image.H 7617 2010-05-27 17:20:18Z manolo $" +// "$Id: Fl_Image.H 8338 2011-01-30 09:24:40Z manolo $" // // Image header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -59,33 +59,24 @@ class FL_EXPORT Fl_Image { protected: /** - The first form of the w() method returns the current - image width in pixels.

    - -

    The second form is a protected method that sets the current - image width. + Sets the current image width in pixels. */ void w(int W) {w_ = W;} /** - The first form of the h() method returns the current - image height in pixels.

    - -

    The second form is a protected method that sets the current - image height. + Sets the current image height in pixels. */ void h(int H) {h_ = H;} /** - The first form of the d() method returns the current - image depth. The return value will be 0 for bitmaps, 1 for - pixmaps, and 1 to 4 for color images.

    - -

    The second form is a protected method that sets the current - image depth. + Sets the current image depth. */ void d(int D) {d_ = D;} - /** See int ld() */ + /** + Sets the current line data size in bytes. + */ void ld(int LD) {ld_ = LD;} - /** See const char * const *data() */ + /** + Sets the current array pointer and count of pointers in the array. + */ void data(const char * const *p, int c) {data_ = p; count_ = c;} void draw_empty(int X, int Y); @@ -94,26 +85,23 @@ class FL_EXPORT Fl_Image { public: - /** See void Fl_Image::w(int) */ + /** + Returns the current image width in pixels. + */ int w() const {return w_;} - /** See void Fl_Image::h(int) */ + /** Returns the current image height in pixels. + */ int h() const {return h_;} /** - The first form of the d() method returns the current - image depth. The return value will be 0 for bitmaps, 1 for + Returns the current image depth. + The return value will be 0 for bitmaps, 1 for pixmaps, and 1 to 4 for color images.

    - -

    The second form is a protected method that sets the current - image depth. */ int d() const {return d_;} /** - The first form of the ld() method returns the current - line data size in bytes. Line data is extra data that is included - after each line of color image data and is normally not present.

    - -

    The second form is a protected method that sets the current - line data size in bytes. + Returns the current line data size in bytes. + Line data is extra data that is included + after each line of color image data and is normally not present. */ int ld() const {return ld_;} /** @@ -124,12 +112,8 @@ class FL_EXPORT Fl_Image { */ int count() const {return count_;} /** - The first form of the data() method returns a - pointer to the current image data array. Use the - count() method to find the size of the data array.

    - -

    The second form is a protected method that sets the current - array pointer and count of pointers in the array. + Returns a pointer to the current image data array. + Use the count() method to find the size of the data array. */ const char * const *data() const {return data_;} @@ -162,15 +146,16 @@ class FL_EXPORT Fl_Image { virtual void label(Fl_Widget*w); virtual void label(Fl_Menu_Item*m); /** - The draw() methods draw the image. This form specifies + Draws the image with a bounding box. + This form specifies a bounding box for the image, with the origin (upper-lefthand corner) of the image offset by the cx and cy arguments. */ virtual void draw(int X, int Y, int W, int H, int cx=0, int cy=0); // platform dependent /** - The draw() methods draw the image. This form - specifies the upper-lefthand corner of the image + Draws the image. + This form specifies the upper-lefthand corner of the image. */ void draw(int X, int Y) {draw(X, Y, w(), h(), 0, 0);} // platform dependent virtual void uncache(); @@ -226,5 +211,5 @@ public: #endif // !Fl_Image_H // -// End of "$Id: Fl_Image.H 7617 2010-05-27 17:20:18Z manolo $". +// End of "$Id: Fl_Image.H 8338 2011-01-30 09:24:40Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Input.H b/plugins/zynaddsubfx/fltk/FL/Fl_Input.H index 01ae60d48..3f6c49e9d 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Input.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Input.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Input.H 6699 2009-03-18 22:58:12Z engelsman $" +// "$Id: Fl_Input.H 8111 2010-12-23 08:13:18Z manolo $" // // Input header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -37,217 +37,232 @@ This is the FLTK text input widget. It displays a single line of text and lets the user edit it. Normally it is drawn with an inset box and a white background. The text may contain any - characters (even 0), and will correctly display anything, using - ^X notation for unprintable control characters and \\nnn notation - for unprintable characters with the high bit set. It assumes the - font can draw any characters in the ISO-8859-1 character set.

    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - -
    Mouse button 1Moves the cursor to - this point. Drag selects characters. Double click selects words. - Triple click selects all text. Shift+click extends the selection. - When you select text it is automatically copied to the clipboard. -
    Mouse button 2Insert the clipboard at - the point clicked. You can also select a region and replace it with the - clipboard by selecting the region with mouse button 2. -
    Mouse button 3Currently acts like button 1.
    BackspaceDeletes one character to the left, or - deletes the selected region.
    EnterMay cause the callback, see when().
    ^A or HomeGo to start of line.
    ^B or LeftMove left
    ^CCopy the selection to the clipboard
    ^D or DeleteDeletes one character to the right - or deletes the selected region.
    ^E or EndGo to the end of line.
    ^F or RightMove right
    ^KDelete to the end of line (next \\n character) - or deletes a single \\n character. These deletions are all concatenated - into the clipboard.
    ^N or DownMove down (for Fl_Multiline_Input - only, otherwise it moves to the next input field).
    ^P or UpMove up (for Fl_Multiline_Input only, - otherwise it moves to the previous input field).
    ^UDelete everything.
    ^V or ^YPaste the clipboard
    ^X or ^WCopy the region to the clipboard and - delete it.
    ^Z or ^_Undo. This is a single-level undo - mechanism, but all adjacent deletions and insertions are concatenated - into a single "undo". Often this will undo a lot more than you - expected.
    Shift+moveMove the cursor but also extend the - selection.
    RightCtrl or -
    Compose    		 - \anchor Fl_Input_Compose_Character - Start a compose-character - sequence. The next one or two keys typed define the character to - insert (see table that follows.) - -

    For instance, to type "á" type [compose][a]['] or [compose]['][a]. - -

    The character "nbsp" (non-breaking space) is typed by using - [compose][space]. - -

    The single-character sequences may be followed by a space if - necessary to remove ambiguity. For instance, if you really want to - type "ª~" rather than "ã" you must type [compose][a][space][~]. - -

    The same key may be used to "quote" control characters into the - text. If you need a ^Q character you can get one by typing - [compose][Control+Q]. - -

    X may have a key on the keyboard - defined as XK_Multi_key. If so this key may be used as well - as the right-hand control key. You can set this up with the program - xmodmap. - -

    If your keyboard is set to support a foreign language you should - also be able to type "dead key" prefix characters. On X you will - actually be able to see what dead key you typed, and if you then move - the cursor without completing the sequence the accent will remain - inserted.

    - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Character Composition Table
    KeysCharKeysCharKeysCharKeysCharKeysCharKeysChar
    spnbsp*°` AÀD -Ð` aàd -ð
    !¡+ -±' AÁ~ NÑ' aá~ nñ
    %¢2²A ^Â` OÒ^ aâ` oò
    #£3³~ AÃ' OÓ~ aã' oó
    $¤'´: AÄ^ OÔ: aä^ oô
    y =¥uµ* AÅ~ OÕ* aå~ oõ
    |¦pA EÆ: OÖa eæ: oö
    &§.·, CÇx×, cç- :÷
    :¨,¸E `ÈO /Ø` eèo /ø
    c©1¹' EÉ` UÙ' eé` uù
    aªoº^ EÊ' UÚ^ eê' uú
    < <«> >»: EË^ UÛ: eë^ uû
    ~¬1 4¼` IÌ: UÜ` iì: uü
    -­1 2½' IÍ' YÝ' ií' yý
    r®3 4¾^ IÎT HÞ^ iît hþ
    _¯?¿: IÏs sß: iï: yÿ
    -*/ + characters, and will correctly display any UTF text, using + ^X notation for unprintable control characters. It assumes the + font can draw any characters of the used scripts, which is true + for standard fonts under MSWindows and Mac OS X. + Characters can be input using the keyboard or the character palette/map. + Character composition is done using dead keys and/or a compose + key as defined by the operating system. +

    + + +
    Fl_Input keyboard and mouse bindings.
    + Mouse button 1 + + Moves the cursor to this point. + Drag selects characters. + Double click selects words. + Triple click selects all line. + Shift+click extends the selection. + When you select text it is automatically copied to the selection buffer. +
    + Mouse button 2 + + Insert the selection buffer at the point clicked. + You can also select a region and replace it with the selection buffer + by selecting the region with mouse button 2. +
    + Mouse button 3 + + Currently acts like button 1. +
    + Backspace + + Deletes one character to the left, or deletes the selected region. +
    + Delete + + Deletes one character to the right, or deletes the selected region. + Combine with Shift for equivalent of ^X (copy+cut). +
    + Enter + + May cause the callback, see when(). +
    + +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Fl_Input platform specific keyboard bindings.
    Windows/Linux Mac Function
    ^A Command-A + Selects all text in the widget. + +
    ^C Command-C + Copy the current selection to the clipboard. + +
    ^I ^I + Insert a tab. + +
    ^J ^J + Insert a Line Feed.
    + (Similar to literal 'Enter' character) + +
    ^L ^L + Insert a Form Feed. + +
    ^M ^M + Insert a Carriage Return. + +
    ^V,
    Shift-Insert     		Command-V + Paste the clipboard.
    + (Macs keyboards don't have "Insert" keys, + but if they did, Shift-Insert would work) + +
    ^X,
    Shift-Delete     		Command-X,
    Shift-Delete     		+ Cut.
    + Copy the selection to the clipboard and delete it. + (If there's no selection, Shift-Delete acts like Delete) + +
    ^Z Command-Z + Undo.
    + This is a single-level undo mechanism, but all adjacent + deletions and insertions are concatenated into a single "undo". + Often this will undo a lot more than you expected. + +
    Shift-^Z Shift-Command-Z + Redo.
    + Currently same behavior as ^Z. + Reserved for future multilevel undo/redo. + +
    Arrow Keys Arrow Keys + Standard cursor movement.
    + Can be combined with Shift to extend selection. + +
    Home Command-Up,
    Command-Left     		+ Move to start of line.
    + Can be combined with Shift to extend selection. + +
    End Command-Down,
    Command-Right     		+ Move to end of line.
    + Can be combined with Shift to extend selection. + +
    Ctrl-HomeCommand-Up,
    Command-PgUp,
    Ctrl-Left    		 + Move to top of document/field.
    + In single line input, moves to start of line. + In multiline input, moves to start of top line. + Can be combined with Shift to extend selection. + +
    Ctrl-End Command-End,
    Command-PgDn,
    Ctrl-Right    		 + Move to bottom of document/field.
    + In single line input, moves to end of line. + In multiline input, moves to end of last line. + Can be combined with Shift to extend selection. + +
    Ctrl-Left Alt-Left + Word left.
    + Can be combined with Shift to extend selection. + +
    Ctrl-Right Alt-Right + Word right.
    + Can be combined with Shift to extend selection. + +
    Ctrl-Backspace Alt-Backspace + Delete word left. + +
    Ctrl-Delete Alt-Delete + Delete word right. + +
    + */ class FL_EXPORT Fl_Input : public Fl_Input_ { int handle_key(); int shift_position(int p); int shift_up_down_position(int p); void handle_mouse(int keepmark=0); + + // Private keyboard functions + int kf_lines_up(int repeat_num); + int kf_lines_down(int repeat_num); + int kf_page_up(); + int kf_page_down(); + int kf_insert_toggle(); + int kf_delete_word_right(); + int kf_delete_word_left(); + int kf_delete_sol(); + int kf_delete_eol(); + int kf_delete_char_right(); + int kf_delete_char_left(); + int kf_move_sol(); + int kf_move_eol(); + int kf_clear_eol(); + int kf_move_char_left(); + int kf_move_char_right(); + int kf_move_word_left(); + int kf_move_word_right(); + int kf_move_up_and_sol(); + int kf_move_down_and_eol(); + int kf_top(); + int kf_bottom(); + int kf_select_all(); + int kf_undo(); + int kf_redo(); + int kf_copy(); + int kf_paste(); + int kf_copy_cut(); + protected: void draw(); public: @@ -258,5 +273,5 @@ public: #endif // -// End of "$Id: Fl_Input.H 6699 2009-03-18 22:58:12Z engelsman $". +// End of "$Id: Fl_Input.H 8111 2010-12-23 08:13:18Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Input_.H b/plugins/zynaddsubfx/fltk/FL/Fl_Input_.H index dc14ab17f..1638436a4 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Input_.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Input_.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Input_.H 7672 2010-07-10 09:44:45Z matt $" +// "$Id: Fl_Input_.H 8068 2010-12-20 07:48:59Z greg.ercolano $" // // Input base class header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -58,10 +58,10 @@ one of those people who likes to change how the editing keys work. It may also be useful for adding scrollbars to the input field. - + This can act like any of the subclasses of Fl_Input, by setting type() to one of the following values: - + \code #define FL_NORMAL_INPUT 0 #define FL_FLOAT_INPUT 1 @@ -78,26 +78,26 @@ \endcode All variables that represent an index into a text buffer are byte-oriented, - not character oriented. Since utf8 characters can be up to six bytes long, + not character oriented. Since UTF-8 characters can be up to six bytes long, simply incrementing such an index will not reliably advance to the next character - in the text buffer. + in the text buffer. - Indices and pointers into the text buffer should always point at a 7 bit ASCII - character or the beginning of a utf8 character sequence. Behavior for false - utf8 sequences and pointers into the middle of a seqeunce are undefined. + Indices and pointers into the text buffer should always point at a 7 bit ASCII + character or the beginning of a UTF-8 character sequence. Behavior for false + UTF-8 sequences and pointers into the middle of a sequence are undefined. \see Fl_Text_Display, Fl_Text_Editor for more powerful text handling widgets \internal - When porting this widget from ASCII to UTF8, previously legal pointers into + When porting this widget from ASCII to UTF-8, previously legal pointers into the text of this widget can become illegal by pointing into the middle of - a UTF8 seuence. This is not a big problem for Fl_Input_ because all code + a UTF-8 sequence. This is not a big problem for Fl_Input_ because all code in this module is quite tolerant. It could be problematic though when deriving - from this class because no feedback for illegal pointers is given. Additionaly, - a careless "copy" call can put partial UTF8 sequnces into the clipboard. + from this class because no feedback for illegal pointers is given. Additionally, + a careless "copy" call can put partial UTF-8 sequences into the clipboard. - None of these issues should be desasterous. Nevertheless, we should - discuss how FLTK should handle false UTF8 suequences and pointers. + None of these issues should be disastrous. Nevertheless, we should + discuss how FLTK should handle false UTF-8 sequences and pointers. */ class FL_EXPORT Fl_Input_ : public Fl_Widget { @@ -113,17 +113,22 @@ class FL_EXPORT Fl_Input_ : public Fl_Widget { /** \internal \todo Please document me! */ int bufsize; - /** \internal Positin of the cursor in the document */ + /** \internal Position of the cursor in the document. */ int position_; /** \internal Position of the other end of the selected text. If \p position_ equals \p mark_, no text is selected */ int mark_; + /** \internal Behavior of Tab key in multiline input widget. + If enabled (default) Tab causes focus nav, otherwise Tab is inserted + as a character. */ + int tab_nav_; + /** \internal Offset to text origin within widget bounds */ int xscroll_, yscroll_; - /** \internal Minimal update pointer. Display requirs redraw from here to the end + /** \internal Minimal update pointer. Display requires redraw from here to the end of the buffer. */ int mu_p; @@ -148,7 +153,7 @@ class FL_EXPORT Fl_Input_ : public Fl_Widget { /** \internal color of the text cursor */ Fl_Color cursor_color_; - /** \internal Horizontal cursor position in pixels while movin up or down. */ + /** \internal Horizontal cursor position in pixels while moving up or down. */ static double up_down_pos; /** \internal Flag to remember last cursor move. */ @@ -192,7 +197,7 @@ protected: /* Move the cursor to the column given by up_down_pos. */ int up_down_position(int, int keepmark=0); - /* Handle mouse clicks and mose moves. */ + /* Handle mouse clicks and mouse moves. */ void handle_mouse(int, int, int, int, int keepmark=0); /* Handle all kinds of text field related events. */ @@ -294,7 +299,7 @@ public: int position(int p) {return position(p, p);} /** Sets the current selection mark. - mark(n) is the same as position(position(),n). + mark(n) is the same as position(position(),n). \param m new index of the mark \return 0 if the mark did not change \see position(), position(int, int) */ @@ -364,13 +369,13 @@ public: /* Copy the yank buffer to the clipboard. */ int copy_cuts(); - /** Return the shortcut key associtaed with this widget. + /** Return the shortcut key associated with this widget. \return shortcut keystroke \see Fl_Button::shortcut() */ int shortcut() const {return shortcut_;} /** - Sets the shortcut key associtaed with this widget. + Sets the shortcut key associated with this widget. Pressing the shortcut key gives text editing focus to this widget. \param [in] s new shortcut keystroke \see Fl_Button::shortcut() @@ -446,10 +451,47 @@ public: void wrap(int b) { if (b) type((uchar)(type() | FL_INPUT_WRAP)); else type((uchar)(type() & ~FL_INPUT_WRAP)); } + /** + Sets whether the Tab key does focus navigation, + or inserts tab characters into Fl_Multiline_Input. + + By default this flag is enabled to provide the 'normal' behavior + most users expect; Tab navigates focus to the next widget. + To inserting an actual Tab character, users can use Ctrl-I + or copy/paste. + + Disabling this flag gives the old FLTK behavior where Tab + inserts a tab character into the text field, in which case + only the mouse can be used to navigate to the next field. + + History: This flag was provided for backwards support of FLTK's old 1.1.x + behavior where Tab inserts a tab character instead of navigating + focus to the next widget. This behavior was unique to Fl_Multiline_Input. + With the advent of Fl_Text_Editor, this old behavior has been deprecated. + + \param [in] val If \p val is 1, Tab advances focus (default).
    + If \p val is 0, Tab inserts a tab character (old FLTK behavior). + */ + void tab_nav(int val) { + tab_nav_ = val; + } + + /** + Gets whether the Tab key causes focus navigation in multiline input fields or not. + + If enabled (default), hitting Tab causes focus navigation to the next widget. + + If disabled, hitting Tab inserts a tab character into the text field. + \returns 1 if Tab advances focus (default), 0 if Tab inserts tab characters. + \see tab_nav(int) + */ + int tab_nav() const { + return tab_nav_; + } }; #endif // -// End of "$Id: Fl_Input_.H 7672 2010-07-10 09:44:45Z matt $". +// End of "$Id: Fl_Input_.H 8068 2010-12-20 07:48:59Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Input_Choice.H b/plugins/zynaddsubfx/fltk/FL/Fl_Input_Choice.H index b0fbe1f27..843e74954 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Input_Choice.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Input_Choice.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Input_Choice.H 7115 2010-02-20 17:40:07Z AlbrechtS $" +// "$Id: Fl_Input_Choice.H 8022 2010-12-12 23:21:03Z AlbrechtS $" // // An input/chooser widget. // ______________ ____ @@ -7,7 +7,7 @@ // | input area || \/ | // |______________||____| // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // Copyright 2004 by Greg Ercolano. // // This library is free software; you can redistribute it and/or @@ -56,7 +56,7 @@ widgets directly, using the menubutton() and input() accessor methods. */ -class Fl_Input_Choice : public Fl_Group { +class FL_EXPORT Fl_Input_Choice : public Fl_Group { // Private class to handle slightly 'special' behavior of menu button class InputMenuButton : public Fl_Menu_Button { void draw() { @@ -218,5 +218,5 @@ public: #endif // !Fl_Input_Choice_H // -// End of "$Id: Fl_Input_Choice.H 7115 2010-02-20 17:40:07Z AlbrechtS $". +// End of "$Id: Fl_Input_Choice.H 8022 2010-12-12 23:21:03Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Int_Input.H b/plugins/zynaddsubfx/fltk/FL/Fl_Int_Input.H index 85db694b6..9bc947782 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Int_Input.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Int_Input.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Int_Input.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Int_Input.H 8726 2011-05-23 18:32:47Z AlbrechtS $" // // Integer input header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -34,22 +34,28 @@ #include "Fl_Input.H" /** - The Fl_Int_Input class is a subclass of Fl_Input - that only allows the user to type decimal digits (or hex numbers of the form 0xaef). + The Fl_Int_Input class is a subclass of Fl_Input that only allows + the user to type decimal digits (or hex numbers of the form 0xaef). */ -class Fl_Int_Input : public Fl_Input { +class FL_EXPORT Fl_Int_Input : public Fl_Input { public: /** Creates a new Fl_Int_Input widget using the given position, size, and label string. The default boxtype is FL_DOWN_BOX. -

    Inherited destructor Destroys the widget and any value associated with it. + + Inherited destructor destroys the widget and any value associated with it. */ + +#if defined(FL_DLL) // implementation in src/Fl_Input.cxx + Fl_Int_Input(int X,int Y,int W,int H,const char *l = 0); +#else Fl_Int_Input(int X,int Y,int W,int H,const char *l = 0) : Fl_Input(X,Y,W,H,l) {type(FL_INT_INPUT);} +#endif }; #endif // -// End of "$Id: Fl_Int_Input.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Int_Input.H 8726 2011-05-23 18:32:47Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Light_Button.H b/plugins/zynaddsubfx/fltk/FL/Fl_Light_Button.H index 23085a3da..a5786c27b 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Light_Button.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Light_Button.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Light_Button.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Light_Button.H 8178 2011-01-04 14:09:37Z manolo $" // // Lighted button header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -34,15 +34,15 @@ #include "Fl_Button.H" /** -

    This subclass displays the "on" state by turning on a light, + This subclass displays the "on" state by turning on a light, rather than drawing pushed in. The shape of the "light" is initially set to FL_DOWN_BOX. The color of the light when on is controlled with selection_color(), which defaults to FL_YELLOW. Buttons generate callbacks when they are clicked by the user. You control exactly when and how by changing the values for type() and when(). -

    \image html Fl_Light_Button.gif

    - \image latex Fl_Light_Button.eps "Fl_Light_Button" width=4cm +

    \image html Fl_Light_Button.png

    + \image latex Fl_Light_Button.png "Fl_Light_Button" width=4cm */ class FL_EXPORT Fl_Light_Button : public Fl_Button { protected: @@ -55,5 +55,5 @@ public: #endif // -// End of "$Id: Fl_Light_Button.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Light_Button.H 8178 2011-01-04 14:09:37Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Line_Dial.H b/plugins/zynaddsubfx/fltk/FL/Fl_Line_Dial.H index 64763c0b8..ade856c17 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Line_Dial.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Line_Dial.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Line_Dial.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Line_Dial.H 8022 2010-12-12 23:21:03Z AlbrechtS $" // // Line dial header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -33,7 +33,7 @@ #include "Fl_Dial.H" -class Fl_Line_Dial : public Fl_Dial { +class FL_EXPORT Fl_Line_Dial : public Fl_Dial { public: Fl_Line_Dial(int x,int y,int w,int h, const char *l = 0) : Fl_Dial(x,y,w,h,l) {type(FL_LINE_DIAL);} @@ -42,5 +42,5 @@ public: #endif // -// End of "$Id: Fl_Line_Dial.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Line_Dial.H 8022 2010-12-12 23:21:03Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Menu.H b/plugins/zynaddsubfx/fltk/FL/Fl_Menu.H index 8cc42e32f..a35dd4a89 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Menu.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Menu.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Menu.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Menu.H 7903 2010-11-28 21:06:39Z matt $" // // Old menu header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -29,5 +29,5 @@ #include "Fl_Menu_Item.H" // -// End of "$Id: Fl_Menu.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Menu.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Menu_.H b/plugins/zynaddsubfx/fltk/FL/Fl_Menu_.H index 9f4319ef2..278ad8ca9 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Menu_.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Menu_.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Menu_.H 7517 2010-04-16 17:55:45Z greg.ercolano $" +// "$Id: Fl_Menu_.H 7903 2010-11-28 21:06:39Z matt $" // // Menu base class header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -70,6 +70,17 @@ public: int find_index(const Fl_Menu_Item *item) const; int find_index(Fl_Callback *cb) const; + /** + Returns the menu item with the entered shortcut (key value). + + This searches the complete menu() for a shortcut that matches the + entered key value. It must be called for a FL_KEYBOARD or FL_SHORTCUT + event. + + If a match is found, the menu's callback will be called. + + \return matched Fl_Menu_Item or NULL. + */ const Fl_Menu_Item* test_shortcut() {return picked(menu()->test_shortcut());} void global(); @@ -116,9 +127,9 @@ public: the new value is different than the old one. */ int value(int i) {return value(menu_+i);} - /** Returns the title of the last item chosen, or of item i. */ + /** Returns the title of the last item chosen. */ const char *text() const {return value_ ? value_->text : 0;} - /** Returns the title of the last item chosen, or of item i. */ + /** Returns the title of item i. */ const char *text(int i) const {return menu_[i].text;} /** Gets the current font of menu item labels. */ @@ -153,5 +164,5 @@ public: #endif // -// End of "$Id: Fl_Menu_.H 7517 2010-04-16 17:55:45Z greg.ercolano $". +// End of "$Id: Fl_Menu_.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Bar.H b/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Bar.H index e48adbcdc..5e522f6ad 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Bar.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Bar.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Menu_Bar.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Menu_Bar.H 7981 2010-12-08 23:53:04Z greg.ercolano $" // // Menu bar header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -44,8 +44,8 @@ top level menu defines the items in the menubar, while the submenus define the pull-down menus. Sub-sub menus and lower pop up to the right of the submenus.

    -

    \image html menubar.gif

    - \image latex menubar.eps " menubar" width=12cm +

    \image html menubar.png

    + \image latex menubar.png " menubar" width=12cm

    If there is an item in the top menu that is not a title of a submenu, then it acts like a "button" in the menubar. Clicking on it will pick it.

    @@ -85,5 +85,5 @@ public: #endif // -// End of "$Id: Fl_Menu_Bar.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Menu_Bar.H 7981 2010-12-08 23:53:04Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Button.H b/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Button.H index 430b66087..a5ff5d89b 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Button.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Button.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Menu_Button.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Menu_Button.H 8016 2010-12-12 11:19:12Z manolo $" // // Menu button header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -37,12 +37,14 @@ This is a button that when pushed pops up a menu (or hierarchy of menus) defined by an array of Fl_Menu_Item objects. -

    \image html menu_button.gif

    - \image latex menu_button.eps " menu_button" width=5cm +

    \image html menu_button.png

    + \image latex menu_button.png " menu_button" width=5cm

    Normally any mouse button will pop up a menu and it is lined up below the button as shown in the picture. However an Fl_Menu_Button - may also control a pop-up menu. This is done by setting the type() - , see below.

    + may also control a pop-up menu. This is done by setting the type(). + If type() is zero a normal menu button is produced. + If it is nonzero then this is a pop-up menu. The bits in type() indicate + what mouse buttons pop up the menu (see Fl_Menu_Button::popup_buttons).

    The menu will also pop up in response to shortcuts indicated by putting a '&' character in the label().

    Typing the shortcut() of any of the menu items will cause @@ -58,8 +60,20 @@ class FL_EXPORT Fl_Menu_Button : public Fl_Menu_ { protected: void draw(); public: - // values for type: - enum {POPUP1 = 1, POPUP2, POPUP12, POPUP3, POPUP13, POPUP23, POPUP123}; + /** + \brief indicate what mouse buttons pop up the menu. + + Values for type() used to indicate what mouse buttons pop up the menu. + Fl_Menu_Button::POPUP3 is usually what you want. + */ + enum popup_buttons {POPUP1 = 1, /**< pops up with the mouse 1st button. */ + POPUP2, /**< pops up with the mouse 2nd button. */ + POPUP12, /**< pops up with the mouse 1st or 2nd buttons. */ + POPUP3, /**< pops up with the mouse 3rd button. */ + POPUP13, /**< pops up with the mouse 1st or 3rd buttons. */ + POPUP23, /**< pops up with the mouse 2nd or 3rd buttons. */ + POPUP123 /**< pops up with any mouse button. */ + }; int handle(int); const Fl_Menu_Item* popup(); Fl_Menu_Button(int,int,int,int,const char * =0); @@ -68,5 +82,5 @@ public: #endif // -// End of "$Id: Fl_Menu_Button.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Menu_Button.H 8016 2010-12-12 11:19:12Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Item.H b/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Item.H index 25b46732e..4d5869933 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Item.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Item.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Menu_Item.H 7517 2010-04-16 17:55:45Z greg.ercolano $" +// "$Id: Fl_Menu_Item.H 7983 2010-12-09 00:04:06Z AlbrechtS $" // // Menu item header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -56,11 +56,11 @@ class Fl_Menu_; is used by the Fl_Menu_ class. \code struct Fl_Menu_Item { - const char* text; // label() + const char* text; // label() ulong shortcut_; - Fl_Callback* callback_; + Fl_Callback* callback_; void* user_data_; - int flags; + int flags; uchar labeltype_; uchar labelfont_; uchar labelsize_; @@ -102,8 +102,8 @@ class Fl_Menu_; \endcode produces: - \image html menu.gif - \image latex menu.eps "menu" width=10cm + \image html menu.png + \image latex menu.png "menu" width=10cm A submenu title is identified by the bit FL_SUBMENU in the flags field, and ends with a label() that is NULL. @@ -119,12 +119,12 @@ struct FL_EXPORT Fl_Menu_Item { const char *text; ///< menu item text, returned by label() int shortcut_; ///< menu item shortcut Fl_Callback *callback_; ///< menu item callback - void *user_data_; ///< menu item user_data for 3rd party apps + void *user_data_; ///< menu item user_data for the menu's callback int flags; ///< menu item flags like FL_MENU_TOGGLE, FL_MENU_RADIO uchar labeltype_; ///< how the menu item text looks like Fl_Font labelfont_; ///< which font for this menu item text Fl_Fontsize labelsize_; ///< size of menu item text - Fl_Color labelcolor_; ///< menu item text color + Fl_Color labelcolor_; ///< menu item text color // advance N items, skipping submenus: const Fl_Menu_Item *next(int=1) const; @@ -148,7 +148,7 @@ struct FL_EXPORT Fl_Menu_Item { Returns the title of the item. A NULL here indicates the end of the menu (or of a submenu). A '&' in the item will print an underscore under the next letter, - and if the menu is popped up that letter will be a "shortcut" to pick + and if the menu is popped up that letter will be a "shortcut" to pick that item. To get a real '&' put two in a row. */ const char* label() const {return text;} @@ -160,6 +160,7 @@ struct FL_EXPORT Fl_Menu_Item { void label(Fl_Labeltype a,const char* b) {labeltype_ = a; text = b;} /** + Returns the menu item's labeltype. A labeltype identifies a routine that draws the label of the widget. This can be used for special effects such as emboss, or to use the label() pointer as another form of data such as a bitmap. @@ -168,6 +169,7 @@ struct FL_EXPORT Fl_Menu_Item { Fl_Labeltype labeltype() const {return (Fl_Labeltype)labeltype_;} /** + Sets the menu item's labeltype. A labeltype identifies a routine that draws the label of the widget. This can be used for special effects such as emboss, or to use the label() pointer as another form of data such as a bitmap. @@ -176,77 +178,100 @@ struct FL_EXPORT Fl_Menu_Item { void labeltype(Fl_Labeltype a) {labeltype_ = a;} /** + Gets the menu item's label color. This color is passed to the labeltype routine, and is typically the color of the label text. This defaults to FL_BLACK. If this - color is not black fltk will not use overlay bitplanes to draw + color is not black fltk will \b not use overlay bitplanes to draw the menu - this is so that images put in the menu draw correctly. */ Fl_Color labelcolor() const {return labelcolor_;} - /** See Fl_Color Fl_Menu_Item::labelcolor() const */ + /** + Sets the menu item's label color. + \see Fl_Color Fl_Menu_Item::labelcolor() const + */ void labelcolor(Fl_Color a) {labelcolor_ = a;} /** - Fonts are identified by small 8-bit indexes into a table. See the + Gets the menu item's label font. + Fonts are identified by small 8-bit indexes into a table. See the enumeration list for predefined fonts. The default value is a Helvetica font. The function Fl::set_font() can define new fonts. */ Fl_Font labelfont() const {return labelfont_;} /** - Fonts are identified by small 8-bit indexes into a table. See the + Sets the menu item's label font. + Fonts are identified by small 8-bit indexes into a table. See the enumeration list for predefined fonts. The default value is a Helvetica font. The function Fl::set_font() can define new fonts. */ void labelfont(Fl_Font a) {labelfont_ = a;} - /** Gets the label font pixel size/height.*/ + /** Gets the label font pixel size/height. */ Fl_Fontsize labelsize() const {return labelsize_;} /** Sets the label font pixel size/height.*/ void labelsize(Fl_Fontsize a) {labelsize_ = a;} /** - Each item has space for a callback function and an argument for that - function. Due to back compatibility, the Fl_Menu_Item itself - is not passed to the callback, instead you have to get it by calling - ((Fl_Menu_*)w)->mvalue() where w is the widget argument. + Returns the callback function that is set for the menu item. + Each item has space for a callback function and an argument for that + function. Due to back compatibility, the Fl_Menu_Item itself + is not passed to the callback, instead you have to get it by calling + ((Fl_Menu_*)w)->mvalue() where w is the widget argument. */ Fl_Callback_p callback() const {return callback_;} - /** See Fl_Callback_p Fl_MenuItem::callback() const */ + /** + Sets the menu item's callback function and userdata() argument. + \see Fl_Callback_p Fl_MenuItem::callback() const + */ void callback(Fl_Callback* c, void* p) {callback_=c; user_data_=p;} - /** See Fl_Callback_p Fl_MenuItem::callback() const */ + /** + Sets the menu item's callback function. + This method does not set the userdata() argument. + \see Fl_Callback_p Fl_MenuItem::callback() const + */ void callback(Fl_Callback* c) {callback_=c;} - /** See Fl_Callback_p Fl_MenuItem::callback() const */ + /** + Sets the menu item's callback function. + This method does not set the userdata() argument. + \see Fl_Callback_p Fl_MenuItem::callback() const + */ void callback(Fl_Callback0*c) {callback_=(Fl_Callback*)c;} - /** See Fl_Callback_p Fl_MenuItem::callback() const */ + /** + Sets the menu item's callback function and userdata() argument. + This method does not set the userdata() argument. + The argument \p is cast to void* and stored as the userdata() + for the menu item's callback function. + \see Fl_Callback_p Fl_MenuItem::callback() const + */ void callback(Fl_Callback1*c, long p=0) {callback_=(Fl_Callback*)c; user_data_=(void*)p;} /** - Get or set the user_data argument that is sent to the - callback function. + Gets the user_data() argument that is sent to the callback function. */ void* user_data() const {return user_data_;} /** - Get or set the user_data argument that is sent to the - callback function. + Sets the user_data() argument that is sent to the callback function. */ void user_data(void* v) {user_data_ = v;} /** + Gets the user_data() argument that is sent to the callback function. For convenience you can also define the callback as taking a long - argument. This is implemented by casting this to a Fl_Callback - and casting the long to a void* and may not be - portable to some machines. + argument. This method casts the stored userdata() argument to long + and returns it as a \e long value. */ - intptr_t argument() const {return (intptr_t)user_data_;} + long argument() const {return (long)(fl_intptr_t)user_data_;} /** + Sets the user_data() argument that is sent to the callback function. For convenience you can also define the callback as taking a long - argument. This is implemented by casting this to a Fl_Callback - and casting the long to a void* and may not be - portable to some machines. + argument. This method casts the given argument \p v to void* + and stores it in the menu item's userdata() member. + This may not be portable to some machines. */ void argument(long v) {user_data_ = (void*)v;} @@ -278,15 +303,15 @@ struct FL_EXPORT Fl_Menu_Item { */ int submenu() const {return flags&(FL_SUBMENU|FL_SUBMENU_POINTER);} /** - Returns true if a checkbox will be drawn next to this item. This is - true if FL_MENU_TOGGLE or FL_MENU_RADIO is set in the flags. + Returns true if a checkbox will be drawn next to this item. + This is true if FL_MENU_TOGGLE or FL_MENU_RADIO is set in the flags. */ int checkbox() const {return flags&FL_MENU_TOGGLE;} /** - Returns true if this item is a radio item. When a radio button is - selected all "adjacent" radio buttons are turned off. A set of radio - items is delimited by an item that has radio() false, or by an - item with FL_MENU_DIVIDER turned on. + Returns true if this item is a radio item. + When a radio button is selected all "adjacent" radio buttons are + turned off. A set of radio items is delimited by an item that has + radio() false, or by an item with FL_MENU_DIVIDER turned on. */ int radio() const {return flags&FL_MENU_RADIO;} /** Returns the current value of the check or radio item. */ @@ -349,29 +374,28 @@ struct FL_EXPORT Fl_Menu_Item { const Fl_Menu_Item* title = 0, int menubar=0) const; const Fl_Menu_Item* test_shortcut() const; - const Fl_Menu_Item* find_shortcut(int *ip=0) const; + const Fl_Menu_Item* find_shortcut(int *ip=0, const bool require_alt = false) const; /** - Calls the Fl_Menu_Item item's callback, and provides the - Fl_Widget argument (and optionally overrides the user_data() - argument). You must first check that callback() is non-zero - before calling this. + Calls the Fl_Menu_Item item's callback, and provides the Fl_Widget argument. + The callback is called with the stored user_data() as its second argument. + You must first check that callback() is non-zero before calling this. */ void do_callback(Fl_Widget* o) const {callback_(o, user_data_);} /** - Calls the Fl_Menu_Item item's callback, and provides the - Fl_Widget argument (and optionally overrides the user_data() - argument). You must first check that callback() is non-zero - before calling this. + Calls the Fl_Menu_Item item's callback, and provides the Fl_Widget argument. + This call overrides the callback's second argument with the given value \p arg. + You must first check that callback() is non-zero before calling this. */ void do_callback(Fl_Widget* o,void* arg) const {callback_(o, arg);} /** - Calls the Fl_Menu_Item item's callback, and provides the - Fl_Widget argument (and optionally overrides the user_data() - argument). You must first check that callback() is non-zero - before calling this. + Calls the Fl_Menu_Item item's callback, and provides the Fl_Widget argument. + This call overrides the callback's second argument with the + given value \p arg. long \p arg is cast to void* when calling + the callback. + You must first check that callback() is non-zero before calling this. */ void do_callback(Fl_Widget* o,long arg) const {callback_(o, (void*)arg);} @@ -415,5 +439,5 @@ enum { // back-compatibility enum: #endif // -// End of "$Id: Fl_Menu_Item.H 7517 2010-04-16 17:55:45Z greg.ercolano $". +// End of "$Id: Fl_Menu_Item.H 7983 2010-12-09 00:04:06Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Window.H b/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Window.H index 217e224af..cca5a97d6 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Window.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Menu_Window.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Menu_Window.H 6909 2009-09-28 14:41:43Z matt $" +// "$Id: Fl_Menu_Window.H 7903 2010-11-28 21:06:39Z matt $" // // Menu window header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -64,5 +64,5 @@ public: #endif // -// End of "$Id: Fl_Menu_Window.H 6909 2009-09-28 14:41:43Z matt $". +// End of "$Id: Fl_Menu_Window.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Multi_Browser.H b/plugins/zynaddsubfx/fltk/FL/Fl_Multi_Browser.H index 18303b18c..6a8661112 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Multi_Browser.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Multi_Browser.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Multi_Browser.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Multi_Browser.H 8736 2011-05-24 20:00:56Z AlbrechtS $" // // Multi browser header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -43,7 +43,7 @@ mouse, but you can change this with when().

    See Fl_Browser for methods to add and remove lines from the browser. */ -class Fl_Multi_Browser : public Fl_Browser { +class FL_EXPORT Fl_Multi_Browser : public Fl_Browser { public: /** Creates a new Fl_Multi_Browser widget using the given @@ -51,12 +51,16 @@ public: The constructor specializes Fl_Browser() by setting the type to FL_MULTI_BROWSER. The destructor destroys the widget and frees all memory that has been allocated. */ +#if defined(FL_DLL) // implementation in src/Fl_Browser.cxx + Fl_Multi_Browser(int X,int Y,int W,int H,const char *L=0); +#else Fl_Multi_Browser(int X,int Y,int W,int H,const char *L=0) : Fl_Browser(X,Y,W,H,L) {type(FL_MULTI_BROWSER);} +#endif }; #endif // -// End of "$Id: Fl_Multi_Browser.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Multi_Browser.H 8736 2011-05-24 20:00:56Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Multi_Label.H b/plugins/zynaddsubfx/fltk/FL/Fl_Multi_Label.H index c53a3f8c4..0b160d13d 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Multi_Label.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Multi_Label.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Multi_Label.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Multi_Label.H 7903 2010-11-28 21:06:39Z matt $" // // Multi-label header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -43,5 +43,5 @@ struct FL_EXPORT Fl_Multi_Label { #endif // -// End of "$Id: Fl_Multi_Label.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Multi_Label.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Multiline_Input.H b/plugins/zynaddsubfx/fltk/FL/Fl_Multiline_Input.H index 5f46624be..a22bfaa3c 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Multiline_Input.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Multiline_Input.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Multiline_Input.H 6889 2009-09-19 22:09:00Z greg.ercolano $" +// "$Id: Fl_Multiline_Input.H 8726 2011-05-23 18:32:47Z AlbrechtS $" // // Multiline input header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -38,29 +38,38 @@ This input field displays '\n' characters as new lines rather than ^J, and accepts the Return, Tab, and up and down arrow keys. This is for editing multiline text. -

    + This is far from the nirvana of text editors, and is probably only good for small bits of text, 10 lines at most. Note that this widget does not support scrollbars or per-character color control. -

    + If you are presenting large amounts of text and need scrollbars or full color control of characters, you probably want Fl_Text_Editor instead. -

    + + In FLTK 1.3.x, the default behavior of the 'Tab' key was changed + to support consistent focus navigation. To get the older FLTK 1.1.x + behavior, set Fl_Input_::tab_nav() to 0. Newer programs should consider using + Fl_Text_Editor. */ -class Fl_Multiline_Input : public Fl_Input { +class FL_EXPORT Fl_Multiline_Input : public Fl_Input { public: /** Creates a new Fl_Multiline_Input widget using the given position, size, and label string. The default boxtype is FL_DOWN_BOX. -

    Inherited destructor destroys the widget and any value associated with it. + + Inherited destructor destroys the widget and any value associated with it. */ +#if defined(FL_DLL) // implementation in src/Fl_Input.cxx + Fl_Multiline_Input(int X,int Y,int W,int H,const char *l = 0); +#else Fl_Multiline_Input(int X,int Y,int W,int H,const char *l = 0) : Fl_Input(X,Y,W,H,l) {type(FL_MULTILINE_INPUT);} +#endif }; #endif // -// End of "$Id: Fl_Multiline_Input.H 6889 2009-09-19 22:09:00Z greg.ercolano $". +// End of "$Id: Fl_Multiline_Input.H 8726 2011-05-23 18:32:47Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Multiline_Output.H b/plugins/zynaddsubfx/fltk/FL/Fl_Multiline_Output.H index f0edf63d0..087d6ed6d 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Multiline_Output.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Multiline_Output.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Multiline_Output.H 6889 2009-09-19 22:09:00Z greg.ercolano $" +// "$Id: Fl_Multiline_Output.H 8726 2011-05-23 18:32:47Z AlbrechtS $" // // Multi line output header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -37,28 +37,34 @@ This widget is a subclass of Fl_Output that displays multiple lines of text. It also displays tab characters as whitespace to the next column. -

    + Note that this widget does not support scrollbars, or per-character color control. -

    + If you are presenting large amounts of read-only text and need scrollbars, or full color control of characters, then use Fl_Text_Display. If you want to display HTML text, use Fl_Help_View. */ -class Fl_Multiline_Output : public Fl_Output { +class FL_EXPORT Fl_Multiline_Output : public Fl_Output { public: + /** - Creates a new Fl_Multiline_Output widget using the given - position, size, and label string. The default boxtype is FL_DOWN_BOX -

    Inherited destructor destroys the widget and any value associated with it. + Creates a new Fl_Multiline_Output widget using the given position, + size, and label string. The default boxtype is FL_DOWN_BOX. + + Inherited destructor destroys the widget and any value associated with it. */ +#if defined(FL_DLL) // implementation in src/Fl_Input.cxx + Fl_Multiline_Output(int X,int Y,int W,int H,const char *l = 0); +#else Fl_Multiline_Output(int X,int Y,int W,int H,const char *l = 0) : Fl_Output(X,Y,W,H,l) {type(FL_MULTILINE_OUTPUT);} +#endif }; #endif // -// End of "$Id: Fl_Multiline_Output.H 6889 2009-09-19 22:09:00Z greg.ercolano $". +// End of "$Id: Fl_Multiline_Output.H 8726 2011-05-23 18:32:47Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Native_File_Chooser.H b/plugins/zynaddsubfx/fltk/FL/Fl_Native_File_Chooser.H index dac6807a7..ad76c68d2 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Native_File_Chooser.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Native_File_Chooser.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Native_File_Chooser.H 7003 2010-01-14 20:47:59Z greg.ercolano $" +// "$Id: Fl_Native_File_Chooser.H 8380 2011-02-06 10:07:28Z manolo $" // // FLTK native OS file chooser widget // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // Copyright 2004 Greg Ercolano. // // This library is free software; you can redistribute it and/or @@ -26,26 +26,280 @@ // http://www.fltk.org/str.php // +/** \file + Fl_Native_File_Chooser widget. */ + +/** + \class Fl_Native_File_Chooser + + This class lets an FLTK application easily and consistently access + the operating system's native file chooser. Some operating systems + have very complex and specific file choosers that many users want + access to specifically, instead of FLTK's default file chooser(s). + + In cases where there is no native file browser, FLTK's own file browser + is used instead. + + To use this widget correctly, use the following include in your code: + \code + #include + \endcode + Do not include the other Fl_Native_File_Choser_XXX.H files in your code; + those are platform specific files that will be included automatically + depending on your build platform. + + The following example shows how to pick a single file: + \code + // Create and post the local native file chooser + #include + [..] + Fl_Native_File_Chooser fnfc; + fnfc.title("Pick a file"); + fnfc.type(Fl_Native_File_Chooser::BROWSE_FILE); + fnfc.filter("Text\t*.txt\n" + "C Files\t*.{cxx,h,c}"); + fnfc.directory("/var/tmp"); // default directory to use + // Show native chooser + switch ( fnfc.show() ) { + case -1: printf("ERROR: %s\n", fnfc.errmsg()); break; // ERROR + case 1: printf("CANCEL\n"); break; // CANCEL + default: printf("PICKED: %s\n", fnfc.filename()); break; // FILE CHOSEN + } + \endcode + + Platform Specific Caveats + + - Under X windows, it's best if you call Fl_File_Icon::load_system_icons() + at the start of main(), to enable the nicer looking file browser widgets. + Use the static public attributes of class Fl_File_Chooser to localize + the browser. + - Some operating systems support certain OS specific options; see + Fl_Native_File_Chooser::options() for a list. + + \image html Fl_Native_File_Chooser.png "The Fl_Native_File_Chooser on different platforms." + \image latex Fl_Native_File_Chooser.png "The Fl_Native_File_Chooser on different platforms" width=14cm + +*/ #ifndef FL_NATIVE_FILE_CHOOSER_H #define FL_NATIVE_FILE_CHOOSER_H +/* \file + Fl_Native_File_Chooser widget. */ + // Use Windows' chooser #ifdef WIN32 -#include +// #define _WIN32_WINNT 0x0501 // needed for OPENFILENAME's 'FlagsEx' +#include +#include // malloc +#include +#include // OPENFILENAME, GetOpenFileName() +#include // BROWSEINFO, SHBrowseForFolder() #endif // Use Apple's chooser #ifdef __APPLE__ -#include +#include +#define MAXFILTERS 80 #endif // All else falls back to FLTK's own chooser #if ! defined(__APPLE__) && !defined(WIN32) -#include +#include +#include // _POSIX_NAME_MAX #endif + +/** + This class lets an FLTK application easily and consistently access + the operating system's native file chooser. Some operating systems + have very complex and specific file choosers that many users want + access to specifically, instead of FLTK's default file chooser(s). + + In cases where there is no native file browser, FLTK's own file browser + is used instead. + + To use this widget, use the following include in your code: + \code + #include + \endcode + + The following example shows how to pick a single file: + \code + // Create and post the local native file chooser + #include + [..] + Fl_Native_File_Chooser fnfc; + fnfc.title("Pick a file"); + fnfc.type(Fl_Native_File_Chooser::BROWSE_FILE); + fnfc.filter("Text\t*.txt\n" + "C Files\t*.{cxx,h,c}"); + fnfc.directory("/var/tmp"); // default directory to use + // Show native chooser + switch ( fnfc.show() ) { + case -1: printf("ERROR: %s\n", fnfc.errmsg()); break; // ERROR + case 1: printf("CANCEL\n"); break; // CANCEL + default: printf("PICKED: %s\n", fnfc.filename()); break; // FILE CHOSEN + } + \endcode + + Platform Specific Caveats + + - Under X windows, it's best if you call Fl_File_Icon::load_system_icons() + at the start of main(), to enable the nicer looking file browser widgets. + Use the static public attributes of class Fl_File_Chooser to localize + the browser. + - Some operating systems support certain OS specific options; see + Fl_Native_File_Chooser::options() for a list. + + \image html Fl_Native_File_Chooser.png "The Fl_Native_File_Chooser on different platforms." + \image latex Fl_Native_File_Chooser.png "The Fl_Native_File_Chooser on different platforms" width=14cm + + */ +class FL_EXPORT Fl_Native_File_Chooser { +public: + enum Type { + BROWSE_FILE = 0, ///< browse files (lets user choose one file) + BROWSE_DIRECTORY, ///< browse directories (lets user choose one directory) + BROWSE_MULTI_FILE, ///< browse files (lets user choose multiple files) + BROWSE_MULTI_DIRECTORY, ///< browse directories (lets user choose multiple directories) + BROWSE_SAVE_FILE, ///< browse to save a file + BROWSE_SAVE_DIRECTORY ///< browse to save a directory + }; + enum Option { + NO_OPTIONS = 0x0000, ///< no options enabled + SAVEAS_CONFIRM = 0x0001, ///< Show native 'Save As' overwrite confirm dialog (if supported) + NEW_FOLDER = 0x0002, ///< Show 'New Folder' icon (if supported) + PREVIEW = 0x0004 ///< enable preview mode + }; + /** Localizable message */ + static const char *file_exists_message; + +public: + Fl_Native_File_Chooser(int val=BROWSE_FILE); + ~Fl_Native_File_Chooser(); + + // Public methods + void type(int); + int type() const; + void options(int); + int options() const; + int count() const; + const char *filename() const; + const char *filename(int i) const; + void directory(const char *val); + const char *directory() const; + void title(const char *); + const char* title() const; + const char *filter() const; + void filter(const char *); + int filters() const; + void filter_value(int i); + int filter_value() const; + void preset_file(const char*); + const char* preset_file() const; + const char *errmsg() const; + int show(); + +#ifdef WIN32 +private: + int _btype; // kind-of browser to show() + int _options; // general options + OPENFILENAMEW _ofn; // GetOpenFileName() & GetSaveFileName() struct + BROWSEINFO _binf; // SHBrowseForFolder() struct + char **_pathnames; // array of pathnames + int _tpathnames; // total pathnames + char *_directory; // default pathname to use + char *_title; // title for window + char *_filter; // user-side search filter + char *_parsedfilt; // filter parsed for Windows dialog + int _nfilters; // number of filters parse_filter counted + char *_preset_file; // the file to preselect + char *_errmsg; // error message + + // Private methods + void errmsg(const char *msg); + + void clear_pathnames(); + void set_single_pathname(const char *s); + void add_pathname(const char *s); + + void FreePIDL(ITEMIDLIST *pidl); + void ClearOFN(); + void ClearBINF(); + void Win2Unix(char *s); + void Unix2Win(char *s); + int showfile(); + static int CALLBACK Dir_CB(HWND win, UINT msg, LPARAM param, LPARAM data); + int showdir(); + + void parse_filter(const char *); + void clear_filters(); + void add_filter(const char *, const char *); +#endif + +#ifdef __APPLE__ +private: + int _btype; // kind-of browser to show() + int _options; // general options + void *_panel; + char **_pathnames; // array of pathnames + int _tpathnames; // total pathnames + char *_directory; // default pathname to use + char *_title; // title for window + char *_preset_file; // the 'save as' filename + + char *_filter; // user-side search filter, eg: + // C Files\t*.[ch]\nText Files\t*.txt" + + char *_filt_names; // filter names (tab delimited) + // eg. "C Files\tText Files" + + char *_filt_patt[MAXFILTERS]; + // array of filter patterns, eg: + // _filt_patt[0]="*.{cxx,h}" + // _filt_patt[1]="*.txt" + + int _filt_total; // parse_filter() # of filters loaded + int _filt_value; // index of the selected filter + char *_errmsg; // error message + + // Private methods + void errmsg(const char *msg); + void clear_pathnames(); + void set_single_pathname(const char *s); + int get_saveas_basename(void); + void clear_filters(); + void add_filter(const char *, const char *); + void parse_filter(const char *from); + int post(); +#endif + +#if ! defined(__APPLE__) && !defined(WIN32) +private: + int _btype; // kind-of browser to show() + int _options; // general options + int _nfilters; + char *_filter; // user supplied filter + char *_parsedfilt; // parsed filter + int _filtvalue; // selected filter + char *_preset_file; + char *_prevvalue; // Returned filename + char *_directory; + char *_errmsg; // error message + Fl_File_Chooser *_file_chooser; + + // Private methods + void errmsg(const char *msg); + int type_fl_file(int); + void parse_filter(); + void keeplocation(); + int exist_dialog(); +#endif +}; + + #endif /*FL_NATIVE_FILE_CHOOSER_H*/ // -// End of "$Id: Fl_Native_File_Chooser.H 7003 2010-01-14 20:47:59Z greg.ercolano $". +// End of "$Id: Fl_Native_File_Chooser.H 8380 2011-02-06 10:07:28Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Native_File_Chooser_FLTK.H b/plugins/zynaddsubfx/fltk/FL/Fl_Native_File_Chooser_FLTK.H deleted file mode 100644 index 8f1ae263e..000000000 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Native_File_Chooser_FLTK.H +++ /dev/null @@ -1,142 +0,0 @@ -// -// "$Id: Fl_Native_File_Chooser_FLTK.H 7007 2010-01-14 23:08:06Z greg.ercolano $" -// -// FLTK native OS file chooser widget -// -// Copyright 1998-2009 by Bill Spitzak and others. -// Copyright 2005 by Nathan Vander Wilt. -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Library General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -// USA. -// -// Please report all bugs and problems on the following page: -// -// http://www.fltk.org/str.php -// - -/* \file - Fl_Native_File_Chooser widget. */ - -#include -#include // _POSIX_NAME_MAX - -/** - This class lets an FLTK application easily and consistently access - the operating system's native file chooser. Some operating systems - have very complex and specific file choosers that many users want - access to specifically, instead of FLTK's default file chooser(s). -

    - In cases where there is no native file browser, FLTK's own file browser - is used instead. -

    - \code - // Create and post the local native file chooser - #include - [..] - Fl_Native_File_Chooser fnfc; - fnfc.title("Pick a file"); - fnfc.type(Fl_Native_File_Chooser::BROWSE_FILE); - fnfc.filter("Text\t*.txt\n" - "C Files\t*.{cxx,h,c}"); - fnfc.directory("/var/tmp"); - // Show native chooser - switch ( fnfc.show() ) { - case -1: printf("ERROR: %s\n", fnfc.errmsg()); break; // ERROR - case 1: printf("CANCEL\n"); break; // CANCEL - default: printf("PICKED: %s\n", fnfc.filename()); break; // FILE CHOSEN - } - \endcode -

    - Platform Specific Caveats -

    - - Under X windows, it's best if you call Fl_File_Icon::load_system_icons() - at the start of main(), to enable the nicer looking file browser widgets. - - Some operating systems support certain OS specific options; see - Fl_Native_File_Chooser::options() for a list. -*/ -class Fl_Native_File_Chooser { -public: - enum Type { - BROWSE_FILE = 0, ///< browse files (lets user choose one file) - BROWSE_DIRECTORY, ///< browse directories (lets user choose one directory) - BROWSE_MULTI_FILE, ///< browse files (lets user choose multiple files) - BROWSE_MULTI_DIRECTORY, ///< browse directories (lets user choose multiple directories) - BROWSE_SAVE_FILE, ///< browse to save a file - BROWSE_SAVE_DIRECTORY ///< browse to save a directory - }; - enum Option { - NO_OPTIONS = 0x0000, ///< no options enabled - SAVEAS_CONFIRM = 0x0001, ///< Show native 'Save As' overwrite confirm dialog (if supported) - NEW_FOLDER = 0x0002, ///< Show 'New Folder' icon (if supported) - PREVIEW = 0x0004, ///< enable preview mode - }; -private: - int _btype; // kind-of browser to show() - int _options; // general options - int _nfilters; - char *_filter; // user supplied filter - char *_parsedfilt; // parsed filter - int _filtvalue; // selected filter - char *_preset_file; - char *_prevvalue; // Returned filename - char *_directory; - char *_errmsg; // error message - char *_old_dir; - Fl_File_Chooser *_file_chooser; - - // added by MG - Fl_File_Browser *my_fileList; - Fl_Check_Button *show_hidden; - int prev_filtervalue; - static void show_hidden_cb(Fl_Check_Button *o, void *data); - static void remove_hidden_files(Fl_File_Browser *my_fileList); - - // Private methods - void errmsg(const char *msg); - int type_fl_file(int); - void parse_filter(); - void keeplocation(); - int exist_dialog(); - -public: - Fl_Native_File_Chooser(int val=BROWSE_FILE); - ~Fl_Native_File_Chooser(); - - // Public methods - void type(int); - int type() const; - void options(int); - int options() const; - int count() const; - const char *filename() const; - const char *filename(int i) const; - void directory(const char *val); - const char *directory() const; - void title(const char *); - const char* title() const; - const char *filter() const; - void filter(const char *); - int filters() const; - void filter_value(int i); - int filter_value() const; - void preset_file(const char*); - const char* preset_file() const; - const char *errmsg() const; - int show(); -}; - -// -// End of "$Id: Fl_Native_File_Chooser_FLTK.H 7007 2010-01-14 23:08:06Z greg.ercolano $". -// diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Native_File_Chooser_MAC.H b/plugins/zynaddsubfx/fltk/FL/Fl_Native_File_Chooser_MAC.H deleted file mode 100644 index d9668cfc6..000000000 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Native_File_Chooser_MAC.H +++ /dev/null @@ -1,122 +0,0 @@ -// -// "$Id: Fl_Native_File_Chooser_MAC.H 7354 2010-03-29 11:07:29Z matt $" -// -// FLTK native OS file chooser widget -// -// Copyright 1998-2009 by Bill Spitzak and others. -// Copyright 2004 Greg Ercolano. -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Library General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -// USA. -// -// Please report all bugs and problems on the following page: -// -// http://www.fltk.org/str.php -// - -#ifndef FL_DOXYGEN // PREVENT DOXYGEN'S USE OF THIS FILE - -// OSX-SPECIFIC NATIVE BROWSER -#include -#include - -#undef check // necessary for use of Fl::check() - -#include -#define MAXFILTERS 80 - -class Fl_Native_File_Chooser { -public: - enum Type { - BROWSE_FILE = 0, - BROWSE_DIRECTORY, - BROWSE_MULTI_FILE, - BROWSE_MULTI_DIRECTORY, - BROWSE_SAVE_FILE, - BROWSE_SAVE_DIRECTORY - }; - enum Option { - NO_OPTIONS = 0x0000, // no options enabled - SAVEAS_CONFIRM = 0x0001, // Show native 'Save As' overwrite confirm dialog (if supported) - NEW_FOLDER = 0x0002, // Show 'New Folder' icon (if supported) - PREVIEW = 0x0004, // enable preview mode - }; -private: - int _btype; // kind-of browser to show() - int _options; // general options - void *_panel; - char **_pathnames; // array of pathnames - int _tpathnames; // total pathnames - char *_directory; // default pathname to use - char *_title; // title for window - char *_preset_file; // the 'save as' filename - - char *_filter; // user-side search filter, eg: - // C Files\t*.[ch]\nText Files\t*.txt" - - char *_filt_names; // filter names (tab delimited) - // eg. "C Files\tText Files" - - char *_filt_patt[MAXFILTERS]; - // array of filter patterns, eg: - // _filt_patt[0]="*.{cxx,h}" - // _filt_patt[1]="*.txt" - - int _filt_total; // parse_filter() # of filters loaded - int _filt_value; // index of the selected filter - char *_errmsg; // error message - - // Private methods - void errmsg(const char *msg); - void clear_pathnames(); - void set_single_pathname(const char *s); - int get_saveas_basename(void); - void clear_filters(); - void add_filter(const char *, const char *); - void parse_filter(const char *from); - int post(); - -public: - Fl_Native_File_Chooser(int val = BROWSE_FILE); - ~Fl_Native_File_Chooser(); - - // Public methods - void type(int); - int type() const; - void options(int); - int options() const; - int count() const; - const char *filename() const; - const char *filename(int i) const; - void directory(const char *); - const char *directory() const; - void title(const char *); - const char *title() const; - const char *filter() const; - void filter(const char *); - void filter_value(int i) { _filt_value = i; } - int filter_value() { return(_filt_value); } - int filters() { return(_filt_total); } - void preset_file(const char *); - const char *preset_file(); - const char *errmsg() const; - int show(); -}; - -#endif /*!FL_DOXYGEN*/ - -// -// End of "$Id: Fl_Native_File_Chooser_MAC.H 7354 2010-03-29 11:07:29Z matt $". -// diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Native_File_Chooser_WIN32.H b/plugins/zynaddsubfx/fltk/FL/Fl_Native_File_Chooser_WIN32.H deleted file mode 100644 index d6aa53a69..000000000 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Native_File_Chooser_WIN32.H +++ /dev/null @@ -1,120 +0,0 @@ -// -// "$Id: Fl_Native_File_Chooser_WIN32.H 7003 2010-01-14 20:47:59Z greg.ercolano $" -// -// FLTK native OS file chooser widget -// -// Copyright 1998-2005 by Bill Spitzak and others. -// Copyright 2004 by Greg Ercolano. -// April 2005 - API changes, improved filter processing by Nathan Vander Wilt -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Library General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -// USA. -// -// Please report all bugs and problems to: -// -// http://www.fltk.org/str.php -// - -#ifndef FL_DOXYGEN // PREVENT DOXYGEN'S USE OF THIS FILE - -// #define _WIN32_WINNT 0x0501 // needed for OPENFILENAME's 'FlagsEx' -#include -#include // malloc -#include -#include // OPENFILENAME, GetOpenFileName() -#include // BROWSEINFO, SHBrowseForFolder() - -class Fl_Native_File_Chooser { -public: - enum Type { - BROWSE_FILE = 0, - BROWSE_DIRECTORY, - BROWSE_MULTI_FILE, - BROWSE_MULTI_DIRECTORY, - BROWSE_SAVE_FILE, - BROWSE_SAVE_DIRECTORY - }; - enum Option { - NO_OPTIONS = 0x0000, // no options enabled - SAVEAS_CONFIRM = 0x0001, // Show native 'Save As' overwrite confirm dialog (if supported) - NEW_FOLDER = 0x0002, // Show 'New Folder' icon (if supported) - PREVIEW = 0x0004, // enable preview mode - }; -private: - int _btype; // kind-of browser to show() - int _options; // general options - OPENFILENAMEW _ofn; // GetOpenFileName() & GetSaveFileName() struct - BROWSEINFO _binf; // SHBrowseForFolder() struct - char **_pathnames; // array of pathnames - int _tpathnames; // total pathnames - char *_directory; // default pathname to use - char *_title; // title for window - char *_filter; // user-side search filter - char *_parsedfilt; // filter parsed for Windows dialog - int _nfilters; // number of filters parse_filter counted - char *_preset_file; // the file to preselect - char *_errmsg; // error message - - // Private methods - void errmsg(const char *msg); - - void clear_pathnames(); - void set_single_pathname(const char *s); - void add_pathname(const char *s); - - void FreePIDL(ITEMIDLIST *pidl); - void ClearOFN(); - void ClearBINF(); - void Win2Unix(char *s); - void Unix2Win(char *s); - int showfile(); - static int CALLBACK Dir_CB(HWND win, UINT msg, LPARAM param, LPARAM data); - int showdir(); - - void parse_filter(const char *); - void clear_filters(); - void add_filter(const char *, const char *); - -public: - Fl_Native_File_Chooser(int val = BROWSE_FILE); - ~Fl_Native_File_Chooser(); - - // Public methods - void type(int val); - int type() const; - void options(int); - int options() const; - int count() const; - const char *filename() const; - const char *filename(int i) const; - void directory(const char *val); - const char *directory() const; - void title(const char *val); - const char *title() const; - const char *filter() const; - void filter(const char *val); - int filters() const { return _nfilters; } - void filter_value(int i); - int filter_value() const; - void preset_file(const char *); - const char *preset_file() const; - const char *errmsg() const; - int show(); -}; -#endif /*!FL_DOXYGEN*/ - -// -// End of "$Id: Fl_Native_File_Chooser_WIN32.H 7003 2010-01-14 20:47:59Z greg.ercolano $". -// diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Nice_Slider.H b/plugins/zynaddsubfx/fltk/FL/Fl_Nice_Slider.H index 1d78a4985..591a8333f 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Nice_Slider.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Nice_Slider.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Nice_Slider.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Nice_Slider.H 8022 2010-12-12 23:21:03Z AlbrechtS $" // // "Nice" slider header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -33,7 +33,7 @@ #include "Fl_Slider.H" -class Fl_Nice_Slider : public Fl_Slider { +class FL_EXPORT Fl_Nice_Slider : public Fl_Slider { public: Fl_Nice_Slider(int x,int y,int w,int h,const char *l=0) : Fl_Slider(x,y,w,h,l) {type(FL_VERT_NICE_SLIDER); box(FL_FLAT_BOX);} @@ -42,5 +42,5 @@ public: #endif // -// End of "$Id: Fl_Nice_Slider.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Nice_Slider.H 8022 2010-12-12 23:21:03Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Object.H b/plugins/zynaddsubfx/fltk/FL/Fl_Object.H index 464f492ec..c743999f1 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Object.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Object.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Object.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Object.H 7903 2010-11-28 21:06:39Z matt $" // // Old Fl_Object header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -32,5 +32,5 @@ #include "Fl_Widget.H" // -// End of "$Id: Fl_Object.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Object.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Output.H b/plugins/zynaddsubfx/fltk/FL/Fl_Output.H index 58b33378f..51cc0348e 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Output.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Output.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Output.H 6898 2009-09-23 20:43:27Z matt $" +// "$Id: Fl_Output.H 8726 2011-05-23 18:32:47Z AlbrechtS $" // // Output header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -33,36 +33,45 @@ #include "Fl_Input.H" /** - This widget displays a piece of text. When you set the value() - , Fl_Output does a strcpy() to it's own storage, + This widget displays a piece of text. + + When you set the value() , Fl_Output does a strcpy() to its own storage, which is useful for program-generated values. The user may select portions of the text using the mouse and paste the contents into other fields or programs. -

    \image html text.gif

    - \image latex text.eps "Fl_Output" width=8cm -

    There is a single subclass, - Fl_Multiline_Output, which allows you to display multiple lines of - text. Fl_Multiline_Output does not provide scroll bars. If a more - complete text editing widget is needed, use Fl_Text_Display instead.

    -

    The text may contain any characters except \\0, and will correctly + +

    \image html text.png

    + \image latex text.png "Fl_Output" width=8cm + + There is a single subclass, Fl_Multiline_Output, which allows you to + display multiple lines of text. Fl_Multiline_Output does not provide + scroll bars. If a more complete text editing widget is needed, use + Fl_Text_Display instead. + + The text may contain any characters except \\0, and will correctly display anything, using ^X notation for unprintable control characters and \\nnn notation for unprintable characters with the high bit set. It - assumes the font can draw any characters in the ISO-Latin1 character - set. + assumes the font can draw any characters in the ISO-Latin1 character set. */ -class Fl_Output : public Fl_Input { +class FL_EXPORT Fl_Output : public Fl_Input { public: /** Creates a new Fl_Output widget using the given position, size, and label string. The default boxtype is FL_DOWN_BOX. -

    Inherited destrucor destroys the widget and any value associated with it. + + Inherited destructor destroys the widget and any value associated with it. */ + +#if defined(FL_DLL) // implementation in src/Fl_Input.cxx + Fl_Output(int X,int Y,int W,int H, const char *l = 0); +#else Fl_Output(int X,int Y,int W,int H, const char *l = 0) : Fl_Input(X, Y, W, H, l) {type(FL_NORMAL_OUTPUT);} +#endif }; #endif // -// End of "$Id: Fl_Output.H 6898 2009-09-23 20:43:27Z matt $". +// End of "$Id: Fl_Output.H 8726 2011-05-23 18:32:47Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Overlay_Window.H b/plugins/zynaddsubfx/fltk/FL/Fl_Overlay_Window.H index 923d64258..918b67101 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Overlay_Window.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Overlay_Window.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Overlay_Window.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Overlay_Window.H 7903 2010-11-28 21:06:39Z matt $" // // Overlay window header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -75,5 +75,5 @@ public: #endif // -// End of "$Id: Fl_Overlay_Window.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Overlay_Window.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Pack.H b/plugins/zynaddsubfx/fltk/FL/Fl_Pack.H index dc3847dc2..4ff3ae442 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Pack.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Pack.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Pack.H 6664 2009-02-18 09:27:54Z AlbrechtS $" +// "$Id: Fl_Pack.H 7903 2010-11-28 21:06:39Z matt $" // // Pack header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -80,5 +80,5 @@ public: #endif // -// End of "$Id: Fl_Pack.H 6664 2009-02-18 09:27:54Z AlbrechtS $". +// End of "$Id: Fl_Pack.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Paged_Device.H b/plugins/zynaddsubfx/fltk/FL/Fl_Paged_Device.H index 345a4bab9..f65da3a95 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Paged_Device.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Paged_Device.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Paged_Device.H 7622 2010-05-27 17:50:51Z manolo $" +// "$Id: Fl_Paged_Device.H 8699 2011-05-20 16:39:06Z manolo $" // // Printing support for the Fast Light Tool Kit (FLTK). // @@ -33,6 +33,10 @@ #define Fl_Paged_Device_H #include +#include + +/** \brief Number of elements in enum Page_Format */ +#define NO_PAGE_FORMATS 30 /* MSVC6 compilation fix */ /** \brief Represents page-structured drawing surfaces. @@ -40,46 +44,103 @@ This class has no public constructor: don't instantiate it; use Fl_Printer or Fl_PostScript_File_Device instead. */ -class Fl_Paged_Device : public Fl_Surface_Device { -private: -#ifdef __APPLE__ - struct chain_elt { - Fl_Image *image; - const uchar *data; - struct chain_elt *next; +class FL_EXPORT Fl_Paged_Device : public Fl_Surface_Device { +public: + /** + \brief Possible page formats. + + All paper formats with pre-defined width and height. + */ + enum Page_Format { + A0 = 0, /**< A0 format */ + A1, + A2, + A3, + A4, /**< A4 format */ + A5, + A6, + A7, + A8, + A9, + B0, + B1, + B2, + B3, + B4, + B5, + B6, + B7, + B8, + B9, + B10, + C5E, + DLE, + EXECUTIVE, + FOLIO, + LEDGER, + LEGAL, + LETTER, /**< Letter format */ + TABLOID, + ENVELOPE, + MEDIA = 0x1000 }; - void add_image(Fl_Image *image, const uchar *data); // adds an image to the page image list -#endif + /** + \brief Possible page layouts. + */ + enum Page_Layout { + PORTRAIT = 0, /**< Portrait orientation */ + LANDSCAPE = 0x100, /**< Landscape orientation */ + REVERSED = 0x200, /**< Reversed orientation */ + ORIENTATION = 0x300 /**< orientation */ + }; + + /** \brief width, height and name of a page format + */ + typedef struct { + /** \brief width in points */ + int width; + /** \brief height in points */ + int height; + /** \brief format name */ + const char *name; + } page_format; + /** \brief width, height and name of all elements of the enum \ref Page_Format. + */ + static const page_format page_formats[NO_PAGE_FORMATS]; +private: void traverse(Fl_Widget *widget); // finds subwindows of widget and prints them protected: /** \brief horizontal offset to the origin of graphics coordinates */ int x_offset; /** \brief vertical offset to the origin of graphics coordinates */ int y_offset; - /** \brief chained list of Fl_Image's used in this page */ - struct chain_elt *image_list_; -#ifdef __APPLE__ - /** \brief deletes the page image list */ - void delete_image_list(); -#endif /** \brief The constructor */ - Fl_Paged_Device() : Fl_Surface_Device(NULL) {type_ = device_type;}; + Fl_Paged_Device() : Fl_Surface_Device(NULL) {}; /** \brief The destructor */ virtual ~Fl_Paged_Device() {}; public: - static const char *device_type; + static const char *class_id; + const char *class_name() {return class_id;}; virtual int start_job(int pagecount, int *frompage = NULL, int *topage = NULL); virtual int start_page(void); virtual int printable_rect(int *w, int *h); virtual void margins(int *left, int *top, int *right, int *bottom); virtual void origin(int x, int y); - void origin(int *x, int *y); - virtual void scale(float scale_x, float scale_y); + virtual void origin(int *x, int *y); + virtual void scale(float scale_x, float scale_y = 0.); virtual void rotate(float angle); virtual void translate(int x, int y); virtual void untranslate(void); - void print_widget(Fl_Widget* widget, int delta_x = 0, int delta_y = 0); - void print_window_part(Fl_Window *win, int x, int y, int w, int h, int delta_x = 0, int delta_y = 0); + virtual void print_widget(Fl_Widget* widget, int delta_x = 0, int delta_y = 0); + /** Prints a window with its title bar and frame if any. + + \p x_offset and \p y_offset are optional coordinates of where to position the window top left. + Equivalent to print_widget() if \p win is a subwindow or has no border. + Use Fl_Window::decorated_w() and Fl_Window::decorated_h() to get the size of the + printed window. + */ + void print_window(Fl_Window *win, int x_offset = 0, int y_offset = 0); + virtual void print_window_part(Fl_Window *win, int x, int y, int w, int h, int delta_x = 0, int delta_y = 0); virtual int end_page (void); virtual void end_job (void); }; @@ -87,6 +148,6 @@ public: #endif // Fl_Paged_Device_H // -// End of "$Id: Fl_Paged_Device.H 7622 2010-05-27 17:50:51Z manolo $" +// End of "$Id: Fl_Paged_Device.H 8699 2011-05-20 16:39:06Z manolo $" // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Pixmap.H b/plugins/zynaddsubfx/fltk/FL/Fl_Pixmap.H index 273ed20d8..bc6438b76 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Pixmap.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Pixmap.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Pixmap.H 7617 2010-05-27 17:20:18Z manolo $" +// "$Id: Fl_Pixmap.H 7903 2010-11-28 21:06:39Z matt $" // // Pixmap header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -95,5 +95,5 @@ class FL_EXPORT Fl_Pixmap : public Fl_Image { #endif // -// End of "$Id: Fl_Pixmap.H 7617 2010-05-27 17:20:18Z manolo $". +// End of "$Id: Fl_Pixmap.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Plugin.H b/plugins/zynaddsubfx/fltk/FL/Fl_Plugin.H index 231a802cc..62da3a238 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Plugin.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Plugin.H @@ -55,7 +55,7 @@ My_Plugin blur_plugin(); \endcode - Plugins can be put into modules and either linked befor distribution, or loaded + Plugins can be put into modules and either linked before distribution, or loaded from dynamically linkable files. An Fl_Plugin_Manager is used to list and access all currently loaded plugins. \code @@ -67,8 +67,7 @@ } \endcode */ -class FL_EXPORT Fl_Plugin -{ +class FL_EXPORT Fl_Plugin { Fl_Preferences::ID id; public: Fl_Plugin(const char *klass, const char *name); @@ -80,8 +79,7 @@ public: \brief Fl_Plugin_Manager manages link-time and run-time plugin binaries. \see Fl_Plugin */ -class FL_EXPORT Fl_Plugin_Manager : public Fl_Preferences -{ +class FL_EXPORT Fl_Plugin_Manager : public Fl_Preferences { public: Fl_Plugin_Manager(const char *klass); ~Fl_Plugin_Manager(); diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Positioner.H b/plugins/zynaddsubfx/fltk/FL/Fl_Positioner.H index 04f181aa6..c8b31a624 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Positioner.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Positioner.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Positioner.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Positioner.H 7981 2010-12-08 23:53:04Z greg.ercolano $" // // Positioner header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -40,8 +40,8 @@ It would be useful if this could be put atop another widget so that the crosshairs are on top, but this is not implemented. The color of the crosshairs is selection_color(). -

    \image html positioner.gif

    - \image latex positioner.eps " Fl_Positioner" width=4cm +

    \image html positioner.png

    + \image latex positioner.png " Fl_Positioner" width=4cm */ class FL_EXPORT Fl_Positioner : public Fl_Widget { @@ -99,5 +99,5 @@ public: #endif // -// End of "$Id: Fl_Positioner.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Positioner.H 7981 2010-12-08 23:53:04Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_PostScript.H b/plugins/zynaddsubfx/fltk/FL/Fl_PostScript.H index 9a998a6d6..fe1ee01b6 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_PostScript.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_PostScript.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_PostScript.H 7622 2010-05-27 17:50:51Z manolo $" +// "$Id: Fl_PostScript.H 8699 2011-05-20 16:39:06Z manolo $" // // Support for graphics output to PostScript file for the Fast Light Tool Kit (FLTK). // -// Copyright 2010 by Bill Spitzak and others. +// Copyright 2010-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -35,70 +35,40 @@ #include #include -#define NO_PAGE_FORMATS 30 /* MSVC6 compilation fix */ - /** \brief PostScript graphical backend. * - PostScript text output is presently implemented only for the latin character set. - FLTK's standard fonts are output using PostScript's standard fonts: Helvetica, Courier, - Times (and their bold, oblique, italic variants), Symbol, ZapfDingbats. + PostScript text uses vectorial fonts for the latin alphabet (exactly: all unicode + characters between U+0020 and U+017F, that is, ASCII, Latin-1 Supplement and Latin Extended-A charts) + plus a few other characters: + + + + + + + + + + + + + + + +
    CharCodepointName CharCodepointName CharCodepointName
    ƒU+0192florin‚U+201Aquotesinglbase™U+2122trademark
    ˆU+02C6circumflex“U+201Cquotedblleft∂U+2202partialdiff
    ˇU+02C7caronâ€U+201DquotedblrightΔU+2206Delta
    ˘U+02D8breve„U+201Equotedblbase∑U+2211summation
    ˙U+02D9dotaccent†U+2020dagger√U+221Aradical
    ˚U+02DAring‡U+2021daggerdbl∞U+221Einfinity
    ˛U+02DBogonek•U+2022bullet≠U+2260notequal
    ˜U+02DCtilde…U+2026ellipsis≤U+2264lessequal
    ËU+02DDhungarumlaut‰U+2030perthousand≥U+2265greaterequal
    –U+2013endash‹U+2039guilsinglleft◊U+25CAlozenge
    —U+2014emdash›U+203Aguilsinglrightï¬U+FB01fi
    ‘U+2018quoteleft/U+2044fractionflU+FB02fl
    ’U+2019quoteright€U+20ACEuroU+F8FFapple (Mac OS only)
    +
    All other unicode characters are output as a bitmap. +
    FLTK standard fonts are output using PostScript standard fonts: Helvetica, Courier, + Times (and their bold, oblique, italic variants). */ -class Fl_PostScript_Graphics_Driver : public Fl_Graphics_Driver { +class FL_EXPORT Fl_PostScript_Graphics_Driver : public Fl_Graphics_Driver { public: - static const char *device_type; - /** - \brief Possible page formats. - */ - enum Page_Format { - A0 = 0, - A1, - A2, - A3, - A4, - A5, - A6, - A7, - A8, - A9, - B0, - B1, - B2, - B3, - B4, - B5, - B6, - B7, - B8, - B9, - B10, - C5E, - DLE, - EXECUTIVE, - FOLIO, - LEDGER, - LEGAL, - LETTER, - TABLOID, - ENVELOPE, - MEDIA = 0x1000 - }; - - /** - \brief Possible page layouts. - */ - enum Page_Layout {PORTRAIT = 0, LANDSCAPE = 0x100, REVERSED = 0x200, ORIENTATION = 0x300}; - + static const char *class_id; + const char *class_name() {return class_id;}; + Fl_PostScript_Graphics_Driver(); #ifndef FL_DOXYGEN -public: enum SHAPE{NONE=0, LINE, LOOP, POLYGON, POINTS}; -typedef struct page_format { - int width; - int height; - const char *name; -} page_format; - class Clip { public: int x, y, w, h; @@ -107,9 +77,6 @@ class Clip { Clip * clip_; int lang_level_; - int font_; - int size_; - Fl_Color color_; int gap_; int pages_; @@ -144,29 +111,35 @@ class Clip { FILE *output; double pw_, ph_; - static const page_format page_formats[NO_PAGE_FORMATS]; uchar bg_r, bg_g, bg_b; - int start_postscript (int pagecount, enum Page_Format format, enum Page_Layout layout); + int start_postscript (int pagecount, enum Fl_Paged_Device::Page_Format format, enum Fl_Paged_Device::Page_Layout layout); /* int alpha_mask(const uchar * data, int w, int h, int D, int LD=0); */ - void draw(const char* s, int n, int x, int y) {transformed_draw(s,n,x,y); }; - void draw(int angle, const char *str, int n, int x, int y); void transformed_draw(const char* s, int n, double x, double y); //precise text placing void transformed_draw(const char* s, double x, double y); int alpha_mask(const uchar * data, int w, int h, int D, int LD=0); - void draw_scaled_image(const uchar *data, double x, double y, double w, double h, int iw, int ih, int D=3, int LD=0); - void draw_scaled_image_mono(const uchar *data, double x, double y, double w, double h, int iw, int ih, int D=3, int LD=0); - void draw_scaled_image(Fl_Draw_Image_Cb call, void *data, double x, double y, double w, double h, int iw, int ih, int D); - void draw_scaled_image_mono(Fl_Draw_Image_Cb call, void *data, double x, double y, double w, double h, int iw, int ih, int D); - enum Page_Format page_format_; + enum Fl_Paged_Device::Page_Format page_format_; char *ps_filename_; + + void page_policy(int p); + int page_policy(){return page_policy_;}; + void close_command( int (*cmd)(FILE *)){close_cmd_=cmd;}; + FILE * file() {return output;}; + //void orientation (int o); + //Fl_PostScript_Graphics_Driver(FILE *o, int lang_level, int pages = 0); // ps (also multi-page) constructor + //Fl_PostScript_Graphics_Driver(FILE *o, int lang_level, int x, int y, int w, int h); //eps constructor + void interpolate(int i){interpolate_=i;}; + int interpolate(){return interpolate_;} + + void page(double pw, double ph, int media = 0); + void page(int format); +#endif // FL_DOXYGEN + // implementation of drawing methods void color(Fl_Color c); - //void bg_color(Fl_Color bg); void color(uchar r, uchar g, uchar b); - Fl_Color color(){return color_;}; void push_clip(int x, int y, int w, int h); int clip_box(int x, int y, int w, int h, int &X, int &Y, int &W, int &H); @@ -214,66 +187,53 @@ class Clip { void gap(){gap_=1;}; void end_complex_polygon(){end_polygon();}; void transformed_vertex(double x, double y); - - void font(int face, int size); - int font(){return font_;}; - int size(){return size_;}; - double width(unsigned c); - double width(const char* s, int n); - int descent(); - int height(); - - void draw_image(const uchar* d, int x,int y,int w,int h, int delta=3, int ldelta=0){draw_scaled_image(d,x,y,w,h,w,h,delta,ldelta);}; - void draw_image_mono(const uchar* d, int x,int y,int w,int h, int delta=1, int ld=0){draw_scaled_image_mono(d,x,y,w,h,w,h,delta,ld);}; - void draw_image(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=3){draw_scaled_image(call,data, x, y, w, h, w, h, delta);}; - void draw_image_mono(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=1){draw_scaled_image_mono(call, data, x, y, w, h, w, h, delta);}; - - void draw(Fl_Pixmap * pxm,int XP, int YP, int WP, int HP, int cx, int cy); - void draw(Fl_RGB_Image * rgb,int XP, int YP, int WP, int HP, int cx, int cy); - void draw(Fl_Bitmap * bitmap,int XP, int YP, int WP, int HP, int cx, int cy); -public: - void page_policy(int p); - int page_policy(){return page_policy_;}; - void close_command( int (*cmd)(FILE *)){close_cmd_=cmd;}; - FILE * file() {return output;}; - //void orientation (int o); - //Fl_PostScript_Graphics_Driver(FILE *o, int lang_level, int pages = 0); // ps (also multi-page) constructor - //Fl_PostScript_Graphics_Driver(FILE *o, int lang_level, int x, int y, int w, int h); //eps constructor - void interpolate(int i){interpolate_=i;}; - int interpolate(){return interpolate_;} - - void page(double pw, double ph, int media = 0); - void page(int format); - - void place(double x, double y, double tx, double ty, double scale = 1); -#endif // FL_DOXYGEN - Fl_PostScript_Graphics_Driver(); + void draw_image(const uchar* d, int x,int y,int w,int h, int delta=3, int ldelta=0); + void draw_image_mono(const uchar* d, int x,int y,int w,int h, int delta=1, int ld=0); + void draw_image(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=3); + void draw_image_mono(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=1); + + void draw(const char* s, int n, int x, int y) {transformed_draw(s,n,x,y); }; +#ifdef __APPLE__ + void draw(const char* s, int n, float x, float y) {transformed_draw(s,n,x,y); }; +#endif + void draw(int angle, const char *str, int n, int x, int y); + void rtl_draw(const char* s, int n, int x, int y); + void font(int face, int size); + double width(const char *, int); + void text_extents(const char *c, int n, int &dx, int &dy, int &w, int &h); + int height(); + int descent(); + void draw(Fl_Pixmap * pxm,int XP, int YP, int WP, int HP, int cx, int cy); + void draw(Fl_Bitmap * bitmap,int XP, int YP, int WP, int HP, int cx, int cy); + void draw(Fl_RGB_Image * rgb,int XP, int YP, int WP, int HP, int cx, int cy); ~Fl_PostScript_Graphics_Driver(); }; /** \brief To send graphical output to a PostScript file. */ -class Fl_PostScript_File_Device : public Fl_Paged_Device { +class FL_EXPORT Fl_PostScript_File_Device : public Fl_Paged_Device { #ifdef __APPLE__ - CGContextRef gc; + Fl_CGContextRef gc; #endif protected: Fl_PostScript_Graphics_Driver *driver(); public: - static const char *device_type; + static const char *class_id; + const char *class_name() {return class_id;}; Fl_PostScript_File_Device(); ~Fl_PostScript_File_Device(); - int start_job(int pagecount, enum Fl_PostScript_Graphics_Driver::Page_Format format = Fl_PostScript_Graphics_Driver::A4, - enum Fl_PostScript_Graphics_Driver::Page_Layout layout = Fl_PostScript_Graphics_Driver::PORTRAIT); - int start_job(FILE *ps_output, int pagecount, enum Fl_PostScript_Graphics_Driver::Page_Format format = Fl_PostScript_Graphics_Driver::A4, - enum Fl_PostScript_Graphics_Driver::Page_Layout layout = Fl_PostScript_Graphics_Driver::PORTRAIT); + int start_job(int pagecount, enum Fl_Paged_Device::Page_Format format = Fl_Paged_Device::A4, + enum Fl_Paged_Device::Page_Layout layout = Fl_Paged_Device::PORTRAIT); + int start_job(FILE *ps_output, int pagecount, enum Fl_Paged_Device::Page_Format format = Fl_Paged_Device::A4, + enum Fl_Paged_Device::Page_Layout layout = Fl_Paged_Device::PORTRAIT); int start_page (void); int printable_rect(int *w, int *h); void margins(int *left, int *top, int *right, int *bottom); + void origin(int *x, int *y); void origin(int x, int y); - void scale (float scale_x, float scale_y); + void scale (float scale_x, float scale_y = 0.); void rotate(float angle); void translate(int x, int y); void untranslate(void); @@ -289,5 +249,5 @@ public: #endif // Fl_PostScript_H // -// End of "$Id: Fl_PostScript.H 7622 2010-05-27 17:50:51Z manolo $" +// End of "$Id: Fl_PostScript.H 8699 2011-05-20 16:39:06Z manolo $" // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Preferences.H b/plugins/zynaddsubfx/fltk/FL/Fl_Preferences.H index 1c201814b..8fa3f04c6 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Preferences.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Preferences.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Preferences.H 7672 2010-07-10 09:44:45Z matt $" +// "$Id: Fl_Preferences.H 7949 2010-12-05 00:38:16Z greg.ercolano $" // // Preferences . // -// Copyright 2002-2009 by Matthias Melcher. +// Copyright 2002-2010 by Matthias Melcher. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -32,8 +32,7 @@ # define Fl_Preferences_H # include -# include "Fl_Export.H" - +# include "Fl_Export.H" /** \brief Fl_Preferences provides methods to store user @@ -67,11 +66,9 @@ current chracter set or code page which renders them incompatible for text entries using international characters. */ -class FL_EXPORT Fl_Preferences -{ - -public: +class FL_EXPORT Fl_Preferences { +public: /** Define the scope of the preferences. */ @@ -99,7 +96,7 @@ public: Fl_Preferences( Fl_Preferences *parent, int groupIndex ); Fl_Preferences(const Fl_Preferences&); Fl_Preferences( ID id ); - ~Fl_Preferences(); + virtual ~Fl_Preferences(); /** Return an ID that can later be reused to open more references to this dataset. */ @@ -156,8 +153,6 @@ public: // char export( const char *filename, Type fileFormat ); // char import( const char *filename ); - // char copyTo(class Fl_Tree*); // deprecated, use Fl_Tree::load(Fl_Preferences&) - /** 'Name' provides a simple method to create numerical or more complex procedural names for entries and groups on the fly. @@ -173,8 +168,7 @@ public: char *data_; - public: - + public: Name( unsigned int n ); Name( const char *format, ... ); @@ -187,13 +181,11 @@ public: }; /** \internal An entry associates a preference name to its corresponding value */ - struct Entry - { + struct Entry { char *name, *value; }; -private: - +private: Fl_Preferences() : node(0), rootNode(0) { } Fl_Preferences &operator=(const Fl_Preferences&); @@ -203,12 +195,12 @@ private: class RootNode; - class FL_EXPORT Node // a node contains a list to all its entries - { // and all means to manage the tree structure + class FL_EXPORT Node { // a node contains a list to all its entries + // and all means to manage the tree structure Node *child_, *next_; - union { // these two are mutually exclusive - Node *parent_; // top_ bit clear - RootNode *root_; // top_ bit set + union { // these two are mutually exclusive + Node *parent_; // top_ bit clear + RootNode *root_; // top_ bit set }; char *path_; Entry *entry_; @@ -257,8 +249,7 @@ private: }; friend class Node; - class FL_EXPORT RootNode // the root node manages file paths and basic reading and writing - { + class FL_EXPORT RootNode { // the root node manages file paths and basic reading and writing Fl_Preferences *prefs_; char *filename_; char *vendor_, *application_; @@ -274,14 +265,12 @@ private: friend class RootNode; protected: - Node *node; RootNode *rootNode; }; - #endif // !Fl_Preferences_H // -// End of "$Id: Fl_Preferences.H 7672 2010-07-10 09:44:45Z matt $". +// End of "$Id: Fl_Preferences.H 7949 2010-12-05 00:38:16Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Printer.H b/plugins/zynaddsubfx/fltk/FL/Fl_Printer.H index 91450837a..6e8d0efcd 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Printer.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Printer.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Printer.H 7662 2010-07-01 15:35:28Z manolo $" +// "$Id: Fl_Printer.H 8699 2011-05-20 16:39:06Z manolo $" // // Printing support for the Fast Light Tool Kit (FLTK). // @@ -25,12 +25,13 @@ // http://www.fltk.org/str.php // /** \file Fl_Printer.H - \brief declaration of classes Fl_System_Printer, Fl_PostScript_Printer, Fl_Printer, Fl_Device_Plugin. + \brief declaration of classes Fl_Printer, Fl_System_Printer and Fl_PostScript_Printer. */ #ifndef Fl_Printer_H #define Fl_Printer_H +#include #include #include #include @@ -39,27 +40,31 @@ #include #if !(defined(__APPLE__) || defined(WIN32)) #include +#elif defined(WIN32) +#include #endif #if defined(__APPLE__) || defined(WIN32) || defined(FL_DOXYGEN) /** - \brief Print support under MSWindows and Mac OS X. -* + Print support under MSWindows and Mac OS. + + Class Fl_System_Printer is implemented only on the MSWindows and Mac OS platforms. + It has no public constructor. Use Fl_Printer instead that is cross-platform and has the same API. - Fl_Printer is typedef'ed to Fl_System_Printer under MSWindows and Mac OS X. */ class Fl_System_Printer : public Fl_Paged_Device { + friend class Fl_Printer; private: /** \brief the printer's graphics context, if there's one, NULL otherwise */ void *gc; - void set_current(); + void set_current(void); #ifdef __APPLE__ float scale_x; float scale_y; float angle; // rotation angle in radians - PMPrintSession printSession; - PMPageFormat pageFormat; - PMPrintSettings printSettings; + Fl_PMPrintSession printSession; + Fl_PMPageFormat pageFormat; + Fl_PMPrintSettings printSettings; #elif defined(WIN32) int abortPrint; PRINTDLG pd; @@ -69,117 +74,69 @@ private: int top_margin; void absolute_printable_rect(int *x, int *y, int *w, int *h); #endif -public: - static const char *device_type; - /** - @brief The constructor. - */ +protected: + /** \brief The constructor */ Fl_System_Printer(void); +public: + static const char *class_id; + const char *class_name() {return class_id;}; int start_job(int pagecount, int *frompage = NULL, int *topage = NULL); int start_page (void); int printable_rect(int *w, int *h); void margins(int *left, int *top, int *right, int *bottom); + void origin(int *x, int *y); void origin(int x, int y); - void scale (float scale_x, float scale_y); + void scale (float scale_x, float scale_y = 0.); void rotate(float angle); void translate(int x, int y); void untranslate(void); int end_page (void); void end_job (void); - - /** - @brief The destructor. - */ + /** \brief The destructor */ ~Fl_System_Printer(void); -#ifndef FL_DOXYGEN -public: - static const char *dialog_title; - static const char *dialog_printer; - static const char *dialog_range; - static const char *dialog_copies; - static const char *dialog_all; - static const char *dialog_pages; - static const char *dialog_from; - static const char *dialog_to; - static const char *dialog_properties; - static const char *dialog_copyNo; - static const char *dialog_print_button; - static const char *dialog_cancel_button; - static const char *dialog_print_to_file; - static const char *property_title; - static const char *property_pagesize; - static const char *property_mode; - static const char *property_use; - static const char *property_save; - static const char *property_cancel; -#endif // FL_DOXYGEN }; // class Fl_System_Printer -/** \brief OS-independant class name */ -typedef Fl_System_Printer Fl_Printer; #endif -#if !(defined(__APPLE__) || defined(WIN32)) +#if !(defined(__APPLE__) || defined(WIN32) ) /** - \brief Print support under Unix/Linux. - * + Print support under Unix/Linux. + + Class Fl_PostScript_Printer is implemented only on the Unix/Linux platform. + It has no public constructor. Use Fl_Printer instead that is cross-platform and has the same API. - Fl_Printer is typedef'ed to Fl_PostScript_Printer under Unix/Linux. */ class Fl_PostScript_Printer : public Fl_PostScript_File_Device { -private: - void set_current(); + friend class Fl_Printer; +protected: + /** The constructor */ + Fl_PostScript_Printer(void) {}; public: - static const char *device_type; + static const char *class_id; + const char *class_name() {return class_id;}; int start_job(int pages, int *firstpage = NULL, int *lastpage = NULL); - -#ifndef FL_DOXYGEN - static const char *dialog_title; - static const char *dialog_printer; - static const char *dialog_range; - static const char *dialog_copies; - static const char *dialog_all; - static const char *dialog_pages; - static const char *dialog_from; - static const char *dialog_to; - static const char *dialog_properties; - static const char *dialog_copyNo; - static const char *dialog_print_button; - static const char *dialog_cancel_button; - static const char *dialog_print_to_file; - static const char *property_title; - static const char *property_pagesize; - static const char *property_mode; - static const char *property_use; - static const char *property_save; - static const char *property_cancel; -#endif // FL_DOXYGEN }; -/** \brief OS-independant class name */ -typedef Fl_PostScript_Printer Fl_Printer; #endif /** - * @brief OS-independent print support. + * \brief OS-independent print support. * Fl_Printer allows to use all FLTK drawing, color, text, and clip functions, and to have them operate on printed page(s). There are two main, non exclusive, ways to use it.
    • Print any widget (standard, custom, Fl_Window, Fl_Gl_Window) as it appears on screen, with optional translation, scaling and rotation. This is done by calling print_widget() or print_window_part(). -
    • Use a series of FLTK graphics commands (e.g., font, text, lines, colors, clip) to +
    • Use a series of FLTK graphics commands (e.g., font, text, lines, colors, clip, image) to compose a page appropriately shaped for printing.
    In both cases, begin by start_job(), start_page(), printable_rect() and origin() calls and finish by end_page() and end_job() calls.

    Platform specifics -
    Fl_Printer is typedef'ed to Fl_PostScript_Printer under Unix/Linux - and to Fl_System_Printer otherwise. Both classes have the same API.

    • Unix/Linux platforms: Class Fl_RGB_Image prints but loses its transparency if it has one. - PostScript text output is presently restricted to the Latin alphabet. + See class Fl_PostScript_Graphics_Driver for a description of how UTF-8 strings appear in print. Use the static public attributes of this class to set the print dialog to other languages than English. For example, the "Printer:" dialog item Fl_Printer::dialog_printer can be set to French with: \code @@ -194,25 +151,29 @@ typedef Fl_PostScript_Printer Fl_Printer;
    • Mac OS X platform: all graphics requests print as on display.
    */ -#ifdef FL_DOXYGEN -// this class is NOT compiled. It's here for Doxygen documentation purpose only -class Fl_Printer : public Fl_System_Printer, Fl_PostScript_Printer { +class FL_EXPORT Fl_Printer : public Fl_Paged_Device { public: - static const char *device_type; - /** @brief The constructor */ + static const char *class_id; + const char *class_name() {return class_id;}; + /** \brief The constructor */ Fl_Printer(void); int start_job(int pagecount, int *frompage = NULL, int *topage = NULL); int start_page(void); int printable_rect(int *w, int *h); void margins(int *left, int *top, int *right, int *bottom); + void origin(int *x, int *y); void origin(int x, int y); - void scale(float scale_x, float scale_y); + void scale(float scale_x, float scale_y = 0.); void rotate(float angle); void translate(int x, int y); void untranslate(void); int end_page (void); void end_job (void); - /** @brief The destructor */ + void print_widget(Fl_Widget* widget, int delta_x=0, int delta_y=0); + void print_window_part(Fl_Window *win, int x, int y, int w, int h, int delta_x=0, int delta_y=0); + void set_current(void); + Fl_Graphics_Driver* driver(void); + /** \brief The destructor */ ~Fl_Printer(void); /** \name These attributes are effective under the Xlib platform only. @@ -238,33 +199,16 @@ public: static const char *property_save; static const char *property_cancel; /** \} */ -}; +private: +#if defined(WIN32) || defined(__APPLE__) + Fl_System_Printer *printer; +#else + Fl_PostScript_Printer *printer; #endif - -/** - This plugin socket allows the integration of new device drivers for special - window or screen types. It is currently used to provide an automated printing - service for OpenGL windows, if linked with fltk_gl. - */ -class Fl_Device_Plugin : public Fl_Plugin { -public: - /** \brief The constructor */ - Fl_Device_Plugin(const char *name) - : Fl_Plugin(klass(), name) { } - /** \brief Returns the class name */ - virtual const char *klass() { return "fltk:device"; } - /** \brief Returns the plugin name */ - virtual const char *name() = 0; - /** \brief Prints a widget - \param w the widget - \param x,y offsets where to print relatively to coordinates origin - \param height height of the current drawing area - */ - virtual int print(Fl_Widget* w, int x, int y, int height) { return 0; } }; #endif // Fl_Printer_H // -// End of "$Id: Fl_Printer.H 7662 2010-07-01 15:35:28Z manolo $" +// End of "$Id: Fl_Printer.H 8699 2011-05-20 16:39:06Z manolo $" // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Progress.H b/plugins/zynaddsubfx/fltk/FL/Fl_Progress.H index 5d2e8c434..ce506d5ae 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Progress.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Progress.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Progress.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Progress.H 8306 2011-01-24 17:04:22Z matt $" // // Progress bar widget definitions. // -// Copyright 2000-2009 by Michael Sweet. +// Copyright 2000-2010 by Michael Sweet. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -44,8 +44,8 @@ /** Displays a progress bar for the user. */ -class FL_EXPORT Fl_Progress : public Fl_Widget -{ +class FL_EXPORT Fl_Progress : public Fl_Widget { + float value_, minimum_, maximum_; @@ -77,5 +77,5 @@ class FL_EXPORT Fl_Progress : public Fl_Widget #endif // !_Fl_Progress_H_ // -// End of "$Id: Fl_Progress.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Progress.H 8306 2011-01-24 17:04:22Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_RGB_Image.H b/plugins/zynaddsubfx/fltk/FL/Fl_RGB_Image.H index fd4a44fc7..bf1285eb4 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_RGB_Image.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_RGB_Image.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_RGB_Image.H 6942 2009-11-18 12:22:51Z AlbrechtS $" +// "$Id: Fl_RGB_Image.H 7903 2010-11-28 21:06:39Z matt $" // // RGB Image header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -31,5 +31,5 @@ #endif // !Fl_RGB_Image_H // -// End of "$Id: Fl_RGB_Image.H 6942 2009-11-18 12:22:51Z AlbrechtS $". +// End of "$Id: Fl_RGB_Image.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Radio_Button.H b/plugins/zynaddsubfx/fltk/FL/Fl_Radio_Button.H index 892730705..979e33010 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Radio_Button.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Radio_Button.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Radio_Button.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Radio_Button.H 8022 2010-12-12 23:21:03Z AlbrechtS $" // // Radio button header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -33,7 +33,7 @@ #include "Fl_Button.H" -class Fl_Radio_Button : public Fl_Button { +class FL_EXPORT Fl_Radio_Button : public Fl_Button { public: Fl_Radio_Button(int x,int y,int w,int h,const char *l=0) : Fl_Button(x,y,w,h,l) {type(FL_RADIO_BUTTON);} @@ -42,5 +42,5 @@ public: #endif // -// End of "$Id: Fl_Radio_Button.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Radio_Button.H 8022 2010-12-12 23:21:03Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Radio_Light_Button.H b/plugins/zynaddsubfx/fltk/FL/Fl_Radio_Light_Button.H index 136915d5d..6286dbd7a 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Radio_Light_Button.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Radio_Light_Button.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Radio_Light_Button.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Radio_Light_Button.H 8022 2010-12-12 23:21:03Z AlbrechtS $" // // Radio light button header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -33,7 +33,7 @@ #include "Fl_Light_Button.H" -class Fl_Radio_Light_Button : public Fl_Light_Button { +class FL_EXPORT Fl_Radio_Light_Button : public Fl_Light_Button { public: Fl_Radio_Light_Button(int X,int Y,int W,int H,const char *l=0) : Fl_Light_Button(X,Y,W,H,l) {type(FL_RADIO_BUTTON);} @@ -42,5 +42,5 @@ public: #endif // -// End of "$Id: Fl_Radio_Light_Button.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Radio_Light_Button.H 8022 2010-12-12 23:21:03Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Radio_Round_Button.H b/plugins/zynaddsubfx/fltk/FL/Fl_Radio_Round_Button.H index 588d02360..b1505afda 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Radio_Round_Button.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Radio_Round_Button.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Radio_Round_Button.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Radio_Round_Button.H 8022 2010-12-12 23:21:03Z AlbrechtS $" // // Radio round button header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -33,7 +33,7 @@ #include "Fl_Round_Button.H" -class Fl_Radio_Round_Button : public Fl_Round_Button { +class FL_EXPORT Fl_Radio_Round_Button : public Fl_Round_Button { public: Fl_Radio_Round_Button(int x,int y,int w,int h,const char *l=0) : Fl_Round_Button(x,y,w,h,l) {type(FL_RADIO_BUTTON);} @@ -42,5 +42,5 @@ public: #endif // -// End of "$Id: Fl_Radio_Round_Button.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Radio_Round_Button.H 8022 2010-12-12 23:21:03Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Repeat_Button.H b/plugins/zynaddsubfx/fltk/FL/Fl_Repeat_Button.H index 0ed4a8f6b..dc6d42eb3 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Repeat_Button.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Repeat_Button.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Repeat_Button.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Repeat_Button.H 7903 2010-11-28 21:06:39Z matt $" // // Repeat button header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -59,5 +59,5 @@ public: #endif // -// End of "$Id: Fl_Repeat_Button.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Repeat_Button.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Return_Button.H b/plugins/zynaddsubfx/fltk/FL/Fl_Return_Button.H index afa13a64e..eb8d6c4e9 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Return_Button.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Return_Button.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Return_Button.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Return_Button.H 7981 2010-12-08 23:53:04Z greg.ercolano $" // // Return button header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -36,8 +36,8 @@ The Fl_Return_Button is a subclass of Fl_Button that generates a callback when it is pressed or when the user presses the Enter key. A carriage-return symbol is drawn next to the button label. -

    \image html Fl_Return_Button.gif - \image latex Fl_Return_Button.eps "Fl_Return_Button" width=4cm +

    \image html Fl_Return_Button.png + \image latex Fl_Return_Button.png "Fl_Return_Button" width=4cm */ class FL_EXPORT Fl_Return_Button : public Fl_Button { protected: @@ -56,5 +56,5 @@ public: #endif // -// End of "$Id: Fl_Return_Button.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Return_Button.H 7981 2010-12-08 23:53:04Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Roller.H b/plugins/zynaddsubfx/fltk/FL/Fl_Roller.H index 60659812f..a22d6433c 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Roller.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Roller.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Roller.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Roller.H 7981 2010-12-08 23:53:04Z greg.ercolano $" // // Roller header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -38,8 +38,8 @@ /** The Fl_Roller widget is a "dolly" control commonly used to move 3D objects. -

    \image html Fl_Roller.gif - \image latex Fl_Roller.eps "Fl_Roller" width=4cm +

    \image html Fl_Roller.png + \image latex Fl_Roller.png "Fl_Roller" width=4cm */ class FL_EXPORT Fl_Roller : public Fl_Valuator { protected: @@ -52,5 +52,5 @@ public: #endif // -// End of "$Id: Fl_Roller.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Roller.H 7981 2010-12-08 23:53:04Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Round_Button.H b/plugins/zynaddsubfx/fltk/FL/Fl_Round_Button.H index de4179119..f11123ec0 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Round_Button.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Round_Button.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Round_Button.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Round_Button.H 7981 2010-12-08 23:53:04Z greg.ercolano $" // // Round button header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -37,8 +37,8 @@ Buttons generate callbacks when they are clicked by the user. You control exactly when and how by changing the values for type() and when(). -

    \image html Fl_Round_Button.gif

    - \image latex Fl_Round_Button.eps " Fl_Round_Button" width=4cm +

    \image html Fl_Round_Button.png

    + \image latex Fl_Round_Button.png " Fl_Round_Button" width=4cm

    The Fl_Round_Button subclass display the "on" state by turning on a light, rather than drawing pushed in. The shape of the "light" is initially set to FL_ROUND_DOWN_BOX. The color of the light @@ -53,5 +53,5 @@ public: #endif // -// End of "$Id: Fl_Round_Button.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Round_Button.H 7981 2010-12-08 23:53:04Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Round_Clock.H b/plugins/zynaddsubfx/fltk/FL/Fl_Round_Clock.H index 919bfbda5..2d420baee 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Round_Clock.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Round_Clock.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Round_Clock.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Round_Clock.H 8022 2010-12-12 23:21:03Z AlbrechtS $" // // Round clock header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -34,7 +34,7 @@ #include "Fl_Clock.H" /** A clock widget of type FL_ROUND_CLOCK. Has no box. */ -class Fl_Round_Clock : public Fl_Clock { +class FL_EXPORT Fl_Round_Clock : public Fl_Clock { public: /** Creates the clock widget, setting his type and box. */ Fl_Round_Clock(int x,int y,int w,int h, const char *l = 0) @@ -44,5 +44,5 @@ public: #endif // -// End of "$Id: Fl_Round_Clock.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Round_Clock.H 8022 2010-12-12 23:21:03Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Scroll.H b/plugins/zynaddsubfx/fltk/FL/Fl_Scroll.H index f93b222c3..c649497ef 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Scroll.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Scroll.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Scroll.H 6951 2009-12-06 22:21:55Z matt $" +// "$Id: Fl_Scroll.H 7981 2010-12-08 23:53:04Z greg.ercolano $" // // Scroll header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -39,8 +39,8 @@ larger than your window. If the child widgets are larger than the size of this object then scrollbars will appear so that you can scroll over to them: - \image html Fl_Scroll.gif - \image latex Fl_Scroll.eps "Fl_Scroll" width=4cm + \image html Fl_Scroll.png + \image latex Fl_Scroll.png "Fl_Scroll" width=4cm If all of the child widgets are packed together into a solid rectangle then you want to set box() to FL_NO_BOX or @@ -195,5 +195,5 @@ public: #endif // -// End of "$Id: Fl_Scroll.H 6951 2009-12-06 22:21:55Z matt $". +// End of "$Id: Fl_Scroll.H 7981 2010-12-08 23:53:04Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Scrollbar.H b/plugins/zynaddsubfx/fltk/FL/Fl_Scrollbar.H index 0b7ab1d5c..96aa4330c 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Scrollbar.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Scrollbar.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Scrollbar.H 6683 2009-03-14 11:46:43Z engelsman $" +// "$Id: Fl_Scrollbar.H 7981 2010-12-08 23:53:04Z greg.ercolano $" // // Scroll bar header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -46,8 +46,8 @@ have to use casts to get at the floating-point versions of value() from Fl_Slider. - \image html scrollbar.gif - \image latex scrollbar.eps "Fl_Scrollbar" width=4cm + \image html scrollbar.png + \image latex scrollbar.png "Fl_Scrollbar" width=4cm */ class FL_EXPORT Fl_Scrollbar : public Fl_Slider { @@ -116,5 +116,5 @@ public: #endif // -// End of "$Id: Fl_Scrollbar.H 6683 2009-03-14 11:46:43Z engelsman $". +// End of "$Id: Fl_Scrollbar.H 7981 2010-12-08 23:53:04Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Secret_Input.H b/plugins/zynaddsubfx/fltk/FL/Fl_Secret_Input.H index 90a65cf87..2c100362c 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Secret_Input.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Secret_Input.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Secret_Input.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Secret_Input.H 8726 2011-05-23 18:32:47Z AlbrechtS $" // // Secret input header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -34,23 +34,31 @@ #include "Fl_Input.H" /** - The Fl_Secret_Input class is a subclass of Fl_Input - that displays its input as a string of asterisks. This subclass is - usually used to receive passwords and other "secret" information. + The Fl_Secret_Input class is a subclass of Fl_Input that displays its + input as a string of placeholders. Depending on the platform this + placeholder is either the asterisk ('*') or the Unicode bullet + character (U+2022). + + This subclass is usually used to receive passwords and other "secret" information. */ -class Fl_Secret_Input : public Fl_Input { +class FL_EXPORT Fl_Secret_Input : public Fl_Input { public: /** Creates a new Fl_Secret_Input widget using the given position, size, and label string. The default boxtype is FL_DOWN_BOX. -

    Inherited destructor destroys the widget and any value associated with it. + + Inherited destructor destroys the widget and any value associated with it. */ +#if defined(FL_DLL) // implementation in src/Fl_Input.cxx + Fl_Secret_Input(int X,int Y,int W,int H,const char *l = 0); +#else Fl_Secret_Input(int X,int Y,int W,int H,const char *l = 0) : Fl_Input(X,Y,W,H,l) {type(FL_SECRET_INPUT);} +#endif }; #endif // -// End of "$Id: Fl_Secret_Input.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Secret_Input.H 8726 2011-05-23 18:32:47Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Select_Browser.H b/plugins/zynaddsubfx/fltk/FL/Fl_Select_Browser.H index 2ae7406c5..82e68da2f 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Select_Browser.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Select_Browser.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Select_Browser.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Select_Browser.H 8736 2011-05-24 20:00:56Z AlbrechtS $" // // Select browser header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -36,25 +36,29 @@ /** The class is a subclass of Fl_Browser which lets the user select a single item, or no items by clicking on - the empty space. As long as the mouse button is held down on an + the empty space. As long as the mouse button is held down on an unselected item it is highlighted. Normally the callback is done when the user presses the mouse, but you can change this with when().

    See Fl_Browser for methods to add and remove lines from the browser. */ -class Fl_Select_Browser : public Fl_Browser { +class FL_EXPORT Fl_Select_Browser : public Fl_Browser { public: - /** + /** Creates a new Fl_Select_Browser widget using the given position, size, and label string. The default boxtype is FL_DOWN_BOX. The constructor specializes Fl_Browser() by setting the type to FL_SELECT_BROWSER. The destructor destroys the widget and frees all memory that has been allocated. */ - Fl_Select_Browser(int X,int Y,int W,int H,const char *l=0) - : Fl_Browser(X,Y,W,H,l) {type(FL_SELECT_BROWSER);} +#if defined(FL_DLL) // implementation in src/Fl_Browser.cxx + Fl_Select_Browser(int X,int Y,int W,int H,const char *L=0); +#else + Fl_Select_Browser(int X,int Y,int W,int H,const char *L=0) + : Fl_Browser(X,Y,W,H,L) {type(FL_SELECT_BROWSER);} +#endif }; #endif // -// End of "$Id: Fl_Select_Browser.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Select_Browser.H 8736 2011-05-24 20:00:56Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Shared_Image.H b/plugins/zynaddsubfx/fltk/FL/Fl_Shared_Image.H index 0e1b39b20..a6beb0dda 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Shared_Image.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Shared_Image.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Shared_Image.H 7505 2010-04-14 20:47:34Z manolo $" +// "$Id: Fl_Shared_Image.H 8306 2011-01-24 17:04:22Z matt $" // // Shared image header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -47,7 +47,11 @@ typedef Fl_Image *(*Fl_Shared_Handler)(const char *name, uchar *header, function to support standard image formats such as BMP, GIF, JPEG, and PNG. */ class FL_EXPORT Fl_Shared_Image : public Fl_Image { - protected: + + friend class Fl_JPEG_Image; + friend class Fl_PNG_Image; + +protected: static Fl_Shared_Image **images_; // Shared images static int num_images_; // Number of shared images @@ -106,5 +110,5 @@ FL_EXPORT extern void fl_register_images(); #endif // !Fl_Shared_Image_H // -// End of "$Id: Fl_Shared_Image.H 7505 2010-04-14 20:47:34Z manolo $" +// End of "$Id: Fl_Shared_Image.H 8306 2011-01-24 17:04:22Z matt $" // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Simple_Counter.H b/plugins/zynaddsubfx/fltk/FL/Fl_Simple_Counter.H index 3b1a92784..dbcebdba2 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Simple_Counter.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Simple_Counter.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Simple_Counter.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Simple_Counter.H 8022 2010-12-12 23:21:03Z AlbrechtS $" // // Simple counter header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -34,10 +34,10 @@ #include "Fl_Counter.H" /** This widget creates a counter with only 2 arrow buttons -

    \image html counter.gif

    - \image latex counter.eps "Fl_Simple_Counter" width=4cm +

    \image html counter.png

    + \image latex counter.png "Fl_Simple_Counter" width=4cm */ -class Fl_Simple_Counter : public Fl_Counter { +class FL_EXPORT Fl_Simple_Counter : public Fl_Counter { public: Fl_Simple_Counter(int x,int y,int w,int h, const char *l = 0) : Fl_Counter(x,y,w,h,l) {type(FL_SIMPLE_COUNTER);} @@ -46,5 +46,5 @@ public: #endif // -// End of "$Id: Fl_Simple_Counter.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Simple_Counter.H 8022 2010-12-12 23:21:03Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Single_Window.H b/plugins/zynaddsubfx/fltk/FL/Fl_Single_Window.H index a536c4951..9bebc4ea8 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Single_Window.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Single_Window.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Single_Window.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Single_Window.H 7903 2010-11-28 21:06:39Z matt $" // // Single-buffered window header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -63,5 +63,5 @@ public: #endif // -// End of "$Id: Fl_Single_Window.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Single_Window.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Slider.H b/plugins/zynaddsubfx/fltk/FL/Fl_Slider.H index 20c60c4e6..e16e2d6d1 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Slider.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Slider.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Slider.H 6683 2009-03-14 11:46:43Z engelsman $" +// "$Id: Fl_Slider.H 7981 2010-12-08 23:53:04Z greg.ercolano $" // // Slider header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -64,8 +64,8 @@ \li FL_HOR_NICE_SLIDER - Draws a horizontal slider with a nice looking control knob. - \image html slider.gif - \image latex slider.eps "Fl_Slider" width=4cm + \image html slider.png + \image latex slider.png "Fl_Slider" width=4cm */ class FL_EXPORT Fl_Slider : public Fl_Valuator { @@ -116,5 +116,5 @@ public: #endif // -// End of "$Id: Fl_Slider.H 6683 2009-03-14 11:46:43Z engelsman $". +// End of "$Id: Fl_Slider.H 7981 2010-12-08 23:53:04Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Spinner.H b/plugins/zynaddsubfx/fltk/FL/Fl_Spinner.H index b718d9281..5d141bd31 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Spinner.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Spinner.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Spinner.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Spinner.H 8339 2011-01-30 12:50:19Z ianmacarthur $" // // Spinner widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -48,8 +48,8 @@ widget and repeat buttons. The user can either type into the input area or use the buttons to change the value. */ -class Fl_Spinner : public Fl_Group -{ +class FL_EXPORT Fl_Spinner : public Fl_Group { + double value_; // Current value double minimum_; // Minimum value double maximum_; // Maximum value @@ -233,14 +233,16 @@ class Fl_Spinner : public Fl_Group void textsize(Fl_Fontsize s) { input_.textsize(s); } - /** Sets or Gets the numeric representation in the input field. - Valid values are FL_INT_INPUT and FL_FLOAT_INPUT. - The first form also changes the format() template. - Setting a new spinner type via a superclass pointer will not work. - \note type is not a virtual function. + /** Gets the numeric representation in the input field. + \see Fl_Spinner::type(uchar) */ uchar type() const { return (input_.type()); } - /** See uchar Fl_Spinner::type() const */ + /** Sets the numeric representation in the input field. + Valid values are FL_INT_INPUT and FL_FLOAT_INPUT. + Also changes the format() template. + Setting a new spinner type via a superclass pointer will not work. + \note type is not a virtual function. + */ void type(uchar v) { if (v==FL_FLOAT_INPUT) { format("%.*f"); @@ -262,5 +264,5 @@ class Fl_Spinner : public Fl_Group #endif // !Fl_Spinner_H // -// End of "$Id: Fl_Spinner.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Spinner.H 8339 2011-01-30 12:50:19Z ianmacarthur $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Sys_Menu_Bar.H b/plugins/zynaddsubfx/fltk/FL/Fl_Sys_Menu_Bar.H index 68a26d16a..da70c92c4 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Sys_Menu_Bar.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Sys_Menu_Bar.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Sys_Menu_Bar.H 7518 2010-04-16 19:27:28Z manolo $" +// "$Id: Fl_Sys_Menu_Bar.H 7903 2010-11-28 21:06:39Z matt $" // // MacOS system menu bar header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -76,5 +76,5 @@ typedef Fl_Menu_Bar Fl_Sys_Menu_Bar; #endif // Fl_Sys_Menu_Bar_H // -// End of "$Id: Fl_Sys_Menu_Bar.H 7518 2010-04-16 19:27:28Z manolo $". +// End of "$Id: Fl_Sys_Menu_Bar.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Table.H b/plugins/zynaddsubfx/fltk/FL/Fl_Table.H index 3be069dc4..55c06fddd 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Table.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Table.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Table.H 7612 2010-05-19 07:22:37Z greg.ercolano $" +// "$Id: Fl_Table.H 8301 2011-01-22 22:40:11Z AlbrechtS $" // // Fl_Table -- A table widget // @@ -61,12 +61,19 @@ This widget can be used in several ways: - - As a custom widget; see test/testtablerow.cxx. Very optimal for even - extremely large tables. - - As a table made up of a single FLTK widget instanced all over the table; - see test/singleinput.cxx. Very optimal for even extremely large tables; + - As a custom widget; see examples/table-simple.cxx and test/table.cxx. + Very optimal for even extremely large tables. + - As a table made up of a single FLTK widget instanced all over the table, + simulating a numeric spreadsheet. See examples/table-spreadsheet.cxx and + examples/table-spreadsheet-with-keyboard-nav.cxx. Optimal for large tables. - As a regular container of FLTK widgets, one widget per cell. - See test/widgettable.cxx. \em Not recommended for large tables. + See examples/table-as-container.cxx. \em Not recommended for large tables. + + \image html table-simple.png + \image latex table-simple.png "table-simple example" width=6cm + + \image html table-as-container.png + \image latex table-as-container.png "table-as-container example" width=6cm When acting as part of a custom widget, events on the cells and/or headings generate callbacks when they are clicked by the user. You control when events @@ -74,11 +81,12 @@ When acting as a container for FLTK widgets, the FLTK widgets maintain themselves. Although the draw_cell() method must be overridden, its contents - can be very simple. See the draw_cell() code in test/widgettable.cxx. + can be very simple. See the draw_cell() code in examples/table-simple.cxx. The following variables are available to classes deriving from Fl_Table: - \image html table-dimensions.gif + \image html table-dimensions.png + \image latex table-dimensions.png "Fl_Table Dimensions" width=6cm @@ -117,11 +125,12 @@ LICENSE Greg added the following license to the original distribution of Fl_Table. He - kindly gave his permission to integrate Fl_Table and Fl_Table_row into FLTK, + kindly gave his permission to integrate Fl_Table and Fl_Table_Row into FLTK, allowing FLTK license to apply while his widgets are part of the library. If used on its own, this is the license that applies: - + + \verbatim Fl_Table License December 16, 2002 @@ -165,20 +174,24 @@ [program/widget] is based in part on the work of the Fl_Table project http://seriss.com/people/erco/fltk/Fl_Table/ + \endverbatim */ -class Fl_Table : public Fl_Group { +class FL_EXPORT Fl_Table : public Fl_Group { public: + /** + The context bit flags for Fl_Table related callbacks (eg. draw_cell(), callback(), etc) + */ enum TableContext { - CONTEXT_NONE = 0, - CONTEXT_STARTPAGE = 0x01, // before a page is redrawn - CONTEXT_ENDPAGE = 0x02, // after a page is redrawn - CONTEXT_ROW_HEADER = 0x04, // in the row header - CONTEXT_COL_HEADER = 0x08, // in the col header - CONTEXT_CELL = 0x10, // in one of the cells - CONTEXT_TABLE = 0x20, // in the table - CONTEXT_RC_RESIZE = 0x40 // column or row being resized + CONTEXT_NONE = 0, ///< no known context + CONTEXT_STARTPAGE = 0x01, ///< before a page is redrawn + CONTEXT_ENDPAGE = 0x02, ///< after a page is redrawn + CONTEXT_ROW_HEADER = 0x04, ///< in the row header + CONTEXT_COL_HEADER = 0x08, ///< in the col header + CONTEXT_CELL = 0x10, ///< in one of the cells + CONTEXT_TABLE = 0x20, ///< in a dead zone of table + CONTEXT_RC_RESIZE = 0x40 ///< column or row being resized }; private: @@ -207,7 +220,7 @@ private: int _selecting; // An STL-ish vector without templates - class IntVector { + class FL_EXPORT IntVector { int *arr; unsigned int _size; void init() { @@ -326,38 +339,47 @@ protected:
    x()/y()/w()/h()
    - + - + - + - + - + + either interactively or via col_width() or row_height().
    + R/C/X/Y/W/H will all be zero. +

    + Useful for fltk containers that need to resize or move + the child fltk widgets.

    \p Fl_Table::CONTEXT_STARTPAGE When table, or parts of the table, are about to be redrawn. - Use to initialize static data, such as font selections. - r/c will be zero, x/y/w/h will be the dimensions of the - table's entire data area. - (Useful for locking a database before accessing; see - also visible_cells())When table, or parts of the table, are about to be redrawn.
    + Use to initialize static data, such as font selections.

    + R/C will be zero,
    + X/Y/W/H will be the dimensions of the table's entire data area.
    + (Useful for locking a database before accessing; see + also visible_cells())
    \p Fl_Table::CONTEXT_ENDPAGEWhen table has completed being redrawn. - r/c will be zero, x/y/w/h dimensions of table's data area. - (Useful for unlocking a database after accessing)When table has completed being redrawn.
    + R/C will be zero, X/Y/W/H dimensions of table's data area.
    + (Useful for unlocking a database after accessing)
    \p Fl_Table::CONTEXT_ROW_HEADERWhenever a row header cell needs to be drawn.Whenever a row header cell needs to be drawn.
    + R will be the row number of the header being redrawn,
    + C will be zero,
    + X/Y/W/H will be the fltk drawing area of the row header in the window
    \p Fl_Table::CONTEXT_COL_HEADERWhenever a column header cell needs to be drawn.Whenever a column header cell needs to be drawn.
    + R will be zero,
    + C will be the column number of the header being redrawn,
    + X/Y/W/H will be the fltk drawing area of the column header in the window
    \p Fl_Table::CONTEXT_CELLWhenever a data cell in the table needs to be drawn.Whenever a data cell in the table needs to be drawn.
    + R/C will be the row/column of the cell to be drawn,
    + X/Y/W/H will be the fltk drawing area of the cell in the window
    \p Fl_Table::CONTEXT_RC_RESIZE Whenever table or row/column is resized or scrolled, - either interactively or via col_width() or row_height(). - - Useful for fltk containers that need to resize or move - the child fltk widgets.
    \p row and \p col will be set to the row and column number - the user clicked on. In the case of row headers, \p col will be \a 0. + of the cell being drawn. In the case of row headers, \p col will be \a 0. In the case of column headers, \p row will be \a 0. x/y/w/h will be the position and dimensions of where the cell @@ -371,55 +393,53 @@ protected: \code // This is called whenever Fl_Table wants you to draw a cell - void MyTable::draw_cell(TableContext context, int R=0, int C=0, int X=0, int Y=0, int W=0, int H=0) - { - static char s[40]; - sprintf(s, "%d/%d", R, C); // text for each cell - switch ( context ) - { - case CONTEXT_STARTPAGE: // Fl_Table telling us its starting to draw page - fl_font(FL_HELVETICA, 16); - return; - - case CONTEXT_ROW_HEADER: // Fl_Table telling us it's draw row/col headers - case CONTEXT_COL_HEADER: - fl_push_clip(X, Y, W, H); - { - fl_draw_box(FL_THIN_UP_BOX, X, Y, W, H, color()); - fl_color(FL_BLACK); - fl_draw(s, X, Y, W, H, FL_ALIGN_CENTER); - } - fl_pop_clip(); - return; - - case CONTEXT_CELL: // Fl_Table telling us to draw cells - fl_push_clip(X, Y, W, H); - { - // BG COLOR - fl_color( row_selected(R) ? selection_color() : FL_WHITE); - fl_rectf(X, Y, W, H); - - // TEXT - fl_color(FL_BLACK); - fl_draw(s, X, Y, W, H, FL_ALIGN_CENTER); - - // BORDER - fl_color(FL_LIGHT2); - fl_rect(X, Y, W, H); - } - fl_pop_clip(); - return; - - default: - return; - } - //NOTREACHED + void MyTable::draw_cell(TableContext context, int R=0, int C=0, int X=0, int Y=0, int W=0, int H=0) { + static char s[40]; + sprintf(s, "%d/%d", R, C); // text for each cell + switch ( context ) { + case CONTEXT_STARTPAGE: // Fl_Table telling us its starting to draw page + fl_font(FL_HELVETICA, 16); + return; + + case CONTEXT_ROW_HEADER: // Fl_Table telling us it's draw row/col headers + case CONTEXT_COL_HEADER: + fl_push_clip(X, Y, W, H); + { + fl_draw_box(FL_THIN_UP_BOX, X, Y, W, H, color()); + fl_color(FL_BLACK); + fl_draw(s, X, Y, W, H, FL_ALIGN_CENTER); + } + fl_pop_clip(); + return; + + case CONTEXT_CELL: // Fl_Table telling us to draw cells + fl_push_clip(X, Y, W, H); + { + // BG COLOR + fl_color( row_selected(R) ? selection_color() : FL_WHITE); + fl_rectf(X, Y, W, H); + + // TEXT + fl_color(FL_BLACK); + fl_draw(s, X, Y, W, H, FL_ALIGN_CENTER); + + // BORDER + fl_color(FL_LIGHT2); + fl_rect(X, Y, W, H); + } + fl_pop_clip(); + return; + + default: + return; + } + //NOTREACHED } \endcode */ virtual void draw_cell(TableContext context, int R=0, int C=0, int X=0, int Y=0, int W=0, int H=0) - { } // overridden by deriving class + { } // overridden by deriving class long row_scroll_position(int row); // find scroll position of row (in pixels) long col_scroll_position(int col); // find scroll position of col (in pixels) @@ -472,9 +492,7 @@ public: */ virtual void clear() { rows(0); cols(0); } - // topline() - // middleline() - // bottomline() + // \todo: add topline(), middleline(), bottomline() /** Sets the kind of box drawn around the data table, @@ -811,8 +829,8 @@ public: return(row_position()); } int is_selected(int r, int c); // selected cell - void get_selection(int& s_top, int& s_left, int& s_bottom, int& s_right); - void set_selection(int s_top, int s_left, int s_bottom, int s_right); + void get_selection(int &row_top, int &col_left, int &row_bot, int &col_right); + void set_selection(int row_top, int col_left, int row_bot, int col_right); int move_cursor(int R, int C); /** @@ -879,10 +897,9 @@ public: Typically used in loops, eg: \code - for ( int i=0; i \code - class MyTable - { - [..] + class MyTable : public Fl_Table { + [..] private: - // Handle events that happen on the table - void event_callback2() - { - int R = callback_row(), // row where event occurred - C = callback_col(); // column where event occurred - TableContext context = callback_context(); // which part of table - fprintf(stderr, "callback: Row=%d Col=%d Context=%d Event=%d\n", - R, C, (int)context, (int)Fl::event()); - } - - // Actual static callback - static void event_callback(Fl_Widget*, void* data) - { - MyTable *o = (MyTable*)data; - o->event_callback2(); - } + // Handle events that happen on the table + void event_callback2() { + int R = callback_row(), // row where event occurred + C = callback_col(); // column where event occurred + TableContext context = callback_context(); // which part of table + fprintf(stderr, "callback: Row=%d Col=%d Context=%d Event=%d\n", + R, C, (int)context, (int)Fl::event()); + } + // Actual static callback + static void event_callback(Fl_Widget*, void* data) { + MyTable *o = (MyTable*)data; + o->event_callback2(); + } + public: - MyTable() // Constructor - { - [..] - table.callback(&event_callback, (void*)this); // setup callback - table.when(FL_WHEN_CHANGED|FL_WHEN_RELEASE); // when to call it - } + // Constructor + MyTable() { + [..] + table.callback(&event_callback, (void*)this); // setup callback + table.when(FL_WHEN_CHANGED|FL_WHEN_RELEASE); // when to call it + } }; \endcode */ @@ -1063,5 +1077,5 @@ public: #endif /*_FL_TABLE_H*/ // -// End of "$Id: Fl_Table.H 7612 2010-05-19 07:22:37Z greg.ercolano $". +// End of "$Id: Fl_Table.H 8301 2011-01-22 22:40:11Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Table_Row.H b/plugins/zynaddsubfx/fltk/FL/Fl_Table_Row.H index 936eb47af..f2c3f25c0 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Table_Row.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Table_Row.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Table_Row.H 6942 2009-11-18 12:22:51Z AlbrechtS $" +// "$Id: Fl_Table_Row.H 8301 2011-01-22 22:40:11Z AlbrechtS $" // #ifndef _FL_TABLE_ROW_H @@ -37,12 +37,10 @@ /** A table with row selection capabilities. - This class implements a simple table of rows and columns that specializes in - the selection of rows. This widget is similar in behavior to a "mail subject - browser", similar to that found in mozilla, netscape and outlook mail browsers. - - Most methods of importance will be found in the Fl_Table widget, such as - Fl_Table::rows() and Fl_Table::cols(). + This class implements a simple table with the ability to select + rows. This widget is similar to an Fl_Browser with columns. Most + methods of importance will be found in the Fl_Table widget, such + as Fl_Table::rows() and Fl_Table::cols(). To be useful it must be subclassed and at minimum the draw_cell() method must be overridden to provide the content of the cells. This widget @@ -53,7 +51,7 @@ clicked by the user. You control when events are generated based on the values you supply for Fl_Table::when(). */ -class Fl_Table_Row : public Fl_Table { +class FL_EXPORT Fl_Table_Row : public Fl_Table { public: enum TableRowSelectMode { SELECT_NONE, // no selection allowed @@ -62,7 +60,7 @@ public: }; private: // An STL-ish vector without templates - class CharVector { + class FL_EXPORT CharVector { char *arr; int _size; void init() { @@ -209,5 +207,5 @@ public: #endif /*_FL_TABLE_ROW_H*/ // -// End of "$Id: Fl_Table_Row.H 6942 2009-11-18 12:22:51Z AlbrechtS $". +// End of "$Id: Fl_Table_Row.H 8301 2011-01-22 22:40:11Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Tabs.H b/plugins/zynaddsubfx/fltk/FL/Fl_Tabs.H index aff3096a4..66b4d3be9 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Tabs.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Tabs.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Tabs.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Tabs.H 8101 2010-12-22 13:06:03Z AlbrechtS $" // // Tab header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -38,8 +38,8 @@ interface that allows you to put lots and lots of buttons and switches in a panel, as popularized by many toolkits. - \image html tabs.gif - \image latex tabs.eps "Fl_Tabs" width=8cm + \image html tabs.png + \image latex tabs.png "Fl_Tabs" width=8cm Clicking the tab makes a child visible() by calling show() on it, and all other children are made invisible @@ -62,7 +62,11 @@ class FL_EXPORT Fl_Tabs : public Fl_Group { Fl_Widget *value_; Fl_Widget *push_; - int tab_positions(int*, int*); + int *tab_pos; // array of x-offsets of tabs per child + 1 + int *tab_width; // array of widths of tabs per child + 1 + int tab_count; // array size + int tab_positions(); // allocate and calculate tab positions + void clear_tab_positions(); int tab_height(); void draw_tab(int x1, int x2, int W, int H, Fl_Widget* o, int sel=0); protected: @@ -77,10 +81,12 @@ public: int push(Fl_Widget *); Fl_Tabs(int,int,int,int,const char * = 0); Fl_Widget *which(int event_x, int event_y); + ~Fl_Tabs(); + void client_area(int &rx, int &ry, int &rw, int &rh, int tabh=0); }; #endif // -// End of "$Id: Fl_Tabs.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Tabs.H 8101 2010-12-22 13:06:03Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Text_Buffer.H b/plugins/zynaddsubfx/fltk/FL/Fl_Text_Buffer.H index 84fae40a5..630fccbb3 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Text_Buffer.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Text_Buffer.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Text_Buffer.H 7527 2010-04-18 14:33:33Z engelsman $" +// "$Id: Fl_Text_Buffer.H 8148 2010-12-31 22:38:03Z matt $" // // Header file for Fl_Text_Buffer class. // -// Copyright 2001-2009 by Bill Spitzak and others. +// Copyright 2001-2010 by Bill Spitzak and others. // Original code Copyright Mark Edel. Permission to distribute under // the LGPL for the FLTK library granted by Mark Edel. // @@ -33,24 +33,34 @@ #ifndef FL_TEXT_BUFFER_H #define FL_TEXT_BUFFER_H + +#undef ASSERT_UTF8 + +#ifdef ASSERT_UTF8 +# include +# define IS_UTF8_ALIGNED(a) if (a && *a) assert(fl_utf8len(*(a))>0); +# define IS_UTF8_ALIGNED2(a, b) if (b>=0 && blength()) assert(fl_utf8len(a->byte_at(b))>0); +#else +# define IS_UTF8_ALIGNED(a) +# define IS_UTF8_ALIGNED2(a, b) +#endif + + /* - Suggested UTF-8 terminology for this file: - - ?? "length" is the number of characters in a string - ?? "size" is the number of bytes - ?? "index" is the position in a string in number of characters - ?? "offset" is the position in a strin in bytes (and must be kept on a charater boundary) - (there seems to be no standard in Uncode documents, howevere "length" is commonly - referencing the number of bytes. Maybe "bytes" and "glyphs" would be the most - obvious way to describe sizes?) - "character size" is the size of a UTF-8 character in bytes - "character width" is the width of a Unicode character in pixels - - "column" was orginally defined as a character offset from the left margin. It was - identical to the byte offset. In UTF-8, we have neither a byte offset nor - truly fixed width fonts. Column could be a pixel value multiplied with + "character width" is the width of a Unicode character in pixels + "column" was orginally defined as a character offset from the left margin. + It was identical to the byte offset. In UTF-8, we have neither a byte offset + nor truly fixed width fonts (*). Column could be a pixel value multiplied with an average character width (which is a bearable approximation). + + * in Unicode, there are no fixed width fonts! Even if the ASCII characters may + happen to be all the same width in pixels, chinese charcaters surely are not. + There are plenty of exceptions, like ligatures, that make special handling of + "fixed" character widths a nightmare. I decided to remove all references to + fixed fonts and see "columns" as a multiple of the average width of a + character in the main font. + - Matthias */ @@ -79,15 +89,6 @@ public: */ void set(int start, int end); - /** - \brief Set a regtangular selection range. - \param start byte offset to first selected character - \param end byte offset pointing after last selected character - \param rectStart first selected column - \param rectEnd last selected column +1 - */ - void set_rectangular(int start, int end, int rectStart, int rectEnd); - /** \brief Updates a selection afer text was modified. Updates an individual selection for changes in the corresponding text @@ -97,12 +98,6 @@ public: */ void update(int pos, int nDeleted, int nInserted); - /** - \brief Returns true if the selection is rectangular. - \return flag - */ - char rectangular() const { return mRectangular; } - /** \brief Return the byte offset to the first selected character. \return byte offset @@ -115,36 +110,24 @@ public: */ int end() const { return mEnd; } - /** - \brief Return the first column of the rectangular selection. - \return first column of rectangular selection - */ - int rect_start() const { return mRectStart; } - - /** - \brief Return the last column of the rectangular selection + 1. - \return last column of rectangular selection +1 - */ - int rect_end() const { return mRectEnd; } - /** \brief Returns true if any text is selected. \return a non-zero number if any text has been selected, or 0 if no text is selected. */ - char selected() const { return mSelected; } + bool selected() const { return mSelected; } /** \brief Modify the 'selected' flag. \param b new flag */ - void selected(char b) { mSelected = b; } + void selected(bool b) { mSelected = b; } /** Return true if position \p pos with indentation \p dispIndex is in the Fl_Text_Selection. */ - int includes(int pos, int lineStartPos, int dispIndex) const; + int includes(int pos) const; /** \brief Return the positions of this selection. @@ -154,41 +137,33 @@ public: */ int position(int* start, int* end) const; - /** - \brief Return the positions of this rectangular selection. - \param start return byte offset to first selected character - \param end return byte offset pointing after last selected character - \param isRect return if the selection is rectangular - \param rectStart return first selected column - \param rectEnd return last selected column +1 - \return true if selected - */ - int position(int* start, int* end, int* isRect, int* rectStart, int* rectEnd) const; - protected: - char mSelected; ///< this flag is set if any text is selected - char mRectangular; ///< this flag is set if the selection is rectangular int mStart; ///< byte offset to the first selected character int mEnd; ///< byte offset to the character after the last selected character - int mRectStart; ///< first selected column (see "column") - int mRectEnd; ///< last selected column +1 (see "column") + bool mSelected; ///< this flag is set if any text is selected }; + typedef void (*Fl_Text_Modify_Cb)(int pos, int nInserted, int nDeleted, int nRestyled, const char* deletedText, void* cbArg); + typedef void (*Fl_Text_Predelete_Cb)(int pos, int nDeleted, void* cbArg); /** \brief This class manages unicode displayed in one or more Fl_Text_Display widgets. + All text in Fl_Text_Buffermust be encoded in UTF-8. All indices used in the + function calls must be aligned to the start of a UTF-8 sequence. All indices + and pointers returned will be aligned. All functions that return a single + character will return that in an unsiged int in UCS-4 encoding. + The Fl_Text_Buffer class is used by the Fl_Text_Display and Fl_Text_Editor to manage complex text data and is based upon the excellent NEdit text editor engine - see http://www.nedit.org/. - \todo unicode check */ class FL_EXPORT Fl_Text_Buffer { public: @@ -218,13 +193,13 @@ public: \brief Get a copy of the entire contents of the text buffer. Memory is allocated to contain the returned string, which the caller must free. - \return newly allocated text buffer - must be free'd + \return newly allocated text buffer - must be free'd, text is utf8 */ char* text() const; /** - Replaces the entire contents of the text buffer - \todo unicode check + Replaces the entire contents of the text buffer. + \param text Text must be valid utf8. */ void text(const char* text); @@ -236,37 +211,42 @@ public: When you are done with the text, free it using the free() function. \param start byte offset to first character \param end byte offset after last character in range - \return newly allocated text buffer - must be free'd + \return newly allocated text buffer - must be free'd, text is utf8 */ char* text_range(int start, int end) const; /** Returns the character at the specified position pos in the buffer. Positions start at 0 - \param pos byte offset into buffer + \param pos byte offset into buffer, pos must be at acharacter boundary \return Unicode UCS-4 encoded character */ - unsigned int character(int pos) const; + unsigned int char_at(int pos) const; + + /** + Returns the raw byte at the specified position pos in the buffer. + Positions start at 0 + \param pos byte offset into buffer + \return unencoded raw byte + */ + char byte_at(int pos) const; /** Convert a byte offset in buffer into a memory address. + \param pos byte offset into buffer + \return byte offset converted to a memory address */ const char *address(int pos) const { return (pos < mGapStart) ? mBuf+pos : mBuf+pos+mGapEnd-mGapStart; } /** Convert a byte offset in buffer into a memory address. + \param pos byte offset into buffer + \return byte offset converted to a memory address */ char *address(int pos) { return (pos < mGapStart) ? mBuf+pos : mBuf+pos+mGapEnd-mGapStart; } - /** - Returns the text from the given rectangle. When you are done - with the text, free it using the free() function. - \todo unicode check - */ - char* text_in_rectangle(int start, int end, int rectStart, int rectEnd) const; - /** Inserts null-terminated string \p text at position \p pos. \param pos insertion position as byte offset (must be utf-8 character aligned) @@ -276,7 +256,7 @@ public: /** Appends the text string to the end of the buffer. - \todo unicode check + \param t utf-8 encoded and nul terminated text */ void append(const char* t) { insert(length(), t); } @@ -296,16 +276,17 @@ public: void replace(int start, int end, const char *text); /** - Copies text from one buffer to this one; fromBuf may - be the same as this. - \todo unicode check + Copies text from one buffer to this one. + \param fromBuf source text buffer may be the same as this + \param fromStart byte offset into buffer + \param fromEnd byte offset into buffer + \param toPos destination byte offset into buffer */ void copy(Fl_Text_Buffer* fromBuf, int fromStart, int fromEnd, int toPos); /** Undo text modification according to the undo variables or insert text from the undo buffer - \todo unicode check */ int undo(int *cp=0); @@ -319,23 +300,22 @@ public: non-zero on error (strerror() contains reason). 1 indicates open for read failed (no data loaded). 2 indicates error occurred while reading data (data was partially loaded). - \todo unicode check + File can be UTF-8 or CP1252-encoded. + If the input file is not UTF-8-encoded, the Fl_Text_Buffer widget will contain + UTF-8-transcoded data. By default, the message Fl_Text_Buffer::file_encoding_warning_message + will warn the user about this. + \see input_file_was_transcoded and transcoding_warning_action. */ int insertfile(const char *file, int pos, int buflen = 128*1024); /** - Appends the named file to the end of the buffer. Returns 0 on - success, non-zero on error (strerror() contains reason). 1 indicates - open for read failed (no data loaded). 2 indicates error occurred - while reading data (data was partially loaded). - \todo unicode check + Appends the named file to the end of the buffer. See also insertfile(). */ int appendfile(const char *file, int buflen = 128*1024) { return insertfile(file, length(), buflen); } /** - Loads a text file into the buffer - \todo unicode check + Loads a text file into the buffer. See also insertfile(). */ int loadfile(const char *file, int buflen = 128*1024) { select(0, length()); remove_selection(); return appendfile(file, buflen); } @@ -345,81 +325,28 @@ public: on error (strerror() contains reason). 1 indicates open for write failed (no data saved). 2 indicates error occurred while writing data (data was partially saved). - \todo unicode check */ int outputfile(const char *file, int start, int end, int buflen = 128*1024); /** Saves a text file from the current buffer - \todo unicode check */ int savefile(const char *file, int buflen = 128*1024) { return outputfile(file, 0, length(), buflen); } /** - Insert \p s columnwise into buffer starting at displayed character - position \p column on the line beginning at \p startPos. Opens a rectangular - space the width and height of \p s, by moving all text to the right of - \p column right. If \p charsInserted and \p charsDeleted are not NULL, the - number of characters inserted and deleted in the operation (beginning - at \p startPos) are returned in these arguments. - \todo unicode check - */ - void insert_column(int column, int startPos, const char* text, - int* charsInserted, int* charsDeleted); - - /** - Replaces a rectangular area in the buffer, given by \p start, \p end, - \p rectStart, and \p rectEnd, with \p text. If \p text is vertically - longer than the rectangle, add extra lines to make room for it. - \todo unicode check - */ - void replace_rectangular(int start, int end, int rectStart, int rectEnd, - const char* text); - - /** - Overlay \p text between displayed character positions \p rectStart and - \p rectEnd on the line beginning at \p startPos. If \p charsInserted and - \p charsDeleted are not NULL, the number of characters inserted and deleted - in the operation (beginning at \p startPos) are returned in these arguments. - \todo unicode check - */ - void overlay_rectangular(int startPos, int rectStart, int rectEnd, - const char* text, int* charsInserted, - int* charsDeleted); - - /** - Removes a rectangular swath of characters between character positions start - and end and horizontal displayed-character offsets rectStart and rectEnd. - \todo unicode check - */ - void remove_rectangular(int start, int end, int rectStart, int rectEnd); - - /** - Clears text in the specified area. - It clears a rectangular "hole" out of the buffer between character positions - start and end and horizontal displayed-character offsets rectStart and - rectEnd. - \todo unicode check - */ - void clear_rectangular(int start, int end, int rectStart, int rectEnd); - - /** Gets the tab width. - \todo unicode check */ int tab_distance() const { return mTabDist; } /** Set the hardware tab distance (width) used by all displays for this buffer, and used in computing offsets for rectangular selection operations. - \todo unicode check */ void tab_distance(int tabDist); /** Selects a range of characters in the buffer. - \todo unicode check */ void select(int start, int end); @@ -430,51 +357,32 @@ public: /** Cancels any previous selection on the primary text selection object - \todo unicode check */ void unselect(); - /** - Achieves a rectangular selection on the primary text selection object - \todo unicode check - */ - void select_rectangular(int start, int end, int rectStart, int rectEnd); - /** Gets the selection position - \todo unicode check */ int selection_position(int* start, int* end); /** - Gets the selection position, and rectangular selection info - \todo unicode check - */ - int selection_position(int* start, int* end, int* isRect, int* rectStart, - int* rectEnd); - - /** Returns the currently selected text. When you are done with the text, free it using the free() function. - \todo unicode check */ char* selection_text(); /** Removes the text in the primary selection. - \todo unicode check */ void remove_selection(); /** Replaces the text in the primary selection. - \todo unicode check */ void replace_selection(const char* text); /** Selects a range of characters in the secondary selection. - \todo unicode check */ void secondary_select(int start, int end); @@ -486,53 +394,33 @@ public: /** Clears any selection in the secondary text selection object. - \todo unicode check */ void secondary_unselect(); /** - Achieves a rectangular selection on the secondary text selection object - \todo unicode check - */ - void secondary_select_rectangular(int start, int end, int rectStart, - int rectEnd); - - /** Returns the current selection in the secondary text selection object. - \todo unicode check */ int secondary_selection_position(int* start, int* end); /** - Returns the current selection in the secondary text selection object. - \todo unicode check - */ - int secondary_selection_position(int* start, int* end, int* isRect, - int* rectStart, int* rectEnd); - - /** Returns the text in the secondary selection. When you are done with the text, free it using the free() function. - \todo unicode check */ char* secondary_selection_text(); /** Removes the text from the buffer corresponding to the secondary text selection object. - \todo unicode check */ void remove_secondary_selection(); /** Replaces the text from the buffer corresponding to the secondary text selection object with the new string \p text. - \todo unicode check */ void replace_secondary_selection(const char* text); /** Highlights the specified text within the buffer. - \todo unicode check */ void highlight(int start, int end); @@ -544,33 +432,17 @@ public: /** Unhighlights text in the buffer. - \todo unicode check */ void unhighlight(); - /** - Highlights a rectangular selection in the buffer - \todo unicode check - */ - void highlight_rectangular(int start, int end, int rectStart, int rectEnd); - /** Highlights the specified text between \p start and \p end within the buffer. - \todo unicode check */ int highlight_position(int* start, int* end); /** - Highlights the specified rectangle of text within the buffer. - \todo unicode check - */ - int highlight_position(int* start, int* end, int* isRect, int* rectStart, - int* rectEnd); - - /** Returns the highlighted text. When you are done with the text, free it using the free() function. - \todo unicode check */ char* highlight_text(); @@ -583,13 +455,11 @@ public: int nRestyled, const char* deletedText, void* cbArg); \endcode - \todo unicode check */ void add_modify_callback(Fl_Text_Modify_Cb bufModifiedCB, void* cbArg); /** Removes a modify callback. - \todo unicode check */ void remove_modify_callback(Fl_Text_Modify_Cb bufModifiedCB, void* cbArg); @@ -597,27 +467,23 @@ public: Calls all modify callbacks that have been registered using the add_modify_callback() method. - \todo unicode check */ void call_modify_callbacks() { call_modify_callbacks(0, 0, 0, 0, 0); } /** Adds a callback routine to be called before text is deleted from the buffer. - \todo unicode check */ void add_predelete_callback(Fl_Text_Predelete_Cb bufPredelCB, void* cbArg); /** Removes a callback routine \p bufPreDeleteCB associated with argument \p cbArg to be called before text is deleted from the buffer. - \todo unicode check */ void remove_predelete_callback(Fl_Text_Predelete_Cb predelCB, void* cbArg); /** Calls the stored pre-delete callback procedure(s) for this buffer to update the changed area(s) on the screen and any other listeners. - \todo unicode check */ void call_predelete_callbacks() { call_predelete_callbacks(0, 0); } @@ -625,13 +491,15 @@ public: Returns the text from the entire line containing the specified character position. When you are done with the text, free it using the free() function. - \todo unicode check + \param pos byte index into buffer + \return copy of utf8 text, must be free'd */ char* line_text(int pos) const; /** Returns the position of the start of the line containing position \p pos. - \todo unicode check + \param pos byte index into buffer + \return byte offset to line start */ int line_start(int pos) const; @@ -639,68 +507,30 @@ public: Finds and returns the position of the end of the line containing position \p pos (which is either a pointer to the newline character ending the line, or a pointer to one character beyond the end of the buffer) - \todo unicode check + \param pos byte index into buffer + \return byte offset to line end */ int line_end(int pos) const; /** Returns the position corresponding to the start of the word - \todo unicode check + \param pos byte index into buffer + \return byte offset to word start */ int word_start(int pos) const; /** Returns the position corresponding to the end of the word. - \todo unicode check + \param pos byte index into buffer + \return byte offset to word end */ int word_end(int pos) const; - /** - Expands the given character to a displayable format. Tabs and - other control characters are given special treatment. - Get a character from the text buffer expanded into its screen - representation (which may be several characters for a tab or a - control code). Returns the number of characters written to \p outStr. - \p indent is the number of characters from the start of the line - for figuring tabs. Output string is guranteed to be shorter or - equal in length to FL_TEXT_MAX_EXP_CHAR_LEN - \todo unicode check - */ - int expand_character(int pos, int indent, char *outStr) const; - - /** - Expand a single character \p c from the text buffer into it's displayable - screen representation (which may be several characters for a tab or a - control code). Returns the number of characters added to \p outStr. - \p indent is the number of characters from the start of the line - for figuring tabs of length \p tabDist. Output string is guaranteed - to be shorter or equal in length to FL_TEXT_MAX_EXP_CHAR_LEN - Tabs and other control characters are given special treatment. - \param src address of utf-8 text - \param indent - \param[out] outStr write substitution here - \param tabDist - \return number of byte in substitution - */ - static int expand_character(const char *src, int indent, char* outStr, int tabDist); - - /** - Return the length in displayed characters of character \p c expanded - for display (as discussed above in expand_character() ). - \param src address of utf-8 text - \param indent - \param tabDist - \return number of byte in substitution - */ - static int character_width(const char *src, int indent, int tabDist); - static int character_width(const char c, int indent, int tabDist); - /** Count the number of displayed characters between buffer position \p lineStartPos and \p targetPos. (displayed characters are the characters shown on the screen to represent characters in the buffer, where tabs and control characters are expanded) - \todo unicode check */ int count_displayed_characters(int lineStartPos, int targetPos) const; @@ -711,21 +541,18 @@ public: \param lineStartPos byte offset into buffer \param nChars number of bytes that are sent to the display \return byte offset in input after all output bytes are sent - \todo unicode check */ int skip_displayed_characters(int lineStartPos, int nChars); /** Counts the number of newlines between \p startPos and \p endPos in buffer. The character at position \p endPos is not counted. - \todo unicode check */ int count_lines(int startPos, int endPos) const; /** Finds the first character of the line \p nLines forward from \p startPos in the buffer and returns its position - \todo unicode check */ int skip_lines(int startPos, int nLines); @@ -733,7 +560,6 @@ public: Finds and returns the position of the first character of the line \p nLines backwards from \p startPos (not counting the character pointed to by \p startpos if that is a newline) in the buffer. \p nLines == 0 means find the beginning of the line - \todo unicode check */ int rewind_lines(int startPos, int nLines); @@ -745,9 +571,12 @@ public: BufSearchForward is that it's optimized for single characters. The overall performance of the text widget is dependent on its ability to count lines quickly, hence searching for a single character: newline) - \todo unicode check + \param startPos byte offset to start position + \param searchChar UCS-4 character that we want to find + \param foundPos byte offset where the character was found + \return 1 if found, 0 if not */ - int findchar_forward(int startPos, char searchChar, int* foundPos) const; + int findchar_forward(int startPos, unsigned searchChar, int* foundPos) const; /** Search backwards in buffer \p buf for character \p searchChar, starting @@ -756,33 +585,22 @@ public: BufSearchBackward is that it's optimized for single characters. The overall performance of the text widget is dependent on its ability to count lines quickly, hence searching for a single character: newline) - \todo unicode check + \param startPos byte offset to start position + \param searchChar UCS-4 character that we want to find + \param foundPos byte offset where the character was found + \return 1 if found, 0 if not */ - int findchar_backward(int startPos, char searchChar, int* foundPos) const; - - /** - Finds the next occurrence of the specified characters. - Search forwards in buffer for characters in \p searchChars, starting - with the character \p startPos, and returning the result in \p foundPos - returns 1 if found, 0 if not. - \todo unicode check - */ - int findchars_forward(int startPos, const char* searchChars, int* foundPos) const; - - /** - Finds the previous occurrence of the specified characters. - Search backwards in buffer for characters in \p searchChars, starting - with the character BEFORE \p startPos, returning the result in \p foundPos - returns 1 if found, 0 if not. - \todo unicode check - */ - int findchars_backward(int startPos, const char* searchChars, int* foundPos) const; + int findchar_backward(int startPos, unsigned int searchChar, int* foundPos) const; /** Search forwards in buffer for string \p searchString, starting with the character \p startPos, and returning the result in \p foundPos returns 1 if found, 0 if not. - \todo unicode check + \param startPos byte offset to start position + \param searchString utf8 string that we want to find + \param foundPos byte offset where the string was found + \param matchCase if set, match character case + \return 1 if found, 0 if not */ int search_forward(int startPos, const char* searchString, int* foundPos, int matchCase = 0) const; @@ -791,7 +609,11 @@ public: Search backwards in buffer for string searchCharssearchString, starting with the character BEFORE \p startPos, returning the result in \p foundPos returns 1 if found, 0 if not. - \todo unicode check + \param startPos byte offset to start position + \param searchString utf8 string that we want to find + \param foundPos byte offset where the string was found + \param matchCase if set, match character case + \return 1 if found, 0 if not */ int search_backward(int startPos, const char* searchString, int* foundPos, int matchCase = 0) const; @@ -816,12 +638,51 @@ public: */ const Fl_Text_Selection* highlight_selection() const { return &mHighlight; } + /** + Returns the index of the previous character. + \param ix index to the current char + */ + int prev_char(int ix) const; + int prev_char_clipped(int ix) const; + + /** + Returns the index of the next character. + \param ix index to the current char + */ + int next_char(int ix) const; + int next_char_clipped(int ix) const; + + /** + Align an index into the buffer to the current or previous utf8 boundary. + */ + int utf8_align(int) const; + + /** + \brief true iff the loaded file has been transcoded to UTF-8 + */ + int input_file_was_transcoded; + + /** This message may be displayed using the fl_alert() function when a file + which was not UTF-8 encoded is input. + */ + static const char* file_encoding_warning_message; + + /** + \brief Pointer to a function called after reading a non UTF-8 encoded file. + + This function is called after reading a file if the file content + was transcoded to UTF-8. Its default implementation calls fl_alert() + with the text of \ref file_encoding_warning_message. No warning message is + displayed if this pointer is set to NULL. Use \ref input_file_was_transcoded + to be informed if file input required transcoding to UTF-8. + */ + void (*transcoding_warning_action)(Fl_Text_Buffer*); + protected: /** Calls the stored modify callback procedure(s) for this buffer to update the changed area(s) on the screen and any other listeners. - \todo unicode check */ void call_modify_callbacks(int pos, int nDeleted, int nInserted, int nRestyled, const char* deletedText) const; @@ -829,7 +690,6 @@ protected: /** Calls the stored pre-delete callback procedure(s) for this buffer to update the changed area(s) on the screen and any other listeners. - \todo unicode check */ void call_predelete_callbacks(int pos, int nDeleted) const; @@ -839,7 +699,7 @@ protected: expensive and the length will be required by any caller who will continue on to call redisplay). \p pos must be contiguous with the existing text in the buffer (i.e. not past the end). - \todo unicode check + \return the number of bytes inserted */ int insert_(int pos, const char* text); @@ -847,64 +707,24 @@ protected: Internal (non-redisplaying) version of BufRemove. Removes the contents of the buffer between start and end (and moves the gap to the site of the delete). - \todo unicode check */ void remove_(int start, int end); - /** - Deletes a rectangle of text without calling the modify callbacks. Returns - the number of characters replacing those between \p start and \p end. Note that - in some pathological cases, deleting can actually increase the size of - the buffer because of tab expansions. \p endPos returns the buffer position - of the point in the last line where the text was removed (as a hint for - routines which need to position the cursor after a delete operation) - \todo unicode check - */ - void remove_rectangular_(int start, int end, int rectStart, int rectEnd, - int* replaceLen, int* endPos); - - /** - Inserts a column of text without calling the modify callbacks. Note that - in some pathological cases, inserting can actually decrease the size of - the buffer because of spaces being coalesced into tabs. \p nDeleted and - \p nInserted return the number of characters deleted and inserted beginning - at the start of the line containing \p startPos. \p endPos returns buffer - position of the lower left edge of the inserted column (as a hint for - routines which need to set a cursor position). - \todo unicode check - */ - void insert_column_(int column, int startPos, const char* insText, - int* nDeleted, int* nInserted, int* endPos); - - /** - Overlay a rectangular area of text without calling the modify callbacks. - \p nDeleted and \p nInserted return the number of characters deleted and - inserted beginning at the start of the line containing \p startPos. - \p endPos returns buffer position of the lower left edge of the inserted - column (as a hint for routines which need to set a cursor position). - \todo unicode check - */ - void overlay_rectangular_(int startPos, int rectStart, int rectEnd, - const char* insText, int* nDeleted, - int* nInserted, int* endPos); - /** Calls the stored redisplay procedure(s) for this buffer to update the screen for a change in a selection. - \todo unicode check */ void redisplay_selection(Fl_Text_Selection* oldSelection, Fl_Text_Selection* newSelection) const; /** - \todo unicode check + Move the gap to start at a new position. */ void move_gap(int pos); /** Reallocates the text storage in the buffer to have a gap starting at \p newGapStart and a gap size of \p newGapLen, preserving the buffer's current contents. - \todo unicode check */ void reallocate_with_gap(int newGapStart, int newGapLen); @@ -912,38 +732,16 @@ protected: /** Removes the text from the buffer corresponding to \p sel. - \todo unicode check */ void remove_selection_(Fl_Text_Selection* sel); /** Replaces the \p text in selection \p sel. - \todo unicode check */ void replace_selection_(Fl_Text_Selection* sel, const char* text); - /** - Finds the first and last character position in a line within a rectangular - selection (for copying). Includes tabs which cross rectStart, but not - control characters which do so. Leaves off tabs which cross rectEnd. - - Technically, the calling routine should convert tab characters which - cross the right boundary of the selection to spaces which line up with - the edge of the selection. Unfortunately, the additional memory - management required in the parent routine to allow for the changes - in string size is not worth all the extra work just for a couple of - shifted characters, so if a tab protrudes, just lop it off and hope - that there are other characters in the selection to establish the right - margin for subsequent columnar pastes of this data. - \todo unicode check - */ - void rectangular_selection_boundaries(int lineStartPos, int rectStart, - int rectEnd, int* selStart, - int* selEnd) const; - /** Updates all of the selections in the buffer for changes in the buffer's text - \todo unicode check */ void update_selections(int pos, int nDeleted, int nInserted); @@ -959,15 +757,13 @@ protected: // The hardware tab distance used by all displays for this buffer, // and used in computing offsets for rectangular selection operations. int mTabDist; /**< equiv. number of characters in a tab */ - int mUseTabs; /**< True if buffer routines are allowed to use - tabs for padding in rectangular operations */ int mNModifyProcs; /**< number of modify-redisplay procs attached */ - Fl_Text_Modify_Cb* /**< procedures to call when buffer is */ - mModifyProcs; /**< modified to redisplay contents */ + Fl_Text_Modify_Cb *mModifyProcs;/**< procedures to call when buffer is + modified to redisplay contents */ void** mCbArgs; /**< caller arguments for modifyProcs above */ int mNPredeleteProcs; /**< number of pre-delete procs attached */ - Fl_Text_Predelete_Cb* /**< procedure to call before text is deleted */ - mPredeleteProcs; /**< from the buffer; at most one is supported. */ + Fl_Text_Predelete_Cb *mPredeleteProcs; /**< procedure to call before text is deleted + from the buffer; at most one is supported. */ void **mPredeleteCbArgs; /**< caller argument for pre-delete proc above */ int mCursorPosHint; /**< hint for reasonable cursor position after a buffer modification operation */ @@ -981,5 +777,5 @@ protected: #endif // -// End of "$Id: Fl_Text_Buffer.H 7527 2010-04-18 14:33:33Z engelsman $". +// End of "$Id: Fl_Text_Buffer.H 8148 2010-12-31 22:38:03Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Text_Display.H b/plugins/zynaddsubfx/fltk/FL/Fl_Text_Display.H index 71bbd229d..c9b91f1f1 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Text_Display.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Text_Display.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Text_Display.H 7527 2010-04-18 14:33:33Z engelsman $" +// "$Id: Fl_Text_Display.H 8306 2011-01-24 17:04:22Z matt $" // // Header file for Fl_Text_Display class. // -// Copyright 2001-2009 by Bill Spitzak and others. +// Copyright 2001-2010 by Bill Spitzak and others. // Original code Copyright Mark Edel. Permission to distribute under // the LGPL for the FLTK library granted by Mark Edel. // @@ -28,7 +28,7 @@ // /* \file - Fl_Text_Display widget . */ + Fl_Text_Display widget . */ #ifndef FL_TEXT_DISPLAY_H #define FL_TEXT_DISPLAY_H @@ -40,305 +40,441 @@ #include "Fl_Text_Buffer.H" /** - This is the FLTK text display widget. It allows the user to - view multiple lines of text and supports highlighting and - scrolling. The buffer that is displayed in the widget is managed - by the Fl_Text_Buffer - class. -*/ + \brief Rich text display widget. + + This is the FLTK text display widget. It allows the user to view multiple lines + of text and supports highlighting and scrolling. The buffer that is displayed + in the widget is managed by the Fl_Text_Buffer class. A single Text Buffer + can be displayed by multiple Text Displays. + */ class FL_EXPORT Fl_Text_Display: public Fl_Group { - public: - /** text display cursor shapes enumeration */ - enum { - NORMAL_CURSOR, CARET_CURSOR, DIM_CURSOR, - BLOCK_CURSOR, HEAVY_CURSOR - }; - enum { - CURSOR_POS, CHARACTER_POS - }; - - /** drag types- they match Fl::event_clicks() so that single clicking to - start a collection selects by character, double clicking selects by - word and triple clicking selects by line. - */ - enum { - DRAG_CHAR = 0, DRAG_WORD = 1, DRAG_LINE = 2 - }; - friend void fl_text_drag_me(int pos, Fl_Text_Display* d); - - typedef void (*Unfinished_Style_Cb)(int, void *); - - /** style attributes - currently not implemented! */ - enum { - ATTR_NONE = 0, - ATTR_UNDERLINE = 1, - ATTR_HIDDEN = 2 - }; - /** This structure associates the color,font,size of a string to draw - with an attribute mask matching attr */ - struct Style_Table_Entry { - Fl_Color color; - Fl_Font font; - int size; - unsigned attr; - }; - - Fl_Text_Display(int X, int Y, int W, int H, const char *l = 0); - ~Fl_Text_Display(); - - virtual int handle(int e); - void buffer(Fl_Text_Buffer* buf); +public: + + /** + text display cursor shapes enumeration + */ + enum { + NORMAL_CURSOR, /**< I-beam */ + CARET_CURSOR, /**< caret under the text */ + DIM_CURSOR, /**< dim I-beam */ + BLOCK_CURSOR, /**< unfille box under the current character */ + HEAVY_CURSOR /**< thick I-beam */ + }; + /** - Sets or gets the current text buffer associated with the text widget. - Multiple text widgets can be associated with the same text buffer. - */ - void buffer(Fl_Text_Buffer& buf) { buffer(&buf); } - /** - Gets the current text buffer associated with the text widget. - Multiple text widgets can be associated with the same text buffer. - */ - Fl_Text_Buffer* buffer() const { return mBuffer; } - void redisplay_range(int start, int end); - void scroll(int topLineNum, int horizOffset); - void insert(const char* text); - void overstrike(const char* text); - void insert_position(int newPos); - /** Gets the position of the text insertion cursor for text display */ - int insert_position() const { return mCursorPos; } - int in_selection(int x, int y) const; - void show_insert_position(); - int move_right(); - int move_left(); - int move_up(); - int move_down(); - int count_lines(int start, int end, bool start_pos_is_line_start) const; - int line_start(int pos) const; - int line_end(int pos, bool start_pos_is_line_start) const; - int skip_lines(int startPos, int nLines, bool startPosIsLineStart); - int rewind_lines(int startPos, int nLines); - void next_word(void); - void previous_word(void); - void show_cursor(int b = 1); - /** Hides the text cursor */ - void hide_cursor() { show_cursor(0); } - void cursor_style(int style); - /** Sets or gets the text cursor color. */ - Fl_Color cursor_color() const {return mCursor_color;} - /** Sets or gets the text cursor color. */ - void cursor_color(Fl_Color n) {mCursor_color = n;} - /** Sets or gets the width/height of the scrollbars. */ - int scrollbar_width() const { return scrollbar_width_; } - /** Sets or gets the width/height of the scrollbars. */ - void scrollbar_width(int W) { scrollbar_width_ = W; } - /** Gets the scrollbar alignment type */ - Fl_Align scrollbar_align() const { return scrollbar_align_; } - /** Sets the scrollbar alignment type */ - void scrollbar_align(Fl_Align a) { scrollbar_align_ = a; } - /** Moves the insert position to the beginning of the current word. */ - int word_start(int pos) const { return buffer()->word_start(pos); } - /** Moves the insert position to the end of the current word. */ - int word_end(int pos) const { return buffer()->word_end(pos); } + the character position is the left edge of a character, whereas + the cursor is thought to be between the centers of two consecutive + characters. + */ + enum { + CURSOR_POS, + CHARACTER_POS + }; + + /** + drag types - they match Fl::event_clicks() so that single clicking to + start a collection selects by character, double clicking selects by + word and triple clicking selects by line. + */ + enum { + DRAG_NONE = -2, + DRAG_START_DND = -1, + DRAG_CHAR = 0, + DRAG_WORD = 1, + DRAG_LINE = 2 + }; + + /** + wrap types - used in wrap_mode() + */ + enum { + WRAP_NONE, /**< don't wrap text at all */ + WRAP_AT_COLUMN, /**< wrap text at the given text column */ + WRAP_AT_PIXEL, /**< wrap text at a pixel position */ + WRAP_AT_BOUNDS /**< wrap text so that it fits into the widget width */ + }; + + friend void fl_text_drag_me(int pos, Fl_Text_Display* d); + + typedef void (*Unfinished_Style_Cb)(int, void *); + + /** + This structure associates the color, font, andsize of a string to draw + with an attribute mask matching attr + */ + struct Style_Table_Entry { + Fl_Color color; + Fl_Font font; + Fl_Fontsize size; + unsigned attr; + }; + + Fl_Text_Display(int X, int Y, int W, int H, const char *l = 0); + ~Fl_Text_Display(); + + virtual int handle(int e); + + void buffer(Fl_Text_Buffer* buf); + + /** + Sets the current text buffer associated with the text widget. + Multiple text widgets can be associated with the same text buffer. + \param buf new text buffer + */ + void buffer(Fl_Text_Buffer& buf) { buffer(&buf); } + + /** + Gets the current text buffer associated with the text widget. + Multiple text widgets can be associated with the same text buffer. + \return current text buffer + */ + Fl_Text_Buffer* buffer() const { return mBuffer; } + + void redisplay_range(int start, int end); + void scroll(int topLineNum, int horizOffset); + void insert(const char* text); + void overstrike(const char* text); + void insert_position(int newPos); + + /** + Gets the position of the text insertion cursor for text display. + \return insert position index into text buffer + */ + int insert_position() const { return mCursorPos; } + int position_to_xy(int pos, int* x, int* y) const; - - void highlight_data(Fl_Text_Buffer *styleBuffer, - const Style_Table_Entry *styleTable, - int nStyles, char unfinishedStyle, - Unfinished_Style_Cb unfinishedHighlightCB, - void *cbArg); + int in_selection(int x, int y) const; + void show_insert_position(); + + int move_right(); + int move_left(); + int move_up(); + int move_down(); + int count_lines(int start, int end, bool start_pos_is_line_start) const; + int line_start(int pos) const; + int line_end(int startPos, bool startPosIsLineStart) const; + int skip_lines(int startPos, int nLines, bool startPosIsLineStart); + int rewind_lines(int startPos, int nLines); + void next_word(void); + void previous_word(void); + + void show_cursor(int b = 1); + + /** + Hides the text cursor. + */ + void hide_cursor() { show_cursor(0); } + + void cursor_style(int style); + + /** + Gets the text cursor color. + \return cursor color + */ + Fl_Color cursor_color() const {return mCursor_color;} + + /** + Sets the text cursor color. + \param n new cursor color + */ + void cursor_color(Fl_Color n) {mCursor_color = n;} + + /** + Gets the width/height of the scrollbars. + /return width of scrollbars + */ + int scrollbar_width() const { return scrollbar_width_; } + + /** + Sets the width/height of the scrollbars. + \param W width of scrollbars + */ + void scrollbar_width(int W) { scrollbar_width_ = W; } + + /** + Gets the scrollbar alignment type. + \return scrollbar alignment + */ + Fl_Align scrollbar_align() const { return scrollbar_align_; } + + /** + Sets the scrollbar alignment type. + \param a new scrollbar alignment + */ + void scrollbar_align(Fl_Align a) { scrollbar_align_ = a; } + + /** + Moves the insert position to the beginning of the current word. + \param pos start calculation at this index + \return beginning of the words + */ + int word_start(int pos) const { return buffer()->word_start(pos); } + + /** + Moves the insert position to the end of the current word. + \param pos start calculation at this index + \return index of first character after the end of the word + */ + int word_end(int pos) const { return buffer()->word_end(pos); } + + + void highlight_data(Fl_Text_Buffer *styleBuffer, + const Style_Table_Entry *styleTable, + int nStyles, char unfinishedStyle, + Unfinished_Style_Cb unfinishedHighlightCB, + void *cbArg); + + int position_style(int lineStartPos, int lineLen, int lineIndex) const; + + /** + \todo FIXME : get set methods pointing on shortcut_ + have no effects as shortcut_ is unused in this class and derived! + \return the current shortcut key + */ + int shortcut() const {return shortcut_;} + + /** + \todo FIXME : get set methods pointing on shortcut_ + have no effects as shortcut_ is unused in this class and derived! + \param s the new shortcut key + */ + void shortcut(int s) {shortcut_ = s;} + + /** + Gets the default font used when drawing text in the widget. + \return current text font face unless overridden by a style + */ + Fl_Font textfont() const {return textfont_;} + + /** + Sets the default font used when drawing text in the widget. + \param s default text font face + */ + void textfont(Fl_Font s) {textfont_ = s; mColumnScale = 0;} + + /** + Gets the default size of text in the widget. + \return current text height unless overridden by a style + */ + Fl_Fontsize textsize() const {return textsize_;} + + /** + Sets the default size of text in the widget. + \param s new text size + */ + void textsize(Fl_Fontsize s) {textsize_ = s; mColumnScale = 0;} + + /** + Gets the default color of text in the widget. + \return text color unless overridden by a style + */ + Fl_Color textcolor() const {return textcolor_;} + + /** + Sets the default color of text in the widget. + \param n new text color + */ + void textcolor(Fl_Color n) {textcolor_ = n;} + + int wrapped_column(int row, int column) const; + int wrapped_row(int row) const; + void wrap_mode(int wrap, int wrap_margin); + + virtual void resize(int X, int Y, int W, int H); - int position_style(int lineStartPos, int lineLen, int lineIndex, - int dispIndex) const; - /** \todo FIXME : get set methods pointing on shortcut_ - have no effects as shortcut_ is unused in this class and derived! */ - int shortcut() const {return shortcut_;} - /** \todo FIXME : get set methods pointing on shortcut_ - have no effects as shortcut_ is unused in this class and derived! */ - void shortcut(int s) {shortcut_ = s;} - - /** Gets the default font used when drawing text in the widget. */ - Fl_Font textfont() const {return textfont_;} - /** Sets the default font used when drawing text in the widget. */ - void textfont(Fl_Font s) {textfont_ = s;} - /** Gets the default size of text in the widget. */ - Fl_Fontsize textsize() const {return textsize_;} - /** Sets the default size of text in the widget. */ - void textsize(Fl_Fontsize s) {textsize_ = s;} - /** Gets the default color of text in the widget. */ - Fl_Color textcolor() const {return textcolor_;} - /** Sets the default color of text in the widget. */ - void textcolor(Fl_Color n) {textcolor_ = n;} - - int wrapped_column(int row, int column) const; - int wrapped_row(int row) const; - void wrap_mode(int wrap, int wrap_margin); - - virtual void resize(int X, int Y, int W, int H); - - protected: - // Most (all?) of this stuff should only be called from resize() or - // draw(). - // Anything with "vline" indicates thats it deals with currently - // visible lines. - - virtual void draw(); - void draw_text(int X, int Y, int W, int H); - void draw_range(int start, int end); - void draw_cursor(int, int); - - void draw_string(int style, int x, int y, int toX, const char *string, - int nChars); - - void draw_vline(int visLineNum, int leftClip, int rightClip, - int leftCharIndex, int rightCharIndex); - - void draw_line_numbers(bool clearAll); - - void clear_rect(int style, int x, int y, int width, int height); - void display_insert(); - - void offset_line_starts(int newTopLineNum); - - void calc_line_starts(int startLine, int endLine); - - void update_line_starts(int pos, int charsInserted, int charsDeleted, - int linesInserted, int linesDeleted, int *scrolled); - - void calc_last_char(); - - int position_to_line( int pos, int* lineNum ) const; - int string_width(const char* string, int length, int style) const; - - static void scroll_timer_cb(void*); - - static void buffer_predelete_cb(int pos, int nDeleted, void* cbArg); - static void buffer_modified_cb(int pos, int nInserted, int nDeleted, - int nRestyled, const char* deletedText, - void* cbArg); - - static void h_scrollbar_cb(Fl_Scrollbar* w, Fl_Text_Display* d); - static void v_scrollbar_cb( Fl_Scrollbar* w, Fl_Text_Display* d); - void update_v_scrollbar(); - void update_h_scrollbar(); - int measure_vline(int visLineNum) const; - int longest_vline() const; - int empty_vlines() const; - int vline_length(int visLineNum) const; - int xy_to_position(int x, int y, int PosType = CHARACTER_POS) const; - - void xy_to_rowcol(int x, int y, int* row, int* column, - int PosType = CHARACTER_POS) const; - - int position_to_xy(int pos, int* x, int* y) const; - void maintain_absolute_top_line_number(int state); - int get_absolute_top_line_number() const; - void absolute_top_line_number(int oldFirstChar); - int maintaining_absolute_top_line_number() const; - void reset_absolute_top_line_number(); - int position_to_linecol(int pos, int* lineNum, int* column) const; - void scroll_(int topLineNum, int horizOffset); - - void extend_range_for_styles(int* start, int* end); - - void find_wrap_range(const char *deletedText, int pos, int nInserted, - int nDeleted, int *modRangeStart, int *modRangeEnd, - int *linesInserted, int *linesDeleted); - void measure_deleted_lines(int pos, int nDeleted); - void wrapped_line_counter(Fl_Text_Buffer *buf, int startPos, int maxPos, - int maxLines, bool startPosIsLineStart, - int styleBufOffset, int *retPos, int *retLines, - int *retLineStart, int *retLineEnd, - bool countLastLineMissingNewLine = true) const; - void find_line_end(int pos, bool start_pos_is_line_start, int *lineEnd, - int *nextLineStart) const; - int measure_proportional_character(const char *s, int colNum, int pos) const; - int wrap_uses_character(int lineEndPos) const; - int range_touches_selection(const Fl_Text_Selection *sel, int rangeStart, - int rangeEnd) const; -#ifndef FL_DOXYGEN - int damage_range1_start, damage_range1_end; - int damage_range2_start, damage_range2_end; - int mCursorPos; - int mCursorOn; - int mCursorOldY; /* Y pos. of cursor for blanking */ - int mCursorToHint; /* Tells the buffer modified callback - where to move the cursor, to reduce - the number of redraw calls */ - int mCursorStyle; /* One of enum cursorStyles above */ - int mCursorPreferredCol; /* Column for vert. cursor movement */ - int mNVisibleLines; /* # of visible (displayed) lines */ - int mNBufferLines; /* # of newlines in the buffer */ - Fl_Text_Buffer* mBuffer; /* Contains text to be displayed */ - Fl_Text_Buffer* mStyleBuffer; /* Optional parallel buffer containing - color and font information */ - int mFirstChar, mLastChar; /* Buffer positions of first and last - displayed character (lastChar points - either to a newline or one character - beyond the end of the buffer) */ - int mContinuousWrap; /* Wrap long lines when displaying */ - int mWrapMargin; /* Margin in # of char positions for - wrapping in continuousWrap mode */ - int* mLineStarts; - int mTopLineNum; /* Line number of top displayed line - of file (first line of file is 1) */ - int mAbsTopLineNum; /* In continuous wrap mode, the line - number of the top line if the text - were not wrapped (note that this is - only maintained as needed). */ - int mNeedAbsTopLineNum; /* Externally settable flag to continue - maintaining absTopLineNum even if - it isn't needed for line # display */ - int mHorizOffset; /* Horizontal scroll pos. in pixels */ - int mTopLineNumHint; /* Line number of top displayed line - of file (first line of file is 1) */ - int mHorizOffsetHint; /* Horizontal scroll pos. in pixels */ - int mNStyles; /* Number of entries in styleTable */ - const Style_Table_Entry *mStyleTable; /* Table of fonts and colors for - coloring/syntax-highlighting */ - char mUnfinishedStyle; /* Style buffer entry which triggers - on-the-fly reparsing of region */ - Unfinished_Style_Cb mUnfinishedHighlightCB; /* Callback to parse "unfinished" */ - /* regions */ - void* mHighlightCBArg; /* Arg to unfinishedHighlightCB */ - - int mMaxsize; - - int mFixedFontWidth; /* Font width if all current fonts are - fixed and match in width, else -1 */ - int mSuppressResync; /* Suppress resynchronization of line - starts during buffer updates */ - int mNLinesDeleted; /* Number of lines deleted during - buffer modification (only used - when resynchronization is suppressed) */ - int mModifyingTabDistance; /* Whether tab distance is being - modified */ - - Fl_Color mCursor_color; - - Fl_Scrollbar* mHScrollBar; - Fl_Scrollbar* mVScrollBar; - int scrollbar_width_; - Fl_Align scrollbar_align_; - int dragPos, dragType, dragging; - int display_insert_position_hint; - struct { int x, y, w, h; } text_area; - - int shortcut_; - - Fl_Font textfont_; - Fl_Fontsize textsize_; - Fl_Color textcolor_; - - // The following are not presently used from the original NEdit code, - // but are being put here so that future versions of Fl_Text_Display - // can implement line numbers without breaking binary compatibility. - int mLineNumLeft, mLineNumWidth; - /* Line number margin and width */ -#endif + /** + Convert an x pixel position into a column number. + \param x number of pixels from the left margin + \return an approximate column number based on the main font + */ + double x_to_col(double x) const; + + /** + Convert a column number into an x pixel position. + \param col an approximate column number based on the main font + \return number of pixels from the left margin to the left of an + average sized character + */ + double col_to_x(double col) const; + +protected: + // Most (all?) of this stuff should only be called from resize() or + // draw(). + // Anything with "vline" indicates thats it deals with currently + // visible lines. + + virtual void draw(); + void draw_text(int X, int Y, int W, int H); + void draw_range(int start, int end); + void draw_cursor(int, int); + + void draw_string(int style, int x, int y, int toX, const char *string, + int nChars) const; + + void draw_vline(int visLineNum, int leftClip, int rightClip, + int leftCharIndex, int rightCharIndex); + + int find_x(const char *s, int len, int style, int x) const; + + enum { + DRAW_LINE, + FIND_INDEX, + FIND_INDEX_FROM_ZERO, + GET_WIDTH + }; + + int handle_vline(int mode, + int lineStart, int lineLen, int leftChar, int rightChar, + int topClip, int bottomClip, + int leftClip, int rightClip) const; + + void draw_line_numbers(bool clearAll); + + void clear_rect(int style, int x, int y, int width, int height) const; + void display_insert(); + + void offset_line_starts(int newTopLineNum); + + void calc_line_starts(int startLine, int endLine); + + void update_line_starts(int pos, int charsInserted, int charsDeleted, + int linesInserted, int linesDeleted, int *scrolled); + + void calc_last_char(); + + int position_to_line( int pos, int* lineNum ) const; + double string_width(const char* string, int length, int style) const; + + static void scroll_timer_cb(void*); + + static void buffer_predelete_cb(int pos, int nDeleted, void* cbArg); + static void buffer_modified_cb(int pos, int nInserted, int nDeleted, + int nRestyled, const char* deletedText, + void* cbArg); + + static void h_scrollbar_cb(Fl_Scrollbar* w, Fl_Text_Display* d); + static void v_scrollbar_cb( Fl_Scrollbar* w, Fl_Text_Display* d); + void update_v_scrollbar(); + void update_h_scrollbar(); + int measure_vline(int visLineNum) const; + int longest_vline() const; + int empty_vlines() const; + int vline_length(int visLineNum) const; + int xy_to_position(int x, int y, int PosType = CHARACTER_POS) const; + + void xy_to_rowcol(int x, int y, int* row, int* column, + int PosType = CHARACTER_POS) const; + void maintain_absolute_top_line_number(int state); + int get_absolute_top_line_number() const; + void absolute_top_line_number(int oldFirstChar); + int maintaining_absolute_top_line_number() const; + void reset_absolute_top_line_number(); + int position_to_linecol(int pos, int* lineNum, int* column) const; + int scroll_(int topLineNum, int horizOffset); + + void extend_range_for_styles(int* start, int* end); + + void find_wrap_range(const char *deletedText, int pos, int nInserted, + int nDeleted, int *modRangeStart, int *modRangeEnd, + int *linesInserted, int *linesDeleted); + void measure_deleted_lines(int pos, int nDeleted); + void wrapped_line_counter(Fl_Text_Buffer *buf, int startPos, int maxPos, + int maxLines, bool startPosIsLineStart, + int styleBufOffset, int *retPos, int *retLines, + int *retLineStart, int *retLineEnd, + bool countLastLineMissingNewLine = true) const; + void find_line_end(int pos, bool start_pos_is_line_start, int *lineEnd, + int *nextLineStart) const; + double measure_proportional_character(const char *s, int colNum, int pos) const; + int wrap_uses_character(int lineEndPos) const; + + int damage_range1_start, damage_range1_end; + int damage_range2_start, damage_range2_end; + int mCursorPos; + int mCursorOn; + int mCursorOldY; /* Y pos. of cursor for blanking */ + int mCursorToHint; /* Tells the buffer modified callback + where to move the cursor, to reduce + the number of redraw calls */ + int mCursorStyle; /* One of enum cursorStyles above */ + int mCursorPreferredXPos; /* Pixel position for vert. cursor movement */ + int mNVisibleLines; /* # of visible (displayed) lines */ + int mNBufferLines; /* # of newlines in the buffer */ + Fl_Text_Buffer* mBuffer; /* Contains text to be displayed */ + Fl_Text_Buffer* mStyleBuffer; /* Optional parallel buffer containing + color and font information */ + int mFirstChar, mLastChar; /* Buffer positions of first and last + displayed character (lastChar points + either to a newline or one character + beyond the end of the buffer) */ + int mContinuousWrap; /* Wrap long lines when displaying */ + int mWrapMarginPix; /* Margin in # of pixels for + wrapping in continuousWrap mode */ + int* mLineStarts; + int mTopLineNum; /* Line number of top displayed line + of file (first line of file is 1) */ + int mAbsTopLineNum; /* In continuous wrap mode, the line + number of the top line if the text + were not wrapped (note that this is + only maintained as needed). */ + int mNeedAbsTopLineNum; /* Externally settable flag to continue + maintaining absTopLineNum even if + it isn't needed for line # display */ + int mHorizOffset; /* Horizontal scroll pos. in pixels */ + int mTopLineNumHint; /* Line number of top displayed line + of file (first line of file is 1) */ + int mHorizOffsetHint; /* Horizontal scroll pos. in pixels */ + int mNStyles; /* Number of entries in styleTable */ + const Style_Table_Entry *mStyleTable; /* Table of fonts and colors for + coloring/syntax-highlighting */ + char mUnfinishedStyle; /* Style buffer entry which triggers + on-the-fly reparsing of region */ + Unfinished_Style_Cb mUnfinishedHighlightCB; /* Callback to parse "unfinished" */ + /* regions */ + void* mHighlightCBArg; /* Arg to unfinishedHighlightCB */ + + int mMaxsize; + + int mSuppressResync; /* Suppress resynchronization of line + starts during buffer updates */ + int mNLinesDeleted; /* Number of lines deleted during + buffer modification (only used + when resynchronization is suppressed) */ + int mModifyingTabDistance; /* Whether tab distance is being + modified */ + + mutable double mColumnScale; /* Width in pixels of an average character. This + value is calculated as needed (lazy eval); it + needs to be mutable so that it can be calculated + within a method marked as "const" */ + + Fl_Color mCursor_color; + + Fl_Scrollbar* mHScrollBar; + Fl_Scrollbar* mVScrollBar; + int scrollbar_width_; + Fl_Align scrollbar_align_; + int dragPos, dragType, dragging; + int display_insert_position_hint; + struct { int x, y, w, h; } text_area; + + int shortcut_; + + Fl_Font textfont_; + Fl_Fontsize textsize_; + Fl_Color textcolor_; + + // The following are not presently used from the original NEdit code, + // but are being put here so that future versions of Fl_Text_Display + // can implement line numbers without breaking binary compatibility. + + /* Line number margin and width */ + int mLineNumLeft, mLineNumWidth; }; #endif // -// End of "$Id: Fl_Text_Display.H 7527 2010-04-18 14:33:33Z engelsman $". +// End of "$Id: Fl_Text_Display.H 8306 2011-01-24 17:04:22Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Text_Editor.H b/plugins/zynaddsubfx/fltk/FL/Fl_Text_Editor.H index be3b718a3..40f9e6be2 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Text_Editor.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Text_Editor.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Text_Editor.H 6893 2009-09-20 19:24:24Z greg.ercolano $" +// "$Id: Fl_Text_Editor.H 7903 2010-11-28 21:06:39Z matt $" // // Header file for Fl_Text_Editor class. // -// Copyright 2001-2009 by Bill Spitzak and others. +// Copyright 2001-2010 by Bill Spitzak and others. // Original code Copyright Mark Edel. Permission to distribute under // the LGPL for the FLTK library granted by Mark Edel. // @@ -136,6 +136,6 @@ class FL_EXPORT Fl_Text_Editor : public Fl_Text_Display { #endif // -// End of "$Id: Fl_Text_Editor.H 6893 2009-09-20 19:24:24Z greg.ercolano $". +// End of "$Id: Fl_Text_Editor.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Tile.H b/plugins/zynaddsubfx/fltk/FL/Fl_Tile.H index 1d9c9174c..c83d2ec1f 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Tile.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Tile.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Tile.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Tile.H 7981 2010-12-08 23:53:04Z greg.ercolano $" // // Tile header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -37,8 +37,8 @@ The Fl_Tile class lets you resize the children by dragging the border between them: -

    \image html Fl_Tile.gif

    - \image latex Fl_Tile.eps "Fl_Tile" width=4cm +

    \image html Fl_Tile.png

    + \image latex Fl_Tile.png "Fl_Tile" width=4cm

    For the tiling to work correctly, the children of an Fl_Tile must cover the entire area of the widget, but not @@ -98,5 +98,5 @@ public: #endif // -// End of "$Id: Fl_Tile.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Tile.H 7981 2010-12-08 23:53:04Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Tiled_Image.H b/plugins/zynaddsubfx/fltk/FL/Fl_Tiled_Image.H index bff39e251..d16937989 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Tiled_Image.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Tiled_Image.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Tiled_Image.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Tiled_Image.H 7903 2010-11-28 21:06:39Z matt $" // // Tiled image header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -66,5 +66,5 @@ class FL_EXPORT Fl_Tiled_Image : public Fl_Image { #endif // !Fl_Tiled_Image_H // -// End of "$Id: Fl_Tiled_Image.H 6614 2009-01-01 16:11:32Z matt $" +// End of "$Id: Fl_Tiled_Image.H 7903 2010-11-28 21:06:39Z matt $" // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Timer.H b/plugins/zynaddsubfx/fltk/FL/Fl_Timer.H index 5af7bc612..952273ffb 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Timer.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Timer.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Timer.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Timer.H 7903 2010-11-28 21:06:39Z matt $" // // Timer header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -82,6 +82,6 @@ public: #endif // -// End of "$Id: Fl_Timer.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Timer.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Toggle_Button.H b/plugins/zynaddsubfx/fltk/FL/Fl_Toggle_Button.H index c7f48a7cc..eaf821b42 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Toggle_Button.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Toggle_Button.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Toggle_Button.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Toggle_Button.H 8022 2010-12-12 23:21:03Z AlbrechtS $" // // Toggle button header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -42,7 +42,7 @@ control exactly when and how by changing the values for type() and when(). */ -class Fl_Toggle_Button : public Fl_Button { +class FL_EXPORT Fl_Toggle_Button : public Fl_Button { public: /** Creates a new Fl_Toggle_Button widget using the given @@ -56,5 +56,5 @@ public: #endif // -// End of "$Id: Fl_Toggle_Button.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Toggle_Button.H 8022 2010-12-12 23:21:03Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Toggle_Light_Button.H b/plugins/zynaddsubfx/fltk/FL/Fl_Toggle_Light_Button.H index caecb99d0..8d446d8e7 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Toggle_Light_Button.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Toggle_Light_Button.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Toggle_Light_Button.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Toggle_Light_Button.H 7903 2010-11-28 21:06:39Z matt $" // // Toggle light button header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -33,5 +33,5 @@ #endif // -// End of "$Id: Fl_Toggle_Light_Button.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Toggle_Light_Button.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Toggle_Round_Button.H b/plugins/zynaddsubfx/fltk/FL/Fl_Toggle_Round_Button.H index fef2ae4b6..3fd892bc3 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Toggle_Round_Button.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Toggle_Round_Button.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Toggle_Round_Button.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Toggle_Round_Button.H 7903 2010-11-28 21:06:39Z matt $" // // Toggle round button header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -33,5 +33,5 @@ #endif // -// End of "$Id: Fl_Toggle_Round_Button.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Toggle_Round_Button.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Tooltip.H b/plugins/zynaddsubfx/fltk/FL/Fl_Tooltip.H index c5ec20641..71153791f 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Tooltip.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Tooltip.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Tooltip.H 6902 2009-09-27 11:06:56Z matt $" +// "$Id: Fl_Tooltip.H 8405 2011-02-08 20:59:46Z manolo $" // // Tooltip header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -55,11 +55,11 @@ public: */ static void hoverdelay(float f) { hoverdelay_ = f; } /** Returns non-zero if tooltips are enabled. */ - static int enabled() { return enabled_; } + static int enabled() { return Fl::option(Fl::OPTION_SHOW_TOOLTIPS); } /** Enables tooltips on all widgets (or disables if b is false). */ - static void enable(int b = 1) { enabled_ = b;} + static void enable(int b = 1) { Fl::option(Fl::OPTION_SHOW_TOOLTIPS, (b!=0));} /** Same as enable(0), disables tooltips on all widgets. */ - static void disable() { enabled_ = 0; } + static void disable() { enable(0); } static void (*enter)(Fl_Widget* w); static void enter_area(Fl_Widget* w, int X, int Y, int W, int H, const char* tip); static void (*exit)(Fl_Widget *w); @@ -72,7 +72,7 @@ public: /** Sets the typeface for the tooltip text. */ static void font(Fl_Font i) { font_ = i; } /** Gets the size of the tooltip text. */ - static Fl_Fontsize size() { return size_; } + static Fl_Fontsize size() { return (size_ == -1 ? FL_NORMAL_SIZE : size_); } /** Sets the size of the tooltip text. */ static void size(Fl_Fontsize s) { size_ = s; } /** Gets the background color for tooltips. The default background color is a pale yellow. */ @@ -83,18 +83,23 @@ public: static Fl_Color textcolor() { return textcolor_; } /** Sets the color of the text in the tooltip. The default is black. */ static void textcolor(Fl_Color c) { textcolor_ = c; } +#ifdef __APPLE__ + // the unique tooltip window + static Fl_Window* current_window(void); +#endif // These should not be public, but Fl_Widget::tooltip() needs them... // fabien: made it private with only a friend function access private: friend void Fl_Widget::tooltip(const char *); + friend void Fl_Widget::copy_tooltip(const char *); static void enter_(Fl_Widget* w); static void exit_(Fl_Widget *w); + static void set_enter_exit_once_(); private: static float delay_; //!< delay before a tooltip is shown static float hoverdelay_; //!< delay between tooltips - static int enabled_; static Fl_Color color_; static Fl_Color textcolor_; static Fl_Font font_; @@ -105,5 +110,5 @@ private: #endif // -// End of "$Id: Fl_Tooltip.H 6902 2009-09-27 11:06:56Z matt $". +// End of "$Id: Fl_Tooltip.H 8405 2011-02-08 20:59:46Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Tree.H b/plugins/zynaddsubfx/fltk/FL/Fl_Tree.H index 94e43f6fe..cce11e729 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Tree.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Tree.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Tree.H 7672 2010-07-10 09:44:45Z matt $" +// "$Id: Fl_Tree.H 8632 2011-05-04 02:59:50Z greg.ercolano $" // #ifndef FL_TREE_H @@ -18,7 +18,7 @@ ////////////////////// // // Fl_Tree -- This file is part of the Fl_Tree widget for FLTK -// Copyright (C) 2009 by Greg Ercolano. +// Copyright (C) 2009-2010 by Greg Ercolano. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -45,6 +45,9 @@ /// /// \brief Tree widget. /// +/// \image html tree-simple.png "Fl_Tree example program" +/// \image latex tree-simple.png "Fl_Tree example program" width=4cm +/// /// \code /// Fl_Tree // Top level widget /// |--- Fl_Tree_Item // Items in the tree @@ -54,10 +57,8 @@ /// |--- Fl_Tree_Sort (enum) // Sort behavior /// \endcode /// -/// An expandable tree widget. -/// -/// Similar to Fl_Browser, Fl_Tree is browser of Fl_Tree_Item's, which can be -/// in a parented hierarchy. Subtrees can be expanded or closed. Items can be +/// Similar to Fl_Browser, Fl_Tree is a browser of Fl_Tree_Item's, which is arranged +/// in a parented hierarchy, or 'tree'. Subtrees can be expanded or closed. Items can be /// added, deleted, inserted, sorted and re-ordered. /// /// The tree items may also contain other FLTK widgets, like buttons, input fields, @@ -84,68 +85,139 @@ /// tree.end(); /// \endcode /// -/// Items can be added with Fl_Tree::add(), -/// removed with Fl_Tree::remove(), -/// inserted with Fl_Tree::insert_above(), -/// selected/deselected with Fl_Tree::select() and Fl_Tree::deselect(). -/// Items can be swapped with Fl_Tree_Item::swap_children(), sorting control via -/// Fl_Tree::sortorder(). +/// Items can be added with add(), +/// removed with remove(), +/// completely cleared with clear(), +/// inserted with insert() and insert_above(), +/// selected/deselected with select() and deselect(), +/// open/closed with open() and closed(). +/// Children of an item can be swapped around with Fl_Tree_Item::swap_children(), +/// sorting can be controlled when items are add()ed via sortorder(). +/// You can walk the entire tree with first() and next(). +/// You can walk selected items with first_selected_item() and +/// next_selected_item(). +/// Items can be found by their pathname using find_item(const char*), +/// and an item's pathname can be found with item_pathname(). +/// The selected items' colors are controlled by selection_color() (inherited from Fl_Widget). /// -/// The tree can have different selection behaviors controlled by Fl_Tree::selectmode(). +/// The tree can have different selection behaviors controlled by selectmode(). /// -/// FLTK and custom FLTK widgets can be assigned to tree items via Fl_Tree_Item::widget(). +/// FLTK widgets (including custom widgets) can be assigned to tree items via +/// Fl_Tree_Item::widget(). /// -/// Parent nodes can be open/closed with open() and close(), icons can be assigned -/// or redefined with some or all items via +/// Icons for individual items can be changed with /// Fl_Tree_Item::openicon(), /// Fl_Tree_Item::closeicon(), /// Fl_Tree_Item::usericon(). /// -/// Various default preferences can be manipulated via Fl_Tree_Prefs, including -/// colors, margins, connection lines. +/// Various default preferences can be globally manipulated via Fl_Tree_Prefs, +/// including colors, margins, icons, connection lines. /// +/// The tree's callback() will be invoked when items change state or are open/closed. +/// when() controls when mouse/keyboard events invoke the callback. +/// callback_item() and callback_reason() can be used to determine the cause of the callback. eg: +/// +/// \code +/// void MyTreeCallback(Fl_Widget *w, void *data) { +/// Fl_Tree *tree = (Fl_Tree*)w; +/// Fl_Tree_Item *item = (Fl_Tree_Item*)tree->callback_item(); // get selected item +/// switch ( tree->callback_reason() ) { +/// case FL_TREE_REASON_SELECTED: [..] +/// case FL_TREE_REASON_DESELECTED: [..] +/// case FL_TREE_REASON_OPENED: [..] +/// case FL_TREE_REASON_CLOSED: [..] +/// } +/// \endcode +/// +/// To get the item's full menu pathname, you can use Fl_Tree_Item::item_pathname(), eg: +/// +/// \code +/// char pathname[256] = "???"; +/// tree->item_pathname(pathname, sizeof(pathname), item); // eg. "Parent/Child/Item" +/// \endcode +/// +/// To walk all the items of the tree from top to bottom: +/// \code +/// // Walk all the items in the tree, and print their labels +/// for ( Fl_Tree_Item *item = tree->first(); item; item = tree->next(item) ) { +/// printf("Item: %s\n", item->label()); +/// } +/// \endcode +/// +/// To recursively walk all the children of a particular item, +/// define a function that uses recursion: +/// \code +/// // Find all of the item's children and print an indented report of their labels +/// void my_print_all_children(Fl_Tree_Item *item, int indent=0) { +/// for ( int t=0; tchildren(); t++ ) { +/// printf("%*s Item: %s\n", indent, "", item->child(t)->label()); +/// my_print_all_children(item->child(t), indent+4); // recurse +/// } +/// } +/// \endcode +/// +/// To change the default label font and color for creating new items: +/// \code +/// tree = new Fl_Tree(..); +/// tree->item_labelfont(FL_COURIER); // Use Courier font for all new items +/// tree->item_labelfgcolor(FL_RED); // Use red color for labels of all new items +/// [..] +/// // Now create the items in the tree using the above defaults. +/// tree->add("Aaa"); +/// tree->add("Bbb"); +/// [..] +/// \endcode +/// +/// To change the font and color of all items in the tree: +/// \code +/// // Change the font and color of all items currently in the tree +/// for ( Fl_Tree_Item *item = tree->first(); item; item = tree->next(item) ) { +/// item->labelfont(FL_COURIER); +/// item->labelcolor(FL_RED); +/// } +/// \endcode +/// +/// The following image shows the tree's various visual elements +/// and the methods that control them: +/// /// \image html tree-elements.png -/// -/// \todo Needs handling of callbacks when items are procedurally select()ed +/// \image latex tree-elements.png "Fl_Tree dimensions" width=6cm /// -class Fl_Tree : public Fl_Group { - Fl_Tree_Item *_root; // can be null! - Fl_Tree_Item *_item_clicked; - Fl_Tree_Prefs _prefs; // all the tree's settings - Fl_Scrollbar *_vscroll; - -public: - /// Find the item that was clicked. - /// You probably want to use item_clicked() instead, which is fast. - /// - /// This method walks the entire tree looking for the first item that is - /// under the mouse (ie. at Fl::event_x()/Fl:event_y(). - /// - /// Use this method /only/ if you've subclassed Fl_Tree, and are receiving - /// events before Fl_Tree has been able to process and update item_clicked(). - /// - /// \returns the item clicked, or 0 if no item was under the current event. - /// - const Fl_Tree_Item *find_clicked() const { - if ( ! _root ) return(0); - return(_root->find_clicked(_prefs)); - } +/// \enum Fl_Tree_Reason +/// The reason the callback was invoked. +/// +enum Fl_Tree_Reason { + FL_TREE_REASON_NONE=0, ///< unknown reason + FL_TREE_REASON_SELECTED, ///< an item was selected + FL_TREE_REASON_DESELECTED, ///< an item was de-selected + FL_TREE_REASON_OPENED, ///< an item was opened + FL_TREE_REASON_CLOSED ///< an item was closed +}; + + +class FL_EXPORT Fl_Tree : public Fl_Group { + Fl_Tree_Item *_root; // can be null! + Fl_Tree_Item *_item_focus; // item that has focus box + Fl_Tree_Item *_callback_item; // item invoked during callback (can be NULL) + Fl_Tree_Reason _callback_reason; // reason for the callback + Fl_Tree_Prefs _prefs; // all the tree's settings + int _scrollbar_size; // size of scrollbar trough + protected: - /// Set the item that was last clicked. - /// Should only be used by subclasses needing to change this value. - /// Normally Fl_Tree manages this value. - /// - void item_clicked(Fl_Tree_Item* val) { - _item_clicked = val; - } - void do_callback_for_item(Fl_Tree_Item* item) { - Fl_Tree_Item *save = _item_clicked; // save previous 'item_clicked' - _item_clicked = item; // set item_clicked to this item while we do callback - do_callback((Fl_Widget*)this, user_data()); - _item_clicked = save; // restore item_clicked - } + /// Vertical scrollbar + Fl_Scrollbar *_vscroll; +protected: + void item_clicked(Fl_Tree_Item* val); + /// Do the callback for the item, setting the item and reason + void do_callback_for_item(Fl_Tree_Item* item, Fl_Tree_Reason reason) { + callback_reason(reason); + callback_item(item); + do_callback((Fl_Widget*)this, user_data()); + } + Fl_Tree_Item *next_visible_item(Fl_Tree_Item *start, int dir); + public: Fl_Tree(int X, int Y, int W, int H, const char *L=0); ~Fl_Tree(); @@ -178,11 +250,11 @@ public: Fl_Tree_Item* insert(Fl_Tree_Item *item, const char *name, int pos); /// Remove the specified \p item from the tree. + /// \p item may not be NULL. /// If it has children, all those are removed too. /// \returns 0 if done, -1 if 'item' not found. /// int remove(Fl_Tree_Item *item) { - if ( !item ) return(0); if ( item == _root ) { clear(); } else { @@ -201,10 +273,12 @@ public: delete _root; _root = 0; } /// Clear all the children of a particular node in the tree specified by \p item. + /// Item may not be NULL. + /// void clear_children(Fl_Tree_Item *item) { if ( item->has_children() ) { item->clear_children(); - redraw(); // redraw only if there were children to clear + redraw(); // redraw only if there were children to clear } } @@ -213,52 +287,29 @@ public: //////////////////////// Fl_Tree_Item *find_item(const char *path); const Fl_Tree_Item *find_item(const char *path) const; + int item_pathname(char *pathname, int pathnamelen, const Fl_Tree_Item *item) const; + + const Fl_Tree_Item *find_clicked() const; /// Return the item that was last clicked. /// - /// Valid only from within an Fl_Tree::callback(). + /// Valid only from within the callback(). + /// + /// Deprecated: use callback_item() instead. /// /// \returns the item clicked, or 0 if none. /// 0 may also be used to indicate several items were clicked/changed. /// Fl_Tree_Item *item_clicked() { - return(_item_clicked); + return(_callback_item); } - /// Returns the first item in the tree. - /// - /// Use this to walk the tree in the forward direction, eg: - /// \code - /// for ( Fl_Tree_Item *item = tree->first(); item; item = item->next() ) { - /// printf("Item: %s\n", item->label()); - /// } - /// \endcode - /// - /// \returns first item in tree, or 0 if none (tree empty). - /// - Fl_Tree_Item *first() { - return(_root); // first item always root - } - /// Returns the last item in the tree. - /// - /// Use this to walk the tree in reverse, eg: - /// - /// \code - /// for ( Fl_Tree_Item *item = tree->last(); item; item = item->prev() ) { - /// printf("Item: %s\n", item->label()); - /// } - /// \endcode - /// - /// \returns last item in the tree, or 0 if none (tree empty). - /// - Fl_Tree_Item *last() { - if ( ! _root ) return(0); - Fl_Tree_Item *item = _root; - while ( item->has_children() ) { - item = item->child(item->children()-1); - } - return(item); - } - + Fl_Tree_Item *first(); + Fl_Tree_Item *next(Fl_Tree_Item *item=0); + Fl_Tree_Item *prev(Fl_Tree_Item *item=0); + Fl_Tree_Item *last(); + Fl_Tree_Item *first_selected_item(); + Fl_Tree_Item *next_selected_item(Fl_Tree_Item *item=0); + ////////////////////////// // Item open/close methods ////////////////////////// @@ -266,59 +317,141 @@ public: /// Open the specified 'item'. /// This causes the item's children (if any) to be shown. /// Handles redrawing if anything was actually changed. + /// Invokes the callback depending on the value of optional parameter \p docallback. /// - void open(Fl_Tree_Item *item) { - if ( ! item->is_open() ) { - item->open(); - redraw(); + /// The callback can use callback_item() and callback_reason() respectively to determine + /// the item changed and the reason the callback was called. + /// + /// \param[in] item -- the item to be opened. Must not be NULL. + /// \param[in] docallback -- A flag that determines if the callback() is invoked or not: + /// - 0 - callback() is not invoked + /// - 1 - callback() is invoked if item changed, + /// callback_reason() will be FL_TREE_REASON_OPENED + /// \returns + /// - 1 -- item was opened + /// - 0 -- item was already open, no change + /// + /// \see open(), close(), is_open(), is_close(), callback_item(), callback_reason() + /// + int open(Fl_Tree_Item *item, int docallback=1) { + if ( item->is_open() ) return(0); + item->open(); + redraw(); + if ( docallback ) { + do_callback_for_item(item, FL_TREE_REASON_OPENED); } + return(1); } /// Opens the item specified by \p path (eg: "Parent/child/item"). /// This causes the item's children (if any) to be shown. /// Handles redrawing if anything was actually changed. + /// Invokes the callback depending on the value of optional parameter \p docallback. /// + /// Items or submenus that themselves contain slashes ('/' or '\') + /// should be escaped, e.g. open("Holidays/12\\/25\//2010"). + /// + /// The callback can use callback_item() and callback_reason() respectively to determine + /// the item changed and the reason the callback was called. + /// + /// \param[in] path -- the tree item's pathname (e.g. "Flintstones/Fred") + /// \param[in] docallback -- A flag that determines if the callback() is invoked or not: + /// - 0 - callback() is not invoked + /// - 1 - callback() is invoked if item changed, + /// callback_reason() will be FL_TREE_REASON_OPENED /// \returns - /// - 0 : OK - /// - -1 : item was not found + /// - 1 -- OK: item opened + /// - 0 -- OK: item was already open, no change + /// - -1 -- ERROR: item was not found + /// + /// \see open(), close(), is_open(), is_close(), callback_item(), callback_reason() /// - int open(const char *path) { + int open(const char *path, int docallback=1) { Fl_Tree_Item *item = find_item(path); - if ( item ) { - open(item); - return(0); + if ( ! item ) return(-1); + return(open(item, docallback)); + } + /// Toggle the open state of \p item. + /// Handles redrawing if anything was actually changed. + /// Invokes the callback depending on the value of optional parameter \p docallback. + /// + /// The callback can use callback_item() and callback_reason() respectively to determine + /// the item changed and the reason the callback was called. + /// + /// \param[in] item -- the item whose open state is to be toggled. Must not be NULL. + /// \param[in] docallback -- A flag that determines if the callback() is invoked or not: + /// - 0 - callback() is not invoked + /// - 1 - callback() is invoked, callback_reason() will be either + /// FL_TREE_REASON_OPENED or FL_TREE_REASON_CLOSED + /// + /// \see open(), close(), is_open(), is_close(), callback_item(), callback_reason() + /// + void open_toggle(Fl_Tree_Item *item, int docallback=1) { + if ( item->is_open() ) { + close(item, docallback); + } else { + open(item, docallback); } - return(-1); } /// Closes the specified \p item. /// Handles redrawing if anything was actually changed. + /// Invokes the callback depending on the value of optional parameter \p docallback. /// - void close(Fl_Tree_Item *item) { - if ( ! item->is_close() ) { - item->close(); - redraw(); + /// The callback can use callback_item() and callback_reason() respectively to determine + /// the item changed and the reason the callback was called. + /// + /// \param[in] item -- the item to be closed. Must not be NULL. + /// \param[in] docallback -- A flag that determines if the callback() is invoked or not: + /// - 0 - callback() is not invoked + /// - 1 - callback() is invoked if item changed, + /// callback_reason() will be FL_TREE_REASON_CLOSED + /// \returns + /// - 1 -- item was closed + /// - 0 -- item was already closed, no change + /// + /// \see open(), close(), is_open(), is_close(), callback_item(), callback_reason() + /// + int close(Fl_Tree_Item *item, int docallback=1) { + if ( item->is_close() ) return(0); + item->close(); + redraw(); + if ( docallback ) { + do_callback_for_item(item, FL_TREE_REASON_CLOSED); } + return(1); } /// Closes the item specified by \p path, eg: "Parent/child/item". - /// /// Handles redrawing if anything was actually changed. + /// Invokes the callback depending on the value of optional parameter \p docallback. /// + /// Items or submenus that themselves contain slashes ('/' or '\') + /// should be escaped, e.g. close("Holidays/12\\/25\//2010"). + /// + /// The callback can use callback_item() and callback_reason() respectively to determine + /// the item changed and the reason the callback was called. + /// + /// \param[in] path -- the tree item's pathname (e.g. "Flintstones/Fred") + /// \param[in] docallback -- A flag that determines if the callback() is invoked or not: + /// - 0 - callback() is not invoked + /// - 1 - callback() is invoked if item changed, + /// callback_reason() will be FL_TREE_REASON_CLOSED /// \returns - /// - 0 -- OK - /// - -1 -- item was not found + /// - 1 -- OK: item closed + /// - 0 -- OK: item was already closed, no change + /// - -1 -- ERROR: item was not found + /// + /// \see open(), close(), is_open(), is_close(), callback_item(), callback_reason() /// - int close(const char *path) { + int close(const char *path, int docallback=1) { Fl_Tree_Item *item = find_item(path); - if ( item ) { - close(item); - return(0); - } - return(-1); + if ( ! item ) return(-1); + return(close(item, docallback)); } /// See if \p item is open. /// /// Items that are 'open' are themselves not necessarily visible; /// one of the item's parents might be closed. /// + /// \param[in] item -- the item to be tested. Must not be NULL. /// \returns /// - 1 : item is open /// - 0 : item is closed @@ -328,20 +461,26 @@ public: } /// See if item specified by \p path (eg: "Parent/child/item") is open. /// + /// Items or submenus that themselves contain slashes ('/' or '\') + /// should be escaped, e.g. is_open("Holidays/12\\/25\//2010"). + /// /// Items that are 'open' are themselves not necessarily visible; /// one of the item's parents might be closed. /// + /// \param[in] path -- the tree item's pathname (e.g. "Flintstones/Fred") /// \returns - /// - 1 : item is open - /// - 0 : item is closed - /// - -1 : item was not found + /// - 1 - OK: item is open + /// - 0 - OK: item is closed + /// - -1 - ERROR: item was not found /// int is_open(const char *path) const { const Fl_Tree_Item *item = find_item(path); - if ( item ) return(item->is_open()?1:0); - return(-1); + if ( ! item ) return(-1); + return(item->is_open()?1:0); } /// See if the specified \p item is closed. + /// + /// \param[in] item -- the item to be tested. Must not be NULL. /// \returns /// - 1 : item is open /// - 0 : item is closed @@ -351,111 +490,159 @@ public: } /// See if item specified by \p path (eg: "Parent/child/item") is closed. /// + /// Items or submenus that themselves contain slashes ('/' or '\') + /// should be escaped, e.g. is_close("Holidays/12\\/25\//2010"). + /// + /// \param[in] path -- the tree item's pathname (e.g. "Flintstones/Fred") /// \returns - /// - 1 : item is closed - /// - 0 : item is open - /// - -1 : item was not found + /// - 1 - OK: item is closed + /// - 0 - OK: item is open + /// - -1 - ERROR: item was not found /// int is_close(const char *path) const { const Fl_Tree_Item *item = find_item(path); - if ( item ) return(item->is_close()?1:0); - return(-1); + if ( ! item ) return(-1); + return(item->is_close()?1:0); } - ///////////////////////// - // Item selection methods - ///////////////////////// - /// Select the specified \p item. Use 'deselect()' to de-select it. /// Handles redrawing if anything was actually changed. + /// Invokes the callback depending on the value of optional parameter \p docallback. /// - /// \p docallback is an optional paramemter that can either be 0 or 1. - /// - 0 - the callback() is not invoked (default) - /// - 1 - the callback() is invoked if the item changed state, - /// and the callback can use item_clicked() to determine the selected item. + /// The callback can use callback_item() and callback_reason() respectively to determine + /// the item changed and the reason the callback was called. /// - void select(Fl_Tree_Item *item, int docallback=0) { + /// \param[in] item -- the item to be selected. Must not be NULL. + /// \param[in] docallback -- A flag that determines if the callback() is invoked or not: + /// - 0 - the callback() is not invoked + /// - 1 - the callback() is invoked if item changed state, + /// callback_reason() will be FL_TREE_REASON_SELECTED + /// \returns + /// - 1 - item's state was changed + /// - 0 - item was already selected, no change was made + /// + int select(Fl_Tree_Item *item, int docallback=1) { if ( ! item->is_selected() ) { item->select(); - if ( docallback == 1 ) do_callback_for_item(item); + set_changed(); + if ( docallback ) { + do_callback_for_item(item, FL_TREE_REASON_SELECTED); + } redraw(); + return(1); } + return(0); } /// Select the item specified by \p path (eg: "Parent/child/item"). /// Handles redrawing if anything was actually changed. + /// Invokes the callback depending on the value of optional parameter \p docallback. /// - /// \p docallback is an optional paramemter that can either be 0 or 1. - /// - 0 - the callback() is not invoked (default) - /// - 1 - the callback() is invoked if the item changed state, - /// and the callback can use item_clicked() to determine the selected item. + /// Items or submenus that themselves contain slashes ('/' or '\') + /// should be escaped, e.g. select("Holidays/12\\/25\//2010"). /// + /// The callback can use callback_item() and callback_reason() respectively to determine + /// the item changed and the reason the callback was called. + /// + /// \param[in] path -- the tree item's pathname (e.g. "Flintstones/Fred") + /// \param[in] docallback -- A flag that determines if the callback() is invoked or not: + /// - 0 - the callback() is not invoked + /// - 1 - the callback() is invoked if item changed state, + /// callback_reason() will be FL_TREE_REASON_SELECTED /// \returns - /// - 0 : OK - /// - -1 : item was not found + /// - 1 : OK: item's state was changed + /// - 0 : OK: item was already selected, no change was made + /// - -1 : ERROR: item was not found /// - int select(const char *path, int docallback=0) { + int select(const char *path, int docallback=1) { Fl_Tree_Item *item = find_item(path); - if ( item ) { - select(item); - if ( docallback == 1 ) do_callback_for_item(item); - return(0); - } - return(-1); + if ( ! item ) return(-1); + return(select(item, docallback)); } /// Toggle the select state of the specified \p item. - /// Handles redrawing. + /// Handles redrawing if anything was actually changed. + /// Invokes the callback depending on the value of optional parameter \p docallback. /// - /// \p docallback is an optional paramemter that can either be 0 or 1. - /// - 0 - the callback() is not invoked (default) - /// - 1 - the callback() is invoked, - /// and the callback can use item_clicked() to determine the selected item. + /// The callback can use callback_item() and callback_reason() respectively to determine + /// the item changed and the reason the callback was called. /// - void select_toggle(Fl_Tree_Item *item, int docallback=0) { + /// \param[in] item -- the item to be selected. Must not be NULL. + /// \param[in] docallback -- A flag that determines if the callback() is invoked or not: + /// - 0 - the callback() is not invoked + /// - 1 - the callback() is invoked, callback_reason() will be + /// either FL_TREE_REASON_SELECTED or FL_TREE_REASON_DESELECTED + /// + void select_toggle(Fl_Tree_Item *item, int docallback=1) { item->select_toggle(); - if ( docallback == 1 ) do_callback_for_item(item); + set_changed(); + if ( docallback ) { + do_callback_for_item(item, item->is_selected() ? FL_TREE_REASON_SELECTED + : FL_TREE_REASON_DESELECTED); + } redraw(); } /// De-select the specified \p item. /// Handles redrawing if anything was actually changed. + /// Invokes the callback depending on the value of optional parameter \p docallback. /// - /// \p docallback is an optional paramemter that can either be 0 or 1. - /// - 0 - the callback() is not invoked (default) - /// - 1 - the callback() is invoked if the item changed state, - /// and the callback can use item_clicked() to determine the selected item. + /// The callback can use callback_item() and callback_reason() respectively to determine + /// the item changed and the reason the callback was called. /// - void deselect(Fl_Tree_Item *item, int docallback=0) { + /// \param[in] item -- the item to be selected. Must not be NULL. + /// \param[in] docallback -- A flag that determines if the callback() is invoked or not: + /// - 0 - the callback() is not invoked + /// - 1 - the callback() is invoked if item changed state, + /// callback_reason() will be FL_TREE_REASON_DESELECTED + /// \returns + /// - 0 - item was already deselected, no change was made + /// - 1 - item's state was changed + /// + int deselect(Fl_Tree_Item *item, int docallback=1) { if ( item->is_selected() ) { item->deselect(); - if ( docallback == 1 ) do_callback_for_item(item); + set_changed(); + if ( docallback ) { + do_callback_for_item(item, FL_TREE_REASON_DESELECTED); + } redraw(); + return(1); } + return(0); } - /// De-select an item specified by \p path (eg: "Parent/child/item"). + /// Deselect an item specified by \p path (eg: "Parent/child/item"). /// Handles redrawing if anything was actually changed. + /// Invokes the callback depending on the value of optional parameter \p docallback. /// - /// \p docallback is an optional paramemter that can either be 0 or 1. - /// - 0 - the callback() is not invoked (default) - /// - 1 - the callback() is invoked if the item changed state, - /// and the callback can use item_clicked() to determine the selected item. + /// Items or submenus that themselves contain slashes ('/' or '\') + /// should be escaped, e.g. deselect("Holidays/12\\/25\//2010"). /// + /// The callback can use callback_item() and callback_reason() respectively to determine + /// the item changed and the reason the callback was called. + /// + /// \param[in] path -- the tree item's pathname (e.g. "Flintstones/Fred") + /// \param[in] docallback -- A flag that determines if the callback() is invoked or not: + /// - 0 - the callback() is not invoked + /// - 1 - the callback() is invoked if item changed state, + /// callback_reason() will be FL_TREE_REASON_DESELECTED /// \returns - /// - 0 : OK - /// - -1 : item was not found + /// - 1 - OK: item's state was changed + /// - 0 - OK: item was already deselected, no change was made + /// - -1 - ERROR: item was not found /// - int deselect(const char *path, int docallback=0) { + int deselect(const char *path, int docallback=1) { Fl_Tree_Item *item = find_item(path); - if ( item ) { - deselect(item, docallback); - return(0); - } - return(-1); + if ( ! item ) return(-1); + return(deselect(item, docallback)); } - int deselect_all(Fl_Tree_Item *item=0, int docallback=0); - int select_only(Fl_Tree_Item *selitem, int docallback=0); - int select_all(Fl_Tree_Item *item=0, int docallback=0); + int deselect_all(Fl_Tree_Item *item=0, int docallback=1); + int select_only(Fl_Tree_Item *selitem, int docallback=1); + int select_all(Fl_Tree_Item *item=0, int docallback=1); + void set_item_focus(Fl_Tree_Item *o); /// See if the specified \p item is selected. + /// + /// \param[in] item -- the item to be tested. Must not be NULL. + /// /// \return /// - 1 : item selected /// - 0 : item deselected @@ -465,6 +652,10 @@ public: } /// See if item specified by \p path (eg: "Parent/child/item") is selected. /// + /// Items or submenus that themselves contain slashes ('/' or '\') + /// should be escaped, e.g. is_selected("Holidays/12\\/25\//2010"). + /// + /// \param[in] path -- the tree item's pathname (e.g. "Flintstones/Fred") /// \returns /// - 1 : item selected /// - 0 : item deselected @@ -472,8 +663,8 @@ public: /// int is_selected(const char *path) { Fl_Tree_Item *item = find_item(path); - if ( item ) return(is_selected(item)); - return(-1); + if ( ! item ) return(-1); + return(is_selected(item)); } /// Print the tree as 'ascii art' to stdout. /// Used mainly for debugging. @@ -488,36 +679,57 @@ public: ///////////////////////////////// /// Get the default label fontsize used for creating new items. - int labelsize() const { + Fl_Fontsize item_labelsize() const { return(_prefs.labelsize()); } /// Set the default label font size used for creating new items. - /// To change the font size on a per-item basis, use Fl_Tree_Item::labelsize(int) + /// To change the font size on a per-item basis, use Fl_Tree_Item::labelsize(Fl_Fontsize) /// - void labelsize(int val) { + void item_labelsize(Fl_Fontsize val) { _prefs.labelsize(val); } - - /// Get the default font face used for item's labels when new items are created. - /// - /// Don't use this if you want to change an existing label() size; use - /// item->labelfont() instead. - /// - int labelfont() const { + /// Get the default font face used for creating new items. + Fl_Font item_labelfont() const { return(_prefs.labelfont()); } - /// Set the default font face used for item's labels when new items are created. + /// Set the default font face used for creating new items. + /// To change the font face on a per-item basis, use Fl_Tree_Item::labelfont(Fl_Font) /// - /// Don't use this if you want to change an existing label() size; use - /// item->labelfont(int) instead. - /// - void labelfont(int val) { + void item_labelfont(Fl_Font val) { _prefs.labelfont(val); } + /// Get the default label foreground color used for creating new items. + Fl_Color item_labelfgcolor(void) const { + return(_prefs.labelfgcolor()); + } + /// Set the default label foreground color used for creating new items. + /// To change the foreground color on a per-item basis, use Fl_Tree_Item::labelfgcolor(Fl_Color) + /// + void item_labelfgcolor(Fl_Color val) { + _prefs.labelfgcolor(val); + } + /// Get the default label background color used for creating new items. + Fl_Color item_labelbgcolor(void) const { + return(_prefs.labelbgcolor()); + } + /// Set the default label background color used for creating new items. + /// To change the background color on a per-item basis, use Fl_Tree_Item::labelbgcolor(Fl_Color) + /// + void item_labelbgcolor(Fl_Color val) { + _prefs.labelbgcolor(val); + } + /// Get the connector color used for tree connection lines. + Fl_Color connectorcolor() const { + return(_prefs.connectorcolor()); + } + /// Set the connector color used for tree connection lines. + void connectorcolor(Fl_Color val) { + _prefs.connectorcolor(val); + } /// Get the amount of white space (in pixels) that should appear /// between the widget's left border and the tree's contents. /// - int marginleft() const { + int marginleft() const { return(_prefs.marginleft()); } /// Set the amount of white space (in pixels) that should appear @@ -530,7 +742,7 @@ public: /// Get the amount of white space (in pixels) that should appear /// between the widget's top border and the top of the tree's contents. /// - int margintop() const { + int margintop() const { return(_prefs.margintop()); } /// Sets the amount of white space (in pixels) that should appear @@ -543,7 +755,7 @@ public: /// Get the amount of white space (in pixels) that should appear /// below an open child tree's contents. /// - int openchild_marginbottom() const { + int openchild_marginbottom() const { return(_prefs.openchild_marginbottom()); } /// Set the amount of white space (in pixels) that should appear @@ -556,7 +768,7 @@ public: /// Gets the width of the horizontal connection lines (in pixels) /// that appear to the left of each tree item's label. /// - int connectorwidth() const { + int connectorwidth() const { return(_prefs.connectorwidth()); } /// Sets the width of the horizontal connection lines (in pixels) @@ -566,7 +778,8 @@ public: _prefs.connectorwidth(val); redraw(); } - /// Returns the Fl_Image being used as the default user icon for newly created items. + /// Returns the Fl_Image being used as the default user icon for all + /// newly created items. /// Returns zero if no icon has been set, which is the default. /// Fl_Image *usericon() const { @@ -688,12 +901,116 @@ public: void selectmode(Fl_Tree_Select val) { _prefs.selectmode(val); } - + int displayed(Fl_Tree_Item *item); + void show_item(Fl_Tree_Item *item, int yoff); + void show_item(Fl_Tree_Item *item); + void show_item_bottom(Fl_Tree_Item *item); + void show_item_middle(Fl_Tree_Item *item); + void show_item_top(Fl_Tree_Item *item); + void display(Fl_Tree_Item *item); + int vposition() const; + void vposition(int ypos); + + /// See if widget \p w is one of the Fl_Tree widget's scrollbars. + /// Use this to skip over the scrollbars when walking the child() array. Example: + /// \code + /// for ( int i=0; ichildren(); i++ ) { // walk children + /// Fl_Widget *w= tree->child(i); + /// if ( brow->is_scrollbar(w) ) continue; // skip scrollbars + /// ..do work here.. + /// } + /// \endcode + /// \param[in] w Widget to test + /// \returns 1 if \p w is a scrollbar, 0 if not. + /// + int is_scrollbar(Fl_Widget *w) { + return( ( w == _vscroll ) ? 1 : 0 ); + } + /// Gets the current size of the scrollbars' troughs, in pixels. + /// + /// If this value is zero (default), this widget will use the global + /// Fl::scrollbar_size() value as the scrollbar's width. + /// + /// \returns Scrollbar size in pixels, or 0 if the global Fl::scrollsize() is being used. + /// \see Fl::scrollbar_size(int) + /// + int scrollbar_size() const { + return(_scrollbar_size); + } + /// Sets the pixel size of the scrollbars' troughs to the \p size, in pixels. + /// + /// Normally you should not need this method, and should use the global + /// Fl::scrollbar_size(int) instead to manage the size of ALL + /// your widgets' scrollbars. This ensures your application + /// has a consistent UI, is the default behavior, and is normally + /// what you want. + /// + /// Only use THIS method if you really need to override the global + /// scrollbar size. The need for this should be rare. + /// + /// Setting \p size to the special value of 0 causes the widget to + /// track the global Fl::scrollbar_size(), which is the default. + /// + /// \param[in] size Sets the scrollbar size in pixels.\n + /// If 0 (default), scrollbar size tracks the global Fl::scrollbar_size() + /// \see Fl::scrollbar_size() + /// + void scrollbar_size(int size) { + _scrollbar_size = size; + int scrollsize = _scrollbar_size ? _scrollbar_size : Fl::scrollbar_size(); + if ( _vscroll->w() != scrollsize ) { + _vscroll->resize(x()+w()-scrollsize, h(), scrollsize, _vscroll->h()); + } + } + + /////////////////////// + // callback related + /////////////////////// + + /// Sets the item that was changed for this callback. + /// Used internally to pass the item that invoked the callback. + /// + void callback_item(Fl_Tree_Item* item) { + _callback_item = item; + } + /// Gets the item that caused the callback. + /// The callback() can use this value to see which item changed. + /// + Fl_Tree_Item* callback_item() { + return(_callback_item); + } + /// Sets the reason for this callback. + /// Used internally to pass the reason the callback was invoked. + /// + void callback_reason(Fl_Tree_Reason reason) { + _callback_reason = reason; + } + /// Gets the reason for this callback. + /// + /// The callback() can use this value to see why it was called. Example: + /// \code + /// void MyTreeCallback(Fl_Widget *w, void *userdata) { + /// Fl_Tree *tree = (Fl_Tree*)w; + /// Fl_Tree_Item *item = tree->callback_item(); // the item changed (can be NULL if more than one item was changed!) + /// switch ( tree->callback_reason() ) { // reason callback was invoked + /// case FL_TREE_REASON_OPENED: ..item was opened.. + /// case FL_TREE_REASON_CLOSED: ..item was closed.. + /// case FL_TREE_REASON_SELECTED: ..item was selected.. + /// case FL_TREE_REASON_DESELECTED: ..item was deselected.. + /// } + /// } + /// \endcode + /// + Fl_Tree_Reason callback_reason() const { + return(_callback_reason); + } + + /// Load FLTK preferences void load(class Fl_Preferences&); }; #endif /*FL_TREE_H*/ // -// End of "$Id: Fl_Tree.H 7672 2010-07-10 09:44:45Z matt $". +// End of "$Id: Fl_Tree.H 8632 2011-05-04 02:59:50Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Tree_Item.H b/plugins/zynaddsubfx/fltk/FL/Fl_Tree_Item.H index 6c46c5caa..3c579faf1 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Tree_Item.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Tree_Item.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Tree_Item.H 6957 2009-12-08 08:39:31Z greg.ercolano $" +// "$Id: Fl_Tree_Item.H 8340 2011-01-30 20:22:06Z greg.ercolano $" // #ifndef FL_TREE_ITEM_H @@ -18,7 +18,7 @@ ////////////////////// // // Fl_Tree -- This file is part of the Fl_Tree widget for FLTK -// Copyright (C) 2009 by Greg Ercolano. +// Copyright (C) 2009-2010 by Greg Ercolano. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -56,10 +56,10 @@ /// When you make changes to items, you'll need to tell the tree to redraw() /// for the changes to show up. /// -class Fl_Tree_Item { +class FL_EXPORT Fl_Tree_Item { const char *_label; // label (memory managed) - int _labelfont; // label's font face - int _labelsize; // label's font size + Fl_Font _labelfont; // label's font face + Fl_Fontsize _labelsize; // label's font size Fl_Color _labelfgcolor; // label's fg color Fl_Color _labelbgcolor; // label's bg color char _open; // item is open? @@ -83,7 +83,11 @@ public: Fl_Tree_Item(const Fl_Tree_Prefs &prefs); // CTOR ~Fl_Tree_Item(); // DTOR Fl_Tree_Item(const Fl_Tree_Item *o); // COPY CTOR - void draw(int X, int &Y, int W, Fl_Widget *tree, const Fl_Tree_Prefs &prefs, int lastchild=1); + int x() const { return(_xywh[0]); } + int y() const { return(_xywh[1]); } + int w() const { return(_xywh[2]); } + int h() const { return(_xywh[3]); } + void draw(int X, int &Y, int W, Fl_Widget *tree, Fl_Tree_Item *itemfocus, const Fl_Tree_Prefs &prefs, int lastchild=1); void show_self(const char *indent = "") const; void label(const char *val); const char *label() const; @@ -95,19 +99,19 @@ public: inline void* user_data() const { return _userdata; } /// Set item's label font face. - void labelfont(int val) { + void labelfont(Fl_Font val) { _labelfont = val; } /// Get item's label font face. - int labelfont() const { + Fl_Font labelfont() const { return(_labelfont); } /// Set item's label font size. - void labelsize(int val) { + void labelsize(Fl_Fontsize val) { _labelsize = val; } /// Get item's label font size. - int labelsize() const { + Fl_Fontsize labelsize() const { return(_labelsize); } /// Set item's label foreground text color. @@ -163,8 +167,10 @@ public: void clear_children(); void swap_children(int ax, int bx); int swap_children(Fl_Tree_Item *a, Fl_Tree_Item *b); - const Fl_Tree_Item *find_item(char **arr) const; - Fl_Tree_Item *find_item(char **arr); + const Fl_Tree_Item *find_child_item(char **arr) const; // const + Fl_Tree_Item *find_child_item(char **arr); // non-const + const Fl_Tree_Item *find_item(char **arr) const; // const + Fl_Tree_Item *find_item(char **arr); // non-const ////////////////// // Adding items ////////////////// @@ -175,12 +181,16 @@ public: int depth() const; Fl_Tree_Item *prev(); Fl_Tree_Item *next(); + Fl_Tree_Item *next_sibling(); + Fl_Tree_Item *prev_sibling(); + Fl_Tree_Item *next_displayed(Fl_Tree_Prefs &prefs); + Fl_Tree_Item *prev_displayed(Fl_Tree_Prefs &prefs); - /// Return the parent for this item. + /// Return the parent for this item. Returns NULL if we are the root. Fl_Tree_Item *parent() { return(_parent); } - /// Return the const parent for this item. + /// Return the const parent for this item. Returns NULL if we are the root. const Fl_Tree_Item *parent() const { return(_parent); } @@ -293,6 +303,12 @@ public: char is_active() const { return(_active); } + /// See if the item is visible. + int visible() const { + return(_visible ? 1 : 0); + } + int visible_r() const; + /// Set the user icon's image. '0' will disable. void usericon(Fl_Image *val) { _usericon = val; @@ -317,5 +333,5 @@ public: #endif /*FL_TREE_ITEM_H*/ // -// End of "$Id: Fl_Tree_Item.H 6957 2009-12-08 08:39:31Z greg.ercolano $". +// End of "$Id: Fl_Tree_Item.H 8340 2011-01-30 20:22:06Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Tree_Item_Array.H b/plugins/zynaddsubfx/fltk/FL/Fl_Tree_Item_Array.H index f1d2834ba..5a91dee18 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Tree_Item_Array.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Tree_Item_Array.H @@ -1,11 +1,13 @@ // -// "$Id: Fl_Tree_Item_Array.H 6956 2009-12-08 08:06:44Z greg.ercolano $" +// "$Id: Fl_Tree_Item_Array.H 7903 2010-11-28 21:06:39Z matt $" // #ifndef _FL_TREE_ITEM_ARRAY_H #define _FL_TREE_ITEM_ARRAY_H -class Fl_Tree_Item; // forward decl must *precede* first doxygen comment block +#include "Fl_Export.H" + +class FL_EXPORT Fl_Tree_Item; // forward decl must *precede* first doxygen comment block // or doxygen will not document our class.. ////////////////////////// @@ -13,7 +15,7 @@ class Fl_Tree_Item; // forward decl must *precede* first doxygen comment block ////////////////////////// // // Fl_Tree -- This file is part of the Fl_Tree widget for FLTK -// Copyright (C) 2009 by Greg Ercolano. +// Copyright (C) 2009-2010 by Greg Ercolano. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -46,7 +48,7 @@ class Fl_Tree_Item; // forward decl must *precede* first doxygen comment block /// (unless otherwise noted). /// -class Fl_Tree_Item_Array { +class FL_EXPORT Fl_Tree_Item_Array { Fl_Tree_Item **_items; // items array int _total; // #items in array int _size; // #items *allocated* for array @@ -84,5 +86,5 @@ public: #endif /*_FL_TREE_ITEM_ARRAY_H*/ // -// End of "$Id: Fl_Tree_Item_Array.H 6956 2009-12-08 08:06:44Z greg.ercolano $". +// End of "$Id: Fl_Tree_Item_Array.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Tree_Prefs.H b/plugins/zynaddsubfx/fltk/FL/Fl_Tree_Prefs.H index 5387a4236..57d72e382 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Tree_Prefs.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Tree_Prefs.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Tree_Prefs.H 6956 2009-12-08 08:06:44Z greg.ercolano $" +// "$Id: Fl_Tree_Prefs.H 8340 2011-01-30 20:22:06Z greg.ercolano $" // #ifndef FL_TREE_PREFS_H @@ -10,7 +10,7 @@ ////////////////////// // // Fl_Tree -- This file is part of the Fl_Tree widget for FLTK -// Copyright (C) 2009 by Greg Ercolano. +// Copyright (C) 2009-2010 by Greg Ercolano. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -69,8 +69,8 @@ enum Fl_Tree_Connector { /// enum Fl_Tree_Select { FL_TREE_SELECT_NONE=0, ///< Nothing selected when items are clicked - FL_TREE_SELECT_SINGLE, ///< Single item selected when item is clicked (default) - FL_TREE_SELECT_MULTI ///< Multiple items can be selected by clicking with + FL_TREE_SELECT_SINGLE=1, ///< Single item selected when item is clicked (default) + FL_TREE_SELECT_MULTI=2 ///< Multiple items can be selected by clicking with ///< SHIFT or CTRL or mouse drags. }; @@ -82,9 +82,9 @@ enum Fl_Tree_Select { /// You should probably be using the methods in Fl_Tree /// instead of trying to accessing tree's preferences settings directly. /// -class Fl_Tree_Prefs { - int _labelfont; // label's font face - int _labelsize; // label's font size +class FL_EXPORT Fl_Tree_Prefs { + Fl_Font _labelfont; // label's font face + Fl_Fontsize _labelsize; // label's font size int _margintop; // -- int _marginleft; // |- tree's margins //int _marginright; // | @@ -95,10 +95,8 @@ class Fl_Tree_Prefs { int _connectorwidth; // connector width (right of open/close icon) int _linespacing; // vertical space between lines // Colors - Fl_Color _fgcolor; // label's foreground color - Fl_Color _bgcolor; // background color - Fl_Color _selectcolor; // selection color - Fl_Color _inactivecolor; // inactive color + Fl_Color _labelfgcolor; // label's foreground color + Fl_Color _labelbgcolor; // background color Fl_Color _connectorcolor; // connector dotted line color Fl_Tree_Connector _connectorstyle; // connector line style Fl_Image *_openimage; // the 'open' icon [+] @@ -116,19 +114,19 @@ public: // Labels //////////////////////////// /// Return the label's font. - inline int labelfont() const { + inline Fl_Font labelfont() const { return(_labelfont); } /// Set the label's font to \p val. - inline void labelfont(int val) { + inline void labelfont(Fl_Font val) { _labelfont = val; } /// Return the label's size in pixels. - inline int labelsize() const { + inline Fl_Fontsize labelsize() const { return(_labelsize); } /// Set the label's size in pixels to \p val. - inline void labelsize(int val) { + inline void labelsize(Fl_Fontsize val) { _labelsize = val; } @@ -204,50 +202,34 @@ public: // Colors and Styles //////////////////////////// /// Get the default label foreground color - inline Fl_Color fgcolor() const { - return(_fgcolor); + inline Fl_Color labelfgcolor() const { + return(_labelfgcolor); } /// Set the default label foreground color - inline void fgcolor(Fl_Color val) { - _fgcolor = val; + inline void labelfgcolor(Fl_Color val) { + _labelfgcolor = val; } /// Get the default label background color - inline Fl_Color bgcolor() const { - return(_bgcolor); + inline Fl_Color labelbgcolor() const { + return(_labelbgcolor); } /// Set the default label background color - inline void bgcolor(Fl_Color val) { - _bgcolor = val; + inline void labelbgcolor(Fl_Color val) { + _labelbgcolor = val; } - /// Get the default selection color - inline Fl_Color selectcolor() const { - return(_selectcolor); - } - /// Set the default selection color - inline void selectcolor(Fl_Color val) { - _selectcolor = val; - } - /// Get the default inactive color - inline Fl_Color inactivecolor() const { - return(_inactivecolor); - } - /// Set the default inactive color - inline void inactivecolor(Fl_Color val) { - _inactivecolor = val; - } - /// Get the connector color; the color used for tree connection lines + /// Get the connector color used for tree connection lines. inline Fl_Color connectorcolor() const { return(_connectorcolor); } - /// Set the connector color; the color used for tree connection lines + /// Set the connector color used for tree connection lines. inline void connectorcolor(Fl_Color val) { _connectorcolor = val; } - /// Get the connector style + /// Get the connector style. inline Fl_Tree_Connector connectorstyle() const { return(_connectorstyle); } - /// Set the connector style + /// Set the connector style. inline void connectorstyle(Fl_Tree_Connector val) { _connectorstyle = val; } @@ -255,11 +237,11 @@ public: inline void connectorstyle(int val) { _connectorstyle = Fl_Tree_Connector(val); } - /// Get the tree connection line's width + /// Get the tree connection line's width. inline int connectorwidth() const { return(_connectorwidth); } - /// Set the tree connection line's width + /// Set the tree connection line's width. inline void connectorwidth(int val) { _connectorwidth = val; } @@ -357,5 +339,5 @@ public: #endif /*FL_TREE_PREFS_H*/ // -// End of "$Id: Fl_Tree_Prefs.H 6956 2009-12-08 08:06:44Z greg.ercolano $". +// End of "$Id: Fl_Tree_Prefs.H 8340 2011-01-30 20:22:06Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Valuator.H b/plugins/zynaddsubfx/fltk/FL/Fl_Valuator.H index af217477e..73af078b9 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Valuator.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Valuator.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Valuator.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Valuator.H 7981 2010-12-08 23:53:04Z greg.ercolano $" // // Valuator header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -44,8 +44,8 @@ and provides a consistent interface to set the value, range, and step, and insures that callbacks are done the same for every object.

    There are probably more of these classes in FLTK than any others: -

    \image html valuators.gif

    - \image latex valuators.eps "Valuators derived from Fl_Valuators" width=10cm +

    \image html valuators.png

    + \image latex valuators.png "Valuators derived from Fl_Valuators" width=10cm

    In the above diagram each box surrounds an actual subclass. These are further differentiated by setting the type() of the widget t o the symbolic value labeling the widget. @@ -140,5 +140,5 @@ public: #endif // -// End of "$Id: Fl_Valuator.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Valuator.H 7981 2010-12-08 23:53:04Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Value_Input.H b/plugins/zynaddsubfx/fltk/FL/Fl_Value_Input.H index 4ed1b1011..47ffcf331 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Value_Input.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Value_Input.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Value_Input.H 6902 2009-09-27 11:06:56Z matt $" +// "$Id: Fl_Value_Input.H 8337 2011-01-30 09:04:59Z manolo $" // // Value input header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -59,8 +59,8 @@ of numbers are limited to integers instead of floating point values. -

    \image html Fl_Value_Input.gif - \image latex Fl_Value_Input.eps "Fl_Value_Input" width=8cm +

    \image html Fl_Value_Input.png + \image latex Fl_Value_Input.png "Fl_Value_Input" width=4cm */ class FL_EXPORT Fl_Value_Input : public Fl_Valuator { public: @@ -90,23 +90,27 @@ public: */ char soft() const {return soft_;} /** - The first form returns the current shortcut key for the Input. -

    The second form sets the shortcut key to key. Setting this - overrides the use of '&' in the label(). The value is a bitwise - OR of a key and a set of shift flags, for example FL_ALT | 'a' - , FL_ALT | (FL_F + 10), or just 'a'. A value - of 0 disables the shortcut.

    -

    The key can be any value returned by - Fl::event_key(), but will usually be an ASCII letter. Use - a lower-case letter unless you require the shift key to be held down.

    -

    The shift flags can be any set of values accepted by - Fl::event_state(). If the bit is on that shift key must - be pushed. Meta, Alt, Ctrl, and Shift must be off if they are not in - the shift flags (zero for the other bits indicates a "don't care" - setting). + Returns the current shortcut key for the Input. + \see Fl_Value_Input::shortcut(int) */ int shortcut() const {return input.shortcut();} - /** See int Fl_Value_Input::shortcut() const */ + /** + Sets the shortcut key to \p s. Setting this + overrides the use of '&' in the label(). The value is a bitwise + OR of a key and a set of shift flags, for example FL_ALT | 'a' + , FL_ALT | (FL_F + 10), or just 'a'. A value + of 0 disables the shortcut. + + The key can be any value returned by + Fl::event_key(), but will usually be an ASCII letter. Use + a lower-case letter unless you require the shift key to be held down. + + The shift flags can be any set of values accepted by + Fl::event_state(). If the bit is on that shift key must + be pushed. Meta, Alt, Ctrl, and Shift must be off if they are not in + the shift flags (zero for the other bits indicates a "don't care" + setting). + */ void shortcut(int s) {input.shortcut(s);} /** Gets the typeface of the text in the value box. */ @@ -131,5 +135,5 @@ public: #endif // -// End of "$Id: Fl_Value_Input.H 6902 2009-09-27 11:06:56Z matt $". +// End of "$Id: Fl_Value_Input.H 8337 2011-01-30 09:04:59Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Value_Output.H b/plugins/zynaddsubfx/fltk/FL/Fl_Value_Output.H index 5dda0ca89..afae308a8 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Value_Output.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Value_Output.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Value_Output.H 6902 2009-09-27 11:06:56Z matt $" +// "$Id: Fl_Value_Output.H 7989 2010-12-09 12:19:03Z greg.ercolano $" // // Value output header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -44,8 +44,8 @@

    This is much lighter-weight than Fl_Value_Input because it contains no text editing code or character buffer.

    -

    \image html Fl_Value_Output.gif - \image latex Fl_Value_Output.eps "Fl_Value_Output" width=8cm +

    \image html Fl_Value_Output.png + \image latex Fl_Value_Output.png "Fl_Value_Output" width=4cm */ class FL_EXPORT Fl_Value_Output : public Fl_Valuator { Fl_Font textfont_; @@ -91,5 +91,5 @@ public: #endif // -// End of "$Id: Fl_Value_Output.H 6902 2009-09-27 11:06:56Z matt $". +// End of "$Id: Fl_Value_Output.H 7989 2010-12-09 12:19:03Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Value_Slider.H b/plugins/zynaddsubfx/fltk/FL/Fl_Value_Slider.H index ec886428a..21a42ff79 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Value_Slider.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Value_Slider.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Value_Slider.H 6902 2009-09-27 11:06:56Z matt $" +// "$Id: Fl_Value_Slider.H 7981 2010-12-08 23:53:04Z greg.ercolano $" // // Value slider header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -36,8 +36,8 @@ /** The Fl_Value_Slider widget is a Fl_Slider widget with a box displaying the current value. -

    \image html value_slider.gif - \image latex value_slider.eps "Fl_Value_Slider" width=4cm +

    \image html value_slider.png + \image latex value_slider.png "Fl_Value_Slider" width=4cm */ class FL_EXPORT Fl_Value_Slider : public Fl_Slider { Fl_Font textfont_; @@ -65,5 +65,5 @@ public: #endif // -// End of "$Id: Fl_Value_Slider.H 6902 2009-09-27 11:06:56Z matt $". +// End of "$Id: Fl_Value_Slider.H 7981 2010-12-08 23:53:04Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Widget.H b/plugins/zynaddsubfx/fltk/FL/Fl_Widget.H index 6ddd04522..780c6cba8 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Widget.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Widget.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Widget.H 7661 2010-07-01 15:01:49Z manolo $" +// "$Id: Fl_Widget.H 8623 2011-04-24 17:09:41Z AlbrechtS $" // // Widget header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -31,10 +31,24 @@ #ifndef Fl_Widget_H #define Fl_Widget_H -#include - #include "Enumerations.H" +/** + \todo typedef's fl_intptr_t and fl_uintptr_t should be documented. +*/ +#ifdef _WIN64 +#ifdef __GNUC__ +#include +#else +#include // M$VC +#endif +typedef intptr_t fl_intptr_t; +typedef uintptr_t fl_uintptr_t; +#else +typedef long fl_intptr_t; +typedef unsigned long fl_uintptr_t; +#endif + class Fl_Widget; class Fl_Window; class Fl_Group; @@ -148,11 +162,11 @@ protected: */ enum { INACTIVE = 1<<0, ///< the widget can't receive focus, and is disabled but potentially visible - INVISIBLE = 1<<1, ///< the widget is not drawn but can receive events + INVISIBLE = 1<<1, ///< the widget is not drawn, but can receive a few special events OUTPUT = 1<<2, ///< for output only NOBORDER = 1<<3, ///< don't draw a decoration (Fl_Window) FORCE_POSITION = 1<<4, ///< don't let the window manager position the window (Fl_Window) - NON_MODAL = 1<<5, ///< thisis a hovering toolbar window (Fl_Window) + NON_MODAL = 1<<5, ///< this is a hovering toolbar window (Fl_Window) SHORTCUT_LABEL = 1<<6, ///< the label contains a shortcut we need to draw CHANGED = 1<<7, ///< the widget value changed OVERRIDE = 1<<8, ///< position window on top (Fl_Window) @@ -163,7 +177,8 @@ protected: TOOLTIP_WINDOW = 1<<13, ///< a temporary popup, transparent to events, and dismissed easily (Fl_Window) MODAL = 1<<14, ///< a window blocking input to all other winows (Fl_Window) NO_OVERLAY = 1<<15, ///< window not using a hardware overlay plane (Fl_Menu_Window) - GROUP_RELATIVE = 1<<16, ///< position this idget relative to the parent group, not to the window + GROUP_RELATIVE = 1<<16, ///< position this widget relative to the parent group, not to the window + COPIED_TOOLTIP = 1<<17, ///< the widget tooltip is internally copied, its destruction is handled by the widget // (space for more flags) USERFLAG3 = 1<<29, ///< reserved for 3rd party extensions USERFLAG2 = 1<<30, ///< reserved for 3rd party extensions @@ -325,13 +340,6 @@ public: \return label alignment \see label(), align(Fl_Align), Fl_Align - \todo This function should not take uchar as an argument. - Apart from the fact that uchar is too short with only 8 bits, - it does not provide type safety (in which case we don't need - to declare Fl_Align an enum to begin with). - *NOTE* The current (FLTK 1.3) implementation (Dec 2008) is such that - Fl_Align is (typedef'd to be) "unsigned" (int), but Fl_Widget's - "align_" member variable is a bit field of 8 bits only ! */ Fl_Align align() const {return label_.align_;} @@ -535,22 +543,12 @@ public: /** Gets the current tooltip text. \return a pointer to the tooltip text or NULL + \see tooltip(const char*), copy_tooltip(const char*) */ const char *tooltip() const {return tooltip_;} - /** Sets the current tooltip text. - Sets a string of text to display in a popup tooltip window when the user - hovers the mouse over the widget. The string is not copied, so - make sure any formatted string is stored in a static, global, - or allocated buffer. - - If no tooltip is set, the tooltip of the parent is inherited. Setting a - tooltip for a group and setting no tooltip for a child will show the - group's tooltip instead. To avoid this behavior, you can set the child's - tooltip to an empty string (""). - \param[in] t new tooltip - */ - void tooltip(const char *t); + void tooltip(const char *text); // see Fl_Tooltip + void copy_tooltip(const char *text); // see Fl_Tooltip /** Gets the current callback function for the widget. Each widget has a single callback. @@ -598,11 +596,11 @@ public: /** Gets the current user data (long) argument that is passed to the callback function. */ - intptr_t argument() const {return (intptr_t)user_data_;} + long argument() const {return (long)(fl_intptr_t)user_data_;} /** Sets the current user data (long) argument that is passed to the callback function. - \todo The user data value must be implemented using a \em union to avoid - 64 bit machine incompatibilities. + \todo The user data value must be implemented using \em intptr_t or similar + to avoid 64-bit machine incompatibilities. */ void argument(long v) {user_data_ = (void*)v;} @@ -662,14 +660,17 @@ public: int visible_r() const; /** Makes a widget visible. - An invisible widget never gets redrawn and does not get events. - The visible() method returns true if the widget is set to be - visible. The visible_r() method returns true if the widget and - all of its parents are visible. A widget is only visible if - visible() is true on it and all of its parents. - Changing it will send FL_SHOW or FL_HIDE events to - the widget. Do not change it if the parent is not visible, as this + An invisible widget never gets redrawn and does not get keyboard + or mouse events, but can receive a few other events like FL_SHOW. + + The visible() method returns true if the widget is set to be + visible. The visible_r() method returns true if the widget and + all of its parents are visible. A widget is only visible if + visible() is true on it and all of its parents. + + Changing it will send FL_SHOW or FL_HIDE events to the widget. + Do not change it if the parent is not visible, as this will send false FL_SHOW or FL_HIDE events to the widget. redraw() is called if necessary on this or the parent. @@ -722,7 +723,7 @@ public: Changing this value will send FL_DEACTIVATE to the widget if active_r() is true. - + Currently you cannot deactivate Fl_Window widgets. \see activate(), active(), active_r() @@ -750,10 +751,10 @@ public: void clear_output() {flags_ &= ~OUTPUT;} /** Returns if the widget is able to take events. - This is the same as (active() && !output() - && visible()) but is faster. + This is the same as (active() && !output() && visible()) + but is faster. \retval 0 if the widget takes no events - */ + */ unsigned int takesevents() const {return !(flags_&(INACTIVE|INVISIBLE|OUTPUT));} /** @@ -845,12 +846,12 @@ public: // Documentation and implementation in Fl_Widget.cxx void do_callback(Fl_Widget* o,void* arg=0); - /** Internal use only. */ + /* Internal use only. */ int test_shortcut(); - /** Internal use only. */ + /* Internal use only. */ static unsigned int label_shortcut(const char *t); - /** Internal use only. */ - static int test_shortcut(const char*); + /* Internal use only. */ + static int test_shortcut(const char*, const bool require_alt = false); /** Checks if w is a child of this widget. \param[in] w potential child widget @@ -920,7 +921,7 @@ public: /** Sets width ww and height hh accordingly with the label size. Labels with images will return w() and h() of the image. */ - void measure_label(int& ww, int& hh) {label_.measure(ww, hh);} + void measure_label(int& ww, int& hh) const {label_.measure(ww, hh);} /** Returns a pointer to the primary Fl_Window widget. \retval NULL if no window is associated with this widget. @@ -930,25 +931,53 @@ public: Fl_Window* window() const ; /** Returns an Fl_Group pointer if this widget is an Fl_Group. - + + Use this method if you have a widget (pointer) and need to + know whether this widget is derived from Fl_Group. If it returns + non-NULL, then the widget in question is derived from Fl_Group, + and you can use the returned pointer to access its children + or other Fl_Group-specific methods. + + Example: + \code + void my_callback (Fl_Widget *w, void *) { + Fl_Group *g = w->as_group(); + if (g) + printf ("This group has %d children\n",g->children()); + else + printf ("This widget is not a group!\n"); + } + \endcode + \retval NULL if this widget is not derived from Fl_Group. \note This method is provided to avoid dynamic_cast. - \todo More documentation ... + \see Fl_Widget::as_window(), Fl_Widget::as_gl_window() */ virtual Fl_Group* as_group() {return 0;} /** Returns an Fl_Window pointer if this widget is an Fl_Window. - - \retval NULL if this widget is not derived from Fl_Window. - \note This method is provided to avoid dynamic_cast. - \todo More documentation ... + + Use this method if you have a widget (pointer) and need to + know whether this widget is derived from Fl_Window. If it returns + non-NULL, then the widget in question is derived from Fl_Window, + and you can use the returned pointer to access its children + or other Fl_Window-specific methods. + + \retval NULL if this widget is not derived from Fl_Window. + \note This method is provided to avoid dynamic_cast. + \see Fl_Widget::as_group(), Fl_Widget::as_gl_window() */ virtual Fl_Window* as_window() {return 0;} - - /** Returns an Fl_Gl_Window pointer if this widget is an Fl_Gl_Window. - \retval NULL if this widget is not derived from Fl_Gl_Window. - \note This method is provided to avoid dynamic_cast. - \todo More documentation ... + + /** Returns an Fl_Gl_Window pointer if this widget is an Fl_Gl_Window. + + Use this method if you have a widget (pointer) and need to + know whether this widget is derived from Fl_Gl_Window. If it returns + non-NULL, then the widget in question is derived from Fl_Gl_Window. + + \retval NULL if this widget is not derived from Fl_Gl_Window. + \note This method is provided to avoid dynamic_cast. + \see Fl_Widget::as_group(), Fl_Widget::as_window() */ virtual class Fl_Gl_Window* as_gl_window() {return 0;} @@ -973,5 +1002,5 @@ public: #endif // -// End of "$Id: Fl_Widget.H 7661 2010-07-01 15:01:49Z manolo $". +// End of "$Id: Fl_Widget.H 8623 2011-04-24 17:09:41Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Window.H b/plugins/zynaddsubfx/fltk/FL/Fl_Window.H index cad924ace..8317fb4a8 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Window.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Window.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Window.H 7280 2010-03-16 22:51:31Z matt $" +// "$Id: Fl_Window.H 8593 2011-04-15 21:38:05Z manolo $" // // Window header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -57,11 +57,13 @@ class Fl_X; */ class FL_EXPORT Fl_Window : public Fl_Group { + static char *default_xclass_; + friend class Fl_X; Fl_X *i; // points at the system-specific stuff const char* iconlabel_; - const char* xclass_; + char* xclass_; const void* icon_; // size_range stuff: int minw, minh, maxw, maxh; @@ -114,8 +116,8 @@ public: If Fl_Group::current() is not NULL, the window is created as a subwindow of the parent window. - The first form of the constructor creates a top-level window - and asks the window manager to position the window. The second + The (w,h) form of the constructor creates a top-level window + and asks the window manager to position the window. The (x,y,w,h) form of the constructor either creates a subwindow or a top-level window at the specified location (x,y) , subject to window manager configuration. If you do not specify the position of the @@ -135,12 +137,12 @@ public: change this to FL_NO_BOX. If you turn the window border off you may want to change this to FL_UP_BOX. - \see Fl_Window(int x, int y, int w, int h, const char* title = 0) + \see Fl_Window(int x, int y, int w, int h, const char* title) */ Fl_Window(int w, int h, const char* title= 0); /** Creates a window from the given position, size and title. - \see Fl_Window::Fl_Window(int w, int h, const char *title = 0) + \see Fl_Window(int w, int h, const char *title) */ Fl_Window(int x, int y, int w, int h, const char* title = 0); /** @@ -321,29 +323,15 @@ public: /** Sets the icon label. */ void iconlabel(const char*); /** Sets the icon label. */ - void label(const char* label, const char* iconlabel); // platform dependent + void label(const char* label, const char* iconlabel); // platform dependent void copy_label(const char* a); - /** See void Fl_Window::xclass(const char*) */ - const char* xclass() const {return xclass_;} - /** - A string used to tell the system what type of window this is. Mostly - this identifies the picture to draw in the icon. Under X, this is - turned into a XA_WM_CLASS pair by truncating at the first - non-alphanumeric character and capitalizing the first character, and - the second one if the first is 'x'. Thus "foo" turns into "foo, Foo", - and "xprog.1" turns into "xprog, XProg". This only works if called - before calling show(). - Under Microsoft Windows this string is used as the name of the - WNDCLASS structure, though it is not clear if this can have any - visible effect. The passed pointer is stored unchanged. The string - is not copied. - */ - void xclass(const char* c) {xclass_ = c;} - /** Gets the current icon window target dependent data. */ - const void* icon() const {return icon_;} - /** Sets the current icon window target dependent data. */ - void icon(const void * ic) {icon_ = ic;} + static void default_xclass(const char*); + static const char *default_xclass(); + const char* xclass() const; + void xclass(const char* c); + const void* icon() const; + void icon(const void * ic); /** Returns non-zero if show() has been called (but not hide() @@ -353,14 +341,18 @@ public: int shown() {return i != 0;} /** Puts the window on the screen. Usually (on X) this has the side - effect of opening the display. The second form is used for top-level - windows and allows standard arguments to be parsed from the - command-line. + effect of opening the display. If the window is already shown then it is restored and raised to the top. This is really convenient because your program can call show() - at any time, even if the window is already up. It also means that + at any time, even if the window is already up. It also means that show() serves the purpose of raise() in other toolkits. + + Fl_Window::show(int argc, char **argv) is used for top-level + windows and allows standard arguments to be parsed from the + command-line. + + \see Fl_Window::show(int argc, char **argv) */ virtual void show(); /** @@ -369,9 +361,26 @@ public: */ virtual void hide(); /** - See virtual void Fl_Window::show() + Puts the window on the screen and parses command-line arguments. + + Usually (on X) this has the side effect of opening the display. + + This form should be used for top-level windows, at least for the + first (main) window. It allows standard arguments to be parsed + from the command-line. You can use \p argc and \p argv from + main(int argc, char **argv) for this call. + + The first call also sets up some system-specific internal + variables like the system colors. + + \todo explain which system parameters are set up. + + \param argc command-line argument count, usually from main() + \param argv command-line argument vector, usually from main() + + \see virtual void Fl_Window::show() */ - void show(int, char**); + void show(int argc, char **argv); /** Makes the window completely fill the screen, without any window manager border visible. You must use fullscreen_off() to undo @@ -415,15 +424,9 @@ public: */ void make_current(); - /** Returns an Fl_Window pointer if this widget is an Fl_Window. - - \retval NULL if this widget is not derived from Fl_Window. - \note This method is provided to avoid dynamic_cast. - \todo More documentation ... - */ + // Note: Doxygen docs in Fl_Widget.H to avoid redundancy. virtual Fl_Window* as_window() { return this; } - // for back-compatibility only: /** Changes the cursor for this window. This always calls the system, if you are changing the cursor a lot you may want to keep track of how @@ -440,11 +443,23 @@ public: void cursor(Fl_Cursor, Fl_Color=FL_BLACK, Fl_Color=FL_WHITE); // platform dependent void default_cursor(Fl_Cursor, Fl_Color=FL_BLACK, Fl_Color=FL_WHITE); static void default_callback(Fl_Window*, void* v); + + /** Returns the window width including any frame added by the window manager. + + Same as w() if applied to a subwindow. + */ + int decorated_w(); + /** Returns the window height including any window title bar and any frame + added by the window manager. + + Same as h() if applied to a subwindow. + */ + int decorated_h(); }; #endif // -// End of "$Id: Fl_Window.H 7280 2010-03-16 22:51:31Z matt $". +// End of "$Id: Fl_Window.H 8593 2011-04-15 21:38:05Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_Wizard.H b/plugins/zynaddsubfx/fltk/FL/Fl_Wizard.H index 80d8af52c..2dcf31513 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_Wizard.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_Wizard.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Wizard.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_Wizard.H 8306 2011-01-24 17:04:22Z matt $" // // Fl_Wizard widget definitions. // -// Copyright 1999-2009 by Easy Software Products. +// Copyright 1999-2010 by Easy Software Products. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -47,8 +47,8 @@

    As with Fl_Tabs, wizard panes are composed of child (usually Fl_Group) widgets. Navigation buttons must be added separately. */ -class FL_EXPORT Fl_Wizard : public Fl_Group -{ +class FL_EXPORT Fl_Wizard : public Fl_Group { + Fl_Widget *value_; void draw(); @@ -66,5 +66,5 @@ class FL_EXPORT Fl_Wizard : public Fl_Group #endif // !_Fl_Wizard_H_ // -// End of "$Id: Fl_Wizard.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_Wizard.H 8306 2011-01-24 17:04:22Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_XBM_Image.H b/plugins/zynaddsubfx/fltk/FL/Fl_XBM_Image.H index 315cee80c..53081ebdd 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_XBM_Image.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_XBM_Image.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_XBM_Image.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_XBM_Image.H 7903 2010-11-28 21:06:39Z matt $" // // XBM image header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -46,5 +46,5 @@ class FL_EXPORT Fl_XBM_Image : public Fl_Bitmap { #endif // !Fl_XBM_Image_H // -// End of "$Id: Fl_XBM_Image.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_XBM_Image.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Fl_XPM_Image.H b/plugins/zynaddsubfx/fltk/FL/Fl_XPM_Image.H index e5e7ec61d..2f1a18acc 100644 --- a/plugins/zynaddsubfx/fltk/FL/Fl_XPM_Image.H +++ b/plugins/zynaddsubfx/fltk/FL/Fl_XPM_Image.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_XPM_Image.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: Fl_XPM_Image.H 7903 2010-11-28 21:06:39Z matt $" // // XPM image header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -47,5 +47,5 @@ class FL_EXPORT Fl_XPM_Image : public Fl_Pixmap { #endif // !Fl_XPM_Image // -// End of "$Id: Fl_XPM_Image.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: Fl_XPM_Image.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/Xutf8.h b/plugins/zynaddsubfx/fltk/FL/Xutf8.h index b4009bd6e..b122d2e04 100644 --- a/plugins/zynaddsubfx/fltk/FL/Xutf8.h +++ b/plugins/zynaddsubfx/fltk/FL/Xutf8.h @@ -1,7 +1,7 @@ -/* "$Id: Xutf8.h 6942 2009-11-18 12:22:51Z AlbrechtS $" +/* "$Id: Xutf8.h 8399 2011-02-07 22:22:16Z ianmacarthur $" * * Author: Jean-Marc Lienher ( http://oksid.ch ) - * Copyright 2000-2003 by O'ksi'D. + * Copyright 2000-2010 by O'ksi'D. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -48,8 +48,8 @@ typedef struct { XUtf8FontStruct * XCreateUtf8FontStruct ( - Display *dpy, - const char *base_font_name_list); + Display *dpy, + const char *base_font_name_list); void XUtf8DrawString( @@ -62,6 +62,19 @@ XUtf8DrawString( const char *string, int num_bytes); +void +XUtf8_measure_extents( + Display *display, + Drawable d, + XUtf8FontStruct *font_set, + GC gc, + int *xx, + int *yy, + int *ww, + int *hh, + const char *string, + int num_bytes); + void XUtf8DrawRtlString( Display *display, @@ -89,7 +102,7 @@ XUtf8TextWidth( XUtf8FontStruct *font_set, const char *string, int num_bytes); -int +int XUtf8UcsWidth( XUtf8FontStruct *font_set, unsigned int ucs); @@ -100,41 +113,41 @@ XGetUtf8FontAndGlyph( unsigned int ucs, XFontStruct **fnt, unsigned short *id); - + void XFreeUtf8FontStruct( Display *dpy, XUtf8FontStruct *font_set); -int -XConvertUtf8ToUcs( - const unsigned char *buf, - int len, +int +XConvertUtf8ToUcs( + const unsigned char *buf, + int len, unsigned int *ucs); -int +int XConvertUcsToUtf8( - unsigned int ucs, + unsigned int ucs, char *buf); -int +int XUtf8CharByteLen( - const unsigned char *buf, + const unsigned char *buf, int len); -int +int XCountUtf8Char( - const unsigned char *buf, + const unsigned char *buf, int len); -int -XFastConvertUtf8ToUcs( - const unsigned char *buf, - int len, +int +XFastConvertUtf8ToUcs( + const unsigned char *buf, + int len, unsigned int *ucs); -long +long XKeysymToUcs( KeySym keysym); @@ -147,7 +160,7 @@ XUtf8LookupString( KeySym* keysym, Status* status_return); -unsigned short +unsigned short XUtf8IsNonSpacing( unsigned int ucs); @@ -156,11 +169,11 @@ XUtf8IsRightToLeft( unsigned int ucs); -int +int XUtf8Tolower( int ucs); -int +int XUtf8Toupper( int ucs); @@ -172,5 +185,5 @@ XUtf8Toupper( #endif /* - * End of "$Id: Xutf8.h 6942 2009-11-18 12:22:51Z AlbrechtS $". - */ + * End of "$Id: Xutf8.h 8399 2011-02-07 22:22:16Z ianmacarthur $". + */ diff --git a/plugins/zynaddsubfx/fltk/FL/dirent.h b/plugins/zynaddsubfx/fltk/FL/dirent.h index 764a4cba4..7b68cd169 100644 --- a/plugins/zynaddsubfx/fltk/FL/dirent.h +++ b/plugins/zynaddsubfx/fltk/FL/dirent.h @@ -1,9 +1,9 @@ // -// "$Id: dirent.h 7504 2010-04-14 20:17:44Z matt $" +// "$Id: dirent.h 8623 2011-04-24 17:09:41Z AlbrechtS $" // // Directory header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -26,9 +26,9 @@ // -// this file is for back-compatability only +// this file is for back-compatibility only #include "filename.H" // -// End of "$Id: dirent.h 7504 2010-04-14 20:17:44Z matt $". +// End of "$Id: dirent.h 8623 2011-04-24 17:09:41Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/filename.H b/plugins/zynaddsubfx/fltk/FL/filename.H index 7c0187926..3acae5788 100644 --- a/plugins/zynaddsubfx/fltk/FL/filename.H +++ b/plugins/zynaddsubfx/fltk/FL/filename.H @@ -1,9 +1,9 @@ /* - * "$Id: filename.H 7504 2010-04-14 20:17:44Z matt $" + * "$Id: filename.H 8073 2010-12-20 13:35:43Z ianmacarthur $" * * Filename header file for the Fast Light Tool Kit (FLTK). * - * Copyright 1998-2009 by Bill Spitzak and others. + * Copyright 1998-2010 by Bill Spitzak and others. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -25,9 +25,10 @@ * http://www.fltk.org/str.php */ -// Xcode on OS X includes files by recursing down into directories. -// This code catches the cycle and directly includes the required file. -#ifdef fl_dirent_h_cyclic_include +/* Xcode on OS X includes files by recursing down into directories. + * This code catches the cycle and directly includes the required file. + */ +#ifdef fl_dirent_h_cyclic_include # include "/usr/include/dirent.h" #endif @@ -36,11 +37,12 @@ # include "Fl_Export.H" -/** \addtogroup filenames File names and URI utility functions +/** \addtogroup filenames File names and URI utility functions + File names and URI functions defined in @{ */ -# define FL_PATH_MAX 256 /**< all path buffers should use this length */ -/** Gets the file name from a path. +# define FL_PATH_MAX 2048 /**< all path buffers should use this length */ +/** Gets the file name from a path. Similar to basename(3), exceptions shown below. \code #include @@ -72,6 +74,7 @@ FL_EXPORT int fl_filename_isdir(const char *name); inline char *fl_filename_setext(char *to, const char *ext) { return fl_filename_setext(to, FL_PATH_MAX, ext); } inline int fl_filename_expand(char *to, const char *from) { return fl_filename_expand(to, FL_PATH_MAX, from); } inline int fl_filename_absolute(char *to, const char *from) { return fl_filename_absolute(to, FL_PATH_MAX, from); } +FL_EXPORT int fl_filename_relative(char *to, int tolen, const char *from, const char *cwd); inline int fl_filename_relative(char *to, const char *from) { return fl_filename_relative(to, FL_PATH_MAX, from); } # endif /* __cplusplus */ @@ -100,9 +103,9 @@ struct dirent {char d_name[1];}; * It would be best to create a file that does this... */ # include -# define fl_dirent_h_cyclic_include +# define fl_dirent_h_cyclic_include # include -# undef fl_dirent_h_cyclic_include +# undef fl_dirent_h_cyclic_include # endif # if defined (__cplusplus) @@ -127,6 +130,7 @@ FL_EXPORT int fl_numericsort(struct dirent **, struct dirent **); FL_EXPORT int fl_filename_list(const char *d, struct dirent ***l, Fl_File_Sort_F *s = fl_numericsort); +FL_EXPORT void fl_filename_free_list(struct dirent ***l, int n); /* * Generic function to open a Uniform Resource Identifier (URI) using a @@ -172,5 +176,5 @@ int _fl_filename_isdir_quick(const char *name); /** @} */ /* - * End of "$Id: filename.H 7504 2010-04-14 20:17:44Z matt $". + * End of "$Id: filename.H 8073 2010-12-20 13:35:43Z ianmacarthur $". */ diff --git a/plugins/zynaddsubfx/fltk/FL/fl_ask.H b/plugins/zynaddsubfx/fltk/FL/fl_ask.H index f9a245748..98e7f3964 100644 --- a/plugins/zynaddsubfx/fltk/FL/fl_ask.H +++ b/plugins/zynaddsubfx/fltk/FL/fl_ask.H @@ -1,9 +1,9 @@ // -// "$Id: fl_ask.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: fl_ask.H 8441 2011-02-18 08:52:48Z AlbrechtS $" // // Standard dialog header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -43,9 +43,6 @@ enum { # ifdef __GNUC__ # define __fl_attr(x) __attribute__ (x) -# if __GNUC__ < 3 -# define __deprecated__ -# endif // __GNUC__ < 3 # else # define __fl_attr(x) # endif // __GNUC__ @@ -67,6 +64,12 @@ extern FL_EXPORT Fl_Fontsize fl_message_size_; inline void fl_message_font(Fl_Font f, Fl_Fontsize s) { fl_message_font_ = f; fl_message_size_ = s;} +FL_EXPORT void fl_message_hotspot(int enable); +FL_EXPORT int fl_message_hotspot(void); + +FL_EXPORT void fl_message_title(const char *title); +FL_EXPORT void fl_message_title_default(const char *title); + // pointers you can use to change FLTK to a foreign language: extern FL_EXPORT const char* fl_no; extern FL_EXPORT const char* fl_yes; @@ -76,5 +79,5 @@ extern FL_EXPORT const char* fl_close; #endif // !fl_ask_H // -// End of "$Id: fl_ask.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: fl_ask.H 8441 2011-02-18 08:52:48Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/fl_draw.H b/plugins/zynaddsubfx/fltk/FL/fl_draw.H index e515b1c35..93c0ce1a6 100644 --- a/plugins/zynaddsubfx/fltk/FL/fl_draw.H +++ b/plugins/zynaddsubfx/fltk/FL/fl_draw.H @@ -1,9 +1,9 @@ // -// "$Id: fl_draw.H 7659 2010-07-01 13:21:32Z manolo $" +// "$Id: fl_draw.H 8772 2011-06-02 08:06:09Z manolo $" // // Portable drawing function header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -33,9 +33,10 @@ #ifndef fl_draw_H #define fl_draw_H -#include "Enumerations.H" // for the color names -#include "Fl_Window.H" // for fl_set_spot() -#include "Fl_Device.H" +#include // for Fl_Region +#include // for the color names +#include // for fl_set_spot() +#include // for fl_graphics_driver // Image class... class Fl_Image; @@ -57,11 +58,11 @@ FL_EXPORT extern char fl_draw_shortcut; the foreground is not set for the current window. \param[in] c color */ -inline void fl_color(Fl_Color c) {fl_graphics_driver->color(c); }; // select indexed color +inline void fl_color(Fl_Color c) {fl_graphics_driver->color(c); } // select indexed color /** for back compatibility - use fl_color(Fl_Color c) instead */ inline void fl_color(int c) {fl_color((Fl_Color)c);} /** - Set the color for all subsequent drawing operations. + Sets the color for all subsequent drawing operations. The closest possible match to the RGB color is used. The RGB color is used directly on TrueColor displays. For colormap visuals the nearest index in the gray @@ -70,14 +71,12 @@ inline void fl_color(int c) {fl_color((Fl_Color)c);} the foreground is not set for the current window. \param[in] r,g,b color components */ -inline void fl_color(uchar r, uchar g, uchar b) {fl_graphics_driver->color(r,g,b); }; // select actual color -/** \brief The current color */ -extern FL_EXPORT Fl_Color fl_color_; +inline void fl_color(uchar r, uchar g, uchar b) {fl_graphics_driver->color(r,g,b); } // select actual color /** Returns the last fl_color() that was set. This can be used for state save/restore. */ -inline Fl_Color fl_color() {return fl_color_;} +inline Fl_Color fl_color() {return fl_graphics_driver->color();} /** @} */ /** \addtogroup fl_drawings @@ -89,13 +88,20 @@ inline Fl_Color fl_color() {return fl_color_;} new region onto the stack. \param[in] x,y,w,h position and size */ -inline void fl_push_clip(int x, int y, int w, int h) {fl_graphics_driver->push_clip(x,y,w,h); }; -/** The fl_clip() name is deprecated and will be removed from future releases */ +inline void fl_push_clip(int x, int y, int w, int h) {fl_graphics_driver->push_clip(x,y,w,h); } +/** + Intersects the current clip region with a rectangle and pushes this + new region onto the stack (deprecated). + \param[in] x,y,w,h position and size + \deprecated + fl_clip(int, int, int, int) is deprecated and will be removed from future releases. + Please use fl_push_clip(int x, int y, int w, int h) instead. + */ #define fl_clip fl_push_clip /** Pushes an empty clip region onto the stack so nothing will be clipped. */ -inline void fl_push_no_clip() {fl_graphics_driver->push_no_clip(); }; +inline void fl_push_no_clip() {fl_graphics_driver->push_no_clip(); } /** Restores the previous clip region. @@ -103,7 +109,7 @@ inline void fl_push_no_clip() {fl_graphics_driver->push_no_clip(); }; Unpredictable results may occur if the clip stack is not empty when you return to FLTK. */ -inline void fl_pop_clip() {fl_graphics_driver->pop_clip(); }; +inline void fl_pop_clip() {fl_graphics_driver->pop_clip(); } /** Does the rectangle intersect the current clip region? \param[in] x,y,w,h position and size of rectangle @@ -114,43 +120,40 @@ inline void fl_pop_clip() {fl_graphics_driver->pop_clip(); }; Under X this returns 2 if the rectangle is partially clipped, and 1 if it is entirely inside the clip region. */ -inline int fl_not_clipped(int x, int y, int w, int h) {return fl_graphics_driver->not_clipped(x,y,w,h); }; +inline int fl_not_clipped(int x, int y, int w, int h) {return fl_graphics_driver->not_clipped(x,y,w,h); } /** Intersects the rectangle with the current clip region and returns the bounding box of the result. Returns non-zero if the resulting rectangle is different to the original. This can be used to limit the necessary drawing to a rectangle. - \p W and \p H are set to zero if the rectangle is completely outside - the region. + \p W and \p H are set to zero if the rectangle is completely outside the region. \param[in] x,y,w,h position and size of rectangle \param[out] X,Y,W,H position and size of resulting bounding box. - \p W and \p H are set to zero if the rectangle is - completely outside the region. \returns Non-zero if the resulting rectangle is different to the original. */ inline int fl_clip_box(int x , int y, int w, int h, int& X, int& Y, int& W, int& H) - {return fl_graphics_driver->clip_box(x,y,w,h,X,Y,W,H); }; + {return fl_graphics_driver->clip_box(x,y,w,h,X,Y,W,H); } /** Undoes any clobbering of clip done by your program */ -extern void fl_restore_clip(); +inline void fl_restore_clip() { fl_graphics_driver->restore_clip(); } /** Replaces the top of the clipping stack with a clipping region of any shape. Fl_Region is an operating system specific type. \param[in] r clipping region */ -FL_EXPORT void fl_clip_region(Fl_Region r); +inline void fl_clip_region(Fl_Region r) { fl_graphics_driver->clip_region(r); } /** - returns the current clipping region. + Returns the current clipping region. */ -extern Fl_Region fl_clip_region(); - +inline Fl_Region fl_clip_region() { return fl_graphics_driver->clip_region(); } + // points: /** Draws a single pixel at the given coordinates */ -inline void fl_point(int x, int y) { fl_graphics_driver->point(x,y); }; +inline void fl_point(int x, int y) { fl_graphics_driver->point(x,y); } // line type: /** @@ -180,7 +183,7 @@ inline void fl_point(int x, int y) { fl_graphics_driver->point(x,y); }; \note The \p dashes array does not work under Windows 95, 98 or Me, since those operating systems do not support complex line styles. */ -inline void fl_line_style(int style, int width=0, char* dashes=0) {fl_graphics_driver->line_style(style,width,dashes); }; +inline void fl_line_style(int style, int width=0, char* dashes=0) {fl_graphics_driver->line_style(style,width,dashes); } enum { FL_SOLID = 0, ///< line style: ___________ FL_DASH = 1, ///< line style: _ _ _ _ _ _ @@ -204,17 +207,17 @@ enum { This function is meant for quick drawing of simple boxes. The behavior is undefined for line widths that are not 1. */ -inline void fl_rect(int x, int y, int w, int h) { fl_graphics_driver->rect(x,y,w,h); }; +inline void fl_rect(int x, int y, int w, int h) { fl_graphics_driver->rect(x,y,w,h); } /** Draws with passed color a 1-pixel border \e inside the given bounding box */ inline void fl_rect(int x, int y, int w, int h, Fl_Color c) {fl_color(c); fl_rect(x,y,w,h);} /** Colors with current color a rectangle that exactly fills the given bounding box */ -inline void fl_rectf(int x, int y, int w, int h) { fl_graphics_driver->rectf(x,y,w,h); }; -/** Colors with passsed color a rectangle that exactly fills the given bounding box */ +inline void fl_rectf(int x, int y, int w, int h) { fl_graphics_driver->rectf(x,y,w,h); } +/** Colors with passed color a rectangle that exactly fills the given bounding box */ inline void fl_rectf(int x, int y, int w, int h, Fl_Color c) {fl_color(c); fl_rectf(x,y,w,h);} /** - Color a rectangle with "exactly" the passed r,g,b color. + Colors a rectangle with "exactly" the passed r,g,b color. On screens with less than 24 bits of color this is done by drawing a solid-colored block using fl_draw_image() so that the correct color shade is produced. @@ -226,63 +229,63 @@ FL_EXPORT void fl_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b); /** Draws a line from (x,y) to (x1,y1) */ -inline void fl_line(int x, int y, int x1, int y1) {fl_graphics_driver->line(x,y,x1,y1); }; +inline void fl_line(int x, int y, int x1, int y1) {fl_graphics_driver->line(x,y,x1,y1); } /** Draws a line from (x,y) to (x1,y1) and another from (x1,y1) to (x2,y2) */ -inline void fl_line(int x, int y, int x1, int y1, int x2, int y2) {fl_graphics_driver->line(x,y,x1,y1,x2,y2); }; +inline void fl_line(int x, int y, int x1, int y1, int x2, int y2) {fl_graphics_driver->line(x,y,x1,y1,x2,y2); } // closed line segments: /** Outlines a 3-sided polygon with lines */ -inline void fl_loop(int x, int y, int x1, int y1, int x2, int y2) {fl_graphics_driver->loop(x,y,x1,y1,x2,y2); }; +inline void fl_loop(int x, int y, int x1, int y1, int x2, int y2) {fl_graphics_driver->loop(x,y,x1,y1,x2,y2); } /** Outlines a 4-sided polygon with lines */ inline void fl_loop(int x, int y, int x1, int y1, int x2, int y2, int x3, int y3) - {fl_graphics_driver->loop(x,y,x1,y1,x2,y2,x3,y3); }; + {fl_graphics_driver->loop(x,y,x1,y1,x2,y2,x3,y3); } // filled polygons /** Fills a 3-sided polygon. The polygon must be convex. */ -inline void fl_polygon(int x, int y, int x1, int y1, int x2, int y2) {fl_graphics_driver->polygon(x,y,x1,y1,x2,y2); }; +inline void fl_polygon(int x, int y, int x1, int y1, int x2, int y2) {fl_graphics_driver->polygon(x,y,x1,y1,x2,y2); } /** Fills a 4-sided polygon. The polygon must be convex. */ inline void fl_polygon(int x, int y, int x1, int y1, int x2, int y2, int x3, int y3) - { fl_graphics_driver->polygon(x,y,x1,y1,x2,y2,x3,y3); }; + { fl_graphics_driver->polygon(x,y,x1,y1,x2,y2,x3,y3); } // draw rectilinear lines, horizontal segment first: /** Draws a horizontal line from (x,y) to (x1,y) */ -inline void fl_xyline(int x, int y, int x1) {fl_graphics_driver->xyline(x,y,x1);}; +inline void fl_xyline(int x, int y, int x1) {fl_graphics_driver->xyline(x,y,x1);} /** Draws a horizontal line from (x,y) to (x1,y), then vertical from (x1,y) to (x1,y2) */ -inline void fl_xyline(int x, int y, int x1, int y2) {fl_graphics_driver->xyline(x,y,x1,y2);}; +inline void fl_xyline(int x, int y, int x1, int y2) {fl_graphics_driver->xyline(x,y,x1,y2);} /** Draws a horizontal line from (x,y) to (x1,y), then a vertical from (x1,y) to (x1,y2) and then another horizontal from (x1,y2) to (x3,y2) */ -inline void fl_xyline(int x, int y, int x1, int y2, int x3) {fl_graphics_driver->xyline(x,y,x1,y2,x3);}; +inline void fl_xyline(int x, int y, int x1, int y2, int x3) {fl_graphics_driver->xyline(x,y,x1,y2,x3);} // draw rectilinear lines, vertical segment first: /** Draws a vertical line from (x,y) to (x,y1) */ -inline void fl_yxline(int x, int y, int y1) {fl_graphics_driver->yxline(x,y,y1);}; +inline void fl_yxline(int x, int y, int y1) {fl_graphics_driver->yxline(x,y,y1);} /** Draws a vertical line from (x,y) to (x,y1), then a horizontal from (x,y1) to (x2,y1) */ -inline void fl_yxline(int x, int y, int y1, int x2) {fl_graphics_driver->yxline(x,y,y1,x2);}; +inline void fl_yxline(int x, int y, int y1, int x2) {fl_graphics_driver->yxline(x,y,y1,x2);} /** Draws a vertical line from (x,y) to (x,y1) then a horizontal from (x,y1) to (x2,y1), then another vertical from (x2,y1) to (x2,y3) */ -inline void fl_yxline(int x, int y, int y1, int x2, int y3) {fl_graphics_driver->yxline(x,y,y1,x2,y3);}; +inline void fl_yxline(int x, int y, int y1, int x2, int y3) {fl_graphics_driver->yxline(x,y,y1,x2,y3);} // circular lines and pie slices (code in fl_arci.C): /** @@ -294,7 +297,7 @@ inline void fl_yxline(int x, int y, int y1, int x2, int y3) {fl_graphics_driver- much nicer small circles, since the small sizes are often hard-coded bitmaps. If a complete circle is drawn it will fit inside the passed bounding box. - The two angles are measured in degrees counterclockwise from 3 o'clock and + The two angles are measured in degrees counter-clockwise from 3 o'clock and are the starting and ending angle of the arc, \p a2 must be greater or equal to \p a1. @@ -307,7 +310,7 @@ inline void fl_yxline(int x, int y, int y1, int x2, int y3) {fl_graphics_driver- counter-clockwise from 3 o'clock. \p a2 must be greater than or equal to \p a1. */ -inline void fl_arc(int x, int y, int w, int h, double a1, double a2) {fl_graphics_driver->arc(x,y,w,h,a1,a2); }; +inline void fl_arc(int x, int y, int w, int h, double a1, double a2) {fl_graphics_driver->arc(x,y,w,h,a1,a2); } /** Draw filled ellipse sections using integer coordinates. @@ -320,41 +323,71 @@ inline void fl_arc(int x, int y, int w, int h, double a1, double a2) {fl_graphic counter-clockwise from 3 o'clock. \p a2 must be greater than or equal to \p a1. */ -inline void fl_pie(int x, int y, int w, int h, double a1, double a2) {fl_graphics_driver->pie(x,y,w,h,a1,a2); }; +inline void fl_pie(int x, int y, int w, int h, double a1, double a2) {fl_graphics_driver->pie(x,y,w,h,a1,a2); } /** fl_chord declaration is a place holder - the function does not yet exist */ FL_EXPORT void fl_chord(int x, int y, int w, int h, double a1, double a2); // nyi // scalable drawing code (code in fl_vertex.C and fl_arc.C): -FL_EXPORT void fl_push_matrix(); -FL_EXPORT void fl_pop_matrix(); -FL_EXPORT void fl_scale(double x, double y); -FL_EXPORT void fl_scale(double x); -FL_EXPORT void fl_translate(double x, double y); -FL_EXPORT void fl_rotate(double d); -FL_EXPORT void fl_mult_matrix(double a, double b, double c, double d, double x,double y); +/** + Saves the current transformation matrix on the stack. + The maximum depth of the stack is 32. + */ +inline void fl_push_matrix() { fl_graphics_driver->push_matrix(); } +/** + Restores the current transformation matrix from the stack. + */ +inline void fl_pop_matrix() { fl_graphics_driver->pop_matrix(); } +/** + Concatenates scaling transformation onto the current one. + \param[in] x,y scale factors in x-direction and y-direction + */ +inline void fl_scale(double x, double y) { fl_graphics_driver->scale(x, y); } +/** + Concatenates scaling transformation onto the current one. + \param[in] x scale factor in both x-direction and y-direction + */ +inline void fl_scale(double x) { fl_graphics_driver->scale(x, x); } +/** + Concatenates translation transformation onto the current one. + \param[in] x,y translation factor in x-direction and y-direction + */ +inline void fl_translate(double x, double y) { fl_graphics_driver->translate(x, y); } +/** + Concatenates rotation transformation onto the current one. + \param[in] d - rotation angle, counter-clockwise in degrees (not radians) + */ +inline void fl_rotate(double d) { fl_graphics_driver->rotate(d); } +/** + Concatenates another transformation onto the current one. + + \param[in] a,b,c,d,x,y transformation matrix elements such that + X' = aX + cY + x and Y' = bX +dY + y + */ +inline void fl_mult_matrix(double a, double b, double c, double d, double x,double y) + { fl_graphics_driver->mult_matrix(a, b, c, d, x, y); } /** Starts drawing a list of points. Points are added to the list with fl_vertex() */ -inline void fl_begin_points() {fl_graphics_driver->begin_points(); }; +inline void fl_begin_points() {fl_graphics_driver->begin_points(); } /** Starts drawing a list of lines. */ -inline void fl_begin_line() {fl_graphics_driver->begin_line(); }; +inline void fl_begin_line() {fl_graphics_driver->begin_line(); } /** Starts drawing a closed sequence of lines. */ -inline void fl_begin_loop() {fl_graphics_driver->begin_loop(); }; +inline void fl_begin_loop() {fl_graphics_driver->begin_loop(); } /** Starts drawing a convex filled polygon. */ -inline void fl_begin_polygon() {fl_graphics_driver->begin_polygon(); }; +inline void fl_begin_polygon() {fl_graphics_driver->begin_polygon(); } /** Adds a single vertex to the current path. \param[in] x,y coordinate */ -inline void fl_vertex(double x, double y) {fl_graphics_driver->vertex(x,y); }; +inline void fl_vertex(double x, double y) {fl_graphics_driver->vertex(x,y); } /** - Add a series of points on a Bezier curve to the path. + Adds a series of points on a Bezier curve to the path. The curve ends (and two of the points) are at X0,Y0 and X3,Y3. \param[in] X0,Y0 curve start point \param[in] X1,Y1 curve control point @@ -362,16 +395,16 @@ inline void fl_vertex(double x, double y) {fl_graphics_driver->vertex(x,y); }; \param[in] X3,Y3 curve end point */ inline void fl_curve(double X0, double Y0, double X1, double Y1, double X2, double Y2, double X3, double Y3) - {fl_graphics_driver->curve(X0,Y0,X1,Y1,X2,Y2,X3,Y3); }; + {fl_graphics_driver->curve(X0,Y0,X1,Y1,X2,Y2,X3,Y3); } /** - Add a series of points to the current path on the arc of a circle; you - can get elliptical paths by using scale and rotate before calling fl_arc(). + Adds a series of points to the current path on the arc of a circle. + You can get elliptical paths by using scale and rotate before calling fl_arc(). \param[in] x,y,r center and radius of circular arc \param[in] start,end angles of start and end of arc measured in degrees counter-clockwise from 3 o'clock. If \p end is less than \p start then it draws the arc in a clockwise direction. */ -inline void fl_arc(double x, double y, double r, double start, double end) {fl_graphics_driver->arc(x,y,r,start,end); }; +inline void fl_arc(double x, double y, double r, double start, double end) {fl_graphics_driver->arc(x,y,r,start,end); } /** fl_circle() is equivalent to fl_arc(x,y,r,0,360), but may be faster. @@ -379,23 +412,23 @@ inline void fl_arc(double x, double y, double r, double start, double end) {fl_g a complex polygon you must use fl_arc() \param[in] x,y,r center and radius of circle */ -inline void fl_circle(double x, double y, double r) {fl_graphics_driver->circle(x,y,r); }; +inline void fl_circle(double x, double y, double r) {fl_graphics_driver->circle(x,y,r); } /** Ends list of points, and draws. */ -inline void fl_end_points() {fl_graphics_driver->end_points(); }; +inline void fl_end_points() {fl_graphics_driver->end_points(); } /** Ends list of lines, and draws. */ -inline void fl_end_line() {fl_graphics_driver->end_line(); }; +inline void fl_end_line() {fl_graphics_driver->end_line(); } /** Ends closed sequence of lines, and draws. */ -inline void fl_end_loop() {fl_graphics_driver->end_loop(); }; +inline void fl_end_loop() {fl_graphics_driver->end_loop(); } /** Ends convex filled polygon, and draws. */ -inline void fl_end_polygon() {fl_graphics_driver->end_polygon(); }; +inline void fl_end_polygon() {fl_graphics_driver->end_polygon(); } /** Starts drawing a complex filled polygon. @@ -410,28 +443,44 @@ inline void fl_end_polygon() {fl_graphics_driver->end_polygon(); }; whether "even/odd" or "non-zero" winding rules are used to fill them. Holes should be drawn in the opposite direction to the outside loop. */ -inline void fl_begin_complex_polygon() {fl_graphics_driver->begin_complex_polygon(); }; +inline void fl_begin_complex_polygon() {fl_graphics_driver->begin_complex_polygon(); } /** Call fl_gap() to separate loops of the path. It is unnecessary but harmless to call fl_gap() before the first vertex, after the last vertex, or several times in a row. */ -inline void fl_gap() {fl_graphics_driver->gap(); }; +inline void fl_gap() {fl_graphics_driver->gap(); } /** Ends complex filled polygon, and draws. */ -inline void fl_end_complex_polygon() {fl_graphics_driver->end_complex_polygon(); }; +inline void fl_end_complex_polygon() {fl_graphics_driver->end_complex_polygon(); } // get and use transformed positions: -FL_EXPORT double fl_transform_x(double x, double y); -FL_EXPORT double fl_transform_y(double x, double y); -FL_EXPORT double fl_transform_dx(double x, double y); -FL_EXPORT double fl_transform_dy(double x, double y); +/** + Transforms coordinate using the current transformation matrix. + \param[in] x,y coordinate + */ +inline double fl_transform_x(double x, double y) {return fl_graphics_driver->transform_x(x, y); } +/** + Transforms coordinate using the current transformation matrix. + \param[in] x,y coordinate + */ +inline double fl_transform_y(double x, double y) {return fl_graphics_driver->transform_y(x, y); } +/** + Transforms distance using current transformation matrix. + \param[in] x,y coordinate + */ +inline double fl_transform_dx(double x, double y) {return fl_graphics_driver->transform_dx(x, y); } +/** + Transforms distance using current transformation matrix. + \param[in] x,y coordinate + */ +inline double fl_transform_dy(double x, double y) {return fl_graphics_driver->transform_dy(x, y); } /** Adds coordinate pair to the vertex list without further transformations. \param[in] xf,yf transformed coordinate */ -inline void fl_transformed_vertex(double xf, double yf) {fl_graphics_driver->transformed_vertex(xf,yf); }; +inline void fl_transformed_vertex(double xf, double yf) {fl_graphics_driver->transformed_vertex(xf,yf); } /** @} */ /** \addtogroup fl_attributes @@ -448,81 +497,79 @@ inline void fl_transformed_vertex(double xf, double yf) {fl_graphics_driver->tra The size of the font is measured in pixels and not "points". Lines should be spaced \p size pixels apart or more. */ -inline void fl_font(Fl_Font face, Fl_Fontsize size) { fl_graphics_driver->font(face,size); }; -extern FL_EXPORT Fl_Font fl_font_; ///< current font index +inline void fl_font(Fl_Font face, Fl_Fontsize size) { fl_graphics_driver->font(face,size); } /** Returns the \p face set by the most recent call to fl_font(). This can be used to save/restore the font. */ -inline Fl_Font fl_font() {return fl_font_;} -/** \brief current font size */ -extern FL_EXPORT Fl_Fontsize fl_size_; +inline Fl_Font fl_font() {return fl_graphics_driver->font();} /** Returns the \p size set by the most recent call to fl_font(). This can be used to save/restore the font. */ -inline Fl_Fontsize fl_size() {return fl_size_;} +inline Fl_Fontsize fl_size() {return fl_graphics_driver->size();} // information you can get about the current font: /** Returns the recommended minimum line spacing for the current font. You can also use the value of \p size passed to fl_font() */ -FL_EXPORT int fl_height(); // using "size" should work ok +inline int fl_height() {return fl_graphics_driver->height();} FL_EXPORT int fl_height(int font, int size); /** Returns the recommended distance above the bottom of a fl_height() tall box to draw the text at so it looks centered vertically in that box. */ -FL_EXPORT int fl_descent(); -/** Return the typographical width of a nul-terminated string */ +inline int fl_descent() {return fl_graphics_driver->descent();} +/** Returns the typographical width of a nul-terminated string */ FL_EXPORT double fl_width(const char* txt); -/** Return the typographical width of a sequence of \p n characters */ -FL_EXPORT double fl_width(const char* txt, int n); -/** Return the typographical width of a single character : +/** Returns the typographical width of a sequence of \p n characters */ +inline double fl_width(const char* txt, int n) {return fl_graphics_driver->width(txt, n);} +/** Returns the typographical width of a single character. \note if a valid fl_gc is NOT found then it uses the first window gc, or the screen gc if no fltk window is available when called. */ -FL_EXPORT double fl_width(unsigned int); -/** Determine the minimum pixel dimensions of a nul-terminated string. +inline double fl_width(unsigned int c) {return fl_graphics_driver->width(c);} +/** Determines the minimum pixel dimensions of a nul-terminated string. -Usage: given a string "txt" drawn using fl_draw(txt, x, y) you would determine -its pixel extents on the display using fl_text_extents(txt, dx, dy, wo, ho) -such that a bounding box that exactly fits around the text could be drawn with -fl_rect(x+dx, y+dy, wo, ho). Note the dx, dy values hold the offset of the first -"colored in" pixel of the string, from the draw origin. + Usage: given a string "txt" drawn using fl_draw(txt, x, y) you would determine + its pixel extents on the display using fl_text_extents(txt, dx, dy, wo, ho) + such that a bounding box that exactly fits around the text could be drawn with + fl_rect(x+dx, y+dy, wo, ho). Note the dx, dy values hold the offset of the first + "colored in" pixel of the string, from the draw origin. */ FL_EXPORT void fl_text_extents(const char*, int& dx, int& dy, int& w, int& h); // NO fltk symbol expansion will be performed -/** Determine the minimum pixel dimensions of a sequence of \p n characters. +/** Determines the minimum pixel dimensions of a sequence of \p n characters. \see fl_text_extents(const char*, int& dx, int& dy, int& w, int& h) */ -FL_EXPORT void fl_text_extents(const char*, int n, int& dx, int& dy, int& w, int& h); +inline void fl_text_extents(const char *t, int n, int& dx, int& dy, int& w, int& h) + {fl_graphics_driver->text_extents(t, n, dx, dy, w, h);} // font encoding: // Note: doxygen comments here to avoid duplication for os-sepecific cases /** - convert text from Windows/X11 latin1 charcter set to local encoding. + Converts text from Windows/X11 latin1 character set to local encoding. \param[in] t character string (latin1 encoding) \param[in] n optional number of characters to convert (default is all) \returns pointer to internal buffer containing converted characters */ FL_EXPORT const char *fl_latin1_to_local(const char *t, int n=-1); /** - convert text from local encoding to Windowx/X11 latin1 character set. + Converts text from local encoding to Windowx/X11 latin1 character set. \param[in] t character string (local encoding) \param[in] n optional number of characters to convert (default is all) \returns pointer to internal buffer containing converted characters */ FL_EXPORT const char *fl_local_to_latin1(const char *t, int n=-1); /** - convert text from Mac Roman charcter set to local encoding. + Converts text from Mac Roman character set to local encoding. \param[in] t character string (Mac Roman encoding) \param[in] n optional number of characters to convert (default is all) \returns pointer to internal buffer containing converted characters */ FL_EXPORT const char *fl_mac_roman_to_local(const char *t, int n=-1); /** - convert text from local encoding to Mac Roman character set. + Converts text from local encoding to Mac Roman character set. \param[in] t character string (local encoding) \param[in] n optional number of characters to convert (default is all) \returns pointer to internal buffer containing converted characters @@ -545,7 +592,7 @@ FL_EXPORT const char *fl_local_to_mac_roman(const char *t, int n=-1); FL_EXPORT void fl_draw(const char* str, int x, int y); /** Draws a nul-terminated string starting at the given location and - rotating \p angle degrees counterclockwise. + rotating \p angle degrees counter-clockwise. This version of fl_draw provides direct access to the text drawing function of the underlying OS and is supported by Xft, Win32 and MacOS fltk subsets. @@ -554,16 +601,16 @@ FL_EXPORT void fl_draw(int angle, const char* str, int x, int y); /** Draws an array of \p n characters starting at the given location. */ -inline void fl_draw(const char* str, int n, int x, int y) {fl_graphics_driver->draw(str,n,x,y); }; +inline void fl_draw(const char* str, int n, int x, int y) {fl_graphics_driver->draw(str,n,x,y); } /** Draws an array of \p n characters starting at the given location, - rotating \p angle degrees counterclockwise. + rotating \p angle degrees counter-clockwise. */ -inline void fl_draw(int angle,const char* str, int n, int x, int y) {fl_graphics_driver->draw(angle,str,n,x,y); }; +inline void fl_draw(int angle,const char* str, int n, int x, int y) {fl_graphics_driver->draw(angle,str,n,x,y); } /** Draws an array of \p n characters right to left starting at given location. */ -inline void fl_rtl_draw(const char* str, int n, int x, int y) {fl_graphics_driver->rtl_draw(str,n,x,y); }; +inline void fl_rtl_draw(const char* str, int n, int x, int y) {fl_graphics_driver->rtl_draw(str,n,x,y); } FL_EXPORT void fl_measure(const char* str, int& x, int& y, int draw_symbols = 1); FL_EXPORT void fl_draw(const char* str, int x, int y, int w, int h, @@ -582,13 +629,14 @@ FL_EXPORT void fl_draw_box(Fl_Boxtype, int x, int y, int w, int h, Fl_Color); // images: /** - Draw an 8-bit per color RGB or luminance image. + Draws an 8-bit per color RGB or luminance image. \param[in] buf points at the "r" data of the top-left pixel. Color data must be in r,g,b order. + Luminance data is only one gray byte. \param[in] X,Y position where to put top-left corner of image \param[in] W,H size of the image - \param[in] D delta to add to the pointer between pixels. it may be - any value greater than or equal to 3, or it can be + \param[in] D delta to add to the pointer between pixels. It may be + any value greater than or equal to 1, or it can be negative to flip the image horizontally \param[in] L delta to add to the pointer between lines (if 0 is passed it uses \p W * \p D), and may be larger than @@ -601,6 +649,7 @@ FL_EXPORT void fl_draw_box(Fl_Boxtype, int x, int y, int w, int h, Fl_Color); \code Fl::visual(FL_RGB); \endcode + Gray scale (1-channel) images may be drawn. This is done if abs(D) is less than 3, or by calling fl_draw_image_mono(). Only one 8-bit sample is used for each pixel, and on screens with @@ -615,31 +664,32 @@ FL_EXPORT void fl_draw_box(Fl_Boxtype, int x, int y, int w, int h, Fl_Color); to 32 bits. */ inline void fl_draw_image(const uchar* buf, int X,int Y,int W,int H, int D=3, int L=0) - { fl_graphics_driver->draw_image(buf, X, Y, W, H, D, L); }; + { fl_graphics_driver->draw_image(buf, X, Y, W, H, D, L); } /** - Draw a gray-scale (1 channel) image. + Draws a gray-scale (1 channel) image. \see fl_draw_image(const uchar* buf, int X,int Y,int W,int H, int D, int L) */ inline void fl_draw_image_mono(const uchar* buf, int X,int Y,int W,int H, int D=1, int L=0) - { fl_graphics_driver->draw_image_mono(buf, X, Y, W, H, D, L); }; + { fl_graphics_driver->draw_image_mono(buf, X, Y, W, H, D, L); } /** - Draw image using callback function to generate image data. + Draws an image using a callback function to generate image data. + You can generate the image as it is being drawn, or do arbitrary decompression of stored data, provided it can be decompressed to individual scan lines easily. \param[in] cb callback function to generate scan line data \param[in] data user data passed to callback function - \param[in] X,Y - \param[in] W,H - \param[in] D + \param[in] X,Y screen position of top left pixel + \param[in] W,H image width and height + \param[in] D data size in bytes (must be greater than 0) \see fl_draw_image(const uchar* buf, int X,int Y,int W,int H, int D, int L) The callback function \p cb is called with the void* \p data user data pointer to allow access to a structure of information about the image, and the \p x, \p y, and \p w of the scan line desired from - the image. 0,0 is the upper-left corner of the image, not \p X, \p Y. + the image. 0,0 is the upper-left corner of the image, not \p x, \p y. A pointer to a buffer to put the data into is passed. You must copy \p w pixels from scanline \p y, starting at pixel \p x, to this buffer. @@ -657,10 +707,10 @@ inline void fl_draw_image_mono(const uchar* buf, int X,int Y,int W,int H, int D= If \p D is 4 or more, you must fill in the unused bytes with zero. */ inline void fl_draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=3) - { fl_graphics_driver->draw_image(cb, data, X, Y, W, H, D); }; + { fl_graphics_driver->draw_image(cb, data, X, Y, W, H, D); } /** - Draw gray-scale image using callback function to generate image data. + Draws a gray-scale image using a callback function to generate image data. \see fl_draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D) */ FL_EXPORT void fl_draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D=1); @@ -674,17 +724,17 @@ FL_EXPORT void fl_draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int X,int Y,i FL_EXPORT char fl_can_do_alpha_blending(); /** - Read an RGB(A) image from the current window or off-screen buffer. + Reads an RGB(A) image from the current window or off-screen buffer. \param[in] p pixel buffer, or NULL to allocate one \param[in] X,Y position of top-left of image to read \param[in] W,H width and height of image to read - \param[in] alpha alpha value for image (0 fr none) + \param[in] alpha alpha value for image (0 for none) \returns pointer to pixel buffer, or NULL if allocation failed. The \p p argument points to a buffer that can hold the image and must be at least \p W*H*3 bytes when reading RGB images, or \p W*H*4 bytes when reading RGBA images. If NULL, fl_read_image() will create an - array of the proper suze which can be freed using delete[]. + array of the proper size which can be freed using delete[]. The \p alpha parameter controls whether an alpha channel is created and the value that is placed in the alpha channel. If 0, no alpha @@ -730,5 +780,5 @@ FL_EXPORT int fl_add_symbol(const char* name, void (*drawit)(Fl_Color), int scal #endif // -// End of "$Id: fl_draw.H 7659 2010-07-01 13:21:32Z manolo $". +// End of "$Id: fl_draw.H 8772 2011-06-02 08:06:09Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/FL/fl_message.H b/plugins/zynaddsubfx/fltk/FL/fl_message.H index bb64474e1..d07949e90 100644 --- a/plugins/zynaddsubfx/fltk/FL/fl_message.H +++ b/plugins/zynaddsubfx/fltk/FL/fl_message.H @@ -1,9 +1,9 @@ // -// "$Id: fl_message.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: fl_message.H 7903 2010-11-28 21:06:39Z matt $" // // Standard message header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -28,5 +28,5 @@ #include "fl_ask.H" // -// End of "$Id: fl_message.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: fl_message.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/fl_show_colormap.H b/plugins/zynaddsubfx/fltk/FL/fl_show_colormap.H index f72fc5176..762a3b4c3 100644 --- a/plugins/zynaddsubfx/fltk/FL/fl_show_colormap.H +++ b/plugins/zynaddsubfx/fltk/FL/fl_show_colormap.H @@ -1,9 +1,9 @@ // -// "$Id: fl_show_colormap.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: fl_show_colormap.H 8621 2011-04-23 15:46:30Z AlbrechtS $" // // Colormap picker header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -25,13 +25,34 @@ // http://www.fltk.org/str.php // +/** \file + The fl_show_colormap() function hides the implementation classes used + to provide the popup window and color selection mechanism. +*/ + #ifndef fl_show_colormap_H #define fl_show_colormap_H +/* doxygen comment here to avoid exposing ColorMenu in fl_show_colormap.cxx +*/ + +/** \addtogroup fl_attributes + @{ */ + +/** + \brief Pops up a window to let the user pick a colormap entry. + \image html fl_show_colormap.png + \image latex fl_show_colormap.png "fl_show_colormap" height=10cm + \param[in] oldcol color to be highlighted when grid is shown. + \retval Fl_Color value of the chosen colormap entry. + \see Fl_Color_Chooser +*/ FL_EXPORT Fl_Color fl_show_colormap(Fl_Color oldcol); +/** @} */ + #endif // -// End of "$Id: fl_show_colormap.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: fl_show_colormap.H 8621 2011-04-23 15:46:30Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/fl_show_input.H b/plugins/zynaddsubfx/fltk/FL/fl_show_input.H index 268c3d168..2d931a417 100644 --- a/plugins/zynaddsubfx/fltk/FL/fl_show_input.H +++ b/plugins/zynaddsubfx/fltk/FL/fl_show_input.H @@ -1,9 +1,9 @@ // -// "$Id: fl_show_input.H 6614 2009-01-01 16:11:32Z matt $" +// "$Id: fl_show_input.H 7903 2010-11-28 21:06:39Z matt $" // // Standard input dialog header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -28,5 +28,5 @@ #include "fl_ask.H" // -// End of "$Id: fl_show_input.H 6614 2009-01-01 16:11:32Z matt $". +// End of "$Id: fl_show_input.H 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/fl_types.h b/plugins/zynaddsubfx/fltk/FL/fl_types.h index 6175ded02..c019821a2 100644 --- a/plugins/zynaddsubfx/fltk/FL/fl_types.h +++ b/plugins/zynaddsubfx/fltk/FL/fl_types.h @@ -1,9 +1,9 @@ /* - * "$Id: fl_types.h 6942 2009-11-18 12:22:51Z AlbrechtS $" + * "$Id: fl_types.h 7903 2010-11-28 21:06:39Z matt $" * * Simple "C"-style types for the Fast Light Tool Kit (FLTK). * - * Copyright 1998-2009 by Bill Spitzak and others. + * Copyright 1998-2010 by Bill Spitzak and others. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -62,5 +62,5 @@ typedef unsigned int Fl_Char; #endif /* - * End of "$Id: fl_types.h 6942 2009-11-18 12:22:51Z AlbrechtS $". + * End of "$Id: fl_types.h 7903 2010-11-28 21:06:39Z matt $". */ diff --git a/plugins/zynaddsubfx/fltk/FL/fl_utf8.h b/plugins/zynaddsubfx/fltk/FL/fl_utf8.h index 767a2a3a3..311683ebb 100644 --- a/plugins/zynaddsubfx/fltk/FL/fl_utf8.h +++ b/plugins/zynaddsubfx/fltk/FL/fl_utf8.h @@ -1,7 +1,7 @@ -/* "$Id: fl_utf8.h 7551 2010-04-20 21:43:31Z engelsman $" +/* "$Id: fl_utf8.h 8585 2011-04-13 15:43:22Z ianmacarthur $" * * Author: Jean-Marc Lienher ( http://oksid.ch ) - * Copyright 2000-2009 by O'ksi'D. + * Copyright 2000-2010 by O'ksi'D. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -28,8 +28,6 @@ * with the functions provided in OksiD's fltk-1.1.6-utf8 port */ -/*** NOTE : all functions are LIMITED to 24 bits Unicode values !!! ***/ - /** \file fl_utf8.h \brief header for Unicode and UTF8 chracter handling @@ -100,6 +98,9 @@ FL_EXPORT int fl_utf8bytes(unsigned ucs); /* OD: returns the byte length of the first UTF-8 char sequence (returns -1 if not valid) */ FL_EXPORT int fl_utf8len(char c); +/* OD: returns the byte length of the first UTF-8 char sequence (returns +1 if not valid) */ +FL_EXPORT int fl_utf8len1(char c); + /* OD: returns the number of Unicode chars in the UTF-8 string */ FL_EXPORT int fl_utf_nb_char(const unsigned char *buf, int len); @@ -115,6 +116,9 @@ FL_EXPORT const char* fl_utf8fwd(const char* p, const char* start, const char* e /* F2: Move backward to the previous valid UTF8 sequence start */ FL_EXPORT const char* fl_utf8back(const char* p, const char* start, const char* end); +/* XX: Convert a single 32-bit Unicode value into UTF16 */ +FL_EXPORT unsigned fl_ucs_to_Utf16(const unsigned ucs, unsigned short *dst, const unsigned dstlen); + /* F2: Convert a UTF8 string into UTF16 */ FL_EXPORT unsigned fl_utf8toUtf16(const char* src, unsigned srclen, unsigned short* dst, unsigned dstlen); @@ -255,5 +259,5 @@ FL_EXPORT char fl_make_path( const char *path ); #endif /* _HAVE_FL_UTF8_HDR_ */ /* - * End of "$Id: fl_utf8.h 7551 2010-04-20 21:43:31Z engelsman $". + * End of "$Id: fl_utf8.h 8585 2011-04-13 15:43:22Z ianmacarthur $". */ diff --git a/plugins/zynaddsubfx/fltk/FL/mac.H b/plugins/zynaddsubfx/fltk/FL/mac.H index aa8e6fb31..704f521d8 100644 --- a/plugins/zynaddsubfx/fltk/FL/mac.H +++ b/plugins/zynaddsubfx/fltk/FL/mac.H @@ -1,9 +1,9 @@ // -// "$Id: mac.H 7663 2010-07-01 16:51:28Z manolo $" +// "$Id: mac.H 8657 2011-05-12 11:50:43Z manolo $" // // Mac header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -33,11 +33,13 @@ #if !defined(Fl_X_H) # error "Never use directly; include instead." #endif // !Fl_X_H +#include -// Standard MacOS Carbon API includes... -#include -#include +typedef void* Window; // this is really a pointer to the subclass FLWindow of NSWindow +typedef void* Fl_Offscreen; // this is really a CGContextRef +typedef void* Fl_Bitmask; // this is really a CGImageRef +#include #ifndef MAC_OS_X_VERSION_10_3 #define MAC_OS_X_VERSION_10_3 1030 #endif @@ -50,10 +52,36 @@ #ifndef MAC_OS_X_VERSION_10_6 #define MAC_OS_X_VERSION_10_6 1060 #endif -#ifndef MAC_OS_X_VERSION_MAX_ALLOWED -#define MAC_OS_X_VERSION_MAX_ALLOWED MAC_OS_X_VERSION_10_3 -#endif +#if !(defined(FL_LIBRARY) || defined(FL_INTERNALS)) // this part is used when compiling an application program + +typedef void* Fl_Region; +typedef void* Fl_CGContextRef; +typedef void* Fl_PMPrintSettings; +typedef void* Fl_PMPageFormat; +typedef void* Fl_PMPrintSession; + +#else // this part must be compiled when building the FLTK libraries + +// Standard MacOS C/C++ includes... +#include +#undef check // because of Fl::check() + +typedef CGContextRef Fl_CGContextRef; +typedef PMPrintSettings Fl_PMPrintSettings; +typedef PMPageFormat Fl_PMPageFormat; +typedef PMPrintSession Fl_PMPrintSession; + +typedef struct flCocoaRegion { + int count; + CGRect *rects; +} *Fl_Region; // a region is the union of a series of rectangles + +# include "Fl_Window.H" + +// Some random X equivalents +struct XPoint { int x, y; }; +struct XRectangle {int x, y, width, height;}; #ifndef CGFLOAT_DEFINED //appears with 10.5 in CGBase.h #if defined(__LP64__) && __LP64__ typedef double CGFloat; @@ -62,21 +90,7 @@ typedef float CGFloat; #endif #endif // CGFLOAT_DEFINED - -// Now make some fixes to the headers... -#undef check // Dunno where this comes from... - -// Some random X equivalents -struct XPoint { int x, y; }; -struct XRectangle {int x, y, width, height;}; - -typedef void *Window; // this is really a pter to the subclass FLWindow of NSWindow -typedef struct flCocoaRegion { - int count; - CGRect *rects; -} *Fl_Region; // a region is the union of a series of rectangles extern CGRect fl_cgrectmake_cocoa(int x, int y, int w, int h); - inline Fl_Region XRectangleRegion(int x, int y, int w, int h) { Fl_Region R = (Fl_Region)malloc(sizeof(*R)); R->count = 1; @@ -86,33 +100,27 @@ inline Fl_Region XRectangleRegion(int x, int y, int w, int h) { } inline void XDestroyRegion(Fl_Region r) { if(r) { - free(r->rects); - free(r); - } + free(r->rects); + free(r); + } } -extern void *fl_default_cursor; extern void *fl_system_menu; -typedef CGContextRef Fl_Offscreen; -typedef CGImageRef Fl_Bitmask; - -void fl_clip_region(Fl_Region); - -# include "Fl_Window.H" +extern void *fl_default_cursor; // This object contains all mac-specific stuff about a window: // WARNING: this object is highly subject to change! -class Fl_X -{ +class Fl_X { + public: - Window xid; // Cocoa: FLWindow* ; Carbon: WindowRef - Fl_Offscreen other_xid; // pointer for offscreen bitmaps (doublebuffer) + Window xid; // pointer to the Cocoa window object (FLWindow*) + Fl_Offscreen other_xid; // pointer for offscreen bitmaps (overlay window) Fl_Window *w; // FLTK window for Fl_Region region; Fl_Region subRegion; // region for this specific subwindow Fl_X *next; // linked tree to support subwindows Fl_X *xidChildren, *xidNext; // more subwindow tree int wait_for_expose; - void *cursor; // is really NSCursor* + void *cursor; // is really NSCursor* static Fl_X* first; static Fl_X* i(const Fl_Window* w) {return w->i;} static int fake_X_wm(const Fl_Window*,int&,int&,int&,int&,int&); @@ -125,60 +133,69 @@ public: static void q_release_context(Fl_X *x=0); // free all resources associated with fl_gc static void q_begin_image(CGRect&, int x, int y, int w, int h); static void q_end_image(); + // Cocoa additions + void destroy(void); + void map(void); + void unmap(void); + int unlink(Fl_X* start = NULL); + void collapse(void); + WindowRef window_ref(void); + void set_key_window(void); + void set_cursor(Fl_Cursor); + static CGImageRef CGImage_from_window_rect(Fl_Window *win, int x, int y, int w, int h); + static unsigned char *bitmap_from_window_rect(Fl_Window *win, int x, int y, int w, int h, int *bytesPerPixel); + static Fl_Region intersect_region_and_rect(Fl_Region current, int x,int y,int w, int h); + static CGContextRef watch_cursor_image(void); + static CGContextRef help_cursor_image(void); + static CGContextRef nesw_cursor_image(void); + static CGContextRef nwse_cursor_image(void); + static CGContextRef none_cursor_image(void); + static void *get_carbon_function(const char *name); +private: + static void relink(Fl_Window*, Fl_Window*); + bool subwindow; }; -extern void MacDestroyWindow(Fl_Window*,void *); -extern void MacMapWindow(Fl_Window*,void *); -extern void MacUnmapWindow(Fl_Window*,void *); -extern WindowRef MACwindowRef(Fl_Window *w); -extern Fl_Region MacRectRegionIntersect(Fl_Region current, int x,int y,int w, int h); -extern void MacCollapseWindow(Window w); - -extern int MacUnlinkWindow(Fl_X*,Fl_X*start=0L); - -inline Window fl_xid(const Fl_Window*w) -{ - return Fl_X::i(w)->xid; -} - extern struct Fl_XMap { RGBColor rgb; ulong pen; } *fl_current_xmap; - -extern FL_EXPORT void *fl_display; extern FL_EXPORT Window fl_window; -extern FL_EXPORT CGContextRef fl_gc; + +#endif // FL_LIBRARY || FL_INTERNALS + +extern FL_EXPORT Fl_CGContextRef fl_gc; extern FL_EXPORT class Fl_Sys_Menu_Bar *fl_sys_menu_bar; +extern Window fl_xid(const Fl_Window*); +void fl_clip_region(Fl_Region); +extern FL_EXPORT Fl_Bitmask fl_create_bitmask(int w, int h, const uchar *data); +extern FL_EXPORT Fl_Bitmask fl_create_alphamask(int w, int h, int d, int ld, const uchar *data); +extern FL_EXPORT void fl_delete_bitmask(Fl_Bitmask bm); extern Fl_Offscreen fl_create_offscreen(int w, int h); extern void fl_copy_offscreen(int x,int y,int w,int h, Fl_Offscreen gWorld, int srcx,int srcy); extern void fl_delete_offscreen(Fl_Offscreen gWorld); extern void fl_begin_offscreen(Fl_Offscreen gWorld); extern void fl_end_offscreen(); - -extern FL_EXPORT Fl_Bitmask fl_create_bitmask(int w, int h, const uchar *data); -extern FL_EXPORT Fl_Bitmask fl_create_alphamask(int w, int h, int d, int ld, const uchar *data); -extern FL_EXPORT void fl_delete_bitmask(Fl_Bitmask bm); - +extern FL_EXPORT int fl_parse_color(const char* p, uchar& r, uchar& g, uchar& b); extern void fl_open_display(); -extern FL_EXPORT int fl_parse_color(const char* p, uchar& r, uchar& g, uchar& b); #endif // FL_DOXYGEN -/** \defgroup group_macosx Mac OS X-specific functions +/** \defgroup group_macosx Mac OS X-specific symbols + Mac OS X-specific symbols declared in or @{ */ -/** @brief Register a function called for each file dropped onto an application icon - * \note \#include +/** @brief Register a function called for each file dropped onto an application icon. + \e cb will be called with a single Unix-style file name and path. + If multiple files were dropped, \e cb will be called multiple times. */ extern void fl_open_callback(void (*cb)(const char *)); /** * \brief Attaches a callback to the "About myprog" item of the system application menu. - * \note \#include * * \param cb a callback that will be called by "About myprog" menu item * with NULL 1st argument. @@ -186,9 +203,35 @@ extern void fl_open_callback(void (*cb)(const char *)); * \param shortcut optional shortcut to attach to the "About myprog" menu item (e.g., FL_META+'a') */ extern void fl_mac_set_about( Fl_Callback *cb, void *user_data, int shortcut = 0); + +/** \brief The version number of the running Mac OS X (e.g., 100604 for 10.6.4) + */ +extern int fl_mac_os_version; + +class Fl_Mac_App_Menu { +public: + /** Localizable text for the "About xxx" application menu item */ + static const char *about; + /** Localizable text for the "Print Front Window" application menu item. + This menu item won't be displayed if Fl_Mac_App_Menu::print + is set to an empty string. + */ + static const char *print; + /** Localizable text for the "Services" application menu item */ + static const char *services; + /** Localizable text for the "Hide xxx" application menu item */ + static const char *hide; + /** Localizable text for the "Hide Others" application menu item */ + static const char *hide_others; + /** Localizable text for the "Show All" application menu item */ + static const char *show; + /** Localizable text for the "Quit xxx" application menu item */ + static const char *quit; +}; + /** @} */ // -// End of "$Id: mac.H 7663 2010-07-01 16:51:28Z manolo $". +// End of "$Id: mac.H 8657 2011-05-12 11:50:43Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/FL/math.h b/plugins/zynaddsubfx/fltk/FL/math.h index bb7fad393..e0f1d4058 100644 --- a/plugins/zynaddsubfx/fltk/FL/math.h +++ b/plugins/zynaddsubfx/fltk/FL/math.h @@ -1,9 +1,9 @@ // -// "$Id: math.h 7504 2010-04-14 20:17:44Z matt $" +// "$Id: math.h 7903 2010-11-28 21:06:39Z matt $" // // Math header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -67,5 +67,5 @@ inline double copysign(double a, double b) {return b<0 ? -a : a;} // -// End of "$Id: math.h 7504 2010-04-14 20:17:44Z matt $". +// End of "$Id: math.h 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/names.h b/plugins/zynaddsubfx/fltk/FL/names.h index 85f1bc02a..952acc028 100644 --- a/plugins/zynaddsubfx/fltk/FL/names.h +++ b/plugins/zynaddsubfx/fltk/FL/names.h @@ -1,9 +1,9 @@ // -// "$Id: names.h 7159 2010-02-26 18:10:54Z greg.ercolano $" +// "$Id: names.h 7903 2010-11-28 21:06:39Z matt $" // // Event names header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -119,5 +119,5 @@ const char * const fl_fontnames[] = #endif /* FL_NAMES_H */ // -// End of "$Id: names.h 7159 2010-02-26 18:10:54Z greg.ercolano $". +// End of "$Id: names.h 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/FL/win32.H b/plugins/zynaddsubfx/fltk/FL/win32.H index 46a9ceb57..2150505a1 100644 --- a/plugins/zynaddsubfx/fltk/FL/win32.H +++ b/plugins/zynaddsubfx/fltk/FL/win32.H @@ -1,9 +1,9 @@ // -// "$Id: win32.H 7671 2010-07-09 17:31:33Z manolo $" +// "$Id: win32.H 8726 2011-05-23 18:32:47Z AlbrechtS $" // // WIN32 header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -35,6 +35,15 @@ #endif // !Fl_X_H #include +typedef HRGN Fl_Region; +typedef HWND Window; +typedef POINT XPoint; + +#include + +// this part is included only when compiling the FLTK library or if requested explicitly +#if defined(FL_LIBRARY) || defined(FL_INTERNALS) + // In some of the distributions, the gcc header files are missing some stuff: #ifndef LPMINMAXINFO #define LPMINMAXINFO MINMAXINFO* @@ -45,14 +54,8 @@ #define VK_APPS 0x5D #endif -#include - // some random X equivalents -typedef HWND Window; -typedef POINT XPoint; struct XRectangle {int x, y, width, height;}; -typedef HRGN Fl_Region; -FL_EXPORT void fl_clip_region(Fl_Region); extern Fl_Region XRectangleRegion(int x, int y, int w, int h); inline void XDestroyRegion(Fl_Region r) {DeleteObject(r);} inline void XClipBox(Fl_Region r,XRectangle* rect) { @@ -66,7 +69,6 @@ inline void XClipBox(Fl_Region r,XRectangle* rect) { #define XMapWindow(a,b) ShowWindow(b, SW_RESTORE) #define XUnmapWindow(a,b) ShowWindow(b, SW_HIDE) -#include "Fl_Window.H" // this object contains all win32-specific stuff about a window: // Warning: this object is highly subject to change! class FL_EXPORT Fl_X { @@ -94,10 +96,21 @@ public: }; extern FL_EXPORT HCURSOR fl_default_cursor; extern FL_EXPORT UINT fl_wake_msg; -inline Window fl_xid(const Fl_Window*w) {Fl_X *temp = Fl_X::i(w); return temp ? temp->xid : 0;} -FL_EXPORT Fl_Window* fl_find(Window xid); extern FL_EXPORT char fl_override_redirect; // hack into Fl_Window::make_xid() extern FL_EXPORT int fl_background_pixel; // hack into Fl_Window::make_xid() +extern FL_EXPORT HPALETTE fl_palette; // non-zero only on 8-bit displays! +extern FL_EXPORT void fl_release_dc(HWND w, HDC dc); +extern FL_EXPORT void fl_save_dc( HWND w, HDC dc); + +inline Window fl_xid(const Fl_Window* w) { Fl_X *temp = Fl_X::i(w); return temp ? temp->xid : 0; } + +#else +FL_EXPORT Window fl_xid_(const Fl_Window* w); +#define fl_xid(w) fl_xid_(w) +#endif // FL_LIBRARY || FL_INTERNALS + +FL_EXPORT Fl_Window* fl_find(Window xid); +void fl_clip_region(Fl_Region); // most recent fl_color() or fl_rgbcolor() points at one of these: extern FL_EXPORT struct Fl_XMap { @@ -113,31 +126,27 @@ FL_EXPORT HBRUSH fl_brush_action(int); // now does the real work extern FL_EXPORT HINSTANCE fl_display; extern FL_EXPORT Window fl_window; extern FL_EXPORT HDC fl_gc; -extern FL_EXPORT HPALETTE fl_palette; // non-zero only on 8-bit displays! -extern FL_EXPORT HDC fl_GetDC(Window); extern FL_EXPORT MSG fl_msg; -extern FL_EXPORT void fl_release_dc(HWND w, HDC dc); -extern FL_EXPORT void fl_save_dc( HWND w, HDC dc); +extern FL_EXPORT HDC fl_GetDC(Window); +extern FL_EXPORT HDC fl_makeDC(HBITMAP); // off-screen pixmaps: create, destroy, draw into, copy to window typedef HBITMAP Fl_Offscreen; #define fl_create_offscreen(w, h) \ CreateCompatibleBitmap( (fl_gc ? fl_gc : fl_GetDC(0) ) , w, h) -extern FL_EXPORT HDC fl_makeDC(HBITMAP); - # define fl_begin_offscreen(b) \ HDC _sgc=fl_gc; Window _sw=fl_window; \ - Fl_Surface_Device *_ss = fl_surface; fl_display_device->set_current(); \ + Fl_Surface_Device *_ss = Fl_Surface_Device::surface(); Fl_Display_Device::display_device()->set_current(); \ fl_gc=fl_makeDC(b); int _savedc = SaveDC(fl_gc); fl_window=(HWND)b; fl_push_no_clip() # define fl_end_offscreen() \ fl_pop_clip(); RestoreDC(fl_gc, _savedc); DeleteDC(fl_gc); _ss->set_current(); fl_window=_sw; fl_gc = _sgc - + FL_EXPORT void fl_copy_offscreen(int x,int y,int w,int h,HBITMAP pixmap,int srcx,int srcy); FL_EXPORT void fl_copy_offscreen_with_alpha(int x,int y,int w,int h,HBITMAP pixmap,int srcx,int srcy); -#define fl_delete_offscreen(bitmap) DeleteObject(bitmap); +#define fl_delete_offscreen(bitmap) DeleteObject(bitmap) // Bitmap masks typedef HBITMAP Fl_Bitmask; @@ -152,5 +161,5 @@ inline void fl_open_callback(void (*)(const char *)) {} extern FL_EXPORT int fl_parse_color(const char* p, uchar& r, uchar& g, uchar& b); #endif // FL_DOXYGEN // -// End of "$Id: win32.H 7671 2010-07-09 17:31:33Z manolo $". +// End of "$Id: win32.H 8726 2011-05-23 18:32:47Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/FL/x.H b/plugins/zynaddsubfx/fltk/FL/x.H index 754fe5e4a..002e429f9 100644 --- a/plugins/zynaddsubfx/fltk/FL/x.H +++ b/plugins/zynaddsubfx/fltk/FL/x.H @@ -1,9 +1,9 @@ // -// "$Id: x.H 7671 2010-07-09 17:31:33Z manolo $" +// "$Id: x.H 8706 2011-05-21 10:05:19Z AlbrechtS $" // // X11 header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -30,6 +30,17 @@ // need to call Xlib directly. These symbols may not exist on non-X // systems. +/** \class Fl_Mac_App_Menu + Mac OS-specific class allowing to localize the application menu. + + These character strings are used to build the application menu. They can be localized + at run time to any UTF-8 text by placing instructions such as this \e very + early in the program: + \verbatim + Fl_Mac_App_Menu::print = "Imprimer la fenêtre"; + \endverbatim +*/ + #if !defined(Fl_X_H) && !defined(FL_DOXYGEN) # define Fl_X_H @@ -60,46 +71,18 @@ FL_EXPORT void fl_close_display(); // constant info about the X server connection: extern FL_EXPORT Display *fl_display; -extern FL_EXPORT Window fl_message_window; extern FL_EXPORT int fl_screen; extern FL_EXPORT XVisualInfo *fl_visual; extern FL_EXPORT Colormap fl_colormap; -// access to core fonts: -// This class provides a "smart pointer" that returns a pointer to an XFontStruct. -// The global variable fl_xfont can be called wherever a bitmap "core" font is -// needed, e.g. when rendering to a GL context under X11. -// With Xlib / X11 fonts, fl_xfont will return the current selected font. -// With XFT / X11 fonts, fl_xfont will attempt to return the bitmap "core" font most -// similar to (usually the same as) the current XFT font. -class Fl_XFont_On_Demand -{ -public: - Fl_XFont_On_Demand(XFontStruct* p = NULL) : ptr(p) { } - Fl_XFont_On_Demand& operator=(const Fl_XFont_On_Demand& x) - { ptr = x.ptr; return *this; } - Fl_XFont_On_Demand& operator=(XFontStruct* p) - { ptr = p; return *this; } - XFontStruct* value(); - operator XFontStruct*() { return value(); } - XFontStruct& operator*() { return *value(); } - XFontStruct* operator->() { return value(); } - bool operator==(const Fl_XFont_On_Demand& x) { return ptr == x.ptr; } - bool operator!=(const Fl_XFont_On_Demand& x) { return ptr != x.ptr; } -private: - XFontStruct *ptr; -}; -extern FL_EXPORT Fl_XFont_On_Demand fl_xfont; // drawing functions: extern FL_EXPORT GC fl_gc; extern FL_EXPORT Window fl_window; -extern FL_EXPORT void *fl_xftfont; FL_EXPORT ulong fl_xpixel(Fl_Color i); FL_EXPORT ulong fl_xpixel(uchar r, uchar g, uchar b); FL_EXPORT void fl_clip_region(Fl_Region); FL_EXPORT Fl_Region fl_clip_region(); -FL_EXPORT Fl_Region XRectangleRegion(int x, int y, int w, int h); // in fl_rect.cxx // feed events into fltk: FL_EXPORT int fl_handle(const XEvent&); @@ -112,13 +95,13 @@ extern FL_EXPORT ulong fl_event_time; typedef ulong Fl_Offscreen; # define fl_create_offscreen(w,h) \ XCreatePixmap(fl_display, \ - (fl_surface->type() == Fl_Display_Device::device_type ? \ + (Fl_Surface_Device::surface()->class_name() == Fl_Display_Device::class_id ? \ fl_window : fl_xid(Fl::first_window()) ) , \ w, h, fl_visual->depth) // begin/end are macros that save the old state in local variables: # define fl_begin_offscreen(pixmap) \ Window _sw=fl_window; fl_window=pixmap; \ - Fl_Surface_Device *_ss = fl_surface; fl_display_device->set_current(); \ + Fl_Surface_Device *_ss = Fl_Surface_Device::surface(); Fl_Display_Device::display_device()->set_current(); \ fl_push_no_clip() # define fl_end_offscreen() \ fl_pop_clip(); fl_window = _sw; _ss->set_current() @@ -133,9 +116,40 @@ extern FL_EXPORT Fl_Bitmask fl_create_bitmask(int w, int h, const uchar *data); extern FL_EXPORT Fl_Bitmask fl_create_alphamask(int w, int h, int d, int ld, const uchar *data); extern FL_EXPORT void fl_delete_bitmask(Fl_Bitmask bm); +#if defined(FL_LIBRARY) || defined(FL_INTERNALS) +extern FL_EXPORT Window fl_message_window; +extern FL_EXPORT void *fl_xftfont; +FL_EXPORT Fl_Region XRectangleRegion(int x, int y, int w, int h); // in fl_rect.cxx + +// access to core fonts: +// This class provides a "smart pointer" that returns a pointer to an XFontStruct. +// The global variable fl_xfont can be called wherever a bitmap "core" font is +// needed, e.g. when rendering to a GL context under X11. +// With Xlib / X11 fonts, fl_xfont will return the current selected font. +// With XFT / X11 fonts, fl_xfont will attempt to return the bitmap "core" font most +// similar to (usually the same as) the current XFT font. +class Fl_XFont_On_Demand +{ +public: + Fl_XFont_On_Demand(XFontStruct* p = NULL) : ptr(p) { } + Fl_XFont_On_Demand& operator=(const Fl_XFont_On_Demand& x) + { ptr = x.ptr; return *this; } + Fl_XFont_On_Demand& operator=(XFontStruct* p) + { ptr = p; return *this; } + XFontStruct* value(); + operator XFontStruct*() { return value(); } + XFontStruct& operator*() { return *value(); } + XFontStruct* operator->() { return value(); } + bool operator==(const Fl_XFont_On_Demand& x) { return ptr == x.ptr; } + bool operator!=(const Fl_XFont_On_Demand& x) { return ptr != x.ptr; } +private: + XFontStruct *ptr; +}; +extern FL_EXPORT Fl_XFont_On_Demand fl_xfont; + // this object contains all X-specific stuff about a window: -// Warning: this object is highly subject to change! It's definition -// is only here so that fl_xid can be declared inline: +// Warning: this object is highly subject to change! +// FL_LIBRARY or FL_INTERNALS must be defined to access this class. class FL_EXPORT Fl_X { public: Window xid; @@ -157,13 +171,21 @@ public: static void y(Fl_Window* wi, int Y) {wi->y(Y);} }; -// convert xid <-> Fl_Window: -inline Window fl_xid(const Fl_Window*w) {return Fl_X::i(w)->xid;} -FL_EXPORT Fl_Window* fl_find(Window xid); - extern FL_EXPORT char fl_override_redirect; // hack into Fl_X::make_xid() extern FL_EXPORT int fl_background_pixel; // hack into Fl_X::make_xid() +inline Window fl_xid(const Fl_Window* w) { Fl_X *temp = Fl_X::i(w); return temp ? temp->xid : 0; } + +#else + +extern Window fl_xid_(const Fl_Window* w); +#define fl_xid(w) fl_xid_(w) + +#endif // FL_LIBRARY || FL_INTERNALS + +FL_EXPORT Fl_Window* fl_find(Window xid); + + // Dummy function to register a function for opening files via the window manager... inline void fl_open_callback(void (*)(const char *)) {} @@ -173,5 +195,5 @@ extern FL_EXPORT int fl_parse_color(const char* p, uchar& r, uchar& g, uchar& b) #endif // -// End of "$Id: x.H 7671 2010-07-09 17:31:33Z manolo $". +// End of "$Id: x.H 8706 2011-05-21 10:05:19Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/src/CMakeLists.txt b/plugins/zynaddsubfx/fltk/src/CMakeLists.txt index 2f05dd4d7..f5feedc02 100644 --- a/plugins/zynaddsubfx/fltk/src/CMakeLists.txt +++ b/plugins/zynaddsubfx/fltk/src/CMakeLists.txt @@ -193,14 +193,20 @@ set(CFILES fl_utf.c ) +add_definitions(-DFL_LIBRARY) if(APPLE) - set_source_files_properties( - Fl.cxx Fl_Native_File_Chooser.cxx Fl_Printer.cxx - PROPERTIES COMPILE_FLAGS "-x objective-c++") + set(MMFILES + Fl_cocoa.mm + Fl_Quartz_Printer.mm + Fl_Native_File_Chooser_MAC.mm + ) +else() + set(MMFILES + ) endif(APPLE) ####################################################################### -add_library(fltk STATIC ${CPPFILES} ${CFILES} fl_call_main.c) +add_library(fltk STATIC ${CPPFILES} ${MMFILES} ${CFILES} fl_call_main.c) set_target_properties(fltk PROPERTIES CLEAN_DIRECT_OUTPUT 1) if(MSVC) if(OPTION_LARGE_FILE) @@ -225,13 +231,13 @@ if(WIN32) target_link_libraries(fltk comctl32) endif(WIN32) -if(HAVE_CAIRO) +if(FLTK_HAVE_CAIRO) target_link_libraries(fltk fltk_cairo ${PKG_CAIRO_LIBRARIES}) -ENDif(HAVE_CAIRO) +ENDif(FLTK_HAVE_CAIRO) -if(USE_XINERAMA) +if(HAVE_XINERAMA) target_link_libraries(fltk ${X11_Xinerama_LIB}) -endif(USE_XINERAMA) +endif(HAVE_XINERAMA) if(USE_XFT) target_link_libraries(fltk ${X11_Xft_LIB}) @@ -254,7 +260,7 @@ install(TARGETS fltk if(OPTION_BUILD_SHARED_LIBS) ####################################################################### -add_library(fltk_SHARED SHARED ${CPPFILES} ${CFILES}) +add_library(fltk_SHARED SHARED ${CPPFILES} ${MMFILES} ${CFILES}) set_target_properties(fltk_SHARED PROPERTIES CLEAN_DIRECT_OUTPUT 1 VERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR} @@ -286,13 +292,13 @@ if(WIN32) target_link_libraries(fltk_SHARED comctl32) endif(WIN32) -if(HAVE_CAIRO) +if(FLTK_HAVE_CAIRO) target_link_libraries(fltk_SHARED fltk_cairo ${PKG_CAIRO_LIBRARIES}) -ENDif(HAVE_CAIRO) +ENDif(FLTK_HAVE_CAIRO) -if(USE_XINERAMA) +if(HAVE_XINERAMA) target_link_libraries(fltk_SHARED ${X11_Xinerama_LIB}) -endif(USE_XINERAMA) +endif(HAVE_XINERAMA) if(USE_XFT) target_link_libraries(fltk_SHARED ${X11_Xft_LIB}) diff --git a/plugins/zynaddsubfx/fltk/src/Fl.cxx b/plugins/zynaddsubfx/fltk/src/Fl.cxx index 116e25705..900ff8f65 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl.cxx 7354 2010-03-29 11:07:29Z matt $" +// "$Id: Fl.cxx 8723 2011-05-23 16:49:02Z manolo $" // // Main event handling code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -27,23 +27,43 @@ // warning: the Apple Quartz version still uses some Quickdraw calls, -// mostly to get around the single active context in QD and +// mostly to get around the single active context in QD and // to implement clipping. This should be changed into pure // Quartz calls in the near future. -#include "config.h" +#include + +/* We require Windows 2000 features (e.g. VK definitions) */ +#if defined(WIN32) +# if !defined(WINVER) || (WINVER < 0x0500) +# ifdef WINVER +# undef WINVER +# endif +# define WINVER 0x0500 +# endif +# if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500) +# ifdef _WIN32_WINNT +# undef _WIN32_WINNT +# endif +# define _WIN32_WINNT 0x0500 +# endif +#endif + +// recent versions of MinGW warn: "Please include winsock2.h before windows.h", +// hence we must include winsock2.h before FL/Fl.H (A.S. Dec. 2010, IMM May 2011) +#if defined(WIN32) && !defined(__CYGWIN__) +# include +#endif + #include #include -#include #include +#include + #include #include #include #include "flstring.h" -#if defined(__APPLE__) -#import -#endif - #if defined(DEBUG) || defined(DEBUG_WATCH) # include #endif // DEBUG || DEBUG_WATCH @@ -55,11 +75,22 @@ HBRUSH fl_brush_action(int action); void fl_cleanup_pens(void); void fl_release_dc(HWND,HDC); void fl_cleanup_dc_list(void); +#elif defined(__APPLE__) +extern double fl_mac_flush_and_wait(double time_to_wait, char in_idle); #endif // WIN32 // // Globals... // +#if defined(__APPLE__) || defined(FL_DOXYGEN) +const char *Fl_Mac_App_Menu::about = "About "; +const char *Fl_Mac_App_Menu::print = "Print Front Window"; +const char *Fl_Mac_App_Menu::services = "Services"; +const char *Fl_Mac_App_Menu::hide = "Hide "; +const char *Fl_Mac_App_Menu::hide_others = "Hide Others"; +const char *Fl_Mac_App_Menu::show = "Show All"; +const char *Fl_Mac_App_Menu::quit = "Quit "; +#endif // __APPLE__ #ifndef FL_DOXYGEN Fl_Widget *Fl::belowmouse_, *Fl::pushed_, @@ -82,8 +113,12 @@ int Fl::damage_, char *Fl::e_text = (char *)""; int Fl::e_length; -int Fl::visible_focus_ = 1, - Fl::dnd_text_ops_ = 1; + +Fl_Event_Dispatch Fl::e_dispatch = 0; + +unsigned char Fl::options_[] = { 0, 0 }; +unsigned char Fl::options_read_ = 0; + Fl_Window *fl_xfocus; // which window X thinks has focus Fl_Window *fl_xmousewin;// which window X thinks has FL_ENTER @@ -106,7 +141,7 @@ Fl::version() { } /** - Gets the default scrollbar size used by + Gets the default scrollbar size used by Fl_Browser_, Fl_Help_View, Fl_Scroll, and @@ -130,12 +165,19 @@ void Fl::scrollbar_size(int W) { } -/** - Returns whether or not the mouse event is inside the given rectangle. - Returns non-zero if the current event_x and event_y - put it inside the widget or inside an arbitrary bounding box. You - should always call this rather than doing your own comparison so you - are consistent about edge effects. +/** Returns whether or not the mouse event is inside the given rectangle. + + Returns non-zero if the current Fl::event_x() and Fl::event_y() + put it inside the given arbitrary bounding box. + + You should always call this rather than doing your own comparison + so you are consistent about edge effects. + + To find out, whether the event is inside a child widget of the + current window, you can use Fl::event_inside(const Fl_Widget *). + + \param[in] xx,yy,ww,hh bounding box + \return non-zero, if mouse event is inside */ int Fl::event_inside(int xx,int yy,int ww,int hh) /*const*/ { int mx = e_x - xx; @@ -143,11 +185,32 @@ int Fl::event_inside(int xx,int yy,int ww,int hh) /*const*/ { return (mx >= 0 && mx < ww && my >= 0 && my < hh); } -/** Returns whether or not the mouse event is inside the given widget. - Returns non-zero if the current event_x and event_y - put it inside the widget or inside an arbitrary bounding box. You - should always call this rather than doing your own comparison so you - are consistent about edge effects. +/** Returns whether or not the mouse event is inside a given child widget. + + Returns non-zero if the current Fl::event_x() and Fl::event_y() + put it inside the given child widget's bounding box. + + This method can only be used to check whether the mouse event is + inside a \b child widget of the window that handles the event, and + there must not be an intermediate subwindow (i.e. the widget must + not be inside a subwindow of the current window). However, it is + valid if the widget is inside a nested Fl_Group. + + You must not use it with the window itself as the \p o argument + in a window's handle() method. + + \note The mentioned restrictions are necessary, because this method + does not transform coordinates of child widgets, and thus the given + widget \p o must be within the \e same window that is handling the + current event. Otherwise the results are undefined. + + You should always call this rather than doing your own comparison + so you are consistent about edge effects. + + \see Fl::event_inside(int, int, int, int) + + \param[in] o child widget to be tested + \return non-zero, if mouse event is inside the widget */ int Fl::event_inside(const Fl_Widget *o) /*const*/ { int mx = e_x - o->x(); @@ -162,11 +225,11 @@ int Fl::event_inside(const Fl_Widget *o) /*const*/ { #ifdef WIN32 -/// implementation in Fl_win32.cxx +// implementation in Fl_win32.cxx #elif defined(__APPLE__) -/// implementation in Fl_mac.cxx +// implementation in Fl_mac.cxx #else @@ -175,10 +238,12 @@ int Fl::event_inside(const Fl_Widget *o) /*const*/ { // -//////////////////////////////////////////////////////////////// -// Timeouts are stored in a sorted list, so only the first one needs -// to be checked to see if any should be called. - +//////////////////////////////////////////////////////////////////////// +// Timeouts are stored in a sorted list (*first_timeout), so only the +// first one needs to be checked to see if any should be called. +// Allocated, but unused (free) Timeout structs are stored in another +// linked list (*free_timeout). + struct Timeout { double time; void (*cb)(void*); @@ -186,14 +251,13 @@ struct Timeout { Timeout* next; }; static Timeout* first_timeout, *free_timeout; -static int first_timeout_count, free_timeout_count; #include // I avoid the overhead of getting the current time when we have no // timeouts by setting this flag instead of getting the time. // In this case calling elapse_timeouts() does nothing, but records -// the current time, and the next call will actualy elapse time. +// the current time, and the next call will actually elapse time. static char reset_clock = 1; static void elapse_timeouts() { @@ -227,7 +291,6 @@ void Fl::repeat_timeout(double time, Fl_Timeout_Handler cb, void *argp) { Timeout* t = free_timeout; if (t) { free_timeout = t->next; - --free_timeout_count; } else { t = new Timeout; } @@ -235,7 +298,7 @@ void Fl::repeat_timeout(double time, Fl_Timeout_Handler cb, void *argp) { t->cb = cb; t->arg = argp; // insert-sort the new timeout: - Timeout** p = &first_timeout; + Timeout** p = &first_timeout; while (*p && (*p)->time <= time) p = &((*p)->next); t->next = *p; *p = t; @@ -253,10 +316,11 @@ int Fl::has_timeout(Fl_Timeout_Handler cb, void *argp) { /** Removes a timeout callback. It is harmless to remove a timeout callback that no longer exists. + + \note This version removes all matching timeouts, not just the first one. + This may change in the future. */ void Fl::remove_timeout(Fl_Timeout_Handler cb, void *argp) { - // This version removes all matching timeouts, not just the first one. - // This may change in the future. for (Timeout** p = &first_timeout; *p;) { Timeout* t = *p; if (t->cb == cb && (t->arg == argp || !argp)) { @@ -275,7 +339,7 @@ void Fl::remove_timeout(Fl_Timeout_Handler cb, void *argp) { // Checks are just stored in a list. They are called in the reverse // order that they were added (this may change in the future). // This is a bit messy because I want to allow checks to be added, -// removed, and have wait() called from inside them, to do this +// removed, and have wait() called from inside them. To do this // next_check points at the next unprocessed one for the outermost // call to Fl::wait(). @@ -291,26 +355,26 @@ static Check *first_check, *next_check, *free_check; waits for events. This is different than an idle callback because it is only called once, then FLTK calls the system and tells it not to return until an event happens. - + This can be used by code that wants to monitor the application's state, such as to keep a display up to date. The advantage of using a check callback is that it is called only when no events are pending. If events are coming in quickly, whole blocks of them will be processed before this is called once. This can save significant time and avoid the application falling behind the events. - + Sample code: - + \code bool state_changed; // anything that changes the display turns this on - + void callback(void*) { if (!state_changed) return; state_changed = false; do_expensive_calculation(); widget->redraw(); } - + main() { Fl::add_check(callback); return Fl::run(); @@ -382,13 +446,13 @@ static char in_idle; //////////////////////////////////////////////////////////////// // wait/run/check/ready: -void (*Fl::idle)(); // see Fl_add_idle.cxx for the add/remove functions +void (*Fl::idle)(); // see Fl::add_idle.cxx for the add/remove functions extern int fl_ready(); // in Fl_.cxx extern int fl_wait(double time); // in Fl_.cxx /** - See int wait() + See int Fl::wait() */ double Fl::wait(double time_to_wait) { // delete all widgets that were listed during callbacks @@ -410,13 +474,7 @@ double Fl::wait(double time_to_wait) { // the idle function may turn off idle, we can then wait: if (idle) time_to_wait = 0.0; } - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - flush(); - if (idle && !in_idle) // 'idle' may have been set within flush() - time_to_wait = 0.0; - double retval = fl_wait(time_to_wait); - [pool release]; - return retval; + return fl_mac_flush_and_wait(time_to_wait, in_idle); #else @@ -433,8 +491,6 @@ double Fl::wait(double time_to_wait) { first_timeout = t->next; t->next = free_timeout; free_timeout = t; - ++free_timeout_count; - --first_timeout_count; // Now it is safe for the callback to do add_timeout: cb(argp); } @@ -484,13 +540,35 @@ int Fl::run() { } #ifdef WIN32 + +// Function to initialize COM/OLE for usage. This must be done only once. +// We define a flag to register whether we called it: +static char oleInitialized = 0; + +// This calls the Windows function OleInitialize() exactly once. +void fl_OleInitialize() { + if (!oleInitialized) { + OleInitialize(0L); + oleInitialized = 1; + } +} + +// This calls the Windows function OleUninitialize() only, if +// OleInitialize has been called before. +void fl_OleUninitialize() { + if (oleInitialized) { + OleUninitialize(); + oleInitialized = 0; + } +} + class Fl_Win32_At_Exit { public: Fl_Win32_At_Exit() { } ~Fl_Win32_At_Exit() { fl_free_fonts(); // do some WIN32 cleanup fl_cleanup_pens(); - OleUninitialize(); + fl_OleUninitialize(); fl_brush_action(1); fl_cleanup_dc_list(); } @@ -505,24 +583,23 @@ static Fl_Win32_At_Exit win32_at_exit; repeatedly to "run" your program. You can also check what happened each time after this returns, which is quite useful for managing program state. - + What this really does is call all idle callbacks, all elapsed timeouts, call Fl::flush() to get the screen to update, and then wait some time (zero if there are idle callbacks, the shortest of all pending timeouts, or infinity), for any events from the user or any Fl::add_fd() callbacks. It then handles the events and calls the callbacks and then returns. - - The return value of the first form is non-zero if there are - any visible windows - this may change in future versions of - FLTK. - - The second form waits a maximum of time - seconds. It can return much sooner if something happens. - + + The return value of Fl::wait() is non-zero if there are any + visible windows - this may change in future versions of FLTK. + + Fl::wait(time) waits a maximum of \e time seconds. + It can return much sooner if something happens. + The return value is positive if an event or fd happens before the time elapsed. It is zero if nothing happens (on Win32 this will only - return zero if time is zero). It is negative if an error + return zero if \e time is zero). It is negative if an error occurs (this will happen on UNIX if a signal happens). */ int Fl::wait() { @@ -534,7 +611,7 @@ int Fl::wait() { /** Same as Fl::wait(0). Calling this during a big calculation will keep the screen up to date and the interface responsive: - + \code while (!calculation_done()) { calculate(); @@ -542,8 +619,8 @@ int Fl::wait() { if (user_hit_abort_button()) break; } \endcode - - The returns non-zero if any windows are displayed, and 0 if no + + This returns non-zero if any windows are displayed, and 0 if no windows are displayed (this is likely to change in future versions of FLTK). */ @@ -558,15 +635,15 @@ int Fl::check() { program is in a state where such callbacks are illegal. This returns true if Fl::check() would do anything (it will continue to return true until you call Fl::check() or Fl::wait()). - + \code while (!calculation_done()) { - calculate(); - if (Fl::ready()) { - do_expensive_cleanup(); - Fl::check(); - if (user_hit_abort_button()) break; - } + calculate(); + if (Fl::ready()) { + do_expensive_cleanup(); + Fl::check(); + if (user_hit_abort_button()) break; + } } \endcode */ @@ -593,9 +670,9 @@ Fl_Window* fl_find(Window xid) { Fl_X *window; for (Fl_X **pp = &Fl_X::first; (window = *pp); pp = &window->next) #if defined(WIN32) || defined(USE_X11) - if (window->xid == xid) + if (window->xid == xid) #elif defined(__APPLE_QUARTZ__) - if (window->xid == xid && !window->w->window()) + if (window->xid == xid && !window->w->window()) #else # error unsupported platform #endif // __APPLE__ @@ -616,13 +693,6 @@ Fl_Window* fl_find(Window xid) { Returns the first top-level window in the list of shown() windows. If a modal() window is shown this is the top-most modal window, otherwise it is the most recent window to get an event. - - The second form sets the window that is returned by - first_window. The window is removed from wherever it is in the - list and inserted at the top. This is not done if Fl::modal() - is on or if the window is not shown(). Because the first window - is used to set the "parent" of modal windows, this is often - useful. */ Fl_Window* Fl::first_window() { Fl_X* i = Fl_X::first; @@ -630,8 +700,9 @@ Fl_Window* Fl::first_window() { } /** - Returns the next top-level window in the list of shown() windows. You can - use this call to iterate through all the windows that are shown(). + Returns the next top-level window in the list of shown() windows. + You can use this call to iterate through all the windows that are shown(). + \param[in] window must be shown and not NULL */ Fl_Window* Fl::next_window(const Fl_Window* window) { Fl_X* i = Fl_X::i(window)->next; @@ -639,11 +710,16 @@ Fl_Window* Fl::next_window(const Fl_Window* window) { } /** - See Fl_Window* first_window() -*/ + Sets the window that is returned by first_window(). + The window is removed from wherever it is in the + list and inserted at the top. This is not done if Fl::modal() + is on or if the window is not shown(). Because the first window + is used to set the "parent" of modal windows, this is often + useful. + */ void Fl::first_window(Fl_Window* window) { if (!window || !window->shown()) return; - fl_find(fl_xid(window)); + fl_find( Fl_X::i(window)->xid ); } /** @@ -656,7 +732,7 @@ void Fl::redraw() { /** Causes all the windows that need it to be redrawn and graphics forced out through the pipes. - + This is what wait() does before looking for events. Note: in multi-threaded applications you should only call Fl::flush() @@ -688,29 +764,37 @@ void Fl::flush() { #endif } + //////////////////////////////////////////////////////////////// // Event handlers: + struct handler_link { int (*handle)(int); handler_link *next; }; + static handler_link *handlers = 0; + /** Install a function to parse unrecognized events. If FLTK cannot figure out what to do with an event, it calls each of these functions (most recent first) until one of them returns non-zero. If none of - them returns non zero then the event is ignored. Events that cause + them returns non-zero then the event is ignored. Events that cause this to be called are: - - - FL_SHORTCUT events that are not recognized by any widget. + + - FL_SHORTCUT events that are not recognized by any widget. This lets you provide global shortcut keys. - System events that FLTK does not recognize. See fl_xevent. - - \e Some other events when the widget FLTK selected returns - zero from its handle() method. Exactly which ones may change + - \e Some other events when the widget FLTK selected returns + zero from its handle() method. Exactly which ones may change in future versions, however. + + \see Fl::remove_handler(Fl_Event_Handler) + \see Fl::event_dispatch(Fl_Event_Dispatch d) + \see Fl::handle(int, Fl_Window*) */ void Fl::add_handler(Fl_Event_Handler ha) { handler_link *l = new handler_link; @@ -719,8 +803,10 @@ void Fl::add_handler(Fl_Event_Handler ha) { handlers = l; } + /** - Removes a previously added event handler. + Removes a previously added event handler. + \see Fl::handle(int, Fl_Window*) */ void Fl::remove_handler(Fl_Event_Handler ha) { handler_link *l, *p; @@ -752,15 +838,15 @@ Fl_Widget* fl_oldfocus; // kludge for Fl_Group... /** Sets the widget that will receive FL_KEYBOARD events. - + If you change Fl::focus(), the previous widget and all parents (that don't contain the new widget) are sent FL_UNFOCUS events. Changing the focus does \e not send FL_FOCUS to this or any widget, because sending FL_FOCUS is supposed to \e test if the widget wants the focus (by it returning non-zero from handle()). - - \sa Fl_Widget::take_focus() + + \see Fl_Widget::take_focus() */ void Fl::focus(Fl_Widget *o) { if (o && !o->visible_focus()) return; @@ -772,9 +858,18 @@ void Fl::focus(Fl_Widget *o) { // make sure that fl_xfocus is set to the top level window // of this widget, or fl_fix_focus will clear our focus again if (o) { - Fl_Window *win = 0, *w1 = o->window(); + Fl_Window *win = 0, *w1 = o->as_window(); + if (!w1) w1 = o->window(); while (w1) { win=w1; w1=win->window(); } - if (win) fl_xfocus = win; + if (win) { +#ifdef __APPLE__ + if (fl_xfocus != win) { + Fl_X *x = Fl_X::i(win); + if (x) x->set_key_window(); + } +#endif + fl_xfocus = win; + } } // take focus from the old focused window fl_oldfocus = 0; @@ -792,16 +887,16 @@ static char dnd_flag = 0; // make 'belowmouse' send DND_LEAVE instead of LEAVE /** Sets the widget that is below the mouse. This is for - highlighting buttons. It is not used to send FL_PUSH or + highlighting buttons. It is not used to send FL_PUSH or FL_MOVE directly, for several obscure reasons, but those events - typically go to this widget. This is also the first widget tried for + typically go to this widget. This is also the first widget tried for FL_SHORTCUT events. - + If you change the belowmouse widget, the previous one and all parents (that don't contain the new widget) are sent FL_LEAVE events. Changing this does \e not send FL_ENTER to this or any widget, because sending FL_ENTER is supposed to \e test - if the widget wants the mouse (by it returning non-zero from + if the widget wants the mouse (by it returning non-zero from handle()). */ void Fl::belowmouse(Fl_Widget *o) { @@ -819,15 +914,15 @@ void Fl::belowmouse(Fl_Widget *o) { } /** - Sets the widget that is being pushed. FL_DRAG or + Sets the widget that is being pushed. FL_DRAG or FL_RELEASE (and any more FL_PUSH) events will be sent to this widget. - + If you change the pushed widget, the previous one and all parents (that don't contain the new widget) are sent FL_RELEASE events. Changing this does \e not send FL_PUSH to this or any widget, because sending FL_PUSH is supposed to \e test - if the widget wants the mouse (by it returning non-zero from + if the widget wants the mouse (by it returning non-zero from handle()). */ void Fl::pushed(Fl_Widget *o) { @@ -895,11 +990,11 @@ void fl_fix_focus() { } } -#ifndef WIN32 +#if !(defined(WIN32) || defined(__APPLE__)) extern Fl_Widget *fl_selection_requestor; // from Fl_x.cxx #endif -// This function is called by ~Fl_Widget() and by Fl_Widget::deactivate +// This function is called by ~Fl_Widget() and by Fl_Widget::deactivate() // and by Fl_Widget::hide(). It indicates that the widget does not want // to receive any more events, and also removes all global variables that // point at the widget. @@ -913,7 +1008,7 @@ void fl_throw_focus(Fl_Widget *o) { #endif // DEBUG if (o->contains(Fl::pushed())) Fl::pushed_ = 0; -#ifndef WIN32 +#if !(defined(WIN32) || defined(__APPLE__)) if (o->contains(fl_selection_requestor)) fl_selection_requestor = 0; #endif if (o->contains(Fl::belowmouse())) Fl::belowmouse_ = 0; @@ -927,9 +1022,9 @@ void fl_throw_focus(Fl_Widget *o) { //////////////////////////////////////////////////////////////// -// Call to->handle but first replace the mouse x/y with the correct -// values to account for nested X windows. 'window' is the outermost -// window the event was posted to by X: +// Call to->handle(), but first replace the mouse x/y with the correct +// values to account for nested windows. 'window' is the outermost +// window the event was posted to by the system: static int send(int event, Fl_Widget* to, Fl_Window* window) { int dx, dy; int old_event = Fl::e_number; @@ -950,11 +1045,98 @@ static int send(int event, Fl_Widget* to, Fl_Window* window) { return ret; } -int Fl::handle(int e, Fl_Window* window) + /** - Sends the event to a window for processing. Returns non-zero if any - widget uses the event. -*/ + \brief Set a new event dispatch function. + + The event dispatch function is called after native events are converted to + FLTK events, but before they are handled by FLTK. If the dispatch function + Fl_Event_Dispatch \p d is set, it is up to the dispatch function to call + Fl::handle_(int, Fl_Window*) or to ignore the event. + + The dispatch function itself must return 0 if it ignored the event, + or non-zero if it used the event. If you call Fl::handle_(), then + this will return the correct value. + + The event dispatch can be used to handle exceptions in FLTK events and + callbacks before they reach the native event handler: + + \code + int myHandler(int e, Fl_Window *w) { + try { + return Fl::handle_(e, w); + } catch () { + ... + } + } + + main() { + Fl::event_dispatch(myHandler); + ... + Fl::run(); + } + \endcode + + \param d new dispatch function, or NULL + \see Fl::add_handler(Fl_Event_Handler) + \see Fl::handle(int, Fl_Window*) + \see Fl::handle_(int, Fl_Window*) + */ +void Fl::event_dispatch(Fl_Event_Dispatch d) +{ + e_dispatch = d; +} + + +/** + \brief Return the current event dispatch function. + */ +Fl_Event_Dispatch Fl::event_dispatch() +{ + return e_dispatch; +} + + +/** + \brief Handle events from the window system. + + This is called from the native event dispatch after native events have been + converted to FLTK notation. This function calls Fl::handle_(int, Fl_Window*) + unless the user sets a dispatch function. If a user dispatch function is set, + the user must make sure that Fl::handle_() is called, or the event will be + ignored. + + \param e the event type (Fl::event_number() is not yet set) + \param window the window that caused this event + \return 0 if the event was not handled + + \see Fl::add_handler(Fl_Event_Handler) + \see Fl::event_dispatch(Fl_Event_Dispatch) + */ +int Fl::handle(int e, Fl_Window* window) +{ + if (e_dispatch) { + return e_dispatch(e, window); + } else { + return handle_(e, window); + } +} + + +/** + \brief Handle events from the window system. + + This function is called from the native event dispatch, unless the user sets + another dispatch function. In that case, the user dispatch function must + decide when to call Fl::handle_(int, Fl_Window*) + + \param e the event type (Fl::event_number() is not yet set) + \param window the window that caused this event + \return 0 if the event was not handled + + \see Fl::event_dispatch(Fl_Event_Dispatch) + */ +int Fl::handle_(int e, Fl_Window* window) { e_number = e; if (fl_local_grab) return fl_local_grab(e); @@ -964,7 +1146,7 @@ int Fl::handle(int e, Fl_Window* window) switch (e) { case FL_CLOSE: - if (grab() || modal() && window != modal()) return 0; + if ( grab() || (modal() && window != modal()) ) return 0; wi->do_callback(); return 1; @@ -1016,9 +1198,25 @@ int Fl::handle(int e, Fl_Window* window) } if (modal() && wi != modal()) wi = 0; if (grab()) wi = grab(); - {Fl_Widget* pbm = belowmouse(); - int ret = (wi && send(e, wi, window)); - if (pbm != belowmouse()) { + { int ret; + Fl_Widget* pbm = belowmouse(); +#ifdef __APPLE__ + if (fl_mac_os_version < 100500) { + // before 10.5, mouse moved events aren't sent to borderless windows such as tooltips + Fl_Window *tooltip = Fl_Tooltip::current_window(); + int inside = 0; + if (tooltip && tooltip->shown() ) { // check if a tooltip window is currently opened + // check if mouse is inside the tooltip + inside = (Fl::event_x_root() >= tooltip->x() && Fl::event_x_root() < tooltip->x() + tooltip->w() && + Fl::event_y_root() >= tooltip->y() && Fl::event_y_root() < tooltip->y() + tooltip->h() ); + } + // if inside, send event to tooltip window instead of background window + if (inside) ret = send(e, tooltip, window); + else ret = (wi && send(e, wi, window)); + } else +#endif + ret = (wi && send(e, wi, window)); + if (pbm != belowmouse()) { #ifdef DEBUG printf("Fl::handle(e=%d, window=%p);\n", e, window); #endif // DEBUG @@ -1049,12 +1247,12 @@ int Fl::handle(int e, Fl_Window* window) return 1; case FL_KEYUP: - // Send the key-up to the current focus. This is not + // Send the key-up to the current focus widget. This is not // always the same widget that received the corresponding // FL_KEYBOARD event because focus may have changed. // Sending the KEYUP to the right KEYDOWN is possible, but - // would require that we track the KEYDOWN for every possible - // key stroke (users may hold down multiple keys!) and then + // would require that we track the KEYDOWN for every possible + // key stroke (users may hold down multiple keys!) and then // make sure that the widget still exists before sending // a KEYUP there. I believe that the current solution is // "close enough". @@ -1178,7 +1376,7 @@ void Fl_Window::hide() { for (; *pp != ip; pp = &(*pp)->next) if (!*pp) return; *pp = ip->next; #ifdef __APPLE__ - MacUnlinkWindow(ip); + ip->unlink(); // MacOS X manages a single pointer per application. Make sure that hiding // a toplevel window will not leave us with some random pointer shape, or // worst case, an invisible pointer @@ -1225,7 +1423,7 @@ void Fl_Window::hide() { fl_release_dc(fl_window, fl_gc); fl_window = (HWND)-1; fl_gc = 0; -# ifdef USE_CAIRO +# ifdef FLTK_USE_CAIRO if (Fl::cairo_autolink_context()) Fl::cairo_make_current((Fl_Window*) 0); # endif } @@ -1241,7 +1439,8 @@ void Fl_Window::hide() { # if USE_XFT fl_destroy_xft_draw(ip->xid); # endif - XDestroyWindow(fl_display, ip->xid); + // this test makes sure ip->xid has not been destroyed already + if (ip->xid) XDestroyWindow(fl_display, ip->xid); #elif defined(WIN32) // this little trickery seems to avoid the popup window stacking problem HWND p = GetForegroundWindow(); @@ -1251,11 +1450,11 @@ void Fl_Window::hide() { } XDestroyWindow(fl_display, ip->xid); #elif defined(__APPLE_QUARTZ__) - MacDestroyWindow(this, ip->xid); + ip->destroy(); #else # error unsupported platform #endif - + #ifdef WIN32 // Try to stop the annoying "raise another program" behavior if (non_modal() && Fl::first_window() && Fl::first_window()->shown()) @@ -1266,6 +1465,9 @@ void Fl_Window::hide() { Fl_Window::~Fl_Window() { hide(); + if (xclass_) { + free(xclass_); + } } // FL_SHOW and FL_HIDE are called whenever the visibility of this widget @@ -1286,7 +1488,7 @@ int Fl_Window::handle(int ev) #if defined(USE_X11) || defined(WIN32) XMapWindow(fl_display, fl_xid(this)); // extra map calls are harmless #elif defined(__APPLE_QUARTZ__) - MacMapWindow(this, i->xid); + i->map(); #else # error unsupported platform #endif // __APPLE__ @@ -1294,7 +1496,7 @@ int Fl_Window::handle(int ev) break; case FL_HIDE: if (shown()) { - // Find what really turned invisible, if is was a parent window + // Find what really turned invisible, if it was a parent window // we do nothing. We need to avoid unnecessary unmap calls // because they cause the display to blink when the parent is // remapped. However if this or any intermediate non-window @@ -1308,7 +1510,7 @@ int Fl_Window::handle(int ev) #if defined(USE_X11) || defined(WIN32) XUnmapWindow(fl_display, fl_xid(this)); #elif defined(__APPLE_QUARTZ__) - MacUnmapWindow(this, i->xid); + i->unmap(); #else # error platform unsupported #endif @@ -1330,7 +1532,7 @@ int Fl_Window::handle(int ev) NULL, without changing the actual text of the selection. FL_SELECTIONCLEAR is sent to the previous selection owner, if any. - + Copying the buffer every time the selection is changed is obviously wasteful, especially for large selections. An interface will probably be added in a future version to allow the selection to be made @@ -1351,14 +1553,8 @@ void Fl::selection(Fl_Widget &owner, const char* text, int len) { Fl::copy(text, len, 0); } -/** Backward compatibility only: - Set things up so the receiver widget will be called with an FL_PASTE event some - time in the future for the specified clipboard. The reciever - should be prepared to be called \e directly by this, or for - it to happen \e later, or possibly not at all. This - allows the window system to take as long as necessary to retrieve - the paste buffer (or even to screw up completely) without complex - and error-prone synchronization code in FLTK. +/** Backward compatibility only. + This calls Fl::paste(receiver, 0); \see Fl::paste(Fl_Widget &receiver, int clipboard) */ void Fl::paste(Fl_Widget &receiver) { @@ -1392,16 +1588,36 @@ void Fl_Widget::redraw_label() { W += 5; // Add a little to the size of the label to cover overflow H += 5; - if (align() & FL_ALIGN_BOTTOM) { - window()->damage(FL_DAMAGE_EXPOSE, x(), y() + h(), w(), H); - } else if (align() & FL_ALIGN_TOP) { - window()->damage(FL_DAMAGE_EXPOSE, x(), y() - H, w(), H); - } else if (align() & FL_ALIGN_LEFT) { - window()->damage(FL_DAMAGE_EXPOSE, x() - W, y(), W, h()); - } else if (align() & FL_ALIGN_RIGHT) { - window()->damage(FL_DAMAGE_EXPOSE, x() + w(), y(), W, h()); - } else { - window()->damage(FL_DAMAGE_ALL); + // FIXME: + // This assumes that measure() returns the correct outline, which it does + // not in all possible cases of alignment combinedwith image and symbols. + switch (align() & 0x0f) { + case FL_ALIGN_TOP_LEFT: + window()->damage(FL_DAMAGE_EXPOSE, x(), y()-H, W, H); break; + case FL_ALIGN_TOP: + window()->damage(FL_DAMAGE_EXPOSE, x()+(w()-W)/2, y()-H, W, H); break; + case FL_ALIGN_TOP_RIGHT: + window()->damage(FL_DAMAGE_EXPOSE, x()+w()-W, y()-H, W, H); break; + case FL_ALIGN_LEFT_TOP: + window()->damage(FL_DAMAGE_EXPOSE, x()-W, y(), W, H); break; + case FL_ALIGN_RIGHT_TOP: + window()->damage(FL_DAMAGE_EXPOSE, x()+w(), y(), W, H); break; + case FL_ALIGN_LEFT: + window()->damage(FL_DAMAGE_EXPOSE, x()-W, y()+(h()-H)/2, W, H); break; + case FL_ALIGN_RIGHT: + window()->damage(FL_DAMAGE_EXPOSE, x()+w(), y()+(h()-H)/2, W, H); break; + case FL_ALIGN_LEFT_BOTTOM: + window()->damage(FL_DAMAGE_EXPOSE, x()-W, y()+h()-H, W, H); break; + case FL_ALIGN_RIGHT_BOTTOM: + window()->damage(FL_DAMAGE_EXPOSE, x()+w(), y()+h()-H, W, H); break; + case FL_ALIGN_BOTTOM_LEFT: + window()->damage(FL_DAMAGE_EXPOSE, x(), y()+h(), W, H); break; + case FL_ALIGN_BOTTOM: + window()->damage(FL_DAMAGE_EXPOSE, x()+(w()-W)/2, y()+h(), W, H); break; + case FL_ALIGN_BOTTOM_RIGHT: + window()->damage(FL_DAMAGE_EXPOSE, x()+w()-W, y()+h(), W, H); break; + default: + window()->damage(FL_DAMAGE_ALL); break; } } else { // The label is inside the widget, so just redraw the widget itself... @@ -1492,8 +1708,7 @@ void Fl_Window::flush() { #ifdef WIN32 # include "Fl_win32.cxx" -#elif defined(__APPLE__) -# include "Fl_cocoa.mm" +//#elif defined(__APPLE__) #endif // @@ -1504,7 +1719,7 @@ void Fl_Window::flush() { static int num_dwidgets = 0, alloc_dwidgets = 0; static Fl_Widget **dwidgets = 0; -/** +/** Schedules a widget for deletion at the next call to the event loop. Use this method to delete a widget inside a callback function. @@ -1544,9 +1759,9 @@ void Fl::delete_widget(Fl_Widget *wi) { num_dwidgets ++; } -/** +/** Deletes widgets previously scheduled for deletion. - + This is for internal use only. You should never call this directly. Fl::do_widget_deletion() is called from the FLTK event loop or whenever @@ -1570,7 +1785,7 @@ static int max_widget_watch = 0; /** Adds a widget pointer to the widget watch list. - + \note Internal use only, please use class Fl_Widget_Tracker instead. This can be used, if it is possible that a widget might be deleted during @@ -1613,7 +1828,7 @@ static int max_widget_watch = 0; \see class Fl_Widget_Tracker */ -void Fl::watch_widget_pointer(Fl_Widget *&w) +void Fl::watch_widget_pointer(Fl_Widget *&w) { Fl_Widget **wp = &w; int i; @@ -1637,7 +1852,7 @@ void Fl::watch_widget_pointer(Fl_Widget *&w) This is used to remove a widget pointer that has been added to the watch list with Fl::watch_widget_pointer(), when it is not needed anymore. - + \note Internal use only, please use class Fl_Widget_Tracker instead. \see Fl::watch_widget_pointer() @@ -1681,7 +1896,7 @@ void Fl::release_widget_pointer(Fl_Widget *&w) \see Fl::watch_widget_pointer() \see class Fl_Widget_Tracker */ -void Fl::clear_widget_pointer(Fl_Widget const *w) +void Fl::clear_widget_pointer(Fl_Widget const *w) { if (w==0L) return; int i; @@ -1692,13 +1907,105 @@ void Fl::clear_widget_pointer(Fl_Widget const *w) } } + +/** + \brief FLTK library options management. + + This function needs to be documented in more detail. It can be used for more + optional settings, such as using a native file chooser instead of the FLTK one + wherever possible, disabling tooltips, disabling visible focus, disabling + FLTK file chooser preview, etc. . + + There should be a command line option interface. + + There should be an application that manages options system wide, per user, and + per application. + + \note As of FLTK 1.3.0, options can be managed within fluid, using the menu + Edit/Global FLTK Settings. + + \param opt which option + \return true or false + \see enum Fl::Fl_Option + \see Fl::option(Fl_Option, bool) + + \since FLTK 1.3.0 + */ +bool Fl::option(Fl_Option opt) +{ + if (!options_read_) { + int tmp; + { // first, read the system wide preferences + Fl_Preferences prefs(Fl_Preferences::SYSTEM, "fltk.org", "fltk"); + Fl_Preferences opt_prefs(prefs, "options"); + opt_prefs.get("ArrowFocus", tmp, 0); // default: off + options_[OPTION_ARROW_FOCUS] = tmp; + //opt_prefs.get("NativeFilechooser", tmp, 1); // default: on + //options_[OPTION_NATIVE_FILECHOOSER] = tmp; + //opt_prefs.get("FilechooserPreview", tmp, 1); // default: on + //options_[OPTION_FILECHOOSER_PREVIEW] = tmp; + opt_prefs.get("VisibleFocus", tmp, 1); // default: on + options_[OPTION_VISIBLE_FOCUS] = tmp; + opt_prefs.get("DNDText", tmp, 1); // default: on + options_[OPTION_DND_TEXT] = tmp; + opt_prefs.get("ShowTooltips", tmp, 1); // default: on + options_[OPTION_SHOW_TOOLTIPS] = tmp; + } + { // next, check the user preferences + // override system options only, if the option is set ( >= 0 ) + Fl_Preferences prefs(Fl_Preferences::USER, "fltk.org", "fltk"); + Fl_Preferences opt_prefs(prefs, "options"); + opt_prefs.get("ArrowFocus", tmp, -1); + if (tmp >= 0) options_[OPTION_ARROW_FOCUS] = tmp; + //opt_prefs.get("NativeFilechooser", tmp, -1); + //if (tmp >= 0) options_[OPTION_NATIVE_FILECHOOSER] = tmp; + //opt_prefs.get("FilechooserPreview", tmp, -1); + //if (tmp >= 0) options_[OPTION_FILECHOOSER_PREVIEW] = tmp; + opt_prefs.get("VisibleFocus", tmp, -1); + if (tmp >= 0) options_[OPTION_VISIBLE_FOCUS] = tmp; + opt_prefs.get("DNDText", tmp, -1); + if (tmp >= 0) options_[OPTION_DND_TEXT] = tmp; + opt_prefs.get("ShowTooltips", tmp, -1); + if (tmp >= 0) options_[OPTION_SHOW_TOOLTIPS] = tmp; + } + { // now, if the developer has registered this app, we could as for per-application preferences + } + options_read_ = 1; + } + if (opt<0 || opt>=OPTION_LAST) + return false; + return (bool)(options_[opt]!=0); +} + +/** + \brief Override an option while the application is running. + + This function does not change any system or user settings. + + \param opt which option + \param val set to true or false + \see enum Fl::Fl_Option + \see bool Fl::option(Fl_Option) + */ +void Fl::option(Fl_Option opt, bool val) +{ + if (opt<0 || opt>=OPTION_LAST) + return; + if (!options_read_) { + // first read this option, so we don't override our setting later + option(opt); + } + options_[opt] = val; +} + + // Helper class Fl_Widget_Tracker /** The constructor adds a widget to the watch list. */ -Fl_Widget_Tracker::Fl_Widget_Tracker(Fl_Widget *wi) { - +Fl_Widget_Tracker::Fl_Widget_Tracker(Fl_Widget *wi) +{ wp_ = wi; Fl::watch_widget_pointer(wp_); // add pointer to watch list } @@ -1706,11 +2013,12 @@ Fl_Widget_Tracker::Fl_Widget_Tracker(Fl_Widget *wi) { /** The destructor removes a widget from the watch list. */ -Fl_Widget_Tracker::~Fl_Widget_Tracker() { - +Fl_Widget_Tracker::~Fl_Widget_Tracker() +{ Fl::release_widget_pointer(wp_); // remove pointer from watch list } + // -// End of "$Id: Fl.cxx 7354 2010-03-29 11:07:29Z matt $". +// End of "$Id: Fl.cxx 8723 2011-05-23 16:49:02Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Adjuster.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Adjuster.cxx index 189d0412f..150504f15 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Adjuster.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Adjuster.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Adjuster.cxx 7115 2010-02-20 17:40:07Z AlbrechtS $" +// "$Id: Fl_Adjuster.cxx 7903 2010-11-28 21:06:39Z matt $" // // Adjuster widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -178,5 +178,5 @@ Fl_Adjuster::Fl_Adjuster(int X, int Y, int W, int H, const char* l) } // -// End of "$Id: Fl_Adjuster.cxx 7115 2010-02-20 17:40:07Z AlbrechtS $". +// End of "$Id: Fl_Adjuster.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Bitmap.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Bitmap.cxx index 7f472c68b..daef86a58 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Bitmap.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Bitmap.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Bitmap.cxx 7659 2010-07-01 13:21:32Z manolo $" +// "$Id: Fl_Bitmap.cxx 8360 2011-02-02 12:42:47Z manolo $" // // Bitmap drawing routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -304,13 +304,13 @@ void Fl_GDI_Graphics_Driver::draw(Fl_Bitmap *bm, int XP, int YP, int WP, int HP, HDC tempdc; int save; BOOL use_print_algo = false; - if (fl_surface->type() == Fl_Printer::device_type) { + if (Fl_Surface_Device::surface()->class_name() == Fl_Printer::class_id) { static HMODULE hMod = NULL; if (!hMod) { hMod = LoadLibrary("MSIMG32.DLL"); if (hMod) fl_TransparentBlt = (fl_transp_func)GetProcAddress(hMod, "TransparentBlt"); } - if (hMod) use_print_algo = true; + if (fl_TransparentBlt) use_print_algo = true; } if (use_print_algo) { // algorithm for bitmap output to Fl_GDI_Printer Fl_Offscreen tmp_id = fl_create_offscreen(W, H); @@ -478,5 +478,5 @@ Fl_Image *Fl_Bitmap::copy(int W, int H) { // -// End of "$Id: Fl_Bitmap.cxx 7659 2010-07-01 13:21:32Z manolo $". +// End of "$Id: Fl_Bitmap.cxx 8360 2011-02-02 12:42:47Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Box.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Box.cxx index 2e9245229..9450cf6a2 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Box.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Box.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Box.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Box.cxx 7903 2010-11-28 21:06:39Z matt $" // // Box widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -40,5 +40,5 @@ int Fl_Box::handle(int event) { // -// End of "$Id: Fl_Box.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Box.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Browser.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Browser.cxx index 0db009245..d62b4f4db 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Browser.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Browser.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Browser.cxx 6895 2009-09-21 06:35:08Z greg.ercolano $" +// "$Id: Fl_Browser.cxx 8736 2011-05-24 20:00:56Z AlbrechtS $" // // Browser widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -32,6 +32,12 @@ #include #include +#if defined(FL_DLL) // really needed for c'tors for MS VC++ only +#include +#include +#include +#endif + // I modified this from the original Forms data to use a linked list // so that the number of items in the browser and size of those items // is unlimited. The only problem is that the old browser used an @@ -375,6 +381,7 @@ int Fl_Browser::item_height(void *item) const { if (hh > hmax) hmax = hh; } else { const int* i = column_widths(); + long int dummy; // do each column separately as they may all set different fonts: for (char* str = l->txt; str && *str; str++) { Fl_Font font = textfont(); // default font @@ -389,7 +396,7 @@ int Fl_Browser::item_height(void *item) const { case 'i': font = (Fl_Font)(font|FL_ITALIC); break; case 'f': case 't': font = FL_COURIER; break; case 'B': - case 'C': strtol(str, &str, 10); break;// skip a color number + case 'C': dummy = strtol(str, &str, 10); break;// skip a color number case 'F': font = (Fl_Font)strtol(str,&str,10); break; case 'S': tsize = strtol(str,&str,10); break; case 0: case '@': str--; @@ -442,6 +449,7 @@ int Fl_Browser::item_width(void *item) const { int done = 0; while (*str == format_char_ && str[1] && str[1] != format_char_) { + long int dummy; str ++; switch (*str++) { case 'l': case 'L': tsize = 24; break; @@ -451,7 +459,7 @@ int Fl_Browser::item_width(void *item) const { case 'i': font = (Fl_Font)(font|FL_ITALIC); break; case 'f': case 't': font = FL_COURIER; break; case 'B': - case 'C': strtol(str, &str, 10); break;// skip a color number + case 'C': dummy = strtol(str, &str, 10); break;// skip a color number case 'F': font = (Fl_Font)strtol(str, &str, 10); break; case 'S': tsize = strtol(str, &str, 10); break; case '.': @@ -536,6 +544,7 @@ void Fl_Browser::item_draw(void* item, int X, int Y, int W, int H) const { //#warning FIXME This maybe needs to be more UTF8 aware now...? //#endif /*__GNUC__*/ while (*str == format_char() && *++str && *str != format_char()) { + long int dummy; switch (*str++) { case 'l': case 'L': tsize = 24; break; case 'm': case 'M': tsize = 18; break; @@ -549,7 +558,7 @@ void Fl_Browser::item_draw(void* item, int X, int Y, int W, int H) const { if (!(l->flags & SELECTED)) { fl_color((Fl_Color)strtol(str, &str, 10)); fl_rectf(X, Y, w1, H); - } else strtol(str, &str, 10); + } else dummy = strtol(str, &str, 10); break; case 'C': lcol = (Fl_Color)strtol(str, &str, 10); @@ -911,6 +920,30 @@ void Fl_Browser::remove_icon(int line) { icon(line,0); } +/* + The following constructors must not be in the header file(s) if we + build a shared object (DLL). Instead they are defined here to force + the constructor (and default destructor as well) to be defined in + the DLL and exported (STR #2632, #2645). + + Note: if you change any of them, do the same changes in the specific + header file as well. This redundant definition was chosen to enable + inline constructors in the header files (for static linking) as well + as those here for dynamic linking (Windows DLL). +*/ +#if defined(FL_DLL) + + Fl_Hold_Browser::Fl_Hold_Browser(int X,int Y,int W,int H,const char *L) + : Fl_Browser(X,Y,W,H,L) {type(FL_HOLD_BROWSER);} + + Fl_Multi_Browser::Fl_Multi_Browser(int X,int Y,int W,int H,const char *L) + : Fl_Browser(X,Y,W,H,L) {type(FL_MULTI_BROWSER);} + + Fl_Select_Browser::Fl_Select_Browser(int X,int Y,int W,int H,const char *L) + : Fl_Browser(X,Y,W,H,L) {type(FL_SELECT_BROWSER);} + +#endif // FL_DLL + // -// End of "$Id: Fl_Browser.cxx 6895 2009-09-21 06:35:08Z greg.ercolano $". +// End of "$Id: Fl_Browser.cxx 8736 2011-05-24 20:00:56Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Browser_.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Browser_.cxx index c1c97ba51..1f738b1d1 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Browser_.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Browser_.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Browser_.cxx 7115 2010-02-20 17:40:07Z AlbrechtS $" +// "$Id: Fl_Browser_.cxx 7903 2010-11-28 21:06:39Z matt $" // // Base Browser widget class for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -1103,5 +1103,5 @@ void Fl_Browser_::item_select(void *item, int val) {} int Fl_Browser_::item_selected(void* item) const { return item==selection_ ? 1 : 0; } // -// End of "$Id: Fl_Browser_.cxx 7115 2010-02-20 17:40:07Z AlbrechtS $". +// End of "$Id: Fl_Browser_.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Browser_load.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Browser_load.cxx index c72d31fd2..d529d2a7b 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Browser_load.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Browser_load.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Browser_load.cxx 6726 2009-03-27 16:52:31Z greg.ercolano $" +// "$Id: Fl_Browser_load.cxx 7903 2010-11-28 21:06:39Z matt $" // // File loading routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -66,5 +66,5 @@ int Fl_Browser::load(const char *filename) { } // -// End of "$Id: Fl_Browser_load.cxx 6726 2009-03-27 16:52:31Z greg.ercolano $". +// End of "$Id: Fl_Browser_load.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Button.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Button.cxx index 391f9311a..7104b4446 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Button.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Button.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Button.cxx 7476 2010-04-09 22:18:05Z matt $" +// "$Id: Fl_Button.cxx 7903 2010-11-28 21:06:39Z matt $" // // Button widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -30,6 +30,10 @@ #include #include + +Fl_Widget_Tracker *Fl_Button::key_release_tracker = 0; + + // There are a lot of subclasses, named Fl_*_Button. Some of // them are implemented by setting the type() value and testing it // here. This includes Fl_Radio_Button and Fl_Toggle_Button @@ -128,22 +132,9 @@ int Fl_Button::handle(int event) { return 1; case FL_SHORTCUT: if (!(shortcut() ? - Fl::test_shortcut(shortcut()) : test_shortcut())) return 0; - + Fl::test_shortcut(shortcut()) : test_shortcut())) return 0; if (Fl::visible_focus() && handle(FL_FOCUS)) Fl::focus(this); - - if (type() == FL_RADIO_BUTTON && !value_) { - setonly(); - set_changed(); - if (when() & (FL_WHEN_CHANGED|FL_WHEN_RELEASE) ) - do_callback(); - } else if (type() == FL_TOGGLE_BUTTON) { - value(!value()); - set_changed(); - if (when() & (FL_WHEN_CHANGED|FL_WHEN_RELEASE)) - do_callback(); - } else if (when() & FL_WHEN_RELEASE) do_callback(); - return 1; + goto triggered_by_keyboard; case FL_FOCUS : /* FALLTHROUGH */ case FL_UNFOCUS : if (Fl::visible_focus()) { @@ -161,6 +152,7 @@ int Fl_Button::handle(int event) { if (Fl::focus() == this && Fl::event_key() == ' ' && !(Fl::event_state() & (FL_SHIFT | FL_CTRL | FL_ALT | FL_META))) { set_changed(); + triggered_by_keyboard: Fl_Widget_Tracker wp(this); if (type() == FL_RADIO_BUTTON && !value_) { setonly(); @@ -168,6 +160,8 @@ int Fl_Button::handle(int event) { } else if (type() == FL_TOGGLE_BUTTON) { value(!value()); if (when() & FL_WHEN_CHANGED) do_callback(); + } else { + simulate_key_action(); } if (wp.deleted()) return 1; if (when() & FL_WHEN_RELEASE) do_callback(); @@ -178,6 +172,33 @@ int Fl_Button::handle(int event) { } } +void Fl_Button::simulate_key_action() +{ + if (key_release_tracker) { + Fl::remove_timeout(key_release_timeout, key_release_tracker); + key_release_timeout(key_release_tracker); + } + value(1); + redraw(); + key_release_tracker = new Fl_Widget_Tracker(this); + Fl::add_timeout(0.15, key_release_timeout, key_release_tracker); +} + +void Fl_Button::key_release_timeout(void *d) +{ + Fl_Widget_Tracker *wt = (Fl_Widget_Tracker*)d; + if (!wt) + return; + if (wt==key_release_tracker) + key_release_tracker = 0L; + Fl_Button *btn = (Fl_Button*)wt->widget(); + if (btn) { + btn->value(0); + btn->redraw(); + } + delete wt; +} + /** The constructor creates the button using the given position, size and label. \param[in] X, Y, W, H position and size of the widget @@ -193,5 +214,5 @@ Fl_Button::Fl_Button(int X, int Y, int W, int H, const char *L) } // -// End of "$Id: Fl_Button.cxx 7476 2010-04-09 22:18:05Z matt $". +// End of "$Id: Fl_Button.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Chart.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Chart.cxx index 28004c901..5af4ed218 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Chart.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Chart.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Chart.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Chart.cxx 7903 2010-11-28 21:06:39Z matt $" // // Forms-compatible chart widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -432,5 +432,5 @@ void Fl_Chart::maxsize(int m) { } // -// End of "$Id: Fl_Chart.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Chart.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Check_Browser.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Check_Browser.cxx index 77284c8cc..4355119a7 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Check_Browser.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Check_Browser.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Check_Browser.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Check_Browser.cxx 8354 2011-02-01 15:41:04Z manolo $" // // Fl_Check_Browser header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -166,15 +166,18 @@ int Fl_Check_Browser::item_selected(void *v) const { return i->selected; } /** - Add a new unchecked line to the end of the browser. The text is copied - using the strdup() function. It may also be NULL to make - a blank line. The second form can set the item checked. + Add a new unchecked line to the end of the browser. + \see add(char *s, int b) */ int Fl_Check_Browser::add(char *s) { return (add(s, 0)); } -/** See int Fl_Check_Browser::add(char *s) */ +/** + Add a new line to the end of the browser. The text is copied + using the strdup() function. It may also be NULL to make + a blank line. It can set the item checked if \p b is not 0. + */ int Fl_Check_Browser::add(char *s, int b) { cb_item *p = (cb_item *)malloc(sizeof(cb_item)); p->next = 0; @@ -322,5 +325,5 @@ int Fl_Check_Browser::handle(int event) { } // -// End of "$Id: Fl_Check_Browser.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Check_Browser.cxx 8354 2011-02-01 15:41:04Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Check_Button.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Check_Button.cxx index d6f24b90c..0baeafcd5 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Check_Button.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Check_Button.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Check_Button.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Check_Button.cxx 7903 2010-11-28 21:06:39Z matt $" // // Check button widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Choice.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Choice.cxx index a31bdc873..6f3b06ffe 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Choice.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Choice.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Choice.cxx 6873 2009-09-16 07:06:41Z AlbrechtS $" +// "$Id: Fl_Choice.cxx 7903 2010-11-28 21:06:39Z matt $" // // Choice widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -209,5 +209,5 @@ int Fl_Choice::handle(int e) { } // -// End of "$Id: Fl_Choice.cxx 6873 2009-09-16 07:06:41Z AlbrechtS $". +// End of "$Id: Fl_Choice.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Clock.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Clock.cxx index f00ba255f..75a757c2f 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Clock.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Clock.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Clock.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Clock.cxx 7903 2010-11-28 21:06:39Z matt $" // // Clock widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -214,5 +214,5 @@ Fl_Clock::~Fl_Clock() { } // -// End of "$Id: Fl_Clock.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Clock.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Color_Chooser.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Color_Chooser.cxx index eb88f8d22..d5bd6e6a1 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Color_Chooser.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Color_Chooser.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Color_Chooser.cxx 7347 2010-03-27 16:35:14Z AlbrechtS $" +// "$Id: Fl_Color_Chooser.cxx 7981 2010-12-08 23:53:04Z greg.ercolano $" // // Color chooser for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -455,6 +455,13 @@ void Fl_Color_Chooser::mode_cb(Fl_Widget* o, void*) { c->set_valuators(); } +void Fl_Color_Chooser::mode(int newMode) +{ + choice.value(newMode); + choice.do_callback(); +} + + //////////////////////////////////////////////////////////////// /** @@ -553,15 +560,17 @@ static void cc_cancel_cb (Fl_Widget *o, void *p) { @{ */ /** \brief Pops up a window to let the user pick an arbitrary RGB color. + \note \#include \image html fl_color_chooser.jpg - \image latex fl_color_chooser.eps "fl_color_chooser" width=8cm - \param[in] name title label for the window - \param[in,out] r, g, b color components in the range 0.0 to 1.0. + \image latex fl_color_chooser.jpg "fl_color_chooser" width=8cm + \param[in] name Title label for the window + \param[in,out] r, g, b Color components in the range 0.0 to 1.0. + \param[in] cmode Optional mode for color chooser. See mode(int). Default -1 if none (rgb mode). \retval 1 if user confirms the selection \retval 0 if user cancels the dialog \relates Fl_Color_Chooser */ -int fl_color_chooser(const char* name, double& r, double& g, double& b) { +int fl_color_chooser(const char* name, double& r, double& g, double& b, int cmode) { int ret = 0; Fl_Window window(215,200,name); window.callback(cc_cancel_cb,&ret); @@ -578,6 +587,7 @@ int fl_color_chooser(const char* name, double& r, double& g, double& b) { window.resizable(chooser); chooser.rgb(r,g,b); chooser.callback(chooser_cb, &ok_color); + if (cmode!=-1) chooser.mode(cmode); window.end(); window.set_modal(); window.hotspot(window); @@ -593,19 +603,21 @@ int fl_color_chooser(const char* name, double& r, double& g, double& b) { /** \brief Pops up a window to let the user pick an arbitrary RGB color. + \note \#include \image html fl_color_chooser.jpg - \image latex fl_color_chooser.eps "fl_color_chooser" width=8cm - \param[in] name title label for the window - \param[in,out] r, g, b color components in the range 0 to 255. + \image latex fl_color_chooser.jpg "fl_color_chooser" width=8cm + \param[in] name Title label for the window + \param[in,out] r, g, b Color components in the range 0 to 255. + \param[in] cmode Optional mode for color chooser. See mode(int). Default -1 if none (rgb mode). \retval 1 if user confirms the selection \retval 0 if user cancels the dialog \relates Fl_Color_Chooser */ -int fl_color_chooser(const char* name, uchar& r, uchar& g, uchar& b) { +int fl_color_chooser(const char* name, uchar& r, uchar& g, uchar& b, int cmode) { double dr = r/255.0; double dg = g/255.0; double db = b/255.0; - if (fl_color_chooser(name,dr,dg,db)) { + if (fl_color_chooser(name,dr,dg,db,cmode)) { r = uchar(255*dr+.5); g = uchar(255*dg+.5); b = uchar(255*db+.5); @@ -613,7 +625,8 @@ int fl_color_chooser(const char* name, uchar& r, uchar& g, uchar& b) { } return 0; } + /** @} */ // -// End of "$Id: Fl_Color_Chooser.cxx 7347 2010-03-27 16:35:14Z AlbrechtS $". +// End of "$Id: Fl_Color_Chooser.cxx 7981 2010-12-08 23:53:04Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Counter.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Counter.cxx index dd0a43674..7f895a751 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Counter.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Counter.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Counter.cxx 7162 2010-02-26 21:10:46Z matt $" +// "$Id: Fl_Counter.cxx 7903 2010-11-28 21:06:39Z matt $" // // Counter widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -207,5 +207,5 @@ Fl_Counter::Fl_Counter(int X, int Y, int W, int H, const char* L) } // -// End of "$Id: Fl_Counter.cxx 7162 2010-02-26 21:10:46Z matt $". +// End of "$Id: Fl_Counter.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Device.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Device.cxx index b37ad5db6..e2808ea7c 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Device.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Device.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Device.cxx 7659 2010-07-01 13:21:32Z manolo $" +// "$Id: Fl_Device.cxx 8504 2011-03-04 16:48:10Z manolo $" // // implementation of Fl_Device class for the Fast Light Tool Kit (FLTK). // -// Copyright 2010 by Bill Spitzak and others. +// Copyright 2010-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -29,18 +29,18 @@ #include #include -const char *Fl_Device::device_type = "Fl_Device"; -const char *Fl_Surface_Device::device_type = "Fl_Surface_Device"; -const char *Fl_Display_Device::device_type = "Fl_Display_Device"; -const char *Fl_Graphics_Driver::device_type = "Fl_Graphics_Driver"; +const char *Fl_Device::class_id = "Fl_Device"; +const char *Fl_Surface_Device::class_id = "Fl_Surface_Device"; +const char *Fl_Display_Device::class_id = "Fl_Display_Device"; +const char *Fl_Graphics_Driver::class_id = "Fl_Graphics_Driver"; #if defined(__APPLE__) || defined(FL_DOXYGEN) -const char *Fl_Quartz_Graphics_Driver::device_type = "Fl_Quartz_Graphics_Driver"; +const char *Fl_Quartz_Graphics_Driver::class_id = "Fl_Quartz_Graphics_Driver"; #endif #if defined(WIN32) || defined(FL_DOXYGEN) -const char *Fl_GDI_Graphics_Driver::device_type = "Fl_GDI_Graphics_Driver"; +const char *Fl_GDI_Graphics_Driver::class_id = "Fl_GDI_Graphics_Driver"; #endif #if !(defined(__APPLE__) || defined(WIN32)) -const char *Fl_Xlib_Graphics_Driver::device_type = "Fl_Xlib_Graphics_Driver"; +const char *Fl_Xlib_Graphics_Driver::class_id = "Fl_Xlib_Graphics_Driver"; #endif @@ -48,9 +48,43 @@ const char *Fl_Xlib_Graphics_Driver::device_type = "Fl_Xlib_Graphics_Driver"; void Fl_Surface_Device::set_current(void) { fl_graphics_driver = _driver; - fl_surface = this; + _surface = this; } +const Fl_Graphics_Driver::matrix Fl_Graphics_Driver::m0 = {1, 0, 0, 1, 0, 0}; + +Fl_Graphics_Driver::Fl_Graphics_Driver() { + font_ = 0; + size_ = 0; + sptr=0; rstackptr=0; + fl_clip_state_number=0; + m = m0; + fl_matrix = &m; + p = (XPOINT *)0; + font_descriptor_ = NULL; +}; + +void Fl_Graphics_Driver::text_extents(const char*t, int n, int& dx, int& dy, int& w, int& h) +{ + w = (int)width(t, n); + h = - height(); + dx = 0; + dy = descent(); +} + +Fl_Display_Device::Fl_Display_Device(Fl_Graphics_Driver *graphics_driver) : Fl_Surface_Device( graphics_driver) { +#ifdef __APPLE__ + SInt32 versionMajor = 0; + SInt32 versionMinor = 0; + SInt32 versionBugFix = 0; + Gestalt( gestaltSystemVersionMajor, &versionMajor ); + Gestalt( gestaltSystemVersionMinor, &versionMinor ); + Gestalt( gestaltSystemVersionBugFix, &versionBugFix ); + fl_mac_os_version = versionMajor * 10000 + versionMinor * 100 + versionBugFix; +#endif +}; + + // -// End of "$Id: Fl_Device.cxx 7659 2010-07-01 13:21:32Z manolo $". +// End of "$Id: Fl_Device.cxx 8504 2011-03-04 16:48:10Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Dial.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Dial.cxx index def4c7103..2adaabbea 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Dial.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Dial.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Dial.cxx 7162 2010-02-26 21:10:46Z matt $" +// "$Id: Fl_Dial.cxx 7903 2010-11-28 21:06:39Z matt $" // // Circular dial widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -162,5 +162,5 @@ Fl_Dial::Fl_Dial(int X, int Y, int W, int H, const char* l) } // -// End of "$Id: Fl_Dial.cxx 7162 2010-02-26 21:10:46Z matt $". +// End of "$Id: Fl_Dial.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Double_Window.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Double_Window.cxx index 13725b5d1..927eccbe1 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Double_Window.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Double_Window.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Double_Window.cxx 7671 2010-07-09 17:31:33Z manolo $" +// "$Id: Fl_Double_Window.cxx 8383 2011-02-06 12:20:16Z AlbrechtS $" // // Double-buffered window code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -52,9 +52,12 @@ static int can_xdbe() { int numscreens = 1; XdbeScreenVisualInfo *a = XdbeGetVisualInfo(fl_display,&root,&numscreens); if (!a) return 0; - for (int j = 0; j < a->count; j++) + for (int j = 0; j < a->count; j++) { if (a->visinfo[j].visual == fl_visual->visualid - /*&& a->visinfo[j].perflevel > 0*/) {use_xdbe = 1; break;} + /*&& a->visinfo[j].perflevel > 0*/) { + use_xdbe = 1; break; + } + } XdbeFreeVisualInfo(a); } return use_xdbe; @@ -67,8 +70,17 @@ void Fl_Double_Window::show() { static void fl_copy_offscreen_to_display(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy); +/** \addtogroup fl_drawings + @{ + */ +/** Copy a rectangular area of the given offscreen buffer into the current drawing destination. + \param x,y position where to draw the copied rectangle + \param w,h size of the copied rectangle + \param pixmap offscreen buffer containing the rectangle to copy + \param srcx,srcy origin in offscreen buffer of rectangle to copy + */ void fl_copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy) { - if( fl_graphics_driver == fl_display_device->driver()) { + if (fl_graphics_driver == Fl_Display_Device::display_device()->driver()) { fl_copy_offscreen_to_display(x, y, w, h, pixmap, srcx, srcy); } else { // when copy is not to the display @@ -76,14 +88,15 @@ void fl_copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx uchar *img = fl_read_image(NULL, srcx, srcy, w, h, 0); fl_end_offscreen(); fl_draw_image(img, x, y, w, h, 3, 0); - delete img; + delete[] img; } } +/** @} */ #if defined(USE_X11) static void fl_copy_offscreen_to_display(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy) { - XCopyArea(fl_display, pixmap, fl_window, fl_gc, srcx, srcy, w, h, x, y); + XCopyArea(fl_display, pixmap, fl_window, fl_gc, srcx, srcy, w, h, x, y); } @@ -170,35 +183,26 @@ void fl_copy_offscreen_with_alpha(int x,int y,int w,int h,HBITMAP bitmap,int src BOOL alpha_ok = 0; // first try to alpha blend // if to printer, always try alpha_blend - int to_display = Fl_Surface_Device::surface()->type() == Fl_Display_Device::device_type; // true iff display output - if ( (to_display && fl_can_do_alpha_blending()) || Fl_Surface_Device::surface()->type() == Fl_Printer::device_type) { + int to_display = Fl_Surface_Device::surface()->class_name() == Fl_Display_Device::class_id; // true iff display output + if ( (to_display && fl_can_do_alpha_blending()) || Fl_Surface_Device::surface()->class_name() == Fl_Printer::class_id) { alpha_ok = fl_alpha_blend(fl_gc, x, y, w, h, new_gc, srcx, srcy, w, h, blendfunc); - } + } // if that failed (it shouldn't), still copy the bitmap over, but now alpha is 1 if (!alpha_ok) { BitBlt(fl_gc, x, y, w, h, new_gc, srcx, srcy, SRCCOPY); - } + } RestoreDC(new_gc, save); DeleteDC(new_gc); } extern void fl_restore_clip(); -#elif defined(__APPLE_QUARTZ__) +#elif defined(__APPLE_QUARTZ__) || defined(FL_DOXYGEN) char fl_can_do_alpha_blending() { return 1; } -Fl_Offscreen fl_create_offscreen(int w, int h) { - void *data = calloc(w*h,4); - CGColorSpaceRef lut = CGColorSpaceCreateDeviceRGB(); - CGContextRef ctx = CGBitmapContextCreate( - data, w, h, 8, w*4, lut, kCGImageAlphaNoneSkipLast); - CGColorSpaceRelease(lut); - return (Fl_Offscreen)ctx; -} - Fl_Offscreen fl_create_offscreen_with_alpha(int w, int h) { void *data = calloc(w*h,4); CGColorSpaceRef lut = CGColorSpaceCreateDeviceRGB(); @@ -208,8 +212,25 @@ Fl_Offscreen fl_create_offscreen_with_alpha(int w, int h) { return (Fl_Offscreen)ctx; } -static void bmProviderRelease (void *src, const void *data, size_t size) -{ +/** \addtogroup fl_drawings + @{ + */ + +/** + Creation of an offscreen graphics buffer. + \param w,h width and height in pixels of the buffer. + \return the created graphics buffer. + */ +Fl_Offscreen fl_create_offscreen(int w, int h) { + void *data = calloc(w*h,4); + CGColorSpaceRef lut = CGColorSpaceCreateDeviceRGB(); + CGContextRef ctx = CGBitmapContextCreate( + data, w, h, 8, w*4, lut, kCGImageAlphaNoneSkipLast); + CGColorSpaceRelease(lut); + return (Fl_Offscreen)ctx; +} + +static void bmProviderRelease (void *src, const void *data, size_t size) { CFIndex count = CFGetRetainCount(src); CFRelease(src); if(count == 1) free((void*)data); @@ -238,6 +259,9 @@ static void fl_copy_offscreen_to_display(int x,int y,int w,int h,Fl_Offscreen os CGDataProviderRelease(src_bytes); } +/** Deletion of an offscreen graphics buffer. + \param ctx the buffer to be deleted. + */ void fl_delete_offscreen(Fl_Offscreen ctx) { if (!ctx) return; void *data = CGBitmapContextGetData((CGContextRef)ctx); @@ -252,9 +276,12 @@ static CGContextRef stack_gc[stack_max]; static Window stack_window[stack_max]; static Fl_Surface_Device *_ss; +/** Send all subsequent drawing commands to this offscreen buffer. + \param ctx the offscreen buffer. + */ void fl_begin_offscreen(Fl_Offscreen ctx) { - _ss = fl_surface; - fl_display_device->set_current(); + _ss = Fl_Surface_Device::surface(); + Fl_Display_Device::display_device()->set_current(); if (stack_ixset_current(); } +/** @} */ + extern void fl_restore_clip(); #else @@ -307,8 +338,7 @@ void Fl_Double_Window::flush(int eraseoverlay) { if (!myi->other_xid) { #if USE_XDBE if (can_xdbe()) { - myi->other_xid = - XdbeAllocateBackBufferName(fl_display, fl_xid(this), XdbeCopied); + myi->other_xid = XdbeAllocateBackBufferName(fl_display, fl_xid(this), XdbeCopied); myi->backbuffer_bad = 1; } else #endif @@ -360,7 +390,7 @@ void Fl_Double_Window::flush(int eraseoverlay) { RestoreDC(fl_gc, save); DeleteDC(fl_gc); fl_gc = _sgc; - //# if defined(USE_CAIRO) + //# if defined(FLTK_USE_CAIRO) //if Fl::cairo_autolink_context() Fl::cairo_make_current(this); // capture gc changes automatically to update the cairo context adequately //# endif #elif defined(__APPLE__) @@ -428,5 +458,5 @@ Fl_Double_Window::~Fl_Double_Window() { } // -// End of "$Id: Fl_Double_Window.cxx 7671 2010-07-09 17:31:33Z manolo $". +// End of "$Id: Fl_Double_Window.cxx 8383 2011-02-06 12:20:16Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_File_Browser.cxx b/plugins/zynaddsubfx/fltk/src/Fl_File_Browser.cxx index 78e21aa33..98c5ff1dd 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_File_Browser.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_File_Browser.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_File_Browser.cxx 7352 2010-03-29 10:47:11Z matt $" +// "$Id: Fl_File_Browser.cxx 8063 2010-12-19 21:20:10Z matt $" // // Fl_File_Browser routines. // -// Copyright 1999-2009 by Michael Sweet. +// Copyright 1999-2010 by Michael Sweet. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -536,7 +536,7 @@ Fl_File_Browser::load(const char *directory,// I - Directory to load // UNIX code uses /etc/fstab or similar... // FILE *mtab; // /etc/mtab or /etc/mnttab file - char line[1024]; // Input line + char line[FL_PATH_MAX]; // Input line // // Open the file that contains a list of mounted filesystems... @@ -639,5 +639,5 @@ Fl_File_Browser::filter(const char *pattern) // I - Pattern string // -// End of "$Id: Fl_File_Browser.cxx 7352 2010-03-29 10:47:11Z matt $". +// End of "$Id: Fl_File_Browser.cxx 8063 2010-12-19 21:20:10Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_File_Chooser.cxx b/plugins/zynaddsubfx/fltk/src/Fl_File_Chooser.cxx index 6a4ba00d3..4d879d2af 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_File_Chooser.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_File_Chooser.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_File_Chooser.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_File_Chooser.cxx 8786 2011-06-07 11:41:36Z manolo $" // // Fl_File_Chooser dialog for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -88,6 +88,13 @@ void Fl_File_Chooser::cb_previewButton(Fl_Check_Button* o, void* v) { ((Fl_File_Chooser*)(o->parent()->parent()->parent()->user_data()))->cb_previewButton_i(o,v); } +void Fl_File_Chooser::cb_showHiddenButton_i(Fl_Check_Button*, void*) { + showHidden(showHiddenButton->value()); +} +void Fl_File_Chooser::cb_showHiddenButton(Fl_Check_Button* o, void* v) { + ((Fl_File_Chooser*)(o->parent()->parent()->parent()->user_data()))->cb_showHiddenButton_i(o,v); +} + void Fl_File_Chooser::cb_fileName_i(Fl_File_Input*, void*) { fileNameCB(); } @@ -208,6 +215,11 @@ Fl_File_Chooser::Fl_File_Chooser(const char *d, const char *p, int t, const char previewButton->callback((Fl_Callback*)cb_previewButton); previewButton->label(preview_label); } // Fl_Check_Button* previewButton + { showHiddenButton = new Fl_Check_Button(115, 275, 165, 20, "Show hidden files"); + showHiddenButton->down_box(FL_DOWN_BOX); + showHiddenButton->callback((Fl_Callback*)cb_showHiddenButton); + showHiddenButton->label(hidden_label); + } // Fl_Check_Button* showHiddenButton { Fl_Box* o = new Fl_Box(115, 275, 365, 20); Fl_Group::current()->resizable(o); } // Fl_Box* o @@ -286,31 +298,31 @@ Fl_File_Chooser::Fl_File_Chooser(const char *d, const char *p, int t, const char favWindow->end(); } // Fl_Double_Window* favWindow callback_ = 0; -data_ = 0; -directory_[0] = 0; -window->size_range(window->w(), window->h(), Fl::w(), Fl::h()); -type(t); -filter(p); -update_favorites(); -value(d); -type(t); -int e; -prefs_.get("preview", e, 1); -preview(e); -Fl_Group::current(prev_current); + data_ = 0; + directory_[0] = 0; + window->size_range(window->w(), window->h(), Fl::w(), Fl::h()); + type(t); + filter(p); + update_favorites(); + value(d); + type(t); + int e; + prefs_.get("preview", e, 1); + preview(e); + Fl_Group::current(prev_current); ext_group=(Fl_Widget*)0; } Fl_File_Chooser::~Fl_File_Chooser() { Fl::remove_timeout((Fl_Timeout_Handler)previewCB, this); -if(ext_group)window->remove(ext_group); -delete window; -delete favWindow; + if(ext_group)window->remove(ext_group); + delete window; + delete favWindow; } void Fl_File_Chooser::callback(void (*cb)(Fl_File_Chooser *, void *), void *d ) { callback_ = cb; -data_ = d; + data_ = d; } void Fl_File_Chooser::color(Fl_Color c) { @@ -335,7 +347,7 @@ int Fl_File_Chooser::filter_value() { void Fl_File_Chooser::filter_value(int f) { showChoice->value(f); -showChoiceCB(); + showChoiceCB(); } void Fl_File_Chooser::hide() { @@ -360,27 +372,17 @@ const char * Fl_File_Chooser::label() { void Fl_File_Chooser::ok_label(const char *l) { okButton->label(l); -int w=0, h=0; -okButton->measure_label(w, h); -okButton->resize(cancelButton->x() - 50 - w, cancelButton->y(), - w + 40, 25); -okButton->parent()->init_sizes(); + int w=0, h=0; + okButton->measure_label(w, h); + okButton->resize(cancelButton->x() - 50 - w, cancelButton->y(), + w + 40, 25); + okButton->parent()->init_sizes(); } const char * Fl_File_Chooser::ok_label() { return (okButton->label()); } -void Fl_File_Chooser::show() { - window->hotspot(fileList); -window->show(); -Fl::flush(); -fl_cursor(FL_CURSOR_WAIT); -rescan_keep_filename(); -fl_cursor(FL_CURSOR_DEFAULT); -fileName->take_focus(); -} - int Fl_File_Chooser::shown() { return window->shown(); } @@ -411,18 +413,18 @@ Fl_Fontsize Fl_File_Chooser::textsize() { void Fl_File_Chooser::type(int t) { type_ = t; -if (t & MULTI) - fileList->type(FL_MULTI_BROWSER); -else - fileList->type(FL_HOLD_BROWSER); -if (t & CREATE) - newButton->activate(); -else - newButton->deactivate(); -if (t & DIRECTORY) - fileList->filetype(Fl_File_Browser::DIRECTORIES); -else - fileList->filetype(Fl_File_Browser::FILES); + if (t & MULTI) + fileList->type(FL_MULTI_BROWSER); + else + fileList->type(FL_HOLD_BROWSER); + if (t & CREATE) + newButton->activate(); + else + newButton->deactivate(); + if (t & DIRECTORY) + fileList->filetype(Fl_File_Browser::DIRECTORIES); + else + fileList->filetype(Fl_File_Browser::FILES); } int Fl_File_Chooser::type() { @@ -445,29 +447,29 @@ Fl_Widget* Fl_File_Chooser::add_extra(Fl_Widget* gr) { Fl_Widget* ret=ext_group; if (gr==ext_group) { return ret; - } - if (ext_group) { - int sh=ext_group->h()+4; -Fl_Widget* svres=window->resizable(); -window->resizable(NULL); -window->size(window->w(),window->h()-sh); -window->remove(ext_group); -ext_group=NULL; -window->resizable(svres); - } - if (gr) { - int nh=window->h()+gr->h()+4; -Fl_Widget* svres=window->resizable(); -window->resizable(NULL); -window->size(window->w(),nh); -gr->position(2,okButton->y()+okButton->h()+2); -window->add(gr); -ext_group=gr; -window->resizable(svres); - } - return ret; + } + if (ext_group) { + int sh=ext_group->h()+4; + Fl_Widget* svres=window->resizable(); + window->resizable(NULL); + window->size(window->w(),window->h()-sh); + window->remove(ext_group); + ext_group=NULL; + window->resizable(svres); + } + if (gr) { + int nh=window->h()+gr->h()+4; + Fl_Widget* svres=window->resizable(); + window->resizable(NULL); + window->size(window->w(),nh); + gr->position(2,okButton->y()+okButton->h()+2); + window->add(gr); + ext_group=gr; + window->resizable(svres); + } + return ret; } // -// End of "$Id: Fl_File_Chooser.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_File_Chooser.cxx 8786 2011-06-07 11:41:36Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_File_Chooser.fl b/plugins/zynaddsubfx/fltk/src/Fl_File_Chooser.fl index 84716418b..dc22a7269 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_File_Chooser.fl +++ b/plugins/zynaddsubfx/fltk/src/Fl_File_Chooser.fl @@ -3,11 +3,11 @@ version 1.0300 header_name {../FL/Fl_File_Chooser.H} code_name {.cxx} comment {// -// "$Id: Fl_File_Chooser.fl 6678 2009-03-13 23:36:09Z AlbrechtS $" +// "$Id: Fl_File_Chooser.fl 8786 2011-06-07 11:41:36Z manolo $" // // Fl_File_Chooser dialog for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -40,8 +40,8 @@ class FL_EXPORT Fl_File_Chooser {open decl {static Fl_Preferences prefs_;} {} decl {void (*callback_)(Fl_File_Chooser*, void *);} {} decl {void *data_;} {} - decl {char directory_[1024];} {} - decl {char pattern_[1024];} {} + decl {char directory_[FL_PATH_MAX];} {} + decl {char pattern_[FL_PATH_MAX];} {} decl {char preview_text_[2048];} {} decl {int type_;} {} decl {void favoritesButtonCB();} {} @@ -115,6 +115,12 @@ window->hide();} open xywh {10 275 73 20} down_box DOWN_BOX shortcut 0x80070 value 1 code0 {previewButton->label(preview_label);} } + Fl_Check_Button showHiddenButton { + label {Show hidden files} + callback {showHidden(showHiddenButton->value());} + xywh {115 275 165 20} down_box DOWN_BOX + code0 {showHiddenButton->label(hidden_label);} + } Fl_Box {} { private xywh {115 275 365 20} resizable } @@ -301,19 +307,15 @@ okButton->parent()->init_sizes();} {} } decl {int preview() const { return previewButton->value(); }} {public } + decl {void showHidden(int e);} {private + } + decl {void remove_hidden_files();} {private + } decl {void rescan();} {public } decl {void rescan_keep_filename();} {public } - Function {show()} {open return_type void - } { - code {window->hotspot(fileList); -window->show(); -Fl::flush(); -fl_cursor(FL_CURSOR_WAIT); -rescan_keep_filename(); -fl_cursor(FL_CURSOR_DEFAULT); -fileName->take_focus();} {} + decl {void show();} {public } Function {shown()} {return_type int } { @@ -418,6 +420,9 @@ else decl {static const char *show_label;} { comment {[standard text may be customized at run-time]} public } + decl {static const char *hidden_label;} { + comment {[standard text may be customized at run-time]} public + } decl {static Fl_File_Sort_F *sort;} { comment {the sort function that is used when loading the contents of a directory.} public @@ -469,6 +474,6 @@ decl {FL_EXPORT void fl_file_chooser_ok_label(const char*l);} {public comment { // -// End of "$Id: Fl_File_Chooser.fl 6678 2009-03-13 23:36:09Z AlbrechtS $". +// End of "$Id: Fl_File_Chooser.fl 8786 2011-06-07 11:41:36Z manolo $". //} {in_source in_header } diff --git a/plugins/zynaddsubfx/fltk/src/Fl_File_Chooser2.cxx b/plugins/zynaddsubfx/fltk/src/Fl_File_Chooser2.cxx index fda39ef6a..861f73997 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_File_Chooser2.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_File_Chooser2.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_File_Chooser2.cxx 7672 2010-07-10 09:44:45Z matt $" +// "$Id: Fl_File_Chooser2.cxx 8785 2011-06-06 16:11:22Z manolo $" // // More Fl_File_Chooser routines. // -// Copyright 1999-2009 by Michael Sweet. +// Copyright 1999-2011 by Michael Sweet. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -34,7 +34,7 @@ dialog that supports various selection modes. \image html Fl_File_Chooser.jpg - \image latex Fl_File_Chooser.eps "Fl_File_Chooser" width=12cm + \image latex Fl_File_Chooser.jpg "Fl_File_Chooser" width=12cm The Fl_File_Chooser class also exports several static values that may be used to localize or customize the appearance of all file chooser @@ -74,7 +74,11 @@ "My Computer" (WIN32)
    "File Systems" (all others) - + + hidden_label + "Show hidden files:" + + manage_favorites_label "Manage Favorites" @@ -98,7 +102,7 @@ show_label "Show:" - + sort fl_numericsort @@ -165,19 +169,19 @@ Destroys the widget and frees all memory used by it.*/ /** \fn void Fl_File_Chooser::color(Fl_Color c) - Sets or gets the background color of the Fl_File_Browser list.*/ + Sets the background color of the Fl_File_Browser list.*/ /** \fn Fl_Color Fl_File_Chooser::color() - Sets or gets the background color of the Fl_File_Browser list.*/ + Gets the background color of the Fl_File_Browser list.*/ /** \fn int Fl_File_Chooser::count() Returns the number of selected files.*/ /** \fn void Fl_File_Chooser::directory(const char *pathname) - Sets or gets the current directory.*/ + Sets the current directory.*/ /** \fn const char *Fl_File_Chooser::directory() - Sets or gets the current directory.*/ + Gets the current directory.*/ /** \fn void Fl_File_Chooser::filter(const char *pattern) Sets or gets the current filename filter patterns. The filter @@ -195,36 +199,36 @@ See void filter(const char *pattern)*/ /** \fn void Fl_File_Chooser::filter_value(int f) - Sets or gets the current filename filter selection.*/ + Sets the current filename filter selection.*/ /** \fn int Fl_File_Chooser::filter_value() - Sets or gets the current filename filter selection.*/ + Gets the current filename filter selection.*/ /** \fn void Fl_File_Chooser::hide() Hides the Fl_File_Chooser window.*/ /** \fn void Fl_File_Chooser::iconsize(uchar s) - Sets or gets the size of the icons in the Fl_File_Browser. By + Sets the size of the icons in the Fl_File_Browser. By default the icon size is set to 1.5 times the textsize(). */ /** \fn uchar Fl_File_Chooser::iconsize() - Sets or gets the size of the icons in the Fl_File_Browser. By + Gets the size of the icons in the Fl_File_Browser. By default the icon size is set to 1.5 times the textsize(). */ /** \fn void Fl_File_Chooser::label(const char *l) - Sets or gets the title bar text for the Fl_File_Chooser.*/ + Sets the title bar text for the Fl_File_Chooser.*/ /** \fn const char *Fl_File_Chooser::label() - Sets or gets the title bar text for the Fl_File_Chooser.*/ + Gets the title bar text for the Fl_File_Chooser.*/ /** \fn void Fl_File_Chooser::ok_label(const char *l) - Sets or gets the label for the "ok" button in the Fl_File_Chooser. + Sets the label for the "ok" button in the Fl_File_Chooser. */ /** \fn const char *Fl_File_Chooser::ok_label() - Sets or gets the label for the "ok" button in the Fl_File_Chooser. + Gets the label for the "ok" button in the Fl_File_Chooser. */ /** \fn int Fl_File_Chooser::preview() const @@ -237,48 +241,48 @@ Shows the Fl_File_Chooser window.*/ /** \fn void Fl_File_Chooser::textcolor(Fl_Color c) - Sets or gets the current Fl_File_Browser text color.*/ + Sets the current Fl_File_Browser text color.*/ /** \fn Fl_Color Fl_File_Chooser::textcolor() - Sets or gets the current Fl_File_Browser text color.*/ + Gets the current Fl_File_Browser text color.*/ /** \fn void Fl_File_Chooser::textfont(Fl_Font f) - Sets or gets the current Fl_File_Browser text font.*/ + Sets the current Fl_File_Browser text font.*/ /** \fn Fl_Font Fl_File_Chooser::textfont() - Sets or gets the current Fl_File_Browser text font.*/ + Gets the current Fl_File_Browser text font.*/ /** \fn void Fl_File_Chooser::textsize(Fl_Fontsize s) - Sets or gets the current Fl_File_Browser text size.*/ + Sets the current Fl_File_Browser text size.*/ /** \fn Fl_Fontsize Fl_File_Chooser::textsize() - Sets or gets the current Fl_File_Browser text size.*/ + Gets the current Fl_File_Browser text size.*/ /** \fn void Fl_File_Chooser::type(int t) - Sets or gets the current type of Fl_File_Chooser.*/ + Sets the current type of Fl_File_Chooser.*/ /** \fn int Fl_File_Chooser::type() - Sets or gets the current type of Fl_File_Chooser.*/ + Gets the current type of Fl_File_Chooser.*/ -/** \fn const char *Fl_File_Chooser::value(const char *pathname) - Sets or gets the current value of the selected file. - - In the second form, \p file is a \c 1-based index into a list of - file names. The number of selected files is returned by - Fl_File_Chooser::count(). - - This sample code loops through all selected files: - \code - // Get list of filenames user selected from a MULTI chooser - for ( int t=1; t<=chooser->count(); t++ ) { - const char *filename = chooser->value(t); - ... - } - \endcode +/** \fn void Fl_File_Chooser::value(const char *pathname) + Sets the current value of the selected file. */ -/** \fn const char *Fl_File_Chooser::value(int file) - See const char *value(const char *pathname)*/ +/** \fn const char *Fl_File_Chooser::value(int f) + Gets the current value of the selected file(s). + \p f is a \c 1-based index into a list of + file names. The number of selected files is returned by + Fl_File_Chooser::count(). + + This sample code loops through all selected files: + \code + // Get list of filenames user selected from a MULTI chooser + for ( int t=1; t<=chooser->count(); t++ ) { + const char *filename = chooser->value(t); + ... + } + \endcode + */ /** \fn int Fl_File_Chooser::visible() Returns 1 if the Fl_File_Chooser window is visible.*/ @@ -343,6 +347,7 @@ #include #include #include +#include #include #include @@ -392,6 +397,7 @@ const char *Fl_File_Chooser::new_directory_tooltip = "Create a new directory."; const char *Fl_File_Chooser::preview_label = "Preview"; const char *Fl_File_Chooser::save_label = "Save"; const char *Fl_File_Chooser::show_label = "Show:"; +const char *Fl_File_Chooser::hidden_label = "Show hidden files"; Fl_File_Sort_F *Fl_File_Chooser::sort = fl_numericsort; @@ -460,7 +466,7 @@ Fl_File_Chooser::directory(const char *d)// I - Directory to change to #ifdef WIN32 // See if the filename contains backslashes... char *slash; // Pointer to slashes - char fixpath[1024]; // Path with slashes converted + char fixpath[FL_PATH_MAX]; // Path with slashes converted if (strchr(d, '\\')) { // Convert backslashes to slashes... strlcpy(fixpath, d, sizeof(fixpath)); @@ -524,8 +530,8 @@ void Fl_File_Chooser::favoritesButtonCB() { int v; // Current selection - char pathname[1024], // Pathname - menuname[2048]; // Menu name + char pathname[FL_PATH_MAX], // Pathname + menuname[FL_PATH_MAX]; // Menu name v = favoritesButton->value(); @@ -691,7 +697,7 @@ void Fl_File_Chooser::fileListCB() { char *filename, // New filename - pathname[1024]; // Full pathname to file + pathname[FL_PATH_MAX]; // Full pathname to file filename = (char *)fileList->text(fileList->value()); @@ -727,6 +733,7 @@ Fl_File_Chooser::fileListCB() { // Hide the window - picked the file... window->hide(); + if (callback_) (*callback_)(this, data_); } } else @@ -791,8 +798,8 @@ Fl_File_Chooser::fileNameCB() { char *filename, // New filename *slash, // Pointer to trailing slash - pathname[1024], // Full pathname to file - matchname[256]; // Matching filename + pathname[FL_PATH_MAX], // Full pathname to file + matchname[FL_PATH_MAX]; // Matching filename int i, // Looping var min_match, // Minimum number of matching chars max_match, // Maximum number of matching chars @@ -841,8 +848,8 @@ Fl_File_Chooser::fileNameCB() // Enter pressed - select or change directory... #if (defined(WIN32) && ! defined(__CYGWIN__)) || defined(__EMX__) if ((isalpha(pathname[0] & 255) && pathname[1] == ':' && !pathname[2]) || - _fl_filename_isdir_quick(pathname) && - compare_dirnames(pathname, directory_)) { + (_fl_filename_isdir_quick(pathname) && + compare_dirnames(pathname, directory_))) { #else if (_fl_filename_isdir_quick(pathname) && compare_dirnames(pathname, directory_)) { @@ -889,7 +896,7 @@ Fl_File_Chooser::fileNameCB() directory(pathname); if (filename[0]) { - char tempname[1024]; + char tempname[FL_PATH_MAX]; snprintf(tempname, sizeof(tempname), "%s/%s", directory_, filename); fileName->value(tempname); @@ -1000,7 +1007,7 @@ Fl_File_Chooser::filter(const char *p) // I - Pattern(s) *start, // Start of pattern *end; // End of pattern int allfiles; // Do we have a "*" pattern? - char temp[1024]; // Temporary pattern string + char temp[FL_PATH_MAX]; // Temporary pattern string // Make sure we have a pattern... @@ -1032,8 +1039,6 @@ Fl_File_Chooser::filter(const char *p) // I - Pattern(s) showChoice->add(custom_filter_label); - // TODO: add a menu item to switch hidden files on and off - showChoice->value(0); showChoiceCB(); } @@ -1047,7 +1052,7 @@ void Fl_File_Chooser::newdir() { const char *dir; // New directory name - char pathname[1024]; // Full path of directory + char pathname[FL_PATH_MAX]; // Full path of directory // Get a directory name from the user @@ -1128,7 +1133,7 @@ Fl_File_Chooser::previewCB(Fl_File_Chooser *fc) { // I - File chooser void Fl_File_Chooser::rescan() { - char pathname[1024]; // New pathname for filename field + char pathname[FL_PATH_MAX]; // New pathname for filename field // Clear the current filename @@ -1146,7 +1151,9 @@ Fl_File_Chooser::rescan() // Build the file list... fileList->load(directory_, sort); - +#ifndef WIN32 + if (!showHiddenButton->value()) remove_hidden_files(); +#endif // Update the preview box... update_preview(); } @@ -1166,12 +1173,14 @@ void Fl_File_Chooser::rescan_keep_filename() } int i; - char pathname[1024]; // New pathname for filename field + char pathname[FL_PATH_MAX]; // New pathname for filename field strlcpy(pathname, fn, sizeof(pathname)); // Build the file list... fileList->load(directory_, sort); - +#ifndef WIN32 + if (!showHiddenButton->value()) remove_hidden_files(); +#endif // Update the preview box... update_preview(); @@ -1212,7 +1221,7 @@ Fl_File_Chooser::showChoiceCB() const char *item, // Selected item *patstart; // Start of pattern char *patend; // End of pattern - char temp[1024]; // Temporary string for pattern + char temp[FL_PATH_MAX]; // Temporary string for pattern item = showChoice->text(showChoice->value()); @@ -1249,7 +1258,7 @@ void Fl_File_Chooser::update_favorites() { int i; // Looping var - char pathname[1024], // Pathname + char pathname[FL_PATH_MAX], // Pathname menuname[2048]; // Menu name const char *home; // Home directory @@ -1296,7 +1305,6 @@ Fl_File_Chooser::update_preview() int w, h; // Width and height of preview image int set = 0; // Set this flag as soon as a decent preview is found - if (!previewButton->value()) return; filename = value(); @@ -1345,7 +1353,7 @@ Fl_File_Chooser::update_preview() int bytes; char *ptr; - if (filename) fp = fopen(filename, "rb"); + if (filename) fp = fl_fopen(filename, "rb"); else fp = NULL; if (fp != NULL) { @@ -1403,7 +1411,7 @@ Fl_File_Chooser::update_preview() // Show the first 1k of text... int size = previewBox->h() / 20; if (size < 6) size = 6; - else if (size > 14) size = 14; + else if (size > FL_NORMAL_SIZE) size = FL_NORMAL_SIZE; previewBox->label(preview_text_); previewBox->align((Fl_Align)(FL_ALIGN_CLIP | FL_ALIGN_INSIDE | @@ -1455,7 +1463,7 @@ Fl_File_Chooser::value(int f) // I - File number int i; // Looping var int fcount; // Number of selected files const char *name; // Current filename - static char pathname[1024]; // Filename + directory + static char pathname[FL_PATH_MAX]; // Filename + directory name = fileName->value(); @@ -1502,7 +1510,7 @@ Fl_File_Chooser::value(const char *filename) int i, // Looping var fcount; // Number of items in list char *slash; // Directory separator - char pathname[1024]; // Local copy of filename + char pathname[FL_PATH_MAX]; // Local copy of filename // printf("Fl_File_Chooser::value(\"%s\")\n", filename == NULL ? "(null)" : filename); @@ -1518,7 +1526,7 @@ Fl_File_Chooser::value(const char *filename) #ifdef WIN32 // See if the filename contains backslashes... - char fixpath[1024]; // Path with slashes converted + char fixpath[FL_PATH_MAX]; // Path with slashes converted if (strchr(filename, '\\')) { // Convert backslashes to slashes... strlcpy(fixpath, filename, sizeof(fixpath)); @@ -1569,8 +1577,42 @@ Fl_File_Chooser::value(const char *filename) break; } } + +void Fl_File_Chooser::show() +{ + window->hotspot(fileList); + window->show(); + Fl::flush(); + fl_cursor(FL_CURSOR_WAIT); + rescan_keep_filename(); + fl_cursor(FL_CURSOR_DEFAULT); + fileName->take_focus(); +#ifdef WIN32 + showHiddenButton->hide(); +#endif +} +void Fl_File_Chooser::showHidden(int value) +{ + if (value) { + fileList->load(directory()); + } else { + remove_hidden_files(); + fileList->redraw(); + } +} + +void Fl_File_Chooser::remove_hidden_files() +{ + int count = fileList->size(); + for(int num = count; num >= 1; num--) { + const char *p = fileList->text(num); + if (*p == '.' && strcmp(p, "../") != 0) fileList->remove(num); + } + fileList->topline(1); +} + // // 'compare_dirnames()' - Compare two directory names. // @@ -1650,5 +1692,5 @@ unquote_pathname(char *dst, // O - Destination string // -// End of "$Id: Fl_File_Chooser2.cxx 7672 2010-07-10 09:44:45Z matt $". +// End of "$Id: Fl_File_Chooser2.cxx 8785 2011-06-06 16:11:22Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_File_Icon.cxx b/plugins/zynaddsubfx/fltk/src/Fl_File_Icon.cxx index 7de58c8b7..98069dda9 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_File_Icon.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_File_Icon.cxx @@ -1,11 +1,11 @@ // -// "$Id: Fl_File_Icon.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_File_Icon.cxx 7903 2010-11-28 21:06:39Z matt $" // // Fl_File_Icon routines. // // KDE icon code donated by Maarten De Boer. // -// Copyright 1999-2009 by Michael Sweet. +// Copyright 1999-2010 by Michael Sweet. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -488,5 +488,5 @@ Fl_File_Icon::labeltype(const Fl_Label *o, // I - Label data // -// End of "$Id: Fl_File_Icon.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_File_Icon.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_File_Input.cxx b/plugins/zynaddsubfx/fltk/src/Fl_File_Input.cxx index dfed97bdd..1bce8f41f 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_File_Input.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_File_Input.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_File_Input.cxx 7115 2010-02-20 17:40:07Z AlbrechtS $" +// "$Id: Fl_File_Input.cxx 8063 2010-12-19 21:20:10Z matt $" // // File_Input header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // Original version Copyright 1998 by Curtis Edwards. // // This library is free software; you can redistribute it and/or @@ -30,6 +30,7 @@ #include #include #include +#include #include #include "flstring.h" @@ -240,7 +241,7 @@ Fl_File_Input::handle_button(int event) // I - Event X; // Current X position char *start, // Start of path component *end; // End of path component - char newvalue[1024]; // New value + char newvalue[FL_PATH_MAX]; // New value // Figure out which button is being pressed... @@ -293,5 +294,5 @@ Fl_File_Input::handle_button(int event) // I - Event // -// End of "$Id: Fl_File_Input.cxx 7115 2010-02-20 17:40:07Z AlbrechtS $". +// End of "$Id: Fl_File_Input.cxx 8063 2010-12-19 21:20:10Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Font.H b/plugins/zynaddsubfx/fltk/src/Fl_Font.H index 4e79b3f93..f534e6f83 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Font.H +++ b/plugins/zynaddsubfx/fltk/src/Fl_Font.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Font.H 7351 2010-03-29 10:35:00Z matt $" +// "$Id: Fl_Font.H 8428 2011-02-15 15:47:22Z manolo $" // // Font definitions for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -51,6 +51,7 @@ class Fl_Font_Descriptor { public: /** linked list for this Fl_Fontdesc */ Fl_Font_Descriptor *next; + Fl_Fontsize size; /**< font size */ #ifndef FL_DOXYGEN // don't bother with platorm dependant details in the doc. # ifdef WIN32 HFONT fid; @@ -63,36 +64,34 @@ public: ATSUTextLayout layout; # if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 CTFontRef fontref; + // the unicode span is divided in 512 blocks of 128 characters + float *width[512]; // array of arrays of character widths # endif ATSUStyle style; short ascent, descent, q_width; -// short width[256]; -// bool knowWidths; char *q_name; - int size; # elif USE_XFT XftFont* font; - const char* encoding; - Fl_Fontsize size; + //const char* encoding; int angle; - FL_EXPORT Fl_Font_Descriptor(const char* xfontname); + FL_EXPORT Fl_Font_Descriptor(const char* xfontname, Fl_Fontsize size, int angle); # else XUtf8FontStruct* font; // X UTF-8 font information FL_EXPORT Fl_Font_Descriptor(const char* xfontname); # endif - Fl_Fontsize minsize; // smallest point size that should use this - Fl_Fontsize maxsize; // largest point size that should use this # if HAVE_GL unsigned int listbase;// base of display list, 0 = none +#ifndef __APPLE_QUARTZ__ char glok[64]; -# endif +#endif // __APPLE_QUARTZ__ +# endif // HAVE_GL FL_EXPORT ~Fl_Font_Descriptor(); #endif // FL_DOXYGEN }; -extern FL_EXPORT Fl_Font_Descriptor *fl_fontsize; // the currently selected one +//extern FL_EXPORT Fl_Font_Descriptor *fl_fontsize; // the currently selected one struct Fl_Fontdesc { const char *name; @@ -115,5 +114,5 @@ FL_EXPORT char *fl_find_fontsize(char *name); #endif // -// End of "$Id: Fl_Font.H 7351 2010-03-29 10:35:00Z matt $". +// End of "$Id: Fl_Font.H 8428 2011-02-15 15:47:22Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_GDI_Printer.cxx b/plugins/zynaddsubfx/fltk/src/Fl_GDI_Printer.cxx index 79c158732..49d25a785 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_GDI_Printer.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_GDI_Printer.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_GDI_Printer.cxx 7659 2010-07-01 13:21:32Z manolo $" +// "$Id: Fl_GDI_Printer.cxx 8467 2011-02-23 14:36:18Z manolo $" // // Support for WIN32 printing for the Fast Light Tool Kit (FLTK). // @@ -34,13 +34,12 @@ extern HWND fl_window; -Fl_Printer::Fl_System_Printer(void) : Fl_Paged_Device() { +Fl_System_Printer::Fl_System_Printer(void) : Fl_Paged_Device() { hPr = NULL; - type_ = device_type; - driver(fl_graphics_driver); + driver(Fl_Display_Device::display_device()->driver()); } -Fl_Printer::~Fl_System_Printer(void) { +Fl_System_Printer::~Fl_System_Printer(void) { if (hPr) end_job(); } @@ -61,7 +60,7 @@ static void WIN_SetupPrinterDeviceContext(HDC prHDC) } -int Fl_Printer::start_job (int pagecount, int *frompage, int *topage) +int Fl_System_Printer::start_job (int pagecount, int *frompage, int *topage) // returns 0 iff OK { DWORD commdlgerr; @@ -116,7 +115,7 @@ int Fl_Printer::start_job (int pagecount, int *frompage, int *topage) return err; } -void Fl_Printer::end_job (void) +void Fl_System_Printer::end_job (void) { Fl_Display_Device::display_device()->set_current(); if (hPr != NULL) { @@ -137,7 +136,7 @@ void Fl_Printer::end_job (void) hPr = NULL; } -void Fl_Printer::absolute_printable_rect(int *x, int *y, int *w, int *h) +void Fl_System_Printer::absolute_printable_rect(int *x, int *y, int *w, int *h) { POINT physPageSize; POINT pixelsPerInch; @@ -163,7 +162,7 @@ void Fl_Printer::absolute_printable_rect(int *x, int *y, int *w, int *h) origin(x_offset, y_offset); } -void Fl_Printer::margins(int *left, int *top, int *right, int *bottom) +void Fl_System_Printer::margins(int *left, int *top, int *right, int *bottom) { int x, y, w, h; absolute_printable_rect(&x, &y, &w, &h); @@ -173,14 +172,14 @@ void Fl_Printer::margins(int *left, int *top, int *right, int *bottom) if (bottom) *bottom = y; } -int Fl_Printer::printable_rect(int *w, int *h) +int Fl_System_Printer::printable_rect(int *w, int *h) { int x, y; absolute_printable_rect(&x, &y, w, h); return 0; } -int Fl_Printer::start_page (void) +int Fl_System_Printer::start_page (void) { int rsult, w, h; @@ -194,29 +193,29 @@ int Fl_Printer::start_page (void) } printable_rect(&w, &h); origin(0, 0); - image_list_ = NULL; fl_clip_region(0); gc = (void *)fl_gc; } return rsult; } -void Fl_Printer::origin (int deltax, int deltay) +void Fl_System_Printer::origin (int deltax, int deltay) { SetWindowOrgEx(fl_gc, - left_margin - deltax, - top_margin - deltay, NULL); x_offset = deltax; y_offset = deltay; } -void Fl_Printer::scale (float scalex, float scaley) +void Fl_System_Printer::scale (float scalex, float scaley) { + if (scaley == 0.) scaley = scalex; int w, h; SetWindowExtEx(fl_gc, (int)(720 / scalex + 0.5), (int)(720 / scaley + 0.5), NULL); printable_rect(&w, &h); origin(0, 0); } -void Fl_Printer::rotate (float rot_angle) +void Fl_System_Printer::rotate (float rot_angle) { XFORM mat; float angle; @@ -229,7 +228,7 @@ void Fl_Printer::rotate (float rot_angle) SetWorldTransform(fl_gc, &mat); } -int Fl_Printer::end_page (void) +int Fl_System_Printer::end_page (void) { int rsult; @@ -261,7 +260,7 @@ static void do_translate(int x, int y) ModifyWorldTransform(fl_gc, &tr, MWT_LEFTMULTIPLY); } -void Fl_Printer::translate (int x, int y) +void Fl_System_Printer::translate (int x, int y) { do_translate(x, y); if (translate_stack_depth < translate_stack_max) { @@ -271,7 +270,7 @@ void Fl_Printer::translate (int x, int y) } } -void Fl_Printer::untranslate (void) +void Fl_System_Printer::untranslate (void) { if (translate_stack_depth > 0) { translate_stack_depth--; @@ -282,5 +281,5 @@ void Fl_Printer::untranslate (void) #endif // WIN32 // -// End of "$Id: Fl_GDI_Printer.cxx 7659 2010-07-01 13:21:32Z manolo $". +// End of "$Id: Fl_GDI_Printer.cxx 8467 2011-02-23 14:36:18Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Gl_Choice.H b/plugins/zynaddsubfx/fltk/src/Fl_Gl_Choice.H index 3c5bef1a0..2b9aedb0e 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Gl_Choice.H +++ b/plugins/zynaddsubfx/fltk/src/Fl_Gl_Choice.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_Gl_Choice.H 7564 2010-04-28 07:21:41Z greg.ercolano $" +// "$Id: Fl_Gl_Choice.H 7913 2010-11-29 18:18:27Z greg.ercolano $" // // OpenGL definitions for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -120,5 +120,5 @@ void fl_delete_gl_context(GLContext); #endif // -// End of "$Id: Fl_Gl_Choice.H 7564 2010-04-28 07:21:41Z greg.ercolano $". +// End of "$Id: Fl_Gl_Choice.H 7913 2010-11-29 18:18:27Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Group.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Group.cxx index d77a75cfe..de7d4887b 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Group.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Group.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Group.cxx 7469 2010-04-07 23:17:33Z matt $" +// "$Id: Fl_Group.cxx 8184 2011-01-04 18:28:01Z matt $" // // Group widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -89,7 +89,8 @@ void Fl_Group::end() {current_ = parent();} Fl_Group *Fl_Group::current() {return current_;} /** - See static Fl_Group *Fl_Group::current() + Sets the current group. + \see Fl_Group::current() */ void Fl_Group::current(Fl_Group *g) {current_ = g;} @@ -133,7 +134,6 @@ static int navkey() { break; case FL_Tab: if (!Fl::event_state(FL_SHIFT)) return FL_Right; - case 0xfe20: // XK_ISO_Left_Tab return FL_Left; case FL_Right: return FL_Right; @@ -387,20 +387,51 @@ void Fl_Group::clear() { savedfocus_ = 0; resizable_ = this; init_sizes(); + + // we must change the Fl::pushed() widget, if it is one of + // the group's children. Otherwise fl_fix_focus() would send + // lots of events to children that are about to be deleted + // anyway. + + Fl_Widget *pushed = Fl::pushed(); // save pushed() widget + if (contains(pushed)) pushed = this; // set it to be the group, if it's a child + Fl::pushed(this); // for fl_fix_focus etc. + // okay, now it is safe to destroy the children: - while (children_) { - Fl_Widget* o = child(0); // *first* child widget - if (o->parent() == this) { // should always be true - remove(o); // remove child widget first - delete o; // then delete it - } else { // this should never happen ! -#ifdef DEBUG_CLEAR - printf ("Fl_Group::clear() widget:%p, parent: %p != this (%p)\n", - o, o->parent(), this); fflush(stdout); -#endif // DEBUG_CLEAR - remove(o); // remove it + +#define REVERSE_CHILDREN +#ifdef REVERSE_CHILDREN + // Reverse the order of the children. Doing this and deleting + // always the last child is much faster than the other way around. + if (children_ > 1) { + Fl_Widget *temp; + Fl_Widget **a = (Fl_Widget**)array(); + for (int i=0,j=children_-1; iparent()==this) { // should always be true + if (children_>2) { // optimized removal + w->parent_ = 0; // reset child's parent + children_--; // update counter + } else { // slow removal + remove(idx); + } + delete w; // delete the child + } else { // should never happen + remove(idx); // remove it anyway + } + } + + if (pushed != this) Fl::pushed(pushed); // reset pushed() widget + } /** @@ -435,7 +466,7 @@ void Fl_Group::insert(Fl_Widget &o, int index) { if (index > n) index--; if (index == n) return; } - g->remove(o); + g->remove(n); } o.parent_ = this; if (children_ == 0) { // use array pointer to point at single child @@ -462,6 +493,37 @@ void Fl_Group::insert(Fl_Widget &o, int index) { */ void Fl_Group::add(Fl_Widget &o) {insert(o, children_);} +/** + Removes the widget at \p index from the group but does not delete it. + + This method does nothing if \p index is out of bounds. + + This method differs from the clear() method in that it only affects + a single widget and does not delete it from memory. + + \since FLTK 1.3.0 +*/ +void Fl_Group::remove(int index) { + if (index < 0 || index >= children_) return; + Fl_Widget &o = *child(index); + if (&o == savedfocus_) savedfocus_ = 0; + if (o.parent_ == this) { // this should always be true + o.parent_ = 0; + } + + // remove the widget from the group + + children_--; + if (children_ == 1) { // go from 2 to 1 child + Fl_Widget *t = array_[!index]; + free((void*)array_); + array_ = (Fl_Widget**)t; + } else if (children_ > 1) { // delete from array + for (; index < children_; index++) array_[index] = array_[index+1]; + } + init_sizes(); +} + /** Removes a widget from the group but does not delete it. @@ -469,33 +531,16 @@ void Fl_Group::add(Fl_Widget &o) {insert(o, children_);} This method differs from the clear() method in that it only affects a single widget and does not delete it from memory. + + \note If you have the child's index anyway, use remove(int index) + instead, because this doesn't need a child lookup in the group's + table of children. This can be much faster, if there are lots of + children. */ void Fl_Group::remove(Fl_Widget &o) { if (!children_) return; int i = find(o); - if (i >= children_) return; - if (&o == savedfocus_) savedfocus_ = 0; - if (o.parent_ == this) { // this should always be true - o.parent_ = 0; - } -#ifdef DEBUG_REMOVE - else { // this should never happen ! - printf ("Fl_Group::remove(): widget %p, parent_ (%p) != this (%p)\n", - &o, o.parent_, this); - } -#endif // DEBUG_REMOVE - - // remove the widget from the group - - children_--; - if (children_ == 1) { // go from 2 to 1 child - Fl_Widget *t = array_[!i]; - free((void*)array_); - array_ = (Fl_Widget**)t; - } else if (children_ > 1) { // delete from array - for (; i < children_; i++) array_[i] = array_[i+1]; - } - init_sizes(); + if (i < children_) remove(i); } //////////////////////////////////////////////////////////////// @@ -600,7 +645,7 @@ void Fl_Group::resize(int X, int Y, int W, int H) { Fl_Widget::resize(X,Y,W,H); // make new xywh values visible for children - if (!resizable() || dw==0 && dh==0 ) { + if (!resizable() || (dw==0 && dh==0) ) { if (type() < FL_WINDOW) { Fl_Widget*const* a = array(); @@ -740,47 +785,53 @@ void Fl_Group::draw_outside_label(const Fl_Widget& widget) const { // skip any labels that are inside the widget: if (!(widget.align()&15) || (widget.align() & FL_ALIGN_INSIDE)) return; // invent a box that is outside the widget: - int a = widget.align(); + Fl_Align a = widget.align(); int X = widget.x(); int Y = widget.y(); int W = widget.w(); int H = widget.h(); + int wx, wy; + if (const_cast(this)->as_window()) { + wx = wy = 0; + } else { + wx = x(); wy = y(); + } if ( (a & 0x0f) == FL_ALIGN_LEFT_TOP ) { a = (a &~0x0f ) | FL_ALIGN_TOP_RIGHT; - X = x(); + X = wx; W = widget.x()-X-3; } else if ( (a & 0x0f) == FL_ALIGN_LEFT_BOTTOM ) { a = (a &~0x0f ) | FL_ALIGN_BOTTOM_RIGHT; - X = x(); + X = wx; W = widget.x()-X-3; } else if ( (a & 0x0f) == FL_ALIGN_RIGHT_TOP ) { a = (a &~0x0f ) | FL_ALIGN_TOP_LEFT; X = X+W+3; - W = x()+this->w()-X; + W = wx+this->w()-X; } else if ( (a & 0x0f) == FL_ALIGN_RIGHT_BOTTOM ) { a = (a &~0x0f ) | FL_ALIGN_BOTTOM_LEFT; X = X+W+3; - W = x()+this->w()-X; + W = wx+this->w()-X; } else if (a & FL_ALIGN_TOP) { a ^= (FL_ALIGN_BOTTOM|FL_ALIGN_TOP); - Y = y(); + Y = wy; H = widget.y()-Y; } else if (a & FL_ALIGN_BOTTOM) { a ^= (FL_ALIGN_BOTTOM|FL_ALIGN_TOP); Y = Y+H; - H = y()+h()-Y; + H = wy+h()-Y; } else if (a & FL_ALIGN_LEFT) { a ^= (FL_ALIGN_LEFT|FL_ALIGN_RIGHT); - X = x(); + X = wx; W = widget.x()-X-3; } else if (a & FL_ALIGN_RIGHT) { a ^= (FL_ALIGN_LEFT|FL_ALIGN_RIGHT); X = X+W+3; - W = x()+this->w()-X; + W = wx+this->w()-X; } widget.draw_label(X,Y,W,H,(Fl_Align)a); } // -// End of "$Id: Fl_Group.cxx 7469 2010-04-07 23:17:33Z matt $". +// End of "$Id: Fl_Group.cxx 8184 2011-01-04 18:28:01Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Help_Dialog.fl b/plugins/zynaddsubfx/fltk/src/Fl_Help_Dialog.fl index e1faef039..d61a35317 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Help_Dialog.fl +++ b/plugins/zynaddsubfx/fltk/src/Fl_Help_Dialog.fl @@ -3,11 +3,11 @@ version 1.0108 header_name {../FL/Fl_Help_Dialog.H} code_name {.cxx} comment {// -// "$Id: Fl_Help_Dialog.fl 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Help_Dialog.fl 7913 2010-11-29 18:18:27Z greg.ercolano $" // // Fl_Help_Dialog dialog for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -260,6 +260,6 @@ window_->label(view_->title());} {} comment { // -// End of "$Id: Fl_Help_Dialog.fl 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Help_Dialog.fl 7913 2010-11-29 18:18:27Z greg.ercolano $". //} {in_source in_header } diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Help_View.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Help_View.cxx index 04d4cae88..1b31a8982 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Help_View.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Help_View.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Help_View.cxx 6776 2009-04-22 09:02:13Z greg.ercolano $" +// "$Id: Fl_Help_View.cxx 8063 2010-12-19 21:20:10Z matt $" // // Fl_Help_View widget routines. // -// Copyright 1997-2009 by Easy Software Products. +// Copyright 1997-2010 by Easy Software Products. // Image support by Matthias Melcher, Copyright 2000-2009. // // This library is free software; you can redistribute it and/or @@ -2606,8 +2606,8 @@ Fl_Help_View::get_color(const char *n, // I - Color name Fl_Shared_Image * Fl_Help_View::get_image(const char *name, int W, int H) { const char *localname; // Local filename - char dir[1024]; // Current directory - char temp[1024], // Temporary filename + char dir[FL_PATH_MAX]; // Current directory + char temp[FL_PATH_MAX], // Temporary filename *tempptr; // Pointer into temporary name Fl_Shared_Image *ip; // Image pointer... @@ -2703,8 +2703,8 @@ void Fl_Help_View::follow_link(Fl_Help_Link *linkp) if (strcmp(linkp->filename, filename_) != 0 && linkp->filename[0]) { - char dir[1024]; // Current directory - char temp[1024], // Temporary filename + char dir[FL_PATH_MAX]; // Current directory + char temp[FL_PATH_MAX], // Temporary filename *tempptr; // Pointer into temporary filename @@ -3115,7 +3115,7 @@ Fl_Help_View::load(const char *f)// I - Filename to load (may also have target) char *slash; // Directory separator const char *localname; // Local filename char error[1024]; // Error buffer - char newname[1024]; // New filename buffer + char newname[FL_PATH_MAX]; // New filename buffer // printf("load(%s)\n",f); fflush(stdout); @@ -3125,7 +3125,7 @@ Fl_Help_View::load(const char *f)// I - Filename to load (may also have target) strncmp(f, "ipp:", 4) == 0 || strncmp(f, "mailto:", 7) == 0 || strncmp(f, "news:", 5) == 0) { - char urimsg[256]; + char urimsg[FL_PATH_MAX]; if ( fl_open_uri(f, urimsg, sizeof(urimsg)) == 0 ) { clear_selection(); @@ -3201,7 +3201,7 @@ Fl_Help_View::load(const char *f)// I - Filename to load (may also have target) rewind(fp); value_ = (const char *)calloc(len + 1, 1); - fread((void *)value_, 1, len, fp); + if (fread((void *)value_, 1, len, fp)==0) { /* use default 0 */ } fclose(fp); } else @@ -3515,5 +3515,5 @@ hscrollbar_callback(Fl_Widget *s, void *) // -// End of "$Id: Fl_Help_View.cxx 6776 2009-04-22 09:02:13Z greg.ercolano $". +// End of "$Id: Fl_Help_View.cxx 8063 2010-12-19 21:20:10Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Image.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Image.cxx index c7cebebb0..4117ba77b 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Image.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Image.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Image.cxx 7659 2010-07-01 13:21:32Z manolo $" +// "$Id: Fl_Image.cxx 8611 2011-04-20 14:01:04Z AlbrechtS $" // // Image drawing code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -379,8 +379,10 @@ void Fl_RGB_Image::desaturate() { // Composite an image with alpha on systems that don't have accelerated // alpha compositing... static void alpha_blend(Fl_RGB_Image *img, int X, int Y, int W, int H, int cx, int cy) { - uchar *srcptr = (uchar*)img->array + img->d() * (img->w() * cy + cx); - int srcskip = img->d() * (img->w() - W); + int ld = img->ld(); + if (ld == 0) ld = img->w() * img->d(); + uchar *srcptr = (uchar*)img->array + cy * ld + cx * img->d(); + int srcskip = ld - img->d() * W; uchar *dst = new uchar[W * H * 3]; uchar *dstptr = dst; @@ -392,7 +394,6 @@ static void alpha_blend(Fl_RGB_Image *img, int X, int Y, int W, int H, int cx, i if (img->d() == 2) { // Composite grayscale + alpha over RGB... - // Composite RGBA over RGB... for (int y = H; y > 0; y--, srcptr+=srcskip) for (int x = W; x > 0; x--) { srcg = *srcptr++; @@ -586,5 +587,5 @@ void Fl_RGB_Image::label(Fl_Menu_Item* m) { // -// End of "$Id: Fl_Image.cxx 7659 2010-07-01 13:21:32Z manolo $". +// End of "$Id: Fl_Image.cxx 8611 2011-04-20 14:01:04Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Input.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Input.cxx index aeb096923..d38d5cfef 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Input.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Input.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Input.cxx 6968 2009-12-13 14:44:30Z matt $" +// "$Id: Fl_Input.cxx 8726 2011-05-23 18:32:47Z AlbrechtS $" // // Input widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -40,6 +40,15 @@ #include #include "flstring.h" +#if defined(FL_DLL) // really needed for c'tors for MS VC++ only +#include +#include +#include +#include +#include +#include +#endif + #ifdef HAVE_LOCALE_H # include #endif @@ -62,11 +71,19 @@ int Fl_Input::shift_up_down_position(int p) { return up_down_position(p, Fl::event_state(FL_SHIFT)); } -// If you define this symbol as zero you will get the peculiar fltk +// Old text from FLTK 1.1 for reference: +// If you define NORMAL_INPUT_MOVE as zero you will get the peculiar fltk // behavior where moving off the end of an input field will move the // cursor into the next field: // define it as 1 to prevent cursor movement from going to next field: -#define NORMAL_INPUT_MOVE 0 +// +// Note: this has been replaced by Fl::option(Fl::OPTION_ARROW_FOCUS) +// in FLTK 1.3. This option has "inverted" values: +// 1 = Arrow keys move focus (previously 0) +// 0 = Arrow keys don't move focus (previously 1) +// Hence we define ... +// +#define NORMAL_INPUT_MOVE (Fl::option(Fl::OPTION_ARROW_FOCUS) ? 0 : 1) #define ctrl(x) ((x)^0x40) @@ -82,12 +99,223 @@ static const char *legal_fp_chars = 0L; static const char *legal_fp_chars = ".eE+-"; #endif +// Move cursor up specified #lines +// If OPTION_ARROW_FOCUS is disabled, return 1 to prevent focus navigation. +// +int Fl_Input::kf_lines_up(int repeat_num) { + int i = position(); + if (!line_start(i)) { + //UNNEEDED if (input_type()==FL_MULTILINE_INPUT && !Fl::option(Fl::OPTION_ARROW_FOCUS)) return 1; + return NORMAL_INPUT_MOVE; + } + while(repeat_num--) { + i = line_start(i); + if (!i) break; + i--; + } + shift_up_down_position(line_start(i)); + return 1; +} + +// Move cursor down specified #lines +// If OPTION_ARROW_FOCUS is disabled, return 1 to prevent focus navigation. +// +int Fl_Input::kf_lines_down(int repeat_num) { + int i = position(); + if (line_end(i) >= size()) { + //UNNEEDED if (input_type()==FL_MULTILINE_INPUT && !Fl::option(Fl::OPTION_ARROW_FOCUS)) return 1; + return NORMAL_INPUT_MOVE; + } + while (repeat_num--) { + i = line_end(i); + if (i >= size()) break; + i++; + } + shift_up_down_position(i); + return 1; +} + +// Move up a page +int Fl_Input::kf_page_up() { + return kf_lines_up(linesPerPage()); +} + +// Move down a page +int Fl_Input::kf_page_down() { + return kf_lines_down(linesPerPage()); +} + +// Toggle insert mode +int Fl_Input::kf_insert_toggle() { + if (readonly()) { fl_beep(); return 1; } + return 1; // \todo: needs insert mode +} + +// Delete word right +int Fl_Input::kf_delete_word_right() { + if (readonly()) { fl_beep(); return 1; } + if (mark() != position()) return cut(); + cut(position(), word_end(position())); + return 1; +} + +// Delete word left +int Fl_Input::kf_delete_word_left() { + if (readonly()) { fl_beep(); return 1; } + if (mark() != position()) return cut(); + cut(word_start(position()), position()); + return 1; +} + +// Delete to start of line +int Fl_Input::kf_delete_sol() { + if (readonly()) { fl_beep(); return 1; } + if (mark() != position()) return cut(); + cut(line_start(position()), position()); + return 1; +} + +// Delete to end of line +int Fl_Input::kf_delete_eol() { + if (readonly()) { fl_beep(); return 1; } + if (mark() != position()) return cut(); + cut(position(), line_end(position())); + return 1; +} + +int Fl_Input::kf_delete_char_right() { + if (readonly()) { fl_beep(); return 1; } + if (mark() != position()) return cut(); + else return cut(1); +} + +int Fl_Input::kf_delete_char_left() { + if (readonly()) { fl_beep(); return 1; } + if (mark() != position()) cut(); + else cut(-1); + return 1; +} + +// Move cursor to start of line +int Fl_Input::kf_move_sol() { + return shift_position(line_start(position())) + NORMAL_INPUT_MOVE; +} + +// Move cursor to end of line +int Fl_Input::kf_move_eol() { + return shift_position(line_end(position())) + NORMAL_INPUT_MOVE; +} + +// Clear to end of line +int Fl_Input::kf_clear_eol() { + if (readonly()) { fl_beep(); return 1; } + if (position()>=size()) return 0; + int i = line_end(position()); + if (i == position() && i < size()) i++; + cut(position(), i); + return copy_cuts(); +} + +// Move cursor one character to the left +// If OPTION_ARROW_FOCUS is disabled, return 1 to prevent focus navigation. +// +int Fl_Input::kf_move_char_left() { + int i = shift_position(position()-1) + NORMAL_INPUT_MOVE; + return Fl::option(Fl::OPTION_ARROW_FOCUS) ? i : 1; +} + +// Move cursor one character to the right +// If OPTION_ARROW_FOCUS is disabled, return 1 to prevent focus navigation. +// +int Fl_Input::kf_move_char_right() { + int i = shift_position(position()+1) + NORMAL_INPUT_MOVE; + return Fl::option(Fl::OPTION_ARROW_FOCUS) ? i : 1; +} + +// Move cursor word-left +int Fl_Input::kf_move_word_left() { + shift_position(word_start(position())); + return 1; +} + +// Move cursor word-right +int Fl_Input::kf_move_word_right() { + shift_position(word_end(position())); + return 1; +} + +// Move cursor up one line and to the start of line (paragraph up) +int Fl_Input::kf_move_up_and_sol() { + if (line_start(position())==position() && position()>0) + return shift_position(line_start(position()-1)) + NORMAL_INPUT_MOVE; + else + return shift_position(line_start(position())) + NORMAL_INPUT_MOVE; +} + +// Move cursor down one line and to the end of line (paragraph down) +int Fl_Input::kf_move_down_and_eol() { + if (line_end(position())==position() && position()= '0' && ascii <= '9') || (ip==1 && index(0)=='0' && (ascii=='x' || ascii == 'X')) - || (ip>1 && index(0)=='0' && (index(1)=='x'||index(1)=='X') - && (ascii>='A'&& ascii<='F' || ascii>='a'&& ascii<='f')) - || input_type()==FL_FLOAT_INPUT && ascii && strchr(legal_fp_chars, ascii)) + || (ip>1 && index(0)=='0' && (index(1)=='x'||index(1)=='X') + && ((ascii>='A'&& ascii<='F') || (ascii>='a'&& ascii<='f'))) + || (input_type()==FL_FLOAT_INPUT && ascii && strchr(legal_fp_chars, ascii))) { if (readonly()) fl_beep(); else replace(position(), mark(), &ascii, 1); @@ -145,339 +373,223 @@ int Fl_Input::handle_key() { } unsigned int mods = Fl::event_state() & (FL_META|FL_CTRL|FL_ALT); + unsigned int shift = Fl::event_state() & FL_SHIFT; + unsigned int multiline = (input_type() == FL_MULTILINE_INPUT) ? 1 : 0; + // + // The following lists apps that support these keypresses. + // Prefixes: '!' indicates NOT supported, '?' indicates un-verified. + // + // HIG=Human Interface Guide, + // TE=TextEdit.app, SA=Safari.app, WOX=MS Word/OSX -- OSX 10.4.x + // NP=Notepad, WP=WordPad, WOW=MS Word/Windows -- WinXP + // GE=gedit, KE=kedit -- Ubuntu8.04 + // OF=old FLTK behavior (<=1.1.10) + // + // Example: (NP,WP,!WO) means supported in notepad + wordpad, but NOT word. + // switch (Fl::event_key()) { + case FL_Insert: - if (Fl::event_state() & FL_CTRL) ascii = ctrl('C'); - else if (Fl::event_state() & FL_SHIFT) ascii = ctrl('V'); - break; - case FL_Delete: + // Note: Mac has no "Insert" key; it's the "Help" key. + // This keypress is apparently not possible on macs. + // + if (mods==0 && shift) return kf_paste(); // Shift-Insert (WP,NP,WOW,GE,KE,OF) + if (mods==0) return kf_insert_toggle(); // Insert (Standard) + if (mods==FL_CTRL) return kf_copy(); // Ctrl-Insert (WP,NP,WOW,GE,KE,OF) + return 0; // ignore other combos, pass to parent + + case FL_Delete: { #ifdef __APPLE__ - if (mods==0 || mods==FL_CTRL) { // delete next char - ascii = ctrl('D'); - } else if (mods==FL_ALT) { // delete next word - if (mark() != position()) return cut(); - cut(position(), word_end(position())); - return 1; - } else if (mods==FL_META) { // delete to the end of the line - if (mark() != position()) return cut(); - cut(position(), line_end(position())); - return 1; - } else return 1; + if (mods==0) return kf_delete_char_right(); // Delete (OSX-HIG,TE,SA,WOX) + if (mods==FL_CTRL) return kf_delete_char_right(); // Ctrl-Delete (??? TE,!SA,!WOX) + if (mods==FL_ALT) return kf_delete_word_right(); // Alt-Delete (OSX-HIG,TE,SA) + return 0; // ignore other combos, pass to parent #else - if (mods==0) { - ascii = ctrl('D'); - } else if (mods==FL_SHIFT) { - ascii = ctrl('X'); - } else return 1; + int selected = (position() != mark()) ? 1 : 0; + if (mods==0 && shift && selected) + return kf_copy_cut(); // Shift-Delete with selection (WP,NP,WOW,GE,KE,OF) + if (mods==0 && shift && !selected) + return kf_delete_char_right(); // Shift-Delete no selection (WP,NP,WOW,GE,KE,!OF) + if (mods==0) return kf_delete_char_right(); // Delete (Standard) + if (mods==FL_CTRL) return kf_delete_word_right(); // Ctrl-Delete (WP,!NP,WOW,GE,KE,!OF) + return 0; // ignore other combos, pass to parent #endif - break; + } + case FL_Left: #ifdef __APPLE__ - if (mods==0) { // char left - ascii = ctrl('B'); - } else if (mods==FL_ALT) { // word left - shift_position(word_start(position())); - return 1; - } else if (mods==FL_CTRL || mods==FL_META) { // start of line - shift_position(line_start(position())); - return 1; - } else return 1; + if (mods==0) return kf_move_char_left(); // Left (OSX-HIG) + if (mods==FL_ALT) return kf_move_word_left(); // Alt-Left (OSX-HIG) + if (mods==FL_META) return kf_move_sol(); // Meta-Left (OSX-HIG) + if (mods==FL_CTRL) return kf_move_sol(); // Ctrl-Left (TE/SA) + return 0; // ignore other combos, pass to parent #else - if (mods==0) { // char left - ascii = ctrl('B'); - } else if (mods==FL_CTRL) { // word left - shift_position(word_start(position())); - return 1; - } else return 1; + if (mods==0) return kf_move_char_left(); // Left (WP,NP,WOW,GE,KE,OF) + if (mods==FL_CTRL) return kf_move_word_left(); // Ctrl-Left (WP,NP,WOW,GE,KE,!OF) + if (mods==FL_META) return kf_move_char_left(); // Meta-Left (WP,NP,?WOW,GE,KE) + return 0; // ignore other combos, pass to parent #endif - break; + case FL_Right: #ifdef __APPLE__ - if (mods==0) { // char right - ascii = ctrl('F'); - } else if (mods==FL_ALT) { // word right - shift_position(word_end(position())); - return 1; - } else if (mods==FL_CTRL || mods==FL_META) { // end of line - shift_position(line_end(position())); - return 1; - } else return 1; + if (mods==0) return kf_move_char_right(); // Right (OSX-HIG) + if (mods==FL_ALT) return kf_move_word_right(); // Alt-Right (OSX-HIG) + if (mods==FL_META) return kf_move_eol(); // Meta-Right (OSX-HIG) + if (mods==FL_CTRL) return kf_move_eol(); // Ctrl-Right (TE/SA) + return 0; // ignore other combos, pass to parent #else - if (mods==0) { // char right - ascii = ctrl('F'); - } else if (mods==FL_CTRL) { // word right - shift_position(word_end(position())); - return 1; - } else return 1; -#endif // __APPLE__ - break; - case FL_Page_Up: -#ifdef __APPLE__ - if (mods==0) { // scroll text one page - // OS X scrolls the view, but does not move the cursor - // Fl_Input has no scroll control, so instead we move the cursor by one page - repeat_num = linesPerPage(); - ascii = ctrl('P'); - } else if (mods==FL_ALT) { // move cursor one page - repeat_num = linesPerPage(); - ascii = ctrl('P'); - } else return 1; - break; -#else - repeat_num = linesPerPage(); - // fall through + if (mods==0) return kf_move_char_right(); // Right (WP,NP,WOW,GE,KE,OF) + if (mods==FL_CTRL) return kf_move_word_right(); // Ctrl-Right (WP,NP,WOW,GE,KE,!OF) + if (mods==FL_META) return kf_move_char_right(); // Meta-Right (WP,NP,?WOW,GE,KE,!OF) + return 0; // ignore other combos, pass to parent #endif + case FL_Up: #ifdef __APPLE__ - if (mods==0) { // line up - ascii = ctrl('P'); - } else if (mods==FL_CTRL) { // scroll text down one page - // OS X scrolls the view, but does not move the cursor - // Fl_Input has no scroll control, so instead we move the cursor by one page - repeat_num = linesPerPage(); - ascii = ctrl('P'); - } else if (mods==FL_ALT) { // line start and up - if (line_start(position())==position() && position()>0) - return shift_position(line_start(position()-1)) + NORMAL_INPUT_MOVE; - else - return shift_position(line_start(position())) + NORMAL_INPUT_MOVE; - } else if (mods==FL_META) { // start of document - shift_position(0); - return 1; - } else return 1; + if (mods==0) return kf_lines_up(1); // Up (OSX-HIG) + if (mods==FL_CTRL) return kf_page_up(); // Ctrl-Up (TE !HIG) + if (mods==FL_ALT) return kf_move_up_and_sol(); // Alt-Up (OSX-HIG) + if (mods==FL_META) return kf_top(); // Meta-Up (OSX-HIG) + return 0; // ignore other combos, pass to parent #else - if (mods==0) { // line up - ascii = ctrl('P'); - } else if (mods==FL_CTRL) { // scroll text down one line - // Fl_Input has no scroll control, so instead we move the cursor by one page - ascii = ctrl('P'); - } else return 1; -#endif - break; - case FL_Page_Down: -#ifdef __APPLE__ - if (mods==0) { // scroll text one page - // OS X scrolls the view, but does not move the cursor - // Fl_Input has no scroll control, so instead we move the cursor by one page - repeat_num = linesPerPage(); - ascii = ctrl('N'); - } else if (mods==FL_ALT) { // move cursor one page - repeat_num = linesPerPage(); - ascii = ctrl('N'); - } else return 1; - break; -#else - repeat_num = linesPerPage(); - // fall through + if (mods==0) return kf_lines_up(1); // Up (WP,NP,WOW,GE,KE,OF) + if (mods==FL_CTRL) return kf_move_up_and_sol(); // Ctrl-Up (WP,!NP,WOW,GE,!KE,OF) + return 0; // ignore other combos, pass to parent #endif + case FL_Down: #ifdef __APPLE__ - if (mods==0) { // line down - ascii = ctrl('N'); - } else if (mods==FL_CTRL) { - // OS X scrolls the view, but does not move the cursor - // Fl_Input has no scroll control, so instead we move the cursor by one page - repeat_num = linesPerPage(); - ascii = ctrl('N'); - } else if (mods==FL_ALT) { // line end and down - if (line_end(position())==position() && position()=size()) return 0; - i = line_end(position()); - if (i == position() && i < size()) i++; - cut(position(), i); - return copy_cuts(); - case ctrl('N'): // go down one line - i = position(); - if (line_end(i) >= size()) return NORMAL_INPUT_MOVE; - while (repeat_num--) { - i = line_end(i); - if (i >= size()) break; - i++; - } - shift_up_down_position(i); - return 1; - case ctrl('P'): // go up one line - i = position(); - if (!line_start(i)) return NORMAL_INPUT_MOVE; - while(repeat_num--) { - i = line_start(i); - if (!i) break; - i--; - } - shift_up_down_position(line_start(i)); - return 1; - case ctrl('U'): // clear the whole document? - if (readonly()) { - fl_beep(); - return 1; - } - return cut(0, size()); - case ctrl('V'): // paste text - case ctrl('Y'): - if (readonly()) { - fl_beep(); - return 1; - } - Fl::paste(*this, 1); - return 1; - case ctrl('X'): // cut the selected text - case ctrl('W'): - if (readonly()) { - fl_beep(); - return 1; - } - copy(1); - return cut(); - case ctrl('Z'): // undo - case ctrl('_'): - if (readonly()) { - fl_beep(); - return 1; - } - return undo(); - case ctrl('I'): // insert literal - case ctrl('J'): - case ctrl('L'): - case ctrl('M'): - if (readonly()) { - fl_beep(); - return 1; - } + case ctrl('H'): + return kf_delete_char_left(); // Ctrl-H (!WP,!NP,!WOW,!WOX,TE,SA,GE,KE,OF) + case ctrl('I'): // Ctrl-I (literal Tab) (!WP,NP,!WOW,!GE,KE,OF) + case ctrl('J'): // Ctrl-J (literal Line Feed/Enter) (Standard) + case ctrl('L'): // Ctrl-L (literal Form Feed) (Standard) + case ctrl('M'): // Ctrl-M (literal Cr) (Standard) + if (readonly()) { fl_beep(); return 1; } // insert a few selected control characters literally: if (input_type() != FL_FLOAT_INPUT && input_type() != FL_INT_INPUT) return replace(position(), mark(), &ascii, 1); + break; } - return 0; + return 0; // ignored } int Fl_Input::handle(int event) { @@ -499,7 +611,6 @@ int Fl_Input::handle(int event) { up_down_position(line_start(size())); break; case FL_Tab: - case 0xfe20: // XK_ISO_Left_Tab position(size(),0); break; default: @@ -509,8 +620,16 @@ int Fl_Input::handle(int event) { break; case FL_KEYBOARD: - if (Fl::event_key() == FL_Tab && mark() != position()) { - // Set the current cursor position to the end of the selection... + // Handle special case for multiline input with 'old tab behavior' + // where tab is entered as a character: make sure user attempt to 'tab over' + // widget doesn't destroy the field, replacing it with a tab character. + // + if (Fl::event_key() == FL_Tab // Tab key? + && !Fl::event_state(FL_SHIFT) // no shift? + && !tab_nav() // with tab navigation disabled? + && input_type() == FL_MULTILINE_INPUT // with a multiline input? + && (mark()==0 && position()==size())) { // while entire field selected? + // Set cursor to the end of the selection... if (mark() > position()) position(mark()); else @@ -521,23 +640,23 @@ int Fl_Input::handle(int event) { window()->cursor(FL_CURSOR_NONE); return handle_key(); } + //NOTREACHED case FL_PUSH: if (Fl::dnd_text_ops()) { int oldpos = position(), oldmark = mark(); Fl_Boxtype b = box(); - Fl_Input_::handle_mouse( - x()+Fl::box_dx(b), y()+Fl::box_dy(b), + Fl_Input_::handle_mouse(x()+Fl::box_dx(b), y()+Fl::box_dy(b), w()-Fl::box_dw(b), h()-Fl::box_dh(b), 0); newpos = position(); position( oldpos, oldmark ); if (Fl::focus()==this && !Fl::event_state(FL_SHIFT) && input_type()!=FL_SECRET_INPUT && - (newpos >= mark() && newpos < position() || - newpos >= position() && newpos < mark())) { - // user clicked in the selection, may be trying to drag - drag_start = newpos; - return 1; - } + ( (newpos >= mark() && newpos < position()) || + (newpos >= position() && newpos < mark()) ) ) { + // user clicked in the selection, may be trying to drag + drag_start = newpos; + return 1; + } drag_start = -1; } @@ -602,12 +721,11 @@ int Fl_Input::handle(int event) { return 0; } #endif - { - Fl_Boxtype b = box(); - Fl_Input_::handle_mouse( - x()+Fl::box_dx(b), y()+Fl::box_dy(b), - w()-Fl::box_dw(b), h()-Fl::box_dh(b), 0); - } + { + Fl_Boxtype b = box(); + Fl_Input_::handle_mouse(x()+Fl::box_dx(b), y()+Fl::box_dy(b), + w()-Fl::box_dw(b), h()-Fl::box_dh(b), 0); + } return 1; case FL_DND_LEAVE: @@ -619,6 +737,9 @@ int Fl_Input::handle(int event) { Fl::focus(dnd_save_focus); handle(FL_UNFOCUS); } +#if !(defined(__APPLE__) || defined(WIN32)) + Fl::first_window()->cursor(FL_CURSOR_MOVE); +#endif return 1; case FL_DND_RELEASE: @@ -636,7 +757,6 @@ int Fl_Input::handle(int event) { } return 1; */ - } Fl_Boxtype b = box(); return Fl_Input_::handletext(event, @@ -652,6 +772,51 @@ Fl_Input::Fl_Input(int X, int Y, int W, int H, const char *l) : Fl_Input_(X, Y, W, H, l) { } +/* + The following constructors must not be in the header file(s) if we + build a shared object (DLL). Instead they are defined here to force + the constructor (and default destructor as well) to be defined in + the DLL and exported (STR #2632). + + Note: if you change any of them, do the same changes in the specific + header file as well. This redundant definition was chosen to enable + inline constructors in the header files (for static linking) as well + as those here for dynamic linking (Windows DLL). +*/ +#if defined(FL_DLL) + +Fl_Float_Input::Fl_Float_Input(int X,int Y,int W,int H,const char *l) + : Fl_Input(X,Y,W,H,l) { + type(FL_FLOAT_INPUT); +} + +Fl_Int_Input::Fl_Int_Input(int X,int Y,int W,int H,const char *l) + : Fl_Input(X,Y,W,H,l) { + type(FL_INT_INPUT); +} + +Fl_Multiline_Input::Fl_Multiline_Input(int X,int Y,int W,int H,const char *l) + : Fl_Input(X,Y,W,H,l) { + type(FL_MULTILINE_INPUT); +} + +Fl_Output::Fl_Output(int X,int Y,int W,int H, const char *l) + : Fl_Input(X, Y, W, H, l) { + type(FL_NORMAL_OUTPUT); +} + +Fl_Multiline_Output::Fl_Multiline_Output(int X,int Y,int W,int H,const char *l) + : Fl_Output(X,Y,W,H,l) { + type(FL_MULTILINE_OUTPUT); +} + +Fl_Secret_Input::Fl_Secret_Input(int X,int Y,int W,int H,const char *l) + : Fl_Input(X,Y,W,H,l) { + type(FL_SECRET_INPUT); +} + +#endif // FL_DLL + // -// End of "$Id: Fl_Input.cxx 6968 2009-12-13 14:44:30Z matt $". +// End of "$Id: Fl_Input.cxx 8726 2011-05-23 18:32:47Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Input_.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Input_.cxx index 6a94ad19a..276c38754 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Input_.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Input_.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Input_.cxx 7672 2010-07-10 09:44:45Z matt $" +// "$Id: Fl_Input_.cxx 8413 2011-02-11 16:37:06Z manolo $" // // Common input widget routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -37,6 +37,12 @@ #include #define MAXBUF 1024 +#if defined(USE_X11) && !USE_XFT +const int secret_char = '*'; // asterisk to hide secret input +#else +const int secret_char = 0x2022; // bullet to hide secret input +#endif +static int l_secret; extern void fl_draw(const char*, int, float, float); @@ -67,7 +73,10 @@ const char* Fl_Input_::expand(const char* p, char* buf) const { if (input_type()==FL_SECRET_INPUT) { while (o= 1) *o++ = '*'; + if (fl_utf8len((char)p[0]) >= 1) { + l_secret = fl_utf8encode(secret_char, o); + o += l_secret; + } p++; } @@ -124,10 +133,12 @@ double Fl_Input_::expandpos( ) const { int n = 0; int chr = 0; + int l; if (input_type()==FL_SECRET_INPUT) { while (p= 1) n++; - p++; + l = fl_utf8len((char)p[0]); + if (l >= 1) n += l_secret; + p += l; } } else while (p= p-value() && position() <= e-value()) { fl_color(cursor_color()); + // cursor position may need to be recomputed (see STR #2486) + curx = int(expandpos(p, value()+position(), buf, 0)+.5); if (readonly()) { fl_line((int)(xpos+curx-2.5f), Y+ypos+height-1, (int)(xpos+curx+0.5f), Y+ypos+height-4, @@ -844,7 +857,7 @@ int Fl_Input_::replace(int b, int e, const char* text, int ilen) { */ int Fl_Input_::undo() { was_up_down = 0; - if (undowidget != this || !undocut && !undoinsert) return 0; + if ( undowidget != this || (!undocut && !undoinsert) ) return 0; int ilen = undocut; int xlen = undoinsert; @@ -1057,6 +1070,7 @@ Fl_Input_::Fl_Input_(int X, int Y, int W, int H, const char* l) maximum_size_ = 32767; shortcut_ = 0; set_flag(SHORTCUT_LABEL); + tab_nav(1); } /** @@ -1254,5 +1268,5 @@ unsigned int Fl_Input_::index(int i) const } // -// End of "$Id: Fl_Input_.cxx 7672 2010-07-10 09:44:45Z matt $". +// End of "$Id: Fl_Input_.cxx 8413 2011-02-11 16:37:06Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Light_Button.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Light_Button.cxx index 8041f4354..9025fcf2d 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Light_Button.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Light_Button.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Light_Button.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Light_Button.cxx 7903 2010-11-28 21:06:39Z matt $" // // Lighted button widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -170,5 +170,5 @@ Fl_Light_Button::Fl_Light_Button(int X, int Y, int W, int H, const char* l) } // -// End of "$Id: Fl_Light_Button.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Light_Button.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Menu.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Menu.cxx index d8a7c1273..81568d0e6 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Menu.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Menu.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Menu.cxx 7151 2010-02-26 13:28:36Z matt $" +// "$Id: Fl_Menu.cxx 8775 2011-06-03 14:07:52Z manolo $" // // Menu code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -38,9 +38,6 @@ #include #include "flstring.h" -#ifdef __APPLE__ -# include -#endif /** Size of the menu starting from this menu item */ int Fl_Menu_Item::size() const { const Fl_Menu_Item* m = this; @@ -56,6 +53,23 @@ int Fl_Menu_Item::size() const { } } +// Advance a pointer to next visible or invisible item of a menu array, +// skipping the contents of submenus. +static const Fl_Menu_Item* next_visible_or_not(const Fl_Menu_Item* m) { + int nest = 0; + do { + if (!m->text) { + if (!nest) return m; + nest--; + } else if (m->flags&FL_SUBMENU) { + nest++; + } + m++; + } + while (nest); + return m; +} + /** Advance a pointer by n items through a menu array, skipping the contents of submenus and invisible items. There are two calls so @@ -64,17 +78,10 @@ int Fl_Menu_Item::size() const { const Fl_Menu_Item* Fl_Menu_Item::next(int n) const { if (n < 0) return 0; // this is so selected==-1 returns NULL const Fl_Menu_Item* m = this; - int nest = 0; if (!m->visible()) n++; - while (n>0) { - if (!m->text) { - if (!nest) return m; - nest--; - } else if (m->flags&FL_SUBMENU) { - nest++; - } - m++; - if (!nest && m->visible()) n--; + while (n) { + m = next_visible_or_not(m); + if (m->visible()) n--; } return m; } @@ -99,7 +106,7 @@ class menuwindow : public Fl_Menu_Window { public: menutitle* title; int handle(int); -#ifdef __APPLE__ +#if defined (__APPLE__) || defined (USE_X11) int early_hide_handle(int); #endif int itemheight; // zero == menubar @@ -538,6 +545,10 @@ int menuwindow::is_inside(int mx, int my) { my < y_root() || my >= y_root() + h()) { return 0; } + if (itemheight == 0 && find_selected(mx, my) == -1) { + // in the menubar but out from any menu header + return 0; + } return 1; } @@ -601,7 +612,7 @@ static void setitem(int m, int n) { static int forward(int menu) { // go to next item in menu menu if possible menustate &pp = *p; - // Fl_Menu_Button can geberate menu=-1. This line fixes it and selectes the first item. + // Fl_Menu_Button can generate menu=-1. This line fixes it and selectes the first item. if (menu==-1) menu = 0; menuwindow &m = *(pp.p[menu]); @@ -626,7 +637,7 @@ static int backward(int menu) { // previous item in menu menu if possible } int menuwindow::handle(int e) { -#ifdef __APPLE__ +#if defined (__APPLE__) || defined (USE_X11) // This off-route takes care of the "detached menu" bug on OS X. // Apple event handler requires that we hide all menu windows right // now, so that Carbon can continue undisturbed with handling window @@ -660,7 +671,6 @@ int menuwindow::early_hide_handle(int e) { case FL_KEYBOARD: switch (Fl::event_key()) { case FL_BackSpace: - case 0xFE20: // backtab BACKTAB: if (!backward(pp.menu_number)) {pp.item_number = -1;backward(pp.menu_number);} return 1; @@ -686,7 +696,7 @@ int menuwindow::early_hide_handle(int e) { } return 1; case FL_Right: - if (pp.menubar && (pp.menu_number<=0 || pp.menu_number==1 && pp.nummenus==2)) + if (pp.menubar && (pp.menu_number<=0 || (pp.menu_number==1 && pp.nummenus==2))) forward(0); else if (pp.menu_number < pp.nummenus-1) forward(pp.menu_number+1); return 1; @@ -719,16 +729,17 @@ int menuwindow::early_hide_handle(int e) { } } break; + case FL_MOVE: +#if ! (defined(WIN32) || defined(__APPLE__)) + if (pp.state == DONE_STATE) { + return 1; // Fix for STR #2619 + } + /* FALLTHROUGH */ +#endif case FL_ENTER: - case FL_MOVE: case FL_PUSH: case FL_DRAG: { -#ifdef __QNX__ - // STR 704: workaround QNX X11 bug - in QNX a FL_MOVE event is sent - // right after FL_RELEASE... - if (pp.state == DONE_STATE) return 1; -#endif // __QNX__ int mx = Fl::event_x_root(); int my = Fl::event_y_root(); int item=0; int mymenu = pp.nummenus-1; @@ -774,8 +785,9 @@ int menuwindow::early_hide_handle(int e) { case FL_RELEASE: // Mouse must either be held down/dragged some, or this must be // the second click (not the one that popped up the menu): - if (!Fl::event_is_click() || pp.state == PUSH_STATE || - pp.menubar && pp.current_item && !pp.current_item->submenu() // button + if ( !Fl::event_is_click() + || pp.state == PUSH_STATE + || (pp.menubar && pp.current_item && !pp.current_item->submenu()) // button ) { #if 0 // makes the check/radio items leave the menu up const Fl_Menu_Item* m = pp.current_item; @@ -812,7 +824,7 @@ const Fl_Menu_Item* Fl_Menu_Item::pulldown( Fl_Group::current(0); // fix possible user error... button = pbutton; - if (pbutton) { + if (pbutton && pbutton->window()) { for (Fl_Window* w = pbutton->window(); w; w = w->window()) { X += w->x(); Y += w->y(); @@ -948,52 +960,64 @@ const Fl_Menu_Item* Fl_Menu_Item::pulldown( } } const Fl_Menu_Item* m = pp.current_item; - Fl::grab(0); delete pp.fakemenu; while (pp.nummenus>1) delete pp.p[--pp.nummenus]; mw.hide(); + Fl::grab(0); return m; } /** - This method is called by widgets that want to display menus. The menu - stays up until the user picks an item or dismisses it. The selected - item (or NULL if none) is returned. This does not do the - callbacks or change the state of check or radio items. -

    X,Y is the position of the mouse cursor, relative to the + This method is called by widgets that want to display menus. + + The menu stays up until the user picks an item or dismisses it. + The selected item (or NULL if none) is returned. This does not + do the callbacks or change the state of check or radio items. + + X,Y is the position of the mouse cursor, relative to the window that got the most recent event (usually you can pass - Fl::event_x() and Fl::event_y() unchanged here).

    -

    title is a character string title for the menu. If - non-zero a small box appears above the menu with the title in it.

    -

    The menu is positioned so the cursor is centered over the item - picked. This will work even if picked is in a submenu. - If picked is zero or not in the menu item table the menu is - positioned with the cursor in the top-left corner.

    -

    button is a pointer to an - Fl_Menu_ from which the color and boxtypes for the menu are - pulled. If NULL then defaults are used. + Fl::event_x() and Fl::event_y() unchanged here). + + \p title is a character string title for the menu. If + non-zero a small box appears above the menu with the title in it. + + The menu is positioned so the cursor is centered over the item + picked. This will work even if \p picked is in a submenu. + If \p picked is zero or not in the menu item table the menu is + positioned with the cursor in the top-left corner. + + \p button is a pointer to an Fl_Menu_ from which the color and + boxtypes for the menu are pulled. If NULL then defaults are used. */ const Fl_Menu_Item* Fl_Menu_Item::popup( int X, int Y, const char* title, const Fl_Menu_Item* picked, - const Fl_Menu_* but + const Fl_Menu_* button ) const { static Fl_Menu_Item dummy; // static so it is all zeros dummy.text = title; - return pulldown(X, Y, 0, 0, picked, but, title ? &dummy : 0); + return pulldown(X, Y, 0, 0, picked, button, title ? &dummy : 0); } /** Search only the top level menu for a shortcut. - Either &x in the label or the shortcut fields are used. + Either &x in the label or the shortcut fields are used. + + This tests the current event, which must be an FL_KEYBOARD or + FL_SHORTCUT, against a shortcut value. + + \param ip returns the index of the item, if \p ip is not NULL. + \param require_alt if true: match only if Alt key is pressed. + + \return found Fl_Menu_Item or NULL */ -const Fl_Menu_Item* Fl_Menu_Item::find_shortcut(int* ip) const { - const Fl_Menu_Item* m = first(); - if (m) for (int ii = 0; m->text; m = m->next(), ii++) { - if (m->activevisible()) { +const Fl_Menu_Item* Fl_Menu_Item::find_shortcut(int* ip, const bool require_alt) const { + const Fl_Menu_Item* m = this; + if (m) for (int ii = 0; m->text; m = next_visible_or_not(m), ii++) { + if (m->active()) { if (Fl::test_shortcut(m->shortcut_) - || Fl_Widget::test_shortcut(m->text)) { + || Fl_Widget::test_shortcut(m->text, require_alt)) { if (ip) *ip=ii; return m; } @@ -1013,10 +1037,10 @@ const Fl_Menu_Item* Fl_Menu_Item::find_shortcut(int* ip) const { preceeded by ' */ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const { - const Fl_Menu_Item* m = first(); + const Fl_Menu_Item* m = this; const Fl_Menu_Item* ret = 0; - if (m) for (; m->text; m = m->next()) { - if (m->activevisible()) { + if (m) for (; m->text; m = next_visible_or_not(m)) { + if (m->active()) { // return immediately any match of an item in top level menu: if (Fl::test_shortcut(m->shortcut_)) return m; // if (Fl_Widget::test_shortcut(m->text)) return m; @@ -1032,5 +1056,5 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const { } // -// End of "$Id: Fl_Menu.cxx 7151 2010-02-26 13:28:36Z matt $". +// End of "$Id: Fl_Menu.cxx 8775 2011-06-03 14:07:52Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Menu_.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Menu_.cxx index af855f957..934430d05 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Menu_.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Menu_.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Menu_.cxx 7517 2010-04-16 17:55:45Z greg.ercolano $" +// "$Id: Fl_Menu_.cxx 7903 2010-11-28 21:06:39Z matt $" // // Common menu code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -431,5 +431,5 @@ int Fl_Menu_::clear_submenu(int index) { } // -// End of "$Id: Fl_Menu_.cxx 7517 2010-04-16 17:55:45Z greg.ercolano $". +// End of "$Id: Fl_Menu_.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Menu_Bar.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Menu_Bar.cxx index 8328836e3..8e114e39b 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Menu_Bar.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Menu_Bar.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Menu_Bar.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Menu_Bar.cxx 7903 2010-11-28 21:06:39Z matt $" // // Menu bar widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -65,7 +65,7 @@ int Fl_Menu_Bar::handle(int event) { return 1; case FL_SHORTCUT: if (visible_r()) { - v = menu()->find_shortcut(); + v = menu()->find_shortcut(0, true); if (v && v->submenu()) goto J1; } return test_shortcut() != 0; @@ -74,5 +74,5 @@ int Fl_Menu_Bar::handle(int event) { } // -// End of "$Id: Fl_Menu_Bar.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Menu_Bar.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Menu_Button.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Menu_Button.cxx index a808d3194..bfd220779 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Menu_Button.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Menu_Button.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Menu_Button.cxx 7162 2010-02-26 21:10:46Z matt $" +// "$Id: Fl_Menu_Button.cxx 7903 2010-11-28 21:06:39Z matt $" // // Menu button widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -118,5 +118,5 @@ Fl_Menu_Button::Fl_Menu_Button(int X,int Y,int W,int H,const char *l) } // -// End of "$Id: Fl_Menu_Button.cxx 7162 2010-02-26 21:10:46Z matt $". +// End of "$Id: Fl_Menu_Button.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Menu_Window.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Menu_Window.cxx index 8f230c379..956f88bdc 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Menu_Window.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Menu_Window.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Menu_Window.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Menu_Window.cxx 8198 2011-01-06 10:24:58Z manolo $" // // Menu window code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -69,7 +69,7 @@ void Fl_Menu_Window::flush() { fl_window = myi->xid; if (!gc) { gc = XCreateGC(fl_display, myi->xid, 0, 0); -# if defined(USE_CAIRO) +# if defined(FLTK_USE_CAIRO) if(Fl::autolink_context()) Fl::cairo_make_current(gc); // capture gc changes automatically to update the cairo context adequately # endif } @@ -106,5 +106,5 @@ Fl_Menu_Window::~Fl_Menu_Window() { } // -// End of "$Id: Fl_Menu_Window.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Menu_Window.cxx 8198 2011-01-06 10:24:58Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Menu_add.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Menu_add.cxx index c36eb2939..2ce280450 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Menu_add.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Menu_add.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Menu_add.cxx 7519 2010-04-16 19:50:40Z greg.ercolano $" +// "$Id: Fl_Menu_add.cxx 8110 2010-12-23 08:02:52Z manolo $" // // Menu utilities for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -51,6 +51,8 @@ extern Fl_Menu_* fl_menu_array_owner; // in Fl_Menu_.cxx // above pointers to detect if the array belongs to an Fl_Menu_ // widget, and if so it reallocates as necessary. + + // Insert a single Fl_Menu_Item into an array of size at offset n, // if this is local_array it will be reallocated if needed. static Fl_Menu_Item* array_insert( @@ -81,6 +83,8 @@ static Fl_Menu_Item* array_insert( return array; } + + // Comparison that does not care about deleted '&' signs: static int compare(const char* a, const char* b) { for (;;) { @@ -97,6 +101,8 @@ static int compare(const char* a, const char* b) { } } + + /** Adds an item. The text is split at '/' characters to automatically produce submenus (actually a totally unnecessary feature as you can now add submenu titles directly by setting SUBMENU in the flags): @@ -111,15 +117,26 @@ int Fl_Menu_Item::add( return(insert(-1,mytext,sc,cb,data,myflags)); // -1: append } -/** Inserts an item at position \p index. + + +/** + Inserts an item at position \p index. - If \p index is -1, the item is added the same way as Fl_Menu_Item::add(). + If \p index is -1, the item is added the same way as Fl_Menu_Item::add(). - If 'mytext' contains any un-escaped front slashes (/), it's assumed - a menu pathname is being specified, and the value of \p index - will be ignored. + If 'mytext' contains any un-escaped front slashes (/), it's assumed + a menu pathname is being specified, and the value of \p index + will be ignored. - In all other aspects, the behavior of insert() is the same as add(). + In all other aspects, the behavior of insert() is the same as add(). + + \param index insert new items here + \param mytext new label string, details see above + \param sc keyboard shortcut for new item + \param cb callback function for new item + \param data user data for new item + \param myflags menu flags as described in FL_Menu_Item + \returns the index into the menu() array, where the entry was added */ int Fl_Menu_Item::insert( int index, @@ -199,6 +216,8 @@ int Fl_Menu_Item::insert( return m-array; } + + /** Adds a new menu item. @@ -251,6 +270,8 @@ int Fl_Menu_Item::insert( \par Raw integer shortcuts can be a combination of keyboard chars (eg. 'A') and optional keyboard modifiers (see Fl::event_state(), e.g. FL_SHIFT, etc). + In addition, FL_COMMAND can be used to denote FL_META under Mac OS X and + FL_CTRL under other platforms. \par String shortcuts can be specified in one of two ways: \par @@ -262,7 +283,7 @@ int Fl_Menu_Item::insert( ..where \ is a decimal value representing an ascii character (eg. 97 is the ascii code for 'a'), and the optional prefixes enhance the value that follows. Multiple prefixes must - appear in the above order. + appear in the order below. \par \verbatim # - Alt @@ -307,6 +328,8 @@ int Fl_Menu_::add(const char *label,int shortcut,Fl_Callback *callback,void *use return(insert(-1,label,shortcut,callback,userdata,flags)); // -1: append } + + /** Inserts a new menu item at the specified \p index position. @@ -387,6 +410,8 @@ int Fl_Menu_::insert( return r; } + + /** This is a Forms (and SGI GL library) compatible add function, it adds many menu items, with '|' separating the menu items, and tab @@ -399,6 +424,9 @@ int Fl_Menu_::insert( same special characters as described for the long version of add(). No items must be added to a menu during a callback to the same menu. + + \param str string containing multiple menu labels as described above + \returns the index into the menu() array, where the entry was added */ int Fl_Menu_::add(const char *str) { char buf[1024]; @@ -417,10 +445,15 @@ int Fl_Menu_::add(const char *str) { return r; } + + /** Changes the text of item \p i. This is the only way to get slash into an add()'ed menu item. If the menu array was directly set with menu(x) then copy() is done to make a private array. + + \param i index into menu array + \param str new label for menu item at index i */ void Fl_Menu_::replace(int i, const char *str) { if (i<0 || i>=size()) return; @@ -431,11 +464,16 @@ void Fl_Menu_::replace(int i, const char *str) { } menu_[i].text = str; } + + + /** Deletes item \p i from the menu. If the menu array was directly set with menu(x) then copy() is done to make a private array. No items must be removed from a menu during a callback to the same menu. + + \param i index into menu array */ void Fl_Menu_::remove(int i) { int n = size(); @@ -454,5 +492,5 @@ void Fl_Menu_::remove(int i) { } // -// End of "$Id: Fl_Menu_add.cxx 7519 2010-04-16 19:50:40Z greg.ercolano $". +// End of "$Id: Fl_Menu_add.cxx 8110 2010-12-23 08:02:52Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Menu_global.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Menu_global.cxx index 31349a8f7..c5d5a76c7 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Menu_global.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Menu_global.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Menu_global.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Menu_global.cxx 7903 2010-11-28 21:06:39Z matt $" // // Global menu shortcut code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -56,5 +56,5 @@ void Fl_Menu_::global() { } // -// End of "$Id: Fl_Menu_global.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Menu_global.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Multi_Label.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Multi_Label.cxx index d8e5cff8a..df117db30 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Multi_Label.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Multi_Label.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Multi_Label.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Multi_Label.cxx 7903 2010-11-28 21:06:39Z matt $" // // Multi-label widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -76,5 +76,5 @@ void Fl_Multi_Label::label(Fl_Menu_Item* o) { } // -// End of "$Id: Fl_Multi_Label.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Multi_Label.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Native_File_Chooser.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Native_File_Chooser.cxx index ffef8b362..1b3024f3c 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Native_File_Chooser.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Native_File_Chooser.cxx @@ -1,8 +1,8 @@ -// "$Id: Fl_Native_File_Chooser.cxx 7003 2010-01-14 20:47:59Z greg.ercolano $" +// "$Id: Fl_Native_File_Chooser.cxx 8378 2011-02-05 22:35:51Z matt $" // // FLTK native OS file chooser widget // -// Copyright 1998-2005 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // Copyright 2004 Greg Ercolano. // // This library is free software; you can redistribute it and/or @@ -32,7 +32,7 @@ // Use Apple's chooser #ifdef __APPLE__ -#include "Fl_Native_File_Chooser_MAC.cxx" +#include #endif // All else falls back to FLTK's own chooser @@ -40,6 +40,8 @@ #include "Fl_Native_File_Chooser_FLTK.cxx" #endif +const char *Fl_Native_File_Chooser::file_exists_message = "File exists. Are you sure you want to overwrite?"; + // -// End of "$Id: Fl_Native_File_Chooser.cxx 7003 2010-01-14 20:47:59Z greg.ercolano $". +// End of "$Id: Fl_Native_File_Chooser.cxx 8378 2011-02-05 22:35:51Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Native_File_Chooser_FLTK.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Native_File_Chooser_FLTK.cxx index 7f910a18a..a11c1f94a 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Native_File_Chooser_FLTK.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Native_File_Chooser_FLTK.cxx @@ -1,8 +1,8 @@ -// "$Id: Fl_Native_File_Chooser_FLTK.cxx 7015 2010-01-17 17:09:00Z greg.ercolano $" +// "$Id: Fl_Native_File_Chooser_FLTK.cxx 8282 2011-01-16 18:26:51Z manolo $" // // FLTK native OS file chooser widget // -// Copyright 1998-2005 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // Copyright 2004 Greg Ercolano. // API changes + filter improvements by Nathan Vander Wilt 2005 // @@ -64,16 +64,6 @@ Fl_Native_File_Chooser::Fl_Native_File_Chooser(int val) { _file_chooser = new Fl_File_Chooser(NULL, NULL, 0, NULL); type(val); // do this after _file_chooser created _nfilters = 0; - - // Added by MG - Fl_Button *b = _file_chooser->previewButton; - Fl_Window *w = b->window(); - Fl_Group::current(w); // adds a "Show hidden files" check button in _file_chooser's window - show_hidden = new Fl_Check_Button(b->x() + b->w() + 10, b->y(), 145, b->h(), "Show hidden files"); - show_hidden->callback((Fl_Callback*)show_hidden_cb, this); - my_fileList = _file_chooser->browser(); - _old_dir = 0; // to detect directory changes - prev_filtervalue = _file_chooser->filter_value(); // to detect filter changes } /** @@ -88,7 +78,6 @@ Fl_Native_File_Chooser::~Fl_Native_File_Chooser() { _prevvalue = strfree(_prevvalue); _directory = strfree(_directory); _errmsg = strfree(_errmsg); - _old_dir = strfree(_old_dir); } // PRIVATE: SET ERROR MESSAGE @@ -198,14 +187,6 @@ int Fl_Native_File_Chooser::show() { // BLOCK WHILE BROWSER SHOWN while ( _file_chooser->shown() ) { - if (_old_dir==0 || strcmp(_old_dir, _file_chooser->directory()) != 0) { - _old_dir = strfree(_old_dir); - _old_dir = strnew(_file_chooser->directory()); - if (!show_hidden->value()) remove_hidden_files(my_fileList); - } else if (prev_filtervalue != _file_chooser->filter_value() ) { - prev_filtervalue = _file_chooser->filter_value(); - if (!show_hidden->value() ) remove_hidden_files(my_fileList); - } Fl::wait(); } @@ -471,34 +452,11 @@ const char* Fl_Native_File_Chooser::preset_file() const { return(_preset_file); } -void Fl_Native_File_Chooser::show_hidden_cb(Fl_Check_Button *o, void *data) -{ - Fl_Native_File_Chooser *mychooser = (Fl_Native_File_Chooser *)data; - if (o->value()) { - mychooser->my_fileList->load(mychooser->_file_chooser->directory()); - } else { - remove_hidden_files(mychooser->my_fileList); - mychooser->my_fileList->redraw(); - } -} -// PRIVATE: Don't show hidden files -void Fl_Native_File_Chooser::remove_hidden_files(Fl_File_Browser *my_fileList) -{ - int count = my_fileList->size(); - for(int num = count; num >= 1; num--) { - const char *p = my_fileList->text(num); - if (*p == '.' && strcmp(p, "../") != 0) my_fileList->remove(num); - } - my_fileList->topline(1); -} - -// PRIVATE: Don't show hidden files int Fl_Native_File_Chooser::exist_dialog() { - return(fl_choice("File exists. Are you sure you want to overwrite?", - "Cancel", " OK ", NULL)); + return(fl_choice("%s", fl_cancel, fl_ok, NULL, file_exists_message)); } // -// End of "$Id: Fl_Native_File_Chooser_FLTK.cxx 7015 2010-01-17 17:09:00Z greg.ercolano $". +// End of "$Id: Fl_Native_File_Chooser_FLTK.cxx 8282 2011-01-16 18:26:51Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Native_File_Chooser_MAC.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Native_File_Chooser_MAC.mm similarity index 87% rename from plugins/zynaddsubfx/fltk/src/Fl_Native_File_Chooser_MAC.cxx rename to plugins/zynaddsubfx/fltk/src/Fl_Native_File_Chooser_MAC.mm index 485376e69..c17b4a076 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Native_File_Chooser_MAC.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Native_File_Chooser_MAC.mm @@ -1,8 +1,8 @@ -// "$Id: Fl_Native_File_Chooser_MAC.cxx 7354 2010-03-29 11:07:29Z matt $" +// "$Id: Fl_Native_File_Chooser_MAC.mm 8784 2011-06-06 12:11:04Z manolo $" // // FLTK native OS file chooser widget // -// Copyright 1998-2005 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // Copyright 2004 Greg Ercolano. // // This library is free software; you can redistribute it and/or @@ -30,7 +30,7 @@ // Possibly 'preset_file' could be used to select the filename. // -#ifndef FL_DOXYGEN // PREVENT DOXYGEN'S USE OF THIS FILE +#ifdef __APPLE__ #include "Fl_Native_File_Chooser_common.cxx" // strnew/strfree/strapp/chrcat #include // dirname(3) @@ -40,6 +40,7 @@ #include #include +#include #include // FREE PATHNAMES ARRAY, IF IT HAS ANY CONTENTS @@ -332,10 +333,22 @@ void Fl_Native_File_Chooser::preset_file(const char* val) { // PRESET FILE // Returned value can be NULL if none set. // -const char* Fl_Native_File_Chooser::preset_file() { +const char* Fl_Native_File_Chooser::preset_file() const { return(_preset_file); } +void Fl_Native_File_Chooser::filter_value(int val) { + _filt_value = val; +} + +int Fl_Native_File_Chooser::filter_value() const { + return(_filt_value); +} + +int Fl_Native_File_Chooser::filters() const { + return(_filt_total); +} + #import #define UNLIKELYPREFIX "___fl_very_unlikely_prefix_" #ifndef MAC_OS_X_VERSION_10_6 @@ -360,18 +373,45 @@ int Fl_Native_File_Chooser::get_saveas_basename(void) { // SET THE TYPE OF BROWSER void Fl_Native_File_Chooser::type(int val) { _btype = val; - switch (_btype) { - case BROWSE_FILE: - case BROWSE_MULTI_FILE: - case BROWSE_DIRECTORY: - case BROWSE_MULTI_DIRECTORY: - _panel = [NSOpenPanel openPanel]; - break; - case BROWSE_SAVE_DIRECTORY: - case BROWSE_SAVE_FILE: - _panel = [NSSavePanel savePanel]; - break; - } +} + +/* Input + filter= "C files\t*.{c,h}\nText files\t*.txt\n" + patterns[0] = "*.{c,h}" + patterns[1] = "*.txt" + count = 2 + Return: + "C files (*.{c,h})\nText files (*.txt)\n" + */ +static char *prepareMacFilter(int count, const char *filter, char **patterns) { + int rank = 0, l = 0; + for (int i = 0; i < count; i++) { + l += strlen(patterns[i]) + 3; + } + const char *p = filter; + char *q; q = new char[strlen(p) + l + 1]; + const char *r, *s; + char *t; + t = q; + do { // copy to t what is in filter removing what is between \t and \n, if any + r = strchr(p, '\n'); + if (!r) r = p + strlen(p); + s = strchr(p, '\t'); + if (s && s < r) { + memcpy(q, p, s - p); + q += s - p; + if (rank < count) { sprintf(q, " (%s)", patterns[rank]); q += strlen(q); } + } + else { + memcpy(q, p, r - p); + q += r - p; + } + rank++; + *(q++) = '\n'; + if (*p) p = r + 1; + } while(*p); + *q = 0; + return t; } @interface FLopenDelegate : NSObject @@ -425,9 +465,9 @@ static NSPopUpButton *createPopupAccessory(NSSavePanel *panel, const char *filte NSPopUpButton *popup; NSRect rectview = NSMakeRect(5, 5, 350, 30 ); NSView *view = [[[NSView alloc] initWithFrame:rectview] autorelease]; - NSRect rectbox = NSMakeRect(0, 3, 50, 1 ); + NSRect rectbox = NSMakeRect(0, 3, 140, 20 ); NSBox *box = [[[NSBox alloc] initWithFrame:rectbox] autorelease]; - NSRect rectpop = NSMakeRect(60, 0, 250, 30 ); + NSRect rectpop = NSMakeRect(105, 0, 246, 30 ); popup = [[[NSPopUpButton alloc ] initWithFrame:rectpop pullsDown:NO] autorelease]; [view addSubview:box]; [view addSubview:popup]; @@ -438,9 +478,14 @@ static NSPopUpButton *createPopupAccessory(NSSavePanel *panel, const char *filte NSFont *font = [NSFont controlContentFontOfSize:NSRegularControlSize]; [box setTitleFont:font]; [box sizeToFit]; + // horizontally move box to fit the locale-dependent width of its title + NSRect r=[box frame]; + NSPoint o = r.origin; + o.x = rectpop.origin.x - r.size.width + 15; + [box setFrameOrigin:o]; CFStringRef tab = CFSTR("\n"); CFStringRef tmp_cfs; - tmp_cfs = CFStringCreateWithCString(NULL, filter, kCFStringEncodingASCII); + tmp_cfs = CFStringCreateWithCString(NULL, filter, kCFStringEncodingUTF8); CFArrayRef array = CFStringCreateArrayBySeparatingStrings(NULL, tmp_cfs, tab); CFRelease(tmp_cfs); CFRelease(tab); @@ -469,6 +514,18 @@ int Fl_Native_File_Chooser::post() { } NSAutoreleasePool *localPool; localPool = [[NSAutoreleasePool alloc] init]; + switch (_btype) { + case BROWSE_FILE: + case BROWSE_MULTI_FILE: + case BROWSE_DIRECTORY: + case BROWSE_MULTI_DIRECTORY: + _panel = [NSOpenPanel openPanel]; + break; + case BROWSE_SAVE_DIRECTORY: + case BROWSE_SAVE_FILE: + _panel = [NSSavePanel savePanel]; + break; + } int retval; NSString *nstitle = [NSString stringWithUTF8String: (_title ? _title : "No Title")]; [(NSSavePanel*)_panel setTitle:nstitle]; @@ -478,6 +535,7 @@ int Fl_Native_File_Chooser::post() { break; case BROWSE_MULTI_DIRECTORY: [(NSOpenPanel*)_panel setAllowsMultipleSelection:YES]; + /* FALLTHROUGH */ case BROWSE_DIRECTORY: [(NSOpenPanel*)_panel setCanChooseDirectories:YES]; break; @@ -490,23 +548,11 @@ int Fl_Native_File_Chooser::post() { if ( [(NSSavePanel*)_panel isKindOfClass:[NSOpenPanel class]] ) { NSPopUpButton *popup = nil; if (_filt_total) { - char *p; p = _filter; - char *q; q = new char[strlen(p) + 1]; - char *r, *s, *t; - t = q; - do { // copy to t what is in _filter removing what is between \t and \n, if any - r = strchr(p, '\n'); - if (!r) r = p + strlen(p) - 1; - s = strchr(p, '\t'); - if (s && s < r) { memcpy(q, p, s - p); q += s - p; *(q++) = '\n'; } - else { memcpy(q, p, r - p + 1); q += r - p + 1; } - *q = 0; - p = r + 1; - } while(*p); - popup = createPopupAccessory((NSSavePanel*)_panel, t, "Enable:", 0); - delete t; + char *t = prepareMacFilter(_filt_total, _filter, _filt_patt); + popup = createPopupAccessory((NSSavePanel*)_panel, t, Fl_File_Chooser::show_label, 0); + delete[] t; [[popup menu] addItem:[NSMenuItem separatorItem]]; - [popup addItemWithTitle:@"All Documents"]; + [popup addItemWithTitle:[[NSString alloc] initWithUTF8String:Fl_File_Chooser::all_files_label]]; [popup setAction:@selector(validateVisibleColumns)]; [popup setTarget:(NSObject*)_panel]; static FLopenDelegate *openDelegate = nil; @@ -548,6 +594,7 @@ int Fl_Native_File_Chooser::post() { NSString *fname = nil; NSString *preset = nil; NSPopUpButton *popup = nil; + [(NSSavePanel*)_panel setAllowsOtherFileTypes:YES]; if ( !(_options & SAVEAS_CONFIRM) ) { static FLsaveDelegate *saveDelegate = nil; if (saveDelegate == nil)saveDelegate = [[FLsaveDelegate alloc] init]; // not to be ever freed @@ -562,7 +609,9 @@ int Fl_Native_File_Chooser::post() { } if (_directory && !dir) dir = [[NSString alloc] initWithUTF8String:_directory]; if (_filt_total) { - popup = createPopupAccessory((NSSavePanel*)_panel, _filter, "Format:", _filt_value); + char *t = prepareMacFilter(_filt_total, _filter, _filt_patt); + popup = createPopupAccessory((NSSavePanel*)_panel, t, [[(NSSavePanel*)_panel nameFieldLabel] UTF8String], _filt_value); + delete[] t; } retval = [(NSSavePanel*)_panel runModalForDirectory:dir file:fname]; if (_filt_total) { @@ -576,8 +625,8 @@ int Fl_Native_File_Chooser::post() { return (retval == NSOKButton ? 0 : 1); } -#endif /*!FL_DOXYGEN*/ +#endif // __APPLE__ // -// End of "$Id: Fl_Native_File_Chooser_MAC.cxx 7354 2010-03-29 11:07:29Z matt $". +// End of "$Id: Fl_Native_File_Chooser_MAC.mm 8784 2011-06-06 12:11:04Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Native_File_Chooser_WIN32.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Native_File_Chooser_WIN32.cxx index 542f0c07b..71b5a9252 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Native_File_Chooser_WIN32.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Native_File_Chooser_WIN32.cxx @@ -1,8 +1,8 @@ -// "$Id: Fl_Native_File_Chooser_WIN32.cxx 7312 2010-03-21 22:55:18Z fabien $" +// "$Id: Fl_Native_File_Chooser_WIN32.cxx 8454 2011-02-20 21:46:11Z manolo $" // // FLTK native OS file chooser widget // -// Copyright 1998-2005 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // Copyright 2004 Greg Ercolano. // API changes + filter improvements by Nathan Vander Wilt 2005 // @@ -47,7 +47,10 @@ char *wchartoutf8(LPCWSTR in); //MG #define RBRACKET_CHR ']' #define MAXFILTERS 80 +void fl_OleInitialize(); // in Fl.cxx (Windows only) + // STATIC: PRINT WINDOWS 'DOUBLE NULL' STRING (DEBUG) +#ifdef DEBUG static void dnullprint(char *wp) { if ( ! wp ) return; for ( int t=0; true; t++ ) { @@ -62,6 +65,7 @@ static void dnullprint(char *wp) { } } } +#endif // RETURN LENGTH OF DOUBLENULL STRING // Includes single nulls in count, excludes trailing doublenull. @@ -464,7 +468,8 @@ int CALLBACK Fl_Native_File_Chooser::Dir_CB(HWND win, UINT msg, LPARAM param, LP // SHOW DIRECTORY BROWSER int Fl_Native_File_Chooser::showdir() { - OleInitialize(NULL); // init needed by BIF_USENEWUI + // initialize OLE only once + fl_OleInitialize(); // init needed by BIF_USENEWUI ClearBINF(); clear_pathnames(); // PARENT WINDOW @@ -630,9 +635,9 @@ void Fl_Native_File_Chooser::add_filter(const char *name_in, // name of filter ( // No name? Make one.. char name[1024]; if ( !name_in || name_in[0] == '\0' ) { - sprintf(name, "%.*s Files", sizeof(name)-10, winfilter); + sprintf(name, "%.*s Files", int(sizeof(name)-10), winfilter); } else { - sprintf(name, "%.*s", sizeof(name)-10, name_in); + sprintf(name, "%.*s", int(sizeof(name)-10), name_in); } dnullcat(_parsedfilt, name); dnullcat(_parsedfilt, winfilter); @@ -816,6 +821,10 @@ const char* Fl_Native_File_Chooser::preset_file() const { return(_preset_file); } +int Fl_Native_File_Chooser::filters() const { + return(_nfilters); +} + char *wchartoutf8(LPCWSTR in) { static char *out = NULL; @@ -847,5 +856,5 @@ LPCWSTR utf8towchar(const char *in) #endif /*!FL_DOXYGEN*/ // -// End of "$Id: Fl_Native_File_Chooser_WIN32.cxx 7312 2010-03-21 22:55:18Z fabien $". +// End of "$Id: Fl_Native_File_Chooser_WIN32.cxx 8454 2011-02-20 21:46:11Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Native_File_Chooser_common.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Native_File_Chooser_common.cxx index 209c9c725..f5d45f194 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Native_File_Chooser_common.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Native_File_Chooser_common.cxx @@ -1,8 +1,8 @@ -// "$Id: Fl_Native_File_Chooser_common.cxx 7001 2010-01-14 19:38:23Z ianmacarthur $" +// "$Id: Fl_Native_File_Chooser_common.cxx 7977 2010-12-08 13:16:27Z AlbrechtS $" // // FLTK native OS file chooser widget // -// Copyright 1998-2005 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // Copyright 2004 Greg Ercolano. // // This library is free software; you can redistribute it and/or @@ -56,6 +56,7 @@ static char *strfree(char *val) { // char *s = strnew("foo"); // s = "foo" // s = strapp(s, "bar"); // s = "foobar" // +#if !defined(WIN32) static char *strapp(char *s, const char *val) { if ( ! val ) { return(s); // Nothing to append? return s @@ -69,6 +70,7 @@ static char *strapp(char *s, const char *val) { delete [] s; // delete old string return(news); // return new copy } +#endif // APPEND A CHARACTER TO A STRING // This does NOT allocate space for the new character. @@ -79,5 +81,5 @@ static void chrcat(char *s, char c) { } // -// End of "$Id: Fl_Native_File_Chooser_common.cxx 7001 2010-01-14 19:38:23Z ianmacarthur $". +// End of "$Id: Fl_Native_File_Chooser_common.cxx 7977 2010-12-08 13:16:27Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Overlay_Window.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Overlay_Window.cxx index 8eec995eb..f75a3d941 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Overlay_Window.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Overlay_Window.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Overlay_Window.cxx 7636 2010-06-09 08:36:25Z AlbrechtS $" +// "$Id: Fl_Overlay_Window.cxx 8198 2011-01-06 10:24:58Z manolo $" // // Overlay window code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -135,7 +135,7 @@ void _Fl_Overlay::flush() { gc = XCreateGC(fl_display, fl_xid(this), 0, 0); } fl_gc = gc; -#if defined(USE_CAIRO) +#if defined(FLTK_USE_CAIRO) if (Fl::cairo_autolink_context()) Fl::cairo_make_current(this); // capture gc changes automatically to update the cairo context adequately #endif fl_overlay = 1; @@ -172,5 +172,5 @@ void Fl_Overlay_Window::redraw_overlay() { #endif // -// End of "$Id: Fl_Overlay_Window.cxx 7636 2010-06-09 08:36:25Z AlbrechtS $". +// End of "$Id: Fl_Overlay_Window.cxx 8198 2011-01-06 10:24:58Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Pack.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Pack.cxx index 86935910c..5889b9fc3 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Pack.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Pack.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Pack.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Pack.cxx 7903 2010-11-28 21:06:39Z matt $" // // Packing widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -153,5 +153,5 @@ void Fl_Pack::draw() { } // -// End of "$Id: Fl_Pack.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Pack.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Paged_Device.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Paged_Device.cxx index faa436983..d3ea07b66 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Paged_Device.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Paged_Device.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Paged_Device.cxx 7623 2010-05-27 17:52:27Z manolo $" +// "$Id: Fl_Paged_Device.cxx 8621 2011-04-23 15:46:30Z AlbrechtS $" // // implementation of Fl_Paged_Device class for the Fast Light Tool Kit (FLTK). // -// Copyright 2010 by Bill Spitzak and others. +// Copyright 2010-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -28,10 +28,11 @@ \brief implementation of class Fl_Paged_Device. */ +#include #include -#include +#include -const char *Fl_Paged_Device::device_type = "Fl_Paged_Device"; +const char *Fl_Paged_Device::class_id = "Fl_Paged_Device"; /** @@ -73,7 +74,7 @@ void Fl_Paged_Device::print_widget(Fl_Widget* widget, int delta_x, int delta_y) int width, height; this->printable_rect(&width, &height); drawn_by_plugin = pi->print(widget, 0, 0, height); - } + } } if (!drawn_by_plugin) { widget->draw(); @@ -117,7 +118,7 @@ void Fl_Paged_Device::origin(int *x, int *y) /** @brief Prints a rectangular part of an on-screen window. - * + @param win The window from where to capture. @param x The rectangle left @param y The rectangle top @@ -128,7 +129,6 @@ void Fl_Paged_Device::origin(int *x, int *y) */ void Fl_Paged_Device::print_window_part(Fl_Window *win, int x, int y, int w, int h, int delta_x, int delta_y) { - int slice, width, offset, count = 0; Fl_Surface_Device *current = Fl_Surface_Device::surface(); Fl_Display_Device::display_device()->set_current(); Fl_Window *save_front = Fl::first_window(); @@ -136,87 +136,51 @@ void Fl_Paged_Device::print_window_part(Fl_Window *win, int x, int y, int w, int fl_gc = NULL; Fl::check(); win->make_current(); - uchar *image_data[20]; -#ifdef WIN32 // because of bug in StretchDIBits, vertically cut image in pieces of width slice - slice = 500; -#else - slice = w; -#endif - for ( offset = 0; offset < w; offset += slice) { - width = slice; - if (offset + width > w) width = w - offset; - image_data[count++] = fl_read_image(NULL, x + offset, y, width, h); - } - save_front->show(); + uchar *image_data; + image_data = fl_read_image(NULL, x, y, w, h); + if (save_front != win) save_front->show(); current->set_current(); - for ( int i = 0, offset = 0; i < count; i++, offset += slice) { - width = slice; - if (offset + width > w) width = w - offset; - fl_draw_image(image_data[i], delta_x + offset, delta_y, width, h, 3); -#ifdef __APPLE__ - add_image(NULL, image_data[i]); -#else - delete image_data[i]; + fl_draw_image(image_data, delta_x, delta_y, w, h, 3); + delete[] image_data; +#ifdef WIN32 + fl_gc = GetDC(fl_xid(win)); + ReleaseDC(fl_xid(win), fl_gc); #endif - } } -#ifdef __APPLE__ -void Fl_Paged_Device::add_image(Fl_Image *image, const uchar *data) -{ - struct chain_elt *elt = (struct chain_elt *)calloc(sizeof(struct chain_elt), 1); - elt->image = image; - elt->data = data; - if (image_list_) { elt->next = image_list_; } - image_list_ = elt; -} - -void Fl_Paged_Device::delete_image_list() -{ - while(image_list_) { - struct chain_elt *next = image_list_->next; - if(image_list_->image) delete image_list_->image; - if (image_list_->data) delete (uchar*) image_list_->data; // msvc6 compilation fix - free(image_list_); - image_list_ = next; - } -} -#endif - - /** @brief Starts a print job. - * + @param[in] pagecount the total number of pages of the job @param[out] frompage if non-null, *frompage is set to the first page the user wants printed @param[out] topage if non-null, *topage is set to the last page the user wants printed - @return 0 iff OK + @return 0 if OK, non-zero if any error */ int Fl_Paged_Device::start_job(int pagecount, int *frompage, int *topage) {return 1;} /** @brief Starts a new printed page - * + The page coordinates are initially in points, i.e., 1/72 inch, and with origin at the top left of the printable page area. - @return 0 iff OK + @return 0 if OK, non-zero if any error */ int Fl_Paged_Device::start_page (void) {return 1;} /** @brief Computes the width and height of the printable area of the page. - * + Values are in the same unit as that used by FLTK drawing functions, are unchanged by calls to origin(), but are changed by scale() calls. Values account for the user-selected paper type and print orientation. - @return 0 iff OK. + @return 0 if OK, non-zero if any error */ int Fl_Paged_Device::printable_rect(int *w, int *h) {return 1;} /** @brief Computes the dimensions of margins that lie between the printable page area and the full page. - * + Values are in the same unit as that used by FLTK drawing functions. They are changed by scale() calls. @param[out] left If non-null, *left is set to the left margin size. @@ -228,7 +192,7 @@ void Fl_Paged_Device::margins(int *left, int *top, int *right, int *bottom) {} /** @brief Sets the position in page coordinates of the origin of graphics functions. - * + Arguments should be expressed relatively to the result of a previous printable_rect() call. That is, printable_rect(&w, &h); origin(w/2, 0); sets the graphics origin at the top center of the page printable area. @@ -241,28 +205,30 @@ void Fl_Paged_Device::origin(int x, int y) {} /** @brief Changes the scaling of page coordinates. - * + This function also resets the origin of graphics functions at top left of printable page area. After a scale() call, do a printable_rect() call to get the new dimensions of the printable page area. Successive scale() calls don't combine their effects. @param scale_x Horizontal dimensions of plot are multiplied by this quantity. - @param scale_y Same as above, vertically. + @param scale_y Same as above, vertically. + The value 0. is equivalent to setting \p scale_y = \p scale_x. Thus, scale(factor); + is equivalent to scale(factor, factor); */ void Fl_Paged_Device::scale (float scale_x, float scale_y) {} /** @brief Rotates the graphics operations relatively to paper. - * + The rotation is centered on the current graphics origin. Successive rotate() calls don't combine their effects. - @param angle Rotation angle in counterclockwise degrees. + @param angle Rotation angle in counter-clockwise degrees. */ void Fl_Paged_Device::rotate(float angle) {} /** @brief To be called at the end of each page. - * - @return 0 iff OK. + + @return 0 if OK, non-zero if any error. */ int Fl_Paged_Device::end_page (void) {return 1;} @@ -273,7 +239,7 @@ void Fl_Paged_Device::end_job (void) {} /** @brief Translates the current graphics origin accounting for the current rotation. - * + This function is only useful after a rotate() call. Each translate() call must be matched by an untranslate() call. Successive translate() calls add up their effects. @@ -285,7 +251,47 @@ void Fl_Paged_Device::translate(int x, int y) {} */ void Fl_Paged_Device::untranslate(void) {} -// -// End of "$Id: Fl_Paged_Device.cxx 7623 2010-05-27 17:52:27Z manolo $". -// +const Fl_Paged_Device::page_format Fl_Paged_Device::page_formats[NO_PAGE_FORMATS] = { + // order of enum Page_Format + // comes from appendix B of 5003.PPD_Spec_v4.3.pdf + + // A* // index(Ai) = i + {2384, 3370, "A0"}, + {1684, 2384, "A1"}, + {1191, 1684, "A2"}, + { 842, 1191, "A3"}, + { 595, 842, "A4"}, + { 420, 595, "A5"}, + { 297, 420, "A6"}, + { 210, 297, "A7"}, + { 148, 210, "A8"}, + { 105, 148, "A9"}, + + // B* // index(Bi) = i+10 + {2920, 4127, "B0"}, + {2064, 2920, "B1"}, + {1460, 2064, "B2"}, + {1032, 1460, "B3"}, + { 729, 1032, "B4"}, + { 516, 729, "B5"}, + { 363, 516, "B6"}, + { 258, 363, "B7"}, + { 181, 258, "B8"}, + { 127, 181, "B9"}, + { 91, 127, "B10"}, + + // others + { 459, 649, "EnvC5"}, // envelope + { 312, 624, "EnvDL"}, // envelope + { 522, 756, "Executive"}, + { 595, 935, "Folio"}, + {1224, 792, "Ledger"}, // landscape + { 612, 1008, "Legal"}, + { 612, 792, "Letter"}, + { 792, 1224, "Tabloid"}, + { 297, 684, "Env10"} // envelope +}; +// +// End of "$Id: Fl_Paged_Device.cxx 8621 2011-04-23 15:46:30Z AlbrechtS $". +// diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Pixmap.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Pixmap.cxx index 3130e1786..461d970e1 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Pixmap.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Pixmap.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Pixmap.cxx 7659 2010-07-01 13:21:32Z manolo $" +// "$Id: Fl_Pixmap.cxx 8360 2011-02-02 12:42:47Z manolo $" // // Pixmap drawing code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -145,7 +145,7 @@ void Fl_GDI_Graphics_Driver::draw(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP } fl_end_offscreen(); } - if (fl_surface->type() == Fl_Printer::device_type) { + if (Fl_Surface_Device::surface()->class_name() == Fl_Printer::class_id) { typedef BOOL (WINAPI* fl_transp_func) (HDC,int,int,int,int,HDC,int,int,int,int,UINT); static HMODULE hMod = NULL; static fl_transp_func fl_TransparentBlt = NULL; @@ -153,7 +153,7 @@ void Fl_GDI_Graphics_Driver::draw(Fl_Pixmap *pxm, int XP, int YP, int WP, int HP hMod = LoadLibrary("MSIMG32.DLL"); if(hMod) fl_TransparentBlt = (fl_transp_func)GetProcAddress(hMod, "TransparentBlt"); } - if (hMod) { + if (fl_TransparentBlt) { Fl_Offscreen tmp_id = fl_create_offscreen(pxm->w(), pxm->h()); fl_begin_offscreen(tmp_id); uchar *bitmap = 0; @@ -559,5 +559,5 @@ void Fl_Pixmap::desaturate() { } // -// End of "$Id: Fl_Pixmap.cxx 7659 2010-07-01 13:21:32Z manolo $". +// End of "$Id: Fl_Pixmap.cxx 8360 2011-02-02 12:42:47Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Positioner.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Positioner.cxx index 11f954dd9..1a50630b3 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Positioner.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Positioner.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Positioner.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Positioner.cxx 7903 2010-11-28 21:06:39Z matt $" // // Positioner widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -157,5 +157,5 @@ void Fl_Positioner::ybounds(double a, double b) { } // -// End of "$Id: Fl_Positioner.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Positioner.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_PostScript.cxx b/plugins/zynaddsubfx/fltk/src/Fl_PostScript.cxx index 1f55badff..e7de956b3 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_PostScript.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_PostScript.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_PostScript.cxx 7653 2010-06-24 08:55:04Z manolo $" +// "$Id: Fl_PostScript.cxx 8623 2011-04-24 17:09:41Z AlbrechtS $" // // PostScript device support for the Fast Light Tool Kit (FLTK). // -// Copyright 2010 by Bill Spitzak and others. +// Copyright 2010-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -25,15 +25,22 @@ // http://www.fltk.org/str.php // +#include #include #include #include #include #include #include +#if defined(USE_X11) +#include "Fl_Font.H" +#if USE_XFT +#include +#endif +#endif -const char *Fl_PostScript_Graphics_Driver::device_type = "Fl_PostScript_Graphics_Driver"; -const char *Fl_PostScript_File_Device::device_type = "Fl_PostScript_File_Device"; +const char *Fl_PostScript_Graphics_Driver::class_id = "Fl_PostScript_Graphics_Driver"; +const char *Fl_PostScript_File_Device::class_id = "Fl_PostScript_File_Device"; /** \brief Label of the PostScript file chooser window */ const char *Fl_PostScript_File_Device::file_chooser_title = "Select a .ps file"; @@ -47,7 +54,6 @@ Fl_PostScript_Graphics_Driver::Fl_PostScript_Graphics_Driver(void) lang_level_ = 2; mask = 0; ps_filename_ = NULL; - type_ = device_type; scale_x = scale_y = 1.; bg_r = bg_g = bg_b = 255; } @@ -62,7 +68,6 @@ Fl_PostScript_Graphics_Driver::~Fl_PostScript_Graphics_Driver() { */ Fl_PostScript_File_Device::Fl_PostScript_File_Device(void) { - type_ = device_type; #ifdef __APPLE__ gc = fl_gc; // the display context is used by fl_text_extents() #endif @@ -85,9 +90,10 @@ Fl_PostScript_Graphics_Driver *Fl_PostScript_File_Device::driver() @param pagecount The total number of pages to be created. @param format Desired page format. @param layout Desired page layout. - @return 0 iff OK, 1 if user cancelled the file dialog, 2 if fopen failed on user-selected output file. + @return 0 if OK, 1 if user cancelled the file dialog, 2 if fopen failed on user-selected output file. */ -int Fl_PostScript_File_Device::start_job (int pagecount, enum Fl_PostScript_Graphics_Driver::Page_Format format, enum Fl_PostScript_Graphics_Driver::Page_Layout layout) +int Fl_PostScript_File_Device::start_job (int pagecount, enum Fl_Paged_Device::Page_Format format, + enum Fl_Paged_Device::Page_Layout layout) { Fl_Native_File_Chooser fnfc; fnfc.title(Fl_PostScript_File_Device::file_chooser_title); @@ -105,22 +111,29 @@ int Fl_PostScript_File_Device::start_job (int pagecount, enum Fl_PostScript_Grap return 0; } +static int dont_close(FILE *f) +{ + return 0; +} + /** @brief Begins the session where all graphics requests will go to FILE pointer. * - @param ps_output A writable FILE pointer that will receive PostScript output and that will be closed - when end_job() will be called. + @param ps_output A writable FILE pointer that will receive PostScript output and that should not be closed + until after end_job() has been called. @param pagecount The total number of pages to be created. @param format Desired page format. @param layout Desired page layout. @return always 0. */ -int Fl_PostScript_File_Device::start_job (FILE *ps_output, int pagecount, enum Fl_PostScript_Graphics_Driver::Page_Format format, enum Fl_PostScript_Graphics_Driver::Page_Layout layout) +int Fl_PostScript_File_Device::start_job (FILE *ps_output, int pagecount, + enum Fl_Paged_Device::Page_Format format, enum Fl_Paged_Device::Page_Layout layout) { Fl_PostScript_Graphics_Driver *ps = driver(); ps->output = ps_output; ps->ps_filename_ = NULL; ps->start_postscript(pagecount, format, layout); + ps->close_command(dont_close); // so that end_job() doesn't close the file this->set_current(); return 0; } @@ -139,46 +152,6 @@ Fl_PostScript_File_Device::~Fl_PostScript_File_Device() { #include "print_panel.cxx" #endif -const Fl_PostScript_Graphics_Driver::page_format Fl_PostScript_Graphics_Driver::page_formats[NO_PAGE_FORMATS] = { // order of enum Page_Format -// comes from appendix B of 5003.PPD_Spec_v4.3.pdf - - // A* // index(Ai) = i - {2384, 3370, "A0"}, - {1684, 2384, "A1"}, - {1191, 1684, "A2"}, - { 842, 1191, "A3"}, - { 595, 842, "A4"}, - { 420, 595, "A5"}, - { 297, 420, "A6"}, - { 210, 297, "A7"}, - { 148, 210, "A8"}, - { 105, 148, "A9"}, - - // B* // index(Bi) = i+10 - {2920, 4127, "B0"}, - {2064, 2920, "B1"}, - {1460, 2064, "B2"}, - {1032, 1460, "B3"}, - { 729, 1032, "B4"}, - { 516, 729, "B5"}, - { 363, 516, "B6"}, - { 258, 363, "B7"}, - { 181, 258, "B8"}, - { 127, 181, "B9"}, - { 91, 127, "B10"}, - - // others - { 459, 649, "EnvC5"}, // envelope - { 312, 624, "EnvDL"}, // envelope - { 522, 756, "Executive"}, - { 595, 935, "Folio"}, - {1224, 792, "Ledger"}, // landscape - { 612, 1008, "Legal"}, - { 612, 792, "Letter"}, - { 792, 1224, "Tabloid"}, - { 297, 684, "Env10"} // envelope -}; - // Prolog string static const char * prolog = @@ -270,7 +243,7 @@ static const char * prolog = "/MI { GS /py exch def /px exch def /sy exch def /sx exch def \n" "translate \n" -"sx sy scale px py false \n" +"sx sy scale px py true \n" "[ px 0 0 py neg 0 py ]\n" "currentfile /ASCIIHexDecode filter\n" "imagemask GR\n" @@ -300,7 +273,8 @@ static const char * prolog = // show at position with desired width // usage: // width (string) x y show_pos_width -"/show_pos_width {GS moveto dup dup stringwidth pop exch length exch 3 index exch sub exch " +"/show_pos_width {GS moveto dup dup stringwidth pop exch length 2 div dup 2 le {pop 9999} if " +"1 sub exch 3 index exch sub exch " "div 0 2 index 1 -1 scale ashow pop pop GR} bind def\n" // spacing altered to match desired width //"/show_pos_width {GS moveto dup stringwidth pop 3 2 roll exch div -1 matrix scale concat " //"show GR } bind def\n" // horizontally scaled text to match desired width @@ -330,8 +304,6 @@ static const char * prolog_2 = // prolog relevant only if lang_level >1 "IDD image GR} bind def\n" // gray image dict - - "/GII {GS /inter exch def /py exch def /px exch def /sy exch def /sx exch def \n" "translate \n" "sx sy scale\n" @@ -351,28 +323,90 @@ static const char * prolog_2 = // prolog relevant only if lang_level >1 "end\n" "IDD image GR} bind def\n" -// procedure to modify a font to use ISOLatin1 encoding (iso-8859-1) -// and to keep its name unchanged -"/ToLatin1 { dup findfont dup length dict " -"begin {def} forall /Encoding ISOLatin1Encoding def currentdict end definefont pop } def\n" -// modify all fonts to use ISOLatin1 encoding -"/Helvetica ToLatin1 " -"/Helvetica-Bold ToLatin1 " -"/Helvetica-Oblique ToLatin1 " -"/Helvetica-BoldOblique ToLatin1 \n" -"/Courier ToLatin1 " -"/Courier-Bold ToLatin1 " -"/Courier-Oblique ToLatin1 " -"/Courier-BoldOblique ToLatin1 \n" -"/Times ToLatin1 " -"/Times-Bold ToLatin1 " -"/Times-Italic ToLatin1 " -"/Times-BoldItalic ToLatin1 \n" +// Create a custom PostScript font derived from PostScript standard text fonts +// The encoding of this custom font is as follows: +// 0000-00FF coincides with Unicode, that is to ASCII + Latin-1 +// 0100-017F coincides with Unicode, that is to Latin Extended-A +// 0180-01A6 encodes miscellaneous characters present in PostScript standard text fonts + +// use ISOLatin1Encoding for all text fonts +"/ToISO { dup findfont dup length dict copy begin /Encoding ISOLatin1Encoding def currentdict end definefont pop } def\n" +"/Helvetica ToISO /Helvetica-Bold ToISO /Helvetica-Oblique ToISO /Helvetica-BoldOblique ToISO \n" +"/Courier ToISO /Courier-Bold ToISO /Courier-Oblique ToISO /Courier-BoldOblique ToISO \n" +"/Times-Roman ToISO /Times-Bold ToISO /Times-Italic ToISO /Times-BoldItalic ToISO \n" + +// define LatinExtA, the encoding of Latin-extended-A + some additional characters +// see http://www.adobe.com/devnet/opentype/archives/glyphlist.txt for their names +"/LatinExtA \n" +"[ " +" /Amacron /amacron /Abreve /abreve /Aogonek /aogonek\n" // begin of Latin Extended-A code page +" /Cacute /cacute /Ccircumflex /ccircumflex /Cdotaccent /cdotaccent /Ccaron /ccaron \n" +" /Dcaron /dcaron /Dcroat /dcroat\n" +" /Emacron /emacron /Ebreve /ebreve /Edotaccent /edotaccent /Eogonek /eogonek /Ecaron /ecaron\n" +" /Gcircumflex /gcircumflex /Gbreve /gbreve /Gdotaccent /gdotaccent /Gcommaaccent /gcommaaccent \n" +" /Hcircumflex /hcircumflex /Hbar /hbar \n" +" /Itilde /itilde /Imacron /imacron /Ibreve /ibreve /Iogonek /iogonek /Idotaccent /dotlessi \n" +" /IJ /ij /Jcircumflex /jcircumflex\n" +" /Kcommaaccent /kcommaaccent /kgreenlandic \n" +" /Lacute /lacute /Lcommaaccent /lcommaaccent /Lcaron /lcaron /Ldotaccent /ldotaccent /Lslash /lslash \n" +" /Nacute /nacute /Ncommaaccent /ncommaaccent /Ncaron /ncaron /napostrophe /Eng /eng \n" +" /Omacron /omacron /Obreve /obreve /Ohungarumlaut /ohungarumlaut /OE /oe \n" +" /Racute /racute /Rcommaaccent /rcommaaccent /Rcaron /rcaron \n" +" /Sacute /sacute /Scircumflex /scircumflex /Scedilla /scedilla /Scaron /scaron \n" +" /Tcommaaccent /tcommaaccent /Tcaron /tcaron /Tbar /tbar \n" +" /Utilde /utilde /Umacron /umacron /Ubreve /ubreve /Uring /uring /Uhungarumlaut /uhungarumlaut /Uogonek /uogonek \n" +" /Wcircumflex /wcircumflex /Ycircumflex /ycircumflex /Ydieresis \n" +" /Zacute /zacute /Zdotaccent /zdotaccent /Zcaron /zcaron \n" +" /longs \n" // end of Latin Extended-A code page +" /florin /circumflex /caron /breve /dotaccent /ring \n" // remaining characters from PostScript standard text fonts +" /ogonek /tilde /hungarumlaut /endash /emdash \n" +" /quoteleft /quoteright /quotesinglbase /quotedblleft /quotedblright \n" +" /quotedblbase /dagger /daggerdbl /bullet /ellipsis \n" +" /perthousand /guilsinglleft /guilsinglright /fraction /Euro \n" +" /trademark /partialdiff /Delta /summation /radical \n" +" /infinity /notequal /lessequal /greaterequal /lozenge \n" +" /fi /fl /apple \n" +" ] def \n" +// deal with alternative PostScript names of some characters +" /mycharstrings /Helvetica findfont /CharStrings get def\n" +" /PSname2 { dup mycharstrings exch known {LatinExtA 3 -1 roll 3 -1 roll put}{pop pop} ifelse } def \n" +" 16#20 /Gdot PSname2 16#21 /gdot PSname2 16#30 /Idot PSname2 16#3F /Ldot PSname2 16#40 /ldot PSname2 16#7F /slong PSname2 \n" + +// proc that gives LatinExtA encoding to a font +"/ToLatinExtA { findfont dup length dict copy begin /Encoding LatinExtA def currentdict end definefont pop } def\n" +// create Ext-versions of standard fonts that use LatinExtA encoding \n" +"/HelveticaExt /Helvetica ToLatinExtA \n" +"/Helvetica-BoldExt /Helvetica-Bold ToLatinExtA /Helvetica-ObliqueExt /Helvetica-Oblique ToLatinExtA \n" +"/Helvetica-BoldObliqueExt /Helvetica-BoldOblique ToLatinExtA \n" +"/CourierExt /Courier ToLatinExtA /Courier-BoldExt /Courier-Bold ToLatinExtA \n" +"/Courier-ObliqueExt /Courier-Oblique ToLatinExtA /Courier-BoldObliqueExt /Courier-BoldOblique ToLatinExtA \n" +"/Times-RomanExt /Times-Roman ToLatinExtA /Times-BoldExt /Times-Bold ToLatinExtA \n" +"/Times-ItalicExt /Times-Italic ToLatinExtA /Times-BoldItalicExt /Times-BoldItalic ToLatinExtA \n" + +// proc to create a Type 0 font with 2-byte encoding +// that merges a text font with ISO encoding + same font with LatinExtA encoding +"/To2byte { 6 dict begin /FontType 0 def \n" +"/FDepVector 3 1 roll findfont exch findfont 2 array astore def \n" +"/FontMatrix [1 0 0 1 0 0] def /FMapType 6 def /Encoding [ 0 1 0 ] def\n" +// 100: Hexa count of ISO array; A7: hexa count of LatinExtA array +"/SubsVector < 01 0100 00A7 > def\n" +"currentdict end definefont pop } def\n" +// create Type 0 versions of standard fonts +"/Helvetica2B /HelveticaExt /Helvetica To2byte \n" +"/Helvetica-Bold2B /Helvetica-BoldExt /Helvetica-Bold To2byte \n" +"/Helvetica-Oblique2B /Helvetica-ObliqueExt /Helvetica-Oblique To2byte \n" +"/Helvetica-BoldOblique2B /Helvetica-BoldObliqueExt /Helvetica-BoldOblique To2byte \n" +"/Courier2B /CourierExt /Courier To2byte \n" +"/Courier-Bold2B /Courier-BoldExt /Courier-Bold To2byte \n" +"/Courier-Oblique2B /Courier-ObliqueExt /Courier-Oblique To2byte \n" +"/Courier-BoldOblique2B /Courier-BoldObliqueExt /Courier-BoldOblique To2byte \n" +"/Times-Roman2B /Times-RomanExt /Times-Roman To2byte \n" +"/Times-Bold2B /Times-BoldExt /Times-Bold To2byte \n" +"/Times-Italic2B /Times-ItalicExt /Times-Italic To2byte \n" +"/Times-BoldItalic2B /Times-BoldItalicExt /Times-BoldItalic To2byte \n" ; -static const char * prolog_2_pixmap = // prolog relevant only if lang_level == 2 for pixmaps -"/pixmap_size { /pixmap_sy exch def /pixmap_sx exch def } bind def\n" - +static const char * prolog_2_pixmap = // prolog relevant only if lang_level == 2 for pixmaps/masked color images "/pixmap_mat {[ pixmap_sx 0 0 pixmap_sy neg 0 pixmap_sy ]} bind def\n" "/pixmap_dict {" @@ -384,10 +418,10 @@ static const char * prolog_2_pixmap = // prolog relevant only if lang_level == "/YStep pixmap_sy\n" "/PaintProc " "{ begin " -"pixmap_sx pixmap_sy scale " +"pixmap_w pixmap_h scale " "pixmap_sx pixmap_sy 8 " "pixmap_mat " -"pixmap_data " +"currentfile /ASCIIHexDecode filter " "false 3 " "colorimage " "end " @@ -397,28 +431,20 @@ static const char * prolog_2_pixmap = // prolog relevant only if lang_level == "/pixmap_plot {" "GS " -"/pixmap_y exch def /pixmap_x exch def\n" -"pixmap_x pixmap_y translate\n" +"/pixmap_sy exch def /pixmap_sx exch def\n" +"/pixmap_h exch def /pixmap_w exch def\n" +"translate\n" "pixmap_dict matrix makepattern setpattern\n" -"pixmap_sx pixmap_sy scale\n" +"pixmap_w pixmap_h scale\n" "pixmap_sx pixmap_sy\n" "true\n" "pixmap_mat\n" -"pixmap_mask\n" +"currentfile /ASCIIHexDecode filter\n" "imagemask\n" "GR\n" "} bind def\n" - -"/pixmap_loaddata { /pixmap_data currentfile pixmap_sx pixmap_sy 3 mul mul string readhexstring " -"} bind def\n" - -"/pixmap_loadmask { " -"/pixmap_mask currentfile pixmap_sx 8 div ceiling cvi pixmap_sy mul string readhexstring " -"} bind def\n" ; - - static const char * prolog_3 = // prolog relevant only if lang_level >2 // masked color images @@ -508,11 +534,12 @@ static const char * prolog_3 = // prolog relevant only if lang_level >2 // end prolog -int Fl_PostScript_Graphics_Driver::start_postscript (int pagecount, enum Fl_PostScript_Graphics_Driver::Page_Format format, enum Fl_PostScript_Graphics_Driver::Page_Layout layout) +int Fl_PostScript_Graphics_Driver::start_postscript (int pagecount, + enum Fl_Paged_Device::Page_Format format, enum Fl_Paged_Device::Page_Layout layout) //returns 0 iff OK { int w, h, x; - if (format == A4) { + if (format == Fl_Paged_Device::A4) { left_margin = 18; top_margin = 18; } @@ -520,7 +547,7 @@ int Fl_PostScript_Graphics_Driver::start_postscript (int pagecount, enum Fl_Post left_margin = 12; top_margin = 12; } - page_format_ = (enum Page_Format)(format | layout); + page_format_ = (enum Fl_Paged_Device::Page_Format)(format | layout); fputs("%!PS-Adobe-3.0\n", output); fputs("%%Creator: FLTK\n", output); @@ -530,10 +557,10 @@ int Fl_PostScript_Graphics_Driver::start_postscript (int pagecount, enum Fl_Post fprintf(output, "%%%%Pages: %i\n", pagecount); else fputs("%%Pages: (atend)\n", output); - fprintf(output, "%%%%BeginFeature: *PageSize %s\n", page_formats[format].name ); - w = page_formats[format].width; - h = page_formats[format].height; - if (lang_level_ == 3 && (layout & LANDSCAPE) ) { x = w; w = h; h = x; } + fprintf(output, "%%%%BeginFeature: *PageSize %s\n", Fl_Paged_Device::page_formats[format].name ); + w = Fl_Paged_Device::page_formats[format].width; + h = Fl_Paged_Device::page_formats[format].height; + if (lang_level_ == 3 && (layout & Fl_Paged_Device::LANDSCAPE) ) { x = w; w = h; h = x; } fprintf(output, "<>setpagedevice\n", w, h ); fputs("%%EndFeature\n", output); fputs("%%EndComments\n", output); @@ -568,15 +595,14 @@ int Fl_PostScript_Graphics_Driver::start_postscript (int pagecount, enum Fl_Post void Fl_PostScript_Graphics_Driver::recover(){ color(cr_,cg_,cb_); line_style(linestyle_,linewidth_,linedash_); - font(font_,size_); + font(Fl_Graphics_Driver::font(), Fl_Graphics_Driver::size()); } void Fl_PostScript_Graphics_Driver::reset(){ gap_=1; clip_=0; cr_=cg_=cb_=0; - font_=FL_HELVETICA; - size_=12; + Fl_Graphics_Driver::font(FL_HELVETICA, 12); linewidth_=0; linestyle_=FL_SOLID; strcpy(linedash_,""); @@ -614,8 +640,8 @@ void Fl_PostScript_Graphics_Driver::page(double pw, double ph, int media) { } fprintf(output, "%%%%BeginPageSetup\n"); - if((media & MEDIA) &&(lang_level_>1)){ - int r = media & REVERSED; + if((media & Fl_Paged_Device::MEDIA) &&(lang_level_>1)){ + int r = media & Fl_Paged_Device::REVERSED; if(r) r = 2; fprintf(output, "<< /PageSize [%i %i] /Orientation %i>> setpagedevice\n", (int)(pw+.5), (int)(ph+.5), r); } @@ -632,9 +658,9 @@ void Fl_PostScript_Graphics_Driver::page(double pw, double ph, int media) { line_style(0); fprintf(output, "GS\n"); - if (!((media & MEDIA) &&(lang_level_>1))){ + if (!((media & Fl_Paged_Device::MEDIA) &&(lang_level_>1))){ if (pw > ph) { - if(media & REVERSED) { + if(media & Fl_Paged_Device::REVERSED) { fprintf(output, "-90 rotate %i 0 translate\n", int(-pw)); } else { @@ -642,25 +668,25 @@ void Fl_PostScript_Graphics_Driver::page(double pw, double ph, int media) { } } else { - if(media & REVERSED) + if(media & Fl_Paged_Device::REVERSED) fprintf(output, "180 rotate %i %i translate\n", int(-pw), int(-ph)); } } fprintf(output, "GS\nCS\n"); -}; +} void Fl_PostScript_Graphics_Driver::page(int format){ - if(format & LANDSCAPE){ - ph_=Fl_PostScript_Graphics_Driver::page_formats[format & 0xFF].width; - pw_=Fl_PostScript_Graphics_Driver::page_formats[format & 0xFF].height; + if(format & Fl_Paged_Device::LANDSCAPE){ + ph_=Fl_Paged_Device::page_formats[format & 0xFF].width; + pw_=Fl_Paged_Device::page_formats[format & 0xFF].height; }else{ - pw_=Fl_PostScript_Graphics_Driver::page_formats[format & 0xFF].width; - ph_=Fl_PostScript_Graphics_Driver::page_formats[format & 0xFF].height; + pw_=Fl_Paged_Device::page_formats[format & 0xFF].width; + ph_=Fl_Paged_Device::page_formats[format & 0xFF].height; } page(pw_,ph_,format & 0xFF00);//,orientation only; -}; +} void Fl_PostScript_Graphics_Driver::rect(int x, int y, int w, int h) { // Commented code does not work, i can't find the bug ;-( @@ -706,7 +732,7 @@ void Fl_PostScript_Graphics_Driver::xyline(int x, int y, int x1, int y2, int x3) fprintf(output,"%i %i LT\n", x3 , y2); fprintf(output, "ELP\n"); fprintf(output, "GR\n"); -}; +} void Fl_PostScript_Graphics_Driver::xyline(int x, int y, int x1, int y2){ @@ -718,7 +744,7 @@ void Fl_PostScript_Graphics_Driver::xyline(int x, int y, int x1, int y2){ fprintf(output, "%i %i LT\n", x1 , y2 ); fprintf(output, "ELP\n"); fprintf(output, "GR\n"); -}; +} void Fl_PostScript_Graphics_Driver::xyline(int x, int y, int x1){ fprintf(output, "GS\n"); @@ -728,7 +754,7 @@ void Fl_PostScript_Graphics_Driver::xyline(int x, int y, int x1){ fprintf(output, "ELP\n"); fprintf(output, "GR\n"); -}; +} void Fl_PostScript_Graphics_Driver::yxline(int x, int y, int y1, int x2, int y3){ fprintf(output, "GS\n"); @@ -740,7 +766,7 @@ void Fl_PostScript_Graphics_Driver::yxline(int x, int y, int y1, int x2, int y3) fprintf(output , "%i %i LT\n", x2 , y3); fprintf(output, "ELP\n"); fprintf(output, "GR\n"); -}; +} void Fl_PostScript_Graphics_Driver::yxline(int x, int y, int y1, int x2){ fprintf(output, "GS\n"); @@ -750,7 +776,7 @@ void Fl_PostScript_Graphics_Driver::yxline(int x, int y, int y1, int x2){ fprintf(output, "%i %i LT\n", x2 , y1); fprintf(output, "ELP\n"); fprintf(output, "GR\n"); -}; +} void Fl_PostScript_Graphics_Driver::yxline(int x, int y, int y1){ fprintf(output, "GS\n"); @@ -759,7 +785,7 @@ void Fl_PostScript_Graphics_Driver::yxline(int x, int y, int y1){ fprintf(output, "%i %i LT\n", x , y1); fprintf(output, "ELP\n"); fprintf(output, "GR\n"); -}; +} void Fl_PostScript_Graphics_Driver::loop(int x0, int y0, int x1, int y1, int x2, int y2) { fprintf(output, "GS\n"); @@ -841,7 +867,7 @@ void Fl_PostScript_Graphics_Driver::line_style(int style, int width, char* dashe linedash_[0]=0; char width0 = 0; if(!width){ - width=1; //for screen drawing compatability + width=1; //for screen drawing compatibility width0=1; } @@ -884,57 +910,83 @@ void Fl_PostScript_Graphics_Driver::line_style(int style, int width, char* dashe } } fprintf(output, "] 0 setdash\n"); -}; +} static const char *_fontNames[] = { -"Helvetica", -"Helvetica-Bold", -"Helvetica-Oblique", -"Helvetica-BoldOblique", -"Courier", -"Courier-Bold", -"Courier-Oblique", -"Courier-BoldOblique", -"Times", -"Times-Bold", -"Times-Italic", -"Times-BoldItalic", +"Helvetica2B", +"Helvetica-Bold2B", +"Helvetica-Oblique2B", +"Helvetica-BoldOblique2B", +"Courier2B", +"Courier-Bold2B", +"Courier-Oblique2B", +"Courier-BoldOblique2B", +"Times-Roman2B", +"Times-Bold2B", +"Times-Italic2B", +"Times-BoldItalic2B", "Symbol", -"Courier", -"Courier-Bold", +"Courier2B", +"Courier-Bold2B", "ZapfDingbats" }; void Fl_PostScript_Graphics_Driver::font(int f, int s) { - if (f >= FL_FREE_FONT) - f = FL_COURIER; - fprintf(output, "/%s SF\n" , _fontNames[f]); - fprintf(output,"%i FS\n", s); - Fl_Display_Device::display_device()->driver()->font(f,s); // Use display fonts for font measurement - font_ = f; size_ = s; -}; - -void Fl_PostScript_Graphics_Driver::color(Fl_Color c) { - //colored_=1; - color_=c; - Fl::get_color(c, cr_, cg_, cb_); - if (cr_==cg_ && cg_==cb_) { - double gray = cr_/255.0; - fprintf(output, "%g GL\n", gray); - - } else { - double fr, fg, fb; - fr = cr_/255.0; - fg = cg_/255.0; - fb = cb_/255.0; - fprintf(output,"%g %g %g SRGB\n", fr , fg , fb); + Fl_Graphics_Driver *driver = Fl_Display_Device::display_device()->driver(); + driver->font(f,s); // Use display fonts for font measurement + Fl_Graphics_Driver::font(f, s); + Fl_Font_Descriptor *desc = driver->font_descriptor(); + this->font_descriptor(desc); + if (f < FL_FREE_FONT) { + float ps_size = s; + fprintf(output, "/%s SF\n" , _fontNames[f]); +#if defined(USE_X11) +#if USE_XFT + // Xft font height is sometimes larger than the required size (see STR 2566). + // Increase the PostScript font size by 15% without exceeding the display font height + int max = desc->font->height; + ps_size = s * 1.15; + if (ps_size > max) ps_size = max; +#else + // Non-Xft fonts can be smaller than required. + // Set the PostScript font size to the display font height + char *name = desc->font->font_name_list[0]; + char *p = strstr(name, "--"); + if (p) { + sscanf(p + 2, "%f", &ps_size); + } +#endif // USE_XFT +#endif // USE_X11 + fprintf(output,"%.1f FS\n", ps_size); } } +double Fl_PostScript_Graphics_Driver::width(const char *s, int n) { + return Fl_Display_Device::display_device()->driver()->width(s, n); +} + +int Fl_PostScript_Graphics_Driver::height() { + return Fl_Display_Device::display_device()->driver()->height(); +} + +int Fl_PostScript_Graphics_Driver::descent() { + return Fl_Display_Device::display_device()->driver()->descent(); +} + +void Fl_PostScript_Graphics_Driver::text_extents(const char *c, int n, int &dx, int &dy, int &w, int &h) { + Fl_Display_Device::display_device()->driver()->text_extents(c, n, dx, dy, w, h); +} + + +void Fl_PostScript_Graphics_Driver::color(Fl_Color c) { + Fl::get_color(c, cr_, cg_, cb_); + color(cr_, cg_, cb_); +} + void Fl_PostScript_Graphics_Driver::color(unsigned char r, unsigned char g, unsigned char b) { - //colored_=1; - cr_=r;cg_=g;cb_=b; - if (r==g && g==b) { + Fl_Graphics_Driver::color( fl_rgb_color(r, g, b) ); + cr_ = r; cg_ = g; cb_ = b; + if (r == g && g == b) { double gray = r/255.0; fprintf(output, "%g GL\n", gray); } else { @@ -953,32 +1005,162 @@ void Fl_PostScript_Graphics_Driver::draw(int angle, const char *str, int n, int fprintf(output, "GR\n"); } -// outputs in PostScript a UTF8 string replacing non-Latin1 characters by ? -// and using the same width in points as on display -void Fl_PostScript_Graphics_Driver::transformed_draw(const char* str, int n, double x, double y) { - int len; - if (!n || !str || !*str) return; - const char *last = str + n; - // compute display width of string - fprintf(output,"%g (", fl_width(str, n)); - while (str < last) { - // Extract each unicode character of string. - // Until 0xFF, UTF codes coincide with iso-Latin1 (iso-8859-1) - unsigned utf = fl_utf8decode(str, last, &len); - str += len; - if (utf > 0xFF) { - utf = '?'; // replace non Latin-1 unicodes by ? + +// computes the mask for the RGB image img of all pixels with color != bg +static uchar *calc_mask(uchar *img, int w, int h, Fl_Color bg) +{ + uchar red, green, blue, r, g, b; + uchar bit, byte, *q; + Fl::get_color(bg, red, green, blue); + int W = (w+7)/8; // width of mask + uchar* mask = new uchar[W * h]; + q = mask; + while (h-- > 0) { // for each row + bit = 0x80; // byte with last bit set + byte = 0; // next mask byte to compute + for (int j = 0; j < w; j++) { // for each column + r = *img++; // the pixel color components + g = *img++; + b = *img++; + // if pixel doesn't have bg color, put it in mask + if (r != red || g != green || b != blue) byte |= bit; + bit = bit>>1; // shift bit one step to the right + if (bit == 0) { // single set bit has fallen out + *q++ = byte; // enter byte in mask + byte = 0; // reset next mask byte to zero + bit = 0x80; // and this byte + } } - else if (utf == '(' || utf == ')' || utf == '\\') { - putc('\\' , output); // these chars need be escaped - } - putc(utf, output); // output the latin character - } - fprintf(output, ") %g %g show_pos_width\n", x, y); + if (bit != 0x80) *q++ = byte; // enter last columns' byte in mask + } + return mask; } -struct matrix {double a, b, c, d, x, y;}; -extern matrix * fl_matrix; +// write to PostScript a bitmap image of a UTF8 string +static void transformed_draw_extra(const char* str, int n, double x, double y, int w, + FILE *output, Fl_Graphics_Driver *driver, bool rtl) { + // scale for bitmask computation +#if defined(USE_X11) && !USE_XFT + float scale = 1; // don't scale because we can't expect to have scalable fonts +#else + float scale = 2; +#endif + Fl_Fontsize old_size = driver->size(); + Fl_Font fontnum = driver->font(); + int w_scaled = (int)(w * (scale + 0.5)); + int h = (int)(driver->height() * scale); + // create an offscreen image of the string + Fl_Color text_color = driver->color(); + Fl_Color bg_color = fl_contrast(FL_WHITE, text_color); + Fl_Offscreen off = fl_create_offscreen(w_scaled, (int)(h+3*scale) ); + fl_begin_offscreen(off); + fl_color(bg_color); + // color offscreen background with a shade contrasting with the text color + fl_rectf(0, 0, w_scaled, (int)(h+3*scale) ); + fl_color(text_color); +#if defined(USE_X11) && !USE_XFT + // force seeing this font as new so it's applied to the offscreen graphics context + fl_graphics_driver->font_descriptor(NULL); + fl_font(fontnum, 0); +#endif + fl_font(fontnum, (Fl_Fontsize)(scale * old_size) ); + int w2 = (int)fl_width(str, n); + // draw string in offscreen + if (rtl) fl_rtl_draw(str, n, w2, (int)(h * 0.8) ); + else fl_draw(str, n, 1, (int)(h * 0.8) ); + // read (most of) the offscreen image + uchar *img = fl_read_image(NULL, 1, 1, w2, h, 0); + fl_end_offscreen(); + driver->font(fontnum, old_size); + fl_delete_offscreen(off); + // compute the mask of what is not the background + uchar *mask = calc_mask(img, w2, h, bg_color); + delete[] img; + // write the string image to PostScript as a scaled bitmask + scale = w2 / float(w); + fprintf(output, "%g %g %g %g %d %d MI\n", x, y - h*0.77/scale, w2/scale, h/scale, w2, h); + uchar *di; + int wmask = (w2+7)/8; + for (int j = h - 1; j >= 0; j--){ + di = mask + j * wmask; + for (int i = 0; i < wmask; i++){ + //if (!(i%80)) fprintf(output, "\n"); // don't have lines longer than 255 chars + fprintf(output, "%2.2x", *di ); + di++; + } + fprintf(output,"\n"); + } + fprintf(output,">\n"); + delete[] mask; +} + +static int is_in_table(unsigned utf) { + unsigned i; + static unsigned extra_table_roman[] = { // unicodes/*names*/ of other characters from PostScript standard fonts + 0x192/*florin*/, 0x2C6/*circumflex*/, 0x2C7/*caron*/, + 0x2D8/*breve*/, 0x2D9/*dotaccent*/, 0x2DA/*ring*/, 0x2DB/*ogonek*/, 0x2DC/*tilde*/, 0x2DD/*hungarumlaut*/, + 0x2013/*endash*/, 0x2014/*emdash*/, 0x2018/*quoteleft*/, 0x2019/*quoteright*/, + 0x201A/*quotesinglbase*/, 0x201C/*quotedblleft*/, 0x201D/*quotedblright*/, 0x201E/*quotedblbase*/, + 0x2020/*dagger*/, 0x2021/*daggerdbl*/, 0x2022/*bullet*/, + 0x2026/*ellipsis*/, 0x2030/*perthousand*/, 0x2039/*guilsinglleft*/, 0x203A/*guilsinglright*/, + 0x2044/*fraction*/, 0x20AC/*Euro*/, 0x2122/*trademark*/, + 0x2202/*partialdiff*/, 0x2206/*Delta*/, 0x2211/*summation*/, 0x221A/*radical*/, + 0x221E/*infinity*/, 0x2260/*notequal*/, 0x2264/*lessequal*/, + 0x2265/*greaterequal*/, + 0x25CA/*lozenge*/, 0xFB01/*fi*/, 0xFB02/*fl*/, + 0xF8FF/*apple*/ + }; + for ( i = 0; i < sizeof(extra_table_roman)/sizeof(int); i++) { + if (extra_table_roman[i] == utf) return i + 0x180; + } + return 0; +} + +// outputs in PostScript a UTF8 string using the same width in points as on display +void Fl_PostScript_Graphics_Driver::transformed_draw(const char* str, int n, double x, double y) { + int len, code; + if (!n || !str || !*str) return; + // compute display width of string + int w = (int)width(str, n); + if (w == 0) return; + if (Fl_Graphics_Driver::font() >= FL_FREE_FONT) { + transformed_draw_extra(str, n, x, y, w, output, this, false); + return; + } + fprintf(output, "%d <", w); + // transforms UTF8 encoding to our custom PostScript encoding as follows: + // extract each unicode character + // if unicode <= 0x17F, unicode and PostScript codes are identical + // if unicode is one of the values listed in extra_table_roman above + // its PostScript code is 0x180 + the character's rank in extra_table_roman + // if unicode is something else, draw all string as bitmap image + + const char *last = str + n; + const char *str2 = str; + while (str2 < last) { + // Extract each unicode character of string. + unsigned utf = fl_utf8decode(str2, last, &len); + str2 += len; + if (utf <= 0x17F) { // until Latin Extended-A + ; + } + else if ( (code = is_in_table(utf)) != 0) { // other handled characters + utf = code; + } + else { // unhandled character: draw all string as bitmap image + fprintf(output, "> pop pop\n"); // close and ignore the opened hex string + transformed_draw_extra(str, n, x, y, w, output, this, false); + return; + } + fprintf(output, "%4.4X", utf); + } + fprintf(output, "> %g %g show_pos_width\n", x, y); +} + +void Fl_PostScript_Graphics_Driver::rtl_draw(const char* str, int n, int x, int y) { + int w = (int)width(str, n); + transformed_draw_extra(str, n, x - w, y, w, output, this, true); +} void Fl_PostScript_Graphics_Driver::concat(){ fprintf(output,"[%g %g %g %g %g %g] CT\n", fl_matrix->a , fl_matrix->b , fl_matrix->c , fl_matrix->d , fl_matrix->x , fl_matrix->y); @@ -998,7 +1180,7 @@ void Fl_PostScript_Graphics_Driver::begin_points(){ fprintf(output, "BP\n"); gap_=1; shape_=POINTS; -}; +} void Fl_PostScript_Graphics_Driver::begin_line(){ fprintf(output, "GS\n"); @@ -1006,7 +1188,7 @@ void Fl_PostScript_Graphics_Driver::begin_line(){ fprintf(output, "BP\n"); gap_=1; shape_=LINE; -}; +} void Fl_PostScript_Graphics_Driver::begin_loop(){ fprintf(output, "GS\n"); @@ -1014,7 +1196,7 @@ void Fl_PostScript_Graphics_Driver::begin_loop(){ fprintf(output, "BP\n"); gap_=1; shape_=LOOP; -}; +} void Fl_PostScript_Graphics_Driver::begin_polygon(){ fprintf(output, "GS\n"); @@ -1022,7 +1204,7 @@ void Fl_PostScript_Graphics_Driver::begin_polygon(){ fprintf(output, "BP\n"); gap_=1; shape_=POLYGON; -}; +} void Fl_PostScript_Graphics_Driver::vertex(double x, double y){ if(shape_==POINTS){ @@ -1035,7 +1217,7 @@ void Fl_PostScript_Graphics_Driver::vertex(double x, double y){ gap_=0; }else fprintf(output, "%g %g LT\n", x , y); -}; +} void Fl_PostScript_Graphics_Driver::curve(double x, double y, double x1, double y1, double x2, double y2, double x3, double y3){ if(shape_==NONE) return; @@ -1046,7 +1228,7 @@ void Fl_PostScript_Graphics_Driver::curve(double x, double y, double x1, double gap_=0; fprintf(output, "%g %g %g %g %g %g curveto \n", x1 , y1 , x2 , y2 , x3 , y3); -}; +} void Fl_PostScript_Graphics_Driver::circle(double x, double y, double r){ @@ -1062,7 +1244,7 @@ void Fl_PostScript_Graphics_Driver::circle(double x, double y, double r){ fprintf(output, "%g %g %g 0 360 arc\n", x , y , r); -}; +} void Fl_PostScript_Graphics_Driver::arc(double x, double y, double r, double start, double a){ if(shape_==NONE) return; @@ -1072,7 +1254,7 @@ void Fl_PostScript_Graphics_Driver::arc(double x, double y, double r, double sta else fprintf(output, "%g %g %g %g %g arcn\n", x , y , r , -start, -a); -}; +} void Fl_PostScript_Graphics_Driver::arc(int x, int y, int w, int h, double a1, double a2) { fprintf(output, "GS\n"); @@ -1145,7 +1327,7 @@ void Fl_PostScript_Graphics_Driver::transformed_vertex(double x, double y){ }else fprintf(output, "%g %g LT\n", x , y); concat(); -}; +} ///////////////////////////// Clipping ///////////////////////////////////////////// @@ -1218,7 +1400,7 @@ int Fl_PostScript_Graphics_Driver::clip_box(int x, int y, int w, int h, int &X, return 1; } return ret; -}; +} int Fl_PostScript_Graphics_Driver::not_clipped(int x, int y, int w, int h){ if(!clip_) return 1; @@ -1227,7 +1409,7 @@ int Fl_PostScript_Graphics_Driver::not_clipped(int x, int y, int w, int h){ clip_box(x, y, w, h, X, Y, W, H); if(W) return 1; return 0; -}; +} void Fl_PostScript_File_Device::margins(int *left, int *top, int *right, int *bottom) // to implement @@ -1248,6 +1430,11 @@ int Fl_PostScript_File_Device::printable_rect(int *w, int *h) return 0; } +void Fl_PostScript_File_Device::origin(int *x, int *y) +{ + Fl_Paged_Device::origin(x, y); +} + void Fl_PostScript_File_Device::origin(int x, int y) { x_offset = x; @@ -1259,6 +1446,7 @@ void Fl_PostScript_File_Device::origin(int x, int y) void Fl_PostScript_File_Device::scale (float s_x, float s_y) { + if (s_y == 0.) s_y = s_x; Fl_PostScript_Graphics_Driver *ps = driver(); ps->scale_x = s_x; ps->scale_y = s_y; @@ -1319,27 +1507,23 @@ void Fl_PostScript_File_Device::end_job (void) if(ferror(ps->output)) { fl_alert ("Error during PostScript data output."); } -#if ! (defined(__APPLE__) || defined(WIN32) ) - if (print_pipe) - pclose(ps->output); - else + if (ps->close_cmd_) { + (*ps->close_cmd_)(ps->output); + } else { fclose(ps->output); -#else - fclose(ps->output); -#endif + } while (ps->clip_){ Fl_PostScript_Graphics_Driver::Clip * c= ps->clip_; ps->clip_= ps->clip_->prev; delete c; } - if (ps->close_cmd_) (*ps->close_cmd_)(ps->output); Fl_Display_Device::display_device()->set_current(); } #if ! (defined(__APPLE__) || defined(WIN32) ) -int Fl_Printer::start_job(int pages, int *firstpage, int *lastpage) { - enum Fl_PostScript_Graphics_Driver::Page_Format format; - enum Fl_PostScript_Graphics_Driver::Page_Layout layout; +int Fl_PostScript_Printer::start_job(int pages, int *firstpage, int *lastpage) { + enum Fl_Paged_Device::Page_Format format; + enum Fl_Paged_Device::Page_Layout layout; // first test version for print dialog if (!print_panel) make_print_panel(); @@ -1357,7 +1541,7 @@ int Fl_Printer::start_job(int pages, int *firstpage, int *lastpage) { // get options - format = print_page_size->value() ? Fl_PostScript_Graphics_Driver::A4 : Fl_PostScript_Graphics_Driver::LETTER; + format = print_page_size->value() ? Fl_Paged_Device::A4 : Fl_Paged_Device::LETTER; { // page range choice int from = 1, to = pages; if (print_pages->value()) { @@ -1372,12 +1556,12 @@ int Fl_Printer::start_job(int pages, int *firstpage, int *lastpage) { pages = to - from + 1; } - if (print_output_mode[0]->value()) layout = Fl_PostScript_Graphics_Driver::PORTRAIT; - else if (print_output_mode[1]->value()) layout = Fl_PostScript_Graphics_Driver::LANDSCAPE; - else if (print_output_mode[2]->value()) layout = Fl_PostScript_Graphics_Driver::PORTRAIT; - else layout = Fl_PostScript_Graphics_Driver::LANDSCAPE; + if (print_output_mode[0]->value()) layout = Fl_Paged_Device::PORTRAIT; + else if (print_output_mode[1]->value()) layout = Fl_Paged_Device::LANDSCAPE; + else if (print_output_mode[2]->value()) layout = Fl_Paged_Device::PORTRAIT; + else layout = Fl_Paged_Device::LANDSCAPE; - print_pipe = print_choice->value(); // 0 = print to file, >0 = printer (pipe) + int print_pipe = print_choice->value(); // 0 = print to file, >0 = printer (pipe) const char *media = print_page_size->text(print_page_size->value()); const char *printer = (const char *)print_choice->menu()[print_choice->value()].user_data(); @@ -1399,6 +1583,7 @@ int Fl_Printer::start_job(int pages, int *firstpage, int *lastpage) { fl_alert("could not run command: %s\n",command); return 1; } + ps->close_command(pclose); this->set_current(); return ps->start_postscript(pages, format, layout); // start printing } @@ -1408,5 +1593,5 @@ int Fl_Printer::start_job(int pages, int *firstpage, int *lastpage) { #endif // FL_DOXYGEN // -// End of "$Id: Fl_PostScript.cxx 7653 2010-06-24 08:55:04Z manolo $". +// End of "$Id: Fl_PostScript.cxx 8623 2011-04-24 17:09:41Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Preferences.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Preferences.cxx index ce5ab57fe..e343821ba 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Preferences.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Preferences.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Preferences.cxx 7672 2010-07-10 09:44:45Z matt $" +// "$Id: Fl_Preferences.cxx 8291 2011-01-19 06:33:48Z manolo $" // // Preferences methods for the Fast Light Tool Kit (FLTK). // -// Copyright 2002-2009 by Matthias Melcher. +// Copyright 2002-2010 by Matthias Melcher. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -28,7 +28,6 @@ #include #include #include -#include #include #include @@ -48,7 +47,7 @@ # define access _access # define mkdir _mkdir #elif defined (__APPLE__) -# include +# include # include # include #else @@ -85,8 +84,7 @@ Fl_Preferences *Fl_Preferences::runtimePrefs = 0; * \return a pointer to a static buffer containing the new UUID in ASCII format. * The buffer is overwritten during every call to this function! */ -const char *Fl_Preferences::newUUID() -{ +const char *Fl_Preferences::newUUID() { #ifdef __APPLE__ CFUUIDRef theUUID = CFUUIDCreate(NULL); CFUUIDBytes b = CFUUIDGetUUIDBytes(theUUID); @@ -104,18 +102,18 @@ const char *Fl_Preferences::newUUID() UUID *pu = &ud; int got_uuid = 0; - if(!hMod){ // first time in? + if (!hMod) { // first time in? hMod = LoadLibrary("Rpcrt4.dll"); } - if(hMod){ // do we have a usable handle to Rpcrt4.dll? + if (hMod) { // do we have a usable handle to Rpcrt4.dll? uuid_func uuid_crt = (uuid_func)GetProcAddress(hMod, "UuidCreate"); - if(uuid_crt != NULL) { + if (uuid_crt != NULL) { RPC_STATUS rpc_res = uuid_crt(pu); - if( // is the return status OK for our needs? - (rpc_res == RPC_S_OK) || // all is well + if ( // is the return status OK for our needs? + (rpc_res == RPC_S_OK) || // all is well (rpc_res == RPC_S_UUID_LOCAL_ONLY) || // only unique to this machine - (rpc_res == RPC_S_UUID_NO_ADDRESS) // probably only locally unique + (rpc_res == RPC_S_UUID_NO_ADDRESS) // probably only locally unique ) { got_uuid = -1; sprintf(uuidBuffer, "%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X", @@ -125,30 +123,36 @@ const char *Fl_Preferences::newUUID() } } } - if(got_uuid == 0) { // did not make a UUID - use fallback logic + if (got_uuid == 0) { // did not make a UUID - use fallback logic unsigned char b[16]; - time_t t = time(0); // first 4 byte + time_t t = time(0); // first 4 byte b[0] = (unsigned char)t; b[1] = (unsigned char)(t>>8); b[2] = (unsigned char)(t>>16); b[3] = (unsigned char)(t>>24); - int r = rand(); // four more bytes + int r = rand(); // four more bytes b[4] = (unsigned char)r; b[5] = (unsigned char)(r>>8); b[6] = (unsigned char)(r>>16); b[7] = (unsigned char)(r>>24); - unsigned int a = (unsigned int)(intptr_t)&t; // four more bytes - b[8] = (unsigned char)a; - b[9] = (unsigned char)(a>>8); - b[10] = (unsigned char)(a>>16); - b[11] = (unsigned char)(a>>24); + // Now we try to find 4 more "random" bytes. We extract the + // lower 4 bytes from the address of t - it is created on the + // stack so *might* be in a different place each time... + // This is now done via a union to make it compile OK on 64-bit systems. + union { void *pv; unsigned char a[sizeof(void*)]; } v; + v.pv = (void *)(&t); + // NOTE: This assume that all WinXX systems are little-endian + b[8] = v.a[0]; + b[9] = v.a[1]; + b[10] = v.a[2]; + b[11] = v.a[3]; TCHAR name[MAX_COMPUTERNAME_LENGTH + 1]; // only used to make last four bytes DWORD nSize = MAX_COMPUTERNAME_LENGTH + 1; // GetComputerName() does not depend on any extra libs, and returns something // analogous to gethostname() GetComputerName(name, &nSize); // use the first 4 TCHAR's of the name to create the last 4 bytes of our UUID - for(int ii = 0; ii < 4; ii++){ + for (int ii = 0; ii < 4; ii++) { b[12 + ii] = (unsigned char)name[ii]; } sprintf(uuidBuffer, "%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X", @@ -156,26 +160,44 @@ const char *Fl_Preferences::newUUID() b[8], b[9], b[10], b[11], b[12], b[13], b[14], b[15]); } #else -#warning Unix implementation incomplete! + // warning Unix implementation of Fl_Preferences::newUUID() incomplete! // #include // void uuid_generate(uuid_t out); unsigned char b[16]; - time_t t = time(0); // first 4 byte + time_t t = time(0); // first 4 byte b[0] = (unsigned char)t; b[1] = (unsigned char)(t>>8); b[2] = (unsigned char)(t>>16); b[3] = (unsigned char)(t>>24); - int r = rand(); // four more bytes + int r = rand(); // four more bytes b[4] = (unsigned char)r; b[5] = (unsigned char)(r>>8); b[6] = (unsigned char)(r>>16); b[7] = (unsigned char)(r>>24); - unsigned long a = (unsigned long)&t; // four more bytes + unsigned long a = (unsigned long)&t; // four more bytes b[8] = (unsigned char)a; b[9] = (unsigned char)(a>>8); b[10] = (unsigned char)(a>>16); b[11] = (unsigned char)(a>>24); - char name[80]; // last four bytes + // Now we try to find 4 more "random" bytes. We extract the + // lower 4 bytes from the address of t - it is created on the + // stack so *might* be in a different place each time... + // This is now done via a union to make it compile OK on 64-bit systems. + union { void *pv; unsigned char a[sizeof(void*)]; } v; + v.pv = (void *)(&t); + // NOTE: May need to handle big- or little-endian systems here +# if WORDS_BIGENDIAN + b[8] = v.a[sizeof(void*) - 1]; + b[9] = v.a[sizeof(void*) - 2]; + b[10] = v.a[sizeof(void*) - 3]; + b[11] = v.a[sizeof(void*) - 4]; +# else /* data ordered for a little-endian system */ + b[8] = v.a[0]; + b[9] = v.a[1]; + b[10] = v.a[2]; + b[11] = v.a[3]; +# endif + char name[80]; // last four bytes gethostname(name, 79); memcpy(b+12, name, 4); sprintf(uuidBuffer, "%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X", @@ -186,7 +208,6 @@ const char *Fl_Preferences::newUUID() return uuidBuffer; } - /** The constructor creates a group that manages name/value pairs and child groups. Groups are ready for reading and writing at any time. @@ -213,14 +234,12 @@ const char *Fl_Preferences::newUUID() \param[in] vendor unique text describing the company or author of this file \param[in] application unique text describing the application */ -Fl_Preferences::Fl_Preferences( Root root, const char *vendor, const char *application ) -{ +Fl_Preferences::Fl_Preferences( Root root, const char *vendor, const char *application ) { node = new Node( "." ); rootNode = new RootNode( this, root, vendor, application ); node->setRoot(rootNode); } - /** \brief Use this constructor to create or read a preferences file at an arbitrary position in the file system. @@ -233,14 +252,12 @@ Fl_Preferences::Fl_Preferences( Root root, const char *vendor, const char *appli \param[in] vendor unique text describing the company or author of this file \param[in] application unique text describing the application */ -Fl_Preferences::Fl_Preferences( const char *path, const char *vendor, const char *application ) -{ +Fl_Preferences::Fl_Preferences( const char *path, const char *vendor, const char *application ) { node = new Node( "." ); rootNode = new RootNode( this, path, vendor, application ); node->setRoot(rootNode); } - /** \brief Generate or read a new group of entries within another group. @@ -251,13 +268,11 @@ Fl_Preferences::Fl_Preferences( const char *path, const char *vendor, const char \param[in] parent reference object for the new group \param[in] group name of the group to access (may contain '/'s) */ -Fl_Preferences::Fl_Preferences( Fl_Preferences &parent, const char *group ) -{ +Fl_Preferences::Fl_Preferences( Fl_Preferences &parent, const char *group ) { rootNode = parent.rootNode; node = parent.node->addChild( group ); } - /** \brief Create or access a group of preferences using a name. \param[in] parent the parameter parent is a pointer to the parent group. @@ -268,8 +283,7 @@ Fl_Preferences::Fl_Preferences( Fl_Preferences &parent, const char *group ) \param[in] group a group name that is used as a key into the database \see Fl_Preferences( Fl_Preferences&, const char *group ) */ -Fl_Preferences::Fl_Preferences( Fl_Preferences *parent, const char *group ) -{ +Fl_Preferences::Fl_Preferences( Fl_Preferences *parent, const char *group ) { if (parent==0) { if (!runtimePrefs) { runtimePrefs = new Fl_Preferences(); @@ -283,7 +297,6 @@ Fl_Preferences::Fl_Preferences( Fl_Preferences *parent, const char *group ) node = parent->node->addChild( group ); } - /** \brief Open a child group using a given index. @@ -297,8 +310,7 @@ Fl_Preferences::Fl_Preferences( Fl_Preferences *parent, const char *group ) \param[in] parent reference object for the new group \param[in] groupIndex zero based index into child groups */ -Fl_Preferences::Fl_Preferences( Fl_Preferences &parent, int groupIndex ) -{ +Fl_Preferences::Fl_Preferences( Fl_Preferences &parent, int groupIndex ) { rootNode = parent.rootNode; if (groupIndex<0 || groupIndex>=parent.groups()) { node = parent.node->addChild( newUUID() ); @@ -307,12 +319,10 @@ Fl_Preferences::Fl_Preferences( Fl_Preferences &parent, int groupIndex ) } } - /** \see Fl_Preferences( Fl_Preferences&, int groupIndex ) */ -Fl_Preferences::Fl_Preferences( Fl_Preferences *parent, int groupIndex ) -{ +Fl_Preferences::Fl_Preferences( Fl_Preferences *parent, int groupIndex ) { rootNode = parent->rootNode; if (groupIndex<0 || groupIndex>=parent->groups()) { node = parent->node->addChild( newUUID() ); @@ -321,7 +331,6 @@ Fl_Preferences::Fl_Preferences( Fl_Preferences *parent, int groupIndex ) } } - /** Create a new dataset access point using a dataset ID. @@ -333,8 +342,7 @@ Fl_Preferences::Fl_Preferences( Fl_Preferences *parent, int groupIndex ) ID's can be put very helpful when put into the user_data() field of widget callbacks. */ -Fl_Preferences::Fl_Preferences( Fl_Preferences::ID id ) -{ +Fl_Preferences::Fl_Preferences( Fl_Preferences::ID id ) { node = (Node*)id; rootNode = node->findRoot(); } @@ -358,7 +366,6 @@ Fl_Preferences &Fl_Preferences::operator=(const Fl_Preferences &rhs) { return *this; } - /** The destructor removes allocated resources. When used on the \em base preferences group, the destructor flushes all @@ -368,8 +375,7 @@ Fl_Preferences &Fl_Preferences::operator=(const Fl_Preferences &rhs) { The destructor does not remove any data from the database. It merely deletes your reference to the database. */ -Fl_Preferences::~Fl_Preferences() -{ +Fl_Preferences::~Fl_Preferences() { if (node && !node->parent()) delete rootNode; // DO NOT delete nodes! The root node will do that after writing the preferences // zero all pointer to avoid memory errors, even though @@ -378,18 +384,15 @@ Fl_Preferences::~Fl_Preferences() rootNode = 0L; } - /** Returns the number of groups that are contained within a group. \return 0 for no groups at all */ -int Fl_Preferences::groups() -{ +int Fl_Preferences::groups() { return node->nChildren(); } - /** Returns the name of the Nth (\p num_group) group. There is no guaranteed order of group names. The index must @@ -398,12 +401,10 @@ int Fl_Preferences::groups() \param[in] num_group number indexing the requested group \return 'C' string pointer to the group name */ -const char *Fl_Preferences::group( int num_group ) -{ +const char *Fl_Preferences::group( int num_group ) { return node->child( num_group ); } - /** Returns non-zero if a group with this name exists. Group names are relative to the Preferences node and can contain a path. @@ -413,12 +414,10 @@ const char *Fl_Preferences::group( int num_group ) \param[in] key name of group that is searched for \return 0 if no group by that name was found */ -char Fl_Preferences::groupExists( const char *key ) -{ +char Fl_Preferences::groupExists( const char *key ) { return node->search( key ) ? 1 : 0 ; } - /** Deletes a group. @@ -428,8 +427,7 @@ char Fl_Preferences::groupExists( const char *key ) \param[in] group name of the group to delete \return 0 if call failed */ -char Fl_Preferences::deleteGroup( const char *group ) -{ +char Fl_Preferences::deleteGroup( const char *group ) { Node *nd = node->search( group ); if ( nd ) return nd->remove(); return 0; @@ -438,8 +436,7 @@ char Fl_Preferences::deleteGroup( const char *group ) /** Delete all groups. */ -char Fl_Preferences::deleteAllGroups() -{ +char Fl_Preferences::deleteAllGroups() { node->deleteAllChildren(); return 1; } @@ -449,12 +446,10 @@ char Fl_Preferences::deleteAllGroups() \return number of entries */ -int Fl_Preferences::entries() -{ +int Fl_Preferences::entries() { return node->nEntry(); } - /** Returns the name of an entry. There is no guaranteed order of entry names. The index must be within the range given by @@ -463,24 +458,20 @@ int Fl_Preferences::entries() \param[in] index number indexing the requested entry \return pointer to value cstring */ -const char *Fl_Preferences::entry( int index ) -{ +const char *Fl_Preferences::entry( int index ) { return node->entry(index).name; } - /** Returns non-zero if an entry with this name exists. \param[in] key name of entry that is searched for \return 0 if entry was not found */ -char Fl_Preferences::entryExists( const char *key ) -{ +char Fl_Preferences::entryExists( const char *key ) { return node->getEntry( key )>=0 ? 1 : 0 ; } - /** Deletes a single name/value pair. @@ -489,16 +480,14 @@ char Fl_Preferences::entryExists( const char *key ) \param[in] key name of entry to delete \return 0 if deleting the entry failed */ -char Fl_Preferences::deleteEntry( const char *key ) -{ +char Fl_Preferences::deleteEntry( const char *key ) { return node->deleteEntry( key ); } /** Delete all entries. */ -char Fl_Preferences::deleteAllEntries() -{ +char Fl_Preferences::deleteAllEntries() { node->deleteAllEntries(); return 1; } @@ -506,8 +495,7 @@ char Fl_Preferences::deleteAllEntries() /** Delete all groups and all entries. */ -char Fl_Preferences::clear() -{ +char Fl_Preferences::clear() { char ret1 = deleteAllGroups(); char ret2 = deleteAllEntries(); return ret1 & ret2; @@ -523,14 +511,12 @@ char Fl_Preferences::clear() \param[in] defaultValue default value to be used if no preference was set \return 0 if the default value was used */ -char Fl_Preferences::get( const char *key, int &value, int defaultValue ) -{ +char Fl_Preferences::get( const char *key, int &value, int defaultValue ) { const char *v = node->get( key ); value = v ? atoi( v ) : defaultValue; return ( v != 0 ); } - /** Sets an entry (name/value pair). The return value indicates if there was a problem storing the data in memory. However it does not @@ -541,14 +527,12 @@ char Fl_Preferences::get( const char *key, int &value, int defaultValue ) \param[in] value set this entry to \p value \return 0 if setting the value failed */ -char Fl_Preferences::set( const char *key, int value ) -{ +char Fl_Preferences::set( const char *key, int value ) { sprintf( nameBuffer, "%d", value ); node->set( key, nameBuffer ); return 1; } - /** Reads an entry from the group. A default value must be supplied. The return value indicates if the value was available @@ -559,14 +543,12 @@ char Fl_Preferences::set( const char *key, int value ) \param[in] defaultValue default value to be used if no preference was set \return 0 if the default value was used */ -char Fl_Preferences::get( const char *key, float &value, float defaultValue ) -{ +char Fl_Preferences::get( const char *key, float &value, float defaultValue ) { const char *v = node->get( key ); value = v ? (float)atof( v ) : defaultValue; return ( v != 0 ); } - /** Sets an entry (name/value pair). The return value indicates if there was a problem storing the data in memory. However it does not @@ -577,14 +559,12 @@ char Fl_Preferences::get( const char *key, float &value, float defaultValue ) \param[in] value set this entry to \p value \return 0 if setting the value failed */ -char Fl_Preferences::set( const char *key, float value ) -{ +char Fl_Preferences::set( const char *key, float value ) { sprintf( nameBuffer, "%g", value ); node->set( key, nameBuffer ); return 1; } - /** Sets an entry (name/value pair). The return value indicates if there was a problem storing the data in memory. However it does not @@ -596,14 +576,12 @@ char Fl_Preferences::set( const char *key, float value ) \param[in] precision number of decimal digits to represent value \return 0 if setting the value failed */ -char Fl_Preferences::set( const char *key, float value, int precision ) -{ +char Fl_Preferences::set( const char *key, float value, int precision ) { sprintf( nameBuffer, "%.*g", precision, value ); node->set( key, nameBuffer ); return 1; } - /** Reads an entry from the group. A default value must be supplied. The return value indicates if the value was available @@ -614,14 +592,12 @@ char Fl_Preferences::set( const char *key, float value, int precision ) \param[in] defaultValue default value to be used if no preference was set \return 0 if the default value was used */ -char Fl_Preferences::get( const char *key, double &value, double defaultValue ) -{ +char Fl_Preferences::get( const char *key, double &value, double defaultValue ) { const char *v = node->get( key ); value = v ? atof( v ) : defaultValue; return ( v != 0 ); } - /** Sets an entry (name/value pair). The return value indicates if there was a problem storing the data in memory. However it does not @@ -632,14 +608,12 @@ char Fl_Preferences::get( const char *key, double &value, double defaultValue ) \param[in] value set this entry to \p value \return 0 if setting the value failed */ -char Fl_Preferences::set( const char *key, double value ) -{ +char Fl_Preferences::set( const char *key, double value ) { sprintf( nameBuffer, "%g", value ); node->set( key, nameBuffer ); return 1; } - /** Sets an entry (name/value pair). The return value indicates if there was a problem storing the data in memory. However it does not @@ -651,30 +625,29 @@ char Fl_Preferences::set( const char *key, double value ) \param[in] precision number of decimal digits to represent value \return 0 if setting the value failed */ -char Fl_Preferences::set( const char *key, double value, int precision ) -{ +char Fl_Preferences::set( const char *key, double value, int precision ) { sprintf( nameBuffer, "%.*g", precision, value ); node->set( key, nameBuffer ); return 1; } - // remove control sequences from a string -static char *decodeText( const char *src ) -{ +static char *decodeText( const char *src ) { int len = 0; const char *s = src; - for ( ; *s; s++, len++ ) - { - if ( *s == '\\' ) - if ( isdigit( s[1] ) ) s+=3; else s+=1; + for ( ; *s; s++, len++ ) { + if ( *s == '\\' ) { + if ( isdigit( s[1] ) ) { + s+=3; + } else { + s+=1; + } + } } char *dst = (char*)malloc( len+1 ), *d = dst; - for ( s = src; *s; s++ ) - { + for ( s = src; *s; s++ ) { char c = *s; - if ( c == '\\' ) - { + if ( c == '\\' ) { if ( s[1] == '\\' ) { *d++ = c; s++; } else if ( s[1] == 'n' ) { *d++ = '\n'; s++; } else if ( s[1] == 'r' ) { *d++ = '\r'; s++; } @@ -688,7 +661,6 @@ static char *decodeText( const char *src ) return dst; } - /** Reads an entry from the group. A default value must be supplied. The return value indicates if the value was available @@ -702,8 +674,7 @@ static char *decodeText( const char *src ) \param[in] maxSize maximum length of value plus one byte for a trailing zero \return 0 if the default value was used */ -char Fl_Preferences::get( const char *key, char *text, const char *defaultValue, int maxSize ) -{ +char Fl_Preferences::get( const char *key, char *text, const char *defaultValue, int maxSize ) { const char *v = node->get( key ); if ( v && strchr( v, '\\' ) ) { char *w = decodeText( v ); @@ -717,7 +688,6 @@ char Fl_Preferences::get( const char *key, char *text, const char *defaultValue, return ( v != defaultValue ); } - /** Reads an entry from the group. A default value must be supplied. The return value indicates if the value was available @@ -730,11 +700,9 @@ char Fl_Preferences::get( const char *key, char *text, const char *defaultValue, \param[in] defaultValue default value to be used if no preference was set \return 0 if the default value was used */ -char Fl_Preferences::get( const char *key, char *&text, const char *defaultValue ) -{ +char Fl_Preferences::get( const char *key, char *&text, const char *defaultValue ) { const char *v = node->get( key ); - if ( v && strchr( v, '\\' ) ) - { + if ( v && strchr( v, '\\' ) ) { text = decodeText( v ); return 1; } @@ -746,8 +714,6 @@ char Fl_Preferences::get( const char *key, char *&text, const char *defaultValue return ( v != defaultValue ); } - - /** Sets an entry (name/value pair). The return value indicates if there was a problem storing the data in memory. However it does not @@ -758,16 +724,13 @@ char Fl_Preferences::get( const char *key, char *&text, const char *defaultValue \param[in] text set this entry to \p value \return 0 if setting the value failed */ -char Fl_Preferences::set( const char *key, const char *text ) -{ +char Fl_Preferences::set( const char *key, const char *text ) { const char *s = text ? text : ""; int n=0, ns=0; for ( ; *s; s++ ) { n++; if ( *s<32 || *s=='\\' || *s==0x7f ) ns+=4; } - if ( ns ) - { + if ( ns ) { char *buffer = (char*)malloc( n+ns+1 ), *d = buffer; - for ( s=text; *s; ) - { + for ( s=text; *s; ) { char c = *s; if ( c=='\\' ) { *d++ = '\\'; *d++ = '\\'; s++; } else if ( c=='\n' ) { *d++ = '\\'; *d++ = 'n'; s++; } @@ -785,17 +748,12 @@ char Fl_Preferences::set( const char *key, const char *text ) return 1; } - // convert a hex string to binary data -static void *decodeHex( const char *src, int &size ) -{ +static void *decodeHex( const char *src, int &size ) { size = strlen( src )/2; unsigned char *data = (unsigned char*)malloc( size ), *d = data; const char *s = src; - int i; - - for ( i=size; i>0; i-- ) - { + for ( int i=size; i>0; i-- ) { int v; char x = tolower(*s++); if ( x >= 'a' ) v = x-'a'+10; else v = x-'0'; @@ -804,11 +762,9 @@ static void *decodeHex( const char *src, int &size ) if ( x >= 'a' ) v += x-'a'+10; else v += x-'0'; *d++ = (uchar)v; } - return (void*)data; } - /** Reads an entry from the group. A default value must be supplied. The return value indicates if the value was available @@ -824,11 +780,9 @@ static void *decodeHex( const char *src, int &size ) \todo maxSize should receive the number of bytes that were read. */ -char Fl_Preferences::get( const char *key, void *data, const void *defaultValue, int defaultSize, int maxSize ) -{ +char Fl_Preferences::get( const char *key, void *data, const void *defaultValue, int defaultSize, int maxSize ) { const char *v = node->get( key ); - if ( v ) - { + if ( v ) { int dsize; void *w = decodeHex( v, dsize ); memmove( data, w, dsize>maxSize?maxSize:dsize ); @@ -840,7 +794,6 @@ char Fl_Preferences::get( const char *key, void *data, const void *defaultValue, return 0; } - /** Reads an entry from the group. A default value must be supplied. The return value indicates if the value was available @@ -854,17 +807,14 @@ char Fl_Preferences::get( const char *key, void *data, const void *defaultValue, \param[in] defaultSize size of default value array \return 0 if the default value was used */ -char Fl_Preferences::get( const char *key, void *&data, const void *defaultValue, int defaultSize ) -{ +char Fl_Preferences::get( const char *key, void *&data, const void *defaultValue, int defaultSize ) { const char *v = node->get( key ); - if ( v ) - { + if ( v ) { int dsize; data = decodeHex( v, dsize ); return 1; } - if ( defaultValue ) - { + if ( defaultValue ) { data = (void*)malloc( defaultSize ); memmove( data, defaultValue, defaultSize ); } @@ -873,7 +823,6 @@ char Fl_Preferences::get( const char *key, void *&data, const void *defaultValue return 0; } - /** Sets an entry (name/value pair). The return value indicates if there was a problem storing the data in memory. However it does not @@ -885,12 +834,10 @@ char Fl_Preferences::get( const char *key, void *&data, const void *defaultValue \param[in] dsize size of data array \return 0 if setting the value failed */ -char Fl_Preferences::set( const char *key, const void *data, int dsize ) -{ +char Fl_Preferences::set( const char *key, const void *data, int dsize ) { char *buffer = (char*)malloc( dsize*2+1 ), *d = buffer;; unsigned char *s = (unsigned char*)data; - for ( ; dsize>0; dsize-- ) - { + for ( ; dsize>0; dsize-- ) { static char lu[] = "0123456789abcdef"; unsigned char v = *s++; *d++ = lu[v>>4]; @@ -902,20 +849,17 @@ char Fl_Preferences::set( const char *key, const void *data, int dsize ) return 1; } - /** Returns the size of the value part of an entry. \param[in] key name of entry \return size of value */ -int Fl_Preferences::size( const char *key ) -{ +int Fl_Preferences::size( const char *key ) { const char *v = node->get( key ); return v ? strlen( v ) : 0 ; } - /** \brief Creates a path that is related to the preferences file and that is usable for additional application data. @@ -943,8 +887,7 @@ int Fl_Preferences::size( const char *key ) \param[in] pathlen size of path buffer (should be at least \c FL_PATH_MAX) \return 0 if path was not created or pathname can't fit into buffer */ -char Fl_Preferences::getUserdataPath( char *path, int pathlen ) -{ +char Fl_Preferences::getUserdataPath( char *path, int pathlen ) { if ( rootNode ) return rootNode->getPath( path, pathlen ); return 0; @@ -955,8 +898,7 @@ char Fl_Preferences::getUserdataPath( char *path, int pathlen ) the base preferences group. This function is rarely used as deleting the base preferences flushes automatically. */ -void Fl_Preferences::flush() -{ +void Fl_Preferences::flush() { if ( rootNode && node->dirty() ) rootNode->write(); } @@ -978,8 +920,7 @@ void Fl_Preferences::flush() prev.get( Fl_Preferences::Name(i), prevFile[i], "" ); \endcode */ -Fl_Preferences::Name::Name( unsigned int n ) -{ +Fl_Preferences::Name::Name( unsigned int n ) { data_ = (char*)malloc(20); sprintf(data_, "%u", n); } @@ -997,8 +938,7 @@ Fl_Preferences::Name::Name( unsigned int n ) prev.get( Fl_Preferences::Name( "File%d", i ), prevFile[i], "" ); \endcode */ -Fl_Preferences::Name::Name( const char *format, ... ) -{ +Fl_Preferences::Name::Name( const char *format, ... ) { data_ = (char*)malloc(1024); va_list args; va_start(args, format); @@ -1007,8 +947,7 @@ Fl_Preferences::Name::Name( const char *format, ... ) } // delete the name -Fl_Preferences::Name::~Name() -{ +Fl_Preferences::Name::~Name() { if (data_) { free(data_); data_ = 0L; @@ -1043,8 +982,7 @@ static char makePath( const char *path ) { #if 0 // strip the filename and create a path -static void makePathForFile( const char *path ) -{ +static void makePathForFile( const char *path ) { const char *s = strrchr( path, '/' ); if ( !s ) return; int len = s-path; @@ -1062,8 +1000,8 @@ Fl_Preferences::RootNode::RootNode( Fl_Preferences *prefs, Root root, const char : prefs_(prefs), filename_(0L), vendor_(0L), - application_(0L) -{ + application_(0L) { + char filename[ FL_PATH_MAX ]; filename[0] = 0; #ifdef WIN32 # define FLPREFS_RESOURCE "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders" @@ -1075,41 +1013,32 @@ Fl_Preferences::RootNode::RootNode( Fl_Preferences *prefs, Root root, const char switch (root) { case SYSTEM: - - err = RegOpenKeyW( HKEY_LOCAL_MACHINE, FLPREFS_RESOURCEW, &key ); - + err = RegOpenKeyW( HKEY_LOCAL_MACHINE, FLPREFS_RESOURCEW, &key ); if (err == ERROR_SUCCESS) { - nn = FL_PATH_MAX - appDataLen; - - err = RegQueryValueExW( key, L"Common AppData", 0L, &type, - (BYTE*)filename, &nn ); - - if ( ( err != ERROR_SUCCESS ) && ( type == REG_SZ ) ) { - filename[0] = 0; - filename[1] = 0; - } - RegCloseKey(key); + nn = FL_PATH_MAX - appDataLen; + err = RegQueryValueExW( key, L"Common AppData", 0L, &type, + (BYTE*)filename, &nn ); + if ( ( err != ERROR_SUCCESS ) && ( type == REG_SZ ) ) { + filename[0] = 0; + filename[1] = 0; + } + RegCloseKey(key); } break; case USER: - err = RegOpenKeyW( HKEY_CURRENT_USER, FLPREFS_RESOURCEW, &key ); - - + err = RegOpenKeyW( HKEY_CURRENT_USER, FLPREFS_RESOURCEW, &key ); if (err == ERROR_SUCCESS) { - nn = FL_PATH_MAX - appDataLen; - err = RegQueryValueExW( key, L"AppData", 0L, &type, - (BYTE*)filename, &nn ); - + nn = FL_PATH_MAX - appDataLen; + err = RegQueryValueExW( key, L"AppData", 0L, &type, + (BYTE*)filename, &nn ); if ( ( err != ERROR_SUCCESS ) && ( type == REG_SZ ) ) { - filename[0] = 0; - filename[1] = 0; + filename[0] = 0; + filename[1] = 0; } RegCloseKey(key); } break; - } - - + } if (!filename[1] && !filename[0]) { strcpy(filename, "C:\\FLTK"); } else { @@ -1139,7 +1068,7 @@ Fl_Preferences::RootNode::RootNode( Fl_Preferences *prefs, Root root, const char strcpy(filename, "/Library/Preferences"); break; case USER: - sprintf(filename, "%s/Library/Preferences", fl_getenv("HOME")); + sprintf(filename, "%s/Library/Preferences", fl_getenv("HOME")); break; } snprintf(filename + strlen(filename), sizeof(filename) - strlen(filename), @@ -1157,21 +1086,17 @@ Fl_Preferences::RootNode::RootNode( Fl_Preferences *prefs, Root root, const char strlcat(filename, ".fltk/", sizeof(filename)); } break; - } - + } case SYSTEM: strcpy(filename, "/etc/fltk/"); break; - } - + } snprintf(filename + strlen(filename), sizeof(filename) - strlen(filename), "%s/%s.prefs", vendor, application); -#endif - +#endif filename_ = strdup(filename); vendor_ = strdup(vendor); - application_ = strdup(application); - + application_ = strdup(application); read(); } @@ -1181,8 +1106,8 @@ Fl_Preferences::RootNode::RootNode( Fl_Preferences *prefs, const char *path, con : prefs_(prefs), filename_(0L), vendor_(0L), - application_(0L) -{ + application_(0L) { + if (!vendor) vendor = "unknown"; if (!application) { @@ -1194,8 +1119,7 @@ Fl_Preferences::RootNode::RootNode( Fl_Preferences *prefs, const char *path, con filename_ = strdup(filename); } vendor_ = strdup(vendor); - application_ = strdup(application); - + application_ = strdup(application); read(); } @@ -1205,13 +1129,11 @@ Fl_Preferences::RootNode::RootNode( Fl_Preferences *prefs ) : prefs_(prefs), filename_(0L), vendor_(0L), - application_(0L) -{ + application_(0L) { } // destroy the root node and all depending nodes -Fl_Preferences::RootNode::~RootNode() -{ +Fl_Preferences::RootNode::~RootNode() { if ( prefs_->node->dirty() ) write(); if ( filename_ ) { @@ -1231,43 +1153,32 @@ Fl_Preferences::RootNode::~RootNode() } // read a preferences file and construct the group tree and with all entry leafs -int Fl_Preferences::RootNode::read() -{ +int Fl_Preferences::RootNode::read() { if (!filename_) // RUNTIME preferences - return -1; - + return -1; char buf[1024]; FILE *f = fl_fopen( filename_, "rb" ); if ( !f ) - return -1; - - fgets( buf, 1024, f ); - fgets( buf, 1024, f ); - fgets( buf, 1024, f ); + return -1; + if (fgets( buf, 1024, f )==0) { /* ignore */ } + if (fgets( buf, 1024, f )==0) { /* ignore */ } + if (fgets( buf, 1024, f )==0) { /* ignore */ } Node *nd = prefs_->node; - for (;;) - { + for (;;) { if ( !fgets( buf, 1024, f ) ) break; // EOF or Error - if ( buf[0]=='[' ) // read a new group - { + if ( buf[0]=='[' ) { // read a new group int end = strcspn( buf+1, "]\n\r" ); buf[ end+1 ] = 0; nd = prefs_->node->find( buf+1 ); - } - else if ( buf[0]=='+' ) // - { // value of previous name/value pair spans multiple lines + } else if ( buf[0]=='+' ) { // value of previous name/value pair spans multiple lines int end = strcspn( buf+1, "\n\r" ); - if ( end != 0 ) // if entry is not empty - { + if ( end != 0 ) { // if entry is not empty buf[ end+1 ] = 0; nd->add( buf+1 ); } - } - else // read a name/value pair - { + } else { // read a name/value pair int end = strcspn( buf, "\n\r" ); - if ( end != 0 ) // if entry is not empty - { + if ( end != 0 ) { // if entry is not empty buf[ end ] = 0; nd->set( buf ); } @@ -1278,31 +1189,40 @@ int Fl_Preferences::RootNode::read() } // write the group tree and all entry leafs -int Fl_Preferences::RootNode::write() -{ +int Fl_Preferences::RootNode::write() { if (!filename_) // RUNTIME preferences - return -1; - + return -1; fl_make_path_for_file(filename_); FILE *f = fl_fopen( filename_, "wb" ); if ( !f ) - return -1; - + return -1; fprintf( f, "; FLTK preferences file format 1.0\n" ); fprintf( f, "; vendor: %s\n", vendor_ ); fprintf( f, "; application: %s\n", application_ ); prefs_->node->write( f ); fclose( f ); +#if !(defined(__APPLE__) || defined(WIN32)) + // unix: make sure that system prefs are user-readable + if (strncmp(filename_, "/etc/fltk/", 10) == 0) { + char *p; + p = filename_ + 9; + do { // for each directory to the pref file + *p = 0; + fl_chmod(filename_, 0755); // rwxr-xr-x + *p = '/'; + p = strchr(p+1, '/'); + } while (p); + fl_chmod(filename_, 0644); // rw-r--r-- + } +#endif return 0; } // get the path to the preferences directory -char Fl_Preferences::RootNode::getPath( char *path, int pathlen ) -{ +char Fl_Preferences::RootNode::getPath( char *path, int pathlen ) { if (!filename_) // RUNTIME preferences - return -1; - - strlcpy( path, filename_, pathlen); + return -1; + strlcpy( path, filename_, pathlen); char *s; for ( s = path; *s; s++ ) if ( *s == '\\' ) *s = '/'; @@ -1310,14 +1230,19 @@ char Fl_Preferences::RootNode::getPath( char *path, int pathlen ) if ( !s ) return 0; *s = 0; char ret = fl_make_path( path ); +#if !(defined(__APPLE__) || defined(WIN32)) + // unix: make sure that system prefs dir. is user-readable + if (strncmp(path, "/etc/fltk/", 10) == 0) { + fl_chmod(path, 0755); // rwxr-xr-x + } +#endif strcpy( s, "/" ); return ret; } // create a node that represents a group // - path must be a single word, prferable alnum(), dot and underscore only. Space is ok. -Fl_Preferences::Node::Node( const char *path ) -{ +Fl_Preferences::Node::Node( const char *path ) { if ( path ) path_ = strdup( path ); else path_ = 0; child_ = 0; next_ = 0; parent_ = 0; entry_ = 0; @@ -1329,11 +1254,9 @@ Fl_Preferences::Node::Node( const char *path ) nIndex_ = NIndex_ = 0; } -void Fl_Preferences::Node::deleteAllChildren() -{ +void Fl_Preferences::Node::deleteAllChildren() { Node *nx; - for ( Node *nd = child_; nd; nd = nx ) - { + for ( Node *nd = child_; nd; nd = nx ) { nx = nd->next_; delete nd; } @@ -1342,12 +1265,9 @@ void Fl_Preferences::Node::deleteAllChildren() updateIndex(); } -void Fl_Preferences::Node::deleteAllEntries() -{ - if ( entry_ ) - { - for ( int i = 0; i < nEntry_; i++ ) - { +void Fl_Preferences::Node::deleteAllEntries() { + if ( entry_ ) { + for ( int i = 0; i < nEntry_; i++ ) { if ( entry_[i].name ) { free( entry_[i].name ); entry_[i].name = 0L; @@ -1366,8 +1286,7 @@ void Fl_Preferences::Node::deleteAllEntries() } // delete this and all depending nodes -Fl_Preferences::Node::~Node() -{ +Fl_Preferences::Node::~Node() { deleteAllChildren(); deleteAllEntries(); deleteIndex(); @@ -1380,8 +1299,7 @@ Fl_Preferences::Node::~Node() } // recursively check if any entry is dirty (was changed after loading a fresh prefs file) -char Fl_Preferences::Node::dirty() -{ +char Fl_Preferences::Node::dirty() { if ( dirty_ ) return 1; if ( next_ && next_->dirty() ) return 1; if ( child_ && child_->dirty() ) return 1; @@ -1391,28 +1309,24 @@ char Fl_Preferences::Node::dirty() // write this node (recursively from the last neighbor back to this) // write all entries // write all children -int Fl_Preferences::Node::write( FILE *f ) -{ +int Fl_Preferences::Node::write( FILE *f ) { if ( next_ ) next_->write( f ); fprintf( f, "\n[%s]\n\n", path_ ); - for ( int i = 0; i < nEntry_; i++ ) - { + for ( int i = 0; i < nEntry_; i++ ) { char *src = entry_[i].value; - if ( src ) - { // hack it into smaller pieces if needed + if ( src ) { // hack it into smaller pieces if needed fprintf( f, "%s:", entry_[i].name ); - int cnt; + int cnt, written; for ( cnt = 0; cnt < 60; cnt++ ) if ( src[cnt]==0 ) break; - fwrite( src, cnt, 1, f ); + written = fwrite( src, cnt, 1, f ); fprintf( f, "\n" ); src += cnt; - for (;*src;) - { + for (;*src;) { for ( cnt = 0; cnt < 80; cnt++ ) if ( src[cnt]==0 ) break; fputc( '+', f ); - fwrite( src, cnt, 1, f ); + written = fwrite( src, cnt, 1, f ); fputc( '\n', f ); src += cnt; } @@ -1426,8 +1340,7 @@ int Fl_Preferences::Node::write( FILE *f ) } // set the parent node and create the full path -void Fl_Preferences::Node::setParent( Node *pn ) -{ +void Fl_Preferences::Node::setParent( Node *pn ) { parent_ = pn; next_ = pn->child_; pn->child_ = this; @@ -1437,21 +1350,18 @@ void Fl_Preferences::Node::setParent( Node *pn ) } // find the corresponding root node -Fl_Preferences::RootNode *Fl_Preferences::Node::findRoot() -{ +Fl_Preferences::RootNode *Fl_Preferences::Node::findRoot() { Node *n = this; do { if (n->top_) return n->root_; n = n->parent(); - } while (n); return 0L; } // add a child to this node and set its path (try to find it first...) -Fl_Preferences::Node *Fl_Preferences::Node::addChild( const char *path ) -{ +Fl_Preferences::Node *Fl_Preferences::Node::addChild( const char *path ) { sprintf( nameBuffer, "%s/%s", path_, path ); char *name = strdup( nameBuffer ); Node *nd = find( name ); @@ -1464,13 +1374,10 @@ Fl_Preferences::Node *Fl_Preferences::Node::addChild( const char *path ) // create and set, or change an entry within this node void Fl_Preferences::Node::set( const char *name, const char *value ) { - for ( int i=0; i= sizeof( nameBuffer ) ) len = sizeof( nameBuffer ); strlcpy( nameBuffer, line, len ); set( nameBuffer, c+1 ); - } - else + } else { set( line, "" ); + } } dirty_ = dirt; } // add more data to an existing entry -void Fl_Preferences::Node::add( const char *line ) -{ +void Fl_Preferences::Node::add( const char *line ) { if ( lastEntrySet<0 || lastEntrySet>=nEntry_ ) return; char *&dst = entry_[ lastEntrySet ].value; int a = strlen( dst ); @@ -1532,19 +1432,15 @@ void Fl_Preferences::Node::add( const char *line ) } // get the value for a name, returns 0 if no such name -const char *Fl_Preferences::Node::get( const char *name ) -{ +const char *Fl_Preferences::Node::get( const char *name ) { int i = getEntry( name ); return i>=0 ? entry_[i].value : 0 ; } // find the index of an entry, returns -1 if no such entry -int Fl_Preferences::Node::getEntry( const char *name ) -{ - for ( int i=0; inext_ ) - { + for ( nd = child_; nd; nd = nd->next_ ) { Node *nn = nd->find( path ); if ( nn ) return nn; } @@ -1598,23 +1489,15 @@ Fl_Preferences::Node *Fl_Preferences::Node::find( const char *path ) // - if the pathname is "." (current node) return this node // - if the pathname is "./" (root node) return the topmost node // - if the pathname starts with "./", start the search at the root node instead -Fl_Preferences::Node *Fl_Preferences::Node::search( const char *path, int offset ) -{ - - if ( offset == 0 ) - { - if ( path[0] == '.' ) - { - if ( path[1] == 0 ) - { +Fl_Preferences::Node *Fl_Preferences::Node::search( const char *path, int offset ) { + if ( offset == 0 ) { + if ( path[0] == '.' ) { + if ( path[1] == 0 ) { return this; // user was searching for current node - } - else if ( path[1] == '/' ) - { + } else if ( path[1] == '/' ) { Node *nn = this; while ( nn->parent() ) nn = nn->parent(); - if ( path[2]==0 ) - { // user is searching for root ( "./" ) + if ( path[2]==0 ) { // user is searching for root ( "./" ) return nn; } return nn->search( path+2, 2 ); // do a relative search on the root node @@ -1622,18 +1505,14 @@ Fl_Preferences::Node *Fl_Preferences::Node::search( const char *path, int offset } offset = strlen( path_ ) + 1; } - int len = strlen( path_ ); if ( len < offset-1 ) return 0; len -= offset; - if ( ( len <= 0 ) || ( strncmp( path, path_+offset, len ) == 0 ) ) - { + if ( ( len <= 0 ) || ( strncmp( path, path_+offset, len ) == 0 ) ) { if ( len > 0 && path[ len ] == 0 ) return this; - if ( len <= 0 || path[ len ] == '/' ) - { - for ( Node *nd = child_; nd; nd = nd->next_ ) - { + if ( len <= 0 || path[ len ] == '/' ) { + for ( Node *nd = child_; nd; nd = nd->next_ ) { Node *nn = nd->search( path, offset ); if ( nn ) return nn; } @@ -1644,8 +1523,7 @@ Fl_Preferences::Node *Fl_Preferences::Node::search( const char *path, int offset } // return the number of child nodes (groups) -int Fl_Preferences::Node::nChildren() -{ +int Fl_Preferences::Node::nChildren() { if (indexed_) { return nIndex_; } else { @@ -1657,10 +1535,8 @@ int Fl_Preferences::Node::nChildren() } // return the node name -const char *Fl_Preferences::Node::name() -{ - if ( path_ ) - { +const char *Fl_Preferences::Node::name() { + if ( path_ ) { char *r = strrchr( path_, '/' ); return r ? r+1 : path_ ; } else { @@ -1669,8 +1545,7 @@ const char *Fl_Preferences::Node::name() } // return the n'th child node's name -const char *Fl_Preferences::Node::child( int ix ) -{ +const char *Fl_Preferences::Node::child( int ix ) { Node *nd = childNode( ix ); if ( nd ) return nd->name(); @@ -1679,8 +1554,7 @@ const char *Fl_Preferences::Node::child( int ix ) } // return the n'th child node -Fl_Preferences::Node *Fl_Preferences::Node::childNode( int ix ) -{ +Fl_Preferences::Node *Fl_Preferences::Node::childNode( int ix ) { createIndex(); if (indexed_) { // usually faster access in correct order, but needing more memory @@ -1690,8 +1564,7 @@ Fl_Preferences::Node *Fl_Preferences::Node::childNode( int ix ) int n = nChildren(); ix = n - ix -1; Node *nd; - for ( nd = child_; nd; nd = nd->next_ ) - { + for ( nd = child_; nd; nd = nd->next_ ) { if ( !ix-- ) break; if ( !nd ) break; } @@ -1700,16 +1573,12 @@ Fl_Preferences::Node *Fl_Preferences::Node::childNode( int ix ) } // remove myself from the list and delete me (and all children) -char Fl_Preferences::Node::remove() -{ +char Fl_Preferences::Node::remove() { Node *nd = 0, *np; - if ( parent() ) - { + if ( parent() ) { nd = parent()->child_; np = 0L; - for ( ; nd; np = nd, nd = nd->next_ ) - { - if ( nd == this ) - { + for ( ; nd; np = nd, nd = nd->next_ ) { + if ( nd == this ) { if ( np ) np->next_ = nd->next_; else @@ -1758,8 +1627,7 @@ void Fl_Preferences::Node::deleteIndex() { * \param[in] name every plugin should have a unique name */ Fl_Plugin::Fl_Plugin(const char *klass, const char *name) -: id(0) -{ +: id(0) { #ifdef FL_PLUGIN_VERBOSE printf("Fl_Plugin: creating a plugin, class \"%s\", name \"%s\"\n", klass, name); @@ -1771,8 +1639,7 @@ Fl_Plugin::Fl_Plugin(const char *klass, const char *name) /** * \brief Clear the plugin and remove it from the database. */ -Fl_Plugin::~Fl_Plugin() -{ +Fl_Plugin::~Fl_Plugin() { #ifdef FL_PLUGIN_VERBOSE printf("Fl_Plugin: deleting a plugin\n"); #endif @@ -1780,13 +1647,11 @@ Fl_Plugin::~Fl_Plugin() Fl_Plugin_Manager::remove(id); } - /** * \brief Manage all plugins belonging to one class. */ Fl_Plugin_Manager::Fl_Plugin_Manager(const char *klass) -: Fl_Preferences(0, Fl_Preferences::Name("%s/%s", "plugins", klass)) -{ +: Fl_Preferences(0, Fl_Preferences::Name("%s/%s", "plugins", klass)) { #ifdef FL_PLUGIN_VERBOSE printf("Fl_Plugin: creating a plugin manager for class \"%s\"\n", klass); #endif @@ -1798,8 +1663,7 @@ Fl_Plugin_Manager::Fl_Plugin_Manager(const char *klass) * Calling this does not remove the database itself or any plugins. It just * removes the reference to the database. */ -Fl_Plugin_Manager::~Fl_Plugin_Manager() -{ +Fl_Plugin_Manager::~Fl_Plugin_Manager() { #ifdef FL_PLUGIN_VERBOSE printf("Fl_Plugin: deleting a plugin manager\n"); #endif @@ -1836,8 +1700,7 @@ static void p2a(void *vp, char *d) { /** * \brief Return the address of a plugin by index. */ -Fl_Plugin *Fl_Plugin_Manager::plugin(int index) -{ +Fl_Plugin *Fl_Plugin_Manager::plugin(int index) { char buf[34]; Fl_Plugin *ret = 0; Fl_Preferences pin(this, index); @@ -1852,8 +1715,7 @@ Fl_Plugin *Fl_Plugin_Manager::plugin(int index) /** * \brief Return the address of a plugin by name. */ -Fl_Plugin *Fl_Plugin_Manager::plugin(const char *name) -{ +Fl_Plugin *Fl_Plugin_Manager::plugin(const char *name) { char buf[34]; Fl_Plugin *ret = 0; if (groupExists(name)) { @@ -1878,8 +1740,7 @@ Fl_Plugin *Fl_Plugin_Manager::plugin(const char *name) * There is no need to call this function explicitly. Every Fl_Plugin constructor * will call this function at initialization time. */ -Fl_Preferences::ID Fl_Plugin_Manager::addPlugin(const char *name, Fl_Plugin *plugin) -{ +Fl_Preferences::ID Fl_Plugin_Manager::addPlugin(const char *name, Fl_Plugin *plugin) { char buf[34]; #ifdef FL_PLUGIN_VERBOSE printf("Fl_Plugin: adding plugin named \"%s\" at 0x%p\n", name, plugin); @@ -1896,8 +1757,7 @@ Fl_Preferences::ID Fl_Plugin_Manager::addPlugin(const char *name, Fl_Plugin *plu * There is no need to call this function explicitly. Every Fl_Plugin destructor * will call this function at destruction time. */ -void Fl_Plugin_Manager::removePlugin(Fl_Preferences::ID id) -{ +void Fl_Plugin_Manager::removePlugin(Fl_Preferences::ID id) { Fl_Preferences::remove(id); } @@ -1909,8 +1769,7 @@ void Fl_Plugin_Manager::removePlugin(Fl_Preferences::ID id) * the constructor of all statically initialized Fl_Plugin classes and adds * them to the database. */ -int Fl_Plugin_Manager::load(const char *filename) -{ +int Fl_Plugin_Manager::load(const char *filename) { // the functions below will autmaticaly load plugins that are defined: // Fl_My_Plugin plugin(); #if defined(WIN32) && !defined(__CYGWIN__) @@ -1925,8 +1784,7 @@ int Fl_Plugin_Manager::load(const char *filename) /** * \brief Use this function to load a whole directory full of modules. */ -int Fl_Plugin_Manager::loadAll(const char *filepath, const char *pattern) -{ +int Fl_Plugin_Manager::loadAll(const char *filepath, const char *pattern) { struct dirent **dir; int i, n = fl_filename_list(filepath, &dir); for (i=0; i #ifdef __APPLE__ -#include +//#include "Fl_Quartz_Printer.mm" #elif defined(WIN32) -#include +#include "Fl_GDI_Printer.cxx" #endif -#include +#include "Fl_PostScript.cxx" // print dialog customization strings /** [this text may be customized at run-time] */ @@ -76,9 +76,16 @@ const char *Fl_Printer::property_save = "Save"; /** [this text may be customized at run-time] */ const char *Fl_Printer::property_cancel = "Cancel"; -const char *Fl_Printer::device_type = "Fl_Printer"; +const char *Fl_Printer::class_id = "Fl_Printer"; +#if defined(__APPLE__) || defined(WIN32) || defined(FL_DOXYGEN) +const char *Fl_System_Printer::class_id = Fl_Printer::class_id; +#endif +#if !( defined(__APPLE__) || defined(WIN32) ) +const char *Fl_PostScript_Printer::class_id = Fl_Printer::class_id; +#endif -void Fl_Printer::set_current() +#if defined(__APPLE__) || defined(WIN32) +void Fl_System_Printer::set_current(void) { #ifdef __APPLE__ fl_gc = (CGContextRef)gc; @@ -88,6 +95,107 @@ void Fl_Printer::set_current() this->Fl_Surface_Device::set_current(); } +void Fl_System_Printer::origin(int *x, int *y) +{ + Fl_Paged_Device::origin(x, y); +} + +#endif + +Fl_Printer::Fl_Printer(void) { +#if defined(WIN32) || defined(__APPLE__) + printer = new Fl_System_Printer(); +#else + printer = new Fl_PostScript_Printer(); +#endif +} + +int Fl_Printer::start_job(int pagecount, int *frompage, int *topage) +{ + return printer->start_job(pagecount, frompage, topage); +} + +int Fl_Printer::start_page(void) +{ + return printer->start_page(); +} + +int Fl_Printer::printable_rect(int *w, int *h) +{ + return printer->printable_rect(w, h); +} + +void Fl_Printer::margins(int *left, int *top, int *right, int *bottom) +{ + printer->margins(left, top, right, bottom); +} + +void Fl_Printer::origin(int *x, int *y) +{ + printer->origin(x, y); +} + +void Fl_Printer::origin(int x, int y) +{ + printer->origin(x, y); +} + +void Fl_Printer::scale(float scale_x, float scale_y) +{ + printer->scale(scale_x, scale_y); +} + +void Fl_Printer::rotate(float angle) +{ + printer->rotate(angle); +} + +void Fl_Printer::translate(int x, int y) +{ + printer->translate(x, y); +} + +void Fl_Printer::untranslate(void) +{ + printer->untranslate(); +} + +int Fl_Printer::end_page (void) +{ + return printer->end_page(); +} + +void Fl_Printer::end_job (void) +{ + printer->end_job(); +} + +void Fl_Printer::print_widget(Fl_Widget* widget, int delta_x, int delta_y) +{ + printer->print_widget(widget, delta_x, delta_y); +} + +void Fl_Printer::print_window_part(Fl_Window *win, int x, int y, int w, int h, int delta_x, int delta_y) +{ + printer->print_window_part(win, x, y, w, h, delta_x, delta_y); +} + +void Fl_Printer::set_current(void) +{ + printer->set_current(); +} + +Fl_Graphics_Driver* Fl_Printer::driver(void) +{ + return printer->driver(); +} + +Fl_Printer::~Fl_Printer(void) +{ + delete printer; +} + + // -// End of "$Id: Fl_Printer.cxx 7617 2010-05-27 17:20:18Z manolo $". +// End of "$Id: Fl_Printer.cxx 8565 2011-04-06 13:43:09Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Progress.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Progress.cxx index d7dee6885..192b38da7 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Progress.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Progress.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Progress.cxx 6794 2009-06-27 09:29:36Z AlbrechtS $" +// "$Id: Fl_Progress.cxx 7903 2010-11-28 21:06:39Z matt $" // // Progress bar widget routines. // -// Copyright 2000-2009 by Michael Sweet. +// Copyright 2000-2010 by Michael Sweet. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -119,5 +119,5 @@ Fl_Progress::Fl_Progress(int X, int Y, int W, int H, const char* L) // -// End of "$Id: Fl_Progress.cxx 6794 2009-06-27 09:29:36Z AlbrechtS $". +// End of "$Id: Fl_Progress.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Repeat_Button.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Repeat_Button.cxx index cff903a8f..65ed3eff1 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Repeat_Button.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Repeat_Button.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Repeat_Button.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Repeat_Button.cxx 7903 2010-11-28 21:06:39Z matt $" // // Repeat button widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -66,5 +66,5 @@ int Fl_Repeat_Button::handle(int event) { } // -// End of "$Id: Fl_Repeat_Button.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Repeat_Button.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Return_Button.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Return_Button.cxx index 3ab21cbe7..42db04788 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Return_Button.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Return_Button.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Return_Button.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Return_Button.cxx 7903 2010-11-28 21:06:39Z matt $" // // Return button widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -61,6 +61,7 @@ void Fl_Return_Button::draw() { int Fl_Return_Button::handle(int event) { if (event == FL_SHORTCUT && (Fl::event_key() == FL_Enter || Fl::event_key() == FL_KP_Enter)) { + simulate_key_action(); do_callback(); return 1; } else @@ -68,5 +69,5 @@ int Fl_Return_Button::handle(int event) { } // -// End of "$Id: Fl_Return_Button.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Return_Button.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Roller.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Roller.cxx index 7efc3472d..8cfbf17e3 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Roller.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Roller.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Roller.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Roller.cxx 7903 2010-11-28 21:06:39Z matt $" // // Roller widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -181,5 +181,5 @@ Fl_Roller::Fl_Roller(int X,int Y,int W,int H,const char* L) } // -// End of "$Id: Fl_Roller.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Roller.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Round_Button.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Round_Button.cxx index 7ca8e40d4..f97207690 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Round_Button.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Round_Button.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Round_Button.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Round_Button.cxx 7903 2010-11-28 21:06:39Z matt $" // // Round button for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -44,5 +44,5 @@ Fl_Round_Button::Fl_Round_Button(int X,int Y,int W,int H, const char *l) } // -// End of "$Id: Fl_Round_Button.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Round_Button.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Scroll.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Scroll.cxx index 4ac025ca6..d93b43b6c 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Scroll.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Scroll.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Scroll.cxx 7039 2010-02-07 21:14:35Z AlbrechtS $" +// "$Id: Fl_Scroll.cxx 8591 2011-04-14 13:21:12Z manolo $" // // Scroll widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -32,13 +32,16 @@ /** Clear all but the scrollbars... */ void Fl_Scroll::clear() { - for (int i=children() - 1; i >= 0; i --) { - Fl_Widget* o = child(i); - if (o != &hscrollbar && o != &scrollbar) { - remove(o); - delete o; - } - } + // Note: the scrollbars are removed from the group before calling + // Fl_Group::clear() to take advantage of the optimized widget removal + // and deletion. Finally they are added to Fl_Scroll's group again. This + // is MUCH faster than removing the widgets one by one (STR #2409). + + remove(scrollbar); + remove(hscrollbar); + Fl_Group::clear(); + add(hscrollbar); + add(scrollbar); } /** Insure the scrollbars are the last children */ @@ -345,9 +348,9 @@ void Fl_Scroll::resize(int X, int Y, int W, int H) { o->position(o->x()+dx, o->y()+dy); } if (dw==0 && dh==0) { - char pad = (scrollbar.visible() && hscrollbar.visible()); - char al = (scrollbar.align()&FL_ALIGN_LEFT!=0); - char at = (scrollbar.align()&FL_ALIGN_TOP!=0); + char pad = ( scrollbar.visible() && hscrollbar.visible() ); + char al = ( (scrollbar.align() & FL_ALIGN_LEFT) != 0 ); + char at = ( (scrollbar.align() & FL_ALIGN_TOP) !=0 ); scrollbar.position(al?X:X+W-scrollbar.w(), (at&&pad)?Y+hscrollbar.h():Y); hscrollbar.position((al&&pad)?X+scrollbar.w():X, at?Y:Y+H-hscrollbar.h()); } else { @@ -388,7 +391,7 @@ void Fl_Scroll::scrollbar_cb(Fl_Widget* o, void*) {

    The destructor also deletes all the children. This allows a whole tree to be deleted at once, without having to keep a pointer to all the children in the user code. A kludge has been done so the - Fl_Scroll and all of it's children can be automatic (local) + Fl_Scroll and all of its children can be automatic (local) variables, but you must declare the Fl_Scrollfirst, so that it is destroyed last. */ @@ -413,5 +416,5 @@ int Fl_Scroll::handle(int event) { } // -// End of "$Id: Fl_Scroll.cxx 7039 2010-02-07 21:14:35Z AlbrechtS $". +// End of "$Id: Fl_Scroll.cxx 8591 2011-04-14 13:21:12Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Scrollbar.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Scrollbar.cxx index 40c298c9b..263e6642e 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Scrollbar.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Scrollbar.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Scrollbar.cxx 7161 2010-02-26 20:44:35Z matt $" +// "$Id: Fl_Scrollbar.cxx 7903 2010-11-28 21:06:39Z matt $" // // Scroll bar widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -288,5 +288,5 @@ Fl_Scrollbar::~Fl_Scrollbar() { // -// End of "$Id: Fl_Scrollbar.cxx 7161 2010-02-26 20:44:35Z matt $". +// End of "$Id: Fl_Scrollbar.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Shared_Image.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Shared_Image.cxx index b32c572f1..13598a9e2 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Shared_Image.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Shared_Image.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Shared_Image.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Shared_Image.cxx 8306 2011-01-24 17:04:22Z matt $" // // Shared image code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -228,7 +228,7 @@ void Fl_Shared_Image::reload() { if (!name_) return; if ((fp = fl_fopen(name_, "rb")) != NULL) { - fread(header, 1, sizeof(header), fp); + if (fread(header, 1, sizeof(header), fp)==0) { /* ignore */ } fclose(fp); } else { return; @@ -374,11 +374,24 @@ Fl_Shared_Image* Fl_Shared_Image::find(const char *n, int W, int H) { /** - Gets a shared image, if it exists already ; it will return it. - If it does not exist or if it exist but with other size, - then the existing image is deleted and replaced - by a new image from the n filename of the proper dimension. - If n is not a valid image filename, then get() will return NULL. + \brief Find or load an image that can be shared by multiple widgets. + + Gets a shared image, if it exists already ; it will return it. + If it does not exist or if it exist but with other size, + then the existing image is deleted and replaced + by a new image from the n filename of the proper dimension. + If n is not a valid image filename, then get() will return NULL. + + Shared JPEG and PNG images can also be created from memory by using their + named memory access constructor. + + \param n name of the image + \param W, H desired size + + \see Fl_Shared_Image::find(const char *n, int W, int H) + \see Fl_Shared_Image::release() + \see Fl_JPEG_Image::Fl_JPEG_Image(const char *name, const unsigned char *data) + \see Fl_PNG_Image::Fl_PNG_Image (const char *name_png, const unsigned char *buffer, int maxsize) */ Fl_Shared_Image* Fl_Shared_Image::get(const char *n, int W, int H) { Fl_Shared_Image *temp; // Image @@ -459,5 +472,5 @@ void Fl_Shared_Image::remove_handler(Fl_Shared_Handler f) { // -// End of "$Id: Fl_Shared_Image.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Shared_Image.cxx 8306 2011-01-24 17:04:22Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Single_Window.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Single_Window.cxx index e83a94709..054b76dd2 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Single_Window.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Single_Window.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Single_Window.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Single_Window.cxx 7903 2010-11-28 21:06:39Z matt $" // // Single-buffered window for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -37,5 +37,5 @@ void Fl_Single_Window::show() {Fl_Window::show();} void Fl_Single_Window::flush() {Fl_Window::flush();} // -// End of "$Id: Fl_Single_Window.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Single_Window.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Slider.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Slider.cxx index 59474df07..341589b79 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Slider.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Slider.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Slider.cxx 7115 2010-02-20 17:40:07Z AlbrechtS $" +// "$Id: Fl_Slider.cxx 8726 2011-05-23 18:32:47Z AlbrechtS $" // // Slider widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -31,6 +31,10 @@ #include #include "flstring.h" +#if defined(FL_DLL) // really needed for c'tors for MS VC++ only +#include +#endif + void Fl_Slider::_Fl_Slider() { slider_size_ = 0; slider_ = 0; // FL_UP_BOX; @@ -364,6 +368,25 @@ int Fl_Slider::handle(int event) { h()-Fl::box_dh(box())); } +/* + The following constructor must not be in the header file if we + build a shared object (DLL). Instead it is defined here to force + the constructor (and default destructor as well) to be defined + in the DLL and exported (STR #2632). + + Note: if you the ctor here, do the same changes in the specific + header file as well. This redundant definition was chosen to enable + inline constructors in the header files (for static linking) as well + as the one here for dynamic linking (Windows DLL). +*/ + +#if defined(FL_DLL) + +Fl_Hor_Slider::Fl_Hor_Slider(int X,int Y,int W,int H,const char *l) + : Fl_Slider(X,Y,W,H,l) {type(FL_HOR_SLIDER);} + +#endif // FL_DLL + // -// End of "$Id: Fl_Slider.cxx 7115 2010-02-20 17:40:07Z AlbrechtS $". +// End of "$Id: Fl_Slider.cxx 8726 2011-05-23 18:32:47Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Table.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Table.cxx index 8f743d178..dc6f26338 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Table.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Table.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Table.cxx 7117 2010-02-20 21:14:47Z matt $" +// "$Id: Fl_Table.cxx 7950 2010-12-05 01:22:53Z greg.ercolano $" // // Fl_Table -- A table widget // @@ -424,14 +424,13 @@ void Fl_Table::_auto_drag_cb() { if (lx > x() + w() - 20) { Fl::e_x = x() + w() - 20; if (hscrollbar->visible()) - ((Fl_Slider*)hscrollbar)->value( - hscrollbar->clamp(hscrollbar->value() + 30)); + ((Fl_Slider*)hscrollbar)->value(hscrollbar->clamp(hscrollbar->value() + 30)); hscrollbar->do_callback(); _dragging_x = Fl::e_x - 30; } else if (lx < (x() + row_header_width())) { Fl::e_x = x() + row_header_width() + 1; - if (hscrollbar->visible()) { + if (hscrollbar->visible()) { ((Fl_Slider*)hscrollbar)->value(hscrollbar->clamp(hscrollbar->value() - 30)); } hscrollbar->do_callback(); @@ -514,7 +513,7 @@ void Fl_Table::table_scrolled() { if ( y > voff ) { y -= row_height(row); break; } } _row_position = toprow = ( row >= _rows ) ? (row - 1) : row; - toprow_scrollpos = y; // OPTIMIZATION: save for later use + toprow_scrollpos = y; // OPTIMIZATION: save for later use // Find bottom row voff = vscrollbar->value() + tih; for ( ; row < _rows; row++ ) { @@ -990,6 +989,13 @@ int Fl_Table::handle(int event) { case FL_Down: ret = move_cursor(1, 0); break; + case FL_Tab: + if ( Fl::event_state() & FL_SHIFT ) { + ret = move_cursor(0, -1); // shift-tab -> left + } else { + ret = move_cursor(0, 1); // tab -> right + } + break; } if (ret && Fl::focus() != this) { do_callback(CONTEXT_TABLE, -1, -1); @@ -1034,6 +1040,10 @@ void Fl_Table::_redraw_cell(TableContext context, int r, int c) { draw_cell(context, r, c, X, Y, W, H); // call users' function to draw it } +/** + See if the cell at row \p r and column \p c is selected. + \returns 1 if the cell is selected, 0 if not. + */ int Fl_Table::is_selected(int r, int c) { int s_left, s_right, s_top, s_bottom; @@ -1057,29 +1067,48 @@ int Fl_Table::is_selected(int r, int c) { return 0; } -void Fl_Table::get_selection(int& s_top, int& s_left, int& s_bottom, int& s_right) { +/** + Gets the region of cells selected (highlighted). + + \param[in] row_top Returns the top row of selection area + \param[in] col_left Returns the left column of selection area + \param[in] row_bot Returns the bottom row of selection area + \param[in] col_right Returns the right column of selection area +*/ +void Fl_Table::get_selection(int& row_top, int& col_left, int& row_bot, int& col_right) { if (select_col > current_col) { - s_left = current_col; - s_right = select_col; + col_left = current_col; + col_right = select_col; } else { - s_right = current_col; - s_left = select_col; + col_right = current_col; + col_left = select_col; } if (select_row > current_row) { - s_top = current_row; - s_bottom = select_row; + row_top = current_row; + row_bot = select_row; } else { - s_bottom = current_row; - s_top = select_row; + row_bot = current_row; + row_top = select_row; } } -void Fl_Table::set_selection(int s_top, int s_left, int s_bottom, int s_right) { +/** + Sets the region of cells to be selected (highlighted). + + So for instance, set_selection(0,0,0,0) selects the top/left cell in the table. + And set_selection(0,0,1,1) selects the four cells in rows 0 and 1, column 0 and 1. + + \param[in] row_top Top row of selection area + \param[in] col_left Left column of selection area + \param[in] row_bot Bottom row of selection area + \param[in] col_right Right column of selection area +*/ +void Fl_Table::set_selection(int row_top, int col_left, int row_bot, int col_right) { damage_zone(current_row, current_col, select_row, select_col); - current_col = s_left; - current_row = s_top; - select_col = s_right; - select_row = s_bottom; + current_col = col_left; + current_row = row_top; + select_col = col_right; + select_row = row_bot; damage_zone(current_row, current_col, select_row, select_col); } @@ -1220,5 +1249,5 @@ void Fl_Table::draw() { } // -// End of "$Id: Fl_Table.cxx 7117 2010-02-20 21:14:47Z matt $". +// End of "$Id: Fl_Table.cxx 7950 2010-12-05 01:22:53Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Table_Row.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Table_Row.cxx index 82b1ef64e..6e24bba0a 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Table_Row.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Table_Row.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Table_Row.cxx 6943 2009-11-18 12:43:21Z AlbrechtS $" +// "$Id: Fl_Table_Row.cxx 7950 2010-12-05 01:22:53Z greg.ercolano $" // // Fl_Table_Row -- A row oriented table widget // @@ -45,16 +45,14 @@ int Fl_Table_Row::row_selected(int row) { void Fl_Table_Row::type(TableRowSelectMode val) { _selectmode = val; switch ( _selectmode ) { - case SELECT_NONE: - { + case SELECT_NONE: { for ( int row=0; row -1 ) { int srow = R, erow = _last_row; @@ -234,8 +228,7 @@ int Fl_Table_Row::handle(int event) { } break; - case FL_DRAG: - { + case FL_DRAG: { if ( _dragging_select ) { // Dragged off table edges? Handle scrolling int offtop = toy - _last_y; // >0 if off top of table @@ -319,5 +312,5 @@ int Fl_Table_Row::handle(int event) { } // -// End of "$Id: Fl_Table_Row.cxx 6943 2009-11-18 12:43:21Z AlbrechtS $". +// End of "$Id: Fl_Table_Row.cxx 7950 2010-12-05 01:22:53Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Tabs.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Tabs.cxx index bb5e54b20..14f309b6b 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Tabs.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Tabs.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Tabs.cxx 7162 2010-02-26 21:10:46Z matt $" +// "$Id: Fl_Tabs.cxx 8658 2011-05-12 15:53:59Z manolo $" // // Tab widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -40,61 +40,76 @@ #define BORDER 2 #define EXTRASPACE 10 +#define SELECTION_BORDER 5 -// return the left edges of each tab (plus a fake left edge for a tab -// past the right-hand one). These position are actually of the left +// Return the left edges of each tab (plus a fake left edge for a tab +// past the right-hand one). These positions are actually of the left // edge of the slope. They are either separated by the correct distance // or by EXTRASPACE or by zero. +// These positions are updated in the private arrays tab_pos[] and +// tab_width[], resp.. If needed, these arrays are (re)allocated. // Return value is the index of the selected item. -int Fl_Tabs::tab_positions(int* p, int* wp) { +int Fl_Tabs::tab_positions() { + int nc = children(); + if (nc != tab_count) { + clear_tab_positions(); + if (nc) { + tab_pos = (int*)malloc((nc+1)*sizeof(int)); + tab_width = (int*)malloc((nc+1)*sizeof(int)); + } + tab_count = nc; + } + if (nc == 0) return 0; int selected = 0; Fl_Widget*const* a = array(); int i; char prev_draw_shortcut = fl_draw_shortcut; fl_draw_shortcut = 1; - p[0] = Fl::box_dx(box()); - for (i=0; ivisible()) selected = i; int wt = 0; int ht = 0; o->measure_label(wt,ht); - wp[i] = wt+EXTRASPACE; - p[i+1] = p[i]+wp[i]+BORDER; + tab_width[i] = wt + EXTRASPACE; + tab_pos[i+1] = tab_pos[i] + tab_width[i] + BORDER; } fl_draw_shortcut = prev_draw_shortcut; int r = w(); - if (p[i] <= r) return selected; + if (tab_pos[i] <= r) return selected; // uh oh, they are too big: // pack them against right edge: - p[i] = r; - for (i = children(); i--;) { - int l = r-wp[i]; - if (p[i+1] < l) l = p[i+1]; - if (p[i] <= l) break; - p[i] = l; + tab_pos[i] = r; + for (i = nc; i--;) { + int l = r-tab_width[i]; + if (tab_pos[i+1] < l) l = tab_pos[i+1]; + if (tab_pos[i] <= l) break; + tab_pos[i] = l; r -= EXTRASPACE; } // pack them against left edge and truncate width if they still don't fit: - for (i = 0; i= i*EXTRASPACE) break; - p[i] = i*EXTRASPACE; - int W = w()-1-EXTRASPACE*(children()-i) - p[i]; - if (wp[i] > W) wp[i] = W; + for (i = 0; i= i*EXTRASPACE) break; + tab_pos[i] = i*EXTRASPACE; + int W = w()-1-EXTRASPACE*(children()-i) - tab_pos[i]; + if (tab_width[i] > W) tab_width[i] = W; } // adjust edges according to visiblity: - for (i = children(); i > selected; i--) { - p[i] = p[i-1]+wp[i-1]; + for (i = nc; i > selected; i--) { + tab_pos[i] = tab_pos[i-1] + tab_width[i-1]; } return selected; } -// return space needed for tabs. Negative to put them on the bottom: +// Returns space (height) in pixels needed for tabs. Negative to put them on the bottom. +// Returns full height, if children() = 0. int Fl_Tabs::tab_height() { + if (children() == 0) return h(); int H = h(); int H2 = y(); Fl_Widget*const* a = array(); @@ -108,8 +123,10 @@ int Fl_Tabs::tab_height() { else return (H <= 0) ? 0 : H; } -// this is used by fluid to pick tabs: +// This is used for event handling (clicks) and by fluid to pick tabs. +// Returns 0, if children() = 0, or if the event is outside of the tabs area. Fl_Widget *Fl_Tabs::which(int event_x, int event_y) { + if (children() == 0) return 0; int H = tab_height(); if (H < 0) { if (event_y > y()+h() || event_y < y()+h()+H) return 0; @@ -117,12 +134,16 @@ Fl_Widget *Fl_Tabs::which(int event_x, int event_y) { if (event_y > y()+H || event_y < y()) return 0; } if (event_x < x()) return 0; - int p[128], wp[128]; - tab_positions(p, wp); - for (int i=0; ivisible() || o && !o->visible()) + if ( (push_ && !push_->visible()) || (o && !o->visible()) ) redraw_tabs(); push_ = o; return 1; @@ -303,14 +325,11 @@ void Fl_Tabs::draw() { draw_box(box(), x(), y()+(H>=0?H:0), w(), h()-(H>=0?H:-H), c); if (selection_color() != c) { - // Draw the top 5 lines of the tab pane in the selection color so - // that the user knows which tab is selected... - if (H >= 0) fl_push_clip(x(), y() + H, w(), 5); - else fl_push_clip(x(), y() + h() - H - 4, w(), 5); - - draw_box(box(), x(), y()+(H>=0?H:0), w(), h()-(H>=0?H:-H), - selection_color()); - + // Draw the top or bottom SELECTION_BORDER lines of the tab pane in the + // selection color so that the user knows which tab is selected... + int clip_y = (H >= 0) ? y() + H : y() + h() + H - SELECTION_BORDER; + fl_push_clip(x(), clip_y, w(), SELECTION_BORDER); + draw_box(box(), x(), clip_y, w(), SELECTION_BORDER, selection_color()); fl_pop_clip(); } if (v) draw_child(*v); @@ -318,17 +337,20 @@ void Fl_Tabs::draw() { if (v) update_child(*v); } if (damage() & (FL_DAMAGE_SCROLL|FL_DAMAGE_ALL)) { - int p[128]; int wp[128]; - int selected = tab_positions(p,wp); + int nc = children(); + int selected = tab_positions(); int i; Fl_Widget*const* a = array(); for (i=0; i selected; i--) - draw_tab(x()+p[i], x()+p[i+1], wp[i], H, a[i], RIGHT); + draw_tab(x()+tab_pos[i], x()+tab_pos[i+1], + tab_width[i], H, a[i], LEFT); + for (i=nc-1; i > selected; i--) + draw_tab(x()+tab_pos[i], x()+tab_pos[i+1], + tab_width[i], H, a[i], RIGHT); if (v) { i = selected; - draw_tab(x()+p[i], x()+p[i+1], wp[i], H, a[i], SELECTED); + draw_tab(x()+tab_pos[i], x()+tab_pos[i+1], + tab_width[i], H, a[i], SELECTED); } } } @@ -405,13 +427,17 @@ void Fl_Tabs::draw_tab(int x1, int x2, int W, int H, Fl_Widget* o, int what) { Creates a new Fl_Tabs widget using the given position, size, and label string. The default boxtype is FL_THIN_UP_BOX. -

    Use add(Fl_Widget - *) to add each child, which are usually + Use add(Fl_Widget*) to add each child, which are usually Fl_Group widgets. The children should be sized to stay away from the top or bottom edge of the Fl_Tabs widget, which is where the tabs will be drawn. -

    The destructor also deletes all the children. This + All children of Fl_Tabs should have the same size and exactly fit on top of + each other. They should only leave space above or below where that tabs will + go, but not on the sides. If the first child of Fl_Tabs is set to + "resizable()", the riders will not resize when the tabs are resized. + + The destructor also deletes all the children. This allows a whole tree to be deleted at once, without having to keep a pointer to all the children in the user code. A kludge has been done so the Fl_Tabs and all of its children @@ -423,8 +449,83 @@ Fl_Tabs::Fl_Tabs(int X,int Y,int W, int H, const char *l) : { box(FL_THIN_UP_BOX); push_ = 0; + tab_pos = 0; + tab_width = 0; + tab_count = 0; +} + +Fl_Tabs::~Fl_Tabs() { + clear_tab_positions(); +} + +/** + Returns the position and size available to be used by its children. + + If there isn't any child yet the \p tabh parameter will be used to + calculate the return values. This assumes that the children's labelsize + is the same as the Fl_Tabs' labelsize and adds a small border. + + If there are already children, the values of child(0) are returned, and + \p tabh is ignored. + + \note Children should always use the same positions and sizes. + + \p tabh can be one of + \li 0: calculate label size, tabs on top + \li -1: calculate label size, tabs on bottom + \li > 0: use given \p tabh value, tabs on top (height = tabh) + \li < -1: use given \p tabh value, tabs on bottom (height = -tabh) + + \param[in] tabh position and optional height of tabs (see above) + \param[out] rx,ry,rw,rh (x,y,w,h) of client area for children + + \since FLTK 1.3.0 +*/ +void Fl_Tabs::client_area(int &rx, int &ry, int &rw, int &rh, int tabh) { + + if (children()) { // use existing values + + rx = child(0)->x(); + ry = child(0)->y(); + rw = child(0)->w(); + rh = child(0)->h(); + + } else { // calculate values + + int y_offset; + int label_height = fl_height(labelfont(), labelsize()) + BORDER*2; + + if (tabh == 0) // use default (at top) + y_offset = label_height; + else if (tabh == -1) // use default (at bottom) + y_offset = -label_height; + else + y_offset = tabh; // user given value + + rx = x(); + rw = w(); + + if (y_offset >= 0) { // labels at top + ry = y() + y_offset; + rh = h() - y_offset; + } else { // labels at bottom + ry = y(); + rh = h() + y_offset; + } + } +} + +void Fl_Tabs::clear_tab_positions() { + if (tab_pos) { + free(tab_pos); + tab_pos = 0; + } + if (tab_width){ + free(tab_width); + tab_width = 0; + } } // -// End of "$Id: Fl_Tabs.cxx 7162 2010-02-26 21:10:46Z matt $". +// End of "$Id: Fl_Tabs.cxx 8658 2011-05-12 15:53:59Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Text_Buffer.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Text_Buffer.cxx index 6e244a006..9714f51e5 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Text_Buffer.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Text_Buffer.cxx @@ -1,7 +1,7 @@ // -// "$Id: Fl_Text_Buffer.cxx 7672 2010-07-10 09:44:45Z matt $" +// "$Id: Fl_Text_Buffer.cxx 8040 2010-12-15 17:38:39Z manolo $" // -// Copyright 2001-2009 by Bill Spitzak and others. +// Copyright 2001-2010 by Bill Spitzak and others. // Original code Copyright Mark Edel. Permission to distribute under // the LGPL for the FLTK library granted by Mark Edel. // @@ -32,91 +32,36 @@ #include #include #include +#include + /* This file is based on a port of NEdit to FLTK many years ago. NEdit at that point was already stretched beyond the task it was designed for which explains - why the source code is sometimes pretty convoluted. It still is a nice widget - for FLTK. + why the source code is sometimes pretty convoluted. It still is a very useful + widget for FLTK, and we are thankful that the nedit team allowed us to + integrate their code. With the introduction of Unicode and UTF-8, Fl_Text_... has to go into a whole - new generation of code. Originally designed for monspaced fonts only, many - features make les sense in the multibyte and multiwdth world of UTF-8. - - Columns are a good example. There is simply no such thing. - - Rectangular selections pose a real problem. - - Using multiple spaces to emulate tab stops will no longer work. - - And constantly recalculating character widths is just much too expensive. - - But nevertheless, we will get ths widget rolling again ;-) - + new generation of code. Originally designed for monospaced fonts only, many + features make less sense in the multibyte and multiwidth world of UTF-8. + + Columns are a good example. There is simply no such thing. The new Fl_Text_... + widget converts columns to pixels by multiplying them with the average + character width for a given font. + + Rectangular selections were rarely used (if at all) and make little sense when + using variable width fonts. They have been removed. + + Using multiple spaces to emulate tab stops has been replaced by pixel counting + routines. They are slower, but give the expected result for proportional fonts. + + And constantly recalculating character widths is just much too expensive. Lines + of text are now subdivided into blocks of text which are measured at once + instead of individual characters. */ -/* - \todo unicode check - */ -static void insertColInLine(const char *line, char *insLine, int column, - int insWidth, int tabDist, int useTabs, - char *outStr, int *outLen, - int *endOffset); - -/* - \todo unicode check - */ -static void deleteRectFromLine(const char *line, int rectStart, - int rectEnd, int tabDist, int useTabs, - char *outStr, - int *outLen, int *endOffset); - -/* - \todo unicode check - */ -static void overlayRectInLine(const char *line, char *insLine, - int rectStart, int rectEnd, int tabDist, - int useTabs, char *outStr, - int *outLen, int *endOffset); - -/* - \todo unicode check - */ -static void addPadding(char *string, int startIndent, int toIndent, - int tabDist, int useTabs, int *charsAdded); - -/* - \todo unicode check - */ -static char *copyLine(const char *text, int *lineLen); - -/* - unicode tested - */ -static int countLines(const char *string); - -/* - \todo unicode check - */ -static int textWidth(const char *text, int tabDist); - -/* - \todo unicode check - */ -static char *realignTabs(const char *text, int origIndent, int newIndent, - int tabDist, int useTabs, int *newLength); - -/* - \todo unicode check - */ -static char *expandTabs(const char *text, int startIndent, int tabDist, int *newLen); - -/* - \todo unicode check - */ -static char *unexpandTabs(char *text, int startIndent, int tabDist, int *newLen); - #ifndef min static int max(int i1, int i2) @@ -131,12 +76,6 @@ static int min(int i1, int i2) #endif -static const char *ControlCodeTable[32] = { - "nul", "soh", "stx", "etx", "eot", "enq", "ack", "bel", - "bs", "ht", "nl", "vt", "np", "cr", "so", "si", - "dle", "dc1", "dc2", "dc3", "dc4", "nak", "syn", "etb", - "can", "em", "sub", "esc", "fs", "gs", "rs", "us" -}; static char *undobuffer; static int undobufferlength; @@ -146,6 +85,9 @@ static int undocut; // number of characters deleted there static int undoinsert; // number of characters inserted static int undoyankcut; // length of valid contents of buffer, even if undocut=0 +/* + Resize the undo buffer to match at least the requested size. + */ static void undobuffersize(int n) { if (n > undobufferlength) { @@ -161,8 +103,14 @@ static void undobuffersize(int n) } } +static void def_transcoding_warning_action(Fl_Text_Buffer *text) +{ + fl_alert("%s", text->file_encoding_warning_message); +} -// unicode ok +/* + Initialize all variables. + */ Fl_Text_Buffer::Fl_Text_Buffer(int requestedSize, int preferredGapSize) { mLength = 0; @@ -171,16 +119,12 @@ Fl_Text_Buffer::Fl_Text_Buffer(int requestedSize, int preferredGapSize) mGapStart = 0; mGapEnd = mPreferredGapSize; mTabDist = 8; - mUseTabs = 1; mPrimary.mSelected = 0; - mPrimary.mRectangular = 0; mPrimary.mStart = mPrimary.mEnd = 0; mSecondary.mSelected = 0; mSecondary.mStart = mSecondary.mEnd = 0; - mSecondary.mRectangular = 0; mHighlight.mSelected = 0; mHighlight.mStart = mHighlight.mEnd = 0; - mHighlight.mRectangular = 0; mModifyProcs = NULL; mCbArgs = NULL; mNModifyProcs = 0; @@ -189,17 +133,14 @@ Fl_Text_Buffer::Fl_Text_Buffer(int requestedSize, int preferredGapSize) mPredeleteCbArgs = NULL; mCursorPosHint = 0; mCanUndo = 1; -#ifdef PURIFY - { - int i; - for (i = mGapStart; i < mGapEnd; i++) - mBuf[i] = '.'; - } -#endif + input_file_was_transcoded = 0; + transcoding_warning_action = def_transcoding_warning_action; } -// unicode ok +/* + Free all resources. + */ Fl_Text_Buffer::~Fl_Text_Buffer() { free(mBuf); @@ -214,21 +155,26 @@ Fl_Text_Buffer::~Fl_Text_Buffer() } -// This function copies verbose whatever is in front and after the gap into a -// single buffer. -// - unicode ok +/* + This function copies verbose whatever is in front and after the gap into a + single buffer. + */ char *Fl_Text_Buffer::text() const { char *t = (char *) malloc(mLength + 1); memcpy(t, mBuf, mGapStart); - memcpy(&t[mGapStart], &mBuf[mGapEnd], mLength - mGapStart); + memcpy(t+mGapStart, mBuf+mGapEnd, mLength - mGapStart); t[mLength] = '\0'; return t; } -// unicode ok, functions called have not been verified yet +/* + Set the text buffer to a new string. + */ void Fl_Text_Buffer::text(const char *t) { + IS_UTF8_ALIGNED(t) + call_predelete_callbacks(0, length()); /* Save information for redisplay, and get rid of the old buffer */ @@ -243,13 +189,6 @@ void Fl_Text_Buffer::text(const char *t) mGapStart = insertedLength; mGapEnd = mGapStart + mPreferredGapSize; memcpy(mBuf, t, insertedLength); -#ifdef PURIFY - { - int i; - for (i = mGapStart; i < mGapEnd; i++) - mBuf[i] = '.'; - } -#endif /* Zero all of the existing selections */ update_selections(0, deletedLength, 0); @@ -260,9 +199,13 @@ void Fl_Text_Buffer::text(const char *t) } -// Creates a new buffer and copies verbose from around the gap. -// - unicode ok +/* + Creates a range of text to a new buffer and copies verbose from around the gap. + */ char *Fl_Text_Buffer::text_range(int start, int end) const { + IS_UTF8_ALIGNED2(this, (start)) + IS_UTF8_ALIGNED2(this, (end)) + char *s = NULL; /* Make sure start and end are ok, and allocate memory for returned string. @@ -285,32 +228,58 @@ char *Fl_Text_Buffer::text_range(int start, int end) const { /* Copy the text from the buffer to the returned string */ if (end <= mGapStart) { - memcpy(s, &mBuf[start], copiedLength); + memcpy(s, mBuf + start, copiedLength); } else if (start >= mGapStart) { - memcpy(s, &mBuf[start + (mGapEnd - mGapStart)], copiedLength); + memcpy(s, mBuf + start + (mGapEnd - mGapStart), copiedLength); } else { int part1Length = mGapStart - start; - memcpy(s, &mBuf[start], part1Length); - memcpy(&s[part1Length], &mBuf[mGapEnd], copiedLength - part1Length); + memcpy(s, mBuf + start, part1Length); + memcpy(s + part1Length, mBuf + mGapEnd, copiedLength - part1Length); } s[copiedLength] = '\0'; return s; } - -// TODO: we will need the same signature function to get bytes (style buffer) -// unicode ok -unsigned int Fl_Text_Buffer::character(int pos) const { +/* + Return a UCS-4 character at the given index. + Pos must be at a character boundary. + */ +unsigned int Fl_Text_Buffer::char_at(int pos) const { if (pos < 0 || pos >= mLength) return '\0'; + + IS_UTF8_ALIGNED2(this, (pos)) + const char *src = address(pos); return fl_utf8decode(src, 0, 0); } -// unicode ok, dependents not tested +/* + Return the raw byte at the given index. + This function ignores all unicode encoding. + */ +char Fl_Text_Buffer::byte_at(int pos) const { + if (pos < 0 || pos >= mLength) + return '\0'; + const char *src = address(pos); + return *src; +} + + +/* + Insert some text at the given index. + Pos must be at a character boundary. +*/ void Fl_Text_Buffer::insert(int pos, const char *text) { + IS_UTF8_ALIGNED2(this, (pos)) + IS_UTF8_ALIGNED(text) + + /* check if there is actually any text */ + if (!text || !*text) + return; + /* if pos is not contiguous to existing text, make it */ if (pos > mLength) pos = mLength; @@ -323,11 +292,15 @@ void Fl_Text_Buffer::insert(int pos, const char *text) /* insert and redisplay */ int nInserted = insert_(pos, text); mCursorPosHint = pos + nInserted; + IS_UTF8_ALIGNED2(this, (mCursorPosHint)) call_modify_callbacks(pos, 0, nInserted, 0, NULL); } -// unicode ok, dependents not tested +/* + Replace a range of text with new text. + Start and end must be at a character boundary. +*/ void Fl_Text_Buffer::replace(int start, int end, const char *text) { // Range check... @@ -337,6 +310,10 @@ void Fl_Text_Buffer::replace(int start, int end, const char *text) start = 0; if (end > mLength) end = mLength; + + IS_UTF8_ALIGNED2(this, (start)) + IS_UTF8_ALIGNED2(this, (end)) + IS_UTF8_ALIGNED(text) call_predelete_callbacks(start, end - start); const char *deletedText = text_range(start, end); @@ -348,7 +325,10 @@ void Fl_Text_Buffer::replace(int start, int end, const char *text) } -// unicode ok, dependents not tested +/* + Remove a range of text. + Start and End must be at a character boundary. +*/ void Fl_Text_Buffer::remove(int start, int end) { /* Make sure the arguments make sense */ @@ -365,6 +345,9 @@ void Fl_Text_Buffer::remove(int start, int end) end = mLength; if (end < 0) end = 0; + + IS_UTF8_ALIGNED2(this, (start)) + IS_UTF8_ALIGNED2(this, (end)) if (start == end) return; @@ -378,9 +361,18 @@ void Fl_Text_Buffer::remove(int start, int end) free((void *) deletedText); } + +/* + Copy a range of text from another text buffer. + fromStart, fromEnd, and toPos must be at a character boundary. + */ void Fl_Text_Buffer::copy(Fl_Text_Buffer * fromBuf, int fromStart, int fromEnd, int toPos) { + IS_UTF8_ALIGNED2(fromBuf, fromStart) + IS_UTF8_ALIGNED2(fromBuf, fromEnd) + IS_UTF8_ALIGNED2(this, (toPos)) + int copiedLength = fromEnd - fromStart; /* Prepare the buffer to receive the new text. If the new text fits in @@ -398,8 +390,7 @@ void Fl_Text_Buffer::copy(Fl_Text_Buffer * fromBuf, int fromStart, memcpy(&mBuf[toPos], &fromBuf->mBuf[fromStart], copiedLength); } else if (fromStart >= fromBuf->mGapStart) { memcpy(&mBuf[toPos], - &fromBuf->mBuf[fromStart + - (fromBuf->mGapEnd - fromBuf->mGapStart)], + &fromBuf->mBuf[fromStart + (fromBuf->mGapEnd - fromBuf->mGapStart)], copiedLength); } else { int part1Length = fromBuf->mGapStart - fromStart; @@ -412,9 +403,15 @@ void Fl_Text_Buffer::copy(Fl_Text_Buffer * fromBuf, int fromStart, update_selections(toPos, 0, copiedLength); } + +/* + Take the previous changes and undo them. Return the previous + cursor position in cursorPos. Returns 1 if the undo was applied. + CursorPos will be at a character boundary. + */ int Fl_Text_Buffer::undo(int *cursorPos) { - if (undowidget != this || !undocut && !undoinsert && !mCanUndo) + if (undowidget != this || (!undocut && !undoinsert && !mCanUndo)) return 0; int ilen = undocut; @@ -450,181 +447,25 @@ int Fl_Text_Buffer::undo(int *cursorPos) } -// unicode ok +/* + Set a flag if undo function will work. + */ void Fl_Text_Buffer::canUndo(char flag) { mCanUndo = flag; + // disabling undo also clears the last undo operation! + if (!mCanUndo && undowidget==this) + undowidget = 0; } -void Fl_Text_Buffer::insert_column(int column, int startPos, - const char *text, int *charsInserted, - int *charsDeleted) -{ - int nLines = countLines(text); - int lineStartPos = line_start(startPos); - int nDeleted = line_end(skip_lines(startPos, nLines)) - lineStartPos; - call_predelete_callbacks(lineStartPos, nDeleted); - const char *deletedText = - text_range(lineStartPos, lineStartPos + nDeleted); - int insertDeleted, nInserted; - insert_column_(column, lineStartPos, text, &insertDeleted, &nInserted, - &mCursorPosHint); - if (nDeleted != insertDeleted) - Fl::error - ("Fl_Text_Buffer::insert_column(): internal consistency check ins1 failed"); - call_modify_callbacks(lineStartPos, nDeleted, nInserted, 0, deletedText); - free((void *) deletedText); - if (charsInserted != NULL) - *charsInserted = nInserted; - if (charsDeleted != NULL) - *charsDeleted = nDeleted; -} - -void Fl_Text_Buffer::overlay_rectangular(int startPos, int rectStart, - int rectEnd, const char *text, - int *charsInserted, - int *charsDeleted) -{ - - int nLines = countLines(text); - int lineStartPos = line_start(startPos); - int nDeleted = line_end(skip_lines(startPos, nLines)) - lineStartPos; - call_predelete_callbacks(lineStartPos, nDeleted); - const char *deletedText = - text_range(lineStartPos, lineStartPos + nDeleted); - int insertDeleted, nInserted; - overlay_rectangular_(lineStartPos, rectStart, rectEnd, text, - &insertDeleted, &nInserted, &mCursorPosHint); - if (nDeleted != insertDeleted) - Fl::error - ("Fl_Text_Buffer::overlay_rectangle(): internal consistency check ovly1 failed"); - call_modify_callbacks(lineStartPos, nDeleted, nInserted, 0, deletedText); - free((void *) deletedText); - if (charsInserted != NULL) - *charsInserted = nInserted; - if (charsDeleted != NULL) - *charsDeleted = nDeleted; -} - -void Fl_Text_Buffer::replace_rectangular(int start, int end, int rectStart, - int rectEnd, const char *text) -{ - char *insText = (char *) ""; - int linesPadded = 0; - - /* Make sure start and end refer to complete lines, since the - columnar delete and insert operations will replace whole lines */ - start = line_start(start); - end = line_end(end); - - call_predelete_callbacks(start, end - start); - - /* If more lines will be deleted than inserted, pad the inserted text - with newlines to make it as long as the number of deleted lines. This - will indent all of the text to the right of the rectangle to the same - column. If more lines will be inserted than deleted, insert extra - lines in the buffer at the end of the rectangle to make room for the - additional lines in "text" */ - int nInsertedLines = countLines(text); - int nDeletedLines = count_lines(start, end); - if (nInsertedLines < nDeletedLines) { - int insLen = strlen(text); - insText = (char *) malloc(insLen + nDeletedLines - nInsertedLines + 1); - strcpy(insText, text); - char *insPtr = insText + insLen; - for (int i = 0; i < nDeletedLines - nInsertedLines; i++) - *insPtr++ = '\n'; - *insPtr = '\0'; - } else if (nDeletedLines < nInsertedLines) { - linesPadded = nInsertedLines - nDeletedLines; - for (int i = 0; i < linesPadded; i++) - insert_(end, "\n"); - } - - /* else nDeletedLines == nInsertedLines; */ - /* Save a copy of the text which will be modified for the modify CBs */ - const char *deletedText = text_range(start, end); - - /* Delete then insert */ - int insertDeleted, insertInserted, deleteInserted, hint; - remove_rectangular_(start, end, rectStart, rectEnd, &deleteInserted, - &hint); - insert_column_(rectStart, start, insText, &insertDeleted, - &insertInserted, &mCursorPosHint); - - /* Figure out how many chars were inserted and call modify callbacks */ - if (insertDeleted != deleteInserted + linesPadded) - Fl::error - ("Fl_Text_Buffer::replace_rectangular(): internal consistency check repl1 failed"); - call_modify_callbacks(start, end - start, insertInserted, 0, - deletedText); - free((void *) deletedText); - if (nInsertedLines < nDeletedLines) - free((void *) insText); -} - -void Fl_Text_Buffer::remove_rectangular(int start, int end, int rectStart, - int rectEnd) -{ - - start = line_start(start); - end = line_end(end); - call_predelete_callbacks(start, end - start); - const char *deletedText = text_range(start, end); - int nInserted; - remove_rectangular_(start, end, rectStart, rectEnd, &nInserted, - &mCursorPosHint); - call_modify_callbacks(start, end - start, nInserted, 0, deletedText); - free((void *) deletedText); -} - -void Fl_Text_Buffer::clear_rectangular(int start, int end, int rectStart, - int rectEnd) -{ - int nLines = count_lines(start, end); - char *newlineString = (char *) malloc(nLines + 1); - int i; - for (i = 0; i < nLines; i++) - newlineString[i] = '\n'; - newlineString[i] = '\0'; - overlay_rectangular(start, rectStart, rectEnd, newlineString, - NULL, NULL); - free((void *) newlineString); -} - -char *Fl_Text_Buffer::text_in_rectangle(int start, int end, - int rectStart, - int rectEnd) const { - start = line_start(start); - end = line_end(end); - char *textOut = (char *) malloc((end - start) + 1); - int lineStart = start; - char *outPtr = textOut; - int selLeft, selRight; - while (lineStart <= end) - { - rectangular_selection_boundaries(lineStart, rectStart, rectEnd, - &selLeft, &selRight); - const char *textIn = text_range(selLeft, selRight); - int len = selRight - selLeft; - memcpy(outPtr, textIn, len); - free((void *) textIn); - outPtr += len; - lineStart = line_end(selRight) + 1; - *outPtr++ = '\n'; - } if (outPtr != textOut) - outPtr--; /* don't leave trailing newline */ - *outPtr = '\0'; - - /* If necessary, realign the tabs in the selection as if the text were - positioned at the left margin */ - int len; - char *retabbedStr = realignTabs(textOut, rectStart, 0, mTabDist, - mUseTabs, &len); - free((void *) textOut); - return retabbedStr; -} +/* + Change the tab width. This will cause a couple of callbacks and a complete + redisplay. + Matt: I am not entirely sure why we need to trigger callbacks because + tabs are only a graphical hint, not changing any text at all, but I leave + this in here for back compatibility. + */ void Fl_Text_Buffer::tab_distance(int tabDist) { /* First call the pre-delete callbacks with the previous tab setting @@ -641,14 +482,26 @@ void Fl_Text_Buffer::tab_distance(int tabDist) free((void *) deletedText); } + +/* + Select a range of text. + Start and End must be at a character boundary. + */ void Fl_Text_Buffer::select(int start, int end) { + IS_UTF8_ALIGNED2(this, (start)) + IS_UTF8_ALIGNED2(this, (end)) + Fl_Text_Selection oldSelection = mPrimary; mPrimary.set(start, end); redisplay_selection(&oldSelection, &mPrimary); } + +/* + Clear the primary selection. + */ void Fl_Text_Buffer::unselect() { Fl_Text_Selection oldSelection = mPrimary; @@ -657,42 +510,47 @@ void Fl_Text_Buffer::unselect() redisplay_selection(&oldSelection, &mPrimary); } -void Fl_Text_Buffer::select_rectangular(int start, int end, int rectStart, - int rectEnd) -{ - Fl_Text_Selection oldSelection = mPrimary; - mPrimary.set_rectangular(start, end, rectStart, rectEnd); - redisplay_selection(&oldSelection, &mPrimary); -} - +/* + Return the primary selection range. + */ int Fl_Text_Buffer::selection_position(int *start, int *end) { return mPrimary.position(start, end); } -int Fl_Text_Buffer::selection_position(int *start, int *end, - int *isRect, int *rectStart, - int *rectEnd) -{ - return mPrimary.position(start, end, isRect, rectStart, rectEnd); -} +/* + Return a copy of the selected text. + */ char *Fl_Text_Buffer::selection_text() { return selection_text_(&mPrimary); } + +/* + Remove the selected text. + */ void Fl_Text_Buffer::remove_selection() { remove_selection_(&mPrimary); } + +/* + Replace the selected text. + */ void Fl_Text_Buffer::replace_selection(const char *text) { replace_selection_(&mPrimary, text); } + +/* + Select text. + Start and End must be at a character boundary. + */ void Fl_Text_Buffer::secondary_select(int start, int end) { Fl_Text_Selection oldSelection = mSecondary; @@ -701,6 +559,10 @@ void Fl_Text_Buffer::secondary_select(int start, int end) redisplay_selection(&oldSelection, &mSecondary); } + +/* + Deselect text. + */ void Fl_Text_Buffer::secondary_unselect() { Fl_Text_Selection oldSelection = mSecondary; @@ -709,44 +571,47 @@ void Fl_Text_Buffer::secondary_unselect() redisplay_selection(&oldSelection, &mSecondary); } -void Fl_Text_Buffer::secondary_select_rectangular(int start, int end, - int rectStart, - int rectEnd) -{ - Fl_Text_Selection oldSelection = mSecondary; - mSecondary.set_rectangular(start, end, rectStart, rectEnd); - redisplay_selection(&oldSelection, &mSecondary); -} - +/* + Return the selected range. + */ int Fl_Text_Buffer::secondary_selection_position(int *start, int *end) { return mSecondary.position(start, end); } -int Fl_Text_Buffer::secondary_selection_position(int *start, int *end, - int *isRect, - int *rectStart, - int *rectEnd) -{ - return mSecondary.position(start, end, isRect, rectStart, rectEnd); -} +/* + Return a copy of the text in this selection. + */ char *Fl_Text_Buffer::secondary_selection_text() { return selection_text_(&mSecondary); } + +/* + Remove the selected text. + */ void Fl_Text_Buffer::remove_secondary_selection() { remove_selection_(&mSecondary); } + +/* + Replace selected text. + */ void Fl_Text_Buffer::replace_secondary_selection(const char *text) { replace_selection_(&mSecondary, text); } + +/* + Highlight a range of text. + Start and End must be at a character boundary. + */ void Fl_Text_Buffer::highlight(int start, int end) { Fl_Text_Selection oldSelection = mHighlight; @@ -755,6 +620,10 @@ void Fl_Text_Buffer::highlight(int start, int end) redisplay_selection(&oldSelection, &mHighlight); } + +/* + Remove text highlighting. + */ void Fl_Text_Buffer::unhighlight() { Fl_Text_Selection oldSelection = mHighlight; @@ -763,32 +632,28 @@ void Fl_Text_Buffer::unhighlight() redisplay_selection(&oldSelection, &mHighlight); } -void Fl_Text_Buffer::highlight_rectangular(int start, int end, - int rectStart, int rectEnd) -{ - Fl_Text_Selection oldSelection = mHighlight; - mHighlight.set_rectangular(start, end, rectStart, rectEnd); - redisplay_selection(&oldSelection, &mHighlight); -} - +/* + Return position of highlight. + */ int Fl_Text_Buffer::highlight_position(int *start, int *end) { return mHighlight.position(start, end); } -int Fl_Text_Buffer::highlight_position(int *start, int *end, - int *isRect, int *rectStart, - int *rectEnd) -{ - return mHighlight.position(start, end, isRect, rectStart, rectEnd); -} +/* + Return a copy of highlighted text. + */ char *Fl_Text_Buffer::highlight_text() { return selection_text_(&mHighlight); } + +/* + Add a callback that is called whenever text is modified. + */ void Fl_Text_Buffer::add_modify_callback(Fl_Text_Modify_Cb bufModifiedCB, void *cbArg) { @@ -810,8 +675,12 @@ void Fl_Text_Buffer::add_modify_callback(Fl_Text_Modify_Cb bufModifiedCB, mCbArgs = newCBArgs; } -void Fl_Text_Buffer:: -remove_modify_callback(Fl_Text_Modify_Cb bufModifiedCB, void *cbArg) + +/* + Remove a callback. + */ +void Fl_Text_Buffer::remove_modify_callback(Fl_Text_Modify_Cb bufModifiedCB, + void *cbArg) { int i, toRemove = -1; @@ -857,8 +726,12 @@ remove_modify_callback(Fl_Text_Modify_Cb bufModifiedCB, void *cbArg) mCbArgs = newCBArgs; } -void Fl_Text_Buffer:: -add_predelete_callback(Fl_Text_Predelete_Cb bufPreDeleteCB, void *cbArg) + +/* + Add a callback that is called before deleting text. + */ +void Fl_Text_Buffer::add_predelete_callback(Fl_Text_Predelete_Cb bufPreDeleteCB, + void *cbArg) { Fl_Text_Predelete_Cb *newPreDeleteProcs = new Fl_Text_Predelete_Cb[mNPredeleteProcs + 1]; @@ -878,8 +751,11 @@ add_predelete_callback(Fl_Text_Predelete_Cb bufPreDeleteCB, void *cbArg) mPredeleteCbArgs = newCBArgs; } -void Fl_Text_Buffer:: -remove_predelete_callback(Fl_Text_Predelete_Cb bufPreDeleteCB, void *cbArg) + +/* + Remove a callback. + */ +void Fl_Text_Buffer::remove_predelete_callback(Fl_Text_Predelete_Cb bufPreDeleteCB, void *cbArg) { int i, toRemove = -1; /* find the matching callback to remove */ @@ -926,170 +802,116 @@ remove_predelete_callback(Fl_Text_Predelete_Cb bufPreDeleteCB, void *cbArg) mPredeleteCbArgs = newCBArgs; } + +/* + Return a copy of the line that contains a given index. + Pos must be at a character boundary. + */ char *Fl_Text_Buffer::line_text(int pos) const { return text_range(line_start(pos), line_end(pos)); } -int Fl_Text_Buffer::line_start(int pos) const { + +/* + Find the beginning of the line. + */ +int Fl_Text_Buffer::line_start(int pos) const +{ if (!findchar_backward(pos, '\n', &pos)) return 0; return pos + 1; } + +/* + Find the end of the line. + */ int Fl_Text_Buffer::line_end(int pos) const { if (!findchar_forward(pos, '\n', &pos)) pos = mLength; return pos; } + +/* + Find the beginning of a word. + NOT UNICODE SAFE. + */ int Fl_Text_Buffer::word_start(int pos) const { // FIXME: character is ucs-4 - while (pos && (isalnum(character(pos)) || character(pos) == '_')) { - pos--; + while (pos>0 && (isalnum(char_at(pos)) || char_at(pos) == '_')) { + pos = prev_char(pos); } // FIXME: character is ucs-4 - if (!(isalnum(character(pos)) || character(pos) == '_')) - pos++; + if (!(isalnum(char_at(pos)) || char_at(pos) == '_')) + pos = next_char(pos); return pos; } + +/* + Find the end of a word. + NOT UNICODE SAFE. + */ int Fl_Text_Buffer::word_end(int pos) const { // FIXME: character is ucs-4 - while (pos < length() && (isalnum(character(pos)) || character(pos) == '_')) + while (pos < length() && (isalnum(char_at(pos)) || char_at(pos) == '_')) { - pos++; - } return pos; + pos = next_char(pos); + } + return pos; } -// Expand from the byte representation into some readable text. -// Under unicode, this is not really needed because all characters should -// be prinatble one way or the other. But since we use this to (badly) simulate -// tabs, we can leave this here anyway. -// - unicode ok -int Fl_Text_Buffer::expand_character(int pos, int indent, char *outStr) const { - const char *src = address(pos); - return expand_character(src, indent, outStr, mTabDist); -} - - -// static function and counterpart to "character_width" -// - unicode ok -// FIXME: harmonise with new character_width(char*...) version -// -int Fl_Text_Buffer::expand_character(const char *src, int indent, char *outStr, int tabDist) -{ - char c = *src; - /* Convert tabs to spaces */ - if (c == '\t') { - int nSpaces = tabDist - (indent % tabDist); - for (int i = 0; i < nSpaces; i++) - outStr[i] = ' '; - return nSpaces; - } - - /* Convert control codes to readable character sequences */ - if (((unsigned char) c) <= 31) { - sprintf(outStr, "<%s>", ControlCodeTable[(unsigned char) c]); - return strlen(outStr); - } else if (c == 127) { - sprintf(outStr, ""); - return 5; - } else if ((c & 0x80) && !(c & 0x40)) { -#ifdef DEBUG - fprintf(stderr, "%s:%d - Error in UTF-8 encoding!\n", __FILE__, __LINE__); -#endif - *outStr = c; - return 1; - } else if (c & 0x80) { - int i, n = fl_utf8len(c); - for (i=0; i %d (%d, %d, %s)\n", ucs, width, len, ret, src); - return width; - } - if ((c & 0x80) && !(c & 0x40)) { // other byte of UTF-8 sequence - return 0; - } - return character_width(c, indent, tabDist); -} - -// FIXME: merge the following with the char* version above. -// but the question then is: how to reorganise expand_character()? -// -int Fl_Text_Buffer::character_width(const char c, int indent, int tabDist) -{ - /* Note, this code must parallel that in Fl_Text_Buffer::ExpandCharacter */ - if (c == '\t') { - return tabDist - (indent % tabDist); - } else if (((unsigned char) c) <= 31) { - return strlen(ControlCodeTable[(unsigned char) c]) + 2; - } else if (c == 127) { - return 5; - } else if ((c & 0x80) && !(c & 0x40)) { -#ifdef DEBUG - fprintf(stderr, "%s:%d - Error in UTF-8 encoding!\n", __FILE__, __LINE__); -#endif - return 1; - } else if (c & 0x80) { - // return fl_utf8len(c); - return 1; - } - return 1; -} - +/* + Count the number of characters between two positions. + */ int Fl_Text_Buffer::count_displayed_characters(int lineStartPos, int targetPos) const { + IS_UTF8_ALIGNED2(this, (lineStartPos)) + IS_UTF8_ALIGNED2(this, (targetPos)) + int charCount = 0; - char expandedChar[FL_TEXT_MAX_EXP_CHAR_LEN]; int pos = lineStartPos; - while (pos < targetPos) - charCount += expand_character(pos++, charCount, expandedChar); + while (pos < targetPos) { + pos = next_char(pos); + charCount++; + } return charCount; } -// All values are number of bytes. -// - unicode ok +/* + Skip ahead a number of characters from a given index. + This function breaks early if it encounters a newline character. + */ int Fl_Text_Buffer::skip_displayed_characters(int lineStartPos, int nChars) { + IS_UTF8_ALIGNED2(this, (lineStartPos)) + int pos = lineStartPos; - for (int charCount = 0; charCount < nChars && pos < mLength;) { - const char *src = address(pos); - char c = *src; + for (int charCount = 0; charCount < nChars && pos < mLength; charCount++) { + unsigned int c = char_at(pos); if (c == '\n') return pos; - charCount += character_width(src, charCount, mTabDist); - pos += fl_utf8len(c); + pos = next_char(pos); } return pos; } + +/* + Count the number of newline characters between start and end. + startPos and endPos must be at a character boundary. + This function is optimized for speed by not using UTF-8 calls. + */ int Fl_Text_Buffer::count_lines(int startPos, int endPos) const { + IS_UTF8_ALIGNED2(this, (startPos)) + IS_UTF8_ALIGNED2(this, (endPos)) + int gapLen = mGapEnd - mGapStart; int lineCount = 0; @@ -1100,7 +922,8 @@ int Fl_Text_Buffer::count_lines(int startPos, int endPos) const { return lineCount; if (mBuf[pos++] == '\n') lineCount++; - } while (pos < mLength) { + } + while (pos < mLength) { if (pos == endPos) return lineCount; if (mBuf[pos++ + gapLen] == '\n') @@ -1109,8 +932,16 @@ int Fl_Text_Buffer::count_lines(int startPos, int endPos) const { return lineCount; } + +/* + Skip to the first character, n lines ahead. + StartPos must be at a character boundary. + This function is optimized for speed by not using UTF-8 calls. + */ int Fl_Text_Buffer::skip_lines(int startPos, int nLines) { + IS_UTF8_ALIGNED2(this, (startPos)) + if (nLines == 0) return startPos; @@ -1120,22 +951,35 @@ int Fl_Text_Buffer::skip_lines(int startPos, int nLines) while (pos < mGapStart) { if (mBuf[pos++] == '\n') { lineCount++; - if (lineCount == nLines) + if (lineCount == nLines) { + IS_UTF8_ALIGNED2(this, (pos)) return pos; + } } } while (pos < mLength) { if (mBuf[pos++ + gapLen] == '\n') { lineCount++; - if (lineCount >= nLines) + if (lineCount >= nLines) { + IS_UTF8_ALIGNED2(this, (pos)) return pos; + } } } + IS_UTF8_ALIGNED2(this, (pos)) return pos; } + +/* + Skip to the first character, n lines back. + StartPos must be at a character boundary. + This function is optimized for speed by not using UTF-8 calls. + */ int Fl_Text_Buffer::rewind_lines(int startPos, int nLines) { + IS_UTF8_ALIGNED2(this, (startPos)) + int pos = startPos - 1; if (pos <= 0) return 0; @@ -1144,136 +988,144 @@ int Fl_Text_Buffer::rewind_lines(int startPos, int nLines) int lineCount = -1; while (pos >= mGapStart) { if (mBuf[pos + gapLen] == '\n') { - if (++lineCount >= nLines) + if (++lineCount >= nLines) { + IS_UTF8_ALIGNED2(this, (pos+1)) return pos + 1; + } } pos--; } while (pos >= 0) { if (mBuf[pos] == '\n') { - if (++lineCount >= nLines) + if (++lineCount >= nLines) { + IS_UTF8_ALIGNED2(this, (pos+1)) return pos + 1; + } } pos--; } return 0; } + +/* + Find a matching string in the buffer. + */ int Fl_Text_Buffer::search_forward(int startPos, const char *searchString, - int *foundPos, - int matchCase) const + int *foundPos, int matchCase) const { + IS_UTF8_ALIGNED2(this, (startPos)) + IS_UTF8_ALIGNED(searchString) + if (!searchString) return 0; int bp; const char *sp; - while (startPos < length()) { - bp = startPos; - sp = searchString; - do { - if (!*sp) { - *foundPos = startPos; - return 1; + if (matchCase) { + while (startPos < length()) { + bp = startPos; + sp = searchString; + for (;;) { + char c = *sp; + // we reached the end of the "needle", so we found the string! + if (!c) { + *foundPos = startPos; + return 1; + } + int l = fl_utf8len1(c); + if (memcmp(sp, address(bp), l)) + break; + sp += l; bp += l; } - // FIXME: character is ucs-4 - } while ((matchCase ? character(bp++) == *sp++ : - toupper(character(bp++)) == toupper(*sp++)) - && bp < length()); - startPos++; - } + startPos = next_char(startPos); + } + } else { + while (startPos < length()) { + bp = startPos; + sp = searchString; + for (;;) { + // we reached the end of the "needle", so we found the string! + if (!*sp) { + *foundPos = startPos; + return 1; + } + int l; + unsigned int b = char_at(bp); + unsigned int s = fl_utf8decode(sp, 0, &l); + if (fl_tolower(b)!=fl_tolower(s)) + break; + sp += l; + bp = next_char(bp); + } + startPos = next_char(startPos); + } + } return 0; } int Fl_Text_Buffer::search_backward(int startPos, const char *searchString, - int *foundPos, - int matchCase) const { + int *foundPos, int matchCase) const +{ + IS_UTF8_ALIGNED2(this, (startPos)) + IS_UTF8_ALIGNED(searchString) + if (!searchString) return 0; int bp; const char *sp; - while (startPos > 0) - { - bp = startPos - 1; - sp = searchString + strlen(searchString) - 1; - do { - if (sp < searchString) { - *foundPos = bp + 1; - return 1; + if (matchCase) { + while (startPos >= 0) { + bp = startPos; + sp = searchString; + for (;;) { + char c = *sp; + // we reached the end of the "needle", so we found the string! + if (!c) { + *foundPos = startPos; + return 1; + } + int l = fl_utf8len1(c); + if (memcmp(sp, address(bp), l)) + break; + sp += l; bp += l; } - // FIXME: character is ucs-4 - } while ((matchCase ? character(bp--) == *sp-- : - toupper(character(bp--)) == toupper(*sp--)) - && bp >= 0); - startPos--; - } + startPos = prev_char(startPos); + } + } else { + while (startPos >= 0) { + bp = startPos; + sp = searchString; + for (;;) { + // we reached the end of the "needle", so we found the string! + if (!*sp) { + *foundPos = startPos; + return 1; + } + int l; + unsigned int b = char_at(bp); + unsigned int s = fl_utf8decode(sp, 0, &l); + if (fl_tolower(b)!=fl_tolower(s)) + break; + sp += l; + bp = next_char(bp); + } + startPos = prev_char(startPos); + } + } return 0; } -int Fl_Text_Buffer::findchars_forward(int startPos, - const char *searchChars, - int *foundPos) const { - int gapLen = mGapEnd - mGapStart; - const char *c; - - int pos = startPos; - while (pos < mGapStart) - { - for (c = searchChars; *c != '\0'; c++) { - if (mBuf[pos] == *c) { - *foundPos = pos; - return 1; - } - } pos++; - } - while (pos < mLength) { - for (c = searchChars; *c != '\0'; c++) { - if (mBuf[pos + gapLen] == *c) { - *foundPos = pos; - return 1; - } - } - pos++; - } - *foundPos = mLength; - return 0; -} -int Fl_Text_Buffer::findchars_backward(int startPos, - const char *searchChars, - int *foundPos) const { - int gapLen = mGapEnd - mGapStart; - const char *c; - - if (startPos == 0) - { - *foundPos = 0; - return 0; - } - int pos = startPos == 0 ? 0 : startPos - 1; - while (pos >= mGapStart) { - for (c = searchChars; *c != '\0'; c++) { - if (mBuf[pos + gapLen] == *c) { - *foundPos = pos; - return 1; - } - } - pos--; - } - while (pos >= 0) { - for (c = searchChars; *c != '\0'; c++) { - if (mBuf[pos] == *c) { - *foundPos = pos; - return 1; - } - } - pos--; - } - *foundPos = 0; - return 0; -} +/* + Insert a string into the buffer. + Pos must be at a character boundary. Text must be a correct UTF-8 string. + */ int Fl_Text_Buffer::insert_(int pos, const char *text) { + if (!text || !*text) + return 0; + int insertedLength = strlen(text); /* Prepare the buffer to receive the new text. If the new text fits in @@ -1307,6 +1159,11 @@ int Fl_Text_Buffer::insert_(int pos, const char *text) return insertedLength; } + +/* + Remove a string from the buffer. + Unicode safe. Start and end must be at a character boundary. + */ void Fl_Text_Buffer::remove_(int start, int end) { /* if the gap is not contiguous to the area to remove, move it there */ @@ -1354,458 +1211,23 @@ void Fl_Text_Buffer::remove_(int start, int end) update_selections(start, end - start, 0); } -void Fl_Text_Buffer::insert_column_(int column, int startPos, - const char *insText, int *nDeleted, - int *nInserted, int *endPos) -{ - if (column < 0) - column = 0; - /* Allocate a buffer for the replacement string large enough to hold - possibly expanded tabs in both the inserted text and the replaced - area, as well as per line: 1) an additional 2*FL_TEXT_MAX_EXP_CHAR_LEN - characters for padding where tabs and control characters cross the - column of the selection, 2) up to "column" additional spaces per - line for padding out to the position of "column", 3) padding up - to the width of the inserted text if that must be padded to align - the text beyond the inserted column. (Space for additional - newlines if the inserted text extends beyond the end of the buffer - is counted with the length of insText) */ - int start = line_start(startPos); - int nLines = countLines(insText) + 1; - int insWidth = textWidth(insText, mTabDist); // this function probably returns a useless value - int end = line_end(skip_lines(start, nLines - 1)); - int expReplLen, expInsLen, len, endOffset; - const char *replText = text_range(start, end); - char *expText = expandTabs(replText, 0, mTabDist, &expReplLen); - free((void *) replText); - free((void *) expText); - expText = expandTabs(insText, 0, mTabDist, &expInsLen); - free((void *) expText); - char *outStr = (char *) malloc(expReplLen + expInsLen + - nLines * (column + insWidth + - FL_TEXT_MAX_EXP_CHAR_LEN) + 1); - - /* Loop over all lines in the buffer between start and end removing the - text between rectStart and rectEnd and padding appropriately. Trim - trailing space from line (whitespace at the ends of lines otherwise - tends to multiply, since additional padding is added to maintain it */ - char *outPtr = outStr, *insLine; - const char *insPtr = insText, *line; - for (int lineStart = start, lineEnd;;) { - lineEnd = line_end(lineStart); - line = text_range(lineStart, lineEnd); - insLine = copyLine(insPtr, &len); - insPtr += len; - insertColInLine(line, insLine, column, insWidth, mTabDist, - mUseTabs, outPtr, &len, &endOffset); - free((void *) line); - free((void *) insLine); - for (const char *c = outPtr + len - 1; c > outPtr && isspace(*c); c--) - len--; - outPtr += len; - *outPtr++ = '\n'; - lineStart = lineEnd < mLength ? lineEnd + 1 : mLength; - if (*insPtr == '\0') - break; - insPtr++; - } - if (outPtr != outStr) - outPtr--; /* trim back off extra newline */ - *outPtr = '\0'; - - /* replace the text between start and end with the new stuff */ - remove_(start, end); - insert_(start, outStr); - *nInserted = outPtr - outStr; - *nDeleted = end - start; - *endPos = start + (outPtr - outStr) - len + endOffset; - free((void *) outStr); -} - -void Fl_Text_Buffer::remove_rectangular_(int start, int end, int rectStart, - int rectEnd, int *replaceLen, - int *endPos) -{ - /* allocate a buffer for the replacement string large enough to hold - possibly expanded tabs as well as an additional FL_TEXT_MAX_EXP_CHAR_LEN * 2 - characters per line for padding where tabs and control characters cross - the edges of the selection */ - start = line_start(start); - end = line_end(end); - int nLines = count_lines(start, end) + 1; - const char *s = text_range(start, end); - int len; - char *expText = expandTabs(s, 0, mTabDist, &len); - free((void *) s); - free((void *) expText); - char *outStr = - (char *) malloc(len + nLines * FL_TEXT_MAX_EXP_CHAR_LEN * 2 + 1); - - /* loop over all lines in the buffer between start and end removing - the text between rectStart and rectEnd and padding appropriately */ - int endOffset = 0; - char *outPtr = outStr; - const char *line; - for (int lineStart = start, lineEnd; - lineStart <= mLength && lineStart <= end;) { - lineEnd = line_end(lineStart); - line = text_range(lineStart, lineEnd); - deleteRectFromLine(line, rectStart, rectEnd, mTabDist, - mUseTabs, outPtr, &len, &endOffset); - free((void *) line); - outPtr += len; - *outPtr++ = '\n'; - lineStart = lineEnd + 1; - } - if (outPtr != outStr) - outPtr--; /* trim back off extra newline */ - *outPtr = '\0'; - - /* replace the text between start and end with the newly created string */ - remove_(start, end); - insert_(start, outStr); - *replaceLen = outPtr - outStr; - *endPos = start + (outPtr - outStr) - len + endOffset; - free((void *) outStr); -} - -void Fl_Text_Buffer::overlay_rectangular_(int startPos, int rectStart, - int rectEnd, const char *insText, - int *nDeleted, int *nInserted, - int *endPos) -{ - - /* Allocate a buffer for the replacement string large enough to hold - possibly expanded tabs in the inserted text, as well as per line: 1) - an additional 2*FL_TEXT_MAX_EXP_CHAR_LEN characters for padding where tabs - and control characters cross the column of the selection, 2) up to - "column" additional spaces per line for padding out to the position - of "column", 3) padding up to the width of the inserted text if that - must be padded to align the text beyond the inserted column. (Space - for additional newlines if the inserted text extends beyond the end - of the buffer is counted with the length of insText) */ - int start = line_start(startPos); - int nLines = countLines(insText) + 1; - int end = line_end(skip_lines(start, nLines - 1)), expInsLen; - char *expText = expandTabs(insText, 0, mTabDist, &expInsLen); - free((void *) expText); - char *outStr = (char *) malloc(end - start + expInsLen + - nLines * (rectEnd + - FL_TEXT_MAX_EXP_CHAR_LEN) + 1); - - /* Loop over all lines in the buffer between start and end overlaying the - text between rectStart and rectEnd and padding appropriately. Trim - trailing space from line (whitespace at the ends of lines otherwise - tends to multiply, since additional padding is added to maintain it */ - int len, endOffset; - char *outPtr = outStr, *insLine; - const char *insPtr = insText, *line; - for (int lineStart = start, lineEnd;;) { - lineEnd = line_end(lineStart); - line = text_range(lineStart, lineEnd); - insLine = copyLine(insPtr, &len); - insPtr += len; - overlayRectInLine(line, insLine, rectStart, rectEnd, mTabDist, - mUseTabs, outPtr, &len, &endOffset); - free((void *) line); - free((void *) insLine); - for (const char *c = outPtr + len - 1; c > outPtr && isspace(*c); c--) - len--; - outPtr += len; - *outPtr++ = '\n'; - lineStart = lineEnd < mLength ? lineEnd + 1 : mLength; - if (*insPtr == '\0') - break; - insPtr++; - } - if (outPtr != outStr) - outPtr--; /* trim back off extra newline */ - *outPtr = '\0'; - - /* replace the text between start and end with the new stuff */ - remove_(start, end); - insert_(start, outStr); - *nInserted = outPtr - outStr; - *nDeleted = end - start; - *endPos = start + (outPtr - outStr) - len + endOffset; - free((void *) outStr); -} - /* - Inserts characters from single-line string \p insLine in single-line string - \p line at \p column, leaving \p insWidth space before continuing line. - \p outLen returns the number of characters written to \p outStr, \p endOffset - returns the number of characters from the beginning of the string to - the right edge of the inserted text (as a hint for routines which need - to position the cursor). + simple setter. + Unicode safe. Start and end must be at a character boundary. */ -static void insertColInLine(const char *line, char *insLine, int column, - int insWidth, int tabDist, int useTabs, - char *outStr, int *outLen, - int *endOffset) -{ - /* copy the line up to "column" */ - char *outPtr = outStr; - int indent = 0, len; - const char *linePtr; - - for (linePtr = line; *linePtr != '\0'; linePtr++) { - len = Fl_Text_Buffer::character_width(linePtr, indent, tabDist); - if (indent + len > column) - break; - indent += len; - *outPtr++ = *linePtr; - } - - /* If "column" falls in the middle of a character, and the character is a - tab, leave it off and leave the indent short and it will get padded - later. If it's a control character, insert it and adjust indent - accordingly. */ - int postColIndent; - if (indent < column && *linePtr != '\0') { - postColIndent = indent + len; - if (*linePtr == '\t') - linePtr++; - else { - *outPtr++ = *linePtr++; - indent += len; - } - } else - postColIndent = indent; - - /* If there's no text after the column and no text to insert, that's all */ - if (*insLine == '\0' && *linePtr == '\0') { - *outLen = *endOffset = outPtr - outStr; - return; - } - - /* pad out to column if text is too short */ - if (indent < column) { - addPadding(outPtr, indent, column, tabDist, useTabs, &len); - outPtr += len; - indent = column; - } - - /* Copy the text from "insLine" (if any), recalculating the tabs as if - the inserted string began at column 0 to its new column destination */ - if (*insLine != '\0') { - char *retabbedStr = realignTabs(insLine, 0, indent, tabDist, useTabs, - &len); - for (const char *c = retabbedStr; *c != '\0'; c++) { - *outPtr++ = *c; - len = Fl_Text_Buffer::character_width(c, indent, tabDist); - indent += len; - } - free((void *) retabbedStr); - } - - /* If the original line did not extend past "column", that's all */ - if (*linePtr == '\0') { - *outLen = *endOffset = outPtr - outStr; - return; - } - - /* Pad out to column + width of inserted text + (additional original - offset due to non-breaking character at column) */ - int toIndent = column + insWidth + postColIndent - column; - addPadding(outPtr, indent, toIndent, tabDist, useTabs, &len); - outPtr += len; - indent = toIndent; - - /* realign tabs for text beyond "column" and write it out */ - char *retabbedStr = realignTabs(linePtr, postColIndent, indent, tabDist, - useTabs, &len); - strcpy(outPtr, retabbedStr); - free((void *) retabbedStr); - *endOffset = outPtr - outStr; - *outLen = (outPtr - outStr) + len; -} - -/** - Removes characters in single-line string \p line between displayed positions - \p rectStart and \p rectEnd, and write the result to \p outStr, which is - assumed to be large enough to hold the returned string. Note that in - certain cases, it is possible for the string to get longer due to - expansion of tabs. \p endOffset returns the number of characters from - the beginning of the string to the point where the characters were - deleted (as a hint for routines which need to position the cursor). - */ -static void deleteRectFromLine(const char *line, int rectStart, - int rectEnd, int tabDist, int useTabs, - char *outStr, - int *outLen, int *endOffset) -{ - - /* copy the line up to rectStart */ - char *outPtr = outStr; - int indent = 0, len; - const char *c; - for (c = line; *c != '\0'; c++) { - if (indent > rectStart) - break; - len = Fl_Text_Buffer::character_width(c, indent, tabDist); - if (indent + len > rectStart && (indent == rectStart || *c == '\t')) - break; - indent += len; - *outPtr++ = *c; - } - int preRectIndent = indent; - - /* skip the characters between rectStart and rectEnd */ - for (; *c != '\0' && indent < rectEnd; c++) - indent += Fl_Text_Buffer::character_width(c, indent, tabDist); - int postRectIndent = indent; - - /* If the line ended before rectEnd, there's nothing more to do */ - if (*c == '\0') { - *outPtr = '\0'; - *outLen = *endOffset = outPtr - outStr; - return; - } - - /* fill in any space left by removed tabs or control characters - which straddled the boundaries */ - indent = max(rectStart + postRectIndent - rectEnd, preRectIndent); - addPadding(outPtr, preRectIndent, indent, tabDist, useTabs, &len); - outPtr += len; - - /* Copy the rest of the line. If the indentation has changed, preserve - the position of non-whitespace characters by converting tabs to - spaces, then back to tabs with the correct offset */ - char *retabbedStr = - realignTabs(c, postRectIndent, indent, tabDist, useTabs, &len); - strcpy(outPtr, retabbedStr); - free((void *) retabbedStr); - *endOffset = outPtr - outStr; - *outLen = (outPtr - outStr) + len; -} - -/** - Overlay characters from single-line string \p insLine on single-line string - \p line between displayed character offsets \p rectStart and \p rectEnd. - \p outLen returns the number of characters written to \p outStr, \p endOffset - returns the number of characters from the beginning of the string to - the right edge of the inserted text (as a hint for routines which need - to position the cursor). - */ -static void overlayRectInLine(const char *line, char *insLine, - int rectStart, int rectEnd, int tabDist, - int useTabs, char *outStr, - int *outLen, int *endOffset) -{ - /* copy the line up to "rectStart" */ - char *outPtr = outStr; - int inIndent = 0, outIndent = 0, len; - const char *linePtr = line; - - for (; *linePtr != '\0'; linePtr++) { - len = Fl_Text_Buffer::character_width(linePtr, inIndent, tabDist); - if (inIndent + len > rectStart) - break; - inIndent += len; - outIndent += len; - *outPtr++ = *linePtr; - } - - /* If "rectStart" falls in the middle of a character, and the character - is a tab, leave it off and leave the outIndent short and it will get - padded later. If it's a control character, insert it and adjust - outIndent accordingly. */ - if (inIndent < rectStart && *linePtr != '\0') { - if (*linePtr == '\t') { - linePtr++; - inIndent += len; - } else { - *outPtr++ = *linePtr++; - outIndent += len; - inIndent += len; - } - } - - /* skip the characters between rectStart and rectEnd */ - int postRectIndent = rectEnd; - for (; *linePtr != '\0'; linePtr++) { - inIndent += Fl_Text_Buffer::character_width(linePtr, inIndent, tabDist); - if (inIndent >= rectEnd) { - linePtr++; - postRectIndent = inIndent; - break; - } - } - - /* If there's no text after rectStart and no text to insert, that's all */ - if (*insLine == '\0' && *linePtr == '\0') { - *outLen = *endOffset = outPtr - outStr; - return; - } - - /* pad out to rectStart if text is too short */ - if (outIndent < rectStart) { - addPadding(outPtr, outIndent, rectStart, tabDist, useTabs, &len); - outPtr += len; - } - outIndent = rectStart; - - /* Copy the text from "insLine" (if any), recalculating the tabs as if - the inserted string began at column 0 to its new column destination */ - if (*insLine != '\0') { - char *retabbedStr = - realignTabs(insLine, 0, rectStart, tabDist, useTabs, &len); - for (const char *c = retabbedStr; *c != '\0'; c++) { - *outPtr++ = *c; - len = Fl_Text_Buffer::character_width(c, outIndent, tabDist); - outIndent += len; - } - free((void *) retabbedStr); - } - - /* If the original line did not extend past "rectStart", that's all */ - if (*linePtr == '\0') { - *outLen = *endOffset = outPtr - outStr; - return; - } - - /* Pad out to rectEnd + (additional original offset - due to non-breaking character at right boundary) */ - addPadding(outPtr, outIndent, postRectIndent, tabDist, useTabs, &len); - outPtr += len; - outIndent = postRectIndent; - - /* copy the text beyond "rectEnd" */ - strcpy(outPtr, linePtr); - *endOffset = outPtr - outStr; - *outLen = (outPtr - outStr) + strlen(linePtr); -} - - -// simple setter -// Unicode safe void Fl_Text_Selection::set(int startpos, int endpos) { mSelected = startpos != endpos; - mRectangular = 0; mStart = min(startpos, endpos); mEnd = max(startpos, endpos); } -// simple setter -// Unicode safe -void Fl_Text_Selection::set_rectangular(int startpos, int endpos, - int rectStart, int rectEnd) -{ - mSelected = rectStart < rectEnd; - mRectangular = 1; - mStart = startpos; - mEnd = endpos; - mRectStart = rectStart; - mRectEnd = rectEnd; -} - - -// simple getter -// Unicode safe +/* + simple getter. + Unicode safe. Start and end will be at a character boundary. + */ int Fl_Text_Selection::position(int *startpos, int *endpos) const { if (!mSelected) return 0; @@ -1816,83 +1238,65 @@ int Fl_Text_Selection::position(int *startpos, int *endpos) const { } -// simple getter -// Unicode safe -int Fl_Text_Selection::position(int *startpos, int *endpos, - int *isRect, int *rectStart, - int *rectEnd) const { - if (!mSelected) - return 0; - *isRect = mRectangular; - *startpos = mStart; - *endpos = mEnd; - if (mRectangular) - { - *rectStart = mRectStart; - *rectEnd = mRectEnd; - } - return 1; +/* + Return if a position is inside the selected area. + Unicode safe. Pos must be at a character boundary. + */ +int Fl_Text_Selection::includes(int pos) const { + return (selected() && pos >= start() && pos < end() ); } -// unicode safe -int Fl_Text_Selection::includes(int pos, int lineStartPos, int dispIndex) const { - return (selected() - && ( (!rectangular() && pos >= start() && pos < end()) - || (rectangular() && pos >= start() && lineStartPos <= end() - && dispIndex >= rect_start() && dispIndex < rect_end() - ) - ) - ); -} - +/* + Return a duplicate of the selected text, or an empty string. + Unicode safe. + */ char *Fl_Text_Buffer::selection_text_(Fl_Text_Selection * sel) const { - int start, end, isRect, rectStart, rectEnd; + int start, end; /* If there's no selection, return an allocated empty string */ - if (!sel->position(&start, &end, &isRect, &rectStart, &rectEnd)) + if (!sel->position(&start, &end)) { char *s = (char *) malloc(1); *s = '\0'; return s; } - /* If the selection is not rectangular, return the selected range */ - if (isRect) - return text_in_rectangle(start, end, rectStart, rectEnd); - else + /* Return the selected range */ return text_range(start, end); } + +/* + Remove the selected text. + Unicode safe. + */ void Fl_Text_Buffer::remove_selection_(Fl_Text_Selection * sel) { - int start, end, isRect, rectStart, rectEnd; + int start, end; - if (!sel->position(&start, &end, &isRect, &rectStart, &rectEnd)) + if (!sel->position(&start, &end)) return; - if (isRect) - remove_rectangular(start, end, rectStart, rectEnd); - else { - remove(start, end); - //undoyankcut = undocut; - } + remove(start, end); + //undoyankcut = undocut; } +/* + Replace selection with text. + Unicode safe. + */ void Fl_Text_Buffer::replace_selection_(Fl_Text_Selection * sel, const char *text) { Fl_Text_Selection oldSelection = *sel; /* If there's no selection, return */ - int start, end, isRect, rectStart, rectEnd; - if (!sel->position(&start, &end, &isRect, &rectStart, &rectEnd)) + int start, end; + if (!sel->position(&start, &end)) return; /* Do the appropriate type of replace */ - if (isRect) - replace_rectangular(start, end, rectStart, rectEnd, text); - else replace(start, end, text); /* Unselect (happens automatically in BufReplace, but BufReplaceRect @@ -1901,43 +1305,36 @@ void Fl_Text_Buffer::replace_selection_(Fl_Text_Selection * sel, redisplay_selection(&oldSelection, sel); } -static void addPadding(char *string, int startIndent, int toIndent, - int tabDist, int useTabs, int *charsAdded) -{ - int indent = startIndent, len; - char *outPtr = string; - if (useTabs) { - while (indent < toIndent) { - //static char t = '\t'; - len = Fl_Text_Buffer::character_width("\t", indent, tabDist); - if (len > 1 && indent + len <= toIndent) { - *outPtr++ = '\t'; - indent += len; - } else { - *outPtr++ = ' '; - indent++; - } - } - } else { - while (indent < toIndent) { - *outPtr++ = ' '; - indent++; - } - } - *charsAdded = outPtr - string; -} - +/* + Call all callbacks. + Unicode safe. + */ void Fl_Text_Buffer::call_modify_callbacks(int pos, int nDeleted, int nInserted, int nRestyled, const char *deletedText) const { + IS_UTF8_ALIGNED2(this, pos) for (int i = 0; i < mNModifyProcs; i++) (*mModifyProcs[i]) (pos, nInserted, nDeleted, nRestyled, deletedText, mCbArgs[i]); -} void Fl_Text_Buffer::call_predelete_callbacks(int pos, int nDeleted) const { +} + + +/* + Call all callbacks. + Unicode safe. + */ +void Fl_Text_Buffer::call_predelete_callbacks(int pos, int nDeleted) const { for (int i = 0; i < mNPredeleteProcs; i++) (*mPredeleteProcs[i]) (pos, nDeleted, mPredeleteCbArgs[i]); -} void Fl_Text_Buffer::redisplay_selection(Fl_Text_Selection * +} + + +/* + Redisplay a new selected area. + Unicode safe. + */ +void Fl_Text_Buffer::redisplay_selection(Fl_Text_Selection * oldSelection, Fl_Text_Selection * newSelection) const @@ -1952,10 +1349,6 @@ void Fl_Text_Buffer::call_modify_callbacks(int pos, int nDeleted, newStart = newSelection->mStart; oldEnd = oldSelection->mEnd; newEnd = newSelection->mEnd; - if (oldSelection->mRectangular) - oldEnd++; - if (newSelection->mRectangular) - newEnd++; /* If the old or new selection is unselected, just redisplay the single area that is (was) selected and return */ @@ -1971,20 +1364,6 @@ void Fl_Text_Buffer::call_modify_callbacks(int pos, int nDeleted, return; } - /* If the selection changed from normal to rectangular or visa versa, or - if a rectangular selection changed boundaries, redisplay everything */ - if ((oldSelection->mRectangular && !newSelection->mRectangular) || - (!oldSelection->mRectangular && newSelection->mRectangular) || - (oldSelection->mRectangular && ((oldSelection->mRectStart != - newSelection->mRectStart) - || (oldSelection->mRectEnd != - newSelection->mRectEnd)))) { - call_modify_callbacks(min(oldStart, newStart), 0, 0, - max(oldEnd, newEnd) - min(oldStart, - newStart), NULL); - return; - } - /* If the selections are non-contiguous, do two separate updates and return */ if (oldEnd < newStart || newEnd < oldStart) { @@ -2006,6 +1385,11 @@ void Fl_Text_Buffer::call_modify_callbacks(int pos, int nDeleted, call_modify_callbacks(ch2Start, 0, 0, ch2End - ch2Start, NULL); } + +/* + Move the gap around without changing buffer content. + Unicode safe. Pos must be at a character boundary. + */ void Fl_Text_Buffer::move_gap(int pos) { int gapLen = mGapEnd - mGapStart; @@ -2018,6 +1402,11 @@ void Fl_Text_Buffer::move_gap(int pos) mGapStart += pos - mGapStart; } + +/* + Create a larger gap. + Unicode safe. Start must be at a character boundary. + */ void Fl_Text_Buffer::reallocate_with_gap(int newGapStart, int newGapLen) { char *newBuf = (char *) malloc(mLength + newGapLen); @@ -2040,15 +1429,13 @@ void Fl_Text_Buffer::reallocate_with_gap(int newGapStart, int newGapLen) mBuf = newBuf; mGapStart = newGapStart; mGapEnd = newGapEnd; -#ifdef PURIFY - { - int i; - for (i = mGapStart; i < mGapEnd; i++) - mBuf[i] = '.'; } -#endif -} + +/* + Update selection range if characters were inserted. + Unicode safe. Pos must be at a character boundary. + */ void Fl_Text_Buffer::update_selections(int pos, int nDeleted, int nInserted) { @@ -2080,305 +1467,240 @@ void Fl_Text_Selection::update(int pos, int nDeleted, int nInserted) } } -int Fl_Text_Buffer::findchar_forward(int startPos, char searchChar, - int *foundPos) const { - if (startPos < 0 || startPos >= mLength) - { + +/* + Find a UCS-4 character. + StartPos must be at a character boundary, searchChar is UCS-4 encoded. + */ +int Fl_Text_Buffer::findchar_forward(int startPos, unsigned searchChar, + int *foundPos) const +{ + if (startPos >= mLength) { *foundPos = mLength; return 0; } - int pos = startPos; - while (pos < mGapStart) { - if (mBuf[pos] == searchChar) { - *foundPos = pos; + if (startPos<0) + startPos = 0; + + for ( ; startPos mLength) - { +/* + Find a UCS-4 character. + StartPos must be at a character boundary, searchChar is UCS-4 encoded. + */ +int Fl_Text_Buffer::findchar_backward(int startPos, unsigned int searchChar, + int *foundPos) const { + if (startPos <= 0) { *foundPos = 0; return 0; } - int pos = startPos - 1; - for (int gapLen = mGapEnd - mGapStart; pos >= mGapStart; pos--) { - if (mBuf[pos + gapLen] == searchChar) { - *foundPos = pos; + if (startPos > mLength) + startPos = mLength; + + for (startPos = prev_char(startPos); startPos>=0; startPos = prev_char(startPos)) { + if (searchChar == char_at(startPos)) { + *foundPos = startPos; return 1; } } - for (; pos >= 0; pos--) { - if (mBuf[pos] == searchChar) { - *foundPos = pos; - return 1; - } - } *foundPos = 0; return 0; } -/* - Copies from \p text to end up to but not including newline (or end of \p text) - and return the copy as the function value, and the length of the line in - \p lineLen - */ -static char *copyLine(const char *text, int *lineLen) +//#define EXAMPLE_ENCODING // shows how to process any encoding for which a decoding function exists +#ifdef EXAMPLE_ENCODING + +// returns the UCS equivalent of *p in CP1252 and advances p by 1 +unsigned cp1252toucs(char* &p) { - int len = 0; - - for (const char *c = text; *c != '\0' && *c != '\n'; c++) - len++; - char *outStr = (char *) malloc(len + 1); - strlcpy(outStr, text, len + 1); - *lineLen = len; - return outStr; + // Codes 0x80..0x9f from the Microsoft CP1252 character set, translated + // to Unicode + static unsigned cp1252[32] = { + 0x20ac, 0x0081, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021, + 0x02c6, 0x2030, 0x0160, 0x2039, 0x0152, 0x008d, 0x017d, 0x008f, + 0x0090, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, + 0x02dc, 0x2122, 0x0161, 0x203a, 0x0153, 0x009d, 0x017e, 0x0178 + }; + unsigned char uc = *(unsigned char*)p; + p++; + return (uc < 0x80 || uc >= 0xa0 ? uc : cp1252[uc - 0x80]); } -/* - Counts the number of newlines in a null-terminated text string. - Unicode tested. - */ -static int countLines(const char *string) +// returns the UCS equivalent of *p in UTF-16 and advances p by 2 (or more for surrogates) +unsigned utf16toucs(char* &p) { - int lineCount = 0; - - for (const char *c = string; *c != '\0'; c++) - if (*c == '\n') - lineCount++; - return lineCount; + union { +#if WORDS_BIGENDIAN + struct { unsigned char a, b;} chars; +#else + struct { unsigned char b, a;} chars; +#endif + U16 short_val; + } u; + u.chars.a = *(unsigned char*)p++; + u.chars.b = *(unsigned char*)p++; + return u.short_val; } -/* - Measures the width in displayed characters of string \p text - */ -static int textWidth(const char *text, int tabDist) +// filter that produces, from an input stream fed by reading from fp, +// a UTF-8-encoded output stream written in buffer. +// Input can be any (e.g., 8-bit, UTF-16) encoding. +// Output is true UTF-8. +// p_trf points to a function that transforms encoded byte(s) into one UCS +// and that increases the pointer by the adequate quantity +static int general_input_filter(char *buffer, int buflen, + char *line, int sline, char* &endline, + unsigned (*p_trf)(char* &), + FILE *fp) { - int width = 0, maxWidth = 0; - - // HUH? Why is "c" incremented? Shouldn't "text" be incrmented? - // FIXME: increment is wrong! - for (const char *c = text; *c != '\0'; c++) { - if (*c == '\n') { - if (width > maxWidth) - maxWidth = width; - width = 0; - } else - width += Fl_Text_Buffer::character_width(c, width, tabDist); + char *p, *q, multibyte[5]; + int lq, r, offset; + p = endline = line; + q = buffer; + while (q < buffer + buflen) { + if (p >= endline) { + r = fread(line, 1, sline, fp); + endline = line + r; + if (r == 0) return q - buffer; + p = line; + } + if (q + 4 /*max width of utf-8 char*/ > buffer + buflen) { + memmove(line, p, endline - p); + endline -= (p - line); + return q - buffer; + } + lq = fl_utf8encode( p_trf(p), multibyte ); + memcpy(q, multibyte, lq); + q += lq; } - if (width > maxWidth) - return width; - return maxWidth; + memmove(line, p, endline - p); + endline -= (p - line); + return q - buffer; } +#endif // EXAMPLE_ENCODING -void Fl_Text_Buffer::rectangular_selection_boundaries(int lineStartPos, - int rectStart, - int rectEnd, - int *selStart, - int *selEnd) const +/* + filter that produces, from an input stream fed by reading from fp, + a UTF-8-encoded output stream written in buffer. + Input can be UTF-8. If it is not, it is decoded with CP1252. + Output is UTF-8. + *input_was_changed is set to true if the input was not strict UTF-8 so output + differs from input. + */ +static int utf8_input_filter(char *buffer, int buflen, char *line, int sline, char* &endline, + FILE *fp, int *input_was_changed) { - int pos, width, indent = 0; - char c; - - /* find the start of the selection */ - for (pos = lineStartPos; pos < mLength; pos++) - { - // FIXME: character is ucs-4 - c = character(pos); - if (c == '\n') - break; - width = - Fl_Text_Buffer::character_width(&c, indent, mTabDist); // FIXME: c is not unicode - if (indent + width > rectStart) { - if (indent != rectStart && c != '\t') { - pos++; - indent += width; + char *p, *q, multibyte[5]; + int l, lp, lq, r; + unsigned u; + p = endline = line; + q = buffer; + while (q < buffer + buflen) { + if (p >= endline) { + r = fread(line, 1, sline, fp); + endline = line + r; + if (r == 0) return q - buffer; + p = line; + } + l = fl_utf8len1(*p); + if (p + l > endline) { + memmove(line, p, endline - p); + endline -= (p - line); + r = fread(endline, 1, sline - (endline - line), fp); + endline += r; + p = line; + if (endline - line < l) break; + } + while ( l > 0) { + u = fl_utf8decode(p, p+l, &lp); + lq = fl_utf8encode(u, multibyte); + if (lp != l || lq != l) *input_was_changed = true; + if (q + lq > buffer + buflen) { + memmove(line, p, endline - p); + endline -= (p - line); + return q - buffer; } - break; - } - indent += width; - } - *selStart = pos; - - /* find the end */ - for (; pos < mLength; pos++) { - // FIXME: character is ucs-4 - c = character(pos); - if (c == '\n') - break; - width = - Fl_Text_Buffer::character_width(&c, indent, mTabDist); // FIXME: c is not unicode - indent += width; - if (indent > rectEnd) { - if (indent - width != rectEnd && c != '\t') - pos++; - break; + memcpy(q, multibyte, lq); + q += lq; + p += lp; + l -= lp; } } - *selEnd = pos; + memmove(line, p, endline - p); + endline -= (p - line); + return q - buffer; } +const char *Fl_Text_Buffer::file_encoding_warning_message = +"Displayed text contains the UTF-8 transcoding\n" +"of the input file which was not UTF-8 encoded.\n" +"Some changes may have occurred."; + /* - Adjust the space and tab characters from string \p text so that non-white - characters remain stationary when the text is shifted from starting at - \p origIndent to starting at \p newIndent. Returns an allocated string - which must be freed by the caller with XtFree. + Insert text from a file. + Input file can be of various encodings according to what input fiter is used. + utf8_input_filter accepts UTF-8 or CP1252 as input encoding. + Output is always UTF-8. */ -static char *realignTabs(const char *text, int origIndent, int newIndent, - int tabDist, int useTabs, int *newLength) -{ - /* If the tabs settings are the same, retain original tabs */ - int len; - char *outStr; - if (origIndent % tabDist == newIndent % tabDist) { - len = strlen(text); - outStr = (char *) malloc(len + 1); - strcpy(outStr, text); - *newLength = len; - return outStr; - } - - /* If the tab settings are not the same, brutally convert tabs to - spaces, then back to tabs in the new position */ - char *expStr = expandTabs(text, origIndent, tabDist, &len); - if (!useTabs) { - *newLength = len; - return expStr; - } - outStr = - unexpandTabs(expStr, newIndent, tabDist, newLength); - free((void *) expStr); - return outStr; -} - -/* - Expand tabs to spaces for a block of text. The additional parameter - \p startIndent if nonzero, indicates that the text is a rectangular selection - beginning at column \p startIndent - */ -static char *expandTabs(const char *text, int startIndent, int tabDist, int *newLen) -{ - /* rehearse the expansion to figure out length for output string */ - int indent = startIndent, len, outLen = 0; - const char *c; - for (c = text; *c != '\0'; c++) { - if (*c == '\t') { - len = - Fl_Text_Buffer::character_width(c, indent, tabDist); - outLen += len; - indent += len; - } else if (*c == '\n') { - indent = startIndent; - outLen++; - } else { - // FIXME: character_width does not return number of bytes for UTF-8! - indent += - Fl_Text_Buffer::character_width(c, indent, tabDist); - outLen++; - } - } - - /* do the expansion */ - char *outStr = (char *) malloc(outLen + 1); - char *outPtr = outStr; - indent = startIndent; - for (c = text; *c != '\0'; c++) { - if (*c == '\t') { - len = - Fl_Text_Buffer::expand_character(c, indent, outPtr, tabDist); - outPtr += len; - indent += len; - } else if (*c == '\n') { - indent = startIndent; - *outPtr++ = *c; - } else { - // FIXME: character_width does not return number of bytes for UTF-8! - indent += - Fl_Text_Buffer::character_width(c, indent, tabDist); - *outPtr++ = *c; - } - } - outStr[outLen] = '\0'; - *newLen = outLen; - return outStr; -} - -/* - Convert sequences of spaces into tabs. The threshold for conversion is - when 3 or more spaces can be converted into a single tab, this avoids - converting double spaces after a period withing a block of text. - */ -static char *unexpandTabs(char *text, int startIndent, int tabDist, int *newLen) -{ - char expandedChar[FL_TEXT_MAX_EXP_CHAR_LEN]; - char *outStr = (char *) malloc(strlen(text) + 1); - char *outPtr = outStr; - int indent = startIndent, len; - - for (const char *c = text; *c != '\0';) { - if (*c == ' ') { - static char tab = '\t'; - len = - Fl_Text_Buffer::expand_character(&tab, indent, expandedChar, tabDist); - if (len >= 3 && !strncmp(c, expandedChar, len)) { - c += len; - *outPtr++ = '\t'; - indent += len; - } else { - *outPtr++ = *c++; - indent++; - } - } else if (*c == '\n') { - indent = startIndent; - *outPtr++ = *c++; - } else { - *outPtr++ = *c++; - indent++; - } - } - *outPtr = '\0'; - *newLen = outPtr - outStr; - return outStr; -} - -int Fl_Text_Buffer::insertfile(const char *file, int pos, int buflen) + int Fl_Text_Buffer::insertfile(const char *file, int pos, int buflen) { FILE *fp; if (!(fp = fl_fopen(file, "r"))) return 1; - char *buffer = new char[buflen]; - for (int r; (r = fread(buffer, 1, buflen - 1, fp)) > 0; pos += r) { - buffer[r] = (char) 0; + char *buffer = new char[buflen + 1]; + char *endline, line[100]; + int l; + input_file_was_transcoded = false; + endline = line; + while (true) { +#ifdef EXAMPLE_ENCODING + // example of 16-bit encoding: UTF-16 + l = general_input_filter(buffer, buflen, + line, sizeof(line), endline, + utf16toucs, // use cp1252toucs to read CP1252-encoded files + fp); + input_file_was_transcoded = true; +#else + l = utf8_input_filter(buffer, buflen, line, sizeof(line), endline, + fp, &input_file_was_transcoded); +#endif + if (l == 0) break; + buffer[l] = 0; insert(pos, buffer); - } - + pos += l; + } int e = ferror(fp) ? 2 : 0; fclose(fp); delete[]buffer; + if ( (!e) && input_file_was_transcoded && transcoding_warning_action) { + transcoding_warning_action(this); + } return e; } -int Fl_Text_Buffer::outputfile(const char *file, int start, int end, - int buflen) -{ + +/* + Write text to file. + Unicode safe. + */ +int Fl_Text_Buffer::outputfile(const char *file, + int start, int end, + int buflen) { FILE *fp; - if (!(fp = fl_fopen(file, "wb"))) + if (!(fp = fl_fopen(file, "w"))) return 1; for (int n; (n = min(end - start, buflen)); start += n) { const char *p = text_range(start, start + n); @@ -2394,6 +1716,79 @@ int Fl_Text_Buffer::outputfile(const char *file, int start, int end, } +/* + Return the previous character position. + Unicode safe. + */ +int Fl_Text_Buffer::prev_char_clipped(int pos) const +{ + if (pos<=0) + return 0; + + IS_UTF8_ALIGNED2(this, (pos)) + + char c; + do { + pos--; + if (pos==0) + return 0; + c = byte_at(pos); + } while ( (c&0xc0) == 0x80); + + IS_UTF8_ALIGNED2(this, (pos)) + return pos; +} + + +/* + Return the previous character position. + Returns -1 if the beginning of the buffer is reached. + */ +int Fl_Text_Buffer::prev_char(int pos) const +{ + if (pos==0) return -1; + return prev_char_clipped(pos); +} + + +/* + Return the next character position. + Returns length() if the end of the buffer is reached. + */ +int Fl_Text_Buffer::next_char(int pos) const +{ + IS_UTF8_ALIGNED2(this, (pos)) + int n = fl_utf8len1(byte_at(pos)); + pos += n; + if (pos>=mLength) + return mLength; + IS_UTF8_ALIGNED2(this, (pos)) + return pos; +} + + +/* + Return the next character position. + If the end of the buffer is reached, it returns the current position. + */ +int Fl_Text_Buffer::next_char_clipped(int pos) const +{ + return next_char(pos); +} + +/* + Align an index to the current UTF-8 boundary. + */ +int Fl_Text_Buffer::utf8_align(int pos) const +{ + char c = byte_at(pos); + while ( (c&0xc0) == 0x80) { + pos--; + c = byte_at(pos); + } + return pos; +} + // -// End of "$Id: Fl_Text_Buffer.cxx 7672 2010-07-10 09:44:45Z matt $". +// End of "$Id: Fl_Text_Buffer.cxx 8040 2010-12-15 17:38:39Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Text_Display.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Text_Display.cxx index c6b5a8195..e6a5b10ce 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Text_Display.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Text_Display.cxx @@ -1,7 +1,7 @@ // -// "$Id: Fl_Text_Display.cxx 7527 2010-04-18 14:33:33Z engelsman $" +// "$Id: Fl_Text_Display.cxx 8659 2011-05-13 07:58:26Z matt $" // -// Copyright 2001-2009 by Bill Spitzak and others. +// Copyright 2001-2010 by Bill Spitzak and others. // Original code Copyright Mark Edel. Permission to distribute under // the LGPL for the FLTK library granted by Mark Edel. // @@ -25,6 +25,9 @@ // http://www.fltk.org/str.php // +// TODO: rendering of the "optional hyphen" +// TODO: make line numbering work again + #include #include #include @@ -35,6 +38,7 @@ #include #include #include +#include #undef min #undef max @@ -49,7 +53,7 @@ #define NO_HINT -1 /* Masks for text drawing methods. These are or'd together to form an - integer which describes what drawing calls to use to draw a string */ + integer which describes what drawing calls to use to draw a string */ #define FILL_MASK 0x0100 #define SECONDARY_MASK 0x0200 #define PRIMARY_MASK 0x0400 @@ -59,8 +63,8 @@ #define STYLE_LOOKUP_MASK 0xff /* Maximum displayable line length (how many characters will fit across the - widest window). This amount of memory is temporarily allocated from the - stack in the draw_vline() method for drawing strings */ + widest window). This amount of memory is temporarily allocated from the + stack in the draw_vline() method for drawing strings */ #define MAX_DISP_LINE_LEN 1000 static int max( int i1, int i2 ); @@ -68,7 +72,7 @@ static int min( int i1, int i2 ); static int countlines( const char *string ); /* The variables below are used in a timer event to allow smooth - scrolling of the text area when the pointer has left the area. */ + scrolling of the text area when the pointer has left the area. */ static int scroll_direction = 0; static int scroll_amount = 0; static int scroll_y = 0; @@ -77,47 +81,55 @@ static int scroll_x = 0; // CET - FIXME #define TMPFONTWIDTH 6 -/** Creates a new text display widget.*/ -Fl_Text_Display::Fl_Text_Display(int X, int Y, int W, int H, const char* l) - : Fl_Group(X, Y, W, H, l) { - int i; + +/** + \brief Creates a new text display widget. + + \param X, Y, W, H position and size of widget + \param l label text, defaults to none + */ +Fl_Text_Display::Fl_Text_Display(int X, int Y, int W, int H, const char* l) +: Fl_Group(X, Y, W, H, l) { + int i; + mMaxsize = 0; damage_range1_start = damage_range1_end = -1; damage_range2_start = damage_range2_end = -1; - dragPos = dragType = dragging = 0; + dragPos = dragging = 0; + dragType = DRAG_CHAR; display_insert_position_hint = 0; shortcut_ = 0; - + color(FL_BACKGROUND2_COLOR, FL_SELECTION_COLOR); box(FL_DOWN_FRAME); textsize(FL_NORMAL_SIZE); textcolor(FL_FOREGROUND_COLOR); textfont(FL_HELVETICA); set_flag(SHORTCUT_LABEL); - + text_area.x = 0; text_area.y = 0; text_area.w = 0; text_area.h = 0; - + mVScrollBar = new Fl_Scrollbar(0,0,1,1); mVScrollBar->callback((Fl_Callback*)v_scrollbar_cb, this); mHScrollBar = new Fl_Scrollbar(0,0,1,1); mHScrollBar->callback((Fl_Callback*)h_scrollbar_cb, this); mHScrollBar->type(FL_HORIZONTAL); - + end(); - + scrollbar_width(Fl::scrollbar_size()); scrollbar_align(FL_ALIGN_BOTTOM_RIGHT); - + mCursorOn = 0; mCursorPos = 0; mCursorOldY = -100; mCursorToHint = NO_HINT; mCursorStyle = NORMAL_CURSOR; - mCursorPreferredCol = -1; + mCursorPreferredXPos = -1; mBuffer = 0; mFirstChar = 0; mLastChar = 0; @@ -126,10 +138,9 @@ Fl_Text_Display::Fl_Text_Display(int X, int Y, int W, int H, const char* l) mAbsTopLineNum = 1; mNeedAbsTopLineNum = 0; mHorizOffset = mHorizOffsetHint = 0; - + mCursor_color = FL_FOREGROUND_COLOR; - - mFixedFontWidth = -1; + mStyleBuffer = 0; mStyleTable = 0; mNStyles = 0; @@ -141,21 +152,25 @@ Fl_Text_Display::Fl_Text_Display(int X, int Y, int W, int H, const char* l) mSuppressResync = 0; mNLinesDeleted = 0; mModifyingTabDistance = 0; - + mUnfinishedStyle = 0; mUnfinishedHighlightCB = 0; mHighlightCBArg = 0; - + mLineNumLeft = mLineNumWidth = 0; mContinuousWrap = 0; - mWrapMargin = 0; + mWrapMarginPix = 0; mSuppressResync = mNLinesDeleted = mModifyingTabDistance = 0; } -/** Free a text display and release its associated memory. Note, the text - BUFFER that the text display displays is a separate entity and is not - freed, nor are the style buffer or style table. -*/ + + +/** + Free a text display and release its associated memory. + + Note, the text BUFFER that the text display displays is a separate + entity and is not freed, nor are the style buffer or style table. + */ Fl_Text_Display::~Fl_Text_Display() { if (scroll_direction) { Fl::remove_timeout(scroll_timer_cb, this); @@ -168,64 +183,93 @@ Fl_Text_Display::~Fl_Text_Display() { if (mLineStarts) delete[] mLineStarts; } + + /** - Attach a text buffer to display, replacing the current buffer (if any) -*/ + Attach a text buffer to display, replacing the current buffer (if any) + \param buf attach this text buffer + */ void Fl_Text_Display::buffer( Fl_Text_Buffer *buf ) { /* If the text display is already displaying a buffer, clear it off - of the display and remove our callback from it */ + of the display and remove our callback from it */ if ( buf == mBuffer) return; if ( mBuffer != 0 ) { - buffer_modified_cb( 0, 0, mBuffer->length(), 0, 0, this ); - mNBufferLines = 0; + // we must provide a copy of the buffer that we are deleting! + char *deletedText = mBuffer->text(); + buffer_modified_cb( 0, 0, mBuffer->length(), 0, deletedText, this ); + free(deletedText); + mNBufferLines = 0; mBuffer->remove_modify_callback( buffer_modified_cb, this ); mBuffer->remove_predelete_callback( buffer_predelete_cb, this ); } - + /* Add the buffer to the display, and attach a callback to the buffer for - receiving modification information when the buffer contents change */ + receiving modification information when the buffer contents change */ mBuffer = buf; if (mBuffer) { mBuffer->add_modify_callback( buffer_modified_cb, this ); mBuffer->add_predelete_callback( buffer_predelete_cb, this ); - + /* Update the display */ buffer_modified_cb( 0, buf->length(), 0, 0, 0, this ); } - + /* Resize the widget to update the screen... */ resize(x(), y(), w(), h()); } -/** - Attach (or remove) highlight information in text display and redisplay. - Highlighting information consists of a style buffer which parallels the - normal text buffer, but codes font and color information for the display; - a style table which translates style buffer codes (indexed by buffer - character - 'A') into fonts and colors; and a callback mechanism for - as-needed highlighting, triggered by a style buffer entry of - "unfinishedStyle". Style buffer can trigger additional redisplay during - a normal buffer modification if the buffer contains a primary Fl_Text_Selection - (see extendRangeForStyleMods for more information on this protocol). - Style buffers, tables and their associated memory are managed by the caller. -*/ + +/** + \brief Attach (or remove) highlight information in text display and redisplay. + + Highlighting information consists of a style buffer which parallels the + normal text buffer, but codes font and color information for the display; + a style table which translates style buffer codes (indexed by buffer + character - 'A') into fonts and colors; and a callback mechanism for + as-needed highlighting, triggered by a style buffer entry of + "unfinishedStyle". Style buffer can trigger additional redisplay during + a normal buffer modification if the buffer contains a primary Fl_Text_Selection + (see extendRangeForStyleMods for more information on this protocol). + + Style buffers, tables and their associated memory are managed by the caller. + + Styles are ranged from 65 ('A') to 126. + + \param styleBuffer this buffer works in parallel to the text buffer. For every + character in the text buffer, the stye buffer has a byte at the same offset + that contains an index into an array of possible styles. + \param styleTable a list of styles indexed by the style buffer + \param nStyles number of styles in the style table + \param unfinishedStyle if this style is found, the callback below is called + \param unfinishedHighlightCB if a character with an unfinished style is found, + this callback will be called + \param cbArg and optional argument for the callback above, usually a pointer + to the Text Display. + */ void Fl_Text_Display::highlight_data(Fl_Text_Buffer *styleBuffer, - const Style_Table_Entry *styleTable, - int nStyles, char unfinishedStyle, - Unfinished_Style_Cb unfinishedHighlightCB, - void *cbArg ) { + const Style_Table_Entry *styleTable, + int nStyles, char unfinishedStyle, + Unfinished_Style_Cb unfinishedHighlightCB, + void *cbArg ) { mStyleBuffer = styleBuffer; mStyleTable = styleTable; mNStyles = nStyles; mUnfinishedStyle = unfinishedStyle; mUnfinishedHighlightCB = unfinishedHighlightCB; mHighlightCBArg = cbArg; - + mColumnScale = 0; + mStyleBuffer->canUndo(0); damage(FL_DAMAGE_EXPOSE); } + + +/** + \brief Find the longest line of all visible lines. + \return the width of the longest visible line in pixels + */ int Fl_Text_Display::longest_vline() const { int longest = 0; for (int i = 0; i < mNVisibleLines; i++) @@ -233,17 +277,21 @@ int Fl_Text_Display::longest_vline() const { return longest; } + + /** - Change the size of the displayed text area -*/ + \brief Change the size of the displayed text area. + Calling this function will trigger a recalculation of all lines visible and + of all scrollbar sizes. + \param X, Y, W, H new position and size of this widget + */ void Fl_Text_Display::resize(int X, int Y, int W, int H) { #ifdef DEBUG printf("Fl_Text_Display::resize(X=%d, Y=%d, W=%d, H=%d)\n", X, Y, W, H); #endif // DEBUG const int oldWidth = w(); #ifdef DEBUG - printf(" oldWidth=%d, mContinuousWrap=%d, mWrapMargin=%d\n", oldWidth, - mContinuousWrap, mWrapMargin); + printf(" oldWidth=%d, mContinuousWrap=%d, mWrapMargin=%d\n", oldWidth, mContinuousWrap, mWrapMargin); #endif // DEBUG Fl_Widget::resize(X,Y,W,H); if (!buffer()) return; @@ -251,44 +299,43 @@ void Fl_Text_Display::resize(int X, int Y, int W, int H) { Y += Fl::box_dy(box()); W -= Fl::box_dw(box()); H -= Fl::box_dh(box()); - + text_area.x = X+LEFT_MARGIN; text_area.y = Y+TOP_MARGIN; text_area.w = W-LEFT_MARGIN-RIGHT_MARGIN; text_area.h = H-TOP_MARGIN-BOTTOM_MARGIN; int i; - + /* Find the new maximum font height for this text display */ for (i = 0, mMaxsize = fl_height(textfont(), textsize()); i < mNStyles; i++) mMaxsize = max(mMaxsize, fl_height(mStyleTable[i].font, mStyleTable[i].size)); - + // did we have scrollbars initially? unsigned int hscrollbarvisible = mHScrollBar->visible(); unsigned int vscrollbarvisible = mVScrollBar->visible(); - + // try without scrollbars first mVScrollBar->clear_visible(); mHScrollBar->clear_visible(); - + for (int again = 1; again;) { - again = 0; + again = 0; /* In continuous wrap mode, a change in width affects the total number of - lines in the buffer, and can leave the top line number incorrect, and - the top character no longer pointing at a valid line start */ - if (mContinuousWrap && !mWrapMargin && W!=oldWidth) { + lines in the buffer, and can leave the top line number incorrect, and + the top character no longer pointing at a valid line start */ + if (mContinuousWrap && !mWrapMarginPix && W!=oldWidth) { int oldFirstChar = mFirstChar; mNBufferLines = count_lines(0, buffer()->length(), true); mFirstChar = line_start(mFirstChar); mTopLineNum = count_lines(0, mFirstChar, true)+1; - absolute_top_line_number(oldFirstChar); - + absolute_top_line_number(oldFirstChar); #ifdef DEBUG printf(" mNBufferLines=%d\n", mNBufferLines); #endif // DEBUG } - + /* reallocate and update the line starts array, which may have changed - size and / or contents. */ + size and / or contents. */ int nvlines = (text_area.h + mMaxsize - 1) / mMaxsize; if (nvlines < 1) nvlines = 1; if (mNVisibleLines != nvlines) { @@ -296,13 +343,13 @@ void Fl_Text_Display::resize(int X, int Y, int W, int H) { if (mLineStarts) delete[] mLineStarts; mLineStarts = new int [mNVisibleLines]; } - + calc_line_starts(0, mNVisibleLines); calc_last_char(); - + // figure the scrollbars if (scrollbar_width()) { - /* Decide if the vertical scroll bar needs to be visible */ + /* Decide if the vertical scrollbar needs to be visible */ if (scrollbar_align() & (FL_ALIGN_LEFT|FL_ALIGN_RIGHT) && mNBufferLines >= mNVisibleLines - 1) { @@ -319,28 +366,28 @@ void Fl_Text_Display::resize(int X, int Y, int W, int H) { scrollbar_width(), text_area.h+TOP_MARGIN+BOTTOM_MARGIN); } } - + /* - Decide if the horizontal scroll bar needs to be visible. If there - is a vertical scrollbar, a horizontal is always created too. This - is because the alternatives are unatractive: - * Dynamically creating a horizontal scrollbar based on the currently - visible lines is what the original nedit does, but it always wastes - space for the scrollbar even when it's not used. Since the FLTK - widget dynamically allocates the space for the scrollbar and - rearranges the widget to make room for it, this would create a very - visually displeasing "bounce" effect when the vertical scrollbar is - dragged. Trust me, I tried it and it looks really bad. - * The other alternative would be to keep track of what the longest - line in the entire buffer is and base the scrollbar on that. I - didn't do this because I didn't see any easy way to do that using - the nedit code and this could involve a lengthy calculation for - large buffers. If an efficient and non-costly way of doing this - can be found, this might be a way to go. - */ + Decide if the horizontal scrollbar needs to be visible. If there + is a vertical scrollbar, a horizontal is always created too. This + is because the alternatives are unattractive: + * Dynamically creating a horizontal scrollbar based on the currently + visible lines is what the original nedit does, but it always wastes + space for the scrollbar even when it's not used. Since the FLTK + widget dynamically allocates the space for the scrollbar and + rearranges the widget to make room for it, this would create a very + visually displeasing "bounce" effect when the vertical scrollbar is + dragged. Trust me, I tried it and it looks really bad. + * The other alternative would be to keep track of what the longest + line in the entire buffer is and base the scrollbar on that. I + didn't do this because I didn't see any easy way to do that using + the nedit code and this could involve a lengthy calculation for + large buffers. If an efficient and non-costly way of doing this + can be found, this might be a way to go. + */ /* WAS: Suggestion: Try turning the horizontal scrollbar on when - you first see a line that is too wide in the window, but then - don't turn it off (ie mix both of your solutions). */ + you first see a line that is too wide in the window, but then + don't turn it off (ie mix both of your solutions). */ if (scrollbar_align() & (FL_ALIGN_TOP|FL_ALIGN_BOTTOM) && (mVScrollBar->visible() || longest_vline() > text_area.w)) { @@ -362,87 +409,86 @@ void Fl_Text_Display::resize(int X, int Y, int W, int H) { } } } - + // user request to change viewport if (mTopLineNumHint != mTopLineNum || mHorizOffsetHint != mHorizOffset) scroll_(mTopLineNumHint, mHorizOffsetHint); - + // everything will fit in the viewport - if (mNBufferLines < mNVisibleLines || mBuffer == NULL || mBuffer->length() == 0) + if (mNBufferLines < mNVisibleLines || mBuffer == NULL || mBuffer->length() == 0) { scroll_(1, mHorizOffset); /* if empty lines become visible, there may be an opportunity to - display more text by scrolling down */ - else while (mLineStarts[mNVisibleLines-2] == -1) - scroll_(mTopLineNum-1, mHorizOffset); - + display more text by scrolling down */ + } else { + while ( mNVisibleLines>=2 + && (mLineStarts[mNVisibleLines-2]==-1) + && scroll_(mTopLineNum-1, mHorizOffset)) + { } + } + // user request to display insert position if (display_insert_position_hint) display_insert(); - + // in case horizontal offset is now greater than longest line int maxhoffset = max(0, longest_vline()-text_area.w); if (mHorizOffset > maxhoffset) scroll_(mTopLineNumHint, maxhoffset); - + mTopLineNumHint = mTopLineNum; mHorizOffsetHint = mHorizOffset; display_insert_position_hint = 0; - + if (mContinuousWrap || hscrollbarvisible != mHScrollBar->visible() || vscrollbarvisible != mVScrollBar->visible()) redraw(); - + update_v_scrollbar(); update_h_scrollbar(); } + + /** - Refresh a rectangle of the text display. left and top are in coordinates of - the text drawing window -*/ + \brief Refresh a rectangle of the text display. + \param left, top are in coordinates of the text drawing window. + \param width, height size in pixels + */ void Fl_Text_Display::draw_text( int left, int top, int width, int height ) { int fontHeight, firstLine, lastLine, line; - + /* find the line number range of the display */ fontHeight = mMaxsize ? mMaxsize : textsize_; firstLine = ( top - text_area.y - fontHeight + 1 ) / fontHeight; lastLine = ( top + height - text_area.y ) / fontHeight + 1; - + fl_push_clip( left, top, width, height ); - + /* draw the lines */ for ( line = firstLine; line <= lastLine; line++ ) draw_vline( line, left, left + width, 0, INT_MAX ); - - /* draw the line numbers if exposed area includes them */ - if (mLineNumWidth != 0 && left <= mLineNumLeft + mLineNumWidth) - draw_line_numbers(false); - + + /* draw the line numbers if exposed area includes them */ + if (mLineNumWidth != 0 && left <= mLineNumLeft + mLineNumWidth) + draw_line_numbers(false); + fl_pop_clip(); } -/** Marks text from start to end as needing a redraw.*/ + + +/** + \brief Marks text from start to end as needing a redraw. + This function will trigger a damage event and later a redraw of parts of + the widget. + \param startpos index of first character needing redraw + \param endpos index after last character needing redraw + */ void Fl_Text_Display::redisplay_range(int startpos, int endpos) { - int ok = 0; - while (!ok && startpos > 0) { - // FIXME: character is ucs-4 - char c = buffer()->character( startpos ); - if (!((c & 0x80) && !(c & 0x40))) { - ok = 1; - } else { - startpos--; - } - } - while (!ok && endpos < buffer()->length()) { - // FIXME: character is ucs-4 - char c = buffer()->character( endpos ); - if (!((c & 0x80) && !(c & 0x40))) { - ok = 1; - } else { - endpos++; - } - } + IS_UTF8_ALIGNED2(buffer(), startpos) + IS_UTF8_ALIGNED2(buffer(), endpos) + if (damage_range1_start == -1 && damage_range1_end == -1) { damage_range1_start = startpos; damage_range1_end = endpos; @@ -459,26 +505,38 @@ void Fl_Text_Display::redisplay_range(int startpos, int endpos) { } damage(FL_DAMAGE_SCROLL); } + + + /** - Refresh all of the text between buffer positions "start" and "end" - not including the character at the position "end". - If end points beyond the end of the buffer, refresh the whole display - after pos, including blank lines which are not technically part of - any range of characters. -*/ + \brief Draw a range of text. + + Refresh all of the text between buffer positions \p startpos and + \p endpos not including the character at the position \p endpos. + + If \p endpos points beyond the end of the buffer, refresh the whole display + after \p startpos, including blank lines which are not technically part of + any range of characters. + + \param startpos index of first character to draw + \param endpos index after last character to draw + */ void Fl_Text_Display::draw_range(int startpos, int endpos) { + startpos = buffer()->utf8_align(startpos); + endpos = buffer()->utf8_align(endpos); + int i, startLine, lastLine, startIndex, endIndex; - + /* If the range is outside of the displayed text, just return */ - if ( endpos < mFirstChar || ( startpos > mLastChar && - !empty_vlines() ) ) return; - + if ( endpos < mFirstChar || ( startpos > mLastChar && !empty_vlines() ) ) + return; + /* Clean up the starting and ending values */ if ( startpos < 0 ) startpos = 0; if ( startpos > mBuffer->length() ) startpos = mBuffer->length(); if ( endpos < 0 ) endpos = 0; if ( endpos > mBuffer->length() ) endpos = mBuffer->length(); - + /* Get the starting and ending lines */ if ( startpos < mFirstChar ) startpos = mFirstChar; @@ -492,19 +550,18 @@ void Fl_Text_Display::draw_range(int startpos, int endpos) { lastLine = mNVisibleLines - 1; } } - + /* Get the starting and ending positions within the lines */ - startIndex = mLineStarts[ startLine ] == -1 ? 0 : - startpos - mLineStarts[ startLine ]; + startIndex = mLineStarts[ startLine ] == -1 ? 0 : startpos - mLineStarts[ startLine ]; if ( endpos >= mLastChar ) endIndex = INT_MAX; else if ( mLineStarts[ lastLine ] == -1 ) endIndex = 0; else endIndex = endpos - mLineStarts[ lastLine ]; - + /* If the starting and ending lines are the same, redisplay the single - line between "start" and "end" */ + line between "start" and "end" */ if ( startLine == lastLine ) { draw_vline( startLine, 0, INT_MAX, startIndex, endIndex ); return; @@ -521,74 +578,123 @@ void Fl_Text_Display::draw_range(int startpos, int endpos) { draw_vline( lastLine, 0, INT_MAX, 0, endIndex ); } -/** Sets the position of the text insertion cursor for text display */ + + +/** + \brief Sets the position of the text insertion cursor for text display. + Move the insertion cursor in front of the character at \p newPos. + This function may trigger a redraw. + \param newPos new caret position + */ void Fl_Text_Display::insert_position( int newPos ) { + IS_UTF8_ALIGNED2(buffer(), newPos) + /* make sure new position is ok, do nothing if it hasn't changed */ - if ( newPos == mCursorPos ) - return; + if ( newPos == mCursorPos ) return; if ( newPos < 0 ) newPos = 0; if ( newPos > mBuffer->length() ) newPos = mBuffer->length(); - + /* cursor movement cancels vertical cursor motion column */ - mCursorPreferredCol = -1; - - /* erase the cursor at it's previous position */ - redisplay_range(mCursorPos - 1, mCursorPos + 1); // FIXME utf8 - + mCursorPreferredXPos = -1; + + /* erase the cursor at its previous position */ + redisplay_range(buffer()->prev_char_clipped(mCursorPos), buffer()->next_char(mCursorPos)); + mCursorPos = newPos; - + /* draw cursor at its new position */ - redisplay_range(mCursorPos - 1, mCursorPos + 1); // FIXME utf8 + redisplay_range(buffer()->prev_char_clipped(mCursorPos), buffer()->next_char(mCursorPos)); } -/** Shows the text cursor */ + + + +/** + \brief Shows the text cursor. + This function may trigger a redraw. + \param b show(1) or hide(0) the text cursor (caret). + */ void Fl_Text_Display::show_cursor(int b) { mCursorOn = b; - redisplay_range(mCursorPos - 1, mCursorPos + 1); // FIXME utf8 + redisplay_range(buffer()->prev_char_clipped(mCursorPos), buffer()->next_char(mCursorPos)); } + + /** - Sets the text cursor style to one of the following: - -

      - -
    • Fl_Text_Display::NORMAL_CURSOR - Shows an I beam. - -
    • Fl_Text_Display::CARET_CURSOR - Shows a caret under the text. - -
    • Fl_Text_Display::DIM_CURSOR - Shows a dimmed I beam. - -
    • Fl_Text_Display::BLOCK_CURSOR - Shows an unfilled box around the current - character. - -
    • Fl_Text_Display::HEAVY_CURSOR - Shows a thick I beam. - -
    -*/ + \brief Sets the text cursor style. + Sets the text cursor style to one of the following: + + \li Fl_Text_Display::NORMAL_CURSOR - Shows an I beam. + \li Fl_Text_Display::CARET_CURSOR - Shows a caret under the text. + \li Fl_Text_Display::DIM_CURSOR - Shows a dimmed I beam. + \li Fl_Text_Display::BLOCK_CURSOR - Shows an unfilled box around the current + character. + \li Fl_Text_Display::HEAVY_CURSOR - Shows a thick I beam. + + This call also switches the cursor on and may trigger a redraw. + + \param style new cursor style + */ void Fl_Text_Display::cursor_style(int style) { mCursorStyle = style; if (mCursorOn) show_cursor(); } -/** - If mode is not zero, this call enables automatic word wrapping at column pos. - Word-wrapping does not change the text buffer itself, only the way that the text is displayed. -*/ -void Fl_Text_Display::wrap_mode(int wrap, int wrapMargin) { - mWrapMargin = wrapMargin; - mContinuousWrap = wrap; + +/** + \brief Set the new text wrap mode. + + If \p wrap mode is not zero, this call enables automatic word wrapping at column + \p wrapMargin. Word-wrapping does not change the text buffer itself, only the way + the text is displayed. Different Text Displays can have different wrap modes, + even if they share the same Text Buffer. + + \param wrap new wrap mode is WRAP_NONE (don't wrap text at all), WRAP_AT_COLUMN + (wrap text at the given text column), WRAP_AT_PIXEL (wrap text at a pixel + position), or WRAP_AT_BOUNDS (wrap text so that it fits into the + widget width) + \param wrapMargin in WRAP_AT_COLUMN mode, text will wrap at the n'th character. + For variable width fonts, an average character width is calculated. The + column width is calculated using the current textfont or the first style + when this function is called. If the font size changes, this function + must be called again. In WRAP_AT_PIXEL mode, this is the pixel position. + \todo we need new wrap modes to wrap at the window edge and based on pixel width + or average character width. + */ +void Fl_Text_Display::wrap_mode(int wrap, int wrapMargin) { + switch (wrap) { + case WRAP_NONE: + mWrapMarginPix = 0; + mContinuousWrap = 0; + break; + case WRAP_AT_COLUMN: + default: + mWrapMarginPix = int(col_to_x(wrapMargin)); + mContinuousWrap = 1; + break; + case WRAP_AT_PIXEL: + mWrapMarginPix = wrapMargin; + mContinuousWrap = 1; + break; + case WRAP_AT_BOUNDS: + mWrapMarginPix = 0; + mContinuousWrap = 1; + break; + } + if (buffer()) { /* wrapping can change the total number of lines, re-count */ mNBufferLines = count_lines(0, buffer()->length(), true); - + /* changing wrap margins or changing from wrapped mode to non-wrapped - can leave the character at the top no longer at a line start, and/or - change the line number */ + can leave the character at the top no longer at a line start, and/or + change the line number */ mFirstChar = line_start(mFirstChar); mTopLineNum = count_lines(0, mFirstChar, true) + 1; - + reset_absolute_top_line_number(); - + /* update the line starts array */ calc_line_starts(0, mNVisibleLines); calc_last_char(); @@ -599,53 +705,70 @@ void Fl_Text_Display::wrap_mode(int wrap, int wrapMargin) { mTopLineNum = 1; mAbsTopLineNum = 0; } - + resize(x(), y(), w(), h()); } -/** - Inserts "text" at the current cursor location. This has the same - effect as inserting the text into the buffer using BufInsert and - then moving the insert position after the newly inserted text, except - that it's optimized to do less redrawing. -*/ -void Fl_Text_Display::insert(const char* text) { - int pos = mCursorPos; + +/** + \brief Inserts "text" at the current cursor location. + + This has the same effect as inserting the text into the buffer using BufInsert + and then moving the insert position after the newly inserted text, except + that it's optimized to do less redrawing. + + \param text new text in UTF-8 encoding. + */ +void Fl_Text_Display::insert(const char* text) { + IS_UTF8_ALIGNED2(buffer(), mCursorPos) + IS_UTF8_ALIGNED(text) + + int pos = mCursorPos; + mCursorToHint = pos + strlen( text ); mBuffer->insert( pos, text ); mCursorToHint = NO_HINT; } -/** Replaces text at the current insert position.*/ + + +/** + \brief Replaces text at the current insert position. + \param text new text in UTF-8 encoding + + \todo Unicode? Find out exactly what we do here and simplify. + */ void Fl_Text_Display::overstrike(const char* text) { + IS_UTF8_ALIGNED2(buffer(), mCursorPos) + IS_UTF8_ALIGNED(text) + int startPos = mCursorPos; Fl_Text_Buffer *buf = mBuffer; int lineStart = buf->line_start( startPos ); int textLen = strlen( text ); int i, p, endPos, indent, startIndent, endIndent; const char *c; - char ch, *paddedText = NULL; - + unsigned int ch; + char *paddedText = NULL; + /* determine how many displayed character positions are covered */ startIndent = mBuffer->count_displayed_characters( lineStart, startPos ); indent = startIndent; - for ( c = text; *c != '\0'; c++ ) - indent += Fl_Text_Buffer::character_width( c, indent, buf->tab_distance() ); + for ( c = text; *c != '\0'; c += fl_utf8len1(*c) ) + indent++; endIndent = indent; - + /* find which characters to remove, and if necessary generate additional - padding to make up for removed control characters at the end */ + padding to make up for removed control characters at the end */ indent = startIndent; - for ( p = startPos; ; p++ ) { + for ( p = startPos; ; p=buffer()->next_char(p) ) { if ( p == buf->length() ) break; - // FIXME: character is ucs-4 - ch = buf->character( p ); + ch = buf->char_at( p ); if ( ch == '\n' ) break; - const char *s = buf->address(p); - indent += Fl_Text_Buffer::character_width(s, indent, buf->tab_distance() ); // FIXME: not unicode + indent++; if ( indent == endIndent ) { p++; break; @@ -662,7 +785,7 @@ void Fl_Text_Display::overstrike(const char* text) { } } endPos = p; - + mCursorToHint = startPos + textLen; buf->replace( startPos, endPos, paddedText == NULL ? text : paddedText ); mCursorToHint = NO_HINT; @@ -670,205 +793,205 @@ void Fl_Text_Display::overstrike(const char* text) { delete [] paddedText; } + + /** - Translate a buffer text position to the XY location where the top left - of the cursor would be positioned to point to that character. Returns - 0 if the position is not displayed because it is VERTICALLY out - of view. If the position is horizontally out of view, returns the - X coordinate where the position would be if it were visible. -*/ + \brief Convert a character index into a pixel position. + + Translate a buffer text position to the XY location where the top left of the + cursor would be positioned to point to that character. Returns 0 if the + position is not displayed because it is \e \b vertically out of view. + If the position is horizontally out of view, returns the X coordinate where + the position would be if it were visible. + \param pos character index + \param[out] X, Y pixel position of character on screen + \return 0 if character vertically out of view, X position otherwise + */ int Fl_Text_Display::position_to_xy( int pos, int* X, int* Y ) const { - int charIndex, lineStartPos, fontHeight, lineLen; - int visLineNum, charLen, outIndex, xStep, charStyle; - char expandedChar[ FL_TEXT_MAX_EXP_CHAR_LEN ]; - const char *lineStr; - -// printf("position_to_xy(pos=%d, X=%p, Y=%p)\n", pos, X, Y); + IS_UTF8_ALIGNED2(buffer(), pos) + int lineStartPos, fontHeight, lineLen; + int visLineNum; + /* If position is not displayed, return false */ if (pos < mFirstChar || (pos > mLastChar && !empty_vlines())) { -// printf(" returning 0\n" -// " mFirstChar=%d, mLastChar=%d, empty_vlines()=0\n", -// mFirstChar, mLastChar); return 0; } - + /* Calculate Y coordinate */ if (!position_to_line(pos, &visLineNum)) { -// puts(" returning 0\n" -// " position_to_line()=0"); return 0; } - if (visLineNum < 0 || visLineNum > mNBufferLines) { -// printf(" returning 0\n" -// " visLineNum=%d, mNBufferLines=%d\n", -// visLineNum, mNBufferLines); return 0; } - + fontHeight = mMaxsize; *Y = text_area.y + visLineNum * fontHeight; - - /* Get the text, length, and buffer position of the line. If the position - is beyond the end of the buffer and should be at the first position on - the first empty line, don't try to get or scan the text */ + + /* Get the text, length, and buffer position of the line. If the position + is beyond the end of the buffer and should be at the first position on + the first empty line, don't try to get or scan the text */ lineStartPos = mLineStarts[visLineNum]; if ( lineStartPos == -1 ) { *X = text_area.x - mHorizOffset; return 1; } lineLen = vline_length( visLineNum ); - lineStr = mBuffer->text_range( lineStartPos, lineStartPos + lineLen ); - - /* Step through character positions from the beginning of the line - to "pos" to calculate the X coordinate */ - xStep = text_area.x - mHorizOffset; - outIndex = 0; - for (charIndex = 0; - charIndex < lineLen && charIndex < pos - lineStartPos; - charIndex += fl_utf8len(lineStr[charIndex]) ) - { - charLen = Fl_Text_Buffer::expand_character( lineStr+charIndex, outIndex, expandedChar, - mBuffer->tab_distance()); - charStyle = position_style( lineStartPos, lineLen, charIndex, - outIndex ); - xStep += string_width( expandedChar, charLen, charStyle ); - outIndex += charLen; - } - *X = xStep; - free((char *)lineStr); + *X = text_area.x + handle_vline(GET_WIDTH, lineStartPos, pos-lineStartPos, 0, 0, 0, 0, 0, 0) - mHorizOffset; return 1; } -/** - Find the line number of position "pos". Note: this only works for - displayed lines. If the line is not displayed, the function returns - 0 (without the mLineStarts array it could turn in to very long - calculation involving scanning large amounts of text in the buffer). - If continuous wrap mode is on, returns the absolute line number (as opposed - to the wrapped line number which is used for scrolling). -*/ -int Fl_Text_Display::position_to_linecol( int pos, int* lineNum, int* column ) const { - int retVal; - - /* In continuous wrap mode, the absolute (non-wrapped) line count is - maintained separately, as needed. Only return it if we're actually - keeping track of it and pos is in the displayed text */ - if (mContinuousWrap) { - if (!maintaining_absolute_top_line_number() || - pos < mFirstChar || pos > mLastChar) - return 0; - *lineNum = mAbsTopLineNum + buffer()->count_lines(mFirstChar, pos); - *column - = buffer()->count_displayed_characters(buffer()->line_start(pos), pos); - return 1; - } + +/** + \brief Find the line and column number of position \p pos. + + This only works for displayed lines. If the line is not displayed, the + function returns 0 (without the mLineStarts array it could turn in to very long + calculation involving scanning large amounts of text in the buffer). + If continuous wrap mode is on, returns the absolute line number (as opposed + to the wrapped line number which is used for scrolling). + + \param pos character index + \param[out] lineNum absolute (unwrapped) line number + \param[out] column character offset to the beginning of the line + \return 0 if \p pos is off screen, line number otherwise + \todo a column number makes little sense in the UTF-8/variable font width + environment. We will have to further define what exactly we want to return. + Please check the functions that call this particular function. + */ +int Fl_Text_Display::position_to_linecol( int pos, int* lineNum, int* column ) const { + IS_UTF8_ALIGNED2(buffer(), pos) + + int retVal; + + /* In continuous wrap mode, the absolute (non-wrapped) line count is + maintained separately, as needed. Only return it if we're actually + keeping track of it and pos is in the displayed text */ + if (mContinuousWrap) { + if (!maintaining_absolute_top_line_number() || pos < mFirstChar || pos > mLastChar) + return 0; + *lineNum = mAbsTopLineNum + buffer()->count_lines(mFirstChar, pos); + *column = buffer()->count_displayed_characters(buffer()->line_start(pos), pos); + return 1; + } + retVal = position_to_line( pos, lineNum ); if ( retVal ) { - *column = mBuffer->count_displayed_characters( - mLineStarts[ *lineNum ], pos ); + *column = mBuffer->count_displayed_characters( mLineStarts[ *lineNum ], pos ); *lineNum += mTopLineNum; } return retVal; } + + /** - Return 1 if position (X, Y) is inside of the primary Fl_Text_Selection -*/ + \brief Check if a pixel position is within the primary selection. + \param X, Y pixel position to test + \return 1 if position (X, Y) is inside of the primary Fl_Text_Selection + */ int Fl_Text_Display::in_selection( int X, int Y ) const { - int row, column, pos = xy_to_position( X, Y, CHARACTER_POS ); + int pos = xy_to_position( X, Y, CHARACTER_POS ); + IS_UTF8_ALIGNED2(buffer(), pos) Fl_Text_Buffer *buf = mBuffer; - int ok = 0; - while (!ok) { - // FIXME: character is ucs-4 - char c = buffer()->character( pos ); - if (!((c & 0x80) && !(c & 0x40))) { - ok = 1; - } else { - pos++; - } - } - - xy_to_rowcol( X, Y, &row, &column, CHARACTER_POS ); - if (range_touches_selection(buf->primary_selection(), mFirstChar, mLastChar)) - column = wrapped_column(row, column); - return buf->primary_selection()->includes(pos, buf->line_start( pos ), column); + return buf->primary_selection()->includes(pos); } + + /** - Correct a column number based on an unconstrained position (as returned by - TextDXYToUnconstrainedPosition) to be relative to the last actual newline - in the buffer before the row and column position given, rather than the - last line start created by line wrapping. This is an adapter - for rectangular selections and code written before continuous wrap mode, - which thinks that the unconstrained column is the number of characters - from the last newline. Obviously this is time consuming, because it - invloves character re-counting. -*/ + \brief Nobody knows what this function does. + + Correct a column number based on an unconstrained position (as returned by + TextDXYToUnconstrainedPosition) to be relative to the last actual newline + in the buffer before the row and column position given, rather than the + last line start created by line wrapping. This is an adapter + for rectangular selections and code written before continuous wrap mode, + which thinks that the unconstrained column is the number of characters + from the last newline. Obviously this is time consuming, because it + invloves character re-counting. + + \param row + \param column + \return something unknown + \todo What does this do and how is it useful? Column numbers mean little in + this context. Which functions depend on this one? + + \todo Unicode? + */ int Fl_Text_Display::wrapped_column(int row, int column) const { - int lineStart, dispLineStart; - - if (!mContinuousWrap || row < 0 || row > mNVisibleLines) - return column; - dispLineStart = mLineStarts[row]; - if (dispLineStart == -1) - return column; - lineStart = buffer()->line_start(dispLineStart); - return column - + buffer()->count_displayed_characters(lineStart, dispLineStart); + int lineStart, dispLineStart; + + if (!mContinuousWrap || row < 0 || row > mNVisibleLines) + return column; + dispLineStart = mLineStarts[row]; + if (dispLineStart == -1) + return column; + lineStart = buffer()->line_start(dispLineStart); + return column + buffer()->count_displayed_characters(lineStart, dispLineStart); } -/** - Correct a row number from an unconstrained position (as returned by - TextDXYToUnconstrainedPosition) to a straight number of newlines from the - top line of the display. Because rectangular selections are based on - newlines, rather than display wrapping, and anywhere a rectangular selection - needs a row, it needs it in terms of un-wrapped lines. -*/ -int Fl_Text_Display::wrapped_row(int row) const{ - if (!mContinuousWrap || row < 0 || row > mNVisibleLines) - return row; - return buffer()->count_lines(mFirstChar, mLineStarts[row]); -} + /** - Scroll the display to bring insertion cursor into view. -** - Note: it would be nice to be able to do this without counting lines twice - (scroll_() counts them too) and/or to count from the most efficient - starting point, but the efficiency of this routine is not as important to - the overall performance of the text display. -*/ + \brief Nobody knows what this function does. + + Correct a row number from an unconstrained position (as returned by + TextDXYToUnconstrainedPosition) to a straight number of newlines from the + top line of the display. Because rectangular selections are based on + newlines, rather than display wrapping, and anywhere a rectangular selection + needs a row, it needs it in terms of un-wrapped lines. + + \param row + \return something unknown + \todo What does this do and how is it useful? Column numbers mean little in + this context. Which functions depend on this one? + */ +int Fl_Text_Display::wrapped_row(int row) const { + if (!mContinuousWrap || row < 0 || row > mNVisibleLines) + return row; + return buffer()->count_lines(mFirstChar, mLineStarts[row]); +} + + + +/** + \brief Scroll the display to bring insertion cursor into view. + + Note: it would be nice to be able to do this without counting lines twice + (scroll_() counts them too) and/or to count from the most efficient + starting point, but the efficiency of this routine is not as important to + the overall performance of the text display. + + \todo Unicode? + */ void Fl_Text_Display::display_insert() { int hOffset, topLine, X, Y; hOffset = mHorizOffset; topLine = mTopLineNum; - -// FIXME: I don't understand this well enough to know if it is correct -// it is different than nedit 5.3 + if (insert_position() < mFirstChar) { topLine -= count_lines(insert_position(), mFirstChar, false); - } else if (mLineStarts[mNVisibleLines-2] != -1) { + } else if (mNVisibleLines>=2 && mLineStarts[mNVisibleLines-2] != -1) { int lastChar = line_end(mLineStarts[mNVisibleLines-2],true); if (insert_position() >= lastChar) - topLine - += count_lines(lastChar - (wrap_uses_character(mLastChar) ? 0 : 1), - insert_position(), false); + topLine += count_lines(lastChar - (wrap_uses_character(mLastChar) ? 0 : 1), + insert_position(), false); } - + /* Find the new setting for horizontal offset (this is a bit ungraceful). - If the line is visible, just use PositionToXY to get the position - to scroll to, otherwise, do the vertical scrolling first, then the - horizontal */ + If the line is visible, just use PositionToXY to get the position + to scroll to, otherwise, do the vertical scrolling first, then the + horizontal */ if (!position_to_xy( mCursorPos, &X, &Y )) { scroll_(topLine, hOffset); if (!position_to_xy( mCursorPos, &X, &Y )) { - #ifdef DEBUG +#ifdef DEBUG printf ("*** display_insert/position_to_xy # GIVE UP !\n"); fflush(stdout); - #endif // DEBUG +#endif // DEBUG return; /* Give up, it's not worth it (but why does it fail?) */ } } @@ -876,56 +999,67 @@ void Fl_Text_Display::display_insert() { hOffset += X-(text_area.x + text_area.w); else if (X < text_area.x) hOffset += X-text_area.x; - + /* Do the scroll */ if (topLine != mTopLineNum || hOffset != mHorizOffset) scroll_(topLine, hOffset); } -/** Scrolls the text buffer to show the current insert position.*/ + +/** + \brief Scrolls the text buffer to show the current insert position. + This function triggers a complete recalculation, ending in a call to + Fl_Text_Display::display_insert() + */ void Fl_Text_Display::show_insert_position() { display_insert_position_hint = 1; resize(x(), y(), w(), h()); } + /* - Cursor movement functions -*/ -/** Moves the current insert position right one character.*/ + Cursor movement functions + */ + +/** + \brief Moves the current insert position right one character. + \return 1 if the cursor moved, 0 if the end of the text was reached + */ int Fl_Text_Display::move_right() { - int ok = 0; - while (!ok) { if ( mCursorPos >= mBuffer->length() ) return 0; - insert_position( mCursorPos + 1 ); - int pos = insert_position(); - // FIXME: character is ucs-4 - char c = buffer()->character( pos ); - if (!((c & 0x80) && !(c & 0x40))) ok = 1; - } + int p = insert_position(); + int q = buffer()->next_char(p); + insert_position(q); return 1; } -/** Moves the current insert position left one character.*/ + + + +/** + \brief Moves the current insert position left one character. + \return 1 if the cursor moved, 0 if the beginning of the text was reached + */ int Fl_Text_Display::move_left() { - int ok = 0; - while (!ok) { if ( mCursorPos <= 0 ) return 0; - insert_position( mCursorPos - 1 ); - int pos = insert_position(); - // FIXME: character is ucs-4 - char c = buffer()->character( pos ); - if (!((c & 0x80) && !(c & 0x40))) ok = 1; - } + int p = insert_position(); + int q = buffer()->prev_char_clipped(p); + insert_position(q); return 1; } -/** Moves the current insert position up one line.*/ -int Fl_Text_Display::move_up() { - int lineStartPos, column, prevLineStartPos, newPos, visLineNum; + +/** + \brief Moves the current insert position up one line. + \return 1 if the cursor moved, 0 if the beginning of the text was reached + */ +int Fl_Text_Display::move_up() { + int lineStartPos, xPos, prevLineStartPos, newPos, visLineNum; + /* Find the position of the start of the line. Use the line starts array - if possible */ + if possible */ if ( position_to_line( mCursorPos, &visLineNum ) ) lineStartPos = mLineStarts[ visLineNum ]; else { @@ -934,319 +1068,403 @@ int Fl_Text_Display::move_up() { } if ( lineStartPos == 0 ) return 0; - + /* Decide what column to move to, if there's a preferred column use that */ - column = mCursorPreferredCol >= 0 ? mCursorPreferredCol : - mBuffer->count_displayed_characters( lineStartPos, mCursorPos ); - + if (mCursorPreferredXPos >= 0) + xPos = mCursorPreferredXPos; + else + xPos = handle_vline(GET_WIDTH, lineStartPos, mCursorPos-lineStartPos, + 0, 0, 0, 0, 0, INT_MAX); + /* count forward from the start of the previous line to reach the column */ if ( visLineNum != -1 && visLineNum != 0 ) prevLineStartPos = mLineStarts[ visLineNum - 1 ]; else prevLineStartPos = rewind_lines( lineStartPos, 1 ); - newPos = mBuffer->skip_displayed_characters( prevLineStartPos, column ); - if (mContinuousWrap) - newPos = min(newPos, line_end(prevLineStartPos, true)); - + + int lineEnd = line_end(prevLineStartPos, true); + newPos = handle_vline(FIND_INDEX_FROM_ZERO, prevLineStartPos, lineEnd-prevLineStartPos, + 0, 0, 0, 0, 0, xPos); + /* move the cursor */ insert_position( newPos ); - - int ok = 0; - while (!ok) { - int pos = insert_position(); - // FIXME: character is ucs-4 - char c = buffer()->character( pos ); - if (!((c & 0x80) && !(c & 0x40))) { - ok = 1; - } else { - insert_position( mCursorPos + 1 ); - } - } - + /* if a preferred column wasn't aleady established, establish it */ - mCursorPreferredCol = column; + mCursorPreferredXPos = xPos; return 1; } -/** Moves the current insert position down one line.*/ -int Fl_Text_Display::move_down() { - int lineStartPos, column, nextLineStartPos, newPos, visLineNum; + +/** + \brief Moves the current insert position down one line. + \return 1 if the cursor moved, 0 if the beginning of the text was reached + */ +int Fl_Text_Display::move_down() { + int lineStartPos, xPos, newPos, visLineNum; + if ( mCursorPos == mBuffer->length() ) return 0; + if ( position_to_line( mCursorPos, &visLineNum ) ) lineStartPos = mLineStarts[ visLineNum ]; else { lineStartPos = line_start( mCursorPos ); visLineNum = -1; } - column = mCursorPreferredCol >= 0 ? mCursorPreferredCol : - mBuffer->count_displayed_characters( lineStartPos, mCursorPos ); - nextLineStartPos = skip_lines( lineStartPos, 1, true ); - newPos = mBuffer->skip_displayed_characters( nextLineStartPos, column ); - if (mContinuousWrap) - newPos = min(newPos, line_end(nextLineStartPos, true)); - - insert_position( newPos ); - int ok = 0; - while (!ok) { - int pos = insert_position(); - // FIXME: character is ucs-4 - char c = buffer()->character( pos ); - if (!((c & 0x80) && !(c & 0x40))) { - ok = 1; - } else { - insert_position( mCursorPos + 1 ); - } + if (mCursorPreferredXPos >= 0) { + xPos = mCursorPreferredXPos; + } else { + xPos = handle_vline(GET_WIDTH, lineStartPos, mCursorPos-lineStartPos, + 0, 0, 0, 0, 0, INT_MAX); } - mCursorPreferredCol = column; + + int nextLineStartPos = skip_lines( lineStartPos, 1, true ); + int lineEnd = line_end(nextLineStartPos, true); + newPos = handle_vline(FIND_INDEX_FROM_ZERO, nextLineStartPos, lineEnd-nextLineStartPos, + 0, 0, 0, 0, 0, xPos); + + insert_position( newPos ); + mCursorPreferredXPos = xPos; return 1; } + + /** - Same as BufCountLines, but takes in to account wrapping if wrapping is - turned on. If the caller knows that startPos is at a line start, it - can pass "startPosIsLineStart" as True to make the call more efficient - by avoiding the additional step of scanning back to the last newline. -*/ + \brief Count the number of lines between two positions. + + Same as BufCountLines, but takes into account wrapping if wrapping is + turned on. If the caller knows that \p startPos is at a line start, it + can pass \p startPosIsLineStart as True to make the call more efficient + by avoiding the additional step of scanning back to the last newline. + + \param startPos index to first character + \param endPos index after last character + \param startPosIsLineStart avoid scanning back to the line start + \return number of lines + */ int Fl_Text_Display::count_lines(int startPos, int endPos, - bool startPosIsLineStart) const { - int retLines, retPos, retLineStart, retLineEnd; - + bool startPosIsLineStart) const { + IS_UTF8_ALIGNED2(buffer(), startPos) + IS_UTF8_ALIGNED2(buffer(), endPos) + + int retLines, retPos, retLineStart, retLineEnd; + #ifdef DEBUG - printf("Fl_Text_Display::count_lines(startPos=%d, endPos=%d, startPosIsLineStart=%d\n", - startPos, endPos, startPosIsLineStart); + printf("Fl_Text_Display::count_lines(startPos=%d, endPos=%d, startPosIsLineStart=%d\n", + startPos, endPos, startPosIsLineStart); #endif // DEBUG - - /* If we're not wrapping use simple (and more efficient) BufCountLines */ - if (!mContinuousWrap) - return buffer()->count_lines(startPos, endPos); - - wrapped_line_counter(buffer(), startPos, endPos, INT_MAX, - startPosIsLineStart, 0, &retPos, &retLines, &retLineStart, - &retLineEnd); - + + /* If we're not wrapping use simple (and more efficient) BufCountLines */ + if (!mContinuousWrap) + return buffer()->count_lines(startPos, endPos); + + wrapped_line_counter(buffer(), startPos, endPos, INT_MAX, + startPosIsLineStart, 0, &retPos, &retLines, &retLineStart, + &retLineEnd); + #ifdef DEBUG - printf(" # after WLC: retPos=%d, retLines=%d, retLineStart=%d, retLineEnd=%d\n", - retPos, retLines, retLineStart, retLineEnd); + printf(" # after WLC: retPos=%d, retLines=%d, retLineStart=%d, retLineEnd=%d\n", + retPos, retLines, retLineStart, retLineEnd); #endif // DEBUG - - return retLines; + + return retLines; } + + /** - Same as BufCountForwardNLines, but takes in to account line breaks when - wrapping is turned on. If the caller knows that startPos is at a line start, - it can pass "startPosIsLineStart" as True to make the call more efficient - by avoiding the additional step of scanning back to the last newline. -*/ + \brief Skip a number of lines forward. + + Same as BufCountForwardNLines, but takes into account line breaks when + wrapping is turned on. If the caller knows that startPos is at a line start, + it can pass "startPosIsLineStart" as True to make the call more efficient + by avoiding the additional step of scanning back to the last newline. + + \param startPos index to starting character + \param nLines number of lines to skip ahead + \param startPosIsLineStart avoid scanning back to the line start + \return new position as index + */ int Fl_Text_Display::skip_lines(int startPos, int nLines, - bool startPosIsLineStart) { - int retLines, retPos, retLineStart, retLineEnd; - - /* if we're not wrapping use more efficient BufCountForwardNLines */ - if (!mContinuousWrap) - return buffer()->skip_lines(startPos, nLines); - - /* wrappedLineCounter can't handle the 0 lines case */ - if (nLines == 0) - return startPos; - - /* use the common line counting routine to count forward */ - wrapped_line_counter(buffer(), startPos, buffer()->length(), - nLines, startPosIsLineStart, 0, &retPos, &retLines, &retLineStart, - &retLineEnd); - return retPos; + bool startPosIsLineStart) { + IS_UTF8_ALIGNED2(buffer(), startPos) + + int retLines, retPos, retLineStart, retLineEnd; + + /* if we're not wrapping use more efficient BufCountForwardNLines */ + if (!mContinuousWrap) + return buffer()->skip_lines(startPos, nLines); + + /* wrappedLineCounter can't handle the 0 lines case */ + if (nLines == 0) + return startPos; + + /* use the common line counting routine to count forward */ + wrapped_line_counter(buffer(), startPos, buffer()->length(), + nLines, startPosIsLineStart, 0, + &retPos, &retLines, &retLineStart, &retLineEnd); + IS_UTF8_ALIGNED2(buffer(), retPos) + return retPos; } -/** - Same as BufEndOfLine, but takes in to account line breaks when wrapping - is turned on. If the caller knows that startPos is at a line start, it - can pass "startPosIsLineStart" as True to make the call more efficient - by avoiding the additional step of scanning back to the last newline. -** - Note that the definition of the end of a line is less clear when continuous - wrap is on. With continuous wrap off, it's just a pointer to the newline - that ends the line. When it's on, it's the character beyond the last - DISPLAYABLE character on the line, where a whitespace character which has - been "converted" to a newline for wrapping is not considered displayable. - Also note that, a line can be wrapped at a non-whitespace character if the - line had no whitespace. In this case, this routine returns a pointer to - the start of the next line. This is also consistent with the model used by - visLineLength. -*/ -int Fl_Text_Display::line_end(int pos, bool startPosIsLineStart) const { - int retLines, retPos, retLineStart, retLineEnd; - - /* If we're not wrapping use more efficien BufEndOfLine */ - if (!mContinuousWrap) - return buffer()->line_end(pos); - - if (pos == buffer()->length()) - return pos; - wrapped_line_counter(buffer(), pos, buffer()->length(), 1, - startPosIsLineStart, 0, &retPos, &retLines, &retLineStart, - &retLineEnd); - return retLineEnd; -} + /** - Same as BufStartOfLine, but returns the character after last wrap point - rather than the last newline. -*/ + \brief Returns the end of a line. + + Same as BufEndOfLine, but takes into account line breaks when wrapping + is turned on. If the caller knows that \p startPos is at a line start, it + can pass "startPosIsLineStart" as True to make the call more efficient + by avoiding the additional step of scanning back to the last newline. + + Note that the definition of the end of a line is less clear when continuous + wrap is on. With continuous wrap off, it's just a pointer to the newline + that ends the line. When it's on, it's the character beyond the last + \b displayable character on the line, where a whitespace character which has + been "converted" to a newline for wrapping is not considered displayable. + Also note that a line can be wrapped at a non-whitespace character if the + line had no whitespace. In this case, this routine returns a pointer to + the start of the next line. This is also consistent with the model used by + visLineLength. + + \param startPos index to starting character + \param startPosIsLineStart avoid scanning back to the line start + \return new position as index + */ +int Fl_Text_Display::line_end(int startPos, bool startPosIsLineStart) const { + IS_UTF8_ALIGNED2(buffer(), startPos) + + int retLines, retPos, retLineStart, retLineEnd; + + /* If we're not wrapping use more efficient BufEndOfLine */ + if (!mContinuousWrap) + return buffer()->line_end(startPos); + + if (startPos == buffer()->length()) + return startPos; + + wrapped_line_counter(buffer(), startPos, buffer()->length(), 1, + startPosIsLineStart, 0, &retPos, &retLines, &retLineStart, + &retLineEnd); + + IS_UTF8_ALIGNED2(buffer(), retLineEnd) + return retLineEnd; +} + + + +/** + \brief Return the beginning of a line. + + Same as BufStartOfLine, but returns the character after last wrap point + rather than the last newline. + + \param pos index to starting character + \return new position as index + */ int Fl_Text_Display::line_start(int pos) const { - int retLines, retPos, retLineStart, retLineEnd; - - /* If we're not wrapping, use the more efficient BufStartOfLine */ - if (!mContinuousWrap) - return buffer()->line_start(pos); + IS_UTF8_ALIGNED2(buffer(), pos) - wrapped_line_counter(buffer(), buffer()->line_start(pos), pos, INT_MAX, true, 0, - &retPos, &retLines, &retLineStart, &retLineEnd); - return retLineStart; + int retLines, retPos, retLineStart, retLineEnd; + + /* If we're not wrapping, use the more efficient BufStartOfLine */ + if (!mContinuousWrap) + return buffer()->line_start(pos); + + wrapped_line_counter(buffer(), buffer()->line_start(pos), pos, INT_MAX, true, 0, + &retPos, &retLines, &retLineStart, &retLineEnd); + + IS_UTF8_ALIGNED2(buffer(), retLineStart) + return retLineStart; } + + /** - Same as BufCountBackwardNLines, but takes in to account line breaks when - wrapping is turned on. -*/ -int Fl_Text_Display::rewind_lines(int startPos, int nLines) { - Fl_Text_Buffer *buf = buffer(); - int pos, lineStart, retLines, retPos, retLineStart, retLineEnd; - - /* If we're not wrapping, use the more efficient BufCountBackwardNLines */ - if (!mContinuousWrap) - return buf->rewind_lines(startPos, nLines); + \brief Skip a number of lines back. - pos = startPos; - for (;;) { - lineStart = buf->line_start(pos); - wrapped_line_counter(buf, lineStart, pos, INT_MAX, - true, 0, &retPos, &retLines, &retLineStart, &retLineEnd, false); - if (retLines > nLines) - return skip_lines(lineStart, retLines-nLines, - true); - nLines -= retLines; - pos = lineStart - 1; - if (pos < 0) - return 0; - nLines -= 1; - } + Same as BufCountBackwardNLines, but takes into account line breaks when + wrapping is turned on. + + \param startPos index to starting character + \param nLines number of lines to skip back + \return new position as index + */ +int Fl_Text_Display::rewind_lines(int startPos, int nLines) { + IS_UTF8_ALIGNED2(buffer(), startPos) + + Fl_Text_Buffer *buf = buffer(); + int pos, lineStart, retLines, retPos, retLineStart, retLineEnd; + + /* If we're not wrapping, use the more efficient BufCountBackwardNLines */ + if (!mContinuousWrap) + return buf->rewind_lines(startPos, nLines); + + pos = startPos; + for (;;) { + lineStart = buf->line_start(pos); + wrapped_line_counter(buf, lineStart, pos, INT_MAX, true, 0, + &retPos, &retLines, &retLineStart, &retLineEnd, false); + if (retLines > nLines) + return skip_lines(lineStart, retLines-nLines, true); + nLines -= retLines; + pos = lineStart - 1; + if (pos < 0) + return 0; + nLines -= 1; + } } -static inline int fl_isseparator(int c) { + + +static inline int fl_isseparator(unsigned int c) { + // FIXME: this does not take UCS-4 encoding into account return c != '$' && c != '_' && (isspace(c) || ispunct(c)); } -/** Moves the current insert position right one word.*/ + + +/** + \brief Moves the current insert position right one word. + */ void Fl_Text_Display::next_word() { int pos = insert_position(); - // FIXME: character is ucs-4 - while (pos < buffer()->length() && !fl_isseparator(buffer()->character(pos))) { - pos++; - } - // FIXME: character is ucs-4 - while (pos < buffer()->length() && fl_isseparator(buffer()->character(pos))) { - pos++; + + while (pos < buffer()->length() && !fl_isseparator(buffer()->char_at(pos))) { + pos = buffer()->next_char(pos); } + while (pos < buffer()->length() && fl_isseparator(buffer()->char_at(pos))) { + pos = buffer()->next_char(pos); + } + insert_position( pos ); } -/** Moves the current insert position left one word.*/ + + +/** + \brief Moves the current insert position left one word. + */ void Fl_Text_Display::previous_word() { int pos = insert_position(); if (pos==0) return; - pos--; - // FIXME: character is ucs-4 - while (pos && fl_isseparator(buffer()->character(pos))) { - pos--; - } - // FIXME: character is ucs-4 - while (pos && !fl_isseparator(buffer()->character(pos))) { - pos--; - } - // FIXME: character is ucs-4 - if (fl_isseparator(buffer()->character(pos))) pos++; + pos = buffer()->prev_char(pos); + while (pos && fl_isseparator(buffer()->char_at(pos))) { + pos = buffer()->prev_char(pos); + } + + while (pos && !fl_isseparator(buffer()->char_at(pos))) { + pos = buffer()->prev_char(pos); + } + + if (fl_isseparator(buffer()->char_at(pos))) { + pos = buffer()->next_char(pos); + } + insert_position( pos ); } -/** - Callback attached to the text buffer to receive delete information before - the modifications are actually made. -*/ -void Fl_Text_Display::buffer_predelete_cb(int pos, int nDeleted, void *cbArg) { - Fl_Text_Display *textD = (Fl_Text_Display *)cbArg; - if (textD->mContinuousWrap && - (textD->mFixedFontWidth == -1 || textD->mModifyingTabDistance)) - /* Note: we must perform this measurement, even if there is not a - single character deleted; the number of "deleted" lines is the - number of visual lines spanned by the real line in which the - modification takes place. - Also, a modification of the tab distance requires the same - kind of calculations in advance, even if the font width is "fixed", - because when the width of the tab characters changes, the layout - of the text may be completely different. */ - textD->measure_deleted_lines(pos, nDeleted); - else - textD->mSuppressResync = 0; /* Probably not needed, but just in case */ -} + /** - Callback attached to the text buffer to receive modification information -*/ + \brief This is called before any characters are deleted. + + Callback attached to the text buffer to receive delete information before + the modifications are actually made. + + \param pos starting index of deletion + \param nDeleted number of bytes we will delete (must be UTF-8 aligned!) + \param cbArg "this" pointer for static callback function + */ +void Fl_Text_Display::buffer_predelete_cb(int pos, int nDeleted, void *cbArg) { + Fl_Text_Display *textD = (Fl_Text_Display *)cbArg; + if (textD->mContinuousWrap) { + /* Note: we must perform this measurement, even if there is not a + single character deleted; the number of "deleted" lines is the + number of visual lines spanned by the real line in which the + modification takes place. + Also, a modification of the tab distance requires the same + kind of calculations in advance, even if the font width is "fixed", + because when the width of the tab characters changes, the layout + of the text may be completely different. */ + IS_UTF8_ALIGNED2(textD->buffer(), pos) + textD->measure_deleted_lines(pos, nDeleted); + } else { + textD->mSuppressResync = 0; /* Probably not needed, but just in case */ + } +} + + + +/** + \brief This is called whenever the buffer is modified. + + Callback attached to the text buffer to receive modification information + + \param pos starting index of modification + \param nInserted number of bytes we inserted (must be UTF-8 aligned!) + \param nDeleted number of bytes deleted (must be UTF-8 aligned!) + \param nRestyled ?? + \param deletedText this is what was removed, must not be NULL if nDeleted is set + \param cbArg "this" pointer for static callback function + */ void Fl_Text_Display::buffer_modified_cb( int pos, int nInserted, int nDeleted, - int nRestyled, const char *deletedText, void *cbArg ) { + int nRestyled, const char *deletedText, void *cbArg ) { int linesInserted, linesDeleted, startDispPos, endDispPos; Fl_Text_Display *textD = ( Fl_Text_Display * ) cbArg; Fl_Text_Buffer *buf = textD->mBuffer; int oldFirstChar = textD->mFirstChar; int scrolled, origCursorPos = textD->mCursorPos; - int wrapModStart, wrapModEnd; + int wrapModStart = 0, wrapModEnd = 0; + IS_UTF8_ALIGNED2(buf, pos) + IS_UTF8_ALIGNED2(buf, oldFirstChar) + /* buffer modification cancels vertical cursor motion column */ if ( nInserted != 0 || nDeleted != 0 ) - textD->mCursorPreferredCol = -1; - - /* Count the number of lines inserted and deleted, and in the case - of continuous wrap mode, how much has changed */ - if (textD->mContinuousWrap) { - textD->find_wrap_range(deletedText, pos, nInserted, nDeleted, - &wrapModStart, &wrapModEnd, &linesInserted, &linesDeleted); - } else { - linesInserted = nInserted == 0 ? 0 : - buf->count_lines( pos, pos + nInserted ); - linesDeleted = nDeleted == 0 ? 0 : countlines( deletedText ); - } - + textD->mCursorPreferredXPos = -1; + + /* Count the number of lines inserted and deleted, and in the case + of continuous wrap mode, how much has changed */ + if (textD->mContinuousWrap) { + textD->find_wrap_range(deletedText, pos, nInserted, nDeleted, + &wrapModStart, &wrapModEnd, &linesInserted, &linesDeleted); + } else { + linesInserted = nInserted == 0 ? 0 : buf->count_lines( pos, pos + nInserted ); + linesDeleted = nDeleted == 0 ? 0 : countlines( deletedText ); + } + /* Update the line starts and mTopLineNum */ if ( nInserted != 0 || nDeleted != 0 ) { - if (textD->mContinuousWrap) { - textD->update_line_starts( wrapModStart, wrapModEnd-wrapModStart, - nDeleted + pos-wrapModStart + (wrapModEnd-(pos+nInserted)), - linesInserted, linesDeleted, &scrolled ); - } else { - textD->update_line_starts( pos, nInserted, nDeleted, linesInserted, - linesDeleted, &scrolled ); - } + if (textD->mContinuousWrap) { + textD->update_line_starts( wrapModStart, wrapModEnd-wrapModStart, + nDeleted + pos-wrapModStart + (wrapModEnd-(pos+nInserted)), + linesInserted, linesDeleted, &scrolled ); + } else { + textD->update_line_starts( pos, nInserted, nDeleted, linesInserted, + linesDeleted, &scrolled ); + } } else scrolled = 0; - - /* If we're counting non-wrapped lines as well, maintain the absolute - (non-wrapped) line number of the text displayed */ - if (textD->maintaining_absolute_top_line_number() && - (nInserted != 0 || nDeleted != 0)) { - if (pos + nDeleted < oldFirstChar) - textD->mAbsTopLineNum += buf->count_lines(pos, pos + nInserted) - - countlines(deletedText); - else if (pos < oldFirstChar) - textD->reset_absolute_top_line_number(); - } - + + /* If we're counting non-wrapped lines as well, maintain the absolute + (non-wrapped) line number of the text displayed */ + if (textD->maintaining_absolute_top_line_number() && + (nInserted != 0 || nDeleted != 0)) { + if (deletedText && (pos + nDeleted < oldFirstChar)) + textD->mAbsTopLineNum += buf->count_lines(pos, pos + nInserted) - + countlines(deletedText); + else if (pos < oldFirstChar) + textD->reset_absolute_top_line_number(); + } + /* Update the line count for the whole buffer */ textD->mNBufferLines += linesInserted - linesDeleted; - + /* Update the cursor position */ if ( textD->mCursorToHint != NO_HINT ) { textD->mCursorPos = textD->mCursorToHint; @@ -1257,13 +1475,13 @@ void Fl_Text_Display::buffer_modified_cb( int pos, int nInserted, int nDeleted, else textD->mCursorPos += nInserted - nDeleted; } - + // refigure scrollbars & stuff textD->resize(textD->x(), textD->y(), textD->w(), textD->h()); - + // don't need to do anything else if not visible? if (!textD->visible_r()) return; - + /* If the changes caused scrolling, re-paint everything and we're done. */ if ( scrolled ) { textD->damage(FL_DAMAGE_EXPOSE); @@ -1271,113 +1489,155 @@ void Fl_Text_Display::buffer_modified_cb( int pos, int nInserted, int nDeleted, textD->mStyleBuffer->primary_selection()->selected(0); return; } - + /* If the changes didn't cause scrolling, decide the range of characters - that need to be re-painted. Also if the cursor position moved, be - sure that the redisplay range covers the old cursor position so the - old cursor gets erased, and erase the bits of the cursor which extend - beyond the left and right edges of the text. */ + that need to be re-painted. Also if the cursor position moved, be + sure that the redisplay range covers the old cursor position so the + old cursor gets erased, and erase the bits of the cursor which extend + beyond the left and right edges of the text. */ startDispPos = textD->mContinuousWrap ? wrapModStart : pos; + IS_UTF8_ALIGNED2(buf, startDispPos) + if ( origCursorPos == startDispPos && textD->mCursorPos != startDispPos ) - startDispPos = min( startDispPos, origCursorPos - 1 ); + startDispPos = min( startDispPos, buf->prev_char_clipped(origCursorPos) ); + IS_UTF8_ALIGNED2(buf, startDispPos) + if ( linesInserted == linesDeleted ) { if ( nInserted == 0 && nDeleted == 0 ) endDispPos = pos + nRestyled; else { - endDispPos = textD->mContinuousWrap ? wrapModEnd : - buf->line_end( pos + nInserted ) + 1; + if (textD->mContinuousWrap) + endDispPos = wrapModEnd; + else + endDispPos = buf->next_char(buf->line_end( pos + nInserted )); + // CET - FIXME if ( origCursorPos >= startDispPos && // ( origCursorPos <= endDispPos || endDispPos == buf->length() ) ) } - - if (linesInserted > 1) textD->draw_line_numbers(false); + + if (linesInserted > 1) textD->draw_line_numbers(false); } else { - endDispPos = textD->mLastChar + 1; + endDispPos = buf->next_char(textD->mLastChar); // CET - FIXME if ( origCursorPos >= pos ) - /* If more than one line is inserted/deleted, a line break may have - been inserted or removed in between, and the line numbers may - have changed. If only one line is altered, line numbers cannot - be affected (the insertion or removal of a line break always - results in at least two lines being redrawn). */ - textD->draw_line_numbers(false); + /* If more than one line is inserted/deleted, a line break may have + been inserted or removed in between, and the line numbers may + have changed. If only one line is altered, line numbers cannot + be affected (the insertion or removal of a line break always + results in at least two lines being redrawn). */ + textD->draw_line_numbers(false); } - + IS_UTF8_ALIGNED2(buf, startDispPos) + IS_UTF8_ALIGNED2(buf, endDispPos) + /* If there is a style buffer, check if the modification caused additional - changes that need to be redisplayed. (Redisplaying separately would - cause double-redraw on almost every modification involving styled - text). Extend the redraw range to incorporate style changes */ + changes that need to be redisplayed. (Redisplaying separately would + cause double-redraw on almost every modification involving styled + text). Extend the redraw range to incorporate style changes */ if ( textD->mStyleBuffer ) textD->extend_range_for_styles( &startDispPos, &endDispPos ); - + IS_UTF8_ALIGNED2(buf, startDispPos) + IS_UTF8_ALIGNED2(buf, endDispPos) + /* Redisplay computed range */ - textD->redisplay_range( startDispPos, endDispPos ); // FIXME utf8 + textD->redisplay_range( startDispPos, endDispPos ); } + + /** - In continuous wrap mode, internal line numbers are calculated after - wrapping. A separate non-wrapped line count is maintained when line - numbering is turned on. There is some performance cost to maintaining this - line count, so normally absolute line numbers are not tracked if line - numbering is off. This routine allows callers to specify that they still - want this line count maintained (for use via TextDPosToLineAndCol). - More specifically, this allows the line number reported in the statistics - line to be calibrated in absolute lines, rather than post-wrapped lines. -*/ + \brief Line numbering stuff, currently unused. + + In continuous wrap mode, internal line numbers are calculated after + wrapping. A separate non-wrapped line count is maintained when line + numbering is turned on. There is some performance cost to maintaining this + line count, so normally absolute line numbers are not tracked if line + numbering is off. This routine allows callers to specify that they still + want this line count maintained (for use via TextDPosToLineAndCol). + More specifically, this allows the line number reported in the statistics + line to be calibrated in absolute lines, rather than post-wrapped lines. + */ void Fl_Text_Display::maintain_absolute_top_line_number(int state) { - mNeedAbsTopLineNum = state; - reset_absolute_top_line_number(); + mNeedAbsTopLineNum = state; + reset_absolute_top_line_number(); } + + /** - Returns the absolute (non-wrapped) line number of the first line displayed. - Returns 0 if the absolute top line number is not being maintained. -*/ + \brief Line numbering stuff, currently unused. + + Returns the absolute (non-wrapped) line number of the first line displayed. + Returns 0 if the absolute top line number is not being maintained. + */ int Fl_Text_Display::get_absolute_top_line_number() const { - if (!mContinuousWrap) - return mTopLineNum; - if (maintaining_absolute_top_line_number()) - return mAbsTopLineNum; - return 0; + if (!mContinuousWrap) + return mTopLineNum; + if (maintaining_absolute_top_line_number()) + return mAbsTopLineNum; + return 0; } + + /** - Re-calculate absolute top line number for a change in scroll position. -*/ + \brief Line numbering stuff, currently unused. + + Re-calculate absolute top line number for a change in scroll position. + */ void Fl_Text_Display::absolute_top_line_number(int oldFirstChar) { - if (maintaining_absolute_top_line_number()) { - if (mFirstChar < oldFirstChar) - mAbsTopLineNum -= buffer()->count_lines(mFirstChar, oldFirstChar); - else - mAbsTopLineNum += buffer()->count_lines(oldFirstChar, mFirstChar); - } + if (maintaining_absolute_top_line_number()) { + if (mFirstChar < oldFirstChar) + mAbsTopLineNum -= buffer()->count_lines(mFirstChar, oldFirstChar); + else + mAbsTopLineNum += buffer()->count_lines(oldFirstChar, mFirstChar); + } } + + /** - Return true if a separate absolute top line number is being maintained - (for displaying line numbers or showing in the statistics line). -*/ + \brief Line numbering stuff, currently unused. + + Return true if a separate absolute top line number is being maintained + (for displaying line numbers or showing in the statistics line). + */ int Fl_Text_Display::maintaining_absolute_top_line_number() const { - return mContinuousWrap && - (mLineNumWidth != 0 || mNeedAbsTopLineNum); + return mContinuousWrap && + (mLineNumWidth != 0 || mNeedAbsTopLineNum); } + + /** - Count lines from the beginning of the buffer to reestablish the - absolute (non-wrapped) top line number. If mode is not continuous wrap, - or the number is not being maintained, does nothing. -*/ + \brief Line numbering stuff, probably unused. + + Count lines from the beginning of the buffer to reestablish the + absolute (non-wrapped) top line number. If mode is not continuous wrap, + or the number is not being maintained, does nothing. + */ void Fl_Text_Display::reset_absolute_top_line_number() { - mAbsTopLineNum = 1; - absolute_top_line_number(0); + mAbsTopLineNum = 1; + absolute_top_line_number(0); } -/** - Find the line number of position "pos" relative to the first line of - displayed text. Returns 0 if the line is not displayed. -*/ -int Fl_Text_Display::position_to_line( int pos, int *lineNum ) const { - int i; + +/** + \brief Convert a position index into a line number offset. + + Find the line number of position \p pos relative to the first line of + displayed text. Returns 0 if the line is not displayed. + + \param pos ?? + \param[out] lineNum ?? + \return ?? + \todo What does this do? + */ +int Fl_Text_Display::position_to_line( int pos, int *lineNum ) const { + IS_UTF8_ALIGNED2(buffer(), pos) + + int i; + *lineNum = 0; if ( pos < mFirstChar ) return 0; if ( pos > mLastChar ) { @@ -1389,13 +1649,13 @@ int Fl_Text_Display::position_to_line( int pos, int *lineNum ) const { } return ++( *lineNum ) <= mNVisibleLines - 1; } else { - position_to_line( mLastChar - 1, lineNum ); + position_to_line( buffer()->prev_char_clipped(mLastChar), lineNum ); return 1; } } return 0; } - + for ( i = mNVisibleLines - 1; i >= 0; i-- ) { if ( mLineStarts[ i ] != -1 && pos >= mLineStarts[ i ] ) { *lineNum = i; @@ -1405,231 +1665,255 @@ int Fl_Text_Display::position_to_line( int pos, int *lineNum ) const { return 0; /* probably never be reached */ } + /** - Draw the text on a single line represented by "visLineNum" (the - number of lines down from the top of the display), limited by - "leftClip" and "rightClip" window coordinates and "leftCharIndex" and - "rightCharIndex" character positions (not including the character at - position "rightCharIndex"). -*/ + Universal pixel machine. + + We use a single function that handles all line layout, measuring, and drawing + \li draw a text range + \li return the width of a text range in pixels + \li return the index of a character that is at a pixel position + + \param[in] mode DRAW_LINE, GET_WIDTH, FIND_INDEX + \param[in] lineStartPos index of first character + \param[in] lineLen size of string in bytes + \param[in] leftChar, rightChar + \param[in] Y drawing position + \param[in] bottomClip, leftClip, rightClip stop work when we reach the clipped + area. rightClip is the X position that we search in FIND_INDEX. + \retval DRAW_LINE index of last drawn character + \retval GET_WIDTH width in pixels of text segment if we would draw it + \retval FIND_INDEX index of character at given x position in window coordinates + \retval FIND_INDEX_FROM_ZERO index of character at given x position without scrolling and widget offsets + \todo we need to handle hidden hyphens and tabs here! + \todo we handle all styles and selections + \todo we must provide code to get pixel positions of the middle of a character as well + */ +int Fl_Text_Display::handle_vline( + int mode, + int lineStartPos, int lineLen, int leftChar, int rightChar, + int Y, int bottomClip, + int leftClip, int rightClip) const +{ + IS_UTF8_ALIGNED2(buffer(), lineStartPos) + + // FIXME: we need to allow two modes for FIND_INDEX: one on the edge of the + // FIXME: character for selection, and one on the character center for cursors. + int i, X, startX, startIndex, style, charStyle; + char *lineStr; + + if ( lineStartPos == -1 ) { + lineStr = NULL; + } else { + lineStr = mBuffer->text_range( lineStartPos, lineStartPos + lineLen ); + } + + if (mode==GET_WIDTH) { + X = 0; + } else if (mode==FIND_INDEX_FROM_ZERO) { + X = 0; + mode = FIND_INDEX; + } else { + X = text_area.x - mHorizOffset; + } + + startX = X; + startIndex = 0; + if (!lineStr) { + // just clear the background + if (mode==DRAW_LINE) { + style = position_style(lineStartPos, lineLen, -1); + draw_string( style|BG_ONLY_MASK, text_area.x, Y, text_area.x+text_area.w, lineStr, lineLen ); + } + if (mode==FIND_INDEX) { + IS_UTF8_ALIGNED2(buffer(), lineStartPos) + return lineStartPos; + } + return 0; + } + + char currChar = 0, prevChar = 0; + // draw the line + style = position_style(lineStartPos, lineLen, 0); + for (i=0; itab_distance()); + int xAbs = (mode==GET_WIDTH) ? startX : startX+mHorizOffset-text_area.x; + w = (((xAbs/tab)+1)*tab) - xAbs; + if (mode==DRAW_LINE) + draw_string( style|BG_ONLY_MASK, startX, Y, startX+w, 0, 0 ); + if (mode==FIND_INDEX && startX+w>rightClip) { + // find x pos inside block + free(lineStr); + return lineStartPos + startIndex; + } + } else { + // draw a text segment + w = int( string_width( lineStr+startIndex, i-startIndex, style ) ); + if (mode==DRAW_LINE) + draw_string( style, startX, Y, startX+w, lineStr+startIndex, i-startIndex ); + if (mode==FIND_INDEX && startX+w>rightClip) { + // find x pos inside block + int di = find_x(lineStr+startIndex, i-startIndex, style, rightClip-startX); + free(lineStr); + IS_UTF8_ALIGNED2(buffer(), (lineStartPos+startIndex+di)) + return lineStartPos + startIndex + di; + } + } + style = charStyle; + startX += w; + startIndex = i; + } + i += len; + prevChar = currChar; + } + int w = 0; + if (currChar=='\t') { + // draw a single Tab space + int tab = (int)col_to_x(mBuffer->tab_distance()); + int xAbs = (mode==GET_WIDTH) ? startX : startX+mHorizOffset-text_area.x; + w = (((xAbs/tab)+1)*tab) - xAbs; + if (mode==DRAW_LINE) + draw_string( style|BG_ONLY_MASK, startX, Y, startX+w, 0, 0 ); + if (mode==FIND_INDEX) { + // find x pos inside block + free(lineStr); + return lineStartPos + startIndex + ( rightClip-startX>w ? 1 : 0 ); + } + } else { + w = int( string_width( lineStr+startIndex, i-startIndex, style ) ); + if (mode==DRAW_LINE) + draw_string( style, startX, Y, startX+w, lineStr+startIndex, i-startIndex ); + if (mode==FIND_INDEX) { + // find x pos inside block + int di = find_x(lineStr+startIndex, i-startIndex, style, rightClip-startX); + free(lineStr); + IS_UTF8_ALIGNED2(buffer(), (lineStartPos+startIndex+di)) + return lineStartPos + startIndex + di; + } + } + if (mode==GET_WIDTH) { + free(lineStr); + return startX+w; + } + + // clear the rest of the line + startX += w; + style = position_style(lineStartPos, lineLen, i); + if (mode==DRAW_LINE) + draw_string( style|BG_ONLY_MASK, startX, Y, text_area.x+text_area.w, lineStr, lineLen ); + + free(lineStr); + IS_UTF8_ALIGNED2(buffer(), (lineStartPos+lineLen)) + return lineStartPos + lineLen; +} + + +/** + \brief Find the index of the character that lies at the given x position. + \param s UTF-8 text string + \param len length of string + \param style index into style lookup table + \param x position in pixels + \return index into buffer + */ +int Fl_Text_Display::find_x(const char *s, int len, int style, int x) const { + IS_UTF8_ALIGNED(s) + + // TODO: use binary search which may be quicker. + int i = 0; + while (ix) + return i; + i += cl; + } + return len; +} + + + +/** + \brief Draw a single line of text. + + Draw the text on a single line represented by \p visLineNum (the + number of lines down from the top of the display), limited by + \p leftClip and \p rightClip window coordinates and \p leftCharIndex and + \p rightCharIndex character positions (not including the character at + position \p rightCharIndex). + + \param visLineNum index of line in the visible line number lookup + \param leftClip, rightClip pixel position of clipped area + \param leftCharIndex, rightCharIndex index into line of segment that we want to draw + */ void Fl_Text_Display::draw_vline(int visLineNum, int leftClip, int rightClip, int leftCharIndex, int rightCharIndex) { - Fl_Text_Buffer * buf = mBuffer; - int i, X, Y, startX, charIndex, lineStartPos, lineLen, fontHeight; - int stdCharWidth, charWidth, startIndex, charStyle, style; - int charLen, outStartIndex, outIndex; - int dispIndexOffset; - char expandedChar[ FL_TEXT_MAX_EXP_CHAR_LEN ], outStr[ MAX_DISP_LINE_LEN ]; - char *outPtr; - const char *lineStr; - -// printf("draw_vline(visLineNum=%d, leftClip=%d, rightClip=%d, leftCharIndex=%d, rightCharIndex=%d)\n", -// visLineNum, leftClip, rightClip, leftCharIndex, rightCharIndex); -// printf("nNVisibleLines=%d\n", mNVisibleLines); - + int Y, lineStartPos, lineLen, fontHeight; + + // printf("draw_vline(visLineNum=%d, leftClip=%d, rightClip=%d, leftCharIndex=%d, rightCharIndex=%d)\n", + // visLineNum, leftClip, rightClip, leftCharIndex, rightCharIndex); + // printf("nNVisibleLines=%d\n", mNVisibleLines); + /* If line is not displayed, skip it */ if ( visLineNum < 0 || visLineNum >= mNVisibleLines ) return; - + /* Calculate Y coordinate of the string to draw */ fontHeight = mMaxsize; Y = text_area.y + visLineNum * fontHeight; - + /* Get the text, length, and buffer position of the line to display */ lineStartPos = mLineStarts[ visLineNum ]; -// printf("lineStartPos=%d\n", lineStartPos); if ( lineStartPos == -1 ) { lineLen = 0; - lineStr = NULL; } else { lineLen = vline_length( visLineNum ); - lineStr = buf->text_range( lineStartPos, lineStartPos + lineLen ); } - - /* Space beyond the end of the line is still counted in units of characters - of a standardized character width (this is done mostly because style - changes based on character position can still occur in this region due - to rectangular Fl_Text_Selections). stdCharWidth must be non-zero to - prevent a potential infinite loop if X does not advance */ - stdCharWidth = TMPFONTWIDTH; //mFontStruct->max_bounds.width; - if ( stdCharWidth <= 0 ) { - Fl::error("Fl_Text_Display::draw_vline(): bad font measurement"); - if (lineStr) free((void *)lineStr); - return; - } - + /* Shrink the clipping range to the active display area */ leftClip = max( text_area.x, leftClip ); rightClip = min( rightClip, text_area.x + text_area.w ); - - /* Rectangular Fl_Text_Selections are based on "real" line starts (after - a newline or start of buffer). Calculate the difference between the - last newline position and the line start we're using. Since scanning - back to find a newline is expensive, only do so if there's actually a - rectangular Fl_Text_Selection which needs it */ - if (mContinuousWrap && (range_touches_selection(buf->primary_selection(), - lineStartPos, lineStartPos + lineLen) || range_touches_selection( - buf->secondary_selection(), lineStartPos, lineStartPos + lineLen) || - range_touches_selection(buf->highlight_selection(), lineStartPos, - lineStartPos + lineLen))) { - dispIndexOffset = buf->count_displayed_characters( - buf->line_start(lineStartPos), lineStartPos); - } else - dispIndexOffset = 0; - - /* Step through character positions from the beginning of the line (even if - that's off the left edge of the displayed area) to find the first - character position that's not clipped, and the X coordinate for drawing - that character */ - X = text_area.x - mHorizOffset; - outIndex = 0; - for ( charIndex = 0; ; charIndex += lineStr ? fl_utf8len(lineStr[charIndex]) : 1 ) { - charLen = charIndex >= lineLen ? 1 : - Fl_Text_Buffer::expand_character( lineStr+charIndex, outIndex, - expandedChar, buf->tab_distance()); - style = position_style( lineStartPos, lineLen, charIndex, - outIndex + dispIndexOffset ); - charWidth = charIndex >= lineLen ? stdCharWidth : - string_width( expandedChar, charLen, style ); - if ( X + charWidth >= leftClip && charIndex >= leftCharIndex ) { - startIndex = charIndex; - outStartIndex = outIndex; - startX = X; - break; - } - X += charWidth; - outIndex += charLen; - } - - /* Scan character positions from the beginning of the clipping range, and - draw parts whenever the style changes (also note if the cursor is on - this line, and where it should be drawn to take advantage of the x - position which we've gone to so much trouble to calculate) */ - /* since characters between style may overlap, we draw the full - background first */ - int sX = startX; - outPtr = outStr; - outIndex = outStartIndex; - X = startX; - for (charIndex = startIndex; - charIndex < rightCharIndex; - charIndex += lineStr ? fl_utf8len(lineStr[charIndex]) : 1 ) - { - charLen = charIndex >= lineLen ? 1 : - Fl_Text_Buffer::expand_character( lineStr+charIndex, outIndex, expandedChar, - buf->tab_distance()); - charStyle = position_style( lineStartPos, lineLen, charIndex, - outIndex + dispIndexOffset ); - for ( i = 0; i < charLen; i++ ) { // FIXME: this rips apart the utf-8 sequneces - if ( i != 0 && charIndex < lineLen && lineStr[ charIndex ] == '\t' ) - charStyle = position_style( lineStartPos, lineLen, - charIndex, outIndex + dispIndexOffset ); - if ( charStyle != style ) { - draw_string( style|BG_ONLY_MASK, sX, Y, X, outStr, outPtr - outStr ); - outPtr = outStr; - sX = X; - style = charStyle; - } - if ( charIndex < lineLen ) { - *outPtr = expandedChar[ i ]; - int l = 1; - if (*outPtr & 0x80) { - l = fl_utf8len(*outPtr); - if (l<=0) l = 1; - } - charWidth = string_width( &expandedChar[ i ], l, charStyle ); - } else - charWidth = stdCharWidth; - outPtr++; - X += charWidth; - outIndex++; - } - if ( outPtr - outStr + FL_TEXT_MAX_EXP_CHAR_LEN >= MAX_DISP_LINE_LEN || X >= rightClip ) - break; - } - draw_string( style|BG_ONLY_MASK, sX, Y, X, outStr, outPtr - outStr ); - - /* now draw the text over the previously erased background */ - outPtr = outStr; - outIndex = outStartIndex; - X = startX; - for (charIndex = startIndex; - charIndex < rightCharIndex; - charIndex += lineStr ? fl_utf8len(lineStr[charIndex]) : 0) - { - charLen = charIndex >= lineLen ? 1 : - Fl_Text_Buffer::expand_character( lineStr+charIndex, outIndex, expandedChar, - buf->tab_distance()); - charStyle = position_style( lineStartPos, lineLen, charIndex, - outIndex + dispIndexOffset ); - for ( i = 0; i < charLen; i++ ) { // FIXME: this rips apart the utf-8 sequneces - if ( i != 0 && charIndex < lineLen && lineStr[ charIndex ] == '\t' ) - charStyle = position_style( lineStartPos, lineLen, - charIndex, outIndex + dispIndexOffset ); - if ( charStyle != style ) { - draw_string( style|TEXT_ONLY_MASK, startX, Y, X, outStr, outPtr - outStr ); - outPtr = outStr; - startX = X; - style = charStyle; - } - if ( charIndex < lineLen ) { - *outPtr = expandedChar[ i ]; - int l = 1; - if (*outPtr & 0x80) { - l = fl_utf8len(*outPtr); - if (l<=0) l = 1; - } - charWidth = string_width( &expandedChar[ i ], l, charStyle ); - } else - charWidth = stdCharWidth; - outPtr++; - X += charWidth; - outIndex++; - } - if ( outPtr - outStr + FL_TEXT_MAX_EXP_CHAR_LEN >= MAX_DISP_LINE_LEN || X >= rightClip ) - break; - } - - /* Draw the remaining style segment */ - draw_string( style|TEXT_ONLY_MASK, startX, Y, X, outStr, outPtr - outStr ); - - /* Draw the cursor if part of it appeared on the redisplayed part of - this line. Also check for the cases which are not caught as the - line is scanned above: when the cursor appears at the very end - of the redisplayed section. */ - /* CET - FIXME - if ( mCursorOn ) - { - if ( hasCursor ) - draw_cursor( cursorX, Y ); - else if ( charIndex < lineLen && ( lineStartPos + charIndex + 1 == cursorPos ) - && X == rightClip ) - { - if ( cursorPos >= buf->length() ) - draw_cursor( X - 1, Y ); - else - { - draw_cursor( X - 1, Y ); - } - } - } - */ - if ( lineStr != NULL ) - free((void *)lineStr); + + handle_vline(DRAW_LINE, + lineStartPos, lineLen, leftCharIndex, rightCharIndex, + Y, Y+fontHeight, leftClip, rightClip); + return; } -/** - Draw a string or blank area according to parameter "style", using the - appropriate colors and drawing method for that style, with top left - corner at X, y. If style says to draw text, use "string" as source of - characters, and draw "nChars", if style is FILL, erase - rectangle where text would have drawn from X to toX and from Y to - the maximum Y extent of the current font(s). -*/ -void Fl_Text_Display::draw_string( int style, int X, int Y, int toX, - const char *string, int nChars ) { - const Style_Table_Entry * styleRec; + +/** + \brief Draw a text segment in a single style. + + Draw a string or blank area according to parameter \p style, using the + appropriate colors and drawing method for that style, with top left + corner at \p X, \p Y. If style says to draw text, use \p string as + source of characters, and draw \p nChars, if style is FILL, erase + rectangle where text would have drawn from \p X to \p toX and from + \p Y to the maximum y extent of the current font(s). + + \param style index into style lookup table + \param X, Y drawing origin + \param toX rightmost position if this is a fill operation + \param string text if this is a drawing operation + \param nChars number of characters to draw + */ +void Fl_Text_Display::draw_string(int style, + int X, int Y, int toX, + const char *string, int nChars) const { + IS_UTF8_ALIGNED(string) + + const Style_Table_Entry * styleRec; + /* Draw blank area rather than text, if that was the request */ if ( style & FILL_MASK ) { if (style & TEXT_ONLY_MASK) return; @@ -1637,45 +1921,45 @@ void Fl_Text_Display::draw_string( int style, int X, int Y, int toX, return; } /* Set font, color, and gc depending on style. For normal text, GCs - for normal drawing, or drawing within a Fl_Text_Selection or highlight are - pre-allocated and pre-configured. For syntax highlighting, GCs are - configured here, on the fly. */ - + for normal drawing, or drawing within a Fl_Text_Selection or highlight are + pre-allocated and pre-configured. For syntax highlighting, GCs are + configured here, on the fly. */ + Fl_Font font = textfont(); int fsize = textsize(); Fl_Color foreground; Fl_Color background; - + if ( style & STYLE_LOOKUP_MASK ) { int si = (style & STYLE_LOOKUP_MASK) - 'A'; if (si < 0) si = 0; else if (si >= mNStyles) si = mNStyles - 1; - + styleRec = mStyleTable + si; font = styleRec->font; fsize = styleRec->size; - + if (style & PRIMARY_MASK) { - if (Fl::focus() == this) background = selection_color(); + if (Fl::focus() == (Fl_Widget*)this) background = selection_color(); else background = fl_color_average(color(), selection_color(), 0.4f); } else if (style & HIGHLIGHT_MASK) { - if (Fl::focus() == this) background = fl_color_average(color(), selection_color(), 0.5f); + if (Fl::focus() == (Fl_Widget*)this) background = fl_color_average(color(), selection_color(), 0.5f); else background = fl_color_average(color(), selection_color(), 0.6f); } else background = color(); foreground = fl_contrast(styleRec->color, background); } else if (style & PRIMARY_MASK) { - if (Fl::focus() == this) background = selection_color(); + if (Fl::focus() == (Fl_Widget*)this) background = selection_color(); else background = fl_color_average(color(), selection_color(), 0.4f); foreground = fl_contrast(textcolor(), background); } else if (style & HIGHLIGHT_MASK) { - if (Fl::focus() == this) background = fl_color_average(color(), selection_color(), 0.5f); + if (Fl::focus() == (Fl_Widget*)this) background = fl_color_average(color(), selection_color(), 0.5f); else background = fl_color_average(color(), selection_color(), 0.6f); foreground = fl_contrast(textcolor(), background); } else { foreground = textcolor(); background = color(); } - + if (!(style & TEXT_ONLY_MASK)) { fl_color( background ); fl_rectf( X, Y, toX - X, mMaxsize ); @@ -1683,47 +1967,59 @@ void Fl_Text_Display::draw_string( int style, int X, int Y, int toX, if (!(style & BG_ONLY_MASK)) { fl_color( foreground ); fl_font( font, fsize ); +#if !(defined(__APPLE__) || defined(WIN32)) && USE_XFT + // makes sure antialiased ÄÖÜ do not leak on line above + fl_push_clip(X, Y, toX - X, mMaxsize); +#endif fl_draw( string, nChars, X, Y + mMaxsize - fl_descent()); +#if !(defined(__APPLE__) || defined(WIN32)) && USE_XFT + fl_pop_clip(); +#endif } - + // CET - FIXME /* If any space around the character remains unfilled (due to use of - different sized fonts for highlighting), fill in above or below - to erase previously drawn characters */ + different sized fonts for highlighting), fill in above or below + to erase previously drawn characters */ /* - if (fs->ascent < mAscent) - clear_rect( style, X, Y, toX - X, mAscent - fs->ascent); - if (fs->descent < mDescent) - clear_rect( style, X, Y + mAscent + fs->descent, toX - x, - mDescent - fs->descent); - */ + if (fs->ascent < mAscent) + clear_rect( style, X, Y, toX - X, mAscent - fs->ascent); + if (fs->descent < mDescent) + clear_rect( style, X, Y + mAscent + fs->descent, toX - x, + mDescent - fs->descent); + */ /* Underline if style is secondary Fl_Text_Selection */ - + /* - if (style & SECONDARY_MASK) - XDrawLine(XtDisplay(mW), XtWindow(mW), gc, x, - y + mAscent, toX - 1, Y + fs->ascent); - */ + if (style & SECONDARY_MASK) + XDrawLine(XtDisplay(mW), XtWindow(mW), gc, x, + y + mAscent, toX - 1, Y + fs->ascent); + */ } + /** - Clear a rectangle with the appropriate background color for "style" -*/ -void Fl_Text_Display::clear_rect( int style, int X, int Y, - int width, int height ) { + \brief Clear a rectangle with the appropriate background color for \p style. + + \param style index into style table + \param X, Y, width, height size and position of background area + */ +void Fl_Text_Display::clear_rect(int style, + int X, int Y, + int width, int height) const { /* A width of zero means "clear to end of window" to XClearArea */ if ( width == 0 ) return; - + if (style & PRIMARY_MASK) { - if (Fl::focus()==this) { + if (Fl::focus()==(Fl_Widget*)this) { fl_color(selection_color()); } else { fl_color(fl_color_average(color(), selection_color(), 0.4f)); } } else if (style & HIGHLIGHT_MASK) { - if (Fl::focus()==this) { + if (Fl::focus()==(Fl_Widget*)this) { fl_color(fl_color_average(color(), selection_color(), 0.5f)); } else { fl_color(fl_color_average(color(), selection_color(), 0.6f)); @@ -1735,10 +2031,14 @@ void Fl_Text_Display::clear_rect( int style, int X, int Y, } + /** - Draw a cursor with top center at X, y. -*/ + \brief Draw a cursor with top center at \p X, \p Y. + + \param X, Y cursor position in pixels + */ void Fl_Text_Display::draw_cursor( int X, int Y ) { + typedef struct { int x1, y1, x2, y2; } @@ -1751,17 +2051,17 @@ void Fl_Text_Display::draw_cursor( int X, int Y ) { int nSegs = 0; int fontHeight = mMaxsize; int bot = Y + fontHeight - 1; - + if ( X < text_area.x - 1 || X > text_area.x + text_area.w ) return; - + /* For cursors other than the block, make them around 2/3 of a character - width, rounded to an even number of pixels so that X will draw an - odd number centered on the stem at x. */ + width, rounded to an even number of pixels so that X will draw an + odd number centered on the stem at x. */ cursorWidth = 4; //(fontWidth/3) * 2; left = X - cursorWidth / 2; right = left + cursorWidth; - + /* Create segments and draw cursor */ if ( mCursorStyle == CARET_CURSOR ) { midY = bot - fontHeight / 5; @@ -1797,72 +2097,89 @@ void Fl_Text_Display::draw_cursor( int X, int Y ) { nSegs = 4; } fl_color( mCursor_color ); - + for ( int k = 0; k < nSegs; k++ ) { fl_line( segs[ k ].x1, segs[ k ].y1, segs[ k ].x2, segs[ k ].y2 ); } } + + /** - Determine the drawing method to use to draw a specific character from "buf". - "lineStartPos" gives the character index where the line begins, "lineIndex", - the number of characters past the beginning of the line, and "dispIndex", - the number of displayed characters past the beginning of the line. Passing - lineStartPos of -1 returns the drawing style for "no text". -** - Why not just: position_style(pos)? Because style applies to blank areas - of the window beyond the text boundaries, and because this routine must also - decide whether a position is inside of a rectangular Fl_Text_Selection, and do - so efficiently, without re-counting character positions from the start of the - line. -** - Note that style is a somewhat incorrect name, drawing method would - be more appropriate. -*/ -int Fl_Text_Display::position_style( int lineStartPos, - int lineLen, int lineIndex, int dispIndex ) const { + \brief Find the correct style for a character. + + Determine the drawing method to use to draw a specific character from "buf". + \p lineStartPos gives the character index where the line begins, \p lineIndex, + the number of characters past the beginning of the line, and \p lineIndex + the number of displayed characters past the beginning of the line. Passing + \p lineStartPos of -1 returns the drawing style for "no text". + + Why not just: position_style(pos)? Because style applies to blank areas + of the window beyond the text boundaries, and because this routine must also + decide whether a position is inside of a rectangular Fl_Text_Selection, and do + so efficiently, without re-counting character positions from the start of the + line. + + Note that style is a somewhat incorrect name, drawing method would + be more appropriate. + + \param lineStartPos beginning of this line + \param lineLen number of bytes in line + \param lineIndex position of character within line + \return style for the given character + */ +int Fl_Text_Display::position_style( int lineStartPos, int lineLen, int lineIndex) const +{ + IS_UTF8_ALIGNED2(buffer(), lineStartPos) + Fl_Text_Buffer * buf = mBuffer; Fl_Text_Buffer *styleBuf = mStyleBuffer; int pos, style = 0; - + if ( lineStartPos == -1 || buf == NULL ) return FILL_MASK; - + pos = lineStartPos + min( lineIndex, lineLen ); - + if ( lineIndex >= lineLen ) style = FILL_MASK; else if ( styleBuf != NULL ) { - // FIXME: character is ucs-4 - style = ( unsigned char ) styleBuf->character( pos ); + style = ( unsigned char ) styleBuf->byte_at( pos ); if (style == mUnfinishedStyle && mUnfinishedHighlightCB) { - /* encountered "unfinished" style, trigger parsing */ - (mUnfinishedHighlightCB)( pos, mHighlightCBArg); - // FIXME: character is ucs-4 - style = (unsigned char) styleBuf->character( pos); + /* encountered "unfinished" style, trigger parsing */ + (mUnfinishedHighlightCB)( pos, mHighlightCBArg); + style = (unsigned char) styleBuf->byte_at( pos); } } - if (buf->primary_selection()->includes(pos, lineStartPos, dispIndex)) + if (buf->primary_selection()->includes(pos)) style |= PRIMARY_MASK; - if (buf->highlight_selection()->includes(pos, lineStartPos, dispIndex)) + if (buf->highlight_selection()->includes(pos)) style |= HIGHLIGHT_MASK; - if (buf->secondary_selection()->includes(pos, lineStartPos, dispIndex)) + if (buf->secondary_selection()->includes(pos)) style |= SECONDARY_MASK; return style; } -/** - Find the width of a string in the font of a particular style -*/ -int Fl_Text_Display::string_width( const char *string, int length, int style ) const { - Fl_Font font; - int fsize; - if ( style & STYLE_LOOKUP_MASK ) { +/** + \brief Find the width of a string in the font of a particular style. + + \param string the text + \param length number of bytes in string + \param style index into style table + \return width of text segment in pixels + */ +double Fl_Text_Display::string_width( const char *string, int length, int style ) const { + IS_UTF8_ALIGNED(string) + + Fl_Font font; + Fl_Fontsize fsize; + + if ( mNStyles && (style & STYLE_LOOKUP_MASK) ) { int si = (style & STYLE_LOOKUP_MASK) - 'A'; if (si < 0) si = 0; else if (si >= mNStyles) si = mNStyles - 1; - + font = mStyleTable[si].font; fsize = mStyleTable[si].size; } else { @@ -1870,23 +2187,28 @@ int Fl_Text_Display::string_width( const char *string, int length, int style ) c fsize = textsize(); } fl_font( font, fsize ); - - return ( int ) ( fl_width( string, length ) ); + return fl_width( string, length ); } -/** - Translate window coordinates to the nearest (insert cursor or character - cell) text position. The parameter posType specifies how to interpret the - position: CURSOR_POS means translate the coordinates to the nearest cursor - position, and CHARACTER_POS means return the position of the character - closest to (X, Y). -*/ -int Fl_Text_Display::xy_to_position( int X, int Y, int posType ) const { - int charIndex, lineStart, lineLen, fontHeight; - int charWidth, charLen, charStyle, visLineNum, xStep, outIndex; - char expandedChar[ FL_TEXT_MAX_EXP_CHAR_LEN ]; - const char *lineStr; + +/** + \brief Translate a pixel position into a character index. + + Translate window coordinates to the nearest (insert cursor or character + cell) text position. The parameter \p posType specifies how to interpret the + position: CURSOR_POS means translate the coordinates to the nearest cursor + position, and CHARACTER_POS means return the position of the character + closest to (\p X, \p Y). + + \param X, Y pixel position + \param posType CURSOR_POS or CHARACTER_POS + \return index into text buffer + */ +int Fl_Text_Display::xy_to_position( int X, int Y, int posType ) const { + int lineStart, lineLen, fontHeight; + int visLineNum; + /* Find the visible line number corresponding to the Y coordinate */ fontHeight = mMaxsize; visLineNum = ( Y - text_area.y ) / fontHeight; @@ -1894,73 +2216,67 @@ int Fl_Text_Display::xy_to_position( int X, int Y, int posType ) const { return mFirstChar; if ( visLineNum >= mNVisibleLines ) visLineNum = mNVisibleLines - 1; - + /* Find the position at the start of the line */ lineStart = mLineStarts[ visLineNum ]; - + /* If the line start was empty, return the last position in the buffer */ if ( lineStart == -1 ) return mBuffer->length(); - + /* Get the line text and its length */ lineLen = vline_length( visLineNum ); - lineStr = mBuffer->text_range( lineStart, lineStart + lineLen ); - - /* Step through character positions from the beginning of the line - to find the character position corresponding to the X coordinate */ - xStep = text_area.x - mHorizOffset; - outIndex = 0; - for (charIndex = 0; - charIndex < lineLen; - charIndex += fl_utf8len(lineStr[charIndex]) ) - { - charLen = Fl_Text_Buffer::expand_character( lineStr+charIndex, outIndex, expandedChar, - mBuffer->tab_distance()); - charStyle = position_style( lineStart, lineLen, charIndex, outIndex ); - charWidth = string_width( expandedChar, charLen, charStyle ); - if ( X < xStep + ( posType == CURSOR_POS ? charWidth / 2 : charWidth ) ) { - free((char *)lineStr); - return lineStart + charIndex; - } - xStep += charWidth; - outIndex += charLen; - } - - /* If the X position was beyond the end of the line, return the position - of the newline at the end of the line */ - free((char *)lineStr); - return lineStart + lineLen; + + return handle_vline(FIND_INDEX, + lineStart, lineLen, 0, 0, + 0, 0, + text_area.x, X); } + + /** - Translate window coordinates to the nearest row and column number for - positioning the cursor. This, of course, makes no sense when the font is - proportional, since there are no absolute columns. The parameter posType - specifies how to interpret the position: CURSOR_POS means translate the - coordinates to the nearest position between characters, and CHARACTER_POS - means translate the position to the nearest character cell. -*/ + \brief Translate pixel coordinates into row and column. + + Translate window coordinates to the nearest row and column number for + positioning the cursor. This, of course, makes no sense when the font is + proportional, since there are no absolute columns. The parameter posType + specifies how to interpret the position: CURSOR_POS means translate the + coordinates to the nearest position between characters, and CHARACTER_POS + means translate the position to the nearest character cell. + + \param X, Y pixel coordinates + \param[out] row, column neares row and column + \param posType CURSOR_POS or CHARACTER_POS + */ void Fl_Text_Display::xy_to_rowcol( int X, int Y, int *row, - int *column, int posType ) const { + int *column, int posType ) const { int fontHeight = mMaxsize; int fontWidth = TMPFONTWIDTH; //mFontStruct->max_bounds.width; - + /* Find the visible line number corresponding to the Y coordinate */ *row = ( Y - text_area.y ) / fontHeight; - if ( *row < 0 ) * row = 0; - if ( *row >= mNVisibleLines ) * row = mNVisibleLines - 1; + if ( *row < 0 ) *row = 0; + if ( *row >= mNVisibleLines ) *row = mNVisibleLines - 1; + *column = ( ( X - text_area.x ) + mHorizOffset + - ( posType == CURSOR_POS ? fontWidth / 2 : 0 ) ) / fontWidth; + ( posType == CURSOR_POS ? fontWidth / 2 : 0 ) ) / fontWidth; if ( *column < 0 ) * column = 0; } + + /** - Offset the line starts array, mTopLineNum, mFirstChar and lastChar, for a new - vertical scroll position given by newTopLineNum. If any currently displayed - lines will still be visible, salvage the line starts values, otherwise, - count lines from the nearest known line start (start or end of buffer, or - the closest value in the mLineStarts array) -*/ + \brief Offset line start counters for a new vertical scroll position. + + Offset the line starts array, mTopLineNum, mFirstChar and lastChar, for a new + vertical scroll position given by newTopLineNum. If any currently displayed + lines will still be visible, salvage the line starts values, otherwise, + count lines from the nearest known line start (start or end of buffer, or + the closest value in the mLineStarts array) + + \param newTopLineNum index into buffer + */ void Fl_Text_Display::offset_line_starts( int newTopLineNum ) { int oldTopLineNum = mTopLineNum; int oldFirstChar = mFirstChar; @@ -1969,14 +2285,14 @@ void Fl_Text_Display::offset_line_starts( int newTopLineNum ) { int *lineStarts = mLineStarts; int i, lastLineNum; Fl_Text_Buffer *buf = mBuffer; - + /* If there was no offset, nothing needs to be changed */ if ( lineDelta == 0 ) return; - + /* Find the new value for mFirstChar by counting lines from the nearest - known line start (start or end of buffer, or the closest value in the - lineStarts array) */ + known line start (start or end of buffer, or the closest value in the + lineStarts array) */ lastLineNum = oldTopLineNum + nVisLines - 1; if ( newTopLineNum < oldTopLineNum && newTopLineNum < -lineDelta ) { mFirstChar = skip_lines( 0, newTopLineNum - 1, true ); @@ -1986,11 +2302,11 @@ void Fl_Text_Display::offset_line_starts( int newTopLineNum ) { mFirstChar = lineStarts[ newTopLineNum - oldTopLineNum ]; } else if ( newTopLineNum - lastLineNum < mNBufferLines - newTopLineNum ) { mFirstChar = skip_lines( lineStarts[ nVisLines - 1 ], - newTopLineNum - lastLineNum, true ); + newTopLineNum - lastLineNum, true ); } else { mFirstChar = rewind_lines( buf->length(), mNBufferLines - newTopLineNum + 1 ); } - + /* Fill in the line starts array */ if ( lineDelta < 0 && -lineDelta < nVisLines ) { for ( i = nVisLines - 1; i >= -lineDelta; i-- ) @@ -2002,32 +2318,46 @@ void Fl_Text_Display::offset_line_starts( int newTopLineNum ) { calc_line_starts( nVisLines - lineDelta, nVisLines - 1 ); } else calc_line_starts( 0, nVisLines ); - + /* Set lastChar and mTopLineNum */ calc_last_char(); mTopLineNum = newTopLineNum; - - /* If we're numbering lines or being asked to maintain an absolute line - number, re-calculate the absolute line number */ - absolute_top_line_number(oldFirstChar); + + /* If we're numbering lines or being asked to maintain an absolute line + number, re-calculate the absolute line number */ + absolute_top_line_number(oldFirstChar); } + + /** - Update the line starts array, mTopLineNum, mFirstChar and lastChar for text - display "textD" after a modification to the text buffer, given by the - position where the change began "pos", and the nmubers of characters - and lines inserted and deleted. -*/ -void Fl_Text_Display::update_line_starts( int pos, int charsInserted, - int charsDeleted, int linesInserted, int linesDeleted, int *scrolled ) { - int * lineStarts = mLineStarts; + \brief Update line start arrays and variables. + + Update the line starts array, mTopLineNum, mFirstChar and lastChar for this + text display after a modification to the text buffer, given by the + position \p pos where the change began, and the numbers of characters + and lines inserted and deleted. + + \param pos index into buffer of recent changes + \param charsInserted number of bytes(!) inserted + \param charsDeleted number of bytes(!) deleted + \param linesInserted number of lines + \param linesDeleted number of lines + \param[out] scrolled set to 1 if the text display needs to be scrolled + */ +void Fl_Text_Display::update_line_starts(int pos, int charsInserted, + int charsDeleted, int linesInserted, + int linesDeleted, int *scrolled ) { + IS_UTF8_ALIGNED2(buffer(), pos) + + int *lineStarts = mLineStarts; int i, lineOfPos, lineOfEnd, nVisLines = mNVisibleLines; int charDelta = charsInserted - charsDeleted; int lineDelta = linesInserted - linesDeleted; - + /* If all of the changes were before the displayed text, the display - doesn't change, just update the top line num and offset the line - start entries and first and last characters */ + doesn't change, just update the top line num and offset the line + start entries and first and last characters */ if ( pos + charsDeleted < mFirstChar ) { mTopLineNum += lineDelta; for ( i = 0; i < nVisLines && lineStarts[i] != -1; i++ ) @@ -2037,16 +2367,15 @@ void Fl_Text_Display::update_line_starts( int pos, int charsInserted, *scrolled = 0; return; } - + /* The change began before the beginning of the displayed text, but - part or all of the displayed text was deleted */ + part or all of the displayed text was deleted */ if ( pos < mFirstChar ) { /* If some text remains in the window, anchor on that */ if ( position_to_line( pos + charsDeleted, &lineOfEnd ) && - ++lineOfEnd < nVisLines && lineStarts[ lineOfEnd ] != -1 ) { + ++lineOfEnd < nVisLines && lineStarts[ lineOfEnd ] != -1 ) { mTopLineNum = max( 1, mTopLineNum + lineDelta ); - mFirstChar = rewind_lines( - lineStarts[ lineOfEnd ] + charDelta, lineOfEnd ); + mFirstChar = rewind_lines(lineStarts[ lineOfEnd ] + charDelta, lineOfEnd ); /* Otherwise anchor on original line number and recount everything */ } else { if ( mTopLineNum > mNBufferLines + lineDelta ) { @@ -2061,12 +2390,12 @@ void Fl_Text_Display::update_line_starts( int pos, int charsInserted, *scrolled = 1; return; } - + /* If the change was in the middle of the displayed text (it usually is), - salvage as much of the line starts array as possible by moving and - offsetting the entries after the changed area, and re-counting the - added lines or the lines beyond the salvaged part of the line starts - array */ + salvage as much of the line starts array as possible by moving and + offsetting the entries after the changed area, and re-counting the + added lines or the lines beyond the salvaged part of the line starts + array */ if ( pos <= mLastChar ) { /* find line on which the change began */ position_to_line( pos, &lineOfPos ); @@ -2077,11 +2406,11 @@ void Fl_Text_Display::update_line_starts( int pos, int charsInserted, } else if ( lineDelta > 0 ) { for ( i = nVisLines - 1; i >= lineOfPos + lineDelta + 1; i-- ) lineStarts[ i ] = lineStarts[ i - lineDelta ] + - ( lineStarts[ i - lineDelta ] == -1 ? 0 : charDelta ); + ( lineStarts[ i - lineDelta ] == -1 ? 0 : charDelta ); } else /* (lineDelta < 0) */ { for ( i = max( 0, lineOfPos + 1 ); i < nVisLines + lineDelta; i++ ) lineStarts[ i ] = lineStarts[ i - lineDelta ] + - ( lineStarts[ i - lineDelta ] == -1 ? 0 : charDelta ); + ( lineStarts[ i - lineDelta ] == -1 ? 0 : charDelta ); } /* fill in the missing line starts */ if ( linesInserted >= 0 ) @@ -2093,9 +2422,9 @@ void Fl_Text_Display::update_line_starts( int pos, int charsInserted, *scrolled = 0; return; } - + /* Change was past the end of the displayed text, but displayable by virtue - of being an insert at the end of the buffer into visible blank lines */ + of being an insert at the end of the buffer into visible blank lines */ if ( empty_vlines() ) { position_to_line( pos, &lineOfPos ); calc_line_starts( lineOfPos, lineOfPos + linesInserted ); @@ -2103,24 +2432,30 @@ void Fl_Text_Display::update_line_starts( int pos, int charsInserted, *scrolled = 0; return; } - + /* Change was beyond the end of the buffer and not visible, do nothing */ *scrolled = 0; } + + /** - Scan through the text in the "textD"'s buffer and recalculate the line - starts array values beginning at index "startLine" and continuing through - (including) "endLine". It assumes that the line starts entry preceding - "startLine" (or mFirstChar if startLine is 0) is good, and re-counts - newlines to fill in the requested entries. Out of range values for - "startLine" and "endLine" are acceptable. -*/ + \brief Update the line start arrays. + + Scan through the text in the "textD"'s buffer and recalculate the line + starts array values beginning at index "startLine" and continuing through + (including) "endLine". It assumes that the line starts entry preceding + "startLine" (or mFirstChar if startLine is 0) is good, and re-counts + newlines to fill in the requested entries. Out of range values for + "startLine" and "endLine" are acceptable. + + \param startLine, endLine range of lines to scan as line numbers + */ void Fl_Text_Display::calc_line_starts( int startLine, int endLine ) { int startPos, bufLen = mBuffer->length(); int line, lineEnd, nextLineStart, nVis = mNVisibleLines; int *lineStarts = mLineStarts; - + /* Clean up (possibly) messy input parameters */ if ( endLine < 0 ) endLine = 0; if ( endLine >= nVis ) endLine = nVis - 1; @@ -2128,34 +2463,34 @@ void Fl_Text_Display::calc_line_starts( int startLine, int endLine ) { if ( startLine >= nVis ) startLine = nVis - 1; if ( startLine > endLine ) return; - + /* Find the last known good line number -> position mapping */ if ( startLine == 0 ) { lineStarts[ 0 ] = mFirstChar; startLine = 1; } startPos = lineStarts[ startLine - 1 ]; - + /* If the starting position is already past the end of the text, - fill in -1's (means no text on line) and return */ + fill in -1's (means no text on line) and return */ if ( startPos == -1 ) { for ( line = startLine; line <= endLine; line++ ) lineStarts[ line ] = -1; return; } - + /* Loop searching for ends of lines and storing the positions of the - start of the next line in lineStarts */ + start of the next line in lineStarts */ for ( line = startLine; line <= endLine; line++ ) { find_line_end(startPos, true, &lineEnd, &nextLineStart); startPos = nextLineStart; if ( startPos >= bufLen ) { /* If the buffer ends with a newline or line break, put - buf->length() in the next line start position (instead of - a -1 which is the normal marker for an empty line) to - indicate that the cursor may safely be displayed there */ + buf->length() in the next line start position (instead of + a -1 which is the normal marker for an empty line) to + indicate that the cursor may safely be displayed there */ if ( line == 0 || ( lineStarts[ line - 1 ] != bufLen && - lineEnd != nextLineStart ) ) { + lineEnd != nextLineStart ) ) { lineStarts[ line ] = bufLen; line++; } @@ -2163,153 +2498,190 @@ void Fl_Text_Display::calc_line_starts( int startLine, int endLine ) { } lineStarts[ line ] = startPos; } - + /* Set any entries beyond the end of the text to -1 */ for ( ; line <= endLine; line++ ) lineStarts[ line ] = -1; } + + /** - Given a Fl_Text_Display with a complete, up-to-date lineStarts array, update - the lastChar entry to point to the last buffer position displayed. -*/ + \brief Update last display character index. + + Given a Fl_Text_Display with a complete, up-to-date lineStarts array, update + the lastChar entry to point to the last buffer position displayed. + */ void Fl_Text_Display::calc_last_char() { int i; for (i = mNVisibleLines - 1; i >= 0 && mLineStarts[i] == -1; i--) ; mLastChar = i < 0 ? 0 : line_end(mLineStarts[i], true); } -/** Scrolls the current buffer to start at the specified line and column.*/ + + +/** + \brief Scrolls the current buffer to start at the specified line and column. + \param topLineNum top line number + \param horizOffset column number + \todo Column numbers make little sense here. + */ void Fl_Text_Display::scroll(int topLineNum, int horizOffset) { mTopLineNumHint = topLineNum; mHorizOffsetHint = horizOffset; resize(x(), y(), w(), h()); } -void Fl_Text_Display::scroll_(int topLineNum, int horizOffset) { + + +/** + \brief Scrolls the current buffer to start at the specified line and column. + \param topLineNum top line number + \param horizOffset in pixels + \return 0 if nothing changed, 1 if we scrolled + */ +int Fl_Text_Display::scroll_(int topLineNum, int horizOffset) { /* Limit the requested scroll position to allowable values */ if (topLineNum > mNBufferLines + 3 - mNVisibleLines) topLineNum = mNBufferLines + 3 - mNVisibleLines; if (topLineNum < 1) topLineNum = 1; - + if (horizOffset > longest_vline() - text_area.w) horizOffset = longest_vline() - text_area.w; if (horizOffset < 0) horizOffset = 0; - + /* Do nothing if scroll position hasn't actually changed or there's no - window to draw in yet */ + window to draw in yet */ if (mHorizOffset == horizOffset && mTopLineNum == topLineNum) - return; - + return 0; + /* If the vertical scroll position has changed, update the line - starts array and related counters in the text display */ + starts array and related counters in the text display */ offset_line_starts(topLineNum); - + /* Just setting mHorizOffset is enough information for redisplay */ mHorizOffset = horizOffset; - + // redraw all text damage(FL_DAMAGE_EXPOSE); + return 1; } + + /** - Update the minimum, maximum, slider size, page increment, and value - for vertical scroll bar. -*/ + \brief Update vertical scrollbar. + + Update the minimum, maximum, slider size, page increment, and value + for vertical scrollbar. + */ void Fl_Text_Display::update_v_scrollbar() { - /* The Vert. scroll bar value and slider size directly represent the top - line number, and the number of visible lines respectively. The scroll - bar maximum value is chosen to generally represent the size of the whole - buffer, with minor adjustments to keep the scroll bar widget happy */ + /* The vertical scrollbar value and slider size directly represent the top + line number, and the number of visible lines respectively. The scroll + bar maximum value is chosen to generally represent the size of the whole + buffer, with minor adjustments to keep the scrollbar widget happy */ #ifdef DEBUG printf("Fl_Text_Display::update_v_scrollbar():\n" " mTopLineNum=%d, mNVisibleLines=%d, mNBufferLines=%d\n", mTopLineNum, mNVisibleLines, mNBufferLines); #endif // DEBUG - + mVScrollBar->value(mTopLineNum, mNVisibleLines, 1, mNBufferLines+2); mVScrollBar->linesize(3); } + /** - Update the minimum, maximum, slider size, page increment, and value - for the horizontal scroll bar. -*/ + \brief Update vertical scrollbar. + + Update the minimum, maximum, slider size, page increment, and value + for the horizontal scrollbar. + */ void Fl_Text_Display::update_h_scrollbar() { int sliderMax = max(longest_vline(), text_area.w + mHorizOffset); mHScrollBar->value( mHorizOffset, text_area.w, 0, sliderMax ); } + + /** - Callbacks for drag or valueChanged on scroll bars -*/ + \brief Callbacks for drag or valueChanged on scrollbars. + */ void Fl_Text_Display::v_scrollbar_cb(Fl_Scrollbar* b, Fl_Text_Display* textD) { if (b->value() == textD->mTopLineNum) return; textD->scroll(b->value(), textD->mHorizOffset); } + + +/** + \brief Callbacks for drag or valueChanged on scrollbars. + */ void Fl_Text_Display::h_scrollbar_cb(Fl_Scrollbar* b, Fl_Text_Display* textD) { if (b->value() == textD->mHorizOffset) return; textD->scroll(textD->mTopLineNum, b->value()); } + + /** - Refresh the line number area. If clearAll is False, writes only over - the character cell areas. Setting clearAll to True will clear out any - stray marks outside of the character cell area, which might have been - left from before a resize or font change. -*/ + \brief Refresh the line number area. + + If clearAll is False, writes only over the character cell areas. Setting + clearAll to True will clear out any stray marks outside of the character cell + area, which might have been left from before a resize or font change. + + This function is not used. + */ void Fl_Text_Display::draw_line_numbers(bool /*clearAll*/) { #if 0 - // FIXME: don't want this yet, so will leave for another time - - int y, line, visLine, nCols, lineStart; - char lineNumString[12]; - int lineHeight = mMaxsize ? mMaxsize : textsize_; - int charWidth = TMPFONTWIDTH; //mFontStruct->max_bounds.width; - - /* Don't draw if mLineNumWidth == 0 (line numbers are hidden), or widget is - not yet realized */ - if (mLineNumWidth == 0 || visible_r()) - return; - - /* GC is allocated on demand, since not everyone will use line numbering */ - if (textD->lineNumGC == NULL) { - XGCValues values; - values.foreground = textD->lineNumFGPixel; - values.background = textD->bgPixel; - values.font = textD->fontStruct->fid; - textD->lineNumGC = XtGetGC(textD->w, - GCFont| GCForeground | GCBackground, &values); - } - - /* Erase the previous contents of the line number area, if requested */ - if (clearAll) - XClearArea(XtDisplay(textD->w), XtWindow(textD->w), textD->lineNumLeft, - textD->top, textD->lineNumWidth, textD->height, False); - - /* Draw the line numbers, aligned to the text */ - nCols = min(11, textD->lineNumWidth / charWidth); - y = textD->top; - line = getAbsTopLineNum(textD); - for (visLine=0; visLine < textD->nVisibleLines; visLine++) { - lineStart = textD->lineStarts[visLine]; - if (lineStart != -1 && (lineStart==0 || - BufGetCharacter(textD->buffer, lineStart-1)=='\n')) { - sprintf(lineNumString, "%*d", nCols, line); - XDrawImageString(XtDisplay(textD->w), XtWindow(textD->w), - textD->lineNumGC, textD->lineNumLeft, y + textD->ascent, - lineNumString, strlen(lineNumString)); - line++; - } else { - XClearArea(XtDisplay(textD->w), XtWindow(textD->w), - textD->lineNumLeft, y, textD->lineNumWidth, - textD->ascent + textD->descent, False); - if (visLine == 0) - line++; - } - y += lineHeight; + int y, line, visLine, nCols, lineStart; + char lineNumString[12]; + int lineHeight = mMaxsize ? mMaxsize : textsize_; + int charWidth = TMPFONTWIDTH; //mFontStruct->max_bounds.width; + + /* Don't draw if mLineNumWidth == 0 (line numbers are hidden), or widget is + not yet realized */ + if (mLineNumWidth == 0 || visible_r()) + return; + + /* GC is allocated on demand, since not everyone will use line numbering */ + if (textD->lineNumGC == NULL) { + XGCValues values; + values.foreground = textD->lineNumFGPixel; + values.background = textD->bgPixel; + values.font = textD->fontStruct->fid; + textD->lineNumGC = XtGetGC(textD->w, + GCFont| GCForeground | GCBackground, &values); + } + + /* Erase the previous contents of the line number area, if requested */ + if (clearAll) + XClearArea(XtDisplay(textD->w), XtWindow(textD->w), textD->lineNumLeft, + textD->top, textD->lineNumWidth, textD->height, False); + + /* Draw the line numbers, aligned to the text */ + nCols = min(11, textD->lineNumWidth / charWidth); + y = textD->top; + line = getAbsTopLineNum(textD); + for (visLine=0; visLine < textD->nVisibleLines; visLine++) { + lineStart = textD->lineStarts[visLine]; + if (lineStart != -1 && (lineStart==0 || + BufGetCharacter(textD->buffer, lineStart-1)=='\n')) { + sprintf(lineNumString, "%*d", nCols, line); + XDrawImageString(XtDisplay(textD->w), XtWindow(textD->w), + textD->lineNumGC, textD->lineNumLeft, y + textD->ascent, + lineNumString, strlen(lineNumString)); + line++; + } else { + XClearArea(XtDisplay(textD->w), XtWindow(textD->w), + textD->lineNumLeft, y, textD->lineNumWidth, + textD->ascent + textD->descent, False); + if (visLine == 0) + line++; } + y += lineHeight; + } #endif } @@ -2321,655 +2693,715 @@ static int min( int i1, int i2 ) { return i1 <= i2 ? i1 : i2; } + + /** - Count the number of newlines in a null-terminated text string; -*/ + Count the number of newlines in a null-terminated text string; + */ static int countlines( const char *string ) { + IS_UTF8_ALIGNED(string) + const char * c; int lineCount = 0; - + if (!string) return 0; - + for ( c = string; *c != '\0'; c++ ) if ( *c == '\n' ) lineCount++; return lineCount; } + + + /** - Return the width in pixels of the displayed line pointed to by "visLineNum" -*/ + \brief Returns the width in pixels of the displayed line pointed to by "visLineNum". + \param visLineNum index into visible lines array + \return width of line in pixels + */ int Fl_Text_Display::measure_vline( int visLineNum ) const { - int i, width = 0, len, style, lineLen = vline_length( visLineNum ); - int charCount = 0, lineStartPos = mLineStarts[ visLineNum ]; - char expandedChar[ FL_TEXT_MAX_EXP_CHAR_LEN ]; - + int lineLen = vline_length( visLineNum ); + int lineStartPos = mLineStarts[ visLineNum ]; if (lineStartPos < 0 || lineLen == 0) return 0; - if ( mStyleBuffer == NULL ) { - for ( i = 0; i < lineLen; i++ ) { - len = mBuffer->expand_character( lineStartPos + i, - charCount, expandedChar ); - - fl_font( textfont(), textsize() ); - - width += ( int ) fl_width( expandedChar, len ); - - charCount += len; - } - } else { - for ( i = 0; i < lineLen; i++ ) { - len = mBuffer->expand_character( lineStartPos + i, - charCount, expandedChar ); - // FIXME: character is ucs-4 - style = ( unsigned char ) mStyleBuffer->character( - lineStartPos + i ) - 'A'; - - if (style < 0) style = 0; - else if (style >= mNStyles) style = mNStyles - 1; - - fl_font( mStyleTable[ style ].font, mStyleTable[ style ].size ); - - width += ( int ) fl_width( expandedChar, len ); - - charCount += len; - } - } - return width; + return handle_vline(GET_WIDTH, lineStartPos, lineLen, 0, 0, 0, 0, 0, 0); } + + /** - Return true if there are lines visible with no corresponding buffer text -*/ + \brief Return true if there are lines visible with no corresponding buffer text. + \return 1 if there are empty lines + */ int Fl_Text_Display::empty_vlines() const { - return mNVisibleLines > 0 && - mLineStarts[ mNVisibleLines - 1 ] == -1; + return (mNVisibleLines > 0) && (mLineStarts[ mNVisibleLines - 1 ] == -1); } + + /** - Return the length of a line (number of displayable characters) by examining - entries in the line starts array rather than by scanning for newlines -*/ + \brief Count number of bytes in a visible line. + + Return the length of a line (number of bytes) by examining + entries in the line starts array rather than by scanning for newlines. + + \param visLineNum index of line in visible line array + \return number of bytes in this line + */ int Fl_Text_Display::vline_length( int visLineNum ) const { int nextLineStart, lineStartPos; - + if (visLineNum < 0 || visLineNum >= mNVisibleLines) return (0); - + lineStartPos = mLineStarts[ visLineNum ]; - + if ( lineStartPos == -1 ) return 0; + if ( visLineNum + 1 >= mNVisibleLines ) return mLastChar - lineStartPos; + nextLineStart = mLineStarts[ visLineNum + 1 ]; if ( nextLineStart == -1 ) return mLastChar - lineStartPos; - if (wrap_uses_character(nextLineStart-1)) - return nextLineStart-1 - lineStartPos; + + int nextLineStartMinus1 = buffer()->prev_char(nextLineStart); + if (wrap_uses_character(nextLineStartMinus1)) + return nextLineStartMinus1 - lineStartPos; + return nextLineStart - lineStartPos; } + + /** - When continuous wrap is on, and the user inserts or deletes characters, - wrapping can happen before and beyond the changed position. This routine - finds the extent of the changes, and counts the deleted and inserted lines - over that range. It also attempts to minimize the size of the range to - what has to be counted and re-displayed, so the results can be useful - both for delimiting where the line starts need to be recalculated, and - for deciding what part of the text to redisplay. -*/ + \brief Wrapping calculations. + + When continuous wrap is on, and the user inserts or deletes characters, + wrapping can happen before and beyond the changed position. This routine + finds the extent of the changes, and counts the deleted and inserted lines + over that range. It also attempts to minimize the size of the range to + what has to be counted and re-displayed, so the results can be useful + both for delimiting where the line starts need to be recalculated, and + for deciding what part of the text to redisplay. + + \param deletedText + \param pos + \param nInserted + \param nDeleted + \param modRangeStart + \param modRangeEnd + \param linesInserted + \param linesDeleted + */ void Fl_Text_Display::find_wrap_range(const char *deletedText, int pos, - int nInserted, int nDeleted, int *modRangeStart, int *modRangeEnd, - int *linesInserted, int *linesDeleted) { - int length, retPos, retLines, retLineStart, retLineEnd; - Fl_Text_Buffer *deletedTextBuf, *buf = buffer(); - int nVisLines = mNVisibleLines; - int *lineStarts = mLineStarts; - int countFrom, countTo, lineStart, adjLineStart, i; - int visLineNum = 0, nLines = 0; - - /* - ** Determine where to begin searching: either the previous newline, or - ** if possible, limit to the start of the (original) previous displayed - ** line, using information from the existing line starts array - */ - if (pos >= mFirstChar && pos <= mLastChar) { - for (i=nVisLines-1; i>0; i--) - if (lineStarts[i] != -1 && pos >= lineStarts[i]) - break; - if (i > 0) { - countFrom = lineStarts[i-1]; - visLineNum = i-1; - } else - countFrom = buf->line_start(pos); - } else - countFrom = buf->line_start(pos); + int nInserted, int nDeleted, + int *modRangeStart, int *modRangeEnd, + int *linesInserted, int *linesDeleted) { + IS_UTF8_ALIGNED(deletedText) + IS_UTF8_ALIGNED2(buffer(), pos) - - /* - ** Move forward through the (new) text one line at a time, counting - ** displayed lines, and looking for either a real newline, or for the - ** line starts to re-sync with the original line starts array - */ - lineStart = countFrom; - *modRangeStart = countFrom; - for (;;) { - - /* advance to the next line. If the line ended in a real newline - or the end of the buffer, that's far enough */ - wrapped_line_counter(buf, lineStart, buf->length(), 1, true, 0, - &retPos, &retLines, &retLineStart, &retLineEnd); - if (retPos >= buf->length()) { - countTo = buf->length(); - *modRangeEnd = countTo; - if (retPos != retLineEnd) - nLines++; - break; - } else - lineStart = retPos; - nLines++; - if (lineStart > pos + nInserted && - // FIXME: character is ucs-4 - buf->character(lineStart-1) == '\n') { - countTo = lineStart; - *modRangeEnd = lineStart; - break; - } - - /* Don't try to resync in continuous wrap mode with non-fixed font - sizes; it would result in a chicken-and-egg dependency between - the calculations for the inserted and the deleted lines. - If we're in that mode, the number of deleted lines is calculated in - advance, without resynchronization, so we shouldn't resynchronize - for the inserted lines either. */ - if (mSuppressResync) - continue; - - /* check for synchronization with the original line starts array - before pos, if so, the modified range can begin later */ - if (lineStart <= pos) { - while (visLineNum pos + nInserted) { - adjLineStart = lineStart - nInserted + nDeleted; - while (visLineNum= mFirstChar && pos <= mLastChar) { + for (i=nVisLines-1; i>0; i--) { + if (lineStarts[i] != -1 && pos >= lineStarts[i]) { + break; + } } - *linesInserted = nLines; - - - /* Count deleted lines between countFrom and countTo as the text existed - before the modification (that is, as if the text between pos and - pos+nInserted were replaced by "deletedText"). This extra context is - necessary because wrapping can occur outside of the modified region - as a result of adding or deleting text in the region. This is done by - creating a textBuffer containing the deleted text and the necessary - additional context, and calling the wrappedLineCounter on it. - - NOTE: This must not be done in continuous wrap mode when the font - width is not fixed. In that case, the calculation would try - to access style information that is no longer available (deleted - text), or out of date (updated highlighting), possibly leading - to completely wrong calculations and/or even crashes eventually. - (This is not theoretical; it really happened.) - - In that case, the calculation of the number of deleted lines - has happened before the buffer was modified (only in that case, - because resynchronization of the line starts is impossible - in that case, which makes the whole calculation less efficient). - */ - if (mSuppressResync) { - *linesDeleted = mNLinesDeleted; - mSuppressResync = 0; - return; + if (i > 0) { + countFrom = lineStarts[i-1]; + visLineNum = i-1; + } else { + countFrom = buf->line_start(pos); } - - length = (pos-countFrom) + nDeleted +(countTo-(pos+nInserted)); - deletedTextBuf = new Fl_Text_Buffer(length); - deletedTextBuf->copy(buffer(), countFrom, pos, 0); - if (nDeleted != 0) - deletedTextBuf->insert(pos-countFrom, deletedText); - deletedTextBuf->copy(buffer(), - pos+nInserted, countTo, pos-countFrom+nDeleted); - /* Note that we need to take into account an offset for the style buffer: - the deletedTextBuf can be out of sync with the style buffer. */ - wrapped_line_counter(deletedTextBuf, 0, length, INT_MAX, true, - countFrom, &retPos, &retLines, &retLineStart, &retLineEnd, false); - delete deletedTextBuf; - *linesDeleted = retLines; - mSuppressResync = 0; -} - -/** - This is a stripped-down version of the findWrapRange() function above, - intended to be used to calculate the number of "deleted" lines during - a buffer modification. It is called _before_ the modification takes place. + } else { + countFrom = buf->line_start(pos); + } + + IS_UTF8_ALIGNED2(buf, countFrom) + + /* + ** Move forward through the (new) text one line at a time, counting + ** displayed lines, and looking for either a real newline, or for the + ** line starts to re-sync with the original line starts array + */ + lineStart = countFrom; + *modRangeStart = countFrom; + for (;;) { + + /* advance to the next line. If the line ended in a real newline + or the end of the buffer, that's far enough */ + wrapped_line_counter(buf, lineStart, buf->length(), 1, true, 0, + &retPos, &retLines, &retLineStart, &retLineEnd); + if (retPos >= buf->length()) { + countTo = buf->length(); + *modRangeEnd = countTo; + if (retPos != retLineEnd) + nLines++; + break; + } else { + lineStart = retPos; + } + nLines++; + if (lineStart > pos + nInserted && buf->char_at(buf->prev_char(lineStart)) == '\n') { + countTo = lineStart; + *modRangeEnd = lineStart; + break; + } + + /* Don't try to resync in continuous wrap mode with non-fixed font + sizes; it would result in a chicken-and-egg dependency between + the calculations for the inserted and the deleted lines. + If we're in that mode, the number of deleted lines is calculated in + advance, without resynchronization, so we shouldn't resynchronize + for the inserted lines either. */ + if (mSuppressResync) + continue; + + /* check for synchronization with the original line starts array + before pos, if so, the modified range can begin later */ + if (lineStart <= pos) { + while (visLineNumprev_char(lineStarts[visLineNum+1])); + else + *modRangeStart = countFrom; + } else + *modRangeStart = min(*modRangeStart, buf->prev_char(lineStart)); + } + + /* check for synchronization with the original line starts array + after pos, if so, the modified range can end early */ + else if (lineStart > pos + nInserted) { + adjLineStart = lineStart - nInserted + nDeleted; + while (visLineNum= mFirstChar && pos <= mLastChar) { - for (i=nVisLines-1; i>0; i--) - if (lineStarts[i] != -1 && pos >= lineStarts[i]) - break; - if (i > 0) { - countFrom = lineStarts[i-1]; - visLineNum = i-1; - } else - countFrom = buf->line_start(pos); - } else - countFrom = buf->line_start(pos); - - /* - ** Move forward through the (new) text one line at a time, counting - ** displayed lines, and looking for either a real newline, or for the - ** line starts to re-sync with the original line starts array - */ - lineStart = countFrom; - for (;;) { - /* advance to the next line. If the line ended in a real newline - or the end of the buffer, that's far enough */ - wrapped_line_counter(buf, lineStart, buf->length(), 1, true, 0, - &retPos, &retLines, &retLineStart, &retLineEnd); - if (retPos >= buf->length()) { - if (retPos != retLineEnd) - nLines++; - break; - } else - lineStart = retPos; - nLines++; - if (lineStart > pos + nDeleted && - // FIXME: character is ucs-4 - buf->character(lineStart-1) == '\n') { - break; - } - - /* Unlike in the findWrapRange() function above, we don't try to - resync with the line starts, because we don't know the length - of the inserted text yet, nor the updated style information. - - Because of that, we also shouldn't resync with the line starts - after the modification either, because we must perform the - calculations for the deleted and inserted lines in the same way. - - This can result in some unnecessary recalculation and redrawing - overhead, and therefore we should only use this two-phase mode - of calculation when it's really needed (continuous wrap + variable - font width). */ - } - mNLinesDeleted = nLines; - mSuppressResync = 1; -} - -/** - Count forward from startPos to either maxPos or maxLines (whichever is - reached first), and return all relevant positions and line count. - The provided textBuffer may differ from the actual text buffer of the - widget. In that case it must be a (partial) copy of the actual text buffer - and the styleBufOffset argument must indicate the starting position of the - copy, to take into account the correct style information. -** - Returned values: -** - retPos: Position where counting ended. When counting lines, the - position returned is the start of the line "maxLines" - lines beyond "startPos". - retLines: Number of line breaks counted - retLineStart: Start of the line where counting ended - retLineEnd: End position of the last line traversed -*/ -void Fl_Text_Display::wrapped_line_counter(Fl_Text_Buffer *buf, int startPos, - int maxPos, int maxLines, bool startPosIsLineStart, int styleBufOffset, - int *retPos, int *retLines, int *retLineStart, int *retLineEnd, - bool countLastLineMissingNewLine) const { - int lineStart, newLineStart = 0, b, p, colNum, wrapMargin; - int maxWidth, i, foundBreak, width; - bool countPixels; - int nLines = 0, tabDist = buffer()->tab_distance(); - unsigned char c; - - /* If the font is fixed, or there's a wrap margin set, it's more efficient - to measure in columns, than to count pixels. Determine if we can count - in columns (countPixels == False) or must count pixels (countPixels == - True), and set the wrap target for either pixels or columns */ - if (mFixedFontWidth != -1 || mWrapMargin != 0) { - countPixels = false; - wrapMargin = mWrapMargin ? mWrapMargin : text_area.w / (mFixedFontWidth + 1); - maxWidth = INT_MAX; - } else { - countPixels = true; - wrapMargin = INT_MAX; - maxWidth = text_area.w; - } - - /* Find the start of the line if the start pos is not marked as a - line start. */ - if (startPosIsLineStart) - lineStart = startPos; - else - lineStart = line_start(startPos); - - /* - ** Loop until position exceeds maxPos or line count exceeds maxLines. - ** (actually, contines beyond maxPos to end of line containing maxPos, - ** in case later characters cause a word wrap back before maxPos) - */ - colNum = 0; - width = 0; - for (p=lineStart; plength(); p++) { - // FIXME: character is ucs-4 - c = (unsigned char)buf->character(p); - - /* If the character was a newline, count the line and start over, - otherwise, add it to the width and column counts */ - if (c == '\n') { - if (p >= maxPos) { - *retPos = maxPos; - *retLines = nLines; - *retLineStart = lineStart; - *retLineEnd = maxPos; - return; - } - nLines++; - if (nLines >= maxLines) { - *retPos = p + 1; - *retLines = nLines; - *retLineStart = p + 1; - *retLineEnd = p; - return; - } - lineStart = p + 1; - colNum = 0; - width = 0; - } else { - const char *s = buf->address(p); - colNum += Fl_Text_Buffer::character_width(s, colNum, tabDist); // FIXME: unicode - if (countPixels) - width += measure_proportional_character(s, colNum, p+styleBufOffset); - } - - /* If character exceeded wrap margin, find the break point - and wrap there */ - if (colNum > wrapMargin || width > maxWidth) { - foundBreak = false; - for (b=p; b>=lineStart; b--) { - // FIXME: character is ucs-4 - c = (unsigned char)buf->character(b); - if (c == '\t' || c == ' ') { - newLineStart = b + 1; - if (countPixels) { - colNum = 0; - width = 0; - for (i=b+1; iaddress(i), colNum, - i+styleBufOffset); - colNum++; - } - } else - colNum = buf->count_displayed_characters(b+1, p+1); - foundBreak = true; - break; - } - } - if (!foundBreak) { /* no whitespace, just break at margin */ - newLineStart = max(p, lineStart+1); - const char *s = buf->address(b); - colNum = Fl_Text_Buffer::character_width(s, colNum, tabDist); // FIXME: unicode - if (countPixels) - width = measure_proportional_character(s, colNum, p+styleBufOffset); - } - if (p >= maxPos) { - *retPos = maxPos; - *retLines = maxPos < newLineStart ? nLines : nLines + 1; - *retLineStart = maxPos < newLineStart ? lineStart : - newLineStart; - *retLineEnd = maxPos; - return; - } - nLines++; - if (nLines >= maxLines) { - *retPos = foundBreak ? b + 1 : max(p, lineStart+1); - *retLines = nLines; - *retLineStart = lineStart; - *retLineEnd = foundBreak ? b : p; - return; - } - lineStart = newLineStart; - } - } - - /* reached end of buffer before reaching pos or line target */ - *retPos = buf->length(); - *retLines = nLines; - if (countLastLineMissingNewLine && colNum > 0) - ++(*retLines); - *retLineStart = lineStart; - *retLineEnd = buf->length(); -} - -/** - Measure the width in pixels of the first character of string "s" at a - particular column "colNum" and buffer position "pos". This is for measuring - characters in proportional or mixed-width highlighting fonts. -** - A note about proportional and mixed-width fonts: the mixed width and - proportional font code in nedit does not get much use in general editing, - because nedit doesn't allow per-language-mode fonts, and editing programs - in a proportional font is usually a bad idea, so very few users would - choose a proportional font as a default. There are still probably mixed- - width syntax highlighting cases where things don't redraw properly for - insertion/deletion, though static display and wrapping and resizing - should now be solid because they are now used for online help display. -*/ - -int Fl_Text_Display::measure_proportional_character(const char *s, int colNum, int pos) const { - int charLen, style; - char expChar[ FL_TEXT_MAX_EXP_CHAR_LEN ]; - Fl_Text_Buffer *styleBuf = mStyleBuffer; - - charLen = Fl_Text_Buffer::expand_character(s, colNum, expChar, buffer()->tab_distance()); // FIXME: unicode - if (styleBuf == 0) { - style = 0; - } else { - // FIXME: character is ucs-4 - style = (unsigned char)styleBuf->character(pos); - if (style == mUnfinishedStyle && mUnfinishedHighlightCB) { - /* encountered "unfinished" style, trigger parsing */ - (mUnfinishedHighlightCB)(pos, mHighlightCBArg); - // FIXME: character is ucs-4 - style = (unsigned char)styleBuf->character(pos); - } - } - return string_width(expChar, charLen, style); -} - -/** - Finds both the end of the current line and the start of the next line. Why? - In continuous wrap mode, if you need to know both, figuring out one from the - other can be expensive or error prone. The problem comes when there's a - trailing space or tab just before the end of the buffer. To translate an - end of line value to or from the next lines start value, you need to know - whether the trailing space or tab is being used as a line break or just a - normal character, and to find that out would otherwise require counting all - the way back to the beginning of the line. -*/ -void Fl_Text_Display::find_line_end(int startPos, bool startPosIsLineStart, - int *lineEnd, int *nextLineStart) const { - int retLines, retLineStart; - - /* if we're not wrapping use more efficient BufEndOfLine */ - if (!mContinuousWrap) { - *lineEnd = buffer()->line_end(startPos); - *nextLineStart = min(buffer()->length(), *lineEnd + 1); - return; - } - - /* use the wrapped line counter routine to count forward one line */ - wrapped_line_counter(buffer(), startPos, buffer()->length(), - 1, startPosIsLineStart, 0, nextLineStart, &retLines, - &retLineStart, lineEnd); + NOTE: This must not be done in continuous wrap mode when the font + width is not fixed. In that case, the calculation would try + to access style information that is no longer available (deleted + text), or out of date (updated highlighting), possibly leading + to completely wrong calculations and/or even crashes eventually. + (This is not theoretical; it really happened.) + + In that case, the calculation of the number of deleted lines + has happened before the buffer was modified (only in that case, + because resynchronization of the line starts is impossible + in that case, which makes the whole calculation less efficient). + */ + if (mSuppressResync) { + *linesDeleted = mNLinesDeleted; + mSuppressResync = 0; return; + } + + length = (pos-countFrom) + nDeleted +(countTo-(pos+nInserted)); + deletedTextBuf = new Fl_Text_Buffer(length); + deletedTextBuf->copy(buffer(), countFrom, pos, 0); + if (nDeleted != 0) + deletedTextBuf->insert(pos-countFrom, deletedText); + deletedTextBuf->copy(buffer(), pos+nInserted, countTo, pos-countFrom+nDeleted); + /* Note that we need to take into account an offset for the style buffer: + the deletedTextBuf can be out of sync with the style buffer. */ + wrapped_line_counter(deletedTextBuf, 0, length, INT_MAX, true, countFrom, + &retPos, &retLines, &retLineStart, &retLineEnd, false); + delete deletedTextBuf; + *linesDeleted = retLines; + mSuppressResync = 0; } + + /** - Line breaks in continuous wrap mode usually happen at newlines or - whitespace. This line-terminating character is not included in line - width measurements and has a special status as a non-visible character. - However, lines with no whitespace are wrapped without the benefit of a - line terminating character, and this distinction causes endless trouble - with all of the text display code which was originally written without - continuous wrap mode and always expects to wrap at a newline character. -** - Given the position of the end of the line, as returned by TextDEndOfLine - or BufEndOfLine, this returns true if there is a line terminating - character, and false if there's not. On the last character in the - buffer, this function can't tell for certain whether a trailing space was - used as a wrap point, and just guesses that it wasn't. So if an exact - accounting is necessary, don't use this function. -*/ + \brief Wrapping calculations. + + This is a stripped-down version of the findWrapRange() function above, + intended to be used to calculate the number of "deleted" lines during + a buffer modification. It is called _before_ the modification takes place. + + This function should only be called in continuous wrap mode with a + non-fixed font width. In that case, it is impossible to calculate + the number of deleted lines, because the necessary style information + is no longer available _after_ the modification. In other cases, we + can still perform the calculation afterwards (possibly even more + efficiently). + + \param pos + \param nDeleted + */ +void Fl_Text_Display::measure_deleted_lines(int pos, int nDeleted) { + IS_UTF8_ALIGNED2(buffer(), pos) + + int retPos, retLines, retLineStart, retLineEnd; + Fl_Text_Buffer *buf = buffer(); + int nVisLines = mNVisibleLines; + int *lineStarts = mLineStarts; + int countFrom, lineStart; + int visLineNum = 0, nLines = 0, i; + /* + ** Determine where to begin searching: either the previous newline, or + ** if possible, limit to the start of the (original) previous displayed + ** line, using information from the existing line starts array + */ + if (pos >= mFirstChar && pos <= mLastChar) { + for (i=nVisLines-1; i>0; i--) + if (lineStarts[i] != -1 && pos >= lineStarts[i]) + break; + if (i > 0) { + countFrom = lineStarts[i-1]; + visLineNum = i-1; + } else + countFrom = buf->line_start(pos); + } else + countFrom = buf->line_start(pos); + + /* + ** Move forward through the (new) text one line at a time, counting + ** displayed lines, and looking for either a real newline, or for the + ** line starts to re-sync with the original line starts array + */ + lineStart = countFrom; + for (;;) { + /* advance to the next line. If the line ended in a real newline + or the end of the buffer, that's far enough */ + wrapped_line_counter(buf, lineStart, buf->length(), 1, true, 0, + &retPos, &retLines, &retLineStart, &retLineEnd); + if (retPos >= buf->length()) { + if (retPos != retLineEnd) + nLines++; + break; + } else + lineStart = retPos; + nLines++; + if (lineStart > pos + nDeleted && buf->char_at(lineStart-1) == '\n') { + break; + } + + /* Unlike in the findWrapRange() function above, we don't try to + resync with the line starts, because we don't know the length + of the inserted text yet, nor the updated style information. + + Because of that, we also shouldn't resync with the line starts + after the modification either, because we must perform the + calculations for the deleted and inserted lines in the same way. + + This can result in some unnecessary recalculation and redrawing + overhead, and therefore we should only use this two-phase mode + of calculation when it's really needed (continuous wrap + variable + font width). */ + } + mNLinesDeleted = nLines; + mSuppressResync = 1; +} + + + +/** + \brief Wrapping calculations. + + Count forward from startPos to either maxPos or maxLines (whichever is + reached first), and return all relevant positions and line count. + The provided textBuffer may differ from the actual text buffer of the + widget. In that case it must be a (partial) copy of the actual text buffer + and the styleBufOffset argument must indicate the starting position of the + copy, to take into account the correct style information. + + \param buf + \param startPos + \param maxPos + \param maxLines + \param startPosIsLineStart + \param styleBufOffset + + \param[out] retPos Position where counting ended. When counting lines, the + position returned is the start of the line "maxLines" lines + beyond "startPos". + \param[out] retLines Number of line breaks counted + \param[out] retLineStart Start of the line where counting ended + \param[out] retLineEnd End position of the last line traversed + \param[out] countLastLineMissingNewLine + */ +void Fl_Text_Display::wrapped_line_counter(Fl_Text_Buffer *buf, int startPos, + int maxPos, int maxLines, bool startPosIsLineStart, int styleBufOffset, + int *retPos, int *retLines, int *retLineStart, int *retLineEnd, + bool countLastLineMissingNewLine) const { + IS_UTF8_ALIGNED2(buf, startPos) + IS_UTF8_ALIGNED2(buf, maxPos) + + int lineStart, newLineStart = 0, b, p, colNum, wrapMarginPix; + int i, foundBreak; + double width; + int nLines = 0; + unsigned int c; + + /* Set the wrap margin to the wrap column or the view width */ + if (mWrapMarginPix != 0) { + wrapMarginPix = mWrapMarginPix; + } else { + wrapMarginPix = text_area.w; + } + + /* Find the start of the line if the start pos is not marked as a + line start. */ + if (startPosIsLineStart) + lineStart = startPos; + else + lineStart = line_start(startPos); + + /* + ** Loop until position exceeds maxPos or line count exceeds maxLines. + ** (actually, continues beyond maxPos to end of line containing maxPos, + ** in case later characters cause a word wrap back before maxPos) + */ + colNum = 0; + width = 0; + for (p=lineStart; plength(); p=buf->next_char(p)) { + c = buf->char_at(p); // UCS-4 + + /* If the character was a newline, count the line and start over, + otherwise, add it to the width and column counts */ + if (c == '\n') { + if (p >= maxPos) { + *retPos = maxPos; + *retLines = nLines; + *retLineStart = lineStart; + *retLineEnd = maxPos; + return; + } + nLines++; + int p1 = buf->next_char(p); + if (nLines >= maxLines) { + *retPos = p1; + *retLines = nLines; + *retLineStart = p1; + *retLineEnd = p; + return; + } + lineStart = p1; + colNum = 0; + width = 0; + } else { + const char *s = buf->address(p); + colNum++; + // FIXME: it is not a good idea to simply add character widths because on + // some platforms, the width is a floating point value and depends on the + // previous character as well. + width += measure_proportional_character(s, (int)width, p+styleBufOffset); + } + + /* If character exceeded wrap margin, find the break point and wrap there */ + if (width > wrapMarginPix) { + foundBreak = false; + for (b=p; b>=lineStart; b=buf->prev_char(b)) { + c = buf->char_at(b); + if (c == '\t' || c == ' ') { + newLineStart = buf->next_char(b); + colNum = 0; + width = 0; + int iMax = buf->next_char(p); + for (i=buf->next_char(b); inext_char(i)) { + width += measure_proportional_character(buf->address(i), (int)width, + i+styleBufOffset); + colNum++; + } + foundBreak = true; + break; + } + } + if (!foundBreak) { /* no whitespace, just break at margin */ + newLineStart = max(p, buf->next_char(lineStart)); + const char *s = buf->address(b); + colNum++; + width = measure_proportional_character(s, 0, p+styleBufOffset); + } + if (p >= maxPos) { + *retPos = maxPos; + *retLines = maxPos < newLineStart ? nLines : nLines + 1; + *retLineStart = maxPos < newLineStart ? lineStart : newLineStart; + *retLineEnd = maxPos; + return; + } + nLines++; + if (nLines >= maxLines) { + *retPos = foundBreak ? buf->next_char(b) : max(p, buf->next_char(lineStart)); + *retLines = nLines; + *retLineStart = lineStart; + *retLineEnd = foundBreak ? b : p; + return; + } + lineStart = newLineStart; + } + } + + /* reached end of buffer before reaching pos or line target */ + *retPos = buf->length(); + *retLines = nLines; + if (countLastLineMissingNewLine && colNum > 0) + *retLines = buf->next_char(*retLines); + *retLineStart = lineStart; + *retLineEnd = buf->length(); +} + + + +/** + \brief Wrapping calculations. + + Measure the width in pixels of the first character of string "s" at a + particular column "colNum" and buffer position "pos". This is for measuring + characters in proportional or mixed-width highlighting fonts. + + A note about proportional and mixed-width fonts: the mixed width and + proportional font code in nedit does not get much use in general editing, + because nedit doesn't allow per-language-mode fonts, and editing programs + in a proportional font is usually a bad idea, so very few users would + choose a proportional font as a default. There are still probably mixed- + width syntax highlighting cases where things don't redraw properly for + insertion/deletion, though static display and wrapping and resizing + should now be solid because they are now used for online help display. + + \param s text string + \param xPix x pixel position needed for calculating tab widths + \param pos offset within string + \return width of character in pixels + */ +double Fl_Text_Display::measure_proportional_character(const char *s, int xPix, int pos) const { + IS_UTF8_ALIGNED(s) + + if (*s=='\t') { + int tab = (int)col_to_x(mBuffer->tab_distance()); + return (((xPix/tab)+1)*tab) - xPix; + } + + int charLen = fl_utf8len1(*s), style = 0; + if (mStyleBuffer) { + style = mStyleBuffer->byte_at(pos); + } + return string_width(s, charLen, style); +} + + + +/** + \brief Finds both the end of the current line and the start of the next line. + + Why? + In continuous wrap mode, if you need to know both, figuring out one from the + other can be expensive or error prone. The problem comes when there's a + trailing space or tab just before the end of the buffer. To translate an + end of line value to or from the next lines start value, you need to know + whether the trailing space or tab is being used as a line break or just a + normal character, and to find that out would otherwise require counting all + the way back to the beginning of the line. + + \param startPos + \param startPosIsLineStart + \param[out] lineEnd + \param[out] nextLineStart + */ +void Fl_Text_Display::find_line_end(int startPos, bool startPosIsLineStart, + int *lineEnd, int *nextLineStart) const { + IS_UTF8_ALIGNED2(buffer(), startPos) + + int retLines, retLineStart; + + /* if we're not wrapping use more efficient BufEndOfLine */ + if (!mContinuousWrap) { + int le = buffer()->line_end(startPos); + int ls = buffer()->next_char(le); + *lineEnd = le; + *nextLineStart = min(buffer()->length(), ls); + return; + } + + /* use the wrapped line counter routine to count forward one line */ + wrapped_line_counter(buffer(), startPos, buffer()->length(), + 1, startPosIsLineStart, 0, nextLineStart, &retLines, + &retLineStart, lineEnd); +} + + + +/** + \brief Check if the line break is caused by a \\n or by line wrapping. + + Line breaks in continuous wrap mode usually happen at newlines or + whitespace. This line-terminating character is not included in line + width measurements and has a special status as a non-visible character. + However, lines with no whitespace are wrapped without the benefit of a + line terminating character, and this distinction causes endless trouble + with all of the text display code which was originally written without + continuous wrap mode and always expects to wrap at a newline character. + + Given the position of the end of the line, as returned by TextDEndOfLine + or BufEndOfLine, this returns true if there is a line terminating + character, and false if there's not. On the last character in the + buffer, this function can't tell for certain whether a trailing space was + used as a wrap point, and just guesses that it wasn't. So if an exact + accounting is necessary, don't use this function. + + \param lineEndPos index of character where the line wraps + \return 1 if a \\n character causes the line wrap + */ int Fl_Text_Display::wrap_uses_character(int lineEndPos) const { - char c; - - if (!mContinuousWrap || lineEndPos == buffer()->length()) - return 1; - - // FIXME: character is ucs-4 - c = buffer()->character(lineEndPos); - return c == '\n' || ((c == '\t' || c == ' ') && - lineEndPos + 1 != buffer()->length()); + IS_UTF8_ALIGNED2(buffer(), lineEndPos) + + unsigned int c; + + if (!mContinuousWrap || lineEndPos == buffer()->length()) + return 1; + + c = buffer()->char_at(lineEndPos); + return c == '\n' || ((c == '\t' || c == ' ') && + lineEndPos + 1 < buffer()->length()); } -/** - Return true if the selection "sel" is rectangular, and touches a - buffer position withing "rangeStart" to "rangeEnd" -*/ -int Fl_Text_Display::range_touches_selection(const Fl_Text_Selection *sel, - int rangeStart, int rangeEnd) const { - return sel->selected() && sel->rectangular() && sel->end() >= rangeStart && - sel->start() <= rangeEnd; -} + /** - Extend the range of a redraw request (from *start to *end) with additional - redraw requests resulting from changes to the attached style buffer (which - contains auxiliary information for coloring or styling text). -*/ + \brief I don't know what this does! + + Extend the range of a redraw request (from *start to *end) with additional + redraw requests resulting from changes to the attached style buffer (which + contains auxiliary information for coloring or styling text). + + \param startpos ?? + \param endpos ?? + + \todo Unicode? + */ void Fl_Text_Display::extend_range_for_styles( int *startpos, int *endpos ) { + IS_UTF8_ALIGNED2(buffer(), (*startpos)) + IS_UTF8_ALIGNED2(buffer(), (*endpos)) + Fl_Text_Selection * sel = mStyleBuffer->primary_selection(); int extended = 0; - + /* The peculiar protocol used here is that modifications to the style - buffer are marked by selecting them with the buffer's primary Fl_Text_Selection. - The style buffer is usually modified in response to a modify callback on - the text buffer BEFORE Fl_Text_Display.c's modify callback, so that it can keep - the style buffer in step with the text buffer. The style-update - callback can't just call for a redraw, because Fl_Text_Display hasn't processed - the original text changes yet. Anyhow, to minimize redrawing and to - avoid the complexity of scheduling redraws later, this simple protocol - tells the text display's buffer modify callback to extend it's redraw - range to show the text color/and font changes as well. */ + buffer are marked by selecting them with the buffer's primary Fl_Text_Selection. + The style buffer is usually modified in response to a modify callback on + the text buffer BEFORE Fl_Text_Display.c's modify callback, so that it can keep + the style buffer in step with the text buffer. The style-update + callback can't just call for a redraw, because Fl_Text_Display hasn't processed + the original text changes yet. Anyhow, to minimize redrawing and to + avoid the complexity of scheduling redraws later, this simple protocol + tells the text display's buffer modify callback to extend its redraw + range to show the text color/and font changes as well. */ if ( sel->selected() ) { if ( sel->start() < *startpos ) { *startpos = sel->start(); + // somewhere while deleting, alignment is lost. We do this just to be sure. + *startpos = buffer()->utf8_align(*startpos); + IS_UTF8_ALIGNED2(buffer(), (*startpos)) extended = 1; } if ( sel->end() > *endpos ) { *endpos = sel->end(); + *endpos = buffer()->utf8_align(*endpos); + IS_UTF8_ALIGNED2(buffer(), (*endpos)) extended = 1; } } - + /* If the Fl_Text_Selection was extended due to a style change, and some of the - fonts don't match in spacing, extend redraw area to end of line to - redraw characters exposed by possible font size changes */ - if ( mFixedFontWidth == -1 && extended ) + fonts don't match in spacing, extend redraw area to end of line to + redraw characters exposed by possible font size changes */ + if ( extended ) *endpos = mBuffer->line_end( *endpos ) + 1; + + IS_UTF8_ALIGNED2(buffer(), (*endpos)) } -// The draw() method. It tries to minimize what is draw as much as possible. + + +/** + \brief Draw the widget. + + This function tries to limit drawing to smaller areas if possible. + */ void Fl_Text_Display::draw(void) { // don't even try if there is no associated text buffer! if (!buffer()) { draw_box(); return; } - + fl_push_clip(x(),y(),w(),h()); // prevent drawing outside widget area - + // draw the non-text, non-scrollbar areas. if (damage() & FL_DAMAGE_ALL) { -// printf("drawing all (box = %d)\n", box()); + // printf("drawing all (box = %d)\n", box()); + if (Fl_Surface_Device::surface()->class_name() == Fl_Printer::class_id) { + // if to printer, draw the background + fl_rectf(text_area.x, text_area.y, text_area.w, text_area.h, color() ); + } // draw the box() int W = w(), H = h(); draw_box(box(), x(), y(), W, H, color()); - + if (mHScrollBar->visible()) W -= scrollbar_width(); if (mVScrollBar->visible()) H -= scrollbar_width(); - + // left margin fl_rectf(text_area.x-LEFT_MARGIN, text_area.y-TOP_MARGIN, LEFT_MARGIN, text_area.h+TOP_MARGIN+BOTTOM_MARGIN, color()); - + // right margin fl_rectf(text_area.x+text_area.w, text_area.y-TOP_MARGIN, RIGHT_MARGIN, text_area.h+TOP_MARGIN+BOTTOM_MARGIN, color()); - + // top margin fl_rectf(text_area.x, text_area.y-TOP_MARGIN, text_area.w, TOP_MARGIN, color()); - + // bottom margin fl_rectf(text_area.x, text_area.y+text_area.h, text_area.w, BOTTOM_MARGIN, color()); - + // draw that little box in the corner of the scrollbars if (mVScrollBar->visible() && mHScrollBar->visible()) fl_rectf(mVScrollBar->x(), mHScrollBar->y(), mVScrollBar->w(), mHScrollBar->h(), FL_GRAY); - + // blank the previous cursor protrusions } else if (damage() & (FL_DAMAGE_SCROLL | FL_DAMAGE_EXPOSE)) { -// printf("blanking previous cursor extrusions at Y: %d\n", mCursorOldY); + // printf("blanking previous cursor extrusions at Y: %d\n", mCursorOldY); // CET - FIXME - save old cursor position instead and just draw side needed? fl_push_clip(text_area.x-LEFT_MARGIN, text_area.y, @@ -2981,7 +3413,7 @@ void Fl_Text_Display::draw(void) { RIGHT_MARGIN, mMaxsize, color()); fl_pop_clip(); } - + // draw the scrollbars if (damage() & (FL_DAMAGE_ALL | FL_DAMAGE_CHILD)) { mVScrollBar->damage(FL_DAMAGE_ALL); @@ -2989,7 +3421,7 @@ void Fl_Text_Display::draw(void) { } update_child(*mVScrollBar); update_child(*mHScrollBar); - + // draw all of the text if (damage() & (FL_DAMAGE_ALL | FL_DAMAGE_EXPOSE)) { //printf("drawing all text\n"); @@ -3018,19 +3450,19 @@ void Fl_Text_Display::draw(void) { damage_range2_start = damage_range2_end = -1; fl_pop_clip(); } - + // draw the text cursor if (damage() & (FL_DAMAGE_ALL | FL_DAMAGE_SCROLL | FL_DAMAGE_EXPOSE) && !buffer()->primary_selection()->selected() && - mCursorOn && Fl::focus() == this ) { + mCursorOn && Fl::focus() == (Fl_Widget*)this ) { fl_push_clip(text_area.x-LEFT_MARGIN, text_area.y, text_area.w+LEFT_MARGIN+RIGHT_MARGIN, text_area.h); - + int X, Y; if (position_to_xy(mCursorPos, &X, &Y)) draw_cursor(X, Y); -// else puts("position_to_xy() failed - unable to draw cursor!"); + // else puts("position_to_xy() failed - unable to draw cursor!"); //printf("drew cursor at pos: %d (%d,%d)\n", mCursorPos, X, Y); mCursorOldY = Y; fl_pop_clip(); @@ -3038,6 +3470,8 @@ void Fl_Text_Display::draw(void) { fl_pop_clip(); } + + // this processes drag events due to mouse for Fl_Text_Display and // also drags due to cursor movement with shift held down for // Fl_Text_Editor @@ -3070,37 +3504,47 @@ void fl_text_drag_me(int pos, Fl_Text_Display* d) { } } -// This timer event scrolls the text view proportionally to -// how far the mouse pointer has left the text area. This -// allows for smooth scrolling without "wiggeling" the mouse. + + +/** + \brief Timer callback for scroll events. + + This timer event scrolls the text view proportionally to + how far the mouse pointer has left the text area. This + allows for smooth scrolling without "wiggeling" the mouse. + */ void Fl_Text_Display::scroll_timer_cb(void *user_data) { Fl_Text_Display *w = (Fl_Text_Display*)user_data; int pos; switch (scroll_direction) { - case 1: // mouse is to the right, scroll left - w->scroll(w->mTopLineNum, w->mHorizOffset + scroll_amount); - pos = w->xy_to_position(w->text_area.x + w->text_area.w, scroll_y, CURSOR_POS); - break; - case 2: // mouse is to the left, scroll right - w->scroll(w->mTopLineNum, w->mHorizOffset + scroll_amount); - pos = w->xy_to_position(w->text_area.x, scroll_y, CURSOR_POS); - break; - case 3: // mouse is above, scroll down - w->scroll(w->mTopLineNum + scroll_amount, w->mHorizOffset); - pos = w->xy_to_position(scroll_x, w->text_area.y, CURSOR_POS); - break; - case 4: // mouse is below, scroll up - w->scroll(w->mTopLineNum + scroll_amount, w->mHorizOffset); - pos = w->xy_to_position(scroll_x, w->text_area.y + w->text_area.h, CURSOR_POS); - break; - default: - return; + case 1: // mouse is to the right, scroll left + w->scroll(w->mTopLineNum, w->mHorizOffset + scroll_amount); + pos = w->xy_to_position(w->text_area.x + w->text_area.w, scroll_y, CURSOR_POS); + break; + case 2: // mouse is to the left, scroll right + w->scroll(w->mTopLineNum, w->mHorizOffset + scroll_amount); + pos = w->xy_to_position(w->text_area.x, scroll_y, CURSOR_POS); + break; + case 3: // mouse is above, scroll down + w->scroll(w->mTopLineNum + scroll_amount, w->mHorizOffset); + pos = w->xy_to_position(scroll_x, w->text_area.y, CURSOR_POS); + break; + case 4: // mouse is below, scroll up + w->scroll(w->mTopLineNum + scroll_amount, w->mHorizOffset); + pos = w->xy_to_position(scroll_x, w->text_area.y + w->text_area.h, CURSOR_POS); + break; + default: + return; } fl_text_drag_me(pos, w); Fl::repeat_timeout(.1, scroll_timer_cb, user_data); } + +/** + \brief Event handling. + */ int Fl_Text_Display::handle(int event) { if (!buffer()) return 0; // This isn't very elegant! @@ -3110,7 +3554,7 @@ int Fl_Text_Display::handle(int event) { event != FL_KEYBOARD && event != FL_KEYUP) { return Fl_Group::handle(event); } - + switch (event) { case FL_ENTER: case FL_MOVE: @@ -3122,137 +3566,144 @@ int Fl_Text_Display::handle(int event) { } else { return 0; } - + case FL_LEAVE: case FL_HIDE: if (active_r() && window()) { window()->cursor(FL_CURSOR_DEFAULT); - + return 1; } else { return 0; } - + case FL_PUSH: { - if (active_r() && window()) { - if (Fl::event_inside(text_area.x, text_area.y, text_area.w, - text_area.h)) window()->cursor(FL_CURSOR_INSERT); - else window()->cursor(FL_CURSOR_DEFAULT); - } - - if (Fl::focus() != this) { - Fl::focus(this); - handle(FL_FOCUS); - } - if (Fl_Group::handle(event)) return 1; - if (Fl::event_state()&FL_SHIFT) return handle(FL_DRAG); - dragging = 1; - int pos = xy_to_position(Fl::event_x(), Fl::event_y(), CURSOR_POS); - int ok = 0; - while (!ok) { - // FIXME: character is ucs-4 - char c = buffer()->character( pos ); - if (!((c & 0x80) && !(c & 0x40))) { - ok = 1; - } else { - pos++; - } - } - dragType = Fl::event_clicks(); - dragPos = pos; - if (dragType == DRAG_CHAR) - buffer()->unselect(); - else if (dragType == DRAG_WORD) - buffer()->select(word_start(pos), word_end(pos)); - else if (dragType == DRAG_LINE) - buffer()->select(buffer()->line_start(pos), buffer()->line_end(pos)+1); - - if (buffer()->primary_selection()->selected()) - insert_position(buffer()->primary_selection()->end()); - else - insert_position(pos); - show_insert_position(); + if (active_r() && window()) { + if (Fl::event_inside(text_area.x, text_area.y, text_area.w, + text_area.h)) window()->cursor(FL_CURSOR_INSERT); + else window()->cursor(FL_CURSOR_DEFAULT); + } + + if (Fl::focus() != this) { + Fl::focus(this); + handle(FL_FOCUS); + } + if (Fl_Group::handle(event)) return 1; + if (Fl::event_state()&FL_SHIFT) return handle(FL_DRAG); + dragging = 1; + int pos = xy_to_position(Fl::event_x(), Fl::event_y(), CURSOR_POS); + dragPos = pos; + if (buffer()->primary_selection()->includes(pos)) { + dragType = DRAG_START_DND; return 1; } - + dragType = Fl::event_clicks(); + if (dragType == DRAG_CHAR) { + buffer()->unselect(); + Fl::copy("", 0, 0); + } + else if (dragType == DRAG_WORD) { + buffer()->select(word_start(pos), word_end(pos)); + dragPos = word_start(pos); + } + + if (buffer()->primary_selection()->selected()) + insert_position(buffer()->primary_selection()->end()); + else + insert_position(pos); + show_insert_position(); + return 1; + } + case FL_DRAG: { - if (dragType < 0) return 1; - int X = Fl::event_x(), Y = Fl::event_y(), pos = 0; - // if we leave the text_area, we start a timer event - // that will take care of scrolling and selecting - if (Y < text_area.y) { - scroll_x = X; - scroll_amount = (Y - text_area.y) / 5 - 1; - if (!scroll_direction) { - Fl::add_timeout(.01, scroll_timer_cb, this); - } - scroll_direction = 3; - } else if (Y >= text_area.y+text_area.h) { - scroll_x = X; - scroll_amount = (Y - text_area.y - text_area.h) / 5 + 1; - if (!scroll_direction) { - Fl::add_timeout(.01, scroll_timer_cb, this); - } - scroll_direction = 4; - } else if (X < text_area.x) { - scroll_y = Y; - scroll_amount = (X - text_area.x) / 2 - 1; - if (!scroll_direction) { - Fl::add_timeout(.01, scroll_timer_cb, this); - } - scroll_direction = 2; - } else if (X >= text_area.x+text_area.w) { - scroll_y = Y; - scroll_amount = (X - text_area.x - text_area.w) / 2 + 1; - if (!scroll_direction) { - Fl::add_timeout(.01, scroll_timer_cb, this); - } - scroll_direction = 1; - } else { - if (scroll_direction) { - Fl::remove_timeout(scroll_timer_cb, this); - scroll_direction = 0; - } - pos = xy_to_position(X, Y, CURSOR_POS); - int ok = 0; - while (!ok) { - // FIXME: character is ucs-4 - char c = buffer()->character( pos ); - if (!((c & 0x80) && !(c & 0x40))) { - ok = 1; - } else { - pos++; - } - } + if (dragType==DRAG_NONE) + return 1; + if (dragType==DRAG_START_DND) { + if (!Fl::event_is_click() && Fl::dnd_text_ops()) { + const char* copy = buffer()->selection_text(); + Fl::dnd(); + free((void*)copy); } - fl_text_drag_me(pos, this); return 1; } - - case FL_RELEASE: { - dragging = 0; + int X = Fl::event_x(), Y = Fl::event_y(), pos = insert_position(); + // if we leave the text_area, we start a timer event + // that will take care of scrolling and selecting + if (Y < text_area.y) { + scroll_x = X; + scroll_amount = (Y - text_area.y) / 5 - 1; + if (!scroll_direction) { + Fl::add_timeout(.01, scroll_timer_cb, this); + } + scroll_direction = 3; + } else if (Y >= text_area.y+text_area.h) { + scroll_x = X; + scroll_amount = (Y - text_area.y - text_area.h) / 5 + 1; + if (!scroll_direction) { + Fl::add_timeout(.01, scroll_timer_cb, this); + } + scroll_direction = 4; + } else if (X < text_area.x) { + scroll_y = Y; + scroll_amount = (X - text_area.x) / 2 - 1; + if (!scroll_direction) { + Fl::add_timeout(.01, scroll_timer_cb, this); + } + scroll_direction = 2; + } else if (X >= text_area.x+text_area.w) { + scroll_y = Y; + scroll_amount = (X - text_area.x - text_area.w) / 2 + 1; + if (!scroll_direction) { + Fl::add_timeout(.01, scroll_timer_cb, this); + } + scroll_direction = 1; + } else { if (scroll_direction) { Fl::remove_timeout(scroll_timer_cb, this); scroll_direction = 0; } - - // convert from WORD or LINE selection to CHAR - if (insert_position() >= dragPos) - dragPos = buffer()->primary_selection()->start(); - else - dragPos = buffer()->primary_selection()->end(); - dragType = DRAG_CHAR; - - const char* copy = buffer()->selection_text(); - if (*copy) Fl::copy(copy, strlen(copy), 0); - free((void*)copy); - return 1; + pos = xy_to_position(X, Y, CURSOR_POS); + pos = buffer()->next_char(pos); } - + fl_text_drag_me(pos, this); + return 1; + } + + case FL_RELEASE: { + if (Fl::event_is_click() && (! Fl::event_clicks()) && + buffer()->primary_selection()->includes(dragPos) && !(Fl::event_state()&FL_SHIFT) ) { + buffer()->unselect(); // clicking in the selection: unselect and move cursor + insert_position(dragPos); + return 1; + } else if (Fl::event_clicks() == DRAG_LINE && Fl::event_button() == FL_LEFT_MOUSE) { + buffer()->select(buffer()->line_start(dragPos), buffer()->next_char(buffer()->line_end(dragPos))); + dragPos = line_start(dragPos); + dragType = DRAG_CHAR; + } else { + dragging = 0; + if (scroll_direction) { + Fl::remove_timeout(scroll_timer_cb, this); + scroll_direction = 0; + } + + // convert from WORD or LINE selection to CHAR + /*if (insert_position() >= dragPos) + dragPos = buffer()->primary_selection()->start(); + else + dragPos = buffer()->primary_selection()->end();*/ + dragType = DRAG_CHAR; + } + + const char* copy = buffer()->selection_text(); + if (*copy) Fl::copy(copy, strlen(copy), 0); + free((void*)copy); + return 1; + } + case FL_MOUSEWHEEL: if (Fl::event_dy()) return mVScrollBar->handle(event); else return mHScrollBar->handle(event); - + case FL_UNFOCUS: if (active_r() && window()) window()->cursor(FL_CURSOR_DEFAULT); case FL_FOCUS: @@ -3272,28 +3723,31 @@ int Fl_Text_Display::handle(int event) { redisplay_range(start, end); } return 1; - + case FL_KEYBOARD: // Copy? if ((Fl::event_state()&(FL_CTRL|FL_COMMAND)) && Fl::event_key()=='c') { - if (!buffer()->selected()) return 1; - const char *copy = buffer()->selection_text(); - if (*copy) Fl::copy(copy, strlen(copy), 1); - free((void*)copy); - return 1; + if (!buffer()->selected()) return 1; + const char *copy = buffer()->selection_text(); + if (*copy) Fl::copy(copy, strlen(copy), 1); + free((void*)copy); + return 1; } - + // Select all ? if ((Fl::event_state()&(FL_CTRL|FL_COMMAND)) && Fl::event_key()=='a') { - buffer()->select(0,buffer()->length()); - return 1; + buffer()->select(0,buffer()->length()); + const char *copy = buffer()->selection_text(); + if (*copy) Fl::copy(copy, strlen(copy), 0); + free((void*)copy); + return 1; } - + if (mVScrollBar->handle(event)) return 1; if (mHScrollBar->handle(event)) return 1; - + break; - + case FL_SHORTCUT: if (!(shortcut() ? Fl::test_shortcut(shortcut()) : test_shortcut())) return 0; @@ -3304,11 +3758,38 @@ int Fl_Text_Display::handle(int event) { break; } - + return 0; } +/* + Convert an x pixel position into a column number. + */ +double Fl_Text_Display::x_to_col(double y) const +{ + if (!mColumnScale) { + mColumnScale = string_width("Mitg", 4, 'A') / 4.0; + } + return (y/mColumnScale)+0.5; +} + + +/** + Convert a column number into an x pixel position. + */ +double Fl_Text_Display::col_to_x(double col) const +{ + if (!mColumnScale) { + // recalculate column scale value + x_to_col(0); + } + return col*mColumnScale; +} + + + + // -// End of "$Id: Fl_Text_Display.cxx 7527 2010-04-18 14:33:33Z engelsman $". +// End of "$Id: Fl_Text_Display.cxx 8659 2011-05-13 07:58:26Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Text_Editor.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Text_Editor.cxx index a670fb780..553bd0d9e 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Text_Editor.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Text_Editor.cxx @@ -1,7 +1,7 @@ // -// "$Id: Fl_Text_Editor.cxx 7462 2010-04-06 23:00:56Z matt $" +// "$Id: Fl_Text_Editor.cxx 8034 2010-12-15 12:21:55Z AlbrechtS $" // -// Copyright 2001-2009 by Bill Spitzak and others. +// Copyright 2001-2010 by Bill Spitzak and others. // Original code Copyright Mark Edel. Permission to distribute under // the LGPL for the FLTK library granted by Mark Edel. // @@ -223,8 +223,6 @@ void Fl_Text_Editor::add_key_binding(int key, int state, Key_Func function, //////////////////////////////////////////////////////////////// -#define NORMAL_INPUT_MOVE 0 - static void kill_selection(Fl_Text_Editor* e) { if (e->buffer()->selected()) { e->insert_position(e->buffer()->primary_selection()->start()); @@ -234,6 +232,7 @@ static void kill_selection(Fl_Text_Editor* e) { /** Inserts the text associated with the key */ int Fl_Text_Editor::kf_default(int c, Fl_Text_Editor* e) { + // FIXME: this function is a mess! Fix this! if (!c || (!isprint(c) && c != '\t')) return 0; char s[2] = "\0"; s[0] = (char)c; @@ -253,13 +252,9 @@ int Fl_Text_Editor::kf_ignore(int, Fl_Text_Editor*) { /** Does a backspace in the current buffer.*/ int Fl_Text_Editor::kf_backspace(int, Fl_Text_Editor* e) { if (!e->buffer()->selected() && e->move_left()) { - int l = 1; - // FIXME: character is ucs-4 - char c = e->buffer()->character(e->insert_position()); - if (c & 0x80 && c & 0x40) { - l = fl_utf8len(c); - } - e->buffer()->select(e->insert_position(), e->insert_position()+l); + int p1 = e->insert_position(); + int p2 = e->buffer()->next_char(p1); + e->buffer()->select(p1, p2); } kill_selection(e); e->show_insert_position(); @@ -286,6 +281,7 @@ int Fl_Text_Editor::kf_move(int c, Fl_Text_Editor* e) { if (!selected) e->dragPos = e->insert_position(); e->buffer()->unselect(); + Fl::copy("", 0, 0); switch (c) { case FL_Home: e->insert_position(e->buffer()->line_start(e->insert_position())); @@ -320,6 +316,11 @@ int Fl_Text_Editor::kf_move(int c, Fl_Text_Editor* e) { int Fl_Text_Editor::kf_shift_move(int c, Fl_Text_Editor* e) { kf_move(c, e); fl_text_drag_me(e->insert_position(), e); + char *copy = e->buffer()->selection_text(); + if (copy) { + Fl::copy(copy, strlen(copy), 0); + free(copy); + } return 1; } /** Moves the current text cursor in the direction indicated by control key */ @@ -328,6 +329,7 @@ int Fl_Text_Editor::kf_ctrl_move(int c, Fl_Text_Editor* e) { e->dragPos = e->insert_position(); if (c != FL_Up && c != FL_Down) { e->buffer()->unselect(); + Fl::copy("", 0, 0); e->show_insert_position(); } switch (c) { @@ -367,6 +369,7 @@ int Fl_Text_Editor::kf_meta_move(int c, Fl_Text_Editor* e) { e->dragPos = e->insert_position(); if (c != FL_Up && c != FL_Down) { e->buffer()->unselect(); + Fl::copy("", 0, 0); e->show_insert_position(); } switch (c) { @@ -449,13 +452,9 @@ int Fl_Text_Editor::kf_insert(int, Fl_Text_Editor* e) { /** Does a delete of selected text or the current character in the current buffer.*/ int Fl_Text_Editor::kf_delete(int, Fl_Text_Editor* e) { if (!e->buffer()->selected()) { - int l = 1; - // FIXME: character is ucs-4 - char c = e->buffer()->character(e->insert_position()); - if (c & 0x80 && c & 0x40) { - l = fl_utf8len(c); - } - e->buffer()->select(e->insert_position(), e->insert_position()+l); + int p1 = e->insert_position(); + int p2 = e->buffer()->next_char(p1); + e->buffer()->select(p1, p2); } kill_selection(e); @@ -497,11 +496,15 @@ int Fl_Text_Editor::kf_paste(int, Fl_Text_Editor* e) { /** Selects all text in the current buffer.*/ int Fl_Text_Editor::kf_select_all(int, Fl_Text_Editor* e) { e->buffer()->select(0, e->buffer()->length()); + const char *copy = e->buffer()->selection_text(); + if (*copy) Fl::copy(copy, strlen(copy), 0); + free((void*)copy); return 1; } /** Undo last edit in the current buffer. Also deselect previous selection. */ int Fl_Text_Editor::kf_undo(int , Fl_Text_Editor* e) { e->buffer()->unselect(); + Fl::copy("", 0, 0); int crsr; int ret = e->buffer()->undo(&crsr); e->insert_position(crsr); @@ -519,7 +522,11 @@ int Fl_Text_Editor::handle_key() { // bytes to delete and a string to insert: int del = 0; if (Fl::compose(del)) { - if (del) buffer()->select(insert_position()-del, insert_position()); + if (del) { + int dp = insert_position(), di = del; + while (di--) dp = buffer()->prev_char_clipped(dp); + buffer()->select(dp, insert_position()); + } kill_selection(this); if (Fl::event_length()) { if (insert_mode()) insert(Fl::event_text()); @@ -549,6 +556,8 @@ void Fl_Text_Editor::maybe_do_callback() { } int Fl_Text_Editor::handle(int event) { + static int dndCursorPos; + if (!buffer()) return 0; switch (event) { @@ -593,7 +602,12 @@ int Fl_Text_Editor::handle(int event) { if (Fl::event_button() == 2) { // don't let the text_display see this event if (Fl_Group::handle(event)) return 1; - dragType = -1; + dragType = DRAG_NONE; + if(buffer()->selected()) { + buffer()->unselect(); + } + int pos = xy_to_position(Fl::event_x(), Fl::event_y(), CURSOR_POS); + insert_position(pos); Fl::paste(*this, 0); Fl::focus(this); set_changed(); @@ -610,11 +624,29 @@ int Fl_Text_Editor::handle(int event) { return 1; } break; + + // Handle drag'n'drop attempt by the user. This is a simplified + // implementation which allows dnd operations onto the scroll bars. + case FL_DND_ENTER: // save the current cursor position + if (Fl::visible_focus() && handle(FL_FOCUS)) + Fl::focus(this); + show_cursor(mCursorOn); + dndCursorPos = insert_position(); + /* fall through */ + case FL_DND_DRAG: // show a temporary insertion cursor + insert_position(xy_to_position(Fl::event_x(), Fl::event_y(), CURSOR_POS)); + return 1; + case FL_DND_LEAVE: // restore original cursor + insert_position(dndCursorPos); + return 1; + case FL_DND_RELEASE: // keep insertion cursor and wait for the FL_PASTE event + buffer()->unselect(); // FL_PASTE must not destroy current selection! + return 1; } return Fl_Text_Display::handle(event); } // -// End of "$Id: Fl_Text_Editor.cxx 7462 2010-04-06 23:00:56Z matt $". +// End of "$Id: Fl_Text_Editor.cxx 8034 2010-12-15 12:21:55Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Tile.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Tile.cxx index 762ea7d37..0d245db3a 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Tile.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Tile.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Tile.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Tile.cxx 7903 2010-11-28 21:06:39Z matt $" // // Tile widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -52,17 +52,17 @@ void Fl_Tile::position(int oix, int oiy, int newx, int newy) { int R = X+o->w(); if (oix) { int t = p[0]; - if (t == oix || t>oix && Xnewx) X = newx; + if (t == oix || (t>oix && Xnewx) ) X = newx; t = p[1]; - if (t == oix || t>oix && Rnewx) R = newx; + if (t == oix || (t>oix && Rnewx) ) R = newx; } int Y = o->y(); int B = Y+o->h(); if (oiy) { int t = p[2]; - if (t == oiy || t>oiy && Ynewy) Y = newy; + if (t == oiy || (t>oiy && Ynewy) ) Y = newy; t = p[3]; - if (t == oiy || t>oiy && Bnewy) B = newy; + if (t == oiy || (t>oiy && Bnewy) ) B = newy; } o->damage_resize(X,Y,R-X,B-Y); } @@ -210,5 +210,5 @@ int Fl_Tile::handle(int event) { } // -// End of "$Id: Fl_Tile.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Tile.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Tiled_Image.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Tiled_Image.cxx index 3646d60d5..1857480af 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Tiled_Image.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Tiled_Image.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Tiled_Image.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Tiled_Image.cxx 7903 2010-11-28 21:06:39Z matt $" // // Tiled image code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -131,5 +131,5 @@ Fl_Tiled_Image::draw(int X, // I - Starting X position // -// End of "$Id: Fl_Tiled_Image.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Tiled_Image.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Tooltip.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Tooltip.cxx index ee02ac88d..05b6e2344 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Tooltip.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Tooltip.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Tooltip.cxx 6902 2009-09-27 11:06:56Z matt $" +// "$Id: Fl_Tooltip.cxx 8788 2011-06-08 14:35:22Z matt $" // // Tooltip source file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -30,16 +30,16 @@ #include #include +#include // strdup() float Fl_Tooltip::delay_ = 1.0f; float Fl_Tooltip::hoverdelay_ = 0.2f; -int Fl_Tooltip::enabled_ = 1; Fl_Color Fl_Tooltip::color_ = fl_color_cube(FL_NUM_RED - 1, FL_NUM_GREEN - 1, FL_NUM_BLUE - 2); Fl_Color Fl_Tooltip::textcolor_ = FL_BLACK; Fl_Font Fl_Tooltip::font_ = FL_HELVETICA; -Fl_Fontsize Fl_Tooltip::size_ = FL_NORMAL_SIZE; +Fl_Fontsize Fl_Tooltip::size_ = -1; #define MAX_WIDTH 400 @@ -59,7 +59,9 @@ public: void layout(); /** Shows the tooltip windows only if a tooltip text is available. */ void show() { - if (tip) Fl_Menu_Window::show(); + if (!tip) return; + + Fl_Menu_Window::show(); } }; @@ -67,6 +69,14 @@ Fl_Widget* Fl_Tooltip::widget_ = 0; static Fl_TooltipBox *window = 0; static int Y,H; +#ifdef __APPLE__ +// returns the unique tooltip window +Fl_Window *Fl_Tooltip::current_window(void) +{ + return (Fl_Window*)window; +} +#endif + void Fl_TooltipBox::layout() { fl_font(Fl_Tooltip::font(), Fl_Tooltip::size()); int ww, hh; @@ -124,15 +134,20 @@ static void tooltip_timeout(void*) { if (!tip || !*tip) { if (window) window->hide(); } else { - //if (Fl::grab()) return; - if (!window) window = new Fl_TooltipBox; - // this cast bypasses the normal Fl_Window label() code: - ((Fl_Widget*)window)->label(tip); - window->layout(); - window->redraw(); -// printf("tooltip_timeout: Showing window %p with tooltip \"%s\"...\n", -// window, tip ? tip : "(null)"); - window->show(); + int condition = 1; +#if !(defined(__APPLE__) || defined(WIN32)) + condition = (Fl::grab() == NULL); +#endif + if ( condition ) { + if (!window) window = new Fl_TooltipBox; + // this cast bypasses the normal Fl_Window label() code: + ((Fl_Widget*)window)->label(tip); + window->layout(); + window->redraw(); + // printf("tooltip_timeout: Showing window %p with tooltip \"%s\"...\n", + // window, tip ? tip : "(null)"); + window->show(); + } } Fl::remove_timeout(recent_timeout); @@ -141,8 +156,8 @@ static void tooltip_timeout(void*) { } /** - This method is called when the mouse pointer enters a widget. -

    If this widget or one of it's parents has a tooltip, enter it. This + This method is called when the mouse pointer enters a widget. +

    If this widget or one of its parents has a tooltip, enter it. This will do nothing if this is the current widget (even if the mouse moved out so an exit() was done and then moved back in). If no tooltip can be found do Fl_Tooltip::exit_(). If you don't want this behavior (for instance @@ -267,16 +282,70 @@ void Fl_Tooltip::enter_area(Fl_Widget* wid, int x,int y,int w,int h, const char* #endif // DEBUG } -void Fl_Widget::tooltip(const char *tt) { +void Fl_Tooltip::set_enter_exit_once_() { static char beenhere = 0; if (!beenhere) { beenhere = 1; Fl_Tooltip::enter = Fl_Tooltip::enter_; Fl_Tooltip::exit = Fl_Tooltip::exit_; } - tooltip_ = tt; +} + +/** + Sets the current tooltip text. + + Sets a string of text to display in a popup tooltip window when the user + hovers the mouse over the widget. The string is not copied, so + make sure any formatted string is stored in a static, global, + or allocated buffer. If you want a copy made and managed for you, + use the copy_tooltip() method, which will manage the tooltip string + automatically. + + If no tooltip is set, the tooltip of the parent is inherited. Setting a + tooltip for a group and setting no tooltip for a child will show the + group's tooltip instead. To avoid this behavior, you can set the child's + tooltip to an empty string (""). + \param[in] text New tooltip text (no copy is made) + \see copy_tooltip(const char*), tooltip() +*/ +void Fl_Widget::tooltip(const char *text) { + Fl_Tooltip::set_enter_exit_once_(); + if (flags() & COPIED_TOOLTIP) { + // reassigning a copied tooltip remains the same copied tooltip + if (tooltip_ == text) return; + free((void*)(tooltip_)); // free maintained copy + clear_flag(COPIED_TOOLTIP); // disable copy flag (WE don't make copies) + } + tooltip_ = text; +} + +/** + Sets the current tooltip text. + Unlike tooltip(), this method allocates a copy of the tooltip + string instead of using the original string pointer. + + The internal copy will automatically be freed whenever you assign + a new tooltip or when the widget is destroyed. + + If no tooltip is set, the tooltip of the parent is inherited. Setting a + tooltip for a group and setting no tooltip for a child will show the + group's tooltip instead. To avoid this behavior, you can set the child's + tooltip to an empty string (""). + \param[in] text New tooltip text (an internal copy is made and managed) + \see tooltip(const char*), tooltip() +*/ +void Fl_Widget::copy_tooltip(const char *text) { + Fl_Tooltip::set_enter_exit_once_(); + if (flags() & COPIED_TOOLTIP) free((void *)(tooltip_)); + if (text) { + set_flag(COPIED_TOOLTIP); + tooltip_ = strdup(text); + } else { + clear_flag(COPIED_TOOLTIP); + tooltip_ = (char *)0; + } } // -// End of "$Id: Fl_Tooltip.cxx 6902 2009-09-27 11:06:56Z matt $". +// End of "$Id: Fl_Tooltip.cxx 8788 2011-06-08 14:35:22Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Tree.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Tree.cxx index 76cabe9f0..4bbd229ce 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Tree.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Tree.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Tree.cxx 7672 2010-07-10 09:44:45Z matt $" +// "$Id: Fl_Tree.cxx 8632 2011-05-04 02:59:50Z greg.ercolano $" // #include @@ -9,14 +9,12 @@ #include #include -#define SCROLL_W 15 - ////////////////////// // Fl_Tree.cxx ////////////////////// // // Fl_Tree -- This file is part of the Fl_Tree widget for FLTK -// Copyright (C) 2009 by Greg Ercolano. +// Copyright (C) 2009-2010 by Greg Ercolano. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -40,34 +38,53 @@ static void scroll_cb(Fl_Widget*,void *data) { } // INTERNAL: Parse elements from path into an array of null terminated strings +// Handles escape characters. // Path="/aa/bb" // Return: arr[0]="aa", arr[1]="bb", arr[2]=0 -// Caller must: free(arr[0]); free(arr); +// Caller must call free_path(arr). // static char **parse_path(const char *path) { while ( *path == '/' ) path++; // skip leading '/' // First pass: identify, null terminate, and count separators - int seps = 1; // separator count (1: first item) + int seps = 1; // separator count (1: first item) int arrsize = 1; // array size (1: first item) char *save = strdup(path); // make copy we can modify - char *s = save; - while ( ( s = strchr(s, '/') ) ) { - while ( *s == '/' ) { *s++ = 0; seps++; } - if ( *s ) { arrsize++; } + char *sin = save, *sout = save; + while ( *sin ) { + if ( *sin == '\\' ) { // handle escape character + *sout++ = *++sin; + if ( *sin ) ++sin; + } else if ( *sin == '/' ) { // handle submenu + *sout++ = 0; + sin++; + seps++; + arrsize++; + } else { // all other chars + *sout++ = *sin++; + } } + *sout = 0; arrsize++; // (room for terminating NULL) // Second pass: create array, save nonblank elements char **arr = (char**)malloc(sizeof(char*) * arrsize); int t = 0; - s = save; + sin = save; while ( seps-- > 0 ) { - if ( *s ) { arr[t++] = s; } // skips empty fields, eg. '//' - s += (strlen(s) + 1); + if ( *sin ) { arr[t++] = sin; } // skips empty fields, e.g. '//' + sin += (strlen(sin) + 1); } arr[t] = 0; return(arr); } +// INTERNAL: Free the array returned by parse_path() +static void free_path(char **arr) { + if ( arr ) { + if ( arr[0] ) { free((void*)arr[0]); } + free((void*)arr); + } +} + // INTERNAL: Recursively descend tree hierarchy, accumulating total child count static int find_total_children(Fl_Tree_Item *item, int count=0) { count++; @@ -82,11 +99,14 @@ Fl_Tree::Fl_Tree(int X, int Y, int W, int H, const char *L) : Fl_Group(X,Y,W,H,L _root = new Fl_Tree_Item(_prefs); _root->parent(0); // we are root of tree _root->label("ROOT"); - _item_clicked = 0; + _item_focus = 0; + _callback_item = 0; + _callback_reason = FL_TREE_REASON_NONE; + _scrollbar_size = 0; // 0: uses Fl::scrollbar_size() box(FL_DOWN_BOX); - color(FL_WHITE); + color(FL_BACKGROUND2_COLOR, FL_SELECTION_COLOR); when(FL_WHEN_CHANGED); - _vscroll = new Fl_Scrollbar(0,0,0,0); // will be resized by draw() + _vscroll = new Fl_Scrollbar(0,0,0,0); // will be resized by draw() _vscroll->hide(); _vscroll->type(FL_VERTICAL); _vscroll->step(1); @@ -102,6 +122,15 @@ Fl_Tree::~Fl_Tree() { /// Adds a new item, given a 'menu style' path, eg: "/Parent/Child/item". /// Any parent nodes that don't already exist are created automatically. /// Adds the item based on the value of sortorder(). +/// +/// To specify items or submenus that contain slashes ('/' or '\') +/// use an escape character to protect them, e.g. +/// +/// \code +/// tree->add("/Holidays/Photos/12\\/25\\2010"); // Adds item "12/25/2010" +/// tree->add("/Pathnames/c:\\\\Program Files\\\\MyApp"); // Adds item "c:\Program Files\MyApp" +/// \endcode +/// /// \returns the child item created, or 0 on error. /// Fl_Tree_Item* Fl_Tree::add(const char *path) { @@ -112,12 +141,13 @@ Fl_Tree_Item* Fl_Tree::add(const char *path) { } char **arr = parse_path(path); Fl_Tree_Item *item = _root->add(_prefs, arr); - free((void*)arr[0]); - free((void*)arr); + free_path(arr); return(item); } /// Inserts a new item above the specified Fl_Tree_Item, with the label set to 'name'. +/// \param[in] above -- the item above which to insert the new item. Must not be NULL. +/// \param[in] name -- the name of the new item /// \returns the item that was added, or 0 if 'above' could not be found. /// Fl_Tree_Item* Fl_Tree::insert_above(Fl_Tree_Item *above, const char *name) { @@ -125,50 +155,122 @@ Fl_Tree_Item* Fl_Tree::insert_above(Fl_Tree_Item *above, const char *name) { } /// Insert a new item into a tree-item's children at a specified position. +/// +/// \param[in] item The existing item to insert new child into. Must not be NULL. +/// \param[in] name The label for the new item +/// \param[in] pos The position of the new item in the child list /// \returns the item that was added. +/// Fl_Tree_Item* Fl_Tree::insert(Fl_Tree_Item *item, const char *name, int pos) { return(item->insert(_prefs, name, pos)); } /// Add a new child to a tree-item. +/// +/// \param[in] item The existing item to add new child to. Must not be NULL. +/// \param[in] name The label for the new item /// \returns the item that was added. +/// Fl_Tree_Item* Fl_Tree::add(Fl_Tree_Item *item, const char *name) { return(item->add(_prefs, name)); } /// Find the item, given a menu style path, eg: "/Parent/Child/item". -/// /// There is both a const and non-const version of this method. /// Const version allows pure const methods to use this method /// to do lookups without causing compiler errors. -/// \returns the item, or 0 if not found. +/// +/// To specify items or submenus that contain slashes ('/' or '\') +/// use an escape character to protect them, e.g. +/// +/// \code +/// tree->add("/Holidays/Photos/12\\/25\\2010"); // Adds item "12/25/2010" +/// tree->add("/Pathnames/c:\\\\Program Files\\\\MyApp"); // Adds item "c:\Program Files\MyApp" +/// \endcode +/// +/// \param[in] path -- the tree item's pathname to be found (e.g. "Flintstones/Fred") +/// \returns the item, or NULL if not found. +/// +/// \see item_pathname() /// Fl_Tree_Item *Fl_Tree::find_item(const char *path) { - if ( ! _root ) return(0); + if ( ! _root ) return(NULL); char **arr = parse_path(path); Fl_Tree_Item *item = _root->find_item(arr); - free((void*)arr[0]); - free((void*)arr); + free_path(arr); return(item); } /// A const version of Fl_Tree::find_item(const char *path) const Fl_Tree_Item *Fl_Tree::find_item(const char *path) const { - if ( ! _root ) return(0); + if ( ! _root ) return(NULL); char **arr = parse_path(path); const Fl_Tree_Item *item = _root->find_item(arr); - free((void*)arr[0]); - free((void*)arr); + free_path(arr); return(item); } +// Handle safe 'reverse string concatenation'. +// In the following we build the pathname from right-to-left, +// since we start at the child and work our way up to the root. +// +#define SAFE_RCAT(c) { \ + slen += 1; if ( slen >= pathnamelen ) { pathname[0] = '\0'; return(-2); } \ + *s-- = c; \ + } + +/// Find the pathname for the specified \p item. +/// If \p item is NULL, root() is used. +/// The tree's root will be included in the pathname of showroot() is on. +/// Menu items or submenus that contain slashes ('/' or '\') in their names +/// will be escaped with a backslash. This is symmetrical with the add() +/// function which uses the same escape pattern to set names. +/// \param[in] pathname The string to use to return the pathname +/// \param[in] pathnamelen The maximum length of the string (including NULL). Must not be zero. +/// \param[in] item The item whose pathname is to be returned. +/// \returns +/// - 0 : OK (\p pathname returns the item's pathname) +/// - -1 : item not found (pathname="") +/// - -2 : pathname not large enough (pathname="") +/// \see find_item() +/// +int Fl_Tree::item_pathname(char *pathname, int pathnamelen, const Fl_Tree_Item *item) const { + pathname[0] = '\0'; + item = item ? item : _root; + if ( !item ) return(-1); + // Build pathname starting at end + char *s = (pathname+pathnamelen-1); + int slen = 0; // length of string compiled so far (including NULL) + SAFE_RCAT('\0'); + while ( item ) { + if ( item->is_root() && showroot() == 0 ) break; // don't include root in path if showroot() off + // Find name of current item + const char *name = item->label() ? item->label() : "???"; // name for this item + int len = strlen(name); + // Add name to end of pathname[] + for ( --len; len>=0; len-- ) { + SAFE_RCAT(name[len]); // rcat name of item + if ( name[len] == '/' || name[len] == '\\' ) { + SAFE_RCAT('\\'); // escape front or back slashes within name + } + } + SAFE_RCAT('/'); // rcat leading slash + item = item->parent(); // move up tree (NULL==root) + } + if ( *(++s) == '/' ) ++s; // leave off leading slash from pathname + if ( s != pathname ) memmove(pathname, s, slen); // Shift down right-aligned string + return(0); +} + /// Standard FLTK draw() method, handles draws the tree widget. void Fl_Tree::draw() { // Let group draw box+label but *NOT* children. // We handle drawing children ourselves by calling each item's draw() // + // Handle group's bg Fl_Group::draw_box(); Fl_Group::draw_label(); + // Handle tree if ( ! _root ) return; int cx = x() + Fl::box_dx(box()); int cy = y() + Fl::box_dy(box()); @@ -178,18 +280,20 @@ void Fl_Tree::draw() { // 'Y' will be the lowest point on the tree int X = cx + _prefs.marginleft(); int Y = cy + _prefs.margintop() - (_vscroll->visible() ? _vscroll->value() : 0); - int W = cw - _prefs.marginleft(); // - _prefs.marginright(); + int W = cw - _prefs.marginleft(); // - _prefs.marginright(); int Ysave = Y; fl_push_clip(cx,cy,cw,ch); { fl_font(_prefs.labelfont(), _prefs.labelsize()); - _root->draw(X, Y, W, this, _prefs); + _root->draw(X, Y, W, this, + (Fl::focus()==this)?_item_focus:0, // show focus item ONLY if Fl_Tree has focus + _prefs); } fl_pop_clip(); // Show vertical scrollbar? int ydiff = (Y+_prefs.margintop())-Ysave; // ydiff=size of tree - int ytoofar = (cy+ch) - Y; // ytoofar -- scrolled beyond bottom (eg. stow) + int ytoofar = (cy+ch) - Y; // ytoofar -- scrolled beyond bottom (e.g. stow) //printf("ydiff=%d ch=%d Ysave=%d ytoofar=%d value=%d\n", //int(ydiff),int(ch),int(Ysave),int(ytoofar), int(_vscroll->value())); @@ -197,9 +301,11 @@ void Fl_Tree::draw() { if ( ytoofar > 0 ) ydiff += ytoofar; if ( Ysave ch || int(_vscroll->value()) > 1 ) { _vscroll->visible(); - int sx = x()+w()-Fl::box_dx(box())-SCROLL_W; + + int scrollsize = _scrollbar_size ? _scrollbar_size : Fl::scrollbar_size(); + int sx = x()+w()-Fl::box_dx(box())-scrollsize; int sy = y()+Fl::box_dy(box()); - int sw = SCROLL_W; + int sw = scrollsize; int sh = h()-Fl::box_dh(box()); _vscroll->show(); _vscroll->range(0.0,ydiff-ch); @@ -214,125 +320,389 @@ void Fl_Tree::draw() { fl_pop_clip(); } +/// Returns next visible item above (dir==Fl_Up) or below (dir==Fl_Down) the specified \p item. +/// If \p item is 0, returns first() if \p dir is Fl_Up, or last() if \p dir is FL_Down. +/// +/// \param[in] item The item above/below which we'll find the next visible item +/// \param[in] dir The direction to search. Can be FL_Up or FL_Down. +/// \returns The item found, or 0 if there's no visible items above/below the specified \p item. +/// +Fl_Tree_Item *Fl_Tree::next_visible_item(Fl_Tree_Item *item, int dir) { + if ( ! item ) { // no start item? + item = ( dir == FL_Up ) ? last() : first(); // start at top or bottom + if ( ! item ) return(0); + if ( item->visible_r() ) return(item); // return first/last visible item + } + switch ( dir ) { + case FL_Up: return(item->prev_displayed(_prefs)); + case FL_Down: return(item->next_displayed(_prefs)); + default: return(item->next_displayed(_prefs)); + } +} + +/// Set the item that currently should have keyboard focus. +/// Handles calling redraw() to update the focus box (if it is visible). +/// +/// \param[in] item The item that should take focus. If NULL, none will have focus. +/// +void Fl_Tree::set_item_focus(Fl_Tree_Item *item) { + if ( _item_focus != item ) { // changed? + _item_focus = item; // update + if ( visible_focus() ) redraw(); // redraw to update focus box + } +} + +/// Find the item that was clicked. +/// You should use callback_item() instead, which is fast, +/// and is meant to be used within a callback to determine the item clicked. +/// +/// This method walks the entire tree looking for the first item that is +/// under the mouse (ie. at Fl::event_x()/Fl:event_y(). +/// +/// Use this method /only/ if you've subclassed Fl_Tree, and are receiving +/// events before Fl_Tree has been able to process and update callback_item(). +/// +/// \returns the item clicked, or 0 if no item was under the current event. +/// +const Fl_Tree_Item* Fl_Tree::find_clicked() const { + if ( ! _root ) return(NULL); + return(_root->find_clicked(_prefs)); +} + +/// Set the item that was last clicked. +/// Should only be used by subclasses needing to change this value. +/// Normally Fl_Tree manages this value. +/// +/// Deprecated: use callback_item() instead. +/// +void Fl_Tree::item_clicked(Fl_Tree_Item* val) { + _callback_item = val; +} + +/// Returns the first item in the tree. +/// +/// Use this to walk the tree in the forward direction, eg: +/// \code +/// for ( Fl_Tree_Item *item = tree->first(); item; item = tree->next(item) ) { +/// printf("Item: %s\n", item->label()); +/// } +/// \endcode +/// +/// \returns first item in tree, or 0 if none (tree empty). +/// \see first(),next(),last(),prev() +/// +Fl_Tree_Item* Fl_Tree::first() { + return(_root); // first item always root +} + +/// Return the next item after \p item, or 0 if no more items. +/// +/// Use this code to walk the entire tree: +/// \code +/// for ( Fl_Tree_Item *item = tree->first(); item; item = tree->next(item) ) { +/// printf("Item: %s\n", item->label()); +/// } +/// \endcode +/// +/// \param[in] item The item to use to find the next item. If NULL, returns 0. +/// \returns Next item in tree, or 0 if at last item. +/// +/// \see first(),next(),last(),prev() +/// +Fl_Tree_Item *Fl_Tree::next(Fl_Tree_Item *item) { + if ( ! item ) return(0); + return(item->next()); +} + +/// Return the previous item before \p item, or 0 if no more items. +/// +/// This can be used to walk the tree in reverse, eg: +/// +/// \code +/// for ( Fl_Tree_Item *item = tree->first(); item; item = tree->prev(item) ) { +/// printf("Item: %s\n", item->label()); +/// } +/// \endcode +/// +/// \param[in] item The item to use to find the previous item. If NULL, returns 0. +/// \returns Previous item in tree, or 0 if at first item. +/// +/// \see first(),next(),last(),prev() +/// +Fl_Tree_Item *Fl_Tree::prev(Fl_Tree_Item *item) { + if ( ! item ) return(0); + return(item->prev()); +} + +/// Returns the last item in the tree. +/// +/// This can be used to walk the tree in reverse, eg: +/// +/// \code +/// for ( Fl_Tree_Item *item = tree->last(); item; item = tree->prev() ) { +/// printf("Item: %s\n", item->label()); +/// } +/// \endcode +/// +/// \returns last item in the tree, or 0 if none (tree empty). +/// +/// \see first(),next(),last(),prev() +/// +Fl_Tree_Item* Fl_Tree::last() { + if ( ! _root ) return(0); + Fl_Tree_Item *item = _root; + while ( item->has_children() ) { + item = item->child(item->children()-1); + } + return(item); +} + +/// Returns the first selected item in the tree. +/// +/// Use this to walk the tree looking for all the selected items, eg: +/// +/// \code +/// for ( Fl_Tree_Item *item = tree->first_selected_item(); item; item = tree->next_selected_item(item) ) { +/// printf("Item: %s\n", item->label()); +/// } +/// \endcode +/// +/// \returns The next selected item, or 0 if there are no more selected items. +/// +Fl_Tree_Item *Fl_Tree::first_selected_item() { + return(next_selected_item(0)); +} + +/// Returns the next selected item after \p item. +/// If \p item is 0, search starts at the first item (root). +/// +/// Use this to walk the tree looking for all the selected items, eg: +/// \code +/// for ( Fl_Tree_Item *item = tree->first_selected_item(); item; item = tree->next_selected_item(item) ) { +/// printf("Item: %s\n", item->label()); +/// } +/// \endcode +/// +/// \param[in] item The item to use to find the next selected item. If NULL, first() is used. +/// \returns The next selected item, or 0 if there are no more selected items. +/// +Fl_Tree_Item *Fl_Tree::next_selected_item(Fl_Tree_Item *item) { + if ( ! item ) { + if ( ! (item = first()) ) return(0); + if ( item->is_selected() ) return(item); + } + while ( (item = item->next()) ) + if ( item->is_selected() ) + return(item); + return(0); +} + /// Standard FLTK event handler for this widget. int Fl_Tree::handle(int e) { + int ret = 0; + // Developer note: Fl_Browser_::handle() used for reference here.. + // #include // for event debugging + // fprintf(stderr, "DEBUG: %s (%d)\n", fl_eventnames[e], e); + if (e == FL_ENTER || e == FL_LEAVE) return(1); + switch (e) { + case FL_FOCUS: { + // FLTK tests if we want focus. + // If a nav key was used to give us focus, and we've got no saved + // focus widget, determine which item gets focus depending on nav key. + // + if ( ! _item_focus ) { // no focus established yet? + switch (Fl::event_key()) { // determine if focus was navigated.. + case FL_Tab: { // received focus via TAB? + if ( Fl::event_state(FL_SHIFT) ) { // SHIFT-TAB similar to FL_Up + set_item_focus(next_visible_item(0, FL_Up)); + } else { // TAB similar to FL_Down + set_item_focus(next_visible_item(0, FL_Down)); + } + break; + } + case FL_Left: // received focus via LEFT or UP? + case FL_Up: { // XK_ISO_Left_Tab + set_item_focus(next_visible_item(0, FL_Up)); + break; + } + case FL_Right: // received focus via RIGHT or DOWN? + case FL_Down: + default: { + set_item_focus(next_visible_item(0, FL_Down)); + break; + } + } + } + if ( visible_focus() ) redraw(); // draw focus change + return(1); + } + case FL_UNFOCUS: { // FLTK telling us some other widget took focus. + if ( visible_focus() ) redraw(); // draw focus change + return(1); + } + case FL_KEYBOARD: { // keyboard shortcut + // Do shortcuts first or scrollbar will get them... + if (_prefs.selectmode() > FL_TREE_SELECT_NONE ) { + if ( !_item_focus ) { + set_item_focus(first()); + } + if ( _item_focus ) { + int ekey = Fl::event_key(); + switch (ekey) { + case FL_Enter: // ENTER: selects current item only + case FL_KP_Enter: + if ( when() & ~FL_WHEN_ENTER_KEY) { + select_only(_item_focus); + show_item(_item_focus); // STR #2426 + return(1); + } + break; + case ' ': // toggle selection state + switch ( _prefs.selectmode() ) { + case FL_TREE_SELECT_NONE: + break; + case FL_TREE_SELECT_SINGLE: + if ( ! _item_focus->is_selected() ) // not selected? + select_only(_item_focus); // select only this + else + deselect_all(); // select nothing + break; + case FL_TREE_SELECT_MULTI: + select_toggle(_item_focus); + break; + } + break; + case FL_Right: // open children (if any) + case FL_Left: { // close children (if any) + if ( _item_focus ) { + if ( ekey == FL_Right && _item_focus->is_close() ) { + // Open closed item + open(_item_focus); + redraw(); + ret = 1; + } else if ( ekey == FL_Left && _item_focus->is_open() ) { + // Close open item + close(_item_focus); + redraw(); + ret = 1; + } + return(1); + } + break; + } + case FL_Up: // next item up + case FL_Down: { // next item down + set_item_focus(next_visible_item(_item_focus, ekey)); // next item up|dn + if ( _item_focus ) { // item in focus? + // Autoscroll + int itemtop = _item_focus->y(); + int itembot = _item_focus->y()+_item_focus->h(); + if ( itemtop < y() ) { show_item_top(_item_focus); } + if ( itembot > y()+h() ) { show_item_bottom(_item_focus); } + // Extend selection + if ( _prefs.selectmode() == FL_TREE_SELECT_MULTI && // multiselect on? + (Fl::event_state() & FL_SHIFT) && // shift key? + ! _item_focus->is_selected() ) { // not already selected? + select(_item_focus); // extend selection.. + } + return(1); + } + break; + } + } + } + } + break; + } + } + + // Let Fl_Group take a shot at handling the event + if (Fl_Group::handle(e)) { + return(1); // handled? don't continue below + } + + // Handle events the child FLTK widgets didn't need + static Fl_Tree_Item *lastselect = 0; - int changed = 0; - int ret = Fl_Group::handle(e); + // fprintf(stderr, "ERCODEBUG: Fl_Tree::handle(): Event was %s (%d)\n", fl_eventnames[e], e); // DEBUGGING if ( ! _root ) return(ret); switch ( e ) { - case FL_PUSH: { + case FL_PUSH: { // clicked on a tree item? + if (Fl::visible_focus() && handle(FL_FOCUS)) { + Fl::focus(this); + } lastselect = 0; - item_clicked(0); // assume no item was clicked Fl_Tree_Item *o = _root->find_clicked(_prefs); - if ( o ) { - ret |= 1; // handled - if ( Fl::event_button() == FL_LEFT_MOUSE ) { - // Was collapse icon clicked? - if ( o->event_on_collapse_icon(_prefs) ) { - o->open_toggle(); - redraw(); - } - // Item's label clicked? - else if ( o->event_on_label(_prefs) && - (!o->widget() || !Fl::event_inside(o->widget())) && - callback() && - (!_vscroll->visible() || !Fl::event_inside(_vscroll)) ) { - item_clicked(o); // save item clicked - - // Handle selection behavior - switch ( _prefs.selectmode() ) { - case FL_TREE_SELECT_NONE: { // no selection changes - break; - } - case FL_TREE_SELECT_SINGLE: { - changed = select_only(o); - break; - } - case FL_TREE_SELECT_MULTI: { - int state = Fl::event_state(); - if ( state & FL_SHIFT ) { - if ( ! o->is_selected() ) { - o->select(); // add to selection - changed = 1; // changed - } - } else if ( state & FL_CTRL ) { - changed = 1; // changed - o->select_toggle(); // toggle selection state - lastselect = o; // save we toggled it (prevents oscillation) - } else { - changed = select_only(o); - } - break; - } - } - - if ( changed ) { - redraw(); // make change(s) visible - if ( when() & FL_WHEN_CHANGED ) { - set_changed(); - do_callback((Fl_Widget*)this, user_data()); // item callback - } - } - } - } + if ( ! o ) break; + set_item_focus(o); // becomes new focus widget + redraw(); + ret |= 1; // handled + if ( Fl::event_button() == FL_LEFT_MOUSE ) { + if ( o->event_on_collapse_icon(_prefs) ) { // collapse icon clicked? + open_toggle(o); + } else if ( o->event_on_label(_prefs) && // label clicked? + (!o->widget() || !Fl::event_inside(o->widget())) && // not inside widget + (!_vscroll->visible() || !Fl::event_inside(_vscroll)) ) { // not on scroller + switch ( _prefs.selectmode() ) { + case FL_TREE_SELECT_NONE: + break; + case FL_TREE_SELECT_SINGLE: + select_only(o); + break; + case FL_TREE_SELECT_MULTI: { + if ( Fl::event_state() & FL_SHIFT ) { // SHIFT+PUSH? + select(o); // add to selection + } else if ( Fl::event_state() & FL_CTRL ) { // CTRL+PUSH? + select_toggle(o); // toggle selection state + lastselect = o; // save toggled item (prevent oscillation) + } else { + select_only(o); + } + break; + } + } + } } break; } case FL_DRAG: { + // do the scrolling first: + int my = Fl::event_y(); + if ( my < y() ) { // above top? + int p = vposition()-(y()-my); + if ( p < 0 ) p = 0; + vposition(p); + } else if ( my > (y()+h()) ) { // below bottom? + int p = vposition()+(my-y()-h()); + if ( p > (int)_vscroll->maximum() ) p = (int)_vscroll->maximum(); + vposition(p); + } if ( Fl::event_button() != FL_LEFT_MOUSE ) break; Fl_Tree_Item *o = _root->find_clicked(_prefs); - if ( o ) { - ret |= 1; // handled - // Item's label clicked? - if ( o->event_on_label(_prefs) && - (!o->widget() || !Fl::event_inside(o->widget())) && - callback() && - (!_vscroll->visible() || !Fl::event_inside(_vscroll)) ) { - item_clicked(o); // save item clicked - // Handle selection behavior - switch ( _prefs.selectmode() ) { - case FL_TREE_SELECT_NONE: { // no selection changes - break; - } - case FL_TREE_SELECT_SINGLE: { - changed = select_only(o); - break; - } - case FL_TREE_SELECT_MULTI: { - int state = Fl::event_state(); - if ( state & FL_CTRL ) { - if ( lastselect != o ) {// not already toggled from last microdrag? - changed = 1; // changed - o->select_toggle(); // toggle selection - lastselect = o; // save we toggled it (prevents oscillation) - } - } else { - if ( ! o->is_selected() ) { - changed = 1; // changed - o->select(); // select this - } - } - break; - } - } - if ( changed ) { - redraw(); // make change(s) visible - if ( when() & FL_WHEN_CHANGED ) { - set_changed(); - do_callback((Fl_Widget*)this, user_data()); // item callback - } - } - } - } - break; - } - case FL_RELEASE: { - if ( Fl::event_button() == FL_LEFT_MOUSE ) { - ret |= 1; - if ( when() & FL_WHEN_RELEASE || ( this->changed() && (when() & FL_WHEN_CHANGED)) ) { - do_callback((Fl_Widget*)this, user_data()); // item callback - } + if ( ! o ) break; + set_item_focus(o); // becomes new focus widget + redraw(); + ret |= 1; + // Item's label clicked? + if ( o->event_on_label(_prefs) && + (!o->widget() || !Fl::event_inside(o->widget())) && + (!_vscroll->visible() || !Fl::event_inside(_vscroll)) ) { + // Handle selection behavior + switch ( _prefs.selectmode() ) { + case FL_TREE_SELECT_NONE: break; // no selection changes + case FL_TREE_SELECT_SINGLE: + select_only(o); + break; + case FL_TREE_SELECT_MULTI: + if ( Fl::event_state() & FL_CTRL && // CTRL-DRAG: toggle? + lastselect != o ) { // not already toggled from last microdrag? + select_toggle(o); // toggle selection + lastselect = o; // save we toggled it (prevents oscillation) + } else { + select(o); // select this + } + break; + } } break; } @@ -340,93 +710,217 @@ int Fl_Tree::handle(int e) { return(ret); } -/// Deselect item and all its children. -/// If item is NULL, root() is used. -/// Handles calling redraw() if anything was changed. -/// Returns count of how many items were in the 'selected' state, -/// ie. how many items were "changed". +/// Deselect \p item and all its children. +/// If item is NULL, first() is used. +/// Handles calling redraw() if anything was changed. +/// Invokes the callback depending on the value of optional parameter \p docallback. /// -/// \p docallback is an optional paramemter that can either be 0 or 1: +/// The callback can use callback_item() and callback_reason() respectively to determine +/// the item changed and the reason the callback was called. /// -/// - 0 - the callback() is not invoked (default) -/// - 1 - the callback() is invoked once if \b any items changed state, -/// and item_clicked() will be NULL (since many items could have been changed). -// -/// \todo deselect_all()'s docallback should support '2' (invoke callback for each item changed) +/// \param[in] item The item that will be deselected (along with all its children). +/// If NULL, first() is used. +/// \param[in] docallback -- A flag that determines if the callback() is invoked or not: +/// - 0 - the callback() is not invoked +/// - 1 - the callback() is invoked for each item that changed state, +/// callback_reason() will be FL_TREE_REASON_DESELECTED +/// +/// \returns count of how many items were actually changed to the deselected state. /// int Fl_Tree::deselect_all(Fl_Tree_Item *item, int docallback) { - item = item ? item : root(); // NULL? use root() - int count = item->deselect_all(); - if ( count ) { - redraw(); // anything changed? cause redraw - if ( docallback == 1 ) - do_callback_for_item(0); + item = item ? item : first(); // NULL? use first() + if ( ! item ) return(0); + int count = 0; + // Deselect item + if ( item->is_selected() ) + if ( deselect(item, docallback) ) + ++count; + // Deselect its children + for ( int t=0; tchildren(); t++ ) { + count += deselect_all(item->child(t), docallback); // recurse } return(count); } -/// Select item and all its children. -/// If item is NULL, root() is used. -/// Handles calling redraw() if anything was changed. -/// Returns count of how many items were in the 'deselected' state, -/// ie. how many items were "changed". +/// Select \p item and all its children. +/// If item is NULL, first() is used. +/// Handles calling redraw() if anything was changed. +/// Invokes the callback depending on the value of optional parameter \p docallback. /// -/// \p docallback is an optional paramemter that can either be 0 or 1: +/// The callback can use callback_item() and callback_reason() respectively to determine +/// the item changed and the reason the callback was called. /// -/// - 0 - the callback() is not invoked (default) -/// - 1 - the callback() is invoked once if \b any items changed state, -/// and item_clicked() will be NULL (since many items could have been changed). -/// -/// \todo select_all()'s docallback should support '2' (invoke callback for each item changed) +/// \param[in] item The item that will be selected (along with all its children). +/// If NULL, first() is used. +/// \param[in] docallback -- A flag that determines if the callback() is invoked or not: +/// - 0 - the callback() is not invoked +/// - 1 - the callback() is invoked for each item that changed state, +/// callback_reason() will be FL_TREE_REASON_SELECTED +/// \returns count of how many items were actually changed to the selected state. /// int Fl_Tree::select_all(Fl_Tree_Item *item, int docallback) { - item = item ? item : root(); // NULL? use root() - int count = item->select_all(); - if ( count ) { - redraw(); // anything changed? cause redraw - if (docallback == 1) - do_callback_for_item(0); + item = item ? item : first(); // NULL? use first() + if ( ! item ) return(0); + int count = 0; + // Select item + if ( !item->is_selected() ) + if ( select(item, docallback) ) + ++count; + // Select its children + for ( int t=0; tchildren(); t++ ) { + count += select_all(item->child(t), docallback); // recurse } return(count); } -/// Select only this item. -/// If item is NULL, root() is used. -/// Handles calling redraw() if anything was changed. -/// Returns how many items were changed, if any. +/// Select only the specified \p item, deselecting all others that might be selected. +/// If item is 0, first() is used. +/// Handles calling redraw() if anything was changed. +/// Invokes the callback depending on the value of optional parameter \p docallback. /// -/// \p docallback is an optional paramemter that can either be 0, 1 or 2: +/// The callback can use callback_item() and callback_reason() respectively to determine +/// the item changed and the reason the callback was called. /// -/// - 0 - the callback() is not invoked (default) -/// - 1 - the callback() is invoked once if \b any items changed state, -/// and item_clicked() will be NULL (since many items could have been changed). -/// - 2 - the callback() is invoked once for \b each item that changed state, -/// and the callback() can use item_clicked() to determine the item changed. +/// \param[in] selitem The item to be selected. If NULL, first() is used. +/// \param[in] docallback -- A flag that determines if the callback() is invoked or not: +/// - 0 - the callback() is not invoked +/// - 1 - the callback() is invoked for each item that changed state, +/// callback_reason() will be either FL_TREE_REASON_SELECTED or +/// FL_TREE_REASON_DESELECTED +/// \returns the number of items whose selection states were changed, if any. /// int Fl_Tree::select_only(Fl_Tree_Item *selitem, int docallback) { - selitem = selitem ? selitem : root(); // NULL? use root() + selitem = selitem ? selitem : first(); // NULL? use first() + if ( ! selitem ) return(0); int changed = 0; for ( Fl_Tree_Item *item = first(); item; item = item->next() ) { if ( item == selitem ) { if ( item->is_selected() ) continue; // don't count if already selected - item->select(); + select(item, docallback); ++changed; - if ( docallback == 2 ) do_callback_for_item(item); } else { if ( item->is_selected() ) { - item->deselect(); + deselect(item, docallback); ++changed; - if ( docallback == 2 ) do_callback_for_item(item); } } } - if ( changed ) { - redraw(); // anything changed? redraw - if ( docallback == 1 ) do_callback_for_item(0); - } return(changed); } +/// Adjust the vertical scroll bar so that \p item is visible +/// \p yoff pixels from the top of the Fl_Tree widget's display. +/// +/// For instance, yoff=0 will position the item at the top. +/// +/// If yoff is larger than the vertical scrollbar's limit, +/// the value will be clipped. So if yoff=100, but scrollbar's max +/// is 50, then 50 will be used. +/// +/// \param[in] item The item to be shown. If NULL, first() is used. +/// \param[in] yoff The pixel offset from the top for the displayed position. +/// +/// \see show_item_top(), show_item_middle(), show_item_bottom() +/// +void Fl_Tree::show_item(Fl_Tree_Item *item, int yoff) { + item = item ? item : first(); + if (!item) return; + int newval = item->y() - y() - yoff + (int)_vscroll->value(); + if ( newval < _vscroll->minimum() ) newval = (int)_vscroll->minimum(); + if ( newval > _vscroll->maximum() ) newval = (int)_vscroll->maximum(); + _vscroll->value(newval); + redraw(); +} + +/// See if \p item is currently displayed on-screen (visible within the widget). +/// This can be used to detect if the item is scrolled off-screen. +/// Checks to see if the item's vertical position is within the top and bottom +/// edges of the display window. This does NOT take into account the hide()/show() +/// or open()/close() status of the item. +/// +/// \param[in] item The item to be checked. If NULL, first() is used. +/// \returns 1 if displayed, 0 if scrolled off screen or no items are in tree. +/// +int Fl_Tree::displayed(Fl_Tree_Item *item) { + item = item ? item : first(); + if (!item) return(0); + return( (item->y() >= y()) && (item->y() <= (y()+h()-item->h())) ? 1 : 0); +} + +/// Adjust the vertical scroll bar to show \p item at the top +/// of the display IF it is currently off-screen (e.g. show_item_top()). +/// If it is already on-screen, no change is made. +/// +/// \param[in] item The item to be shown. If NULL, first() is used. +/// +/// \see show_item_top(), show_item_middle(), show_item_bottom() +/// +void Fl_Tree::show_item(Fl_Tree_Item *item) { + item = item ? item : first(); + if (!item) return; + if ( displayed(item) ) return; + show_item_top(item); +} + +/// Adjust the vertical scrollbar so that \p item is at the top of the display. +/// +/// \param[in] item The item to be shown. If NULL, first() is used. +/// +void Fl_Tree::show_item_top(Fl_Tree_Item *item) { + item = item ? item : first(); + if (item) show_item(item, 0); +} + +/// Adjust the vertical scrollbar so that \p item is in the middle of the display. +/// +/// \param[in] item The item to be shown. If NULL, first() is used. +/// +void Fl_Tree::show_item_middle(Fl_Tree_Item *item) { + item = item ? item : first(); + if (item) show_item(item, (h()/2)-(item->h()/2)); +} + +/// Adjust the vertical scrollbar so that \p item is at the bottom of the display. +/// +/// \param[in] item The item to be shown. If NULL, first() is used. +/// +void Fl_Tree::show_item_bottom(Fl_Tree_Item *item) { + item = item ? item : first(); + if (item) show_item(item, h()-item->h()); +} + +/// Returns the vertical scroll position as a pixel offset. +/// The position returned is how many pixels of the tree are scrolled off the top edge +/// of the screen. Example: A position of '3' indicates the top 3 pixels of +/// the tree are scrolled off the top edge of the screen. +/// \see vposition(), hposition() +/// +int Fl_Tree::vposition() const { + return((int)_vscroll->value()); +} + +/// Sets the vertical scroll offset to position \p pos. +/// The position is how many pixels of the tree are scrolled off the top edge +/// of the screen. Example: A position of '3' scrolls the top three pixels of +/// the tree off the top edge of the screen. +/// \param[in] pos The vertical position (in pixels) to scroll the browser to. +/// +void Fl_Tree::vposition(int pos) { + if (pos < 0) pos = 0; + if (pos > _vscroll->maximum()) pos = (int)_vscroll->maximum(); + if (pos == _vscroll->value()) return; + _vscroll->value(pos); + redraw(); +} + +/// Displays \p item, scrolling the tree as necessary. +/// \param[in] item The item to be displayed. If NULL, first() is used. +/// +void Fl_Tree::display(Fl_Tree_Item *item) { + item = item ? item : first(); + if (item) show_item_middle(item); +} + /** * Read a preferences database into the tree widget. * A preferences database is a hierarchical collection of data which can be @@ -478,5 +972,5 @@ void Fl_Tree::load(Fl_Preferences &prefs) } // -// End of "$Id: Fl_Tree.cxx 7672 2010-07-10 09:44:45Z matt $". +// End of "$Id: Fl_Tree.cxx 8632 2011-05-04 02:59:50Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Tree_Item.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Tree_Item.cxx index 7315ef6ff..deeaf5a4c 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Tree_Item.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Tree_Item.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Tree_Item.cxx 7672 2010-07-10 09:44:45Z matt $" +// "$Id: Fl_Tree_Item.cxx 8589 2011-04-14 13:15:13Z manolo $" // #include @@ -14,7 +14,7 @@ ////////////////////// // // Fl_Tree -- This file is part of the Fl_Tree widget for FLTK -// Copyright (C) 2009 by Greg Ercolano. +// Copyright (C) 2009-2010 by Greg Ercolano. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -44,8 +44,8 @@ Fl_Tree_Item::Fl_Tree_Item(const Fl_Tree_Prefs &prefs) { _label = 0; _labelfont = prefs.labelfont(); _labelsize = prefs.labelsize(); - _labelfgcolor = prefs.fgcolor(); - _labelbgcolor = prefs.bgcolor(); + _labelfgcolor = prefs.labelfgcolor(); + _labelbgcolor = prefs.labelbgcolor(); _widget = 0; _open = 1; _visible = 1; @@ -165,12 +165,12 @@ int Fl_Tree_Item::find_child(const char *name) { return(-1); } -/// Find item by descending array of names. +/// Find child item by descending array of names. Does not include self in search. /// Only Fl_Tree should need this method. /// /// \returns item, or 0 if not found /// -const Fl_Tree_Item *Fl_Tree_Item::find_item(char **arr) const { +const Fl_Tree_Item *Fl_Tree_Item::find_child_item(char **arr) const { for ( int t=0; tlabel() ) { if ( strcmp(child(t)->label(), *arr) == 0 ) { // match? @@ -185,12 +185,12 @@ const Fl_Tree_Item *Fl_Tree_Item::find_item(char **arr) const { return(0); } -/// Find item by by descending array of names. -/// Only Fl_Tree should need this method. +/// Find child item by descending array of names. Does not include self in search. +/// Only Fl_Tree should need this method. Use Fl_Tree::find_item() instead. /// /// \returns item, or 0 if not found /// -Fl_Tree_Item *Fl_Tree_Item::find_item(char **arr) { +Fl_Tree_Item *Fl_Tree_Item::find_child_item(char **arr) { for ( int t=0; tlabel() ) { if ( strcmp(child(t)->label(), *arr) == 0 ) { // match? @@ -205,6 +205,40 @@ Fl_Tree_Item *Fl_Tree_Item::find_item(char **arr) { return(0); } +/// Find item by descending array of \p names. Includes self in search. +/// Only Fl_Tree should need this method. Use Fl_Tree::find_item() instead. +/// +/// \returns item, or 0 if not found +/// +const Fl_Tree_Item *Fl_Tree_Item::find_item(char **names) const { + if ( label() && strcmp(label(), *names) == 0 ) { // match self? + if ( *(names+1) == 0 ) { // end of names, + return(this); // found ourself. + } + } + if ( children() ) { // check children.. + return(find_child_item(names)); + } + return(0); +} + +/// Find item by descending array of \p names. Includes self in search. +/// Only Fl_Tree should need this method. +/// +/// \returns item, or 0 if not found +/// +Fl_Tree_Item *Fl_Tree_Item::find_item(char **names) { + if ( label() && strcmp(label(), *names) == 0 ) { // match self? + if ( *(names+1) == 0 ) { // end of names, + return(this); // found ourself. + } + } + if ( children() ) { // check children.. + return(find_child_item(names)); + } + return(0); +} + /// Find the index number for the specified 'item' /// in the current item's list of children. /// @@ -265,7 +299,7 @@ Fl_Tree_Item *Fl_Tree_Item::add(const Fl_Tree_Prefs &prefs, const char *new_labe /// Fl_Tree_Item *Fl_Tree_Item::add(const Fl_Tree_Prefs &prefs, char **arr) { int t = find_child(*arr); - Fl_Tree_Item *item; + Fl_Tree_Item *item = 0; if ( t == -1 ) { item = (Fl_Tree_Item*)add(prefs, *arr); } else { @@ -416,7 +450,7 @@ void Fl_Tree_Item::draw_vertical_connector(int x, int y1, int y2, const Fl_Tree_ /// Find the item that the last event was over. /// -/// Returns the item if its visible, and mouse is over it. +/// Returns the item if it is visible, and mouse is over it. /// Works even if widget deactivated. /// Use event_on_collapse_icon() to determine if collapse button was pressed. /// @@ -446,7 +480,7 @@ const Fl_Tree_Item *Fl_Tree_Item::find_clicked(const Fl_Tree_Prefs &prefs) const /// Non-const version of the above. /// Find the item that the last event was over. /// -/// Returns the item if its visible, and mouse is over it. +/// Returns the item if it is visible, and mouse is over it. /// Works even if widget deactivated. /// Use event_on_collapse_icon() to determine if collapse button was pressed. /// @@ -473,8 +507,49 @@ Fl_Tree_Item *Fl_Tree_Item::find_clicked(const Fl_Tree_Prefs &prefs) { return(0); } +static void draw_item_focus(Fl_Boxtype B, Fl_Color C, int X, int Y, int W, int H) { + if (!Fl::visible_focus()) return; + switch (B) { + case FL_DOWN_BOX: + case FL_DOWN_FRAME: + case FL_THIN_DOWN_BOX: + case FL_THIN_DOWN_FRAME: + X ++; + Y ++; + default: + break; + } + fl_color(fl_contrast(FL_BLACK, C)); + +#if defined(USE_X11) || defined(__APPLE_QUARTZ__) + fl_line_style(FL_DOT); + fl_rect(X + Fl::box_dx(B), Y + Fl::box_dy(B), + W - Fl::box_dw(B) - 1, H - Fl::box_dh(B) - 1); + fl_line_style(FL_SOLID); +#else + // Some platforms don't implement dotted line style, so draw + // every other pixel around the focus area... + // + // Also, QuickDraw (MacOS) does not support line styles specifically, + // and the hack we use in fl_line_style() will not draw horizontal lines + // on odd-numbered rows... + int i, xx, yy; + + X += Fl::box_dx(B); + Y += Fl::box_dy(B); + W -= Fl::box_dw(B) + 2; + H -= Fl::box_dh(B) + 2; + + for (xx = 0, i = 1; xx < W; xx ++, i ++) if (i & 1) fl_point(X + xx, Y); + for (yy = 0; yy < H; yy ++, i ++) if (i & 1) fl_point(X + W, Y + yy); + for (xx = W; xx > 0; xx --, i ++) if (i & 1) fl_point(X + xx, Y + H); + for (yy = H; yy > 0; yy --, i ++) if (i & 1) fl_point(X, Y + yy); +#endif +} + /// Draw this item and its children. -void Fl_Tree_Item::draw(int X, int &Y, int W, Fl_Widget *tree, +void Fl_Tree_Item::draw(int X, int &Y, int W, Fl_Widget *tree, + Fl_Tree_Item *itemfocus, const Fl_Tree_Prefs &prefs, int lastchild) { if ( ! _visible ) return; fl_font(_labelfont, _labelsize); @@ -487,12 +562,12 @@ void Fl_Tree_Item::draw(int X, int &Y, int W, Fl_Widget *tree, W += prefs.openicon()->w(); } // Colors, fonts - Fl_Color fg = _selected ? prefs.bgcolor() : _labelfgcolor; - Fl_Color bg = _selected ? prefs.selectcolor() : _labelbgcolor; - if ( ! _active ) { - fg = fl_inactive(fg); - if ( _selected ) bg = fl_inactive(bg); - } + Fl_Color fg = _selected ? fl_contrast(_labelfgcolor, tree->selection_color()) + : _active ? _labelfgcolor + : fl_inactive(_labelfgcolor); + Fl_Color bg = _selected ? _active ? tree->selection_color() + : fl_inactive(tree->selection_color()) + : _labelbgcolor; // Update the xywh of this item _xywh[0] = X; _xywh[1] = Y; @@ -598,6 +673,10 @@ void Fl_Tree_Item::draw(int X, int &Y, int W, Fl_Widget *tree, fl_draw(_label, X+useroff, Y+H-fl_descent()-1); } } + if ( this == itemfocus && Fl::visible_focus() && Fl::focus() == tree) { + // Draw focus box around this item + draw_item_focus(FL_NO_BOX,bg,bx+1,by+1,bw-1,bh-1); + } Y += H; } // end drawthis // Draw children @@ -608,7 +687,7 @@ void Fl_Tree_Item::draw(int X, int &Y, int W, Fl_Widget *tree, int child_y_start = Y; for ( int t=0; tdraw(child_x, Y, child_w, tree, prefs, lastchild); + _children[t]->draw(child_x, Y, child_w, tree, itemfocus, prefs, lastchild); } if ( has_children() && is_open() ) { Y += prefs.openchild_marginbottom(); // offset below open child tree @@ -736,6 +815,115 @@ Fl_Tree_Item *Fl_Tree_Item::prev() { return(p); } +/// Return this item's next sibling. +/// +/// Moves to the next item below us at the same level (sibling). +/// Use this to move down the tree without moving deeper into the tree, +/// effectively skipping over this item's children/descendents. +/// +/// \returns item's next sibling, or 0 if none. +/// +Fl_Tree_Item *Fl_Tree_Item::next_sibling() { + if ( !parent() ) return(0); // No parent (root)? We have no siblings + int index = parent()->find_child(this); // find our position in parent's child() array + if ( index == -1 ) return(0); // parent doesn't know us? weird + if ( (index+1) < parent()->children() ) // is there a next child? + return(parent()->child(index+1)); // return next child if there's one below us + return(0); // no siblings below us +} + +/// Return this item's previous sibling. +/// +/// Moves to the previous item above us at the same level (sibling). +/// Use this to move up the tree without moving deeper into the tree. +/// +/// \returns This item's previous sibling, or 0 if none. +/// +Fl_Tree_Item *Fl_Tree_Item::prev_sibling() { + if ( !parent() ) return(0); // No parent (root)? We have no siblings + int index = parent()->find_child(this); // find next position up in parent's child() array + if ( index == -1 ) return(0); // parent doesn't know us? weird + if ( index > 0 ) return(parent()->child(index-1)); // return previous child if there's one above us + return(0); // no siblings above us +} + +/// Return the next visible item. (If this item has children and is closed, children are skipped) +/// +/// This method can be used to walk the tree forward, skipping items +/// that are not currently visible to the user. +/// +/// \returns the next visible item below us, or 0 if there's no more items. +/// +Fl_Tree_Item *Fl_Tree_Item::next_displayed(Fl_Tree_Prefs &prefs) { + Fl_Tree_Item *c = this; + while ( c ) { + if ( c->is_root() && !prefs.showroot() ) { // on root and can't show it? + c = c->next(); // skip ahead, try again + continue; + } + if ( c->has_children() && c->is_close() ) { // item has children and: invisible or closed? + // Skip children, take next sibling. If none, try parent's sibling, repeat + while ( c ) { + Fl_Tree_Item *sib = c->next_sibling(); // get sibling + if ( sib ) { c = sib; break; } // Found? let outer loop test it + c = c->parent(); // No sibling? move up tree, try parent's sibling + } + } else { // has children and isn't closed, or no children + c = c->next(); // use normal 'next' + } + if ( !c ) return(0); // no more? done + // Check all parents to be sure none are closed. + // If closed, move up to that level and repeat until sure none are closed. + Fl_Tree_Item *p = c->parent(); + while (1) { + if ( !p || p->is_root() ) return(c); // hit top? then we're displayed, return c + if ( p->is_close() ) c = p; // found closed parent? make it current + p = p->parent(); // continue up tree + } + if ( c && c->visible() ) return(c); // item visible? return it + } + return(0); // hit end: no more items +} + +/// Return the previous visible item. (If this item above us has children and is closed, its children are skipped) +/// +/// This method can be used to walk the tree backward, +/// skipping items that are not currently visible to the user. +/// +/// \returns the previous visible item above us, or 0 if there's no more items. +/// +Fl_Tree_Item *Fl_Tree_Item::prev_displayed(Fl_Tree_Prefs &prefs) { + Fl_Tree_Item *c = this; + while ( c ) { + c = c->prev(); // previous item + if ( !c ) break; // no more items? done + if ( c->is_root() ) // root + return((prefs.showroot()&&c->visible()) ? c : 0); // return root if visible + if ( !c->visible() ) continue; // item not visible? skip + // Check all parents to be sure none are closed. + // If closed, move up to that level and repeat until sure none are closed. + Fl_Tree_Item *p = c->parent(); + while (1) { + if ( !p || p->is_root() ) return(c); // hit top? then we're displayed, return c + if ( p->is_close() ) c = p; // found closed parent? make it current + p = p->parent(); // continue up tree + } + } + return(0); // hit end: no more items +} + +/// Returns if item and all its parents are visible. +/// Also takes into consideration if any parent is close()ed. +/// \returns +/// 1 -- item and its parents are visible/open() +/// 0 -- item (or parents) invisible or close()ed. +/// +int Fl_Tree_Item::visible_r() const { + for (const Fl_Tree_Item *p=this; p; p=p->parent()) // move up through parents + if (!p->visible() || p->is_close()) return(0); // any parent not visible or closed? + return(1); +} + // -// End of "$Id: Fl_Tree_Item.cxx 7672 2010-07-10 09:44:45Z matt $". +// End of "$Id: Fl_Tree_Item.cxx 8589 2011-04-14 13:15:13Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Tree_Item_Array.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Tree_Item_Array.cxx index 16d5dc547..13600bd88 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Tree_Item_Array.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Tree_Item_Array.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Tree_Item_Array.cxx 6956 2009-12-08 08:06:44Z greg.ercolano $" +// "$Id: Fl_Tree_Item_Array.cxx 7903 2010-11-28 21:06:39Z matt $" // #include @@ -14,7 +14,7 @@ ////////////////////// // // Fl_Tree -- This file is part of the Fl_Tree widget for FLTK -// Copyright (C) 2009 by Greg Ercolano. +// Copyright (C) 2009-2010 by Greg Ercolano. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -153,5 +153,5 @@ int Fl_Tree_Item_Array::remove(Fl_Tree_Item *item) { } // -// End of "$Id: Fl_Tree_Item_Array.cxx 6956 2009-12-08 08:06:44Z greg.ercolano $". +// End of "$Id: Fl_Tree_Item_Array.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Tree_Prefs.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Tree_Prefs.cxx index f200c758f..796c21989 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Tree_Prefs.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Tree_Prefs.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Tree_Prefs.cxx 7672 2010-07-10 09:44:45Z matt $" +// "$Id: Fl_Tree_Prefs.cxx 8340 2011-01-30 20:22:06Z greg.ercolano $" // #include @@ -12,7 +12,7 @@ ////////////////////// // // Fl_Tree -- This file is part of the Fl_Tree widget for FLTK -// Copyright (C) 2009 by Greg Ercolano. +// Copyright (C) 2009-2010 by Greg Ercolano. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -136,10 +136,8 @@ Fl_Tree_Prefs::Fl_Tree_Prefs() { _usericonmarginleft = 3; _labelmarginleft = 3; _linespacing = 0; - _fgcolor = FL_BLACK; - _bgcolor = FL_WHITE; - _selectcolor = FL_DARK_BLUE; - _inactivecolor = FL_GRAY; + _labelfgcolor = FL_BLACK; + _labelbgcolor = FL_WHITE; _connectorcolor = Fl_Color(43); #ifdef __APPLE__ _connectorstyle = FL_TREE_CONNECTOR_NONE; @@ -166,5 +164,5 @@ Fl_Tree_Prefs::Fl_Tree_Prefs() { } // -// End of "$Id: Fl_Tree_Prefs.cxx 7672 2010-07-10 09:44:45Z matt $". +// End of "$Id: Fl_Tree_Prefs.cxx 8340 2011-01-30 20:22:06Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Valuator.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Valuator.cxx index d636d5e58..cfa440208 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Valuator.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Valuator.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Valuator.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Valuator.cxx 7903 2010-11-28 21:06:39Z matt $" // // Valuator widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -192,5 +192,5 @@ int Fl_Valuator::format(char* buffer) { } // -// End of "$Id: Fl_Valuator.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Valuator.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Value_Input.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Value_Input.cxx index a786204c1..f4817d812 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Value_Input.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Value_Input.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Value_Input.cxx 7117 2010-02-20 21:14:47Z matt $" +// "$Id: Fl_Value_Input.cxx 7903 2010-11-28 21:06:39Z matt $" // // Value input widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -145,5 +145,5 @@ Fl_Value_Input::~Fl_Value_Input() { } // -// End of "$Id: Fl_Value_Input.cxx 7117 2010-02-20 21:14:47Z matt $". +// End of "$Id: Fl_Value_Input.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Value_Output.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Value_Output.cxx index fb9f1ab9b..7dd3f451f 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Value_Output.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Value_Output.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Value_Output.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Value_Output.cxx 7903 2010-11-28 21:06:39Z matt $" // // Value output widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -104,5 +104,5 @@ Fl_Value_Output::Fl_Value_Output(int X, int Y, int W, int H,const char *l) } // -// End of "$Id: Fl_Value_Output.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Value_Output.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Value_Slider.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Value_Slider.cxx index e5d0e4388..6c5ff22e5 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Value_Slider.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Value_Slider.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Value_Slider.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Value_Slider.cxx 7903 2010-11-28 21:06:39Z matt $" // // Value slider widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -82,5 +82,5 @@ int Fl_Value_Slider::handle(int event) { } // -// End of "$Id: Fl_Value_Slider.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Value_Slider.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Widget.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Widget.cxx index e05f0f503..96754a9d2 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Widget.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Widget.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Widget.cxx 7321 2010-03-23 17:37:51Z AlbrechtS $" +// "$Id: Fl_Widget.cxx 7940 2010-12-02 17:58:58Z greg.ercolano $" // // Base widget class for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -168,6 +168,7 @@ extern void fl_throw_focus(Fl_Widget*); // in Fl_x.cxx Fl_Widget::~Fl_Widget() { Fl::clear_widget_pointer(this); if (flags() & COPIED_LABEL) free((void *)(label_.value)); + if (flags() & COPIED_TOOLTIP) free((void *)(tooltip_)); // remove from parent group if (parent_) parent_->remove(this); #ifdef DEBUG_DELETE @@ -340,5 +341,5 @@ Fl_Widget::do_callback(Fl_Widget* o,void* arg) { } // -// End of "$Id: Fl_Widget.cxx 7321 2010-03-23 17:37:51Z AlbrechtS $". +// End of "$Id: Fl_Widget.cxx 7940 2010-12-02 17:58:58Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Window.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Window.cxx index 3f2786718..1aadb0130 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Window.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Window.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Window.cxx 7357 2010-03-29 14:10:54Z matt $" +// "$Id: Fl_Window.cxx 8472 2011-02-25 08:44:47Z AlbrechtS $" // // Window widget class for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -29,7 +29,7 @@ // This is the system-independent portions. The huge amount of // crap you need to do to communicate with X is in Fl_x.cxx, the // equivalent (but totally different) crap for MSWindows is in Fl_win32.cxx -#include "config.h" +#include #include #include #include @@ -40,6 +40,8 @@ #include #endif +char *Fl_Window::default_xclass_ = 0L; + void Fl_Window::_Fl_Window() { type(FL_WINDOW); box(FL_FLAT_BOX); @@ -134,7 +136,7 @@ void Fl_Window::draw() { } #endif -# if defined(USE_CAIRO) +# if defined(FLTK_USE_CAIRO) Fl::cairo_make_current(this); // checkout if an update is necessary # endif } @@ -178,7 +180,114 @@ Fl_Window *Fl_Window::current() { return current_; } +/** Returns the default xclass. + + \see Fl_Window::default_xclass(const char *) + + */ +const char *Fl_Window::default_xclass() +{ + if (default_xclass_) { + return default_xclass_; + } else { + return "FLTK"; + } +} + +/** Sets the default window xclass. + + The default xclass is used for all windows that don't have their + own xclass set before show() is called. You can change the default + xclass whenever you want, but this only affects windows that are + created (and shown) after this call. + + The given string \p xc is copied. You can use a local variable or + free the string immediately after this call. + + If you don't call this, the default xclass for all windows will be "FLTK". + You can reset the default xclass by specifying NULL for \p xc. + + If you call Fl_Window::xclass(const char *) for any window, then + this also sets the default xclass, unless it has been set before. + + \param[in] xc default xclass for all windows subsequently created + + \see Fl_Window::xclass(const char *) +*/ +void Fl_Window::default_xclass(const char *xc) +{ + if (default_xclass_) { + free(default_xclass_); + default_xclass_ = 0L; + } + if (xc) { + default_xclass_ = strdup(xc); + } +} + +/** Sets the xclass for this window. + + A string used to tell the system what type of window this is. Mostly + this identifies the picture to draw in the icon. This only works if + called \e before calling show(). + + Under X, this is turned into a XA_WM_CLASS pair by truncating at + the first non-alphanumeric character and capitalizing the first character, + and the second one if the first is 'x'. Thus "foo" turns into "foo, Foo", + and "xprog.1" turns into "xprog, XProg". + + Under Microsoft Windows, this string is used as the name of the + WNDCLASS structure, though it is not clear if this can have any + visible effect. + + \since FLTK 1.3 the passed string is copied. You can use a local + variable or free the string immediately after this call. Note that + FLTK 1.1 stores the \e pointer without copying the string. + + If the default xclass has not yet been set, this also sets the + default xclass for all windows created subsequently. + + \see Fl_Window::default_xclass(const char *) +*/ +void Fl_Window::xclass(const char *xc) +{ + if (xclass_) { + free(xclass_); + xclass_ = 0L; + } + if (xc) { + xclass_ = strdup(xc); + if (!default_xclass_) { + default_xclass(xc); + } + } +} + +/** Returns the xclass for this window, or a default. + + \see Fl_Window::default_xclass(const char *) + \see Fl_Window::xclass(const char *) +*/ +const char *Fl_Window::xclass() const +{ + if (xclass_) { + return xclass_; + } else { + return default_xclass(); + } +} + +/** Gets the current icon window target dependent data. */ +const void *Fl_Window::icon() const { + return icon_; +} + +/** Sets the current icon window target dependent data. */ +void Fl_Window::icon(const void * ic) { + icon_ = ic; +} + // -// End of "$Id: Fl_Window.cxx 7357 2010-03-29 14:10:54Z matt $". +// End of "$Id: Fl_Window.cxx 8472 2011-02-25 08:44:47Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Window_fullscreen.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Window_fullscreen.cxx index 6635133fd..ea563439d 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Window_fullscreen.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Window_fullscreen.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Window_fullscreen.cxx 6905 2009-09-27 12:06:35Z matt $" +// "$Id: Fl_Window_fullscreen.cxx 8515 2011-03-12 21:36:21Z manolo $" // // Fullscreen window support for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -66,18 +66,21 @@ void Fl_Window::fullscreen() { //determine its thickness border(0); #endif -#if defined(__APPLE__) || defined(WIN32) +#if defined(__APPLE__) || defined(WIN32) || defined(USE_X11) int sx, sy, sw, sh; - Fl::screen_xywh(sx, sy, sw, sh, x()+w()/2, y()+h()/2); + Fl::screen_xywh(sx, sy, sw, sh, x(), y(), w(), h()); // if we are on the main screen, we will leave the system menu bar unobstructed if (Fl::x()>=sx && Fl::y()>=sy && Fl::x()+Fl::w()<=sx+sw && Fl::y()+Fl::h()<=sy+sh) { sx = Fl::x(); sy = Fl::y(); sw = Fl::w(); sh = Fl::h(); } if (x()==sx) x(sx+1); // make sure that we actually execute the resize +#if defined(USE_X11) + resize(0, 0, w(), h()); // work around some quirks in X11 +#endif resize(sx, sy, sw, sh); #else - if (!x()) x(1); // force it to call XResizeWindow() + if (!x()) x(1); // make sure that we actually execute the resize resize(0,0,Fl::w(),Fl::h()); #endif } @@ -91,5 +94,5 @@ void Fl_Window::fullscreen_off(int X,int Y,int W,int H) { } // -// End of "$Id: Fl_Window_fullscreen.cxx 6905 2009-09-27 12:06:35Z matt $". +// End of "$Id: Fl_Window_fullscreen.cxx 8515 2011-03-12 21:36:21Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Window_hotspot.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Window_hotspot.cxx index 120a79854..92a298f03 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Window_hotspot.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Window_hotspot.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Window_hotspot.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Window_hotspot.cxx 7903 2010-11-28 21:06:39Z matt $" // // Common hotspot routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -96,5 +96,5 @@ void Fl_Window::hotspot(const Fl_Widget *o, int offscreen) { // -// End of "$Id: Fl_Window_hotspot.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Window_hotspot.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Window_iconize.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Window_iconize.cxx index 1caea9f97..10ceda599 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Window_iconize.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Window_iconize.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Window_iconize.cxx 7351 2010-03-29 10:35:00Z matt $" +// "$Id: Fl_Window_iconize.cxx 8055 2010-12-18 22:31:01Z manolo $" // // Window minification code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -37,7 +37,7 @@ void Fl_Window::iconize() { #ifdef WIN32 ShowWindow(i->xid, SW_SHOWMINNOACTIVE); #elif defined(__APPLE__) - MacCollapseWindow((Window)i->xid); + i->collapse(); #else XIconifyWindow(fl_display, i->xid, fl_screen); #endif @@ -45,5 +45,5 @@ void Fl_Window::iconize() { } // -// End of "$Id: Fl_Window_iconize.cxx 7351 2010-03-29 10:35:00Z matt $". +// End of "$Id: Fl_Window_iconize.cxx 8055 2010-12-18 22:31:01Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Wizard.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Wizard.cxx index 1a0f001e8..3557cfa94 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Wizard.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Wizard.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_Wizard.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_Wizard.cxx 7903 2010-11-28 21:06:39Z matt $" // // Fl_Wizard widget routines. // -// Copyright 1997-2009 by Easy Software Products. +// Copyright 1997-2010 by Easy Software Products. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -191,5 +191,5 @@ void Fl_Wizard::value(Fl_Widget *kid) // -// End of "$Id: Fl_Wizard.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_Wizard.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_XBM_Image.cxx b/plugins/zynaddsubfx/fltk/src/Fl_XBM_Image.cxx index 7503806da..cb35c1b5c 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_XBM_Image.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_XBM_Image.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_XBM_Image.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_XBM_Image.cxx 7903 2010-11-28 21:06:39Z matt $" // // Fl_XBM_Image routines. // -// Copyright 1997-2009 by Bill Spitzak and others. +// Copyright 1997-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -108,5 +108,5 @@ Fl_XBM_Image::Fl_XBM_Image(const char *name) : Fl_Bitmap((const char *)0,0,0) { // -// End of "$Id: Fl_XBM_Image.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_XBM_Image.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_XColor.H b/plugins/zynaddsubfx/fltk/src/Fl_XColor.H index 16cb36671..9162f3ae8 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_XColor.H +++ b/plugins/zynaddsubfx/fltk/src/Fl_XColor.H @@ -1,9 +1,9 @@ // -// "$Id: Fl_XColor.H 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_XColor.H 7913 2010-11-29 18:18:27Z greg.ercolano $" // // X-specific color definitions for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -42,5 +42,5 @@ extern unsigned char fl_redmask, fl_greenmask, fl_bluemask; extern int fl_redshift, fl_greenshift, fl_blueshift, fl_extrashift; // -// End of "$Id: Fl_XColor.H 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_XColor.H 7913 2010-11-29 18:18:27Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_XPM_Image.cxx b/plugins/zynaddsubfx/fltk/src/Fl_XPM_Image.cxx index 2d7326aa2..7f66eff82 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_XPM_Image.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_XPM_Image.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_XPM_Image.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_XPM_Image.cxx 7903 2010-11-28 21:06:39Z matt $" // // Fl_XPM_Image routines. // -// Copyright 1997-2009 by Bill Spitzak and others. +// Copyright 1997-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -77,7 +77,7 @@ Fl_XPM_Image::Fl_XPM_Image(const char *name) : Fl_Pixmap((char *const*)0) { if (*q == '\\') switch (*++q) { case '\r': case '\n': - fgets(q,(buffer+MAXSIZE+20)-q,f); break; + if (!fgets(q,(buffer+MAXSIZE+20)-q,f)) { /* no problem if we hit EOF */ } break; case 0: break; case 'x': { @@ -132,5 +132,5 @@ Fl_XPM_Image::Fl_XPM_Image(const char *name) : Fl_Pixmap((char *const*)0) { // -// End of "$Id: Fl_XPM_Image.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_XPM_Image.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_abort.cxx b/plugins/zynaddsubfx/fltk/src/Fl_abort.cxx index 807092a8c..f85461557 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_abort.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_abort.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_abort.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_abort.cxx 7903 2010-11-28 21:06:39Z matt $" // // Warning/error message code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -98,5 +98,5 @@ void (*Fl::error)(const char* format, ...) = ::error; void (*Fl::fatal)(const char* format, ...) = ::fatal; // -// End of "$Id: Fl_abort.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_abort.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_add_idle.cxx b/plugins/zynaddsubfx/fltk/src/Fl_add_idle.cxx index ac7caf355..6059ae1c1 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_add_idle.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_add_idle.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_add_idle.cxx 7334 2010-03-25 14:37:46Z AlbrechtS $" +// "$Id: Fl_add_idle.cxx 7903 2010-11-28 21:06:39Z matt $" // // Idle routine support for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -119,5 +119,5 @@ void Fl::remove_idle(Fl_Idle_Handler cb, void* data) { } // -// End of "$Id: Fl_add_idle.cxx 7334 2010-03-25 14:37:46Z AlbrechtS $". +// End of "$Id: Fl_add_idle.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_arg.cxx b/plugins/zynaddsubfx/fltk/src/Fl_arg.cxx index 1a9c36ecc..8ebc75f93 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_arg.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_arg.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_arg.cxx 7334 2010-03-25 14:37:46Z AlbrechtS $" +// "$Id: Fl_arg.cxx 7903 2010-11-28 21:06:39Z matt $" // // Optional argument initialization code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -68,11 +68,73 @@ extern const char *fl_bg; extern const char *fl_bg2; /** - Consume a single switch from argv, starting at word i. + Parse a single switch from \p argv, starting at word \p i. Returns the number of words eaten (1 or 2, or 0 if it is not - recognized) and adds the same value to i. You can use this - function if you prefer to control the incrementing through the - arguments yourself. + recognized) and adds the same value to \p i. + + This is the default argument handler used internally by Fl::args(...), + but you can use this function if you prefer to step through the + standard FLTK switches yourself. + + All standard FLTK switches except -bg2 may be abbreviated to just + one letter and case is ignored: + + \li -bg color or -background color +
    + Sets the background color using Fl::background(). + + \li -bg2 color or -background2 color +
    + Sets the secondary background color using Fl::background2(). + + \li -display host:n.n +
    + Sets the X display to use; this option is silently + ignored under WIN32 and MacOS. + + \li -dnd and -nodnd +
    + Enables or disables drag and drop text operations + using Fl::dnd_text_ops(). + + \li -fg color or -foreground color +
    + Sets the foreground color using Fl::foreground(). + + \li -geometry WxH+X+Y +
    + Sets the initial window position and size according + to the standard X geometry string. + + \li -iconic +
    + Iconifies the window using Fl_Window::iconize(). + + \li -kbd and -nokbd +
    + Enables or disables visible keyboard focus for + non-text widgets using Fl::visible_focus(). + + \li -name string +
    + Sets the window class using Fl_Window::xclass(). + + \li -scheme string +
    + Sets the widget scheme using Fl::scheme(). + + \li -title string +
    + Sets the window title using Fl_Window::label(). + + \li -tooltips and -notooltips +
    + Enables or disables tooltips using Fl_Tooltip::enable(). + + + If your program requires other switches in addition to the standard + FLTK options, you will need to pass your own argument handler to + Fl::args(int,char**,int&,Fl_Args_Handler) explicitly. */ int Fl::arg(int argc, char **argv, int &i) { arg_called = 1; @@ -167,114 +229,59 @@ int Fl::arg(int argc, char **argv, int &i) { } -/** - Consume all switches from argv. Returns number of words eaten - Returns zero on error. 'i' will either point at first word that - does not start with '-', at the error word, or after a '--', or at - argc. If your program does not take any word arguments you can - report an error if i < argc. +/** + Parse command line switches using the \p cb argument handler. -

    FLTK provides an entirely optional command-line switch parser. - You don't have to call it if you don't like them! Everything it can do - can be done with other calls to FLTK. + Returns 0 on error, or the number of words processed. -

    To use the switch parser, call Fl::args(...) near the start - of your program. This does not open the display, instead - switches that need the display open are stashed into static variables. - Then you must display your first window by calling - window->show(argc,argv), which will do anything stored in the - static variables. + FLTK provides this as an entirely optional command line + switch parser. You don't have to call it if you don't want to. + Everything it can do can be done with other calls to FLTK. -

    callback lets you define your own switches. It is called - with the same argc and argv, and with i the - index of each word. The callback should return zero if the switch is - unrecognized, and not change i. It should return non-zero if - the switch is recognized, and add at least 1 to i (it can add - more to consume words after the switch). This function is called - before any other tests, so you can override any FLTK - switch (this is why FLTK can use very short switches instead of + To use the switch parser, call Fl::args(...) near the start + of your program. This does \b not open the display, instead + switches that need the display open are stashed into static + variables. Then you \b must display your first window by calling + window->show(argc,argv), which will do anything stored + in the static variables. + + Providing an argument handler callback \p cb lets you define + your own switches. It is called with the same \p argc and \p argv, + and with \p i set to the index of the switch to be processed. + The \p cb handler should return zero if the switch is unrecognized, + and not change \p i. It should return non-zero to indicate the + number of words processed if the switch is recognized, i.e. 1 for + just the switch, and more than 1 for the switch plus associated + parameters. \p i should be incremented by the same amount. + + The \p cb handler is called \b before any other tests, so + you can also override any standard FLTK switch + (this is why FLTK can use very short switches instead of the long ones all other toolkits force you to use). - -

    On return i is set to the index of the first non-switch. + See Fl::arg() for descriptions of the standard switches. + + On return \p i is set to the index of the first non-switch. This is either: -

      -
    • The first word that does not start with '-'.
      • -
    • The word '-' (used by many programs to name stdin as a file)
      • -
    • The first unrecognized switch (return value is 0).
      • -
    • argc
      • -
    + \li The first word that does not start with '-'. + \li The word '-' (used by many programs to name stdin as a file) + \li The first unrecognized switch (return value is 0). + \li \p argc -

    The return value is i unless an unrecognized switch is found, - in which case it is zero. If your program takes no arguments other + The return value is \p i unless an unrecognized switch is found, + in which case it is zero. If your program takes no arguments other than switches you should produce an error if the return value is less - than argc. + than \p argc. -

    All switches except -bg2 may be abbreviated one letter and case is ignored: -

      - -
    • -bg color or -background color - -

      Sets the background color using Fl::background().

      • - -
    • -bg2 color or -background2 color - -

      Sets the secondary background color using Fl::background2().

      • - -
    • -display host:n.n - -

      Sets the X display to use; this option is silently - ignored under WIN32 and MacOS.

      • - -
    • -dnd and -nodnd - -

      Enables or disables drag and drop text operations - using Fl::dnd_text_ops().

      • - -
    • -fg color or -foreground color - -

      Sets the foreground color using Fl::foreground().

      • - -
    • -geometry WxH+X+Y - -

      Sets the initial window position and size according - to the standard X geometry string.

      • - -
    • -iconic - -

      Iconifies the window using Fl_Window::iconize().

      • - -
    • -kbd and -nokbd - -

      Enables or disables visible keyboard focus for - non-text widgets using Fl::visible_focus().

      • - -
    • -name string - -

      Sets the window class using Fl_Window::xclass().

      • - -
    • -scheme string - -

      Sets the widget scheme using Fl::scheme().

      • - -
    • -title string - -

      Sets the window title using Fl_Window::label().

      • - -
    • -tooltips and -notooltips - -

      Enables or disables tooltips using Fl_Tooltip::enable().

      • - -
    - -

    The second form of Fl::args() is useful if your program does - not have command line switches of its own. It parses all the switches, - and if any are not recognized it calls Fl::abort(Fl::help). - -

    A usage string is displayed if Fl::args() detects an invalid - argument on the command-line. You can change the message by setting the + A usage string is displayed if Fl::args() detects an invalid argument + on the command-line. You can change the message by setting the Fl::help pointer. + + A very simple command line parser can be found in examples/howto-parse-args.cxx + + The simpler Fl::args(int argc, char **argv) form is useful if your program + does not have command line switches of its own. */ int Fl::args(int argc, char** argv, int& i, Fl_Args_Handler cb) { @@ -387,7 +394,15 @@ static const char * const helpmsg = " -to[oltips]"; const char * const Fl::help = helpmsg+13; -/** See Fl::args(int argc, char **argv, int& i, int (*cb)(int,char**,int&)) */ + +/** + Parse all command line switches matching standard FLTK options only. + + It parses all the switches, and if any are not recognized it calls + Fl::abort(Fl::help), i.e. unlike the long form, an unrecognized + switch generates an error message and causes the program to exit. + + */ void Fl::args(int argc, char **argv) { int i; if (Fl::args(argc,argv,i) < argc) Fl::error(helpmsg); } @@ -531,5 +546,5 @@ int XParseGeometry(const char* string, int* x, int* y, #endif // ifdef WIN32 // -// End of "$Id: Fl_arg.cxx 7334 2010-03-25 14:37:46Z AlbrechtS $". +// End of "$Id: Fl_arg.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_compose.cxx b/plugins/zynaddsubfx/fltk/src/Fl_compose.cxx index dce2d11b7..fe72c229d 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_compose.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_compose.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_compose.cxx 7351 2010-03-29 10:35:00Z matt $" +// "$Id: Fl_compose.cxx 8626 2011-04-27 11:21:57Z manolo $" // // Character compose processing for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -28,223 +28,75 @@ #include #include -// -// MRS: Uncomment the following define to get the original (pre-1.1.2) -// dead key support code. The original code apparently did not -// work on Belgian keyboards. -// - -//#define OLD_DEAD_KEY_CODE - - -#ifdef __APPLE__ - -static const char* const compose_pairs = -" ! % # $ y=| & : c a <<~ - r _ * +-2 3 ' u p . , 1 o >>141234? "//00A0 ... -"`A'A^A~A:A*AAE,C`E'E^E:E`I'I^I:I-D~N`O'O^O~O:Ox O/`U'U^U:U'YTHss" //00C0 ... -"`a'a^a~a:a*aae,c`e'e^e:e`i'i^i:i-d~n`o'o^o~o:o-:o/`u'u^u:u'yth:y";//00E0 ... - -#else - -static const char* const compose_pairs = -"=E _'f _\"..+ ++^ %%^S< OE ^Z ^''^^\"\"^-*- --~ TM^s> oe ^z:Y" -" ! % # $ y=| & : c a <<~ - r _ * +-2 3 ' u p . , 1 o >>141234? " -"`A'A^A~A:A*AAE,C`E'E^E:E`I'I^I:I-D~N`O'O^O~O:Ox O/`U'U^U:U'YTHss" -"`a'a^a~a:a*aae,c`e'e^e:e`i'i^i:i-d~n`o'o^o~o:o-:o/`u'u^u:u'yth:y"; - -#endif - -#if !defined(WIN32) && defined(OLD_DEAD_KEY_CODE) // X only -// X dead-key lookup table. This turns a dead-key keysym into the -// first of two characters for one of the compose sequences. These -// keysyms start at 0xFE50. -// Win32 handles the dead keys before FLTK can see them. This is -// unfortunate, because you don't get the preview effect. -static char dead_keys[] = { - '`', // XK_dead_grave - '\'', // XK_dead_acute - '^', // XK_dead_circumflex - '~', // XK_dead_tilde - '_', // XK_dead_macron - 0, // XK_dead_breve - '.', // XK_dead_abovedot - ':', // XK_dead_diaeresis - '*', // XK_dead_abovering - 0, // XK_dead_doubleacute - 'v', // XK_dead_caron - ',' // XK_dead_cedilla -// 0, // XK_dead_ogonek -// 0, // XK_dead_iota -// 0, // XK_dead_voiced_sound -// 0, // XK_dead_semivoiced_sound -// 0 // XK_dead_belowdot -}; -#endif // !WIN32 && OLD_DEAD_KEY_CODE - #ifndef FL_DOXYGEN int Fl::compose_state = 0; #endif +#if !defined(WIN32) && !defined(__APPLE__) +extern XIC fl_xim_ic; +#endif + /** Any text editing widget should call this for each FL_KEYBOARD event. - Use of this function is very simple. - -

    If true is returned, then it has modified the - Fl::event_text() and Fl::event_length() to a set of bytes to - insert (it may be of zero length!). In will also set the "del" - parameter to the number of bytes to the left of the cursor to - delete, this is used to delete the results of the previous call to - Fl::compose(). - -

    If false is returned, the keys should be treated as function - keys, and del is set to zero. You could insert the text anyways, if - you don't know what else to do. - -

    Though the current implementation returns immediately, future - versions may take quite awhile, as they may pop up a window or do - other user-interface things to allow characters to be selected. -*/ + Use of this function is very simple. + +

    If true is returned, then it has modified the + Fl::event_text() and Fl::event_length() to a set of bytes to + insert (it may be of zero length!). In will also set the "del" + parameter to the number of bytes to the left of the cursor to + delete, this is used to delete the results of the previous call to + Fl::compose(). + +

    If false is returned, the keys should be treated as function + keys, and del is set to zero. You could insert the text anyways, if + you don't know what else to do. + +

    Though the current implementation returns immediately, future + versions may take quite awhile, as they may pop up a window or do + other user-interface things to allow characters to be selected. + */ int Fl::compose(int& del) { - + // character composition is now handled by the OS del = 0; +#if defined(__APPLE__) + // this stuff is to be treated as a function key + if(Fl::e_length == 0 || Fl::e_keysym == FL_Enter || Fl::e_keysym == FL_KP_Enter || + Fl::e_keysym == FL_Tab || Fl::e_keysym == FL_Escape || Fl::e_state&(FL_META | FL_CTRL) ) { + return 0; + } +#elif defined(WIN32) unsigned char ascii = (unsigned)e_text[0]; - - // Alt+letters are reserved for shortcuts. But alt+foreign letters - // has to be allowed, because some key layouts require alt to be held - // down in order to type them... - // - // OSX users sometimes need to hold down ALT for keys, so we only check - // for META on OSX... -#ifdef __APPLE__ - if ((e_state & FL_META) && !(ascii & 128)) return 0; + if ((e_state & (FL_ALT | FL_META)) && !(ascii & 128)) return 0; #else - if ((e_state & (FL_ALT|FL_META)) && !(ascii & 128)) return 0; -#endif // __APPLE__ - - if (compose_state == 1) { // after the compose key - if ( // do not get distracted by any modifier keys - e_keysym==FL_Shift_L|| - e_keysym==FL_Shift_R || - e_keysym==FL_Alt_L || - e_keysym==FL_Alt_R || - e_keysym==FL_Meta_L || - e_keysym==FL_Meta_R || - e_keysym==FL_Control_R || - e_keysym==FL_Control_L || - e_keysym==FL_Menu - ) return 0; - - if (ascii == ' ') { // space turns into nbsp -#ifdef __APPLE__ - int len = fl_utf8encode(0xCA, e_text); - e_text[len] = '\0'; - e_length = len; - #else - int len = fl_utf8encode(0xA0, e_text); - e_text[len] = '\0'; - e_length = len; + unsigned char ascii = (unsigned)e_text[0]; + if ((e_state & (FL_ALT | FL_META | FL_CTRL)) && !(ascii & 128)) return 0; #endif - compose_state = 0; - return 1; - } else if (ascii < ' ' || ascii == 127) { - compose_state = 0; - return 0; - } - - // see if it is either character of any pair: - for (const char *p = compose_pairs; *p; p += 2) - if (p[0] == ascii || p[1] == ascii) { - if (p[1] == ' ') { - int len = fl_utf8encode((p-compose_pairs)/2+0xA0, e_text); - e_text[len] = '\0'; - e_length = len; - } - - compose_state = ascii; - return 1; - } - - if (e_length) { // compose key also "quotes" control characters - compose_state = 0; - return 1; - } - - } else if (compose_state) { // second character of compose - - char c1 = char(compose_state); // retrieve first character -#ifdef __APPLE__ - if ( (c1==0x60 && ascii==0xab) || (c1==0x27 && ascii==0x60)) { - del = 1; - compose_state = '^'; - e_text[0] = 0xf6; - return 1; - } - if (ascii==' ') { - del = 0; - compose_state = 0; - return 0; - } + if(Fl::compose_state) { + del = Fl::compose_state; + Fl::compose_state = 0; +#ifndef __APPLE__ + } else { + // Only insert non-control characters: + if (! (ascii & ~31 && ascii!=127)) { return 0; } #endif - // now search for the pair in either order: - for (const char *p = compose_pairs; *p; p += 2) { - if (p[0] == ascii && p[1] == c1 || p[1] == ascii && p[0] == c1) { - int len = fl_utf8encode((p-compose_pairs)/2+0xA0, e_text); - e_text[len] = '\0'; - e_length = len; - del = 1; // delete the old character and insert new one - compose_state = 0; - return 1; - } - } - } - - int i = e_keysym; - - // See if they type the compose prefix key: - if (i == FL_Control_R || i == 0xff20/* Multi-Key */) { - compose_state = 1; - return 1; - } - -#ifdef WIN32 -#elif (defined __APPLE__) - if (e_state & 0x40000000) { - if (ascii<0x80) - compose_state = ascii; - else - compose_state = compose_pairs[(ascii-0x80)*2]; - return 1; - } -#else - // See if they typed a dead key. This gets it into the same state as - // typing prefix+accent: - if (i >= 0xfe50 && i <= 0xfe5b) { -# ifdef OLD_DEAD_KEY_CODE - ascii = dead_keys[i-0xfe50]; - for (const char *p = compose_pairs; *p; p += 2) - if (p[0] == ascii) { - compose_state = ascii; - return 1; - } -# else - ascii = e_text[0]; - for (const char *p = compose_pairs; *p; p += 2) - if (p[0] == ascii || - (p[1] == ' ' && (p - compose_pairs) / 2 + 0xA0 == ascii)) { - compose_state = p[0]; - return 1; - } -# endif // OLD_DEAD_KEY_CODE - compose_state = 0; - return 1; - } -#endif - - // Only insert non-control characters: - if (e_length && (ascii & ~31 && ascii!=127)) {compose_state = 0; return 1;} - - return 0; + return 1; } +/** + If the user moves the cursor, be sure to call Fl::compose_reset(). + The next call to Fl::compose() will start out in an initial state. In + particular it will not set "del" to non-zero. This call is very fast + so it is ok to call it many times and in many places. + */ +void Fl::compose_reset() +{ + Fl::compose_state = 0; +#if !defined(WIN32) && !defined(__APPLE__) + if (fl_xim_ic) XmbResetIC(fl_xim_ic); +#endif +} +// +// End of "$Id: Fl_compose.cxx 8626 2011-04-27 11:21:57Z manolo $" +// diff --git a/plugins/zynaddsubfx/fltk/src/Fl_display.cxx b/plugins/zynaddsubfx/fltk/src/Fl_display.cxx index 09d74c7c0..c661d236c 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_display.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_display.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_display.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_display.cxx 7903 2010-11-28 21:06:39Z matt $" // // Display function for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -56,5 +56,5 @@ void Fl::display(const char *d) { } // -// End of "$Id: Fl_display.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_display.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_get_key.cxx b/plugins/zynaddsubfx/fltk/src/Fl_get_key.cxx index 065ccda34..80bcf91b1 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_get_key.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_get_key.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_get_key.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_get_key.cxx 7903 2010-11-28 21:06:39Z matt $" // // Keyboard state routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -65,5 +65,5 @@ int Fl::get_key(int k) { #endif // -// End of "$Id: Fl_get_key.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_get_key.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_get_key_mac.cxx b/plugins/zynaddsubfx/fltk/src/Fl_get_key_mac.cxx index 17617ad69..167a70665 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_get_key_mac.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_get_key_mac.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_get_key_mac.cxx 7615 2010-05-26 21:25:11Z manolo $" +// "$Id: Fl_get_key_mac.cxx 8624 2011-04-26 17:28:10Z manolo $" // // MacOS keyboard state routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -34,8 +34,10 @@ #include // convert an FLTK (X) keysym to a MacOS symbol: -// See also the inverse converter in Fl_mac.cxx -// This table is in numeric order by FLTK symbol order for binary search: +// See also the inverse converter in table macKeyLookUp of Fl_cocoa.mm +// This table is in numeric order by FLTK symbol order for binary search. +// The list of Mac OS virtual keycodes appears with OS 10.5 in +// ...../Carbon.framework/Frameworks/HIToolbox.framework/Headers/Events.h static const struct {unsigned short vk, fltk;} vktab[] = { { 49, ' ' }, { 39, '\'' }, { 43, ',' }, { 27, '-' }, { 47, '.' }, { 44, '/' }, @@ -49,12 +51,12 @@ static const struct {unsigned short vk, fltk;} vktab[] = { { 12, 'Q' }, { 15, 'R' }, { 1, 'S' }, { 17, 'T' }, { 32, 'U' }, { 9, 'V' }, { 13, 'W' }, { 7, 'X' }, { 16, 'Y' }, { 6, 'Z' }, - { 33, '[' }, { 30, ']' }, { 50, '`' }, { 42, '|' }, - { 51, FL_BackSpace }, { 48, FL_Tab }, { 36, FL_Enter }, { 127, FL_Pause }, - { 107, FL_Scroll_Lock }, { 53, FL_Escape }, { 0x73, FL_Home }, { 123, FL_Left }, + { 33, '[' }, { 30, ']' }, { 50, '`' }, { 42, '\\' }, + { 51, FL_BackSpace }, { 48, FL_Tab }, { 36, FL_Enter }, { 0x7F, FL_Pause }, + { 0x7F, FL_Scroll_Lock }, { 53, FL_Escape }, { 0x73, FL_Home }, { 123, FL_Left }, { 126, FL_Up }, { 124, FL_Right }, { 125, FL_Down }, { 0x74, FL_Page_Up }, - { 0x79, FL_Page_Down }, { 119, FL_End }, { 0x71, FL_Print }, { 127, FL_Insert }, - { 0x6e, FL_Menu }, { 114, FL_Help }, /*{ 0x47, FL_Num_Lock },*/ + { 0x79, FL_Page_Down }, { 119, FL_End }, { 0x7F, FL_Print }, { 0x7F, FL_Insert }, + { 0x6e, FL_Menu }, { 114, FL_Help }, { 0x47, FL_Num_Lock }, { 76, FL_KP_Enter }, { 67, FL_KP+'*' }, { 69, FL_KP+'+'}, { 78, FL_KP+'-' }, { 65, FL_KP+'.' }, { 75, FL_KP+'/' }, { 82, FL_KP+'0' }, { 83, FL_KP+'1' }, { 84, FL_KP+'2' }, { 85, FL_KP+'3' }, { 86, FL_KP+'4' }, { 87, FL_KP+'5' }, { 88, FL_KP+'6' }, { 89, FL_KP+'7' }, @@ -62,9 +64,10 @@ static const struct {unsigned short vk, fltk;} vktab[] = { { 0x7a, FL_F+1 }, { 0x78, FL_F+2 }, { 0x63, FL_F+3 }, { 0x76, FL_F+4 }, { 0x60, FL_F+5 }, { 0x61, FL_F+6 }, { 0x62, FL_F+7 }, { 0x64, FL_F+8 }, { 0x65, FL_F+9 }, { 0x6D, FL_F+10 }, { 0x67, FL_F+11 }, { 0x6f, FL_F+12 }, - { 56, FL_Shift_L }, { 56, FL_Shift_R }, { 59, FL_Control_L }, { 59, FL_Control_R }, - { 57, FL_Caps_Lock }, { 55, FL_Meta_L }, { 55, FL_Meta_R }, - { 58, FL_Alt_L }, { 58, FL_Alt_R }, /*{ 0x75, FL_Delete },*/ { 0x47, FL_Delete }, + { 0x69, FL_F+13 }, { 0x6B, FL_F+14 }, { 0x71, FL_F+15 }, { 0x6A, FL_F+16 }, + { 0x38, FL_Shift_L }, { 0x3C, FL_Shift_R }, { 0x3B, FL_Control_L }, { 0x3E, FL_Control_R }, + { 0x39, FL_Caps_Lock }, { 0x37, FL_Meta_L }, { 0x36, FL_Meta_R }, + { 0x3A, FL_Alt_L }, { 0x3D, FL_Alt_R }, { 0x75, FL_Delete }, }; static int fltk2mac(int fltk) { @@ -83,8 +86,6 @@ int Fl::event_key(int k) { return get_key(k); } -#include - //: returns true, if that key is pressed right now int Fl::get_key(int k) { #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 @@ -94,8 +95,13 @@ int Fl::get_key(int k) { else #endif { - KeyMap foo; - GetKeys(foo); + typedef UInt32 fl_KeyMap[4]; + fl_KeyMap foo; + // use the GetKeys Carbon function + typedef void (*keymap_f)(fl_KeyMap); + static keymap_f f = NULL; + if (!f) f = ( keymap_f )Fl_X::get_carbon_function("GetKeys"); + (*f)(foo); #ifdef MAC_TEST_FOR_KEYCODES static int cnt = 0; if (cnt++>1024) { @@ -114,5 +120,5 @@ int Fl::get_key(int k) { } // -// End of "$Id: Fl_get_key_mac.cxx 7615 2010-05-26 21:25:11Z manolo $". +// End of "$Id: Fl_get_key_mac.cxx 8624 2011-04-26 17:28:10Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_get_key_win32.cxx b/plugins/zynaddsubfx/fltk/src/Fl_get_key_win32.cxx index 1f14b4cda..e935a2ebf 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_get_key_win32.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_get_key_win32.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_get_key_win32.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_get_key_win32.cxx 7913 2010-11-29 18:18:27Z greg.ercolano $" // // WIN32 keyboard state routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -134,5 +134,5 @@ int Fl::get_key(int k) { } // -// End of "$Id: Fl_get_key_win32.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_get_key_win32.cxx 7913 2010-11-29 18:18:27Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_get_system_colors.cxx b/plugins/zynaddsubfx/fltk/src/Fl_get_system_colors.cxx index 176fece6c..35e9a9f25 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_get_system_colors.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_get_system_colors.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_get_system_colors.cxx 7352 2010-03-29 10:47:11Z matt $" +// "$Id: Fl_get_system_colors.cxx 7903 2010-11-28 21:06:39Z matt $" // // System color support for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -422,5 +422,5 @@ int Fl::reload_scheme() { // -// End of "$Id: Fl_get_system_colors.cxx 7352 2010-03-29 10:47:11Z matt $". +// End of "$Id: Fl_get_system_colors.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_grab.cxx b/plugins/zynaddsubfx/fltk/src/Fl_grab.cxx index 8a609675d..76c9e9e15 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_grab.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_grab.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_grab.cxx 7351 2010-03-29 10:35:00Z matt $" +// "$Id: Fl_grab.cxx 8055 2010-12-18 22:31:01Z manolo $" // // Grab/release code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -47,7 +47,6 @@ extern HWND fl_capture; #endif #ifdef __APPLE__ -extern void MACsetkeywindow(void *nsw); extern void *fl_capture; #endif @@ -59,7 +58,7 @@ void Fl::grab(Fl_Window* win) { SetCapture(fl_capture); #elif defined(__APPLE__) fl_capture = Fl_X::i(first_window())->xid; - MACsetkeywindow(fl_capture); + Fl_X::i(first_window())->set_key_window(); #else XGrabPointer(fl_display, fl_xid(first_window()), @@ -101,5 +100,5 @@ void Fl::grab(Fl_Window* win) { } // -// End of "$Id: Fl_grab.cxx 7351 2010-03-29 10:35:00Z matt $". +// End of "$Id: Fl_grab.cxx 8055 2010-12-18 22:31:01Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_lock.cxx b/plugins/zynaddsubfx/fltk/src/Fl_lock.cxx index 58ae297e6..e95bceb97 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_lock.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_lock.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_lock.cxx 6787 2009-05-14 20:16:09Z engelsman $" +// "$Id: Fl_lock.cxx 8393 2011-02-06 19:46:11Z manolo $" // // Multi-threading support code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -121,11 +121,15 @@ int Fl::get_awake_handler_(Fl_Awake_Handler &func, void *&data) return ret; } -// /** - Let the main thread know an update is pending - and have it call a specific function - See void awake(void* message=0). + Let the main thread know an update is pending and have it call a specific function. + Registers a function that will be + called by the main thread during the next message handling cycle. + Returns 0 if the callback function was registered, + and -1 if registration failed. Over a thousand awake callbacks can be + registered simultaneously. + + \see Fl::awake(void* message=0) */ int Fl::awake(Fl_Awake_Handler func, void *data) { int ret = add_awake_handler_(func, data); @@ -135,12 +139,13 @@ int Fl::awake(Fl_Awake_Handler func, void *data) { //////////////////////////////////////////////////////////////// // Windows threading... -/** \fn void Fl::lock() +/** \fn int Fl::lock() The lock() method blocks the current thread until it can safely access FLTK widgets and data. Child threads should call this method prior to updating any widgets or accessing data. The main thread must call lock() to initialize - the threading support in FLTK. + the threading support in FLTK. lock() will return non-zero + if threading is not available on the platform. Child threads must call unlock() when they are done accessing FLTK. @@ -150,6 +155,9 @@ int Fl::awake(Fl_Awake_Handler func, void *data) { Similarly, when the main thread needs to do processing, it will wait until all child threads have called unlock() before processing additional data. + + \return 0 if threading is available on the platform; non-zero + otherwise. See also: \ref advanced_multithreading */ @@ -162,7 +170,7 @@ int Fl::awake(Fl_Awake_Handler func, void *data) { See also: \ref advanced_multithreading */ /** \fn void Fl::awake(void* msg) - The awake() method sends a message pointer to the main thread, + Sends a message pointer to the main thread, causing any pending Fl::wait() call to terminate so that the main thread can retrieve the message and any pending redraws can be processed. @@ -172,12 +180,6 @@ int Fl::awake(Fl_Awake_Handler func, void *data) { thousand) depth. The default message handler saves the last message which can be accessed using the Fl::thread_message() function. - - The second form of awake() registers a function that will be - called by the main thread during the next message handling cycle. - awake() will return 0 if the callback function was registered, - and -1 if registration failed. Over a thousand awake callbacks can be - registered simultaneously. In the context of a threaded application, a call to Fl::awake() with no argument will trigger event loop handling in the main thread. Since @@ -187,7 +189,6 @@ int Fl::awake(Fl_Awake_Handler func, void *data) { See also: \ref advanced_multithreading */ #ifdef WIN32 -# include # include # include # include @@ -231,7 +232,7 @@ static void lock_function() { EnterCriticalSection(&cs); } -void Fl::lock() { +int Fl::lock() { if (!main_thread) InitializeCriticalSection(&cs); lock_function(); @@ -241,6 +242,7 @@ void Fl::lock() { fl_unlock_function = unlock_function; main_thread = GetCurrentThreadId(); } + return 0; } void Fl::unlock() { @@ -305,7 +307,7 @@ static void unlock_function_rec() { # endif // PTHREAD_MUTEX_RECURSIVE void Fl::awake(void* msg) { - write(thread_filedes[1], &msg, sizeof(void*)); + if (write(thread_filedes[1], &msg, sizeof(void*))==0) { /* ignore */ } } static void* thread_message_; @@ -316,7 +318,9 @@ void* Fl::thread_message() { } static void thread_awake_cb(int fd, void*) { - read(fd, &thread_message_, sizeof(void*)); + if (read(fd, &thread_message_, sizeof(void*))==0) { + /* This should never happen */ + } Fl_Awake_Handler func; void *data; while (Fl::get_awake_handler_(func, data)==0) { @@ -328,11 +332,13 @@ static void thread_awake_cb(int fd, void*) { extern void (*fl_lock_function)(); extern void (*fl_unlock_function)(); -void Fl::lock() { +int Fl::lock() { if (!thread_filedes[1]) { // Initialize thread communication pipe to let threads awake FLTK // from Fl::wait() - pipe(thread_filedes); + if (pipe(thread_filedes)==-1) { + /* this should not happen */ + } // Make the write side of the pipe non-blocking to avoid deadlock // conditions (STR #1537) @@ -361,6 +367,7 @@ void Fl::lock() { } fl_lock_function(); + return 0; } void Fl::unlock() { @@ -393,8 +400,19 @@ void lock_ring() { void Fl::awake(void*) { } +int Fl::lock() { + return 1; +} + +void Fl::unlock() { +} + +void* Fl::thread_message() { + return NULL; +} + #endif // WIN32 // -// End of "$Id: Fl_lock.cxx 6787 2009-05-14 20:16:09Z engelsman $". +// End of "$Id: Fl_lock.cxx 8393 2011-02-06 19:46:11Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_mac.cxx b/plugins/zynaddsubfx/fltk/src/Fl_mac.cxx index 82d9f6a65..38c0f21ea 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_mac.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_mac.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_mac.cxx 7351 2010-03-29 10:35:00Z matt $" +// "$Id: Fl_mac.cxx 7913 2010-11-29 18:18:27Z greg.ercolano $" // // MacOS specific code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -2866,5 +2866,5 @@ void MacUnmapWindow(Fl_Window *w, WindowPtr p) { #endif // FL_DOXYGEN // -// End of "$Id: Fl_mac.cxx 7351 2010-03-29 10:35:00Z matt $". +// End of "$Id: Fl_mac.cxx 7913 2010-11-29 18:18:27Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_own_colormap.cxx b/plugins/zynaddsubfx/fltk/src/Fl_own_colormap.cxx index 17b7bfeeb..3a7668858 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_own_colormap.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_own_colormap.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_own_colormap.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_own_colormap.cxx 7903 2010-11-28 21:06:39Z matt $" // // Private colormap support for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -86,5 +86,5 @@ void Fl::own_colormap() { #endif // -// End of "$Id: Fl_own_colormap.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_own_colormap.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_visual.cxx b/plugins/zynaddsubfx/fltk/src/Fl_visual.cxx index 7daf75d3b..98c3c3a92 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_visual.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_visual.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_visual.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: Fl_visual.cxx 7903 2010-11-28 21:06:39Z matt $" // // Visual support for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -151,5 +151,5 @@ int Fl::visual(int flags) { #endif // -// End of "$Id: Fl_visual.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: Fl_visual.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_win32.cxx b/plugins/zynaddsubfx/fltk/src/Fl_win32.cxx index 5dfdb7aae..54d9c813d 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_win32.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_win32.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_win32.cxx 7659 2010-07-01 13:21:32Z manolo $" +// "$Id: Fl_win32.cxx 8759 2011-05-30 12:33:51Z manolo $" // // WIN32-specific code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -29,14 +29,16 @@ // in. Search other files for "WIN32" or filenames ending in _win32.cxx // for other system-specific code. +// This file must be #include'd in Fl.cxx and not compiled separately. + #ifndef FL_DOXYGEN #include -#include #include #include #include #include #include +#include #include "flstring.h" #include "Fl_Font.H" #include @@ -46,30 +48,25 @@ #ifdef __CYGWIN__ # include # include -#else -# if !defined(USE_WSOCK1) -# include -#else -# include -# endif #endif -#if !defined(USE_WSOCK1) -# define WSCK_DLL_NAME "WS2_32.DLL" -#else -# define WSCK_DLL_NAME "WSOCK32.DLL" -#endif -#include -#include -#if defined(__GNUC__) && __GNUC__ >= 3 +#if !defined(NO_TRACK_MOUSE) +# include // TrackMouseEvent +// fabien: Ms Visual Studio >= 2003 permit embedded lib reference +// that makes fltk use easier as only fltk libs are now requested +// This idea could be extended to fltk libs themselves, +// implementer should then care about DLL linkage flags ... +# if (_MSC_VER>=1310) +# pragma comment (lib, "comctl32.lib") +# endif +#endif + +#if defined(__GNUC__) # include #endif -// The following include files require GCC 3.x or a non-GNU compiler... -#if !defined(__GNUC__) || __GNUC__ >= 3 -# include -# include -#endif // !__GNUC__ || __GNUC__ >= 3 +#include +#include #include "aimm.h" @@ -97,20 +94,24 @@ static Fl_GDI_Graphics_Driver fl_gdi_driver; static Fl_Display_Device fl_gdi_display(&fl_gdi_driver); -FL_EXPORT Fl_Display_Device *fl_display_device = (Fl_Display_Device*)&fl_gdi_display; // does not change FL_EXPORT Fl_Graphics_Driver *fl_graphics_driver = (Fl_Graphics_Driver*)&fl_gdi_driver; // the current target driver of graphics operations -FL_EXPORT Fl_Surface_Device *fl_surface = (Fl_Surface_Device*)fl_display_device; // the current target surface of graphics operations +Fl_Surface_Device* Fl_Surface_Device::_surface = (Fl_Surface_Device*)&fl_gdi_display; // the current target surface of graphics operations +Fl_Display_Device *Fl_Display_Device::_display = &fl_gdi_display; // the platform display // dynamic wsock dll handling api: #if defined(__CYGWIN__) && !defined(SOCKET) # define SOCKET int #endif + +// note: winsock2.h has been #include'd in Fl.cxx +#define WSCK_DLL_NAME "WS2_32.DLL" + typedef int (WINAPI* fl_wsk_select_f)(int, fd_set*, fd_set*, fd_set*, const struct timeval*); typedef int (WINAPI* fl_wsk_fd_is_set_f)(SOCKET, fd_set *); static HMODULE s_wsock_mod = 0; -static fl_wsk_select_f s_wsock_select=0; -static fl_wsk_fd_is_set_f fl_wsk_fd_is_set=0; +static fl_wsk_select_f s_wsock_select = 0; +static fl_wsk_fd_is_set_f fl_wsk_fd_is_set = 0; static HMODULE get_wsock_mod() { if (!s_wsock_mod) { @@ -245,9 +246,7 @@ static Fl_Window *track_mouse_win=0; // current TrackMouseEvent() window static int maxfd = 0; static fd_set fdsets[3]; -#if !defined(__GNUC__) || __GNUC__ >= 3 extern IDropTarget *flIDropTarget; -#endif // !__GNUC__ || __GNUC__ >= 3 static int nfds = 0; static int fd_array_size = 0; @@ -568,7 +567,7 @@ void Fl::copy(const char *stuff, int len, int clipboard) { EmptyClipboard(); HGLOBAL hMem = GlobalAlloc(GHND, utf16_len * 2 + 2); // moveable and zero'ed mem alloc. LPVOID memLock = GlobalLock(hMem); - fl_utf8toUtf16(fl_selection_buffer[clipboard], fl_selection_length[clipboard], (unsigned short*) memLock, utf16_len * 2); + fl_utf8toUtf16(fl_selection_buffer[clipboard], fl_selection_length[clipboard], (unsigned short*) memLock, utf16_len + 1); GlobalUnlock(hMem); SetClipboardData(CF_UNICODETEXT, hMem); CloseClipboard(); @@ -743,6 +742,7 @@ static const struct {unsigned short vk, fltk, extended;} vktab[] = { {VK_LWIN, FL_Meta_L}, {VK_RWIN, FL_Meta_R}, {VK_APPS, FL_Menu}, + {VK_SLEEP, FL_Sleep}, {VK_MULTIPLY, FL_KP+'*'}, {VK_ADD, FL_KP+'+'}, {VK_SUBTRACT, FL_KP+'-'}, @@ -750,6 +750,23 @@ static const struct {unsigned short vk, fltk, extended;} vktab[] = { {VK_DIVIDE, FL_KP+'/'}, {VK_NUMLOCK, FL_Num_Lock}, {VK_SCROLL, FL_Scroll_Lock}, +# if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0500) + {VK_BROWSER_BACK, FL_Back}, + {VK_BROWSER_FORWARD, FL_Forward}, + {VK_BROWSER_REFRESH, FL_Refresh}, + {VK_BROWSER_STOP, FL_Stop}, + {VK_BROWSER_SEARCH, FL_Search}, + {VK_BROWSER_FAVORITES, FL_Favorites}, + {VK_BROWSER_HOME, FL_Home_Page}, + {VK_VOLUME_MUTE, FL_Volume_Mute}, + {VK_VOLUME_DOWN, FL_Volume_Down}, + {VK_VOLUME_UP, FL_Volume_Up}, + {VK_MEDIA_NEXT_TRACK, FL_Media_Next}, + {VK_MEDIA_PREV_TRACK, FL_Media_Prev}, + {VK_MEDIA_STOP, FL_Media_Stop}, + {VK_MEDIA_PLAY_PAUSE, FL_Media_Play}, + {VK_LAUNCH_MAIL, FL_Mail}, +#endif {0xba, ';'}, {0xbb, '='}, {0xbc, ','}, @@ -1076,9 +1093,20 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar break; } } - } else if ((lParam & (1<<31))==0){ + } else if ((lParam & (1<<31))==0) { +#ifdef FLTK_PREVIEW_DEAD_KEYS + if ((lParam & (1<<24))==0) { // clear if dead key (always?) + xchar u = (xchar) wParam; + Fl::e_length = fl_utf8fromwc(buffer, 1024, &u, 1); + buffer[Fl::e_length] = 0; + } else { // set if "extended key" (never printable?) + buffer[0] = 0; + Fl::e_length = 0; + } +#else buffer[0] = 0; Fl::e_length = 0; +#endif } Fl::e_text = buffer; if (lParam & (1<<31)) { // key up events. @@ -1087,7 +1115,11 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar } // for (int i = lParam&0xff; i--;) while (window->parent()) window = window->window(); - if (Fl::handle(FL_KEYBOARD,window)) return 0; + if (Fl::handle(FL_KEYBOARD,window)) { + if (uMsg==WM_DEADCHAR || uMsg==WM_SYSDEADCHAR) + Fl::compose_state = 1; + return 0; + } break;} case WM_MOUSEWHEEL: { @@ -1400,14 +1432,16 @@ Fl_X* Fl_X::make(Fl_Window* w) { first_class_name = class_name; } - const wchar_t* class_namew = L"FLTK"; - const wchar_t* message_namew = L"FLTK::ThreadWakeup"; - if (!class_name_list.has_name(class_name)) { - WNDCLASSEX wc; - WNDCLASSEXW wcw; + wchar_t class_namew[100]; // (limited) buffer for Windows class name - memset(&wc, 0, sizeof(wc)); - wc.cbSize = sizeof(WNDCLASSEX); + // convert UTF-8 class_name to wchar_t for RegisterClassExW and CreateWindowExW + + fl_utf8toUtf16(class_name,strlen(class_name), // in + (unsigned short*)class_namew, // out + sizeof(class_namew)/sizeof(wchar_t)); // max. size + + if (!class_name_list.has_name(class_name)) { + WNDCLASSEXW wcw; memset(&wcw, 0, sizeof(wcw)); wcw.cbSize = sizeof(WNDCLASSEXW); @@ -1428,13 +1462,11 @@ Fl_X* Fl_X::make(Fl_Window* w) { wcw.hbrBackground = NULL; wcw.lpszMenuName = NULL; wcw.lpszClassName = class_namew; - wcw.cbSize = sizeof(WNDCLASSEXW); RegisterClassExW(&wcw); - class_name_list.add_name((const char *)class_namew); + class_name_list.add_name(class_name); } - // const char* message_name = "FLTK::ThreadWakeup"; - // if (!fl_wake_msg) fl_wake_msg = RegisterWindowMessage(message_name); + const wchar_t* message_namew = L"FLTK::ThreadWakeup"; if (!fl_wake_msg) fl_wake_msg = RegisterWindowMessageW(message_namew); HWND parent; @@ -1547,28 +1579,21 @@ Fl_X* Fl_X::make(Fl_Window* w) { w->redraw(); // force draw to happen } // If we've captured the mouse, we dont want to activate any - // other windows from the code, or we loose the capture. + // other windows from the code, or we lose the capture. ShowWindow(x->xid, !showit ? SW_SHOWMINNOACTIVE : (Fl::grab() || (style & WS_POPUP)) ? SW_SHOWNOACTIVATE : SW_SHOWNORMAL); - // Drag-n-drop requires GCC 3.x or a non-GNU compiler... -#if !defined(__GNUC__) || __GNUC__ >= 3 // Register all windows for potential drag'n'drop operations - static char oleInitialized = 0; - if (!oleInitialized) { OleInitialize(0L); oleInitialized=1; } - + fl_OleInitialize(); RegisterDragDrop(x->xid, flIDropTarget); + if (!fl_aimm) { - static char been_here = 0; - if (!been_here && !oleInitialized) CoInitialize(NULL); - been_here = 1; CoCreateInstance(CLSID_CActiveIMM, NULL, CLSCTX_INPROC_SERVER, IID_IActiveIMMApp, (void**) &fl_aimm); if (fl_aimm) { fl_aimm->Activate(TRUE); } } -#endif // !__GNUC__ || __GNUC__ >= 3 if (w->modal()) {Fl::modal_ = w; fl_fix_focus();} return x; @@ -1927,13 +1952,73 @@ void fl_cleanup_dc_list(void) { // clean up the list } Fl_Region XRectangleRegion(int x, int y, int w, int h) { - if (Fl_Surface_Device::surface()->type() == Fl_Display_Device::device_type) return CreateRectRgn(x,y,x+w,y+h); + if (Fl_Surface_Device::surface()->class_name() == Fl_Display_Device::class_id) return CreateRectRgn(x,y,x+w,y+h); // because rotation may apply, the rectangle becomes a polygon in device coords POINT pt[4] = { {x, y}, {x + w, y}, {x + w, y + h}, {x, y + h} }; LPtoDP(fl_gc, pt, 4); return CreatePolygonRgn(pt, 4, ALTERNATE); } +Window fl_xid_(const Fl_Window *w) { + Fl_X *temp = Fl_X::i(w); + return temp ? temp->xid : 0; +} + +int Fl_Window::decorated_w() +{ + if (!shown() || parent() || !border() || !visible()) return w(); + int X, Y, bt, bx, by; + Fl_X::fake_X_wm(this, X, Y, bt, bx, by); + return w() + 2 * bx; +} + +int Fl_Window::decorated_h() +{ + if (!shown() || parent() || !border() || !visible()) return h(); + int X, Y, bt, bx, by; + Fl_X::fake_X_wm(this, X, Y, bt, bx, by); + return h() + bt + 2 * by; +} + +void Fl_Paged_Device::print_window(Fl_Window *win, int x_offset, int y_offset) +{ + if (!win->shown() || win->parent() || !win->border() || !win->visible()) { + this->print_widget(win, x_offset, y_offset); + return; + } + int X, Y, bt, bx, by, ww, wh; // compute the window border sizes + Fl_X::fake_X_wm(win, X, Y, bt, bx, by); + ww = win->w() + 2 * bx; + wh = win->h() + bt + 2 * by; + Fl_Display_Device::display_device()->set_current(); // make window current + win->show(); + Fl::check(); + win->make_current(); + HDC save_gc = fl_gc; + fl_gc = GetDC(NULL); // get the screen device context + // capture the 4 window sides from screen + RECT r; GetWindowRect(fl_window, &r); + uchar *top_image = fl_read_image(NULL, r.left, r.top, ww, bt + by); + uchar *left_image = fl_read_image(NULL, r.left, r.top, bx, wh); + uchar *right_image = fl_read_image(NULL, r.right - bx, r.top, bx, wh); + uchar *bottom_image = fl_read_image(NULL, r.left, r.bottom-by, ww, by); + ReleaseDC(NULL, fl_gc); fl_gc = save_gc; + this->set_current(); + // print the 4 window sides + fl_draw_image(top_image, x_offset, y_offset, ww, bt + by, 3); + fl_draw_image(left_image, x_offset, y_offset, bx, wh, 3); + fl_draw_image(right_image, x_offset + win->w() + bx, y_offset, bx, wh, 3); + fl_draw_image(bottom_image, x_offset, y_offset + win->h() + bt + by, ww, by, 3); + delete[] top_image; + delete[] left_image; + delete[] right_image; + delete[] bottom_image; + // print the window inner part + this->print_widget(win, x_offset + bx, y_offset + bt + by); + fl_gc = GetDC(fl_xid(win)); + ReleaseDC(fl_xid(win), fl_gc); +} + #ifdef USE_PRINT_BUTTON // to test the Fl_Printer class creating a "Print front window" button in a separate window // contains also preparePrintFront call above @@ -1949,11 +2034,14 @@ void printFront(Fl_Widget *o, void *data) if( printer.start_job(1) ) { o->window()->show(); return; } if( printer.start_page() ) { o->window()->show(); return; } printer.printable_rect(&w,&h); + int wh, ww; + wh = win->decorated_h(); + ww = win->decorated_w(); // scale the printer device so that the window fits on the page float scale = 1; - if (win->w() > w || win->h() > h) { - scale = (float)w/win->w(); - if ((float)h/win->h() < scale) scale = (float)h/win->h(); + if (ww > w || wh > h) { + scale = (float)w/ww; + if ((float)h/wh < scale) scale = (float)h/wh; printer.scale(scale, scale); } // #define ROTATE 20.0 @@ -1964,9 +2052,8 @@ void printFront(Fl_Widget *o, void *data) printer.rotate(ROTATE); printer.print_widget( win, - win->w()/2, - win->h()/2 ); //printer.print_window_part( win, 0,0, win->w(), win->h(), - win->w()/2, - win->h()/2 ); -#else - printer.print_widget( win ); - //printer.print_window_part( win, 0,0, win->w(), win->h() ); +#else + printer.print_window(win); #endif printer.end_page(); printer.end_job(); @@ -1989,5 +2076,5 @@ void preparePrintFront(void) #endif // FL_DOXYGEN // -// End of "$Id: Fl_win32.cxx 7659 2010-07-01 13:21:32Z manolo $". +// End of "$Id: Fl_win32.cxx 8759 2011-05-30 12:33:51Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/Fl_x.cxx b/plugins/zynaddsubfx/fltk/src/Fl_x.cxx index 4e9cebc5e..4ef92b064 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_x.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_x.cxx @@ -1,9 +1,9 @@ // -// "$Id: Fl_x.cxx 7659 2010-07-01 13:21:32Z manolo $" +// "$Id: Fl_x.cxx 8764 2011-05-30 16:47:48Z manolo $" // // X specific code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -42,6 +42,7 @@ # include # include # include +# include # include # include # include "flstring.h" @@ -50,12 +51,13 @@ # include # include # include +# include static Fl_Xlib_Graphics_Driver fl_xlib_driver; static Fl_Display_Device fl_xlib_display(&fl_xlib_driver); -FL_EXPORT Fl_Display_Device *fl_display_device = (Fl_Display_Device*)&fl_xlib_display; // does not change FL_EXPORT Fl_Graphics_Driver *fl_graphics_driver = (Fl_Graphics_Driver*)&fl_xlib_driver; // the current target device of graphics operations -FL_EXPORT Fl_Surface_Device *fl_surface = (Fl_Surface_Device*)fl_display_device; // the current target surface of graphics operations +Fl_Surface_Device* Fl_Surface_Device::_surface = (Fl_Surface_Device*)&fl_xlib_display; // the current target surface of graphics operations +Fl_Display_Device *Fl_Display_Device::_display = &fl_xlib_display;// the platform display //////////////////////////////////////////////////////////////// // interface to poll/select call: @@ -278,6 +280,17 @@ int fl_ready() { # endif } +// replace \r\n by \n +static void convert_crlf(unsigned char *string, long& len) { + unsigned char *a, *b; + a = b = string; + while (*a) { + if (*a == '\r' && a[1] == '\n') { a++; len--; } + else *b++ = *a++; + } + *b = 0; +} + //////////////////////////////////////////////////////////////// Display *fl_display; @@ -307,8 +320,22 @@ Atom fl_XdndActionCopy; Atom fl_XdndFinished; //Atom fl_XdndProxy; Atom fl_XdndURIList; +Atom fl_Xatextplainutf; +Atom fl_Xatextplain; +static Atom fl_XaText; +Atom fl_XaCompoundText; Atom fl_XaUtf8String; Atom fl_XaTextUriList; +Atom fl_NET_WM_NAME; // utf8 aware window label +Atom fl_NET_WM_ICON_NAME; // utf8 aware window icon name + +/* + X defines 32-bit-entities to have a format value of max. 32, + although sizeof(atom) can be 8 (64 bits) on a 64-bit OS. + See also fl_open_display() for sizeof(atom) < 4. + Used for XChangeProperty (see STR #2419). +*/ +static int atom_bits = 32; static void fd_callback(int,void *) { do_queued_events(); @@ -338,7 +365,6 @@ void fl_new_ic() XVaNestedList status_attr = NULL; static XFontSet fs = NULL; char *fnt; - bool must_free_fnt = true; char **missing_list; int missing_count; char *def_string; @@ -350,21 +376,22 @@ void fl_new_ic() #if USE_XFT #if defined(__GNUC__) -#warning XFT support here +// FIXME: warning XFT support here #endif /*__GNUC__*/ if (!fs) { - fnt = NULL;//fl_get_font_xfld(0, 14); - if (!fnt) {fnt = "-misc-fixed-*";must_free_fnt=false;} + fnt = (char*)"-misc-fixed-*"; fs = XCreateFontSet(fl_display, fnt, &missing_list, &missing_count, &def_string); } #else if (!fs) { + bool must_free_fnt = true; fnt = fl_get_font_xfld(0, 14); - if (!fnt) {fnt = "-misc-fixed-*";must_free_fnt=false;} + if (!fnt) {fnt = (char*)"-misc-fixed-*";must_free_fnt=false;} fs = XCreateFontSet(fl_display, fnt, &missing_list, &missing_count, &def_string); + if (must_free_fnt) free(fnt); } #endif preedit_attr = XVaCreateNestedList(0, @@ -465,16 +492,16 @@ void fl_set_spot(int font, int size, int X, int Y, int W, int H, Fl_Window *win) #if USE_XFT #if defined(__GNUC__) -#warning XFT support here +// FIXME: warning XFT support here #endif /*__GNUC__*/ fnt = NULL; // fl_get_font_xfld(font, size); - if (!fnt) {fnt = "-misc-fixed-*";must_free_fnt=false;} + if (!fnt) {fnt = (char*)"-misc-fixed-*";must_free_fnt=false;} fs = XCreateFontSet(fl_display, fnt, &missing_list, &missing_count, &def_string); #else fnt = fl_get_font_xfld(font, size); - if (!fnt) {fnt = "-misc-fixed-*";must_free_fnt=false;} + if (!fnt) {fnt = (char*)"-misc-fixed-*";must_free_fnt=false;} fs = XCreateFontSet(fl_display, fnt, &missing_list, &missing_count, &def_string); #endif @@ -509,8 +536,10 @@ void fl_set_status(int x, int y, int w, int h) XFree(status_attr); } -void fl_init_xim() -{ +void fl_init_xim() { + static int xim_warning = 2; + if (xim_warning > 0) xim_warning--; + //XIMStyle *style; XIMStyles *xim_styles; if (!fl_display) return; @@ -524,27 +553,34 @@ void fl_init_xim() XGetIMValues (fl_xim_im, XNQueryInputStyle, &xim_styles, NULL, NULL); } else { - Fl::warning("XOpenIM() failed\n"); + if (xim_warning) + Fl::warning("XOpenIM() failed"); + // if xim_styles is allocated, free it now + if (xim_styles) XFree(xim_styles); return; } if (xim_styles && xim_styles->count_styles) { fl_new_ic(); } else { - Fl::warning("No XIM style found\n"); + if (xim_warning) + Fl::warning("No XIM style found"); XCloseIM(fl_xim_im); fl_xim_im = NULL; + // if xim_styles is allocated, free it now + if (xim_styles) XFree(xim_styles); return; } if (!fl_xim_ic) { - Fl::warning("XCreateIC() failed\n"); + if (xim_warning) + Fl::warning("XCreateIC() failed"); XCloseIM(fl_xim_im); - XFree(xim_styles); fl_xim_im = NULL; } + // if xim_styles is still allocated, free it now + if(xim_styles) XFree(xim_styles); } - void fl_open_display() { if (fl_display) return; @@ -581,8 +617,17 @@ void fl_open_display(Display* d) { //fl_XdndProxy = XInternAtom(d, "XdndProxy", 0); fl_XdndEnter = XInternAtom(d, "XdndEnter", 0); fl_XdndURIList = XInternAtom(d, "text/uri-list", 0); + fl_Xatextplainutf = XInternAtom(d, "text/plain;charset=UTF-8",0); + fl_Xatextplain = XInternAtom(d, "text/plain", 0); + fl_XaText = XInternAtom(d, "TEXT", 0); + fl_XaCompoundText = XInternAtom(d, "COMPOUND_TEXT", 0); fl_XaUtf8String = XInternAtom(d, "UTF8_STRING", 0); fl_XaTextUriList = XInternAtom(d, "text/uri-list", 0); + fl_NET_WM_NAME = XInternAtom(d, "_NET_WM_NAME", 0); + fl_NET_WM_ICON_NAME = XInternAtom(d, "_NET_WM_ICON_NAME", 0); + + if (sizeof(Atom) < 4) + atom_bits = sizeof(Atom) * 8; Fl::add_fd(ConnectionNumber(d), POLLIN, fd_callback); @@ -693,7 +738,7 @@ void Fl::paste(Fl_Widget &receiver, int clipboard) { // otherwise get the window server to return it: fl_selection_requestor = &receiver; Atom property = clipboard ? CLIPBOARD : XA_PRIMARY; - XConvertSelection(fl_display, property, fl_XaUtf8String, property, + XConvertSelection(fl_display, property, TARGETS, property, fl_xid(Fl::first_window()), fl_event_time); } @@ -793,12 +838,32 @@ static Fl_Window* resize_bug_fix; static char unknown[] = ""; const int unknown_len = 10; +extern "C" { + +static int xerror = 0; + +static int ignoreXEvents(Display *display, XErrorEvent *event) { + xerror = 1; + return 0; +} + +static XErrorHandler catchXExceptions() { + xerror = 0; + return ignoreXEvents; +} + +static int wasXExceptionRaised() { + return xerror; +} + +} + + int fl_handle(const XEvent& thisevent) { XEvent xevent = thisevent; fl_xevent = &thisevent; Window xid = xevent.xany.window; - int filtered = 0; static Window xim_win = 0; if (fl_xim_ic && xevent.type == DestroyNotify && @@ -857,10 +922,8 @@ int fl_handle(const XEvent& thisevent) #endif } - filtered = XFilterEvent((XEvent *)&xevent, 0); - if (filtered) { - return 1; - } + if ( XFilterEvent((XEvent *)&xevent, 0) ) + return(1); switch (xevent.type) { @@ -882,24 +945,49 @@ int fl_handle(const XEvent& thisevent) // bugs in X servers, or maybe to avoid an extra round-trip to // get the property length. I copy this here: Atom actual; int format; unsigned long count, remaining; - unsigned char* portion; + unsigned char* portion = NULL; if (XGetWindowProperty(fl_display, fl_xevent->xselection.requestor, fl_xevent->xselection.property, bytesread/4, 65536, 1, 0, &actual, &format, &count, &remaining, &portion)) break; // quit on error - if (bytesread) { // append to the accumulated buffer - buffer = (unsigned char*)realloc(buffer, bytesread+count*format/8+remaining); - memcpy(buffer+bytesread, portion, count*format/8); - XFree(portion); - } else { // Use the first section without moving the memory: - buffer = portion; + if (actual == TARGETS || actual == XA_ATOM) { + Atom type = XA_STRING; + for (unsigned i = 0; ixselectionrequest.time; e.property = fl_xevent->xselectionrequest.property; if (e.target == TARGETS) { - Atom a = fl_XaUtf8String; //XA_STRING; + Atom a[3] = {fl_XaUtf8String, XA_STRING, fl_XaText}; XChangeProperty(fl_display, e.requestor, e.property, - XA_ATOM, sizeof(Atom)*8, 0, (unsigned char*)&a, 1); + XA_ATOM, atom_bits, 0, (unsigned char*)a, 3); } else if (/*e.target == XA_STRING &&*/ fl_selection_length[clipboard]) { - XChangeProperty(fl_display, e.requestor, e.property, - e.target, 8, 0, - (unsigned char *)fl_selection_buffer[clipboard], - fl_selection_length[clipboard]); + if (e.target == fl_XaUtf8String || + e.target == XA_STRING || + e.target == fl_XaCompoundText || + e.target == fl_XaText || + e.target == fl_Xatextplain || + e.target == fl_Xatextplainutf) { + // clobber the target type, this seems to make some applications + // behave that insist on asking for XA_TEXT instead of UTF8_STRING + // Does not change XA_STRING as that breaks xclipboard. + if (e.target != XA_STRING) e.target = fl_XaUtf8String; + XChangeProperty(fl_display, e.requestor, e.property, + e.target, 8, 0, + (unsigned char *)fl_selection_buffer[clipboard], + fl_selection_length[clipboard]); + } } else { // char* x = XGetAtomName(fl_display,e.target); // fprintf(stderr,"selection request of %s\n",x); @@ -970,6 +1069,19 @@ int fl_handle(const XEvent& thisevent) if (window) switch (xevent.type) { + case DestroyNotify: { // an X11 window was closed externally from the program + Fl::handle(FL_CLOSE, window); + Fl_X* X = Fl_X::i(window); + if (X) { // indicates the FLTK window was not closed + X->xid = (Window)0; // indicates the X11 window was already destroyed + window->hide(); + int oldx = window->x(), oldy = window->y(); + window->position(0, 0); + window->position(oldx, oldy); + window->show(); // recreate the X11 window in support of the FLTK window + } + return 1; + } case ClientMessage: { Atom message = fl_xevent->xclient.message_type; const long* data = fl_xevent->xclient.data.l; @@ -1133,33 +1245,30 @@ int fl_handle(const XEvent& thisevent) int len = 0; if (fl_xim_ic) { - if (!filtered) { - Status status; - len = XUtf8LookupString(fl_xim_ic, (XKeyPressedEvent *)&xevent.xkey, - buffer, buffer_len, &keysym, &status); + Status status; + len = XUtf8LookupString(fl_xim_ic, (XKeyPressedEvent *)&xevent.xkey, + buffer, buffer_len, &keysym, &status); - while (status == XBufferOverflow && buffer_len < 50000) { - buffer_len = buffer_len * 5 + 1; - buffer = (char*)realloc(buffer, buffer_len); - len = XUtf8LookupString(fl_xim_ic, (XKeyPressedEvent *)&xevent.xkey, - buffer, buffer_len, &keysym, &status); - } - } else { + while (status == XBufferOverflow && buffer_len < 50000) { + buffer_len = buffer_len * 5 + 1; + buffer = (char*)realloc(buffer, buffer_len); + len = XUtf8LookupString(fl_xim_ic, (XKeyPressedEvent *)&xevent.xkey, + buffer, buffer_len, &keysym, &status); + } + keysym = XKeycodeToKeysym(fl_display, keycode, 0); + } else { + //static XComposeStatus compose; + len = XLookupString((XKeyEvent*)&(xevent.xkey), + buffer, buffer_len, &keysym, 0/*&compose*/); + if (keysym && keysym < 0x400) { // a character in latin-1,2,3,4 sets + // force it to type a character (not sure if this ever is needed): + // if (!len) {buffer[0] = char(keysym); len = 1;} + len = fl_utf8encode(XKeysymToUcs(keysym), buffer); + if (len < 1) len = 1; + // ignore all effects of shift on the keysyms, which makes it a lot + // easier to program shortcuts and is Windoze-compatible: keysym = XKeycodeToKeysym(fl_display, keycode, 0); } - } else { - //static XComposeStatus compose; - len = XLookupString((XKeyEvent*)&(xevent.xkey), - buffer, buffer_len, &keysym, 0/*&compose*/); - if (keysym && keysym < 0x400) { // a character in latin-1,2,3,4 sets - // force it to type a character (not sure if this ever is needed): - // if (!len) {buffer[0] = char(keysym); len = 1;} - len = fl_utf8encode(XKeysymToUcs(keysym), buffer); - if (len < 1) len = 1; - // ignore all effects of shift on the keysyms, which makes it a lot - // easier to program shortcuts and is Windoze-compatable: - keysym = XKeycodeToKeysym(fl_display, keycode, 0); - } } // MRS: Can't use Fl::event_state(FL_CTRL) since the state is not // set until set_event_xy() is called later... @@ -1172,21 +1281,21 @@ int fl_handle(const XEvent& thisevent) // down, probably due to some back compatibility problem. Fortunately // we can detect this because the repeating KeyPress event is in // the queue, get it and execute it instead: - + // Bool XkbSetDetectableAutorepeat ( display, detectable, supported_rtrn ) // Display * display ; // Bool detectable ; // Bool * supported_rtrn ; - // ...would be the easy way to corrct this isuue. Unfortunatly, this call is also + // ...would be the easy way to corrct this isuue. Unfortunatly, this call is also // broken on many Unix distros including Ubuntu and Solaris (as of Dec 2009) - // Bogus KeyUp events are generated by repeated KeyDown events. One + // Bogus KeyUp events are generated by repeated KeyDown events. One // neccessary condition is an identical key event pending right after // the bogus KeyUp. // The new code introduced Dec 2009 differs in that it only check the very // next event in the queue, not the entire queue of events. // This function wrongly detects a repeat key if a software keyboard - // sends a burst of events containing two consecutive equal keys. However, + // sends a burst of events containing two consecutive equal keys. However, // in every non-gaming situation, this is no problem because both KeyPress // events will cause the expected behavior. XEvent peekevent; @@ -1200,7 +1309,7 @@ int fl_handle(const XEvent& thisevent) goto KEYPRESS; } } - + event = FL_KEYUP; fl_key_vector[keycode/8] &= ~(1 << (keycode%8)); // keyup events just get the unshifted keysym: @@ -1225,6 +1334,72 @@ int fl_handle(const XEvent& thisevent) else if (keysym == FL_BackSpace) got_backspace = 1; } # endif + // For the first few years, there wasn't a good consensus on what the + // Windows keys should be mapped to for X11. So we need to help out a + // bit and map all variants to the same FLTK key... + switch (keysym) { + case XK_Meta_L: + case XK_Hyper_L: + case XK_Super_L: + keysym = FL_Meta_L; + break; + case XK_Meta_R: + case XK_Hyper_R: + case XK_Super_R: + keysym = FL_Meta_R; + break; + } + // Convert the multimedia keys to safer, portable values + switch (keysym) { // XF names come from X11/XF86keysym.h + case 0x1008FF11: // XF86XK_AudioLowerVolume: + keysym = FL_Volume_Down; + break; + case 0x1008FF12: // XF86XK_AudioMute: + keysym = FL_Volume_Mute; + break; + case 0x1008FF13: // XF86XK_AudioRaiseVolume: + keysym = FL_Volume_Up; + break; + case 0x1008FF14: // XF86XK_AudioPlay: + keysym = FL_Media_Play; + break; + case 0x1008FF15: // XF86XK_AudioStop: + keysym = FL_Media_Stop; + break; + case 0x1008FF16: // XF86XK_AudioPrev: + keysym = FL_Media_Prev; + break; + case 0x1008FF17: // XF86XK_AudioNext: + keysym = FL_Media_Next; + break; + case 0x1008FF18: // XF86XK_HomePage: + keysym = FL_Home_Page; + break; + case 0x1008FF19: // XF86XK_Mail: + keysym = FL_Mail; + break; + case 0x1008FF1B: // XF86XK_Search: + keysym = FL_Search; + break; + case 0x1008FF26: // XF86XK_Back: + keysym = FL_Back; + break; + case 0x1008FF27: // XF86XK_Forward: + keysym = FL_Forward; + break; + case 0x1008FF28: // XF86XK_Stop: + keysym = FL_Stop; + break; + case 0x1008FF29: // XF86XK_Refresh: + keysym = FL_Refresh; + break; + case 0x1008FF2F: // XF86XK_Sleep: + keysym = FL_Sleep; + break; + case 0x1008FF30: // XF86XK_Favorites: + keysym = FL_Favorites; + break; + } // We have to get rid of the XK_KP_function keys, because they are // not produced on Windoze and thus case statements tend not to check // for them. There are 15 of these in the range 0xff91 ... 0xff9f @@ -1254,6 +1429,10 @@ int fl_handle(const XEvent& thisevent) Fl::e_original_keysym = (int)keysym; } Fl::e_keysym = int(keysym); + + // replace XK_ISO_Left_Tab (Shift-TAB) with FL_Tab (modifier flags are set correctly by X11) + if (Fl::e_keysym == 0xfe20) Fl::e_keysym = FL_Tab; + set_event_xy(); Fl::e_is_click = 0; break;} @@ -1311,6 +1490,12 @@ int fl_handle(const XEvent& thisevent) fl_xmousewin = window; in_a_window = true; + { XIMStyles *xim_styles = NULL; + if(!fl_xim_im || XGetIMValues(fl_xim_im, XNQueryInputStyle, &xim_styles, NULL, NULL)) { + fl_init_xim(); + } + if (xim_styles) XFree(xim_styles); + } break; case LeaveNotify: @@ -1351,16 +1536,22 @@ int fl_handle(const XEvent& thisevent) int xpos, ypos; Window junk; + // on some systems, the ReparentNotify event is not handled as we would expect. + XErrorHandler oldHandler = XSetErrorHandler(catchXExceptions()); + //ReparentNotify gives the new position of the window relative to //the new parent. FLTK cares about the position on the root window. XTranslateCoordinates(fl_display, xevent.xreparent.parent, XRootWindow(fl_display, fl_screen), xevent.xreparent.x, xevent.xreparent.y, &xpos, &ypos, &junk); + XSetErrorHandler(oldHandler); // tell Fl_Window about it and set flag to prevent echoing: - resize_bug_fix = window; - window->position(xpos, ypos); + if ( !wasXExceptionRaised() ) { + resize_bug_fix = window; + window->position(xpos, ypos); + } break; } } @@ -1373,13 +1564,14 @@ int fl_handle(const XEvent& thisevent) void Fl_Window::resize(int X,int Y,int W,int H) { int is_a_move = (X != x() || Y != y()); int is_a_resize = (W != w() || H != h()); + int is_a_enlarge = (W > w() || H > h()); int resize_from_program = (this != resize_bug_fix); if (!resize_from_program) resize_bug_fix = 0; if (is_a_move && resize_from_program) set_flag(FORCE_POSITION); else if (!is_a_resize && !is_a_move) return; if (is_a_resize) { Fl_Group::resize(X,Y,W,H); - if (shown()) {redraw(); i->wait_for_expose = 1;} + if (shown()) {redraw(); if(is_a_enlarge) i->wait_for_expose = 1;} } else { x(X); y(Y); } @@ -1559,7 +1751,7 @@ void Fl_X::make_xid(Fl_Window* win, XVisualInfo *visual, Colormap colormap) XSetTransientForHint(fl_display, xp->xid, fl_xid(wp)); if (!wp->visible()) showit = 0; // guess that wm will not show it } - + // Make sure that borderless windows do not show in the task bar if (!win->border()) { Atom net_wm_state = XInternAtom (fl_display, "_NET_WM_STATE", 0); @@ -1704,11 +1896,13 @@ void Fl_Window::label(const char *name,const char *iname) { iconlabel_ = iname; if (shown() && !parent()) { if (!name) name = ""; - XChangeProperty(fl_display, i->xid, XA_WM_NAME, - fl_XaUtf8String, 8, 0, (uchar*)name, strlen(name)); + int namelen = strlen(name); if (!iname) iname = fl_filename_name(name); - XChangeProperty(fl_display, i->xid, XA_WM_ICON_NAME, - fl_XaUtf8String, 8, 0, (uchar*)iname, strlen(iname)); + int inamelen = strlen(iname); + XChangeProperty(fl_display, i->xid, fl_NET_WM_NAME, fl_XaUtf8String, 8, 0, (uchar*)name, namelen); // utf8 + XChangeProperty(fl_display, i->xid, XA_WM_NAME, XA_STRING, 8, 0, (uchar*)name, namelen); // non-utf8 + XChangeProperty(fl_display, i->xid, fl_NET_WM_ICON_NAME, fl_XaUtf8String, 8, 0, (uchar*)iname, inamelen); // utf8 + XChangeProperty(fl_display, i->xid, XA_WM_ICON_NAME, XA_STRING, 8, 0, (uchar*)iname, inamelen); // non-utf8 } } @@ -1725,7 +1919,7 @@ void Fl_Window::label(const char *name,const char *iname) { // contents are restored to the area, but this assumes the area // is cleared to background color. So this is disabled in this version. // Fl_Window *fl_boxcheat; -static inline int can_boxcheat(uchar b) {return (b==1 || (b&2) && b<=15);} +static inline int can_boxcheat(uchar b) {return (b==1 || ((b&2) && b<=15));} void Fl_Window::show() { image(Fl::scheme_bg_); @@ -1765,11 +1959,97 @@ void Fl_Window::make_current() { current_ = this; fl_clip_region(0); -#ifdef USE_CAIRO +#ifdef FLTK_USE_CAIRO // update the cairo_t context if (Fl::cairo_autolink_context()) Fl::cairo_make_current(this); #endif +} +Window fl_xid_(const Fl_Window *w) { + Fl_X *temp = Fl_X::i(w); + return temp ? temp->xid : 0; +} + +static void decorated_win_size(Fl_Window *win, int &w, int &h) +{ + w = win->w(); + h = win->h(); + if (!win->shown() || win->parent() || !win->border() || !win->visible()) return; + Window root, parent, *children; + unsigned n = 0; + Status status = XQueryTree(fl_display, Fl_X::i(win)->xid, &root, &parent, &children, &n); + if (status != 0 && n) XFree(children); + // when compiz is used, root and parent are the same window + // and I don't know where to find the window decoration + if (status == 0 || root == parent) return; + XWindowAttributes attributes; + XGetWindowAttributes(fl_display, parent, &attributes); + w = attributes.width; + h = attributes.height; +} + +int Fl_Window::decorated_h() +{ + int w, h; + decorated_win_size(this, w, h); + return h; +} + +int Fl_Window::decorated_w() +{ + int w, h; + decorated_win_size(this, w, h); + return w; +} + +void Fl_Paged_Device::print_window(Fl_Window *win, int x_offset, int y_offset) +{ + if (!win->shown() || win->parent() || !win->border() || !win->visible()) { + this->print_widget(win, x_offset, y_offset); + return; + } + Fl_Display_Device::display_device()->set_current(); + win->show(); + Fl::check(); + win->make_current(); + Window root, parent, *children, child_win, from; + unsigned n = 0; + int bx, bt, do_it; + from = fl_window; + do_it = (XQueryTree(fl_display, fl_window, &root, &parent, &children, &n) != 0 && + XTranslateCoordinates(fl_display, fl_window, parent, 0, 0, &bx, &bt, &child_win) == True); + if (n) XFree(children); + // hack to bypass STR #2648: when compiz is used, root and parent are the same window + // and I don't know where to find the window decoration + if (do_it && root == parent) do_it = 0; + if (!do_it) { + this->set_current(); + this->print_widget(win, x_offset, y_offset); + return; + } + fl_window = parent; + uchar *top_image = 0, *left_image = 0, *right_image = 0, *bottom_image = 0; + top_image = fl_read_image(NULL, 0, 0, - (win->w() + 2 * bx), bt); + if (bx) { + left_image = fl_read_image(NULL, 0, bt, -bx, win->h() + bx); + right_image = fl_read_image(NULL, win->w() + bx, bt, -bx, win->h() + bx); + bottom_image = fl_read_image(NULL, 0, bt + win->h(), -(win->w() + 2*bx), bx); + } + fl_window = from; + this->set_current(); + if (top_image) { + fl_draw_image(top_image, x_offset, y_offset, win->w() + 2 * bx, bt, 3); + delete[] top_image; + } + if (bx) { + if (left_image) fl_draw_image(left_image, x_offset, y_offset + bt, bx, win->h() + bx, 3); + if (right_image) fl_draw_image(right_image, x_offset + win->w() + bx, y_offset + bt, bx, win->h() + bx, 3); + if (bottom_image) fl_draw_image(bottom_image, x_offset, y_offset + bt + win->h(), win->w() + 2*bx, bx, 3); + if (left_image) delete[] left_image; + if (right_image) delete[] right_image; + if (bottom_image) delete[] bottom_image; + } + this->print_widget( win, x_offset + bx, y_offset + bt ); } #ifdef USE_PRINT_BUTTON @@ -1789,9 +2069,11 @@ void printFront(Fl_Widget *o, void *data) printer.printable_rect(&w,&h); // scale the printer device so that the window fits on the page float scale = 1; - if (win->w() > w || win->h() > h) { - scale = (float)w/win->w(); - if ((float)h/win->h() < scale) scale = (float)h/win->h(); + int ww = win->decorated_w(); + int wh = win->decorated_h(); + if (ww > w || wh > h) { + scale = (float)w/ww; + if ((float)h/wh < scale) scale = (float)h/wh; printer.scale(scale, scale); } @@ -1803,9 +2085,8 @@ void printFront(Fl_Widget *o, void *data) printer.rotate(ROTATE); printer.print_widget( win, - win->w()/2, - win->h()/2 ); //printer.print_window_part( win, 0,0, win->w(), win->h(), - win->w()/2, - win->h()/2 ); -#else - printer.print_widget( win ); - //printer.print_window_part( win, 0,0,win->w(), win->h() ); +#else + printer.print_window(win); #endif printer.end_page(); @@ -1829,5 +2110,5 @@ void preparePrintFront(void) #endif // -// End of "$Id: Fl_x.cxx 7659 2010-07-01 13:21:32Z manolo $". +// End of "$Id: Fl_x.cxx 8764 2011-05-30 16:47:48Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/aimm.h b/plugins/zynaddsubfx/fltk/src/aimm.h index 64ed66fa5..0251255cb 100644 --- a/plugins/zynaddsubfx/fltk/src/aimm.h +++ b/plugins/zynaddsubfx/fltk/src/aimm.h @@ -1,9 +1,9 @@ // -// "$Id: aimm.h 6943 2009-11-18 12:43:21Z AlbrechtS $" +// "$Id: aimm.h 7913 2010-11-29 18:18:27Z greg.ercolano $" // // Standard dialog header file for the UTF-8 Fast Light Tool Kit (FLTK-UTF8). // -// Copyright 2009 by Bill Spitzak and others. +// Copyright 2009-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -427,5 +427,5 @@ extern "C" __declspec(dllimport) long __stdcall CoCreateInstance(const GUID & rc #endif // -// End of "$Id: aimm.h 6943 2009-11-18 12:43:21Z AlbrechtS $". +// End of "$Id: aimm.h 7913 2010-11-29 18:18:27Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/src/filename_absolute.cxx b/plugins/zynaddsubfx/fltk/src/filename_absolute.cxx index 35a5fc7a0..b98d5eeb4 100644 --- a/plugins/zynaddsubfx/fltk/src/filename_absolute.cxx +++ b/plugins/zynaddsubfx/fltk/src/filename_absolute.cxx @@ -1,9 +1,9 @@ // -// "$Id: filename_absolute.cxx 6986 2010-01-01 18:30:49Z greg.ercolano $" +// "$Id: filename_absolute.cxx 8146 2010-12-31 22:13:07Z matt $" // // Filename expansion routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -121,7 +121,7 @@ int fl_filename_absolute(char *to, int tolen, const char *from) { [..] chdir("/var/tmp/somedir"); // set cwd to /var/tmp/somedir [..] - char out[1024]; + char out[FL_PATH_MAX]; fl_filename_relative(out, sizeof(out), "/var/tmp/somedir/foo.txt"); // out="foo.txt", return=1 fl_filename_relative(out, sizeof(out), "/var/tmp/foo.txt"); // out="../foo.txt", return=1 fl_filename_relative(out, sizeof(out), "foo.txt"); // out="foo.txt", return=0 (no change) @@ -136,13 +136,36 @@ int fl_filename_absolute(char *to, int tolen, const char *from) { int // O - 0 if no change, 1 if changed fl_filename_relative(char *to, // O - Relative filename int tolen, // I - Size of "to" buffer - const char *from) {// I - Absolute filename - char *newslash; // Directory separator + const char *from) // I - Absolute filename +{ + char cwd_buf[FL_PATH_MAX]; // Current directory + // get the current directory and return if we can't + if (!fl_getcwd(cwd_buf, sizeof(cwd_buf))) { + strlcpy(to, from, tolen); + return 0; + } + return fl_filename_relative(to, tolen, from, cwd_buf); +} + + +/** Makes a filename relative to any other directory. + \param[out] to resulting relative filename + \param[in] tolen size of the relative filename buffer + \param[in] from absolute filename + \param[in] base relative to this absolute path + \return 0 if no change, non zero otherwise + */ +int // O - 0 if no change, 1 if changed +fl_filename_relative(char *to, // O - Relative filename + int tolen, // I - Size of "to" buffer + const char *from, // I - Absolute filename + const char *base) { // I - Find path relative to this path + + char *newslash; // Directory separator const char *slash; // Directory separator - char cwd_buf[1024]; // Current directory - char *cwd = cwd_buf; - - + char *cwd = 0L, *cwd_buf = 0L; + if (base) cwd = cwd_buf = strdup(base); + // return if "from" is not an absolute path #if defined(WIN32) || defined(__EMX__) if (from[0] == '\0' || @@ -152,15 +175,23 @@ fl_filename_relative(char *to, // O - Relative filename if (from[0] == '\0' || !isdirsep(*from)) { #endif // WIN32 || __EMX__ strlcpy(to, from, tolen); + if (cwd_buf) free(cwd_buf); return 0; } - - // get the current directory and return if we can't - if (!fl_getcwd(cwd_buf, sizeof(cwd_buf))) { + + // return if "cwd" is not an absolute path +#if defined(WIN32) || defined(__EMX__) + if (!cwd || cwd[0] == '\0' || + (!isdirsep(*cwd) && !isalpha(*cwd) && cwd[1] != ':' && + !isdirsep(cwd[2]))) { +#else + if (!cwd || cwd[0] == '\0' || !isdirsep(*cwd)) { +#endif // WIN32 || __EMX__ strlcpy(to, from, tolen); + if (cwd_buf) free(cwd_buf); return 0; } - + #if defined(WIN32) || defined(__EMX__) // convert all backslashes into forward slashes for (newslash = strchr(cwd, '\\'); newslash; newslash = strchr(newslash + 1, '\\')) @@ -169,6 +200,7 @@ fl_filename_relative(char *to, // O - Relative filename // test for the exact same string and return "." if so if (!strcasecmp(from, cwd)) { strlcpy(to, ".", tolen); + free(cwd_buf); return (1); } @@ -176,6 +208,7 @@ fl_filename_relative(char *to, // O - Relative filename if (tolower(*from & 255) != tolower(*cwd & 255)) { // Not the same drive... strlcpy(to, from, tolen); + free(cwd_buf); return 0; } @@ -185,6 +218,7 @@ fl_filename_relative(char *to, // O - Relative filename // test for the exact same string and return "." if so if (!strcmp(from, cwd)) { strlcpy(to, ".", tolen); + free(cwd_buf); return (1); } #endif // WIN32 || __EMX__ @@ -210,6 +244,7 @@ fl_filename_relative(char *to, // O - Relative filename if (isdirsep(*slash)) slash ++; // do the same for the current dir + if (isdirsep(*newslash)) newslash --; if (*newslash != '\0') while (!isdirsep(*newslash) && newslash > cwd) newslash --; @@ -227,10 +262,11 @@ fl_filename_relative(char *to, // O - Relative filename // finally add the differing path from "from" strlcat(to, slash, tolen); + free(cwd_buf); return 1; } // -// End of "$Id: filename_absolute.cxx 6986 2010-01-01 18:30:49Z greg.ercolano $". +// End of "$Id: filename_absolute.cxx 8146 2010-12-31 22:13:07Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/filename_expand.cxx b/plugins/zynaddsubfx/fltk/src/filename_expand.cxx index 7fc5939c9..2591ec4c7 100644 --- a/plugins/zynaddsubfx/fltk/src/filename_expand.cxx +++ b/plugins/zynaddsubfx/fltk/src/filename_expand.cxx @@ -1,9 +1,9 @@ // -// "$Id: filename_expand.cxx 6986 2010-01-01 18:30:49Z greg.ercolano $" +// "$Id: filename_expand.cxx 7903 2010-11-28 21:06:39Z matt $" // // Filename expansion routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -130,5 +130,5 @@ int fl_filename_expand(char *to,int tolen, const char *from) { // -// End of "$Id: filename_expand.cxx 6986 2010-01-01 18:30:49Z greg.ercolano $". +// End of "$Id: filename_expand.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/filename_ext.cxx b/plugins/zynaddsubfx/fltk/src/filename_ext.cxx index 174fe5266..f9be10476 100644 --- a/plugins/zynaddsubfx/fltk/src/filename_ext.cxx +++ b/plugins/zynaddsubfx/fltk/src/filename_ext.cxx @@ -1,9 +1,9 @@ // -// "$Id: filename_ext.cxx 6986 2010-01-01 18:30:49Z greg.ercolano $" +// "$Id: filename_ext.cxx 7903 2010-11-28 21:06:39Z matt $" // // Filename extension routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -54,5 +54,5 @@ const char *fl_filename_ext(const char *buf) { } // -// End of "$Id: filename_ext.cxx 6986 2010-01-01 18:30:49Z greg.ercolano $". +// End of "$Id: filename_ext.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/filename_isdir.cxx b/plugins/zynaddsubfx/fltk/src/filename_isdir.cxx index a17bc19d5..253bc078d 100644 --- a/plugins/zynaddsubfx/fltk/src/filename_isdir.cxx +++ b/plugins/zynaddsubfx/fltk/src/filename_isdir.cxx @@ -1,9 +1,9 @@ // -// "$Id: filename_isdir.cxx 6986 2010-01-01 18:30:49Z greg.ercolano $" +// "$Id: filename_isdir.cxx 8063 2010-12-19 21:20:10Z matt $" // // Directory detection routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -60,7 +60,7 @@ int _fl_filename_isdir_quick(const char* n) { */ int fl_filename_isdir(const char* n) { struct stat s; - char fn[1024]; + char fn[FL_PATH_MAX]; int length; length = strlen(n); @@ -99,5 +99,5 @@ int fl_filename_isdir(const char* n) { } // -// End of "$Id: filename_isdir.cxx 6986 2010-01-01 18:30:49Z greg.ercolano $". +// End of "$Id: filename_isdir.cxx 8063 2010-12-19 21:20:10Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/filename_list.cxx b/plugins/zynaddsubfx/fltk/src/filename_list.cxx index b863c674d..6434d6792 100644 --- a/plugins/zynaddsubfx/fltk/src/filename_list.cxx +++ b/plugins/zynaddsubfx/fltk/src/filename_list.cxx @@ -1,9 +1,9 @@ // -// "$Id: filename_list.cxx 6986 2010-01-01 18:30:49Z greg.ercolano $" +// "$Id: filename_list.cxx 8192 2011-01-05 16:50:10Z manolo $" // // Filename list routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -28,6 +28,7 @@ // Wrapper for scandir with const-correct function prototypes. #include +#include #include "flstring.h" #include @@ -37,7 +38,6 @@ extern "C" { int fl_scandir (const char *dir, dirent ***namelist, int (*select)(dirent *), int (*compar)(dirent **, dirent **)); -# define scandir fl_scandir #endif } @@ -81,56 +81,126 @@ int fl_casealphasort(struct dirent **a, struct dirent **b) { */ int fl_filename_list(const char *d, dirent ***list, Fl_File_Sort_F *sort) { +#if defined(WIN32) && !defined(__CYGWIN__) && !defined(HAVE_SCANDIR) + // For Windows we have a special scandir implementation that uses + // the Win32 "wide" functions for lookup, avoiding the code page mess + // entirely. It also fixes up the trailing '/'. + return fl_scandir(d, list, 0, sort); + +#else // WIN32 + + int dirlen; + char *dirloc; + + // Assume that locale encoding is no less dense than UTF-8 + dirlen = strlen(d); +#ifdef __APPLE__ + dirloc = (char *)d; +#else + dirloc = (char *)malloc(dirlen + 1); + fl_utf8to_mb(d, dirlen, dirloc, dirlen + 1); +#endif + #ifndef HAVE_SCANDIR - int n = scandir(d, list, 0, sort); -#elif defined(HAVE_SCANDIR_POSIX) - // HP-UX, Cygwin and POSIX (2008) define the comparison function like this: - int n = scandir(d, list, 0, (int(*)(const dirent **, const dirent **))sort); + // This version is when we define our own scandir + int n = fl_scandir(dirloc, list, 0, sort); +#elif defined(HAVE_SCANDIR_POSIX) && !defined(__APPLE__) + // POSIX (2008) defines the comparison function like this: + int n = scandir(dirloc, list, 0, (int(*)(const dirent **, const dirent **))sort); #elif defined(__osf__) // OSF, DU 4.0x - int n = scandir(d, list, 0, (int(*)(dirent **, dirent **))sort); + int n = scandir(dirloc, list, 0, (int(*)(dirent **, dirent **))sort); #elif defined(_AIX) // AIX is almost standard... - int n = scandir(d, list, 0, (int(*)(void*, void*))sort); -#elif !defined(__sgi) + int n = scandir(dirloc, list, 0, (int(*)(void*, void*))sort); +#elif defined(__sgi) + int n = scandir(dirloc, list, 0, sort); +#else // The vast majority of UNIX systems want the sort function to have this // prototype, most likely so that it can be passed to qsort without any // changes: - int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort); -#else - // This version is when we define our own scandir (WIN32 and perhaps - // some Unix systems) and apparently on IRIX: - int n = scandir(d, list, 0, sort); + int n = scandir(dirloc, list, 0, (int(*)(const void*,const void*))sort); #endif -#if defined(WIN32) && !defined(__CYGWIN__) - // we did this already during fl_scandir/win32 -#else - // append a '/' to all filenames that are directories - int i, dirlen = strlen(d); +#ifndef __APPLE__ + free(dirloc); +#endif + + // convert every filename to utf-8, and append a '/' to all + // filenames that are directories + int i; char *fullname = (char*)malloc(dirlen+FL_PATH_MAX+3); // Add enough extra for two /'s and a nul // Use memcpy for speed since we already know the length of the string... memcpy(fullname, d, dirlen+1); + char *name = fullname + dirlen; - if (name!=fullname && name[-1]!='/') *name++ = '/'; + if (name!=fullname && name[-1]!='/') + *name++ = '/'; + for (i=0; id_name); - if (de->d_name[len-1]=='/' || len>FL_PATH_MAX) continue; - // Use memcpy for speed since we already know the length of the string... - memcpy(name, de->d_name, len+1); - if (fl_filename_isdir(fullname)) { - (*list)[i] = de = (dirent*)realloc(de, de->d_name - (char*)de + len + 2); - char *dst = de->d_name + len; - *dst++ = '/'; - *dst = 0; +#ifdef __APPLE__ + newlen = len; +#else + newlen = fl_utf8from_mb(NULL, 0, de->d_name, len); +#endif + dirent *newde = (dirent*)malloc(de->d_name - (char*)de + newlen + 2); // Add space for a / and a nul + + // Conversion to UTF-8 + memcpy(newde, de, de->d_name - (char*)de); +#ifdef __APPLE__ + strcpy(newde->d_name, de->d_name); +#else + fl_utf8from_mb(newde->d_name, newlen + 1, de->d_name, len); +#endif + + // Check if dir (checks done on "old" name as we need to interact with + // the underlying OS) + if (de->d_name[len-1]!='/' && len<=FL_PATH_MAX) { + // Use memcpy for speed since we already know the length of the string... + memcpy(name, de->d_name, len+1); + if (fl_filename_isdir(fullname)) { + char *dst = newde->d_name + newlen; + *dst++ = '/'; + *dst = 0; + } } + + free(de); + (*list)[i] = newde; } free(fullname); -#endif + return n; + +#endif // WIN32 } +/** + \brief Free the list of filenames that is generated by fl_filename_list(). + + Free everything that was allocated by a previous call to fl_filename_list(). + Use the return values as parameters for this function. + + \param[in,out] list table containing the resulting directory listing + \param[in] n number of entries in the list + */ +void fl_filename_free_list(struct dirent ***list, int n) +{ + if (n<0) return; + + int i; + for (i = 0; i < n; i ++) { + if ((*list)[i]) + free((*list)[i]); + } + free(*list); + *list = 0; +} + + // -// End of "$Id: filename_list.cxx 6986 2010-01-01 18:30:49Z greg.ercolano $". +// End of "$Id: filename_list.cxx 8192 2011-01-05 16:50:10Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/filename_match.cxx b/plugins/zynaddsubfx/fltk/src/filename_match.cxx index 1f3d729f0..41e6dfd47 100644 --- a/plugins/zynaddsubfx/fltk/src/filename_match.cxx +++ b/plugins/zynaddsubfx/fltk/src/filename_match.cxx @@ -1,9 +1,9 @@ // -// "$Id: filename_match.cxx 7162 2010-02-26 21:10:46Z matt $" +// "$Id: filename_match.cxx 7903 2010-11-28 21:06:39Z matt $" // // Pattern matching routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -124,5 +124,5 @@ int fl_filename_match(const char *s, const char *p) { } // -// End of "$Id: filename_match.cxx 7162 2010-02-26 21:10:46Z matt $". +// End of "$Id: filename_match.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/filename_setext.cxx b/plugins/zynaddsubfx/fltk/src/filename_setext.cxx index 7dc12cc61..927ea4872 100644 --- a/plugins/zynaddsubfx/fltk/src/filename_setext.cxx +++ b/plugins/zynaddsubfx/fltk/src/filename_setext.cxx @@ -1,9 +1,9 @@ // -// "$Id: filename_setext.cxx 6986 2010-01-01 18:30:49Z greg.ercolano $" +// "$Id: filename_setext.cxx 8063 2010-12-19 21:20:10Z matt $" // // Filename extension routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -40,7 +40,7 @@ \code #include [..] - char buf[1024] = "/path/myfile.cxx"; + char buf[FL_PATH_MAX] = "/path/myfile.cxx"; fl_filename_setext(buf, sizeof(buf), ".txt"); // buf[] becomes "/path/myfile.txt" \endcode @@ -56,5 +56,5 @@ char *fl_filename_setext(char *buf, int buflen, const char *ext) { // -// End of "$Id: filename_setext.cxx 6986 2010-01-01 18:30:49Z greg.ercolano $". +// End of "$Id: filename_setext.cxx 8063 2010-12-19 21:20:10Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_arc.cxx b/plugins/zynaddsubfx/fltk/src/fl_arc.cxx index 273a39e5d..70b29e7ca 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_arc.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_arc.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_arc.cxx 7617 2010-05-27 17:20:18Z manolo $" +// "$Id: fl_arc.cxx 7903 2010-11-28 21:06:39Z matt $" // // Arc functions for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -87,5 +87,5 @@ void fl_circle(double x,double y,double r) { #endif // -// End of "$Id: fl_arc.cxx 7617 2010-05-27 17:20:18Z manolo $". +// End of "$Id: fl_arc.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_arci.cxx b/plugins/zynaddsubfx/fltk/src/fl_arci.cxx index 3327d2d0e..963d62c6d 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_arci.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_arci.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_arci.cxx 7617 2010-05-27 17:20:18Z manolo $" +// "$Id: fl_arci.cxx 7903 2010-11-28 21:06:39Z matt $" // // Arc (integer) drawing functions for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -127,5 +127,5 @@ void Fl_Graphics_Driver::pie(int x,int y,int w,int h,double a1,double a2) { } // -// End of "$Id: fl_arci.cxx 7617 2010-05-27 17:20:18Z manolo $". +// End of "$Id: fl_arci.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_ask.cxx b/plugins/zynaddsubfx/fltk/src/fl_ask.cxx index 8ec31a988..e2dfc0a9b 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_ask.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_ask.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_ask.cxx 7370 2010-03-30 19:44:50Z AlbrechtS $" +// "$Id: fl_ask.cxx 8616 2011-04-20 14:54:42Z AlbrechtS $" // // Standard dialog functions for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -47,12 +47,6 @@ #include #include -#ifdef __APPLE__ -# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -# include -# endif -#endif - static Fl_Window *message_form; static Fl_Box *message; static Fl_Box *icon; @@ -60,14 +54,24 @@ static Fl_Button *button[3]; static Fl_Input *input; static int ret_val; static const char *iconlabel = "?"; +static const char *message_title_default; Fl_Font fl_message_font_ = FL_HELVETICA; -Fl_Fontsize fl_message_size_ = 14; +Fl_Fontsize fl_message_size_ = -1; +static int enableHotspot = 1; +#ifdef __APPLE__ +extern "C" void NSBeep(void); +#endif static char avoidRecursion = 0; -// sets the global return value (ret_val) and closes the window -static void button_cb(Fl_Widget *bt, void *val) { - ret_val = (int)(intptr_t)val; +// Sets the global return value (ret_val) and closes the window. +// Note: this is used for the button callbacks and the window +// callback (closing the window with the close button or menu). +// The first argument (Fl_Widget *) can either be an Fl_Button* +// pointer to one of the buttons or an Fl_Window* pointer to the +// message window (message_form). +static void button_cb(Fl_Widget *, void *val) { + ret_val = (fl_intptr_t)val; message_form->hide(); } @@ -76,12 +80,13 @@ static Fl_Window *makeform() { message_form->size(410,103); return message_form; } - // make sure that the dialog does not become the child of some + // make sure that the dialog does not become the child of some // current group Fl_Group *previously_current_group = Fl_Group::current(); Fl_Group::current(0); // create a new top level window - Fl_Window *w = message_form = new Fl_Window(410,103,""); + Fl_Window *w = message_form = new Fl_Window(410,103); + message_form->callback(button_cb,(void *)0); // w->clear_border(); // w->box(FL_UP_BOX); (message = new Fl_Box(60, 25, 340, 20)) @@ -94,6 +99,7 @@ static Fl_Window *makeform() { o->color(FL_WHITE); o->labelcolor(FL_BLUE); } + w->end(); // don't add the buttons automatically // create the buttons (right to left) for (int b=0, x=310; b<3; b++, x -= 100) { if (b==1) @@ -104,6 +110,10 @@ static Fl_Window *makeform() { button[b]->callback(button_cb,(void *)b); } button[0]->shortcut(FL_Escape); + // add the buttons (left to right) + for (int b=2; b>=0; b--) + w->add(button[b]); + w->begin(); w->resizable(new Fl_Box(60,10,110-60,27)); w->end(); w->set_modal(); @@ -124,7 +134,7 @@ void resizeform() { int x, w, h, max_w, max_h; const int icon_size = 50; - fl_font(fl_message_font_, fl_message_size_); + fl_font(message->labelfont(), message->labelsize()); message_w = message_h = 0; fl_measure(message->label(), message_w, message_h); @@ -208,7 +218,10 @@ static int innards(const char* fmt, va_list ap, } message->labelfont(fl_message_font_); - message->labelsize(fl_message_size_); + if (fl_message_size_ == -1) + message->labelsize(FL_NORMAL_SIZE); + else + message->labelsize(fl_message_size_); if (b0) {button[0]->show(); button[0]->label(b0); button[1]->position(210,70);} else {button[0]->hide(); button[1]->position(310,70);} if (b1) {button[1]->show(); button[1]->label(b1);} @@ -220,14 +233,19 @@ static int innards(const char* fmt, va_list ap, resizeform(); - if (button[1]->visible() && !input->visible()) + if (button[1]->visible() && !input->visible()) button[1]->take_focus(); - message_form->hotspot(button[0]); + if (enableHotspot) + message_form->hotspot(button[0]); if (b0 && Fl_Widget::label_shortcut(b0)) button[0]->shortcut(0); else button[0]->shortcut(FL_Escape); + // set default window title, if defined and a specific title is not set + if (!message_form->label() && message_title_default) + message_form->label(message_title_default); + // deactivate Fl::grab(), because it is incompatible with modal windows Fl_Window* g = Fl::grab(); if (g) Fl::grab(0); @@ -236,6 +254,7 @@ static int innards(const char* fmt, va_list ap, if (g) // regrab the previous popup menu, if there was one Fl::grab(g); icon->label(prev_icon_label); + message_form->label(0); // reset window title avoidRecursion = 0; return ret_val; @@ -244,17 +263,17 @@ static int innards(const char* fmt, va_list ap, /** \addtogroup group_comdlg @{ */ -// pointers you can use to change FLTK to a foreign language: -const char* fl_no = "No"; ///< string pointer used in common dialogs, you can change it to a foreign language -const char* fl_yes= "Yes"; ///< string pointer used in common dialogs, you can change it to a foreign language -const char* fl_ok = "OK"; ///< string pointer used in common dialogs, you can change it to a foreign language -const char* fl_cancel= "Cancel"; ///< string pointer used in common dialogs, you can change it to a foreign language -const char* fl_close= "Close"; ///< string pointer used in common dialogs, you can change it to a foreign language +// pointers you can use to change FLTK to another language: +const char* fl_no = "No"; ///< string pointer used in common dialogs, you can change it to another language +const char* fl_yes= "Yes"; ///< string pointer used in common dialogs, you can change it to another language +const char* fl_ok = "OK"; ///< string pointer used in common dialogs, you can change it to another language +const char* fl_cancel= "Cancel"; ///< string pointer used in common dialogs, you can change it to another language +const char* fl_close= "Close"; ///< string pointer used in common dialogs, you can change it to another language // fltk functions: - /** Emits a system beep message. + \note \#include */ void fl_beep(int type) { #ifdef WIN32 @@ -280,26 +299,7 @@ void fl_beep(int type) { switch (type) { case FL_BEEP_DEFAULT : case FL_BEEP_ERROR : - // How Apple is not any better than Microsoft: - /* MacOS 8 */ // SysBeep(30); - /* OS X 10.1 */ // AlertSoundPlay(); - /* OS X 10.5 */ // AudioServicesPlayAlertSound(kUserPreferredAlert); - /* OS X 10.6 */ // AudioServicesPlayAlertSound(kSystemSoundID_UserPreferredAlert); -# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 - if (AudioServicesPlayAlertSound!=0L) -# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 - AudioServicesPlayAlertSound(kSystemSoundID_UserPreferredAlert); -# else - AudioServicesPlayAlertSound(kUserPreferredAlert); -# endif - else -# endif -#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 - AlertSoundPlay(); -#else - { - } -#endif + NSBeep(); break; default : break; @@ -320,10 +320,13 @@ void fl_beep(int type) { } #endif // WIN32 } + /** Shows an information message dialog box. \note Common dialog boxes are application modal. No more than one common dialog box can be open at any time. Requests for additional dialog boxes are ignored. + \note \#include + \param[in] fmt can be used as an sprintf-like format and variables for the message text */ @@ -346,6 +349,7 @@ void fl_message(const char *fmt, ...) { \note Common dialog boxes are application modal. No more than one common dialog box can be open at any time. Requests for additional dialog boxes are ignored. + \note \#include \param[in] fmt can be used as an sprintf-like format and variables for the message text */ @@ -368,6 +372,7 @@ void fl_alert(const char *fmt, ...) { \note Common dialog boxes are application modal. No more than one common dialog box can be open at any time. Requests for additional dialog boxes are ignored. + \note \#include \param[in] fmt can be used as an sprintf-like format and variables for the message text \retval 0 if the no button is selected or another dialog box is still open @@ -392,7 +397,8 @@ int fl_ask(const char *fmt, ...) { this dialog features up to 3 customizable choice buttons \note Common dialog boxes are application modal. No more than one common dialog box - can be open at any time. Requests for additional dialog boxes are ignored. + can be open at any time. Requests for additional dialog boxes are ignored. + \note \#include \param[in] fmt can be used as an sprintf-like format and variables for the message text \param[in] b0 text label of button 0 @@ -415,10 +421,11 @@ int fl_choice(const char*fmt,const char *b0,const char *b1,const char *b2,...){ va_end(ap); return r; } -/** Gets the Fl_Box icon container of the current default dialog used in - many common dialogs like fl_message(), fl_alert(), - fl_ask(), fl_choice(), fl_input(), fl_password() -*/ +/** Gets the Fl_Box icon container of the current default dialog used in + many common dialogs like fl_message(), fl_alert(), + fl_ask(), fl_choice(), fl_input(), fl_password() + \note \#include +*/ Fl_Widget *fl_message_icon() {makeform(); return icon;} static const char* input_innards(const char* fmt, va_list ap, @@ -440,6 +447,7 @@ static const char* input_innards(const char* fmt, va_list ap, \note Common dialog boxes are application modal. No more than one common dialog box can be open at any time. Requests for additional dialog boxes are ignored. + \note \#include \param[in] fmt can be used as an sprintf-like format and variables for the message text \param[in] defstr defines the default returned string if no text is entered @@ -465,6 +473,7 @@ const char* fl_input(const char *fmt, const char *defstr, ...) { \note Common dialog boxes are application modal. No more than one common dialog box can be open at any time. Requests for additional dialog boxes are ignored. + \note \#include \param[in] fmt can be used as an sprintf-like format and variables for the message text \param[in] defstr defines the default returned string if no text is entered @@ -483,8 +492,80 @@ const char *fl_password(const char *fmt, const char *defstr, ...) { return r; } +/** Sets whether or not to move the common message box used in + many common dialogs like fl_message(), fl_alert(), + fl_ask(), fl_choice(), fl_input(), fl_password() to follow + the mouse pointer. + + The default is \e enabled, so that the default button is the + hotspot and appears at the mouse position. + \note \#include + \param[in] enable non-zero enables hotspot behavior, + 0 disables hotspot + */ +void fl_message_hotspot(int enable) { + enableHotspot = enable ? 1 : 0; +} + +/** Gets whether or not to move the common message box used in + many common dialogs like fl_message(), fl_alert(), + fl_ask(), fl_choice(), fl_input(), fl_password() to follow + the mouse pointer. + \note \#include + \return 0 if disable, non-zero otherwise + \see fl_message_hotspot(int) + */ +int fl_message_hotspot(void) { + return enableHotspot; +} + +/** Sets the title of the dialog window used in many common dialogs. + + This window \p title will be used in the next call of one of the + common dialogs like fl_message(), fl_alert(), fl_ask(), fl_choice(), + fl_input(), fl_password(). + + The \p title string is copied internally, so that you can use a + local variable or free the string immediately after this call. It + applies only to the \b next call of one of the common dialogs and + will be reset to an empty title (the default for all dialogs) after + that call. + + \note \#include + \param[in] title window label, string copied internally +*/ +void fl_message_title(const char *title) { + makeform(); + message_form->copy_label(title); +} + +/** Sets the default title of the dialog window used in many common dialogs. + + This window \p title will be used in all subsequent calls of one of the + common dialogs like fl_message(), fl_alert(), fl_ask(), fl_choice(), + fl_input(), fl_password(), unless a specific title has been set + with fl_message_title(const char *title). + + The default is no title. You can override the default title for a + single dialog with fl_message_title(const char *title). + + The \p title string is copied internally, so that you can use a + local variable or free the string immediately after this call. + + \note \#include + \param[in] title default window label, string copied internally +*/ +void fl_message_title_default(const char *title) { + if (message_title_default) { + free ((void *)message_title_default); + message_title_default = 0; + } + if (title) + message_title_default = strdup(title); +} + /** @} */ // -// End of "$Id: fl_ask.cxx 7370 2010-03-30 19:44:50Z AlbrechtS $". +// End of "$Id: fl_ask.cxx 8616 2011-04-20 14:54:42Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_boxtype.cxx b/plugins/zynaddsubfx/fltk/src/fl_boxtype.cxx index 6a1b76199..ffbc69866 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_boxtype.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_boxtype.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_boxtype.cxx 7469 2010-04-07 23:17:33Z matt $" +// "$Id: fl_boxtype.cxx 7903 2010-11-28 21:06:39Z matt $" // // Box drawing code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -81,19 +81,19 @@ void fl_frame(const char* s, int x, int y, int w, int h) { uchar *g = fl_gray_ramp(); if (h > 0 && w > 0) for (;*s;) { // draw top line: - fl_color(g[*s++]); + fl_color(g[(int)*s++]); fl_xyline(x, y, x+w-1); y++; if (--h <= 0) break; // draw left line: - fl_color(g[*s++]); + fl_color(g[(int)*s++]); fl_yxline(x, y+h-1, y); x++; if (--w <= 0) break; // draw bottom line: - fl_color(g[*s++]); + fl_color(g[(int)*s++]); fl_xyline(x, y+h-1, x+w-1); if (--h <= 0) break; // draw right line: - fl_color(g[*s++]); + fl_color(g[(int)*s++]); fl_yxline(x+w-1, y+h-1, y); if (--w <= 0) break; } @@ -115,19 +115,19 @@ void fl_frame2(const char* s, int x, int y, int w, int h) { uchar *g = fl_gray_ramp(); if (h > 0 && w > 0) for (;*s;) { // draw bottom line: - fl_color(g[*s++]); + fl_color(g[(int)*s++]); fl_xyline(x, y+h-1, x+w-1); if (--h <= 0) break; // draw right line: - fl_color(g[*s++]); + fl_color(g[(int)*s++]); fl_yxline(x+w-1, y+h-1, y); if (--w <= 0) break; // draw top line: - fl_color(g[*s++]); + fl_color(g[(int)*s++]); fl_xyline(x, y, x+w-1); y++; if (--h <= 0) break; // draw left line: - fl_color(g[*s++]); + fl_color(g[(int)*s++]); fl_yxline(x, y+h-1, y); x++; if (--w <= 0) break; } @@ -425,5 +425,5 @@ void Fl_Widget::draw_box(Fl_Boxtype t, int X, int Y, int W, int H, Fl_Color c) c } // -// End of "$Id: fl_boxtype.cxx 7469 2010-04-07 23:17:33Z matt $". +// End of "$Id: fl_boxtype.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_call_main.c b/plugins/zynaddsubfx/fltk/src/fl_call_main.c index 2ed215037..00f349fbe 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_call_main.c +++ b/plugins/zynaddsubfx/fltk/src/fl_call_main.c @@ -1,7 +1,7 @@ /* - * "$Id: fl_call_main.c 7352 2010-03-29 10:47:11Z matt $" + * "$Id: fl_call_main.c 7903 2010-11-28 21:06:39Z matt $" * - * Copyright 1998-2009 by Bill Spitzak and others. + * Copyright 1998-2010 by Bill Spitzak and others. * * fl_call_main() calls main() for you Windows people. Needs to be done in C * because Borland C++ won't let you call main() from C++. @@ -138,6 +138,6 @@ static void dummy(void) {} #endif /* WIN32 && !FL_DLL && !__GNUC__ */ /* - * End of "$Id: fl_call_main.c 7352 2010-03-29 10:47:11Z matt $". + * End of "$Id: fl_call_main.c 7903 2010-11-28 21:06:39Z matt $". */ diff --git a/plugins/zynaddsubfx/fltk/src/fl_color.cxx b/plugins/zynaddsubfx/fltk/src/fl_color.cxx index 5946976ce..0645f1a5e 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_color.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_color.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_color.cxx 7617 2010-05-27 17:20:18Z manolo $" +// "$Id: fl_color.cxx 8384 2011-02-06 12:32:23Z manolo $" // // Color functions for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -124,22 +124,19 @@ Fl_XColor fl_xmap[1][256]; # define fl_overlay 0 # endif -/** Current color for drawing operations */ -Fl_Color fl_color_; - -void Fl_Graphics_Driver::color(Fl_Color i) { +void Fl_Xlib_Graphics_Driver::color(Fl_Color i) { if (i & 0xffffff00) { unsigned rgb = (unsigned)i; fl_color((uchar)(rgb >> 24), (uchar)(rgb >> 16), (uchar)(rgb >> 8)); } else { - fl_color_ = i; + Fl_Graphics_Driver::color(i); if(!fl_gc) return; // don't get a default gc if current window is not yet created/valid XSetForeground(fl_display, fl_gc, fl_xpixel(i)); } } -void Fl_Graphics_Driver::color(uchar r,uchar g,uchar b) { - fl_color_ = fl_rgb_color(r, g, b); +void Fl_Xlib_Graphics_Driver::color(uchar r,uchar g,uchar b) { + Fl_Graphics_Driver::color( fl_rgb_color(r, g, b) ); if(!fl_gc) return; // don't get a default gc if current window is not yet created/valid XSetForeground(fl_display, fl_gc, fl_xpixel(r,g,b)); } @@ -202,7 +199,7 @@ static inline uchar realcolor(uchar color, uchar mask) { } return result; # else - return (color&mask) | (~mask)&(mask>>1); + return (color&mask) | ( (~mask)&(mask>>1) ); # endif } @@ -361,14 +358,12 @@ void Fl::set_color(Fl_Color i, unsigned c) { #endif // end of X-specific code /** - Returns the RGB value(s) for the given FLTK color index. The - first form returns the RGB values packed in a 32-bit unsigned + Returns the RGB value(s) for the given FLTK color index. + + This form returns the RGB values packed in a 32-bit unsigned integer with the red value in the upper 8 bits, the green value in the next 8 bits, and the blue value in bits 8-15. The lower 8 bits will always be 0. - - The second form returns the red, green, and blue values - separately in referenced variables. */ unsigned Fl::get_color(Fl_Color i) { if (i & 0xffffff00) return (i); @@ -383,7 +378,14 @@ void Fl::set_color(Fl_Color i, uchar red, uchar green, uchar blue) { Fl::set_color((Fl_Color)(i & 255), ((unsigned)red<<24)+((unsigned)green<<16)+((unsigned)blue<<8)); } -/** See unsigned get_color(Fl_Color c) */ +/** + Returns the RGB value(s) for the given FLTK color index. + + This form returns the red, green, and blue values + separately in referenced variables. + + See also unsigned get_color(Fl_Color c) + */ void Fl::get_color(Fl_Color i, uchar &red, uchar &green, uchar &blue) { unsigned c; @@ -465,5 +467,5 @@ Fl_Color fl_contrast(Fl_Color fg, Fl_Color bg) { @} */ // -// End of "$Id: fl_color.cxx 7617 2010-05-27 17:20:18Z manolo $". +// End of "$Id: fl_color.cxx 8384 2011-02-06 12:32:23Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_color_mac.cxx b/plugins/zynaddsubfx/fltk/src/fl_color_mac.cxx index def0ae400..c6351c098 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_color_mac.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_color_mac.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_color_mac.cxx 7617 2010-05-27 17:20:18Z manolo $" +// "$Id: fl_color_mac.cxx 8384 2011-02-06 12:32:23Z manolo $" // // MacOS color functions for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -47,10 +47,8 @@ Fl_XMap fl_xmap[256]; Fl_XMap* fl_current_xmap; -Fl_Color fl_color_; - -void Fl_Graphics_Driver::color(Fl_Color i) { - fl_color_ = i; +void Fl_Quartz_Graphics_Driver::color(Fl_Color i) { + Fl_Graphics_Driver::color(i); int index; uchar r, g, b; if (i & 0xFFFFFF00) { @@ -74,8 +72,8 @@ void Fl_Graphics_Driver::color(Fl_Color i) { CGContextSetRGBStrokeColor(fl_gc, fr, fg, fb, 1.0f); } -void Fl_Graphics_Driver::color(uchar r, uchar g, uchar b) { - fl_color_ = fl_rgb_color(r, g, b); +void Fl_Quartz_Graphics_Driver::color(uchar r, uchar g, uchar b) { + Fl_Graphics_Driver::color( fl_rgb_color(r, g, b) ); float fr = r/255.0f; float fg = g/255.0f; float fb = b/255.0f; @@ -90,5 +88,5 @@ void Fl::set_color(Fl_Color i, unsigned c) { } // -// End of "$Id: fl_color_mac.cxx 7617 2010-05-27 17:20:18Z manolo $". +// End of "$Id: fl_color_mac.cxx 8384 2011-02-06 12:32:23Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_color_win32.cxx b/plugins/zynaddsubfx/fltk/src/fl_color_win32.cxx index 1aab0d77b..7925f2dfe 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_color_win32.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_color_win32.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_color_win32.cxx 7617 2010-05-27 17:20:18Z manolo $" +// "$Id: fl_color_win32.cxx 8384 2011-02-06 12:32:23Z manolo $" // // WIN32 color functions for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -92,14 +92,12 @@ static void set_xmap(Fl_XMap& xmap, COLORREF c) { xmap.brush = -1; } -Fl_Color fl_color_; - -void Fl_Graphics_Driver::color(Fl_Color i) { +void Fl_GDI_Graphics_Driver::color(Fl_Color i) { if (i & 0xffffff00) { unsigned rgb = (unsigned)i; fl_color((uchar)(rgb >> 24), (uchar)(rgb >> 16), (uchar)(rgb >> 8)); } else { - fl_color_ = i; + Fl_Graphics_Driver::color(i); Fl_XMap &xmap = fl_xmap[i]; if (!xmap.pen) { #if USE_COLORMAP @@ -118,10 +116,10 @@ void Fl_Graphics_Driver::color(Fl_Color i) { } } -void Fl_Graphics_Driver::color(uchar r, uchar g, uchar b) { +void Fl_GDI_Graphics_Driver::color(uchar r, uchar g, uchar b) { static Fl_XMap xmap; COLORREF c = RGB(r,g,b); - fl_color_ = fl_rgb_color(r, g, b); + Fl_Graphics_Driver::color( fl_rgb_color(r, g, b) ); if (!xmap.pen || c != xmap.rgb) { clear_xmap(xmap); set_xmap(xmap, c); @@ -250,5 +248,5 @@ fl_select_palette(void) #endif // -// End of "$Id: fl_color_win32.cxx 7617 2010-05-27 17:20:18Z manolo $". +// End of "$Id: fl_color_win32.cxx 8384 2011-02-06 12:32:23Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_cursor.cxx b/plugins/zynaddsubfx/fltk/src/fl_cursor.cxx index 2d454359c..66492551f 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_cursor.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_cursor.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_cursor.cxx 7351 2010-03-29 10:35:00Z matt $" +// "$Id: fl_cursor.cxx 8055 2010-12-18 22:31:01Z manolo $" // // Mouse cursor support for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -134,11 +134,10 @@ void Fl_Window::cursor(Fl_Cursor c, Fl_Color c1, Fl_Color c2) { # error "Either __LITTLE_ENDIAN__ or __BIG_ENDIAN__ must be defined" #endif -extern void *MACSetCursor(Fl_Cursor c); extern Fl_Offscreen fl_create_offscreen_with_alpha(int w, int h); -CGContextRef CreateHelpImage(void) +CGContextRef Fl_X::help_cursor_image(void) { int w = 20, h = 20; Fl_Offscreen off = fl_create_offscreen_with_alpha(w, h); @@ -152,7 +151,7 @@ CGContextRef CreateHelpImage(void) return (CGContextRef)off; } -CGContextRef CreateNoneImage(void) +CGContextRef Fl_X::none_cursor_image(void) { int w = 20, h = 20; Fl_Offscreen off = fl_create_offscreen_with_alpha(w, h); @@ -163,7 +162,7 @@ CGContextRef CreateNoneImage(void) return (CGContextRef)off; } -CGContextRef CreateWatchImage(void) +CGContextRef Fl_X::watch_cursor_image(void) { int w, h, r = 5; w = 2*r+6; @@ -176,19 +175,19 @@ CGContextRef CreateWatchImage(void) fl_color(FL_WHITE); fl_circle(0, 0, r+1); fl_color(FL_BLACK); - fl_rectf(-r*0.7, -r*1.7, 1.4*r, 3.4*r); + fl_rectf(int(-r*0.7), int(-r*1.7), int(1.4*r), int(3.4*r)); fl_rectf(r-1, -1, 3, 3); fl_color(FL_WHITE); fl_pie(-r, -r, 2*r, 2*r, 0, 360); fl_color(FL_BLACK); fl_circle(0,0,r); - fl_xyline(0, 0, -r*.7); - fl_xyline(0, 0, 0, -r*.7); + fl_xyline(0, 0, int(-r*.7)); + fl_xyline(0, 0, 0, int(-r*.7)); fl_end_offscreen(); return (CGContextRef)off; } -CGContextRef CreateNESWImage(void) +CGContextRef Fl_X::nesw_cursor_image(void) { int c = 7, r = 2*c; int w = r, h = r; @@ -208,7 +207,7 @@ CGContextRef CreateNESWImage(void) return (CGContextRef)off; } -CGContextRef CreateNWSEImage(void) +CGContextRef Fl_X::nwse_cursor_image(void) { int c = 7, r = 2*c; int w = r, h = r; @@ -232,10 +231,7 @@ void Fl_Window::cursor(Fl_Cursor c, Fl_Color, Fl_Color) { if (c == FL_CURSOR_DEFAULT) { c = cursor_default; } - void *cursor = MACSetCursor( c ); - if (i) { - i->cursor = cursor; - } + if (i) i->set_cursor(c); } #else @@ -333,5 +329,5 @@ void Fl_Window::cursor(Fl_Cursor c, Fl_Color fg, Fl_Color bg) { #endif // -// End of "$Id: fl_cursor.cxx 7351 2010-03-29 10:35:00Z matt $". +// End of "$Id: fl_cursor.cxx 8055 2010-12-18 22:31:01Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_curve.cxx b/plugins/zynaddsubfx/fltk/src/fl_curve.cxx index 029c05f48..2f8655232 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_curve.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_curve.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_curve.cxx 7617 2010-05-27 17:20:18Z manolo $" +// "$Id: fl_curve.cxx 7903 2010-11-28 21:06:39Z matt $" // // Bezier curve functions for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -106,5 +106,5 @@ void Fl_Graphics_Driver::curve(double X0, double Y0, } // -// End of "$Id: fl_curve.cxx 7617 2010-05-27 17:20:18Z manolo $". +// End of "$Id: fl_curve.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_diamond_box.cxx b/plugins/zynaddsubfx/fltk/src/fl_diamond_box.cxx index 34ecd89f6..4f4af9175 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_diamond_box.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_diamond_box.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_diamond_box.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: fl_diamond_box.cxx 7903 2010-11-28 21:06:39Z matt $" // // Diamond box code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -76,5 +76,5 @@ Fl_Boxtype fl_define_FL_DIAMOND_BOX() { } // -// End of "$Id: fl_diamond_box.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: fl_diamond_box.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_dnd.cxx b/plugins/zynaddsubfx/fltk/src/fl_dnd.cxx index d9eeb3b6d..701cf10a9 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_dnd.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_dnd.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_dnd.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: fl_dnd.cxx 8055 2010-12-18 22:31:01Z manolo $" // // Drag & Drop code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -28,11 +28,11 @@ #ifdef WIN32 # include "fl_dnd_win32.cxx" #elif defined(__APPLE__) -# include "fl_dnd_mac.cxx" +//# include "fl_dnd_mac.cxx" #else # include "fl_dnd_x.cxx" #endif // -// End of "$Id: fl_dnd.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: fl_dnd.cxx 8055 2010-12-18 22:31:01Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_dnd_mac.cxx b/plugins/zynaddsubfx/fltk/src/fl_dnd_mac.cxx deleted file mode 100644 index 032750412..000000000 --- a/plugins/zynaddsubfx/fltk/src/fl_dnd_mac.cxx +++ /dev/null @@ -1,58 +0,0 @@ -// -// "$Id: fl_dnd_mac.cxx 7563 2010-04-28 03:15:47Z greg.ercolano $" -// -// Drag & Drop code for the Fast Light Tool Kit (FLTK). -// -// Copyright 1998-2009 by Bill Spitzak and others. -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Library General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -// USA. -// -// Please report all bugs and problems on the following page: -// -// http://www.fltk.org/str.php - -// This file contains MacOS-specific code for fltk which is always linked -// in. Search other files for "__APPLE__" or filenames ending in _mac.cxx -// for other system-specific code. - -#include -#include -#include -#include - -// warning: this function is only implemented in Quickdraw. The function -// below may not work if FLTK is compiled with Quartz enabled - -extern EventRef fl_os_event; -extern char *fl_selection_buffer; -extern int fl_selection_length; - - -/** - * drag and drop whatever is in the cut-copy-paste buffer - * - create a selection first using: - * Fl::copy(const char *stuff, int len, 0) - */ -int Fl::dnd() -{ - extern int MACpreparedrag(void); - return MACpreparedrag(); -} - - -// -// End of "$Id: fl_dnd_mac.cxx 7563 2010-04-28 03:15:47Z greg.ercolano $". -// diff --git a/plugins/zynaddsubfx/fltk/src/fl_dnd_win32.cxx b/plugins/zynaddsubfx/fltk/src/fl_dnd_win32.cxx index 84a75b2d2..48cd9c5cb 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_dnd_win32.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_dnd_win32.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_dnd_win32.cxx 7563 2010-04-28 03:15:47Z greg.ercolano $" +// "$Id: fl_dnd_win32.cxx 8028 2010-12-14 19:46:55Z AlbrechtS $" // // Drag & Drop code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -41,8 +41,6 @@ #if defined(__CYGWIN__) #include #include -#else -#include #endif extern char *fl_selection_buffer[2]; @@ -54,9 +52,6 @@ extern unsigned int fl_codepage; Fl_Window *fl_dnd_target_window = 0; -// All of the following code requires GCC 3.x or a non-GNU compiler... -#if !defined(__GNUC__) || __GNUC__ >= 3 - #include #include #include @@ -177,6 +172,15 @@ public: HWND hwnd = fl_xid( (Fl_Window*)w ); if (fillCurrentDragData(data)) { int old_event = Fl::e_number; + char *a, *b; + a = b = currDragData; + while (*a) { // strip the CRLF pairs + if (*a == '\r' && a[1] == '\n') a++; + else *b++ = *a++; + } + *b = 0; + Fl::e_text = currDragData; + Fl::e_length = b - currDragData; Fl::belowmouse()->handle(Fl::e_number = FL_PASTE); // e_text will be invalid after this call Fl::e_number = old_event; SetForegroundWindow( hwnd ); @@ -210,20 +214,53 @@ private: // clear currDrag* for a new drag event clearCurrentDragData(); - - // fill currDrag* with ASCII data, if available + + currDragRef = data; + // fill currDrag* with UTF-8 data, if available FORMATETC fmt = { 0 }; STGMEDIUM medium = { 0 }; fmt.tymed = TYMED_HGLOBAL; fmt.dwAspect = DVASPECT_CONTENT; fmt.lindex = -1; - fmt.cfFormat = CF_TEXT; - // if it is ASCII text, return a copy of it + fmt.cfFormat = CF_UNICODETEXT; + // if it is UNICODE text, return a UTF-8-converted copy of it if ( data->GetData( &fmt, &medium )==S_OK ) { void *stuff = GlobalLock( medium.hGlobal ); - Fl::e_length = strlen((char*)stuff); - Fl::e_text = strdup((char*)stuff); + unsigned srclen = 0; + const wchar_t *wstuff = (const wchar_t *)stuff; + while (*wstuff++) srclen++; + wstuff = (const wchar_t *)stuff; + unsigned utf8len = fl_utf8fromwc(NULL, 0, wstuff, srclen); + currDragSize = utf8len; + currDragData = (char*)malloc(utf8len + 1); + fl_utf8fromwc(currDragData, currDragSize+1, wstuff, srclen+1); // include null-byte + GlobalUnlock( medium.hGlobal ); + ReleaseStgMedium( &medium ); + currDragResult = 1; + return currDragResult; + } + fmt.cfFormat = CF_TEXT; + // if it is CP1252 text, return a UTF-8-converted copy of it + if ( data->GetData( &fmt, &medium )==S_OK ) + { + int len; + char *p, *q, *last; + unsigned u; + void *stuff = GlobalLock( medium.hGlobal ); + currDragData = (char*)malloc(3 * strlen((char*)stuff) + 10); + p = (char*)stuff; + last = p + strlen(p); + q = currDragData; + while (p < last) { + u = fl_utf8decode(p, last, &len); + p += len; + len = fl_utf8encode(u, q); + q += len; + } + *q = 0; + currDragSize = q - currDragData; + currDragData = (char*)realloc(currDragData, currDragSize + 1); GlobalUnlock( medium.hGlobal ); ReleaseStgMedium( &medium ); currDragResult = 1; @@ -253,10 +290,10 @@ private: } *dst=0; - Fl::e_text = (char*) malloc(nn * 5 + 1); + currDragData = (char*) malloc(nn * 5 + 1); // Fl::e_length = fl_unicode2utf(bu, nn, Fl::e_text); - Fl::e_length = fl_utf8fromwc(Fl::e_text, (nn*5+1), bu, nn); - Fl::e_text[Fl::e_length] = 0; + currDragSize = fl_utf8fromwc(currDragData, (nn*5+1), bu, nn); + currDragData[currDragSize] = 0; free(bu); // Fl::belowmouse()->handle(FL_DROP); @@ -378,7 +415,7 @@ public: n = 0; } - ~FLEnum(void) { + virtual ~FLEnum(void) { n = 0; } }; @@ -413,16 +450,16 @@ public: delete this; return nTemp; } - // GetData currently allows ASCII text through Global Memory only + // GetData currently allows UNICODE text through Global Memory only HRESULT STDMETHODCALLTYPE GetData( FORMATETC *pformatetcIn, STGMEDIUM *pmedium ) { if ((pformatetcIn->dwAspect & DVASPECT_CONTENT) && (pformatetcIn->tymed & TYMED_HGLOBAL) && - (pformatetcIn->cfFormat == CF_TEXT)) + (pformatetcIn->cfFormat == CF_UNICODETEXT)) { - HGLOBAL gh = GlobalAlloc( GHND, fl_selection_length[0]+1 ); + int utf16_len = fl_utf8toUtf16(fl_selection_buffer[0], fl_selection_length[0], 0, 0); + HGLOBAL gh = GlobalAlloc( GHND, utf16_len * 2 + 2 ); char *pMem = (char*)GlobalLock( gh ); - memmove( pMem, fl_selection_buffer[0], fl_selection_length[0] ); - pMem[ fl_selection_length[0] ] = 0; + fl_utf8toUtf16(fl_selection_buffer[0], fl_selection_length[0], (unsigned short*)pMem, utf16_len + 1); // HGLOBAL gh = GlobalAlloc( GHND| GMEM_SHARE, // (fl_selection_length[0]+4) * sizeof(short) // + sizeof(DROPFILES)); @@ -464,7 +501,7 @@ public: { if ((pformatetc->dwAspect & DVASPECT_CONTENT) && (pformatetc->tymed & TYMED_HGLOBAL) && - (pformatetc->cfFormat == CF_TEXT)) + (pformatetc->cfFormat == CF_UNICODETEXT)) return S_OK; return DV_E_FORMATETC; } @@ -486,13 +523,6 @@ public: }; -/** - Drag and drop whatever is in the cut-copy-paste buffer. - - Create a selection first using: - - Fl::copy(const char *stuff, int len, 0) -*/ int Fl::dnd() { DWORD dropEffect; @@ -519,15 +549,7 @@ int Fl::dnd() if ( ret==DRAGDROP_S_DROP ) return 1; // or DD_S_CANCEL return 0; } -#else -int Fl::dnd() -{ - // Always indicate DnD failed when using GCC < 3... - return 1; -} -#endif // !__GNUC__ || __GNUC__ >= 3 - // -// End of "$Id: fl_dnd_win32.cxx 7563 2010-04-28 03:15:47Z greg.ercolano $". +// End of "$Id: fl_dnd_win32.cxx 8028 2010-12-14 19:46:55Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_dnd_x.cxx b/plugins/zynaddsubfx/fltk/src/fl_dnd_x.cxx index 990961659..406287524 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_dnd_x.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_dnd_x.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_dnd_x.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: fl_dnd_x.cxx 7992 2010-12-09 21:52:07Z manolo $" // // Drag & Drop code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -43,6 +43,7 @@ extern Atom fl_XdndActionCopy; extern Atom fl_XdndFinished; //extern Atom fl_XdndProxy; extern Atom fl_XdndURIList; +extern Atom fl_XaUtf8String; extern char fl_i_own_selection[2]; extern char *fl_selection_buffer[2]; @@ -87,7 +88,7 @@ static int local_handle(int event, Fl_Window* window) { int Fl::dnd() { Fl_Window *source_fl_win = Fl::first_window(); - Fl::first_window()->cursor((Fl_Cursor)21); + Fl::first_window()->cursor(FL_CURSOR_MOVE); Window source_window = fl_xid(Fl::first_window()); fl_local_grab = grabfunc; Window target_window = 0; @@ -149,7 +150,7 @@ int Fl::dnd() { } else { // Send plain text... fl_sendClientMessage(target_window, fl_XdndEnter, source_window, - dndversion<<24, XA_STRING, 0, 0); + dndversion<<24, fl_XaUtf8String, 0, 0); } } } @@ -197,5 +198,5 @@ int Fl::dnd() { // -// End of "$Id: fl_dnd_x.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: fl_dnd_x.cxx 7992 2010-12-09 21:52:07Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_draw.cxx b/plugins/zynaddsubfx/fltk/src/fl_draw.cxx index 129a74406..b88cc70da 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_draw.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_draw.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_draw.cxx 7502 2010-04-14 13:21:10Z manolo $" +// "$Id: fl_draw.cxx 8763 2011-05-30 16:08:46Z manolo $" // // Label drawing code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -32,7 +32,6 @@ // Expands all unprintable characters to ^X or \nnn notation // Aligns them against the inside of the box. -#define min(a,b) ((a)<(b)?(a):(b)) #include #include #include @@ -193,7 +192,7 @@ void fl_draw( char buf[MAXBUF]; int buflen; char symbol[2][255], *symptr; - int symwidth[2], symoffset, symtotal; + int symwidth[2], symoffset, symtotal, imgtotal; // count how many lines and put the last one into the buffer: int lines; @@ -216,23 +215,24 @@ void fl_draw( *symptr++ = *str++); *symptr = '\0'; if (isspace(*str)) str++; - symwidth[0] = min(w,h); + symwidth[0] = (w < h ? w : h); } if (str && (p = strrchr(str, '@')) != NULL && p > (str + 1) && p[-1] != '@') { strlcpy(symbol[1], p, sizeof(symbol[1])); - symwidth[1] = min(w,h); + symwidth[1] = (w < h ? w : h); } } symtotal = symwidth[0] + symwidth[1]; + imgtotal = (img && (align&FL_ALIGN_IMAGE_NEXT_TO_TEXT)) ? img->w() : 0; int strw = 0; int strh; if (str) { for (p = str, lines=0; p;) { - e = fl_expand_text(p, buf, MAXBUF, w - symtotal, buflen, width, + e = fl_expand_text(p, buf, MAXBUF, w - symtotal - imgtotal, buflen, width, align&FL_ALIGN_WRAP, draw_symbols); if (strw1) e = fl_expand_text(p, buf, MAXBUF, w - symtotal, buflen, + if (lines>1) e = fl_expand_text(p, buf, MAXBUF, w - symtotal - imgtotal, buflen, width, align&FL_ALIGN_WRAP, draw_symbols); else e = ""; @@ -441,7 +441,7 @@ void fl_measure(const char* str, int& w, int& h, int draw_symbols) { w != 0, draw_symbols); if ((int)ceil(width) > W) W = (int)ceil(width); lines++; - if (!*e || (*e == '@' && draw_symbols)) break; + if (!*e || (*e == '@' && e[1] != '@' && draw_symbols)) break; p = e; } @@ -482,5 +482,5 @@ int fl_height(int font, int size) { } // -// End of "$Id: fl_draw.cxx 7502 2010-04-14 13:21:10Z manolo $". +// End of "$Id: fl_draw.cxx 8763 2011-05-30 16:08:46Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_draw_image.cxx b/plugins/zynaddsubfx/fltk/src/fl_draw_image.cxx index cf527140d..384a4c66f 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_draw_image.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_draw_image.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_draw_image.cxx 7617 2010-05-27 17:20:18Z manolo $" +// "$Id: fl_draw_image.cxx 8731 2011-05-23 21:05:22Z AlbrechtS $" // // Image drawing routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -297,13 +297,15 @@ static void rrr_converter(const uchar *from, uchar *to, int w, int delta) { # if WORDS_BIGENDIAN # define INNARDS32(f) \ U64 *t = (U64*)to; \ - int w1 = (w+1)/2; \ - for (; w1--; from += delta) {U64 i = f; from += delta; *t++ = (i<<32)|(f);} + int w1 = w/2; \ + for (; w1--; from += delta) {U64 i = f; from += delta; *t++ = (i<<32)|(f);} \ + if (w&1) *t++ = (U64)(f)<<32; # else # define INNARDS32(f) \ U64 *t = (U64*)to; \ - int w1 = (w+1)/2; \ - for (; w1--; from += delta) {U64 i=f; from+= delta; *t++ = ((U64)(f)<<32)|i;} + int w1 = w/2; \ + for (; w1--; from += delta) {U64 i = f; from += delta; *t++ = ((U64)(f)<<32)|i;} \ + if (w&1) *t++ = (U64)(f); # endif # else # define STORETYPE U32 @@ -543,17 +545,17 @@ static void innards(const uchar *buf, int X, int Y, int W, int H, } } -void Fl_Graphics_Driver::draw_image(const uchar* buf, int x, int y, int w, int h, int d, int l){ +void Fl_Xlib_Graphics_Driver::draw_image(const uchar* buf, int x, int y, int w, int h, int d, int l){ innards(buf,x,y,w,h,d,l,(d<3&&d>-3),0,0); } -void Fl_Graphics_Driver::draw_image(Fl_Draw_Image_Cb cb, void* data, +void Fl_Xlib_Graphics_Driver::draw_image(Fl_Draw_Image_Cb cb, void* data, int x, int y, int w, int h,int d) { innards(0,x,y,w,h,d,0,(d<3&&d>-3),cb,data); } -void Fl_Graphics_Driver::draw_image_mono(const uchar* buf, int x, int y, int w, int h, int d, int l){ +void Fl_Xlib_Graphics_Driver::draw_image_mono(const uchar* buf, int x, int y, int w, int h, int d, int l){ innards(buf,x,y,w,h,d,l,1,0,0); } -void Fl_Graphics_Driver::draw_image_mono(Fl_Draw_Image_Cb cb, void* data, +void Fl_Xlib_Graphics_Driver::draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int x, int y, int w, int h,int d) { innards(0,x,y,w,h,d,0,1,cb,data); } @@ -572,5 +574,5 @@ void fl_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b) { #endif // -// End of "$Id: fl_draw_image.cxx 7617 2010-05-27 17:20:18Z manolo $". +// End of "$Id: fl_draw_image.cxx 8731 2011-05-23 21:05:22Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_draw_image_mac.cxx b/plugins/zynaddsubfx/fltk/src/fl_draw_image_mac.cxx index 0dc5e25b2..73af9927a 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_draw_image_mac.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_draw_image_mac.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_draw_image_mac.cxx 7617 2010-05-27 17:20:18Z manolo $" +// "$Id: fl_draw_image_mac.cxx 8581 2011-04-12 11:38:43Z manolo $" // // MacOS image drawing code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -30,6 +30,7 @@ #include #include #include +#include #include #define MAXBUFFER 0x40000 // 256k @@ -39,7 +40,7 @@ static void dataReleaseCB(void *info, const void *data, size_t size) delete[] (uchar *)data; } -/** +/* * draw an image based on the input parameters * * buf: image source data @@ -63,10 +64,18 @@ static void innards(const uchar *buf, int X, int Y, int W, int H, const void *array = buf; uchar *tmpBuf = 0; - if (cb) { + if (cb || Fl_Surface_Device::surface()->class_name() == Fl_Printer::class_id) { tmpBuf = new uchar[ H*W*delta ]; - for (int i=0; i-3),0,0); } -void Fl_Graphics_Driver::draw_image(Fl_Draw_Image_Cb cb, void* data, +void Fl_Quartz_Graphics_Driver::draw_image(Fl_Draw_Image_Cb cb, void* data, int x, int y, int w, int h,int d) { innards(0,x,y,w,h,d,0,(d<3&&d>-3),cb,data); } -void Fl_Graphics_Driver::draw_image_mono(const uchar* buf, int x, int y, int w, int h, int d, int l){ +void Fl_Quartz_Graphics_Driver::draw_image_mono(const uchar* buf, int x, int y, int w, int h, int d, int l){ innards(buf,x,y,w,h,d,l,1,0,0); } -void Fl_Graphics_Driver::draw_image_mono(Fl_Draw_Image_Cb cb, void* data, +void Fl_Quartz_Graphics_Driver::draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int x, int y, int w, int h,int d) { innards(0,x,y,w,h,d,0,1,cb,data); } @@ -169,5 +172,5 @@ void fl_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b) { } // -// End of "$Id: fl_draw_image_mac.cxx 7617 2010-05-27 17:20:18Z manolo $". +// End of "$Id: fl_draw_image_mac.cxx 8581 2011-04-12 11:38:43Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_draw_image_win32.cxx b/plugins/zynaddsubfx/fltk/src/fl_draw_image_win32.cxx index e5eb86012..625112ab7 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_draw_image_win32.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_draw_image_win32.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_draw_image_win32.cxx 7617 2010-05-27 17:20:18Z manolo $" +// "$Id: fl_draw_image_win32.cxx 8294 2011-01-20 12:55:50Z manolo $" // // WIN32 image drawing code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -174,13 +174,14 @@ static void innards(const uchar *buf, int X, int Y, int W, int H, int linesize = (pixelsize*w+3)&~3; static U32* buffer; + static long buffer_size; int blocking = h; {int size = linesize*h; - if (size > MAXBUFFER) { + // when printing, don't limit buffer size not to get a crash in StretchDIBits + if (size > MAXBUFFER && Fl_Surface_Device::surface()->class_name() != Fl_Printer::class_id) { size = MAXBUFFER; blocking = MAXBUFFER/linesize; } - static long buffer_size; if (size > buffer_size) { delete[] buffer; buffer_size = size; @@ -255,7 +256,7 @@ static void innards(const uchar *buf, int X, int Y, int W, int H, } } } - if(Fl_Surface_Device::surface()->type() == Fl_Printer::device_type) { + if(Fl_Surface_Device::surface()->class_name() == Fl_Printer::class_id) { // if print context, device and logical units are not equal, so SetDIBitsToDevice // does not do the expected job, whereas StretchDIBits does it. StretchDIBits(fl_gc, x, y+j-k, w, k, 0, 0, w, k, @@ -267,6 +268,9 @@ static void innards(const uchar *buf, int X, int Y, int W, int H, DIB_RGB_COLORS #endif , SRCCOPY ); + delete[] buffer; + buffer = NULL; + buffer_size = 0; } else { SetDIBitsToDevice(fl_gc, x, y+j-k, w, k, 0, 0, 0, k, @@ -284,7 +288,7 @@ static void innards(const uchar *buf, int X, int Y, int W, int H, static int fl_abs(int v) { return v<0 ? -v : v; } -void Fl_Graphics_Driver::draw_image(const uchar* buf, int x, int y, int w, int h, int d, int l){ +void Fl_GDI_Graphics_Driver::draw_image(const uchar* buf, int x, int y, int w, int h, int d, int l){ if (fl_abs(d)&FL_IMAGE_WITH_ALPHA) { d ^= FL_IMAGE_WITH_ALPHA; innards(buf,x,y,w,h,d,l,fl_abs(d),0,0); @@ -293,7 +297,7 @@ void Fl_Graphics_Driver::draw_image(const uchar* buf, int x, int y, int w, int h } } -void Fl_Graphics_Driver::draw_image(Fl_Draw_Image_Cb cb, void* data, +void Fl_GDI_Graphics_Driver::draw_image(Fl_Draw_Image_Cb cb, void* data, int x, int y, int w, int h,int d) { if (fl_abs(d)&FL_IMAGE_WITH_ALPHA) { d ^= FL_IMAGE_WITH_ALPHA; @@ -303,7 +307,7 @@ void Fl_Graphics_Driver::draw_image(Fl_Draw_Image_Cb cb, void* data, } } -void Fl_Graphics_Driver::draw_image_mono(const uchar* buf, int x, int y, int w, int h, int d, int l){ +void Fl_GDI_Graphics_Driver::draw_image_mono(const uchar* buf, int x, int y, int w, int h, int d, int l){ if (fl_abs(d)&FL_IMAGE_WITH_ALPHA) { d ^= FL_IMAGE_WITH_ALPHA; innards(buf,x,y,w,h,d,l,1,0,0); @@ -312,7 +316,7 @@ void Fl_Graphics_Driver::draw_image_mono(const uchar* buf, int x, int y, int w, } } -void Fl_Graphics_Driver::draw_image_mono(Fl_Draw_Image_Cb cb, void* data, +void Fl_GDI_Graphics_Driver::draw_image_mono(Fl_Draw_Image_Cb cb, void* data, int x, int y, int w, int h,int d) { if (fl_abs(d)&FL_IMAGE_WITH_ALPHA) { d ^= FL_IMAGE_WITH_ALPHA; @@ -337,5 +341,5 @@ void fl_rectf(int x, int y, int w, int h, uchar r, uchar g, uchar b) { } // -// End of "$Id: fl_draw_image_win32.cxx 7617 2010-05-27 17:20:18Z manolo $". +// End of "$Id: fl_draw_image_win32.cxx 8294 2011-01-20 12:55:50Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_draw_pixmap.cxx b/plugins/zynaddsubfx/fltk/src/fl_draw_pixmap.cxx index c9debb5c6..68f7df6f1 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_draw_pixmap.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_draw_pixmap.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_draw_pixmap.cxx 7659 2010-07-01 13:21:32Z manolo $" +// "$Id: fl_draw_pixmap.cxx 8362 2011-02-02 18:39:34Z manolo $" // // Pixmap drawing code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -63,7 +63,7 @@ int fl_measure_pixmap(/*const*/ char* const* data, int &w, int &h) { int fl_measure_pixmap(const char * const *cdata, int &w, int &h) { int i = sscanf(cdata[0],"%d%d%d%d",&w,&h,&ncolors,&chars_per_pixel); if (i<4 || w<=0 || h<=0 || - chars_per_pixel!=1 && chars_per_pixel!=2) return w=0; + (chars_per_pixel!=1 && chars_per_pixel!=2) ) return w=0; return 1; } @@ -341,7 +341,7 @@ int fl_draw_pixmap(const char*const* cdata, int x, int y, Fl_Color bg) { #endif #ifdef __APPLE_QUARTZ__ - if (fl_graphics_driver->type() == Fl_Quartz_Graphics_Driver::device_type ) { + if (fl_graphics_driver->class_name() == Fl_Quartz_Graphics_Driver::class_id ) { bool transparent = (transparent_index>=0); transparent = true; U32 *array = new U32[d.w * d.h], *q = array; @@ -370,7 +370,7 @@ int fl_draw_pixmap(const char*const* cdata, int x, int y, Fl_Color bg) { CGContextDrawImage(fl_gc, rect, img); Fl_X::q_end_image(); CGImageRelease(img); - delete array; + delete[] array; } else { #endif // __APPLE_QUARTZ__ @@ -425,5 +425,5 @@ int fl_draw_pixmap(const char*const* cdata, int x, int y, Fl_Color bg) { } // -// End of "$Id: fl_draw_pixmap.cxx 7659 2010-07-01 13:21:32Z manolo $". +// End of "$Id: fl_draw_pixmap.cxx 8362 2011-02-02 18:39:34Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_encoding_latin1.cxx b/plugins/zynaddsubfx/fltk/src/fl_encoding_latin1.cxx index 0cad05914..bac531164 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_encoding_latin1.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_encoding_latin1.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_encoding_latin1.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: fl_encoding_latin1.cxx 7903 2010-11-28 21:06:39Z matt $" // // Convert MSWindows-1252 (Latin-1) encoded text to the local encoding. // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -133,5 +133,5 @@ const char *fl_local_to_latin1(const char *t, int) #endif // -// End of "$Id: fl_encoding_latin1.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: fl_encoding_latin1.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_encoding_mac_roman.cxx b/plugins/zynaddsubfx/fltk/src/fl_encoding_mac_roman.cxx index e8713fa33..45d61153e 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_encoding_mac_roman.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_encoding_mac_roman.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_encoding_mac_roman.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: fl_encoding_mac_roman.cxx 7903 2010-11-28 21:06:39Z matt $" // // Convert Mac Roman encoded text to the local encoding. // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -130,5 +130,5 @@ const char *fl_mac_roman_to_local(const char *t, int n) #endif // -// End of "$Id: fl_encoding_mac_roman.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: fl_encoding_mac_roman.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_engraved_label.cxx b/plugins/zynaddsubfx/fltk/src/fl_engraved_label.cxx index 6a8857f71..bd0af8965 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_engraved_label.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_engraved_label.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_engraved_label.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: fl_engraved_label.cxx 7903 2010-11-28 21:06:39Z matt $" // // Engraved label drawing routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -89,5 +89,5 @@ Fl_Labeltype fl_define_FL_EMBOSSED_LABEL() { } // -// End of "$Id: fl_engraved_label.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: fl_engraved_label.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_file_dir.cxx b/plugins/zynaddsubfx/fltk/src/fl_file_dir.cxx index ee11f7531..a96070a12 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_file_dir.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_file_dir.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_file_dir.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: fl_file_dir.cxx 8345 2011-01-31 18:04:09Z manolo $" // // File chooser widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -45,39 +45,45 @@ static void callback(Fl_File_Chooser *, void*) { /** \addtogroup group_comdlg @{ */ -/** \relatesalso Fl_File_Chooser +/** Set the file chooser callback + \note \#include + \relates Fl_File_Chooser */ void fl_file_chooser_callback(void (*cb)(const char*)) { current_callback = cb; } -/** \relatesalso Fl_File_Chooser +/** Set the "OK" button label + \note \#include + \relates Fl_File_Chooser */ void fl_file_chooser_ok_label(const char *l) { if (l) current_label = l; else current_label = fl_ok; } -/** \relates Fl_File_Chooser +/** Shows a file chooser dialog and gets a filename. + \note \#include \image html Fl_File_Chooser.jpg - \image latex Fl_File_Chooser.eps "Fl_File_Chooser" width=12cm + \image latex Fl_File_Chooser.jpg "Fl_File_Chooser" width=12cm \param[in] message text in title bar \param[in] pat filename pattern filter \param[in] fname initial/default filename selection \param[in] relative 0 for absolute path name, relative path name otherwise \return the user selected filename, in absolute or relative format or NULL if user cancels + \relates Fl_File_Chooser */ char * // O - Filename or NULL fl_file_chooser(const char *message, // I - Message in titlebar const char *pat, // I - Filename pattern const char *fname, // I - Initial filename selection int relative) { // I - 0 for absolute path - static char retname[1024]; // Returned filename + static char retname[FL_PATH_MAX]; // Returned filename if (!fc) { if (!fname || !*fname) fname = "."; @@ -146,20 +152,20 @@ fl_file_chooser(const char *message, // I - Message in titlebar else return 0; } -/** \relates Fl_File_Chooser - Shows a file chooser dialog and gets a directory. +/** Shows a file chooser dialog and gets a directory. + \note \#include \param[in] message title bar text \param[in] fname initial/default directory name \param[in] relative 0 for absolute path return, relative otherwise \return the directory path string chosen by the user or NULL if user cancels + \relates Fl_File_Chooser */ - char * // O - Directory or NULL fl_dir_chooser(const char *message, // I - Message for titlebar const char *fname, // I - Initial directory name int relative) // I - 0 for absolute { - static char retname[1024]; // Returned directory name + static char retname[FL_PATH_MAX]; // Returned directory name if (!fc) { if (!fname || !*fname) fname = "."; @@ -190,5 +196,5 @@ fl_dir_chooser(const char *message, // I - Message for titlebar // -// End of "$Id: fl_file_dir.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: fl_file_dir.cxx 8345 2011-01-31 18:04:09Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_font.cxx b/plugins/zynaddsubfx/fltk/src/fl_font.cxx index 7bde16909..e208ed792 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_font.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_font.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_font.cxx 6779 2009-04-24 09:28:30Z yuri $" +// "$Id: fl_font.cxx 8722 2011-05-23 16:06:13Z ianmacarthur $" // // Font selection code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -26,14 +26,20 @@ // #ifdef WIN32 -#ifndef WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN -#endif +# ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +# endif /* We require Windows 2000 features such as GetGlyphIndices */ # if !defined(WINVER) || (WINVER < 0x0500) +# ifdef WINVER +# undef WINVER +# endif # define WINVER 0x0500 # endif # if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500) +# ifdef _WIN32_WINNT +# undef _WIN32_WINNT +# endif # define _WIN32_WINNT 0x0500 # endif #endif @@ -81,11 +87,13 @@ void fl_text_extents(const char *c, int &dx, int &dy, int &w, int &h) { } // fl_text_extents -#if !USE_XFT && !__APPLE__ void fl_draw(const char* str, int l, float x, float y) { +#ifdef __APPLE__ + fl_graphics_driver->draw(str, l, x, y); +#else fl_draw(str, l, (int)x, (int)y); -} #endif +} // -// End of "$Id: fl_font.cxx 6779 2009-04-24 09:28:30Z yuri $". +// End of "$Id: fl_font.cxx 8722 2011-05-23 16:06:13Z ianmacarthur $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_font_mac.cxx b/plugins/zynaddsubfx/fltk/src/fl_font_mac.cxx index 3a07767ce..b65de069f 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_font_mac.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_font_mac.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_font_mac.cxx 7659 2010-07-01 13:21:32Z manolo $" +// "$Id: fl_font_mac.cxx 8597 2011-04-17 13:18:55Z ianmacarthur $" // // MacOS font selection routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -30,11 +30,10 @@ /* from fl_utf.c */ extern unsigned fl_utf8toUtf16(const char* src, unsigned srclen, unsigned short* dst, unsigned dstlen); -// if no font has been selected yet by the user, get one. -#define check_default_font() {if (!fl_fontsize) fl_font(0, 12);} - -static const CGAffineTransform font_mx = { 1, 0, 0, -1, 0, 0 }; -static SInt32 MACsystemVersion = 0; +static CGAffineTransform font_mx = { 1, 0, 0, -1, 0, 0 }; +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 +static CFMutableDictionaryRef attributes = NULL; +#endif Fl_Font_Descriptor::Fl_Font_Descriptor(const char* name, Fl_Fontsize Size) { next = 0; @@ -46,11 +45,8 @@ Fl_Font_Descriptor::Fl_Font_Descriptor(const char* name, Fl_Fontsize Size) { // OpenGL needs those for its font handling q_name = strdup(name); size = Size; - minsize = maxsize = Size; #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 - if(MACsystemVersion == 0) Gestalt(gestaltSystemVersion, &MACsystemVersion); - -if(MACsystemVersion >= 0x1050) {//unfortunately, CTFontCreateWithName != NULL on 10.4 also! +if (fl_mac_os_version >= 100500) {//unfortunately, CTFontCreateWithName != NULL on 10.4 also! CFStringRef str = CFStringCreateWithCString(NULL, name, kCFStringEncodingUTF8); fontref = CTFontCreateWithName(str, size, NULL); CGGlyph glyph[2]; @@ -60,8 +56,8 @@ if(MACsystemVersion >= 0x1050) {//unfortunately, CTFontCreateWithName != NULL on double w; CTFontGetAdvancesForGlyphs(fontref, kCTFontHorizontalOrientation, glyph, advances, 2); w = advances[0].width; - if( abs(advances[0].width - advances[1].width) < 1E-2 ) {//this is a fixed-width font - //slightly rescale fixed-width fonts so the character width has an integral value + if ( abs(advances[0].width - advances[1].width) < 1E-2 ) {//this is a fixed-width font + // slightly rescale fixed-width fonts so the character width has an integral value CFRelease(fontref); CGFloat fsize = size / ( w/floor(w + 0.5) ); fontref = CTFontCreateWithName(str, fsize, NULL); @@ -71,7 +67,31 @@ if(MACsystemVersion >= 0x1050) {//unfortunately, CTFontCreateWithName != NULL on ascent = (short)(CTFontGetAscent(fontref) + 0.5); descent = (short)(CTFontGetDescent(fontref) + 0.5); q_width = w + 0.5; + for (unsigned i = 0; i < sizeof(width)/sizeof(float*); i++) width[i] = NULL; + if (!attributes) { + static CFNumberRef zero_ref; + float zero = 0.; + zero_ref = CFNumberCreate(NULL, kCFNumberFloat32Type, &zero); + // deactivate kerning for all fonts, so that string width = sum of character widths + // which allows fast fl_width() implementation. + attributes = CFDictionaryCreateMutable(kCFAllocatorDefault, + 3, + &kCFTypeDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + CFDictionarySetValue (attributes, kCTKernAttributeName, zero_ref); } + if (ascent == 0) { // this may happen with some third party fonts + CFDictionarySetValue (attributes, kCTFontAttributeName, fontref); + CFAttributedStringRef mastr = CFAttributedStringCreate(kCFAllocatorDefault, CFSTR("Wj"), attributes); + CTLineRef ctline = CTLineCreateWithAttributedString(mastr); + CFRelease(mastr); + CGFloat fascent, fdescent; + CTLineGetTypographicBounds(ctline, &fascent, &fdescent, NULL); + CFRelease(ctline); + ascent = (short)(fascent + 0.5); + descent = (short)(fdescent + 0.5); + } +} else { #endif #if ! __LP64__ @@ -109,7 +129,6 @@ else { ATSUFindFontFromName(name, strlen(name), kFontFullName, kFontMacintoshPlatform, kFontRomanScript, kFontEnglishLanguage, &fontID); // draw the font upside-down... Compensate for fltk/OSX origin differences - static CGAffineTransform font_mx = { 1, 0, 0, -1, 0, 0 }; ATSUAttributeTag sTag[] = { kATSUFontTag, kATSUSizeTag, kATSUFontMatrixTag }; ByteCount sBytes[] = { sizeof(ATSUFontID), sizeof(Fixed), sizeof(CGAffineTransform) }; ATSUAttributeValuePtr sAttr[] = { &fontID, &fsize, &font_mx }; @@ -129,8 +148,8 @@ else { float fa = -FixedToFloat(bAscent), fd = -FixedToFloat(bDescent); if (fa>0.0f && fd>0.0f) { //float f = Size/(fa+fd); - ascent = fa; //int(fa*f+0.5f); - descent = fd; //Size - ascent; + ascent = int(fa); //int(fa*f+0.5f); + descent = int(fd); //Size - ascent; } int w = FixedToInt(bAfter); if (w) @@ -149,8 +168,6 @@ else { #endif } -Fl_Font_Descriptor* fl_fontsize = 0L; - Fl_Font_Descriptor::~Fl_Font_Descriptor() { /* #if HAVE_GL @@ -166,12 +183,14 @@ Fl_Font_Descriptor::~Fl_Font_Descriptor() { // } #endif */ - if (this == fl_fontsize) fl_fontsize = 0; + if (this == fl_graphics_driver->font_descriptor()) fl_graphics_driver->font_descriptor(NULL); #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 - if(MACsystemVersion >= 0x1050) CFRelease(fontref); -#else - /* ATSUDisposeTextLayout(layout); - ATSUDisposeStyle(style); */ + if (fl_mac_os_version >= 100500) { + CFRelease(fontref); + for (unsigned i = 0; i < sizeof(width)/sizeof(float*); i++) { + if (width[i]) free(width[i]); + } + } #endif } @@ -202,10 +221,10 @@ static unsigned utfWlen = 0; static UniChar *mac_Utf8_to_Utf16(const char *txt, int len, int *new_len) { unsigned wlen = fl_utf8toUtf16(txt, len, (unsigned short*)utfWbuf, utfWlen); - if(wlen >= utfWlen) + if (wlen >= utfWlen) { utfWlen = wlen + 100; - if(utfWbuf) free(utfWbuf); + if (utfWbuf) free(utfWbuf); utfWbuf = (UniChar*)malloc((utfWlen)*sizeof(UniChar)); wlen = fl_utf8toUtf16(txt, len, (unsigned short*)utfWbuf, utfWlen); } @@ -215,17 +234,12 @@ static UniChar *mac_Utf8_to_Utf16(const char *txt, int len, int *new_len) Fl_Fontdesc* fl_fonts = built_in_table; -void fl_font(Fl_Font_Descriptor* s) { - fl_fontsize = s; - // we will use fl_fontsize later to access the required style and layout -} - static Fl_Font_Descriptor* find(Fl_Font fnum, Fl_Fontsize size) { Fl_Fontdesc* s = fl_fonts+fnum; if (!s->name) s = fl_fonts; // use 0 if fnum undefined Fl_Font_Descriptor* f; for (f = s->first; f; f = f->next) - if (f->minsize <= size && f->maxsize >= size) return f; + if (f->size == size) return f; f = new Fl_Font_Descriptor(s->name, size); f->next = s->first; s->first = f; @@ -235,75 +249,118 @@ static Fl_Font_Descriptor* find(Fl_Font fnum, Fl_Fontsize size) { //////////////////////////////////////////////////////////////// // Public interface: -Fl_Font fl_font_ = 0; -Fl_Fontsize fl_size_ = 0; - - -void Fl_Graphics_Driver::font(Fl_Font fnum, Fl_Fontsize size) { +void Fl_Quartz_Graphics_Driver::font(Fl_Font fnum, Fl_Fontsize size) { if (fnum==-1) { - fl_font_ = 0; - fl_size_ = 0; + Fl_Graphics_Driver::font(0, 0); return; } - fl_font_ = fnum; - fl_size_ = size; - fl_font(find(fnum, size)); + Fl_Graphics_Driver::font(fnum, size); + this->font_descriptor( find(fnum, size) ); } -int fl_height() { - check_default_font(); - if (fl_fontsize) return fl_fontsize->ascent+fl_fontsize->descent; - else return -1; +int Fl_Quartz_Graphics_Driver::height() { + if (!font_descriptor()) font(FL_HELVETICA, FL_NORMAL_SIZE); + Fl_Font_Descriptor *fl_fontsize = font_descriptor(); + return fl_fontsize->ascent + fl_fontsize->descent; } -int fl_descent() { - check_default_font(); - if (fl_fontsize) - return fl_fontsize->descent+1; - else return -1; +int Fl_Quartz_Graphics_Driver::descent() { + if (!font_descriptor()) font(FL_HELVETICA, FL_NORMAL_SIZE); + Fl_Font_Descriptor *fl_fontsize = font_descriptor(); + return fl_fontsize->descent+1; } -double fl_width(const UniChar* txt, int n) { - check_default_font(); - if (!fl_fontsize) { - check_default_font(); // avoid a crash! - if (!fl_fontsize) - return 8*n; // user must select a font first! - } #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -if(MACsystemVersion >= 0x1050) { - CTFontRef fontref = fl_fontsize->fontref; - CFStringRef str = CFStringCreateWithBytes(NULL, (const UInt8*)txt, n * sizeof(UniChar), kCFStringEncodingUTF16, false); - CFAttributedStringRef astr = CFAttributedStringCreate(NULL, str, NULL); - CFMutableAttributedStringRef mastr = CFAttributedStringCreateMutableCopy(NULL, 0, astr); - CFRelease(astr); - CFAttributedStringSetAttribute(mastr, CFRangeMake(0, CFStringGetLength(str)), kCTFontAttributeName, fontref); - CFRelease(str); - CTLineRef ctline = CTLineCreateWithAttributedString(mastr); - CFRelease(mastr); - double retval = CTLineGetTypographicBounds(ctline, NULL, NULL, NULL); - CFRelease(ctline); - return retval; +// returns width of a pair of UniChar's in the surrogate range +static CGFloat surrogate_width(const UniChar *txt, Fl_Font_Descriptor *fl_fontsize) +{ + CTFontRef font2 = fl_fontsize->fontref; + bool must_release = false; + CGGlyph glyphs[2]; + bool b = CTFontGetGlyphsForCharacters(font2, txt, glyphs, 2); + CGSize a; + if(!b) { // the current font doesn't contain this char + CFStringRef str = CFStringCreateWithCharactersNoCopy(NULL, txt, 2, kCFAllocatorNull); + // find a font that contains it + font2 = CTFontCreateForString(font2, str, CFRangeMake(0,2)); + must_release = true; + CFRelease(str); + b = CTFontGetGlyphsForCharacters(font2, txt, glyphs, 2); } -else { + if (b) CTFontGetAdvancesForGlyphs(font2, kCTFontHorizontalOrientation, glyphs, &a, 1); + else a.width = fl_fontsize->q_width; + if(must_release) CFRelease(font2); + return a.width; +} +#endif + +static double fl_mac_width(const UniChar* txt, int n, Fl_Font_Descriptor *fl_fontsize) { +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 +if (fl_mac_os_version >= 100500) { + double retval = 0; + UniChar uni; + int i; + for (i = 0; i < n; i++) { // loop over txt + uni = txt[i]; + if (uni >= 0xD800 && uni <= 0xDBFF) { // handles the surrogate range + retval += surrogate_width(&txt[i], fl_fontsize); + i++; // because a pair of UniChar's represent a single character + continue; + } + const int block = 0x10000 / (sizeof(fl_fontsize->width)/sizeof(float*)); // block size + // r: index of the character block containing uni + unsigned int r = uni >> 7; // change 7 if sizeof(width) is changed + if (!fl_fontsize->width[r]) { // this character block has not been hit yet +//fprintf(stderr,"r=%d size=%d name=%s\n",r,fl_fontsize->size, fl_fontsize->q_name); + // allocate memory to hold width of each character in the block + fl_fontsize->width[r] = (float*) malloc(sizeof(float) * block); + UniChar ii = r * block; + CGSize advance_size; + CGGlyph glyph; + for (int j = 0; j < block; j++) { // loop over the block + CTFontRef font2 = fl_fontsize->fontref; + bool must_release = false; + // ii spans all characters of this block + bool b = CTFontGetGlyphsForCharacters(font2, &ii, &glyph, 1); + if (!b) { // the current font doesn't contain this char + CFStringRef str = CFStringCreateWithCharactersNoCopy(NULL, &ii, 1, kCFAllocatorNull); + // find a font that contains it + font2 = CTFontCreateForString(font2, str, CFRangeMake(0,1)); + must_release = true; + CFRelease(str); + b = CTFontGetGlyphsForCharacters(font2, &ii, &glyph, 1); + } + if (b) CTFontGetAdvancesForGlyphs(font2, kCTFontHorizontalOrientation, &glyph, &advance_size, 1); + else advance_size.width = 0.; + // the width of one character of this block of characters + fl_fontsize->width[r][j] = advance_size.width; + if (must_release) CFRelease(font2); + ii++; + } + } + // sum the widths of all characters of txt + retval += fl_fontsize->width[r][uni & (block-1)]; + } + return retval; +} else { #endif #if ! __LP64__ - OSStatus err; + OSStatus err; Fixed bBefore, bAfter, bAscent, bDescent; ATSUTextLayout layout; ByteCount iSize; ATSUAttributeTag iTag; ATSUAttributeValuePtr iValuePtr; -// Here's my ATSU text measuring attempt... This seems to do the Right Thing + // Here's my ATSU text measuring attempt... This seems to do the Right Thing // now collect our ATSU resources and measure our text string layout = fl_fontsize->layout; - // activate the current GC + // activate the current GC iSize = sizeof(CGContextRef); iTag = kATSUCGContextTag; iValuePtr = &fl_gc; - ATSUSetLayoutControls(layout, 1, &iTag, &iSize, &iValuePtr); - // now measure the bounding box + ATSUSetLayoutControls(layout, 1, &iTag, &iSize, &iValuePtr); + // now measure the bounding box err = ATSUSetTextPointerLocation(layout, txt, kATSUFromTextBeginning, n, n); err = ATSUGetUnjustifiedBounds(layout, kATSUFromTextBeginning, n, &bBefore, &bAfter, &bAscent, &bDescent); // If err is OK then return length, else return 0. Or something... @@ -313,40 +370,43 @@ else { #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 } #endif - return 0; // FIXME: I do not understand the shuffeling of the above ifdef's and why they are here! + return 0; } -double fl_width(const char* txt, int n) { +double Fl_Quartz_Graphics_Driver::width(const char* txt, int n) { int wc_len = n; UniChar *uniStr = mac_Utf8_to_Utf16(txt, n, &wc_len); - return fl_width(uniStr, wc_len); + if (!font_descriptor()) font(FL_HELVETICA, FL_NORMAL_SIZE); + return fl_mac_width(uniStr, wc_len, font_descriptor()); } -double fl_width(uchar c) { - return fl_width((const char*)(&c), 1); -} +double Fl_Quartz_Graphics_Driver::width(unsigned int wc) { + if (!font_descriptor()) font(FL_HELVETICA, FL_NORMAL_SIZE); -double fl_width(unsigned int wc) { - return fl_width((const UniChar*)(&wc), 1); + UniChar utf16[3]; + int l = 1; + if (wc <= 0xFFFF) { + *utf16 = wc; + } + else { +// char buf[4]; +// l = fl_utf8encode(wc, buf); +// l = (int)fl_utf8toUtf16(buf, l, utf16, 3); + l = (int)fl_ucs_to_Utf16(wc, utf16, 3); + } + return fl_mac_width(utf16, l, font_descriptor()); } // text extent calculation -void fl_text_extents(const UniChar* txt, int n, int &dx, int &dy, int &w, int &h) { - if (!fl_fontsize) { - check_default_font(); // avoid a crash! - if (!fl_fontsize) - w = 8.0 * n; // user must select a font first! - h = 8.0; - return; - } +void Fl_Quartz_Graphics_Driver::text_extents(const char *str8, int n, int &dx, int &dy, int &w, int &h) { + if (!font_descriptor()) font(FL_HELVETICA, FL_NORMAL_SIZE); + Fl_Font_Descriptor *fl_fontsize = font_descriptor(); + UniChar *txt = mac_Utf8_to_Utf16(str8, n, &n); #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -if(MACsystemVersion >= 0x1050) { - CTFontRef fontref = fl_fontsize->fontref; - CFStringRef str16 = CFStringCreateWithBytes(NULL, (const UInt8*)txt, n *sizeof(UniChar), kCFStringEncodingUTF16, false); - CFAttributedStringRef astr = CFAttributedStringCreate(NULL, str16, NULL); - CFMutableAttributedStringRef mastr = CFAttributedStringCreateMutableCopy(NULL, 0, astr); - CFRelease(astr); - CFAttributedStringSetAttribute(mastr, CFRangeMake(0, CFStringGetLength(str16)), kCTFontAttributeName, fontref); +if (fl_mac_os_version >= 100500) { + CFStringRef str16 = CFStringCreateWithCharactersNoCopy(NULL, txt, n, kCFAllocatorNull); + CFDictionarySetValue (attributes, kCTFontAttributeName, fl_fontsize->fontref); + CFAttributedStringRef mastr = CFAttributedStringCreate(kCFAllocatorDefault, str16, attributes); CFRelease(str16); CTLineRef ctline = CTLineCreateWithAttributedString(mastr); CFRelease(mastr); @@ -393,65 +453,32 @@ else { return; } // fl_text_extents -void fl_text_extents(const char *c, int n, int &dx, int &dy, int &w, int &h) { - int wc_len = n; - UniChar *uniStr = mac_Utf8_to_Utf16(c, n, &wc_len); - fl_text_extents(uniStr, wc_len, dx, dy, w, h); -} // fl_text_extents - - -void fl_draw(const char *str, int n, float x, float y); - -void Fl_Graphics_Driver::draw(const char* str, int n, int x, int y) { - fl_draw(str, n, (float)x-0.0f, (float)y+0.5f); -} - - +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 static CGColorRef flcolortocgcolor(Fl_Color i) { uchar r, g, b; Fl::get_color(i, r, g, b); CGFloat components[4] = {r/255.0f, g/255.0f, b/255.0f, 1.}; static CGColorSpaceRef cspace = NULL; - if(cspace == NULL) { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 + if (cspace == NULL) { cspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB); -#else - cspace = CGColorSpaceCreateWithName(kCGColorSpaceUserRGB); -#endif } return CGColorCreate(cspace, components); } +#endif -void fl_draw(const char *str, int n, float x, float y) { - - if(fl_graphics_driver->type() != Fl_Quartz_Graphics_Driver::device_type) { - fl_graphics_driver->draw(str, n, (int)x, (int)y ); - return; - } - // avoid a crash if no font has been selected by user yet ! - check_default_font(); +static void fl_mac_draw(const char *str, int n, float x, float y, Fl_Graphics_Driver *driver) { // convert to UTF-16 first UniChar *uniStr = mac_Utf8_to_Utf16(str, n, &n); #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 - if(MACsystemVersion >= 0x1050) { - CFStringRef keys[2]; - CFTypeRef values[2]; - CFStringRef str16 = CFStringCreateWithBytes(NULL, (const UInt8*)uniStr, n * sizeof(UniChar), kCFStringEncodingUTF16, false); - CGColorRef color = flcolortocgcolor(fl_color()); - keys[0] = kCTFontAttributeName; - keys[1] = kCTForegroundColorAttributeName; - values[0] = fl_fontsize->fontref; - values[1] = color; - CFDictionaryRef attributes = CFDictionaryCreate(kCFAllocatorDefault, - (const void**)&keys, - (const void**)&values, - 2, - &kCFTypeDictionaryKeyCallBacks, - &kCFTypeDictionaryValueCallBacks); + if (fl_mac_os_version >= 100500) { + CFStringRef str16 = CFStringCreateWithCharactersNoCopy(NULL, uniStr, n, kCFAllocatorNull); + if (str16 == NULL) return; // shd not happen + CGColorRef color = flcolortocgcolor(driver->color()); + CFDictionarySetValue (attributes, kCTFontAttributeName, driver->font_descriptor()->fontref); + CFDictionarySetValue (attributes, kCTForegroundColorAttributeName, color); CFAttributedStringRef mastr = CFAttributedStringCreate(kCFAllocatorDefault, str16, attributes); CFRelease(str16); - CFRelease(attributes); CFRelease(color); CTLineRef ctline = CTLineCreateWithAttributedString(mastr); CFRelease(mastr); @@ -461,13 +488,12 @@ void fl_draw(const char *str, int n, float x, float y) { CTLineDraw(ctline, fl_gc); CGContextSetShouldAntialias(fl_gc, false); CFRelease(ctline); - } - else { + } else { #endif #if ! __LP64__ OSStatus err; // now collect our ATSU resources - ATSUTextLayout layout = fl_fontsize->layout; + ATSUTextLayout layout = driver->font_descriptor()->layout; ByteCount iSize = sizeof(CGContextRef); ATSUAttributeTag iTag = kATSUCGContextTag; @@ -484,18 +510,32 @@ void fl_draw(const char *str, int n, float x, float y) { #endif } -void Fl_Graphics_Driver::draw(int angle, const char *str, int n, int x, int y) { +void Fl_Quartz_Graphics_Driver::draw(const char *str, int n, float x, float y) { + // avoid a crash if no font has been selected by user yet ! + if (!font_descriptor()) font(FL_HELVETICA, FL_NORMAL_SIZE); + fl_mac_draw(str, n, x, y, this); +} + +void Fl_Quartz_Graphics_Driver::draw(const char* str, int n, int x, int y) { + // avoid a crash if no font has been selected by user yet ! + if (!font_descriptor()) font(FL_HELVETICA, FL_NORMAL_SIZE); + fl_mac_draw(str, n, (float)x-0.0f, (float)y+0.5f, this); +} + +void Fl_Quartz_Graphics_Driver::draw(int angle, const char *str, int n, int x, int y) { CGContextSaveGState(fl_gc); CGContextTranslateCTM(fl_gc, x, y); CGContextRotateCTM(fl_gc, - angle*(M_PI/180) ); - fl_draw(str, n, (float)0., (float)0.); + draw(str, n, 0, 0); CGContextRestoreGState(fl_gc); } -void Fl_Graphics_Driver::rtl_draw(const char* c, int n, int x, int y) { - draw(c, n, x - fl_width(c, n), y); +void Fl_Quartz_Graphics_Driver::rtl_draw(const char* c, int n, int x, int y) { + int dx, dy, w, h; + text_extents(c, n, dx, dy, w, h); + draw(c, n, x - w - dx, y); } // -// End of "$Id: fl_font_mac.cxx 7659 2010-07-01 13:21:32Z manolo $". +// End of "$Id: fl_font_mac.cxx 8597 2011-04-17 13:18:55Z ianmacarthur $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_font_win32.cxx b/plugins/zynaddsubfx/fltk/src/fl_font_win32.cxx index 81a7c015b..537fc2e6b 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_font_win32.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_font_win32.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_font_win32.cxx 7652 2010-06-21 15:49:45Z manolo $" +// "$Id: fl_font_win32.cxx 8644 2011-05-10 15:37:05Z ianmacarthur $" // // WIN32 font selection routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -30,7 +30,7 @@ static int fl_angle_ = 0; #ifndef FL_DOXYGEN -Fl_Font_Descriptor::Fl_Font_Descriptor(const char* name, Fl_Fontsize size) { +Fl_Font_Descriptor::Fl_Font_Descriptor(const char* name, Fl_Fontsize fsize) { int weight = FW_NORMAL; int italic = 0; switch (*name++) { @@ -41,7 +41,7 @@ Fl_Font_Descriptor::Fl_Font_Descriptor(const char* name, Fl_Fontsize size) { default: name--; } fid = CreateFont( - -size, // negative makes it use "char size" + -fsize, // negative makes it use "char size" 0, // logical average character width fl_angle_*10, // angle of escapement fl_angle_*10, // base-line orientation angle @@ -69,11 +69,9 @@ Fl_Font_Descriptor::Fl_Font_Descriptor(const char* name, Fl_Fontsize size) { listbase = 0; for (i = 0; i < 64; i++) glok[i] = 0; #endif - minsize = maxsize = size; + size = fsize; } -Fl_Font_Descriptor* fl_fontsize; - Fl_Font_Descriptor::~Fl_Font_Descriptor() { #if HAVE_GL // Delete list created by gl_draw(). This is not done by this code @@ -86,7 +84,7 @@ Fl_Font_Descriptor::~Fl_Font_Descriptor() { // glDeleteLists(listbase+base,size); // } #endif - if (this == fl_fontsize) fl_fontsize = 0; + if (this == fl_graphics_driver->font_descriptor()) fl_graphics_driver->font_descriptor(NULL); DeleteObject(fid); int i; for (i = 0; i < 64; i++) free(width[i]); @@ -122,7 +120,7 @@ static Fl_Font_Descriptor* find(Fl_Font fnum, Fl_Fontsize size, int angle) { if (!s->name) s = fl_fonts; // use 0 if fnum undefined Fl_Font_Descriptor* f; for (f = s->first; f; f = f->next) - if (f->minsize <= size && f->maxsize >= size && f->angle == angle) return f; + if (f->size == size && f->angle == angle) return f; f = new Fl_Font_Descriptor(s->name, size); f->next = s->first; s->first = f; @@ -132,65 +130,88 @@ static Fl_Font_Descriptor* find(Fl_Font fnum, Fl_Fontsize size, int angle) { //////////////////////////////////////////////////////////////// // Public interface: -Fl_Font fl_font_ = 0; -Fl_Fontsize fl_size_ = 0; -//static HDC font_gc; - -void fl_font(Fl_Font fnum, Fl_Fontsize size, int angle) { +static void fl_font(Fl_Graphics_Driver *driver, Fl_Font fnum, Fl_Fontsize size, int angle) { if (fnum==-1) { // just make sure that we will load a new font next time - fl_font_ = 0; fl_size_ = 0; fl_angle_ = 0; + fl_angle_ = 0; + driver->Fl_Graphics_Driver::font(0, 0); return; } - if (fnum == fl_font_ && size == fl_size_ && angle == fl_angle_) return; - fl_font_ = fnum; fl_size_ = size; fl_angle_ = angle; - fl_fontsize = find(fnum, size, angle); + if (fnum == driver->Fl_Graphics_Driver::font() && size == driver->size() && angle == fl_angle_) return; + fl_angle_ = angle; + driver->Fl_Graphics_Driver::font(fnum, size); + driver->font_descriptor( find(fnum, size, angle) ); } -void Fl_Graphics_Driver::font(Fl_Font fnum, Fl_Fontsize size) { - fl_font(fnum, size, 0); +void Fl_GDI_Graphics_Driver::font(Fl_Font fnum, Fl_Fontsize size) { + fl_font(this, fnum, size, 0); } -int fl_height() { +int Fl_GDI_Graphics_Driver::height() { + Fl_Font_Descriptor *fl_fontsize = font_descriptor(); if (fl_fontsize) return (fl_fontsize->metr.tmAscent + fl_fontsize->metr.tmDescent); else return -1; } -int fl_descent() { +int Fl_GDI_Graphics_Driver::descent() { + Fl_Font_Descriptor *fl_fontsize = font_descriptor(); if (fl_fontsize) return fl_fontsize->metr.tmDescent; else return -1; } // Unicode string buffer -static xchar *wstr = NULL; +static unsigned short *wstr = NULL; static int wstr_len = 0; -double fl_width(const char* c, int n) { +double Fl_GDI_Graphics_Driver::width(const char* c, int n) { int i = 0; - if (!fl_fontsize) return -1.0; + if (!font_descriptor()) return -1.0; double w = 0.0; char *end = (char *)&c[n]; while (i < n) { unsigned int ucs; -// int l = fl_utf2ucs((const unsigned char*)c + i, n - i, &ucs); int l; ucs = fl_utf8decode((const char*)(c + i), end, &l); // if (l < 1) l = 1; i += l; if (!fl_nonspacing(ucs)) { - w += fl_width(ucs); + w += width(ucs); } } return w; } -double fl_width(unsigned int c) { +double Fl_GDI_Graphics_Driver::width(unsigned int c) { + Fl_Font_Descriptor *fl_fontsize = font_descriptor(); unsigned int r; + SIZE s; + // Special Case Handling of Unicode points over U+FFFF. + // The logic (below) computes a lookup table for char widths + // on-the-fly, but the table only covers codepoints up to + // U+FFFF, which covers the basic multilingual plane, but + // not any higher plane, or glyphs that require surrogate-pairs + // to encode them in WinXX, which is UTF16. + // This code assumes that these glyphs are rarely used and simply + // measures them explicitly if they occur - This will be slow... + if(c > 0x0000FFFF) { // UTF16 surrogate pair is needed + if (!fl_gc) { // We have no valid gc, so nothing to measure - bail out + return 0.0; + } + int cc; // cell count + unsigned short u16[4]; // Array for UTF16 representation of c + // Creates a UTF16 string from a UCS code point. + cc = fl_ucs_to_Utf16(c, u16, 4); + // Make sure the current font is selected before we make the measurement + SelectObject(fl_gc, fl_fontsize->fid); + // measure the glyph width + GetTextExtentPoint32W(fl_gc, (WCHAR*)u16, cc, &s); + return (double)s.cx; + } + // else - this falls through to the lookup-table for glyph widths + // in the basic multilingual plane r = (c & 0xFC00) >> 10; if (!fl_fontsize->width[r]) { - SelectObject(fl_gc, fl_fontsize->fid); fl_fontsize->width[r] = (int*) malloc(sizeof(int) * 0x0400); - SIZE s; unsigned short i = 0, ii = r * 0x400; // The following code makes a best effort attempt to obtain a valid fl_gc. // If no fl_gc is available at the time we call fl_width(), then we first @@ -201,12 +222,13 @@ double fl_width(unsigned int c) { HDC gc = fl_gc; HWND hWnd = 0; if (!gc) { // We have no valid gc, try and obtain one - // Use our first fltk window, or fallback to using the screen via GetDC(NULL) - hWnd = Fl::first_window() ? fl_xid(Fl::first_window()) : NULL; - gc = GetDC(hWnd); + // Use our first fltk window, or fallback to using the screen via GetDC(NULL) + hWnd = Fl::first_window() ? fl_xid(Fl::first_window()) : NULL; + gc = GetDC(hWnd); } if (!gc) Fl::fatal("Invalid graphic context: fl_width() failed because no valid HDC was found!"); + SelectObject(gc, fl_fontsize->fid); for (; i < 0x400; i++) { GetTextExtentPoint32W(gc, (WCHAR*)&ii, 1, &s); fl_fontsize->width[r][i] = s.cx; @@ -250,24 +272,29 @@ static void on_printer_extents_update(int &dx, int &dy, int &w, int &h) // if printer context, extents shd be converted to logical coords #define EXTENTS_UPDATE(x,y,w,h) \ - if (Fl_Surface_Device::surface()->type() == Fl_Printer::device_type) { on_printer_extents_update(x,y,w,h); } + if (Fl_Surface_Device::surface()->class_name() == Fl_Printer::class_id) { on_printer_extents_update(x,y,w,h); } -static unsigned short *ext_buff = NULL; // UTF-16 converted version of input UTF-8 string -static unsigned wc_len = 0; // current string buffer dimension -static WORD *gi = NULL; // glyph indices array // Function to determine the extent of the "inked" area of the glyphs in a string -void fl_text_extents(const char *c, int n, int &dx, int &dy, int &w, int &h) { - if (!fl_fontsize) { +void Fl_GDI_Graphics_Driver::text_extents(const char *c, int n, int &dx, int &dy, int &w, int &h) { + + Fl_Font_Descriptor *fl_fontsize = font_descriptor(); + if (!fl_fontsize) { // no valid font, nothing to measure w = 0; h = 0; dx = dy = 0; return; } - static const MAT2 matrix = { { 0, 1 }, { 0, 0 }, { 0, 0 }, { 0, 1 } }; + + static unsigned short *ext_buff = NULL; // UTF-16 converted version of input UTF-8 string + static WORD *w_buff = NULL; // glyph indices array + static unsigned wc_len = 0; // current string buffer dimensions + static const MAT2 matrix = { { 0, 1 }, { 0, 0 }, { 0, 0 }, { 0, 1 } }; // identity mat for GetGlyphOutlineW GLYPHMETRICS metrics; int maxw = 0, maxh = 0, dh; int minx = 0, miny = -999999; unsigned len = 0, idx = 0; HWND hWnd = 0; + HDC gc = fl_gc; // local copy of current gc - make a copy in case we change it... + int has_surrogates; // will be set if the string contains surrogate pairs // Have we loaded the GetGlyphIndicesW function yet? if (have_loaded_GetGlyphIndices == 0) { @@ -278,43 +305,69 @@ void fl_text_extents(const char *c, int n, int &dx, int &dy, int &w, int &h) { // The following code makes a best effort attempt to obtain a valid fl_gc. // See description in fl_width() above for an explanation. - if (!fl_gc) { // We have no valid gc, try and obtain one - // Use our first fltk window, or fallback to using the screen via GetDC(NULL) - hWnd = Fl::first_window() ? fl_xid(Fl::first_window()) : NULL; - fl_gc = GetDC(hWnd); + if (!gc) { // We have no valid gc, try and obtain one + // Use our first fltk window, or fallback to using the screen via GetDC(NULL) + hWnd = Fl::first_window() ? fl_xid(Fl::first_window()) : NULL; + gc = GetDC(hWnd); } - if (!fl_gc)goto exit_error; // no valid gc, attempt to use fallback measure + if (!gc) goto exit_error; // no valid gc, attempt to use fallback measure // now convert the string to WCHAR and measure it len = fl_utf8toUtf16(c, n, ext_buff, wc_len); if(len >= wc_len) { if(ext_buff) {delete [] ext_buff;} - if(gi) {delete [] gi;} - wc_len = len + 64; + if(w_buff) {delete [] w_buff;} + wc_len = len + 64; ext_buff = new unsigned short[wc_len]; - gi = new WORD[wc_len]; + w_buff = new WORD[wc_len]; len = fl_utf8toUtf16(c, n, ext_buff, wc_len); } - SelectObject(fl_gc, fl_fontsize->fid); + SelectObject(gc, fl_fontsize->fid); - if (fl_GetGlyphIndices(fl_gc, (WCHAR*)ext_buff, len, gi, 0) == GDI_ERROR) { - // some error occured here - just return fl_measure values? - goto exit_error; + // Are there surrogate-pairs in this string? If so GetGlyphIndicesW will fail + // since it can only handle the BMP range. + // We ideally want to use GetGlyphIndicesW, as it is the Right Thing, but it + // only works for the BMP, so we leverage GetCharacterPlacementW instead, which + // is not ideal, but works adequately well, and does handle surrogate pairs. + has_surrogates = 0; + for(unsigned ll = 0; ll < len; ll++) { + if((ext_buff[ll] >= 0xD800) && (ext_buff[ll] < 0xE000)) { + has_surrogates = -1; + break; + } + } + if (has_surrogates) { + // GetGlyphIndices will not work - use GetCharacterPlacementW() instead + GCP_RESULTSW gcp_res; + memset(w_buff, 0, (sizeof(WORD) * wc_len)); + memset(&gcp_res, 0, sizeof(GCP_RESULTSW)); + gcp_res.lpGlyphs = (LPWSTR)w_buff; + gcp_res.nGlyphs = wc_len; + gcp_res.lStructSize = sizeof(gcp_res); + + DWORD dr = GetCharacterPlacementW(gc, (WCHAR*)ext_buff, len, 0, &gcp_res, GCP_GLYPHSHAPE); + if(dr) { + len = gcp_res.nGlyphs; + } else goto exit_error; + } else { + if (fl_GetGlyphIndices(gc, (WCHAR*)ext_buff, len, w_buff, GGI_MARK_NONEXISTING_GLYPHS) == GDI_ERROR) { + // some error occured here - just return fl_measure values + goto exit_error; + } } // now we have the glyph array we measure each glyph in turn... for(idx = 0; idx < len; idx++){ - if (GetGlyphOutlineW (fl_gc, gi[idx], GGO_METRICS | GGO_GLYPH_INDEX, - &metrics, 0, NULL, &matrix) == GDI_ERROR) { - goto exit_error; + if (GetGlyphOutlineW (gc, w_buff[idx], GGO_METRICS | GGO_GLYPH_INDEX, + &metrics, 0, NULL, &matrix) == GDI_ERROR) { + goto exit_error; } maxw += metrics.gmCellIncX; - if(idx == 0) minx = metrics.gmptGlyphOrigin.x; + if(idx == 0) minx = metrics.gmptGlyphOrigin.x; dh = metrics.gmBlackBoxY - metrics.gmptGlyphOrigin.y; - if(dh > maxh) maxh = dh; - if(miny < metrics.gmptGlyphOrigin.y) miny = metrics.gmptGlyphOrigin.y; + if(dh > maxh) maxh = dh; + if(miny < metrics.gmptGlyphOrigin.y) miny = metrics.gmptGlyphOrigin.y; } - // for the last cell, we only want the bounding X-extent, not the glyphs increment step maxw = maxw - metrics.gmCellIncX + metrics.gmBlackBoxX + metrics.gmptGlyphOrigin.x; w = maxw - minx; @@ -326,86 +379,59 @@ void fl_text_extents(const char *c, int n, int &dx, int &dy, int &w, int &h) { exit_error: // some error here - just return fl_measure values - w = (int)fl_width(c, n); - h = fl_height(); + w = (int)width(c, n); + h = height(); dx = 0; - dy = fl_descent() - h; + dy = descent() - h; EXTENTS_UPDATE(dx, dy, w, h); return; } // fl_text_extents -void Fl_Graphics_Driver::draw(const char* str, int n, int x, int y) { - int i = 0; - int lx = 0; - char *end = (char *)&str[n]; +void Fl_GDI_Graphics_Driver::draw(const char* str, int n, int x, int y) { COLORREF oldColor = SetTextColor(fl_gc, fl_RGB()); - SelectObject(fl_gc, fl_fontsize->fid); - while (i < n) { - unsigned int u; - unsigned int u1; - unsigned short ucs; -// int l = fl_utf2ucs((const unsigned char*)str + i, n - i, &u); - int l; - u = fl_utf8decode((const char*)(str + i), end, &l); - if (u1 = fl_nonspacing(u)) { - x -= lx; - u = u1; - } else { - lx = (int) fl_width(u); - } - ucs = u; - if (l < 1) l = 1; - i += l; - TextOutW(fl_gc, x, y, (WCHAR*)&ucs, 1); - x += lx; - } - SetTextColor(fl_gc, oldColor); -} - -void Fl_Graphics_Driver::draw(int angle, const char* str, int n, int x, int y) { - fl_font(fl_font_, fl_size_, angle); -// fl_draw(str, n, (int)x, (int)y); - int i = 0, i2=0; - char *end = (char *)&str[n]; - COLORREF oldColor = SetTextColor(fl_gc, fl_RGB()); - SelectObject(fl_gc, fl_fontsize->fid); - //unsigned short ucs[n]; //only GCC, but not MSVC - unsigned short* ucs = new unsigned short[n]; - while (i < n) { - unsigned int u; - int l; - u = fl_utf8decode((const char*)(str + i), end, &l); - ucs[i2] = u; - if (l < 1) l = 1; - i += l; - ++i2; - } - TextOutW(fl_gc, x, y, (WCHAR*)ucs, i2); - delete[] ucs; - SetTextColor(fl_gc, oldColor); - fl_font(fl_font_, fl_size_); -} - -void Fl_Graphics_Driver::rtl_draw(const char* c, int n, int x, int y) { - int wn; - int i = 0; - int lx = 0; -// if (n > wstr_len) { -// wstr = (xchar*) realloc(wstr, sizeof(xchar) * (n + 1)); -// wstr_len = n; -// } -//wn = fl_utf2unicode((const unsigned char *)c, n, wstr); - wn = fl_utf8toUtf16(c, n, (unsigned short*)wstr, wstr_len); + SelectObject(fl_gc, font_descriptor()->fid); + int wn = fl_utf8toUtf16(str, n, wstr, wstr_len); if(wn >= wstr_len) { - wstr = (xchar*) realloc(wstr, sizeof(xchar) * (wn + 1)); + wstr = (unsigned short*) realloc(wstr, sizeof(unsigned short) * (wn + 1)); wstr_len = wn + 1; - wn = fl_utf8toUtf16(c, n, (unsigned short*)wstr, wstr_len); + wn = fl_utf8toUtf16(str, n, wstr, wstr_len); + } + TextOutW(fl_gc, x, y, (WCHAR*)wstr, wn); + SetTextColor(fl_gc, oldColor); // restore initial state +} + +void Fl_GDI_Graphics_Driver::draw(int angle, const char* str, int n, int x, int y) { + fl_font(this, Fl_Graphics_Driver::font(), size(), angle); + int wn = 0; // count of UTF16 cells to render full string + COLORREF oldColor = SetTextColor(fl_gc, fl_RGB()); + SelectObject(fl_gc, font_descriptor()->fid); + wn = fl_utf8toUtf16(str, n, wstr, wstr_len); + if(wn >= wstr_len) { // Array too small + wstr = (unsigned short*) realloc(wstr, sizeof(unsigned short) * (wn + 1)); + wstr_len = wn + 1; + wn = fl_utf8toUtf16(str, n, wstr, wstr_len); // respin the translation + } + TextOutW(fl_gc, x, y, (WCHAR*)wstr, wn); + SetTextColor(fl_gc, oldColor); + fl_font(this, Fl_Graphics_Driver::font(), size(), 0); +} + +void Fl_GDI_Graphics_Driver::rtl_draw(const char* c, int n, int x, int y) { + int wn; + wn = fl_utf8toUtf16(c, n, wstr, wstr_len); + if(wn >= wstr_len) { + wstr = (unsigned short*) realloc(wstr, sizeof(unsigned short) * (wn + 1)); + wstr_len = wn + 1; + wn = fl_utf8toUtf16(c, n, wstr, wstr_len); } COLORREF oldColor = SetTextColor(fl_gc, fl_RGB()); - SelectObject(fl_gc, fl_fontsize->fid); - while (i < wn) { - lx = (int) fl_width(wstr[i]); + SelectObject(fl_gc, font_descriptor()->fid); +#ifdef RTL_CHAR_BY_CHAR + int i = 0; + int lx = 0; + while (i < wn) { // output char by char is very bad for Arabic but coherent with fl_width() + lx = (int) width(wstr[i]); x -= lx; TextOutW(fl_gc, x, y, (WCHAR*)wstr + i, 1); if (fl_nonspacing(wstr[i])) { @@ -413,9 +439,14 @@ void Fl_Graphics_Driver::rtl_draw(const char* c, int n, int x, int y) { } i++; } +#else + UINT old_align = SetTextAlign(fl_gc, TA_RIGHT | TA_RTLREADING); + TextOutW(fl_gc, x, y - height() + descent(), (WCHAR*)wstr, wn); + SetTextAlign(fl_gc, old_align); +#endif SetTextColor(fl_gc, oldColor); } #endif // -// End of "$Id: fl_font_win32.cxx 7652 2010-06-21 15:49:45Z manolo $". +// End of "$Id: fl_font_win32.cxx 8644 2011-05-10 15:37:05Z ianmacarthur $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_font_x.cxx b/plugins/zynaddsubfx/fltk/src/fl_font_x.cxx index 52f30a3d3..1f1077c4b 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_font_x.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_font_x.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_font_x.cxx 7652 2010-06-21 15:49:45Z manolo $" +// "$Id: fl_font_x.cxx 8446 2011-02-19 18:03:43Z manolo $" // // Standard X11 font selection code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -38,7 +38,6 @@ Fl_Font_Descriptor::Fl_Font_Descriptor(const char* name) { # endif } -Fl_Font_Descriptor* fl_fontsize; Fl_XFont_On_Demand fl_xfont; Fl_Font_Descriptor::~Fl_Font_Descriptor() { @@ -53,8 +52,8 @@ Fl_Font_Descriptor::~Fl_Font_Descriptor() { // glDeleteLists(listbase+base,size); // } # endif - if (this == fl_fontsize) { - fl_fontsize = 0; + if (this == fl_graphics_driver->font_descriptor()) { + fl_graphics_driver->font_descriptor(NULL); fl_xfont = 0; } XFreeUtf8FontStruct(fl_display, font); @@ -87,8 +86,6 @@ Fl_Fontdesc* fl_fonts = built_in_table; #define MAXSIZE 32767 -#define current_font (fl_fontsize->font) - // return dash number N, or pointer to ending null if none: const char* fl_font_word(const char* p, int n) { while (*p) {if (*p=='-') {if (!--n) break;} p++;} @@ -111,7 +108,8 @@ char* fl_find_fontsize(char* name) { return r; } -const char* fl_encoding = "iso8859-1"; +//const char* fl_encoding = "iso8859-1"; +const char* fl_encoding = "iso10646-1"; // return true if this matches fl_encoding: int fl_correct_encoding(const char* name) { @@ -160,8 +158,8 @@ static const char *find_best_font(const char *fname, int size) { name = namebuffer; ptsize = size; } else if (!ptsize || // no fonts yet - thissize < ptsize && ptsize > size || // current font too big - thissize > ptsize && thissize <= size // current too small + (thissize < ptsize && ptsize > size) || // current font too big + (thissize > ptsize && thissize <= size) // current too small ) { name = thisname; ptsize = thissize; @@ -243,13 +241,12 @@ static Fl_Font_Descriptor* find(int fnum, int size) { if (!s->name) s = fl_fonts; // use font 0 if still undefined Fl_Font_Descriptor* f; for (f = s->first; f; f = f->next) - if (f->minsize <= size && f->maxsize >= size) return f; + if (f->size == size) return f; fl_open_display(); name = put_font_size(s->name, size); f = new Fl_Font_Descriptor(name); - f->minsize = size; - f->maxsize = size; + f->size = size; f->next = s->first; s->first = f; free(name); @@ -260,8 +257,6 @@ static Fl_Font_Descriptor* find(int fnum, int size) { //////////////////////////////////////////////////////////////// // Public interface: -Fl_Font fl_font_ = 0; -Fl_Fontsize fl_size_ = 0; void *fl_xftfont = 0; static GC font_gc; @@ -269,80 +264,81 @@ XFontStruct* Fl_XFont_On_Demand::value() { return ptr; } -void Fl_Graphics_Driver::font(Fl_Font fnum, Fl_Fontsize size) { +void Fl_Xlib_Graphics_Driver::font(Fl_Font fnum, Fl_Fontsize size) { if (fnum==-1) { - fl_font_ = 0; fl_size_ = 0; + Fl_Graphics_Driver::font(0, 0); return; } - if (fnum == fl_font_ && size == fl_size_) return; - fl_font_ = fnum; fl_size_ = size; + if (fnum == Fl_Graphics_Driver::font() && size == Fl_Graphics_Driver::size()) return; + Fl_Graphics_Driver::font(fnum, size); Fl_Font_Descriptor* f = find(fnum, size); - if (f != fl_fontsize) { - fl_fontsize = f; - fl_xfont = current_font->fonts[0]; + if (f != this->font_descriptor()) { + this->font_descriptor(f); + fl_xfont = f->font->fonts[0]; font_gc = 0; } } -int fl_height() { - if (current_font) return (current_font->ascent + current_font->descent); +int Fl_Xlib_Graphics_Driver::height() { + if (font_descriptor()) return font_descriptor()->font->ascent + font_descriptor()->font->descent; else return -1; } -int fl_descent() { - if (current_font) return current_font->descent; +int Fl_Xlib_Graphics_Driver::descent() { + if (font_descriptor()) return font_descriptor()->font->descent; else return -1; } -double fl_width(const char* c, int n) { - if (current_font) return (double) XUtf8TextWidth(current_font, c, n); +double Fl_Xlib_Graphics_Driver::width(const char* c, int n) { + if (font_descriptor()) return (double) XUtf8TextWidth(font_descriptor()->font, c, n); else return -1; } -double fl_width(unsigned int c) { - if (current_font) return (double) XUtf8UcsWidth(current_font, c); +double Fl_Xlib_Graphics_Driver::width(unsigned int c) { + if (font_descriptor()) return (double) XUtf8UcsWidth(font_descriptor()->font, c); else return -1; } - -void fl_text_extents(const char *c, int n, int &dx, int &dy, int &W, int &H) { - -#if defined(__GNUC__) -#warning fl_text_extents is only a test stub in Xlib build at present -#endif /*__GNUC__*/ - - W = 0; H = 0; - fl_measure(c, W, H, 0); - dx = 0; - dy = fl_descent() - H; -} // fl_text_extents - - -void Fl_Graphics_Driver::draw(const char* c, int n, int x, int y) { +void Fl_Xlib_Graphics_Driver::text_extents(const char *c, int n, int &dx, int &dy, int &W, int &H) { if (font_gc != fl_gc) { - if (!current_font) fl_font(FL_HELVETICA, 14); + if (!font_descriptor()) font(FL_HELVETICA, FL_NORMAL_SIZE); font_gc = fl_gc; - XSetFont(fl_display, fl_gc, current_font->fid); + XSetFont(fl_display, fl_gc, font_descriptor()->font->fid); } -// XDrawString(fl_display, fl_window, fl_gc, x, y, c, n); - XUtf8DrawString(fl_display, fl_window, current_font, fl_gc, x, y, c, n); -} -void Fl_Graphics_Driver::draw(int angle, const char *str, int n, int x, int y) { - fprintf(stderr,"ROTATING TEXT NOT IMPLIMENTED\n"); - fl_draw(str, n, (int)x, (int)y); -} -//void fl_draw(const char* str, int n, float x, float y) { -// fl_draw(str, n, (int)x, (int)y); -//} + int xx, yy, ww, hh; + xx = yy = ww = hh = 0; + if (fl_gc) XUtf8_measure_extents(fl_display, fl_window, font_descriptor()->font, fl_gc, &xx, &yy, &ww, &hh, c, n); -void Fl_Graphics_Driver::rtl_draw(const char* c, int n, int x, int y) { + W = ww; H = hh; dx = xx; dy = yy; +// This is the safe but mostly wrong thing we used to do... +// W = 0; H = 0; +// fl_measure(c, W, H, 0); +// dx = 0; +// dy = fl_descent() - H; +} + +void Fl_Xlib_Graphics_Driver::draw(const char* c, int n, int x, int y) { if (font_gc != fl_gc) { - if (!current_font) fl_font(FL_HELVETICA, 12); + if (!font_descriptor()) this->font(FL_HELVETICA, FL_NORMAL_SIZE); + font_gc = fl_gc; + XSetFont(fl_display, fl_gc, font_descriptor()->font->fid); + } + if (fl_gc) XUtf8DrawString(fl_display, fl_window, font_descriptor()->font, fl_gc, x, y, c, n); +} + +void Fl_Xlib_Graphics_Driver::draw(int angle, const char *str, int n, int x, int y) { + fprintf(stderr,"ROTATING TEXT NOT IMPLEMENTED\n"); + this->draw(str, n, (int)x, (int)y); +} + +void Fl_Xlib_Graphics_Driver::rtl_draw(const char* c, int n, int x, int y) { + if (font_gc != fl_gc) { + if (!font_descriptor()) this->font(FL_HELVETICA, FL_NORMAL_SIZE); font_gc = fl_gc; } - XUtf8DrawRtlString(fl_display, fl_window, current_font, fl_gc, x, y, c, n); + if (fl_gc) XUtf8DrawRtlString(fl_display, fl_window, font_descriptor()->font, fl_gc, x, y, c, n); } #endif // FL_DOXYGEN // -// End of "$Id: fl_font_x.cxx 7652 2010-06-21 15:49:45Z manolo $". +// End of "$Id: fl_font_x.cxx 8446 2011-02-19 18:03:43Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_font_xft.cxx b/plugins/zynaddsubfx/fltk/src/fl_font_xft.cxx index cf8764751..9e20fa09c 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_font_xft.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_font_xft.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_font_xft.cxx 7652 2010-06-21 15:49:45Z manolo $" +// "$Id: fl_font_xft.cxx 8442 2011-02-18 13:39:48Z manolo $" // // Xft font code for the Fast Light Tool Kit (FLTK). // -// Copyright 2001-2009 Bill Spitzak and others. +// Copyright 2001-2011 Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -69,6 +69,7 @@ // The predefined fonts that FLTK has: static Fl_Fontdesc built_in_table[] = { +#if 1 {" sans"}, {"Bsans"}, {"Isans"}, @@ -84,47 +85,55 @@ static Fl_Fontdesc built_in_table[] = { {" symbol"}, {" screen"}, {"Bscreen"}, -{" dingbats"}, +{" zapf dingbats"}, +#else +{" helvetica"}, +{"Bhelvetica"}, +{"Ihelvetica"}, +{"Phelvetica"}, +{" courier"}, +{"Bcourier"}, +{"Icourier"}, +{"Pcourier"}, +{" times"}, +{"Btimes"}, +{"Itimes"}, +{"Ptimes"}, +{" symbol"}, +{" lucidatypewriter"}, +{"Blucidatypewriter"}, +{" zapf dingbats"}, +#endif }; Fl_Fontdesc* fl_fonts = built_in_table; -#define current_font (fl_fontsize->font) - -Fl_Font fl_font_ = 0; -Fl_Fontsize fl_size_ = 0; -int fl_angle_ = 0; // internal for rotating text support Fl_XFont_On_Demand fl_xfont; void *fl_xftfont = 0; //const char* fl_encoding_ = "iso8859-1"; const char* fl_encoding_ = "iso10646-1"; -Fl_Font_Descriptor* fl_fontsize = 0; - - -void fl_font(Fl_Font fnum, Fl_Fontsize size, int angle) { +static void fl_xft_font(Fl_Xlib_Graphics_Driver *driver, Fl_Font fnum, Fl_Fontsize size, int angle) { if (fnum==-1) { // special case to stop font caching - fl_font_ = 0; fl_size_ = 0; fl_angle_ = 0; + driver->Fl_Graphics_Driver::font(0, 0); return; } - if (fnum == fl_font_ && size == fl_size_ && angle == fl_angle_ - && fl_fontsize) -// && !strcasecmp(fl_fontsize->encoding, fl_encoding_)) + Fl_Font_Descriptor* f = driver->font_descriptor(); + if (fnum == driver->Fl_Graphics_Driver::font() && size == driver->size() && f && f->angle == angle) return; - fl_font_ = fnum; fl_size_ = size; fl_angle_ = angle; + driver->Fl_Graphics_Driver::font(fnum, size); Fl_Fontdesc *font = fl_fonts + fnum; - Fl_Font_Descriptor* f; // search the fontsizes we have generated already for (f = font->first; f; f = f->next) { if (f->size == size && f->angle == angle)// && !strcasecmp(f->encoding, fl_encoding_)) break; } if (!f) { - f = new Fl_Font_Descriptor(font->name); + f = new Fl_Font_Descriptor(font->name, size, angle); f->next = font->first; font->first = f; } - fl_fontsize = f; + driver->font_descriptor(f); #if XFT_MAJOR < 2 fl_xfont = f->font->u.core.font; #else @@ -133,11 +142,11 @@ void fl_font(Fl_Font fnum, Fl_Fontsize size, int angle) { fl_xftfont = (void*)f->font; } -void Fl_Graphics_Driver::font(Fl_Font fnum, Fl_Fontsize size) { - fl_font(fnum,size,0); +void Fl_Xlib_Graphics_Driver::font(Fl_Font fnum, Fl_Fontsize size) { + fl_xft_font(this,fnum,size,0); } -static XftFont* fontopen(const char* name, bool core, int angle) { +static XftFont* fontopen(const char* name, Fl_Fontsize size, bool core, int angle) { // Check: does it look like we have been passed an old-school XLFD fontname? bool is_xlfd = false; int hyphen_count = 0; @@ -214,14 +223,14 @@ static XftFont* fontopen(const char* name, bool core, int angle) { // Construct a match pattern for the font we want... XftPatternAddInteger(fnt_pat, XFT_WEIGHT, weight); XftPatternAddInteger(fnt_pat, XFT_SLANT, slant); - XftPatternAddDouble (fnt_pat, XFT_PIXEL_SIZE, (double)fl_size_); + XftPatternAddDouble (fnt_pat, XFT_PIXEL_SIZE, (double)size); XftPatternAddString (fnt_pat, XFT_ENCODING, fl_encoding_); - // rotate font if fl_angle_!=0 - if (fl_angle_ !=0) { + // rotate font if angle!=0 + if (angle !=0) { XftMatrix m; XftMatrixInit(&m); - XftMatrixRotate(&m,cos(M_PI*fl_angle_/180.),sin(M_PI*fl_angle_/180.)); + XftMatrixRotate(&m,cos(M_PI*angle/180.),sin(M_PI*angle/180.)); XftPatternAddMatrix (fnt_pat, XFT_MATRIX,&m); } @@ -270,6 +279,20 @@ static XftFont* fontopen(const char* name, bool core, int angle) { free(picked_name); #endif + if (!match_pat) { + // last chance, just open any font in the right size + the_font = XftFontOpen (fl_display, fl_screen, + XFT_FAMILY, XftTypeString, "sans", + XFT_SIZE, XftTypeDouble, (double)size, + NULL); + XftPatternDestroy(fnt_pat); + if (!the_font) { + Fl::error("Unable to find fonts. Check your FontConfig configuration.\n"); + exit(1); + } + return the_font; + } + // open the matched font the_font = XftFontOpenPattern(fl_display, match_pat); @@ -310,61 +333,95 @@ puts("Font Opened"); fflush(stdout); } } // end of fontopen -Fl_Font_Descriptor::Fl_Font_Descriptor(const char* name) { +Fl_Font_Descriptor::Fl_Font_Descriptor(const char* name, Fl_Fontsize fsize, int fangle) { // encoding = fl_encoding_; - size = fl_size_; - angle = fl_angle_; + size = fsize; + angle = fangle; #if HAVE_GL listbase = 0; #endif // HAVE_GL - font = fontopen(name, false, angle); + font = fontopen(name, fsize, false, angle); } Fl_Font_Descriptor::~Fl_Font_Descriptor() { - if (this == fl_fontsize) fl_fontsize = 0; + if (this == fl_graphics_driver->font_descriptor()) fl_graphics_driver->font_descriptor(NULL); // XftFontClose(fl_display, font); } -int fl_height() { - if (current_font) return current_font->ascent + current_font->descent; +/* decodes the input UTF-8 string into a series of wchar_t characters. + n is set upon return to the number of characters. + Don't deallocate the returned memory. + */ +static const wchar_t *utf8reformat(const char *str, int& n) +{ + static const wchar_t empty[] = {0}; + static wchar_t *buffer; + static int lbuf = 0; + int newn; + if (n == 0) return empty; + newn = fl_utf8towc(str, n, (wchar_t*)buffer, lbuf); + if (newn >= lbuf) { + lbuf = newn + 100; + if (buffer) free(buffer); + buffer = (wchar_t*)malloc(lbuf * sizeof(wchar_t)); + n = fl_utf8towc(str, n, (wchar_t*)buffer, lbuf); + } else { + n = newn; + } + return buffer; +} + +static void utf8extents(Fl_Font_Descriptor *desc, const char *str, int n, XGlyphInfo *extents) +{ + memset(extents, 0, sizeof(XGlyphInfo)); + const wchar_t *buffer = utf8reformat(str, n); +#ifdef __CYGWIN__ + XftTextExtents16(fl_display, desc->font, (XftChar16 *)buffer, n, extents); +#else + XftTextExtents32(fl_display, desc->font, (XftChar32 *)buffer, n, extents); +#endif +} + +int Fl_Xlib_Graphics_Driver::height() { + if (font_descriptor()) return font_descriptor()->font->ascent + font_descriptor()->font->descent; else return -1; } -int fl_descent() { - if (current_font) return current_font->descent; +int Fl_Xlib_Graphics_Driver::descent() { + if (font_descriptor()) return font_descriptor()->font->descent; else return -1; } -double fl_width(const char *str, int n) { - if (!current_font) return -1.0; +double Fl_Xlib_Graphics_Driver::width(const char* str, int n) { + if (!font_descriptor()) return -1.0; XGlyphInfo i; - XftTextExtentsUtf8(fl_display, current_font, (XftChar8 *)str, n, &i); + utf8extents(font_descriptor(), str, n, &i); return i.xOff; } -double fl_width(uchar c) { - return fl_width((const char *)(&c), 1); -} +/*double fl_width(uchar c) { + return fl_graphics_driver->width((const char *)(&c), 1); +}*/ -double fl_width(FcChar32 *str, int n) { - if (!current_font) return -1.0; +static double fl_xft_width(Fl_Font_Descriptor *desc, FcChar32 *str, int n) { + if (!desc) return -1.0; XGlyphInfo i; - XftTextExtents32(fl_display, current_font, str, n, &i); + XftTextExtents32(fl_display, desc->font, str, n, &i); return i.xOff; } -double fl_width(unsigned int c) { - return fl_width((FcChar32 *)(&c), 1); +double Fl_Xlib_Graphics_Driver::width(unsigned int c) { + return fl_xft_width(font_descriptor(), (FcChar32 *)(&c), 1); } -void fl_text_extents(const char *c, int n, int &dx, int &dy, int &w, int &h) { - if (!current_font) { +void Fl_Xlib_Graphics_Driver::text_extents(const char *c, int n, int &dx, int &dy, int &w, int &h) { + if (!font_descriptor()) { w = h = 0; dx = dy = 0; return; } XGlyphInfo gi; - XftTextExtentsUtf8(fl_display, current_font, (XftChar8 *)c, n, &gi); + utf8extents(font_descriptor(), c, n, &gi); w = gi.width; h = gi.height; @@ -394,49 +451,54 @@ void fl_text_extents(const char *c, int n, int &dx, int &dy, int &w, int &h) { // original fltk code did. // NOTE: On my test boxes (FC6, FC7, FC8, ubuntu8.04, 9.04, 9.10) this works // well for the fltk "built-in" font names. -static XFontStruct* load_xfont_for_xft2(void) { +static XFontStruct* load_xfont_for_xft2(Fl_Graphics_Driver *driver) { XFontStruct* xgl_font = 0; - int size = fl_size_; + int size = driver->size(); + int fnum = driver->font(); const char *wt_med = "medium"; const char *wt_bold = "bold"; - char *weight = (char *)wt_med; // no specifc weight requested - accept any + const char *weight = wt_med; // no specifc weight requested - accept any char slant = 'r'; // regular non-italic by default char xlfd[128]; // we will put our synthetic XLFD in here - char *pc = strdup(fl_fonts[fl_font_].name); // what font were we asked for? - char *name = pc; // keep a handle to the original name for freeing later + char *pc = strdup(fl_fonts[fnum].name); // what font were we asked for? + const char *name = pc; // keep a handle to the original name for freeing later // Parse the "fltk-name" of the font switch (*name++) { - case 'I': slant = 'i'; break; // italic - case 'P': slant = 'i'; // bold-italic (falls-through) - case 'B': weight = (char*)wt_bold; break; // bold - case ' ': break; // regular - default: name--; // no prefix, restore name - } - - // map generic Xft names to customary XLFD faces - if (!strcmp(name, "sans")) { - name = "helvetica"; - } else if (!strcmp(name, "mono")) { - name = "courier"; - } else if (!strcmp(name, "serif")) { - name = "times"; - } else if (!strcmp(name, "screen")) { - name = "lucidatypewriter"; - } else if (!strcmp(name, "dingbats")) { - name = "zapf dingbats"; + case 'I': slant = 'i'; break; // italic + case 'P': slant = 'i'; // bold-italic (falls-through) + case 'B': weight = wt_bold; break; // bold + case ' ': break; // regular + default: name--; // no prefix, restore name } // first, we do a query with no prefered size, to see if the font exists at all - snprintf(xlfd, 128, "-*-*%s*-%s-%c-*--*-*-*-*-*-*-*-*", name, weight, slant); // make up xlfd style name + snprintf(xlfd, 128, "-*-%s-%s-%c-*--*-*-*-*-*-*-*-*", name, weight, slant); // make up xlfd style name xgl_font = XLoadQueryFont(fl_display, xlfd); if(xgl_font) { // the face exists, but can we get it in a suitable size? XFreeFont(fl_display, xgl_font); // release the non-sized version - snprintf(xlfd, 128, "-*-*%s*-%s-%c-*--*-%d-*-*-*-*-*-*", name, weight, slant, (size*10)); + snprintf(xlfd, 128, "-*-%s-%s-%c-*--*-%d-*-*-*-*-*-*", name, weight, slant, (size*10)); xgl_font = XLoadQueryFont(fl_display, xlfd); // attempt to load the font at the right size } //puts(xlfd); - free(pc); // release our copy of the font name + // try alternative names + if (!xgl_font) { + if (!strcmp(name, "sans")) { + name = "helvetica"; + } else if (!strcmp(name, "mono")) { + name = "courier"; + } else if (!strcmp(name, "serif")) { + name = "times"; + } else if (!strcmp(name, "screen")) { + name = "lucidatypewriter"; + } else if (!strcmp(name, "dingbats")) { + name = "zapf dingbats"; + } + snprintf(xlfd, 128, "-*-*%s*-%s-%c-*--*-%d-*-*-*-*-*-*", name, weight, slant, (size*10)); + xgl_font = XLoadQueryFont(fl_display, xlfd); + } + free(pc); // release our copy of the font name + // if we have nothing loaded, try a generic proportional font if(!xgl_font) { snprintf(xlfd, 128, "-*-helvetica-*-%c-*--*-%d-*-*-*-*-*-*", slant, (size*10)); @@ -457,7 +519,7 @@ static XFontStruct* load_xfont_for_xft2(void) { } // end of load_xfont_for_xft2 # endif -XFontStruct* fl_xxfont() { +static XFontStruct* fl_xxfont(Fl_Graphics_Driver *driver) { # if XFT_MAJOR > 1 // kludge! XFT 2 and later does not provide core fonts for us to use with GL // try to load a bitmap X font instead @@ -465,25 +527,27 @@ XFontStruct* fl_xxfont() { static int glsize = 0; static int glfont = -1; // Do we need to load a new font? - if ((!xgl_font) || (glsize != fl_size_) || (glfont != fl_font_)) { + if ((!xgl_font) || (glsize != driver->size()) || (glfont != driver->font())) { // create a dummy XLFD for some font of the appropriate size... if (xgl_font) XFreeFont(fl_display, xgl_font); // font already loaded, free it - this *might* be a Bad Idea - glsize = fl_size_; // record current font size - glfont = fl_font_; // and face - xgl_font = load_xfont_for_xft2(); + glsize = driver->size(); // record current font size + glfont = driver->font(); // and face + xgl_font = load_xfont_for_xft2(driver); } return xgl_font; # else // XFT-1 provides a means to load a "core" font directly - if (current_font->core) return current_font->u.core.font; // is the current font a "core" font? If so, use it. + if (driver->font_descriptor()->font->core) { + return driver->font_descriptor()->font->u.core.font; // is the current font a "core" font? If so, use it. + } static XftFont* xftfont; if (xftfont) XftFontClose (fl_display, xftfont); - xftfont = fontopen(fl_fonts[fl_font_].name, true); // else request XFT to load a suitable "core" font instead. + xftfont = fontopen(fl_fonts[driver->font()].name, driver->size(), true, 0); // else request XFT to load a suitable "core" font instead. return xftfont->u.core.font; # endif // XFT_MAJOR > 1 } XFontStruct* Fl_XFont_On_Demand::value() { - if (!ptr) ptr = fl_xxfont(); + if (!ptr) ptr = fl_xxfont(fl_graphics_driver); return ptr; } @@ -515,9 +579,9 @@ void fl_destroy_xft_draw(Window id) { #endif } -void Fl_Graphics_Driver::draw(const char *str, int n, int x, int y) { - if ( !current_font ) { - fl_font(FL_HELVETICA, 14); +void Fl_Xlib_Graphics_Driver::draw(const char *str, int n, int x, int y) { + if ( !this->font_descriptor() ) { + this->font(FL_HELVETICA, FL_NORMAL_SIZE); } #if USE_OVERLAY XftDraw*& draw_ = fl_overlay ? draw_overlay : ::draw_; @@ -542,27 +606,28 @@ void Fl_Graphics_Driver::draw(const char *str, int n, int x, int y) { // Use fltk's color allocator, copy the results to match what // XftCollorAllocValue returns: XftColor color; - color.pixel = fl_xpixel(fl_color_); - uchar r,g,b; Fl::get_color(fl_color_, r,g,b); + color.pixel = fl_xpixel(Fl_Graphics_Driver::color()); + uchar r,g,b; Fl::get_color(Fl_Graphics_Driver::color(), r,g,b); color.color.red = ((int)r)*0x101; color.color.green = ((int)g)*0x101; color.color.blue = ((int)b)*0x101; color.color.alpha = 0xffff; - - XftDrawStringUtf8(draw_, &color, current_font, x, y, (XftChar8 *)str, n); + + const wchar_t *buffer = utf8reformat(str, n); +#ifdef __CYGWIN__ + XftDrawString16(draw_, &color, font_descriptor()->font, x, y, (XftChar16 *)buffer, n); +#else + XftDrawString32(draw_, &color, font_descriptor()->font, x, y, (XftChar32 *)buffer, n); +#endif } -void Fl_Graphics_Driver::draw(int angle, const char *str, int n, int x, int y) { - fl_font(fl_font_, fl_size_, angle); - fl_draw(str, n, (int)x, (int)y); - fl_font(fl_font_, fl_size_); +void Fl_Xlib_Graphics_Driver::draw(int angle, const char *str, int n, int x, int y) { + fl_xft_font(this, this->Fl_Graphics_Driver::font(), this->size(), angle); + this->draw(str, n, (int)x, (int)y); + fl_xft_font(this, this->Fl_Graphics_Driver::font(), this->size(), 0); } -void fl_draw(const char* str, int n, float x, float y) { - fl_draw(str, n, (int)x, (int)y); -} - -static void fl_drawUCS4(const FcChar32 *str, int n, int x, int y) { +static void fl_drawUCS4(Fl_Graphics_Driver *driver, const FcChar32 *str, int n, int x, int y) { #if USE_OVERLAY XftDraw*& draw_ = fl_overlay ? draw_overlay : ::draw_; if (fl_overlay) { @@ -586,21 +651,21 @@ static void fl_drawUCS4(const FcChar32 *str, int n, int x, int y) { // Use fltk's color allocator, copy the results to match what // XftCollorAllocValue returns: XftColor color; - color.pixel = fl_xpixel(fl_color_); - uchar r,g,b; Fl::get_color(fl_color_, r,g,b); + color.pixel = fl_xpixel(driver->color()); + uchar r,g,b; Fl::get_color(driver->color(), r,g,b); color.color.red = ((int)r)*0x101; color.color.green = ((int)g)*0x101; color.color.blue = ((int)b)*0x101; color.color.alpha = 0xffff; - XftDrawString32(draw_, &color, current_font, x, y, (FcChar32 *)str, n); + XftDrawString32(draw_, &color, driver->font_descriptor()->font, x, y, (FcChar32 *)str, n); } -void Fl_Graphics_Driver::rtl_draw(const char* c, int n, int x, int y) { +void Fl_Xlib_Graphics_Driver::rtl_draw(const char* c, int n, int x, int y) { #if defined(__GNUC__) -#warning Need to improve this XFT right to left draw function +// FIXME: warning Need to improve this XFT right to left draw function #endif /*__GNUC__*/ // This actually draws LtoR, but aligned to R edge with the glyph order reversed... @@ -629,13 +694,13 @@ void Fl_Graphics_Driver::rtl_draw(const char* c, int n, int x, int y) { out = out - 1; } // Now we have a UCS4 version of the input text, reversed, in ucs_txt - int offs = (int)fl_width(ucs_txt, n); - fl_drawUCS4(ucs_txt, n, (x-offs), y); + int offs = (int)fl_xft_width(font_descriptor(), ucs_txt, n); + fl_drawUCS4(this, ucs_txt, n, (x-offs), y); delete[] ucs_txt; } #endif // -// End of "$Id: fl_font_xft.cxx 7652 2010-06-21 15:49:45Z manolo $" +// End of "$Id: fl_font_xft.cxx 8442 2011-02-18 13:39:48Z manolo $" // diff --git a/plugins/zynaddsubfx/fltk/src/fl_gtk.cxx b/plugins/zynaddsubfx/fltk/src/fl_gtk.cxx index a75a392c1..76cbe4cbc 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_gtk.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_gtk.cxx @@ -1,12 +1,12 @@ // -// "$Id: fl_gtk.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: fl_gtk.cxx 7903 2010-11-28 21:06:39Z matt $" // // "GTK" drawing routines for the Fast Light Tool Kit (FLTK). // // These box types provide a GTK+ look, based on Red Hat's Bluecurve // theme... // -// Copyright 2006-2009 by Michael Sweet. +// Copyright 2006-2010 by Michael Sweet. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -300,5 +300,5 @@ Fl_Boxtype fl_define_FL_GTK_UP_BOX() { // -// End of "$Id: fl_gtk.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: fl_gtk.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_labeltype.cxx b/plugins/zynaddsubfx/fltk/src/fl_labeltype.cxx index afdb88d0a..e9d3ae9fd 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_labeltype.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_labeltype.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_labeltype.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: fl_labeltype.cxx 7903 2010-11-28 21:06:39Z matt $" // // Label drawing routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -140,5 +140,5 @@ void Fl_Widget::draw_label(int X, int Y, int W, int H, Fl_Align a) const { #include // -// End of "$Id: fl_labeltype.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: fl_labeltype.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_line_style.cxx b/plugins/zynaddsubfx/fltk/src/fl_line_style.cxx index 39c661e1f..f9b61bfb4 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_line_style.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_line_style.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_line_style.cxx 7644 2010-06-15 21:16:27Z manolo $" +// "$Id: fl_line_style.cxx 8190 2011-01-05 10:21:45Z manolo $" // // Line style code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -37,6 +37,11 @@ #include "flstring.h" #include +// We save the current line width (absolute value) here. +// This is currently used only for X11 clipping, see src/fl_rect.cxx. +// FIXME: this would probably better be in class Fl:: +int fl_line_width_ = 0; + #ifdef __APPLE_QUARTZ__ float fl_quartz_line_width_ = 1.0f; static enum CGLineCap fl_quartz_line_cap_ = kCGLineCapButt; @@ -53,6 +58,10 @@ void fl_quartz_restore_line_style_() { void Fl_Graphics_Driver::line_style(int style, int width, char* dashes) { + // save line width in global variable for X11 clipping + if (width == 0) fl_line_width_ = 1; + else fl_line_width_ = width>0 ? width : -width; + #if defined(USE_X11) int ndashes = dashes ? strlen(dashes) : 0; // emulate the WIN32 dash patterns on X @@ -118,7 +127,7 @@ void Fl_Graphics_Driver::line_style(int style, int width, char* dashes) { fl_quartz_line_width_ = (float)width; fl_quartz_line_cap_ = Cap[(style>>8)&3]; // when printing kCGLineCapSquare seems better for solid lines - if ( Fl_Surface_Device::surface()->type() == Fl_Printer::device_type && style == FL_SOLID && dashes == NULL ) { + if ( Fl_Surface_Device::surface()->class_name() == Fl_Printer::class_id && style == FL_SOLID && dashes == NULL ) { fl_quartz_line_cap_ = kCGLineCapSquare; } fl_quartz_line_join_ = Join[(style>>12)&3]; @@ -161,5 +170,5 @@ void Fl_Graphics_Driver::line_style(int style, int width, char* dashes) { // -// End of "$Id: fl_line_style.cxx 7644 2010-06-15 21:16:27Z manolo $". +// End of "$Id: fl_line_style.cxx 8190 2011-01-05 10:21:45Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_open_uri.cxx b/plugins/zynaddsubfx/fltk/src/fl_open_uri.cxx index b04443d96..adeb4cb91 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_open_uri.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_open_uri.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_open_uri.cxx 6986 2010-01-01 18:30:49Z greg.ercolano $" +// "$Id: fl_open_uri.cxx 8063 2010-12-19 21:20:10Z matt $" // // fl_open_uri() code for FLTK. // @@ -7,7 +7,7 @@ // // gcc -I/fltk/dir -I/fltk/dir/src -DTEST -o fl_open_uri fl_open_uri.cxx -lfltk // -// Copyright 2003-2009 by Michael R Sweet +// Copyright 2003-2010 by Michael R Sweet // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -36,7 +36,6 @@ #include #include "flstring.h" #ifdef WIN32 -#include # include # include #else @@ -58,6 +57,8 @@ static char *path_find(const char *program, char *filename, int filesize); static int run_program(const char *program, char **argv, char *msg, int msglen); #endif // !WIN32 +/** \addtogroup filenames + @{ */ /** * Opens the specified Uniform Resource Identifier (URI). @@ -125,7 +126,7 @@ fl_open_uri(const char *uri, char *msg, int msglen) { #ifdef WIN32 if (msg) snprintf(msg, msglen, "open %s", uri); - return (intptr_t)ShellExecute(HWND_DESKTOP, "open", uri, NULL, NULL, SW_SHOW) > 32; + return (int)(ShellExecute(HWND_DESKTOP, "open", uri, NULL, NULL, SW_SHOW) > (void *)32); #elif defined(__APPLE__) char *argv[3]; // Command-line arguments @@ -151,7 +152,7 @@ fl_open_uri(const char *uri, char *msg, int msglen) { // BROWSER environment variables because we have no idea whether // we need to run the listed commands in a terminal program. - char command[1024], // Command to run... + char command[FL_PATH_MAX], // Command to run... *argv[4], // Command-line arguments remote[1024]; // Remote-mode command... const char * const *commands; // Array of commands to check... @@ -240,6 +241,7 @@ fl_open_uri(const char *uri, char *msg, int msglen) { #endif // WIN32 } +/** @} */ #if !defined(WIN32) && !defined(__APPLE__) // Find a program in the path... @@ -377,5 +379,5 @@ int main(int argc, char **argv) { // -// End of "$Id: fl_open_uri.cxx 6986 2010-01-01 18:30:49Z greg.ercolano $". +// End of "$Id: fl_open_uri.cxx 8063 2010-12-19 21:20:10Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_oval_box.cxx b/plugins/zynaddsubfx/fltk/src/fl_oval_box.cxx index ef777ec4e..0dad6d738 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_oval_box.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_oval_box.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_oval_box.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: fl_oval_box.cxx 7903 2010-11-28 21:06:39Z matt $" // // Oval box drawing code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -62,5 +62,5 @@ Fl_Boxtype fl_define_FL_OVAL_BOX() { } // -// End of "$Id: fl_oval_box.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: fl_oval_box.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_overlay.cxx b/plugins/zynaddsubfx/fltk/src/fl_overlay.cxx index bc994f62c..adcd8712e 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_overlay.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_overlay.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_overlay.cxx 6690 2009-03-15 20:52:46Z engelsman $" +// "$Id: fl_overlay.cxx 7903 2010-11-28 21:06:39Z matt $" // // Overlay support for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -125,5 +125,5 @@ void fl_overlay_rect(int x, int y, int w, int h) { } // -// End of "$Id: fl_overlay.cxx 6690 2009-03-15 20:52:46Z engelsman $". +// End of "$Id: fl_overlay.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_overlay_visual.cxx b/plugins/zynaddsubfx/fltk/src/fl_overlay_visual.cxx index e188f020b..392898fa8 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_overlay_visual.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_overlay_visual.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_overlay_visual.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: fl_overlay_visual.cxx 7903 2010-11-28 21:06:39Z matt $" // // X overlay support for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -101,5 +101,5 @@ XVisualInfo *fl_find_overlay_visual() { #endif // -// End of "$Id: fl_overlay_visual.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: fl_overlay_visual.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_plastic.cxx b/plugins/zynaddsubfx/fltk/src/fl_plastic.cxx index d8d4c4b05..28a50c7d1 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_plastic.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_plastic.cxx @@ -1,12 +1,12 @@ // -// "$Id: fl_plastic.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: fl_plastic.cxx 7903 2010-11-28 21:06:39Z matt $" // // "Plastic" drawing routines for the Fast Light Tool Kit (FLTK). // // These box types provide a cross between Aqua and KDE buttons; kindof // like translucent plastic buttons... // -// Copyright 2001-2009 by Michael Sweet. +// Copyright 2001-2010 by Michael Sweet. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -87,13 +87,13 @@ static void frame_rect(int x, int y, int w, int h, const char *c, Fl_Color bc) { { // Draw lines around the perimeter of the button, 4 colors per // circuit. - fl_color(shade_color(g[*c++], bc)); + fl_color(shade_color(g[(int)*c++], bc)); fl_line(x, y + h + b, x + w - 1, y + h + b, x + w + b - 1, y + h); - fl_color(shade_color(g[*c++], bc)); + fl_color(shade_color(g[(int)*c++], bc)); fl_line(x + w + b - 1, y + h, x + w + b - 1, y, x + w - 1, y - b); - fl_color(shade_color(g[*c++], bc)); + fl_color(shade_color(g[(int)*c++], bc)); fl_line(x + w - 1, y - b, x, y - b, x - b, y); - fl_color(shade_color(g[*c++], bc)); + fl_color(shade_color(g[(int)*c++], bc)); fl_line(x - b, y, x - b, y + h, x, y + h + b); } } @@ -106,45 +106,45 @@ static void frame_round(int x, int y, int w, int h, const char *c, Fl_Color bc) if (w==h) { for (; b > 1; b --, x ++, y ++, w -= 2, h -= 2) { - fl_color(shade_color(g[*c++], bc)); + fl_color(shade_color(g[(int)*c++], bc)); fl_arc(x, y, w, h, 45.0, 135.0); - fl_color(shade_color(g[*c++], bc)); + fl_color(shade_color(g[(int)*c++], bc)); fl_arc(x, y, w, h, 315.0, 405.0); - fl_color(shade_color(g[*c++], bc)); + fl_color(shade_color(g[(int)*c++], bc)); fl_arc(x, y, w, h, 225.0, 315.0); - fl_color(shade_color(g[*c++], bc)); + fl_color(shade_color(g[(int)*c++], bc)); fl_arc(x, y, w, h, 135.0, 225.0); } } else if (w>h) { int d = h/2; for (; b > 1; d--, b --, x ++, y ++, w -= 2, h -= 2) { - fl_color(shade_color(g[*c++], bc)); + fl_color(shade_color(g[(int)*c++], bc)); fl_arc(x, y, h, h, 90.0, 135.0); fl_xyline(x+d, y, x+w-d); fl_arc(x+w-h, y, h, h, 45.0, 90.0); - fl_color(shade_color(g[*c++], bc)); + fl_color(shade_color(g[(int)*c++], bc)); fl_arc(x+w-h, y, h, h, 315.0, 405.0); - fl_color(shade_color(g[*c++], bc)); + fl_color(shade_color(g[(int)*c++], bc)); fl_arc(x+w-h, y, h, h, 270.0, 315.0); fl_xyline(x+d, y+h-1, x+w-d); fl_arc(x, y, h, h, 225.0, 270.0); - fl_color(shade_color(g[*c++], bc)); + fl_color(shade_color(g[(int)*c++], bc)); fl_arc(x, y, h, h, 135.0, 225.0); } } else if (w 1; d--, b --, x ++, y ++, w -= 2, h -= 2) { - fl_color(shade_color(g[*c++], bc)); + fl_color(shade_color(g[(int)*c++], bc)); fl_arc(x, y, w, w, 45.0, 135.0); - fl_color(shade_color(g[*c++], bc)); + fl_color(shade_color(g[(int)*c++], bc)); fl_arc(x, y, w, w, 0.0, 45.0); fl_yxline(x+w-1, y+d, y+h-d); fl_arc(x, y+h-w, w, w, 315.0, 360.0); - fl_color(shade_color(g[*c++], bc)); + fl_color(shade_color(g[(int)*c++], bc)); fl_arc(x, y+h-w, w, w, 225.0, 315.0); - fl_color(shade_color(g[*c++], bc)); + fl_color(shade_color(g[(int)*c++], bc)); fl_arc(x, y+h-w, w, w, 180.0, 225.0); fl_yxline(x, y+d, y+h-d); fl_arc(x, y, w, w, 135.0, 180.0); @@ -166,7 +166,7 @@ static void shade_rect(int x, int y, int w, int h, const char *c, Fl_Color bc) { for (i = 0, j = 0; j < chalf; i ++, j += cstep) { // Draw the top line and points... - fl_color(shade_color(g[c[i]], bc)); + fl_color(shade_color(g[(int)c[i]], bc)); fl_xyline(x + 1, y + i, x + w - 2); fl_color(shade_color(g[c[i] - 2], bc)); @@ -174,7 +174,7 @@ static void shade_rect(int x, int y, int w, int h, const char *c, Fl_Color bc) { fl_point(x + w - 1, y + i + 1); // Draw the bottom line and points... - fl_color(shade_color(g[c[clen - i]], bc)); + fl_color(shade_color(g[(int)c[clen - i]], bc)); fl_xyline(x + 1, y + h - i, x + w - 2); fl_color(shade_color(g[c[clen - i] - 2], bc)); @@ -185,7 +185,7 @@ static void shade_rect(int x, int y, int w, int h, const char *c, Fl_Color bc) { // Draw the interior and sides... i = chalf / cstep; - fl_color(shade_color(g[c[chalf]], bc)); + fl_color(shade_color(g[(int)c[chalf]], bc)); fl_rectf(x + 1, y + i, w - 2, h - 2 * i + 1); fl_color(shade_color(g[c[chalf] - 2], bc)); @@ -197,7 +197,7 @@ static void shade_rect(int x, int y, int w, int h, const char *c, Fl_Color bc) { for (i = 0, j = 0; j < chalf; i ++, j += cstep) { // Draw the left line and points... - fl_color(shade_color(g[c[i]], bc)); + fl_color(shade_color(g[(int)c[i]], bc)); fl_yxline(x + i, y + 1, y + h - 1); fl_color(shade_color(g[c[i] - 2], bc)); @@ -205,7 +205,7 @@ static void shade_rect(int x, int y, int w, int h, const char *c, Fl_Color bc) { fl_point(x + i + 1, y + h); // Draw the right line and points... - fl_color(shade_color(g[c[clen - i]], bc)); + fl_color(shade_color(g[(int)c[clen - i]], bc)); fl_yxline(x + w - 1 - i, y + 1, y + h - 1); fl_color(shade_color(g[c[clen - i] - 2], bc)); @@ -216,7 +216,7 @@ static void shade_rect(int x, int y, int w, int h, const char *c, Fl_Color bc) { // Draw the interior, top, and bottom... i = chalf / cstep; - fl_color(shade_color(g[c[chalf]], bc)); + fl_color(shade_color(g[(int)c[chalf]], bc)); fl_rectf(x + i, y + 1, w - 2 * i, h - 1); fl_color(shade_color(g[c[chalf] - 2], bc)); @@ -236,20 +236,20 @@ static void shade_round(int x, int y, int w, int h, const char *c, Fl_Color bc) const int na = 8; for (i=0; i -extern unsigned char *MACbitmapFromRectOfWindow(Fl_Window *win, int x, int y, int w, int h, int *bytesPerPixel); // // 'fl_read_image()' - Read an image from the current window or off-screen buffer. @@ -54,7 +53,7 @@ fl_read_image(uchar *p, // I - Pixel buffer or NULL to allocate else { // reading from current window Fl_Window *window = Fl_Window::current(); while(window->window()) window = window->window(); - base = MACbitmapFromRectOfWindow(window,x,y,w,h,&delta); + base = Fl_X::bitmap_from_window_rect(window,x,y,w,h,&delta); rowBytes = delta*w; x = y = 0; } @@ -73,11 +72,11 @@ fl_read_image(uchar *p, // I - Pixel buffer or NULL to allocate pdst[2] = psrc[2]; // B } } - if(fl_window != NULL) delete base; + if(fl_window != NULL) delete[] base; return p; } // -// End of "$Id: fl_read_image_mac.cxx 7670 2010-07-09 17:29:35Z manolo $". +// End of "$Id: fl_read_image_mac.cxx 8362 2011-02-02 18:39:34Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_read_image_win32.cxx b/plugins/zynaddsubfx/fltk/src/fl_read_image_win32.cxx index d3ef8ecb6..a58bafab8 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_read_image_win32.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_read_image_win32.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_read_image_win32.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: fl_read_image_win32.cxx 8595 2011-04-17 08:48:40Z manolo $" // // WIN32 image reading routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -36,10 +36,8 @@ fl_read_image(uchar *p, // I - Pixel buffer or NULL to allocate int w, // I - Width of area to read int h, // I - Height of area to read int alpha) { // I - Alpha value for image (0 for none) - int x, y; // Looping vars - int d; // Depth of image - uchar *ptr; // Pointer in image data + int d; // Depth of image // Allocate the image data array as needed... d = alpha ? 4 : 3; @@ -49,24 +47,87 @@ fl_read_image(uchar *p, // I - Pixel buffer or NULL to allocate // Initialize the default colors/alpha in the whole image... memset(p, alpha, w * h * d); - // Grab all of the pixels in the image, one at a time... - // MRS: there has to be a better way than this! - for (y = 0, ptr = p; y < h; y ++) { - for (x = 0; x < w; x ++, ptr += d) { - COLORREF c = GetPixel(fl_gc, X + x, Y + y); + // Grab all of the pixels in the image... - ptr[0] = (uchar)c; - c >>= 8; - ptr[1] = (uchar)c; - c >>= 8; - ptr[2] = (uchar)c; + // Assure that we are not trying to read non-existing data. If it is so, the + // function should still work, but the out-of-bounds part of the image is + // untouched (initialized with the alpha value or 0 (black), resp.). + + int ww = w; // We need the original width for output data line size + + int shift_x = 0; // X target shift if X modified + int shift_y = 0; // Y target shift if X modified + + if (X < 0) { + shift_x = -X; + w += X; + X = 0; + } + if (Y < 0) { + shift_y = -Y; + h += Y; + Y = 0; + } + + if (h < 1 || w < 1) return p; // nothing to copy + + int line_size = ((3*w+3)/4) * 4; // each line is aligned on a DWORD (4 bytes) + uchar *dib = new uchar[line_size*h]; // create temporary buffer to read DIB + + // fill in bitmap info for GetDIBits + + BITMAPINFO bi; + bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bi.bmiHeader.biWidth = w; + bi.bmiHeader.biHeight = -h; // negative => top-down DIB + bi.bmiHeader.biPlanes = 1; + bi.bmiHeader.biBitCount = 24; // 24 bits RGB + bi.bmiHeader.biCompression = BI_RGB; + bi.bmiHeader.biSizeImage = 0; + bi.bmiHeader.biXPelsPerMeter = 0; + bi.bmiHeader.biYPelsPerMeter = 0; + bi.bmiHeader.biClrUsed = 0; + bi.bmiHeader.biClrImportant = 0; + + // copy bitmap from original DC (Window, Fl_Offscreen, ...) + + HDC hdc = CreateCompatibleDC(fl_gc); + HBITMAP hbm = CreateCompatibleBitmap(fl_gc,w,h); + + int save_dc = SaveDC(hdc); // save context for cleanup + SelectObject(hdc,hbm); // select bitmap + BitBlt(hdc,0,0,w,h,fl_gc,X,Y,SRCCOPY); // copy image section to DDB + + // copy RGB image data to the allocated DIB + + GetDIBits(hdc, hbm, 0, h, dib, (BITMAPINFO *)&bi, DIB_RGB_COLORS); + + // finally copy the image data to the user buffer + + for (int j = 0; j #include +// fl_line_width_ must contain the absolute value of the current +// line width to be used for X11 clipping (see below). +// This is defined in src/fl_line_style.cxx +extern int fl_line_width_; + #ifdef __APPLE_QUARTZ__ extern float fl_quartz_line_width_; -#define USINGQUARTZPRINTER (Fl_Surface_Device::surface()->type() == Fl_Printer::device_type) +#define USINGQUARTZPRINTER (Fl_Surface_Device::surface()->class_name() == Fl_Printer::class_id) #endif +#ifdef USE_X11 + +#ifndef SHRT_MAX +#define SHRT_MAX (32767) +#endif + +/* + We need to check some coordinates for areas for clipping before we + use X functions, because X can't handle coordinates outside the 16-bit + range. Since all windows use relative coordinates > 0, we do also + check for negative values. X11 only, see also STR #2304. + + Note that this is only necessary for large objects, where only a + part of the object is visible. The draw() functions (e.g. box + drawing) must be clipped correctly. This is usually only a matter + for large container widgets. The individual child widgets will be + clipped completely. + + We define the usable X coordinate space as [ -LW : SHRT_MAX - LW ] + where LW = current line width for drawing. This is done so that + horizontal and vertical line drawing works correctly, even in real + border cases, e.g. drawing a rectangle slightly outside the top left + window corner, but with a line width so that a part of the line should + be visible (in this case 2 of 5 pixels): + + fl_line_style (FL_SOLID,5); // line width = 5 + fl_rect (-1,-1,100,100); // top/left: 2 pixels visible + + In this example case, no clipping would be done, because X can + handle it and clip unneeded pixels. + + Note that we must also take care of the case where fl_line_width_ + is zero (maybe unitialized). If this is the case, we assume a line + width of 1. + + Todo: Arbitrary line drawings (e.g. polygons) and clip regions + are not yet done. + + Note: + + We could use max. screen coordinates instead of SHRT_MAX, but that + would need more work and would probably be slower. We assume that + all window coordinates are >= 0 and that no window extends up to + 32767 - LW (where LW = current line width). Thus it is safe to clip + all coordinates to this range before calling X functions. If this + is not true, then clip_to_short() and clip_x() must be redefined. + + It would be somewhat easier if we had fl_clip_w and fl_clip_h, as + defined in FLTK 2.0 (for the upper clipping bounds)... +*/ + +/* + clip_to_short() returns 1, if the area is invisible (clipped), + because ... + + (a) w or h are <= 0 i.e. nothing is visible + (b) x+w or y+h are < kmin i.e. left of or above visible area + (c) x or y are > kmax i.e. right of or below visible area + + kmin and kmax are the minimal and maximal X coordinate values, + as defined above. In this case x, y, w, and h are not changed. + + It returns 0, if the area is potentially visible and X can handle + clipping. x, y, w, and h may have been adjusted to fit into the + X coordinate space. + + Use this for clipping rectangles, as used in fl_rect() and + fl_rectf(). +*/ + +static int clip_to_short(int &x, int &y, int &w, int &h) { + + int lw = (fl_line_width_ > 0) ? fl_line_width_ : 1; + int kmin = -lw; + int kmax = SHRT_MAX - lw; + + if (w <= 0 || h <= 0) return 1; // (a) + if (x+w < kmin || y+h < kmin) return 1; // (b) + if (x > kmax || y > kmax) return 1; // (c) + + if (x < kmin) { w -= (kmin-x); x = kmin; } + if (y < kmin) { h -= (kmin-y); y = kmin; } + if (x+w > kmax) w = kmax - x; + if (y+h > kmax) h = kmax - y; + + return 0; +} + +/* + clip_x() returns a coordinate value clipped to the 16-bit coordinate + space (see above). This can be used to draw horizontal and vertical + lines that can be handled by X11. Each single coordinate value can + be clipped individually, and the result can be used directly, e.g. + in fl_xyline() and fl_yxline(). Note that this can't be used for + arbitrary lines (not horizontal or vertical). +*/ +static int clip_x (int x) { + + int lw = (fl_line_width_ > 0) ? fl_line_width_ : 1; + int kmin = -lw; + int kmax = SHRT_MAX - lw; + + if (x < kmin) + x = kmin; + else if (x > kmax) + x = kmax; + return x; +} + +#endif // USE_X11 + + void Fl_Graphics_Driver::rect(int x, int y, int w, int h) { if (w<=0 || h<=0) return; #if defined(USE_X11) - XDrawRectangle(fl_display, fl_window, fl_gc, x, y, w-1, h-1); + if (!clip_to_short(x, y, w, h)) + XDrawRectangle(fl_display, fl_window, fl_gc, x, y, w-1, h-1); #elif defined(WIN32) MoveToEx(fl_gc, x, y, 0L); LineTo(fl_gc, x+w-1, y); @@ -59,10 +177,10 @@ void Fl_Graphics_Driver::rect(int x, int y, int w, int h) { LineTo(fl_gc, x, y+h-1); LineTo(fl_gc, x, y); #elif defined(__APPLE_QUARTZ__) - if (USINGQUARTZPRINTER || fl_quartz_line_width_ > 1.5f) CGContextSetShouldAntialias(fl_gc, true); + if ( (!USINGQUARTZPRINTER) && fl_quartz_line_width_ > 1.5f) CGContextSetShouldAntialias(fl_gc, true); CGRect rect = CGRectMake(x, y, w-1, h-1); CGContextStrokeRect(fl_gc, rect); - if (USINGQUARTZPRINTER || fl_quartz_line_width_ > 1.5f) CGContextSetShouldAntialias(fl_gc, false); + if ( (!USINGQUARTZPRINTER) && fl_quartz_line_width_ > 1.5f) CGContextSetShouldAntialias(fl_gc, false); #else # error unsupported platform #endif @@ -71,17 +189,22 @@ void Fl_Graphics_Driver::rect(int x, int y, int w, int h) { void Fl_Graphics_Driver::rectf(int x, int y, int w, int h) { if (w<=0 || h<=0) return; #if defined(USE_X11) - if (w && h) XFillRectangle(fl_display, fl_window, fl_gc, x, y, w, h); + if (!clip_to_short(x, y, w, h)) + XFillRectangle(fl_display, fl_window, fl_gc, x, y, w, h); #elif defined(WIN32) RECT rect; rect.left = x; rect.top = y; rect.right = x + w; rect.bottom = y + h; FillRect(fl_gc, &rect, fl_brush()); #elif defined(__APPLE_QUARTZ__) - if (USINGQUARTZPRINTER || fl_quartz_line_width_ > 1.5f) CGContextSetShouldAntialias(fl_gc, true); - CGRect rect = CGRectMake(x, y, w-1, h-1); + CGFloat delta_size = 0.9; + CGFloat delta_ori = 0; + if (USINGQUARTZPRINTER) { + delta_size = 0; + delta_ori = 0.5; + } + CGRect rect = CGRectMake(x - delta_ori, y - delta_ori, w - delta_size , h - delta_size); CGContextFillRect(fl_gc, rect); - if (USINGQUARTZPRINTER || fl_quartz_line_width_ > 1.5f) CGContextSetShouldAntialias(fl_gc, false); #else # error unsupported platform #endif @@ -89,7 +212,7 @@ void Fl_Graphics_Driver::rectf(int x, int y, int w, int h) { void Fl_Graphics_Driver::xyline(int x, int y, int x1) { #if defined(USE_X11) - XDrawLine(fl_display, fl_window, fl_gc, x, y, x1, y); + XDrawLine(fl_display, fl_window, fl_gc, clip_x(x), clip_x(y), clip_x(x1), clip_x(y)); #elif defined(WIN32) MoveToEx(fl_gc, x, y, 0L); LineTo(fl_gc, x1+1, y); #elif defined(__APPLE_QUARTZ__) @@ -106,8 +229,8 @@ void Fl_Graphics_Driver::xyline(int x, int y, int x1) { void Fl_Graphics_Driver::xyline(int x, int y, int x1, int y2) { #if defined (USE_X11) XPoint p[3]; - p[0].x = x; p[0].y = p[1].y = y; - p[1].x = p[2].x = x1; p[2].y = y2; + p[0].x = clip_x(x); p[0].y = p[1].y = clip_x(y); + p[1].x = p[2].x = clip_x(x1); p[2].y = clip_x(y2); XDrawLines(fl_display, fl_window, fl_gc, p, 3, 0); #elif defined(WIN32) if (y2 < y) y2--; @@ -130,9 +253,9 @@ void Fl_Graphics_Driver::xyline(int x, int y, int x1, int y2) { void Fl_Graphics_Driver::xyline(int x, int y, int x1, int y2, int x3) { #if defined(USE_X11) XPoint p[4]; - p[0].x = x; p[0].y = p[1].y = y; - p[1].x = p[2].x = x1; p[2].y = p[3].y = y2; - p[3].x = x3; + p[0].x = clip_x(x); p[0].y = p[1].y = clip_x(y); + p[1].x = p[2].x = clip_x(x1); p[2].y = p[3].y = clip_x(y2); + p[3].x = clip_x(x3); XDrawLines(fl_display, fl_window, fl_gc, p, 4, 0); #elif defined(WIN32) if(x3 < x1) x3--; @@ -156,7 +279,7 @@ void Fl_Graphics_Driver::xyline(int x, int y, int x1, int y2, int x3) { void Fl_Graphics_Driver::yxline(int x, int y, int y1) { #if defined(USE_X11) - XDrawLine(fl_display, fl_window, fl_gc, x, y, x, y1); + XDrawLine(fl_display, fl_window, fl_gc, clip_x(x), clip_x(y), clip_x(x), clip_x(y1)); #elif defined(WIN32) if (y1 < y) y1--; else y1++; @@ -175,8 +298,8 @@ void Fl_Graphics_Driver::yxline(int x, int y, int y1) { void Fl_Graphics_Driver::yxline(int x, int y, int y1, int x2) { #if defined(USE_X11) XPoint p[3]; - p[0].x = p[1].x = x; p[0].y = y; - p[1].y = p[2].y = y1; p[2].x = x2; + p[0].x = p[1].x = clip_x(x); p[0].y = clip_x(y); + p[1].y = p[2].y = clip_x(y1); p[2].x = clip_x(x2); XDrawLines(fl_display, fl_window, fl_gc, p, 3, 0); #elif defined(WIN32) if (x2 > x) x2++; @@ -199,9 +322,9 @@ void Fl_Graphics_Driver::yxline(int x, int y, int y1, int x2) { void Fl_Graphics_Driver::yxline(int x, int y, int y1, int x2, int y3) { #if defined(USE_X11) XPoint p[4]; - p[0].x = p[1].x = x; p[0].y = y; - p[1].y = p[2].y = y1; p[2].x = p[3].x = x2; - p[3].y = y3; + p[0].x = p[1].x = clip_x(x); p[0].y = clip_x(y); + p[1].y = p[2].y = clip_x(y1); p[2].x = p[3].x = clip_x(x2); + p[3].y = clip_x(y3); XDrawLines(fl_display, fl_window, fl_gc, p, 4, 0); #elif defined(WIN32) if(y3 1.5f) CGContextSetShouldAntialias(fl_gc, true); - CGContextMoveToPoint(fl_gc, x-.5, y); // Quartz needs a line that is one pixel long, or it will not draw anything - CGContextAddLineToPoint(fl_gc, x+.5, y); - CGContextStrokePath(fl_gc); - if (fl_quartz_line_width_ > 1.5f) CGContextSetShouldAntialias(fl_gc, false); + CGContextFillRect(fl_gc, CGRectMake(x - 0.5, y - 0.5, 1, 1) ); #else # error unsupported platform #endif @@ -394,17 +513,12 @@ void Fl_Graphics_Driver::point(int x, int y) { //////////////////////////////////////////////////////////////// -#define STACK_SIZE 10 -#define STACK_MAX (STACK_SIZE - 1) -static Fl_Region rstack[STACK_SIZE]; -static int rstackptr=0; -int fl_clip_state_number=0; // used by gl_begin.cxx to update GL clip - #if !defined(WIN32) && !defined(__APPLE__) // Missing X call: (is this the fastest way to init a 1-rectangle region?) // MSWindows equivalent exists, implemented inline in win32.H Fl_Region XRectangleRegion(int x, int y, int w, int h) { XRectangle R; + clip_to_short(x, y, w, h); R.x = x; R.y = y; R.width = w; R.height = h; Fl_Region r = XCreateRegion(); XUnionRectWithRegion(&R, r, r); @@ -412,7 +526,7 @@ Fl_Region XRectangleRegion(int x, int y, int w, int h) { } #endif -void fl_restore_clip() { +void Fl_Graphics_Driver::restore_clip() { fl_clip_state_number++; Fl_Region r = rstack[rstackptr]; #if defined(USE_X11) @@ -440,14 +554,14 @@ void fl_restore_clip() { #endif } -void fl_clip_region(Fl_Region r) { +void Fl_Graphics_Driver::clip_region(Fl_Region r) { Fl_Region oldr = rstack[rstackptr]; if (oldr) XDestroyRegion(oldr); rstack[rstackptr] = r; fl_restore_clip(); } -Fl_Region fl_clip_region() { +Fl_Region Fl_Graphics_Driver::clip_region() { return rstack[rstackptr]; } @@ -466,7 +580,7 @@ void Fl_Graphics_Driver::push_clip(int x, int y, int w, int h) { CombineRgn(r,r,current,RGN_AND); #elif defined(__APPLE_QUARTZ__) XDestroyRegion(r); - r = MacRectRegionIntersect(current, x,y,w,h); + r = Fl_X::intersect_region_and_rect(current, x,y,w,h); #else # error unsupported platform #endif @@ -482,14 +596,14 @@ void Fl_Graphics_Driver::push_clip(int x, int y, int w, int h) { # error unsupported platform #endif } - if (rstackptr < STACK_MAX) rstack[++rstackptr] = r; + if (rstackptr < region_stack_max) rstack[++rstackptr] = r; else Fl::warning("fl_push_clip: clip stack overflow!\n"); fl_restore_clip(); } // make there be no clip (used by fl_begin_offscreen() only!) void Fl_Graphics_Driver::push_no_clip() { - if (rstackptr < STACK_MAX) rstack[++rstackptr] = 0; + if (rstackptr < region_stack_max) rstack[++rstackptr] = 0; else Fl::warning("fl_push_no_clip: clip stack overflow!\n"); fl_restore_clip(); } @@ -506,26 +620,26 @@ void Fl_Graphics_Driver::pop_clip() { int Fl_Graphics_Driver::not_clipped(int x, int y, int w, int h) { if (x+w <= 0 || y+h <= 0) return 0; Fl_Region r = rstack[rstackptr]; -#if defined (USE_X11) - return r ? XRectInRegion(r, x, y, w, h) : 1; -#elif defined(WIN32) if (!r) return 1; +#if defined (USE_X11) + // get rid of coordinates outside the 16-bit range the X calls take. + if (clip_to_short(x,y,w,h)) return 0; // clipped + return XRectInRegion(r, x, y, w, h); +#elif defined(WIN32) RECT rect; - if (Fl_Surface_Device::surface()->type() == Fl_Printer::device_type) { // in case of print context, convert coords from logical to device + if (Fl_Surface_Device::surface()->class_name() == Fl_Printer::class_id) { // in case of print context, convert coords from logical to device POINT pt[2] = { {x, y}, {x + w, y + h} }; LPtoDP(fl_gc, pt, 2); rect.left = pt[0].x; rect.top = pt[0].y; rect.right = pt[1].x; rect.bottom = pt[1].y; - } - else { + } else { rect.left = x; rect.top = y; rect.right = x+w; rect.bottom = y+h; - } + } return RectInRegion(r,&rect); #elif defined(__APPLE_QUARTZ__) - if (!r) return 1; CGRect arg = fl_cgrectmake_cocoa(x, y, w, h); - for(int i = 0; i < r->count; i++) { + for (int i = 0; i < r->count; i++) { CGRect test = CGRectIntersection(r->rects[i], arg); - if( ! CGRectIsEmpty(test)) return 1; + if (!CGRectIsEmpty(test)) return 1; } return 0; #else @@ -573,7 +687,7 @@ int Fl_Graphics_Driver::clip_box(int x, int y, int w, int h, int& X, int& Y, int } else { // partial intersection RECT rect; GetRgnBox(temp, &rect); - if(Fl_Surface_Device::surface()->type() == Fl_Printer::device_type) { // if print context, convert coords from device to logical + if(Fl_Surface_Device::surface()->class_name() == Fl_Printer::class_id) { // if print context, convert coords from device to logical POINT pt[2] = { {rect.left, rect.top}, {rect.right, rect.bottom} }; DPtoLP(fl_gc, pt, 2); X = pt[0].x; Y = pt[0].y; W = pt[1].x - X; H = pt[1].y - Y; @@ -597,10 +711,10 @@ int Fl_Graphics_Driver::clip_box(int x, int y, int w, int h, int& X, int& Y, int else u = CGRectUnion(u, test); } } - X = u.origin.x; - Y = u.origin.y; - W = u.size.width + 1; - H = u.size.height + 1; + X = int(u.origin.x); + Y = int(u.origin.y); + W = int(u.size.width + 1); + H = int(u.size.height + 1); if(CGRectIsEmpty(u)) W = H = 0; return ! CGRectEqualToRect(arg, u); #else @@ -609,5 +723,5 @@ int Fl_Graphics_Driver::clip_box(int x, int y, int w, int h, int& X, int& Y, int } // -// End of "$Id: fl_rect.cxx 7617 2010-05-27 17:20:18Z manolo $". +// End of "$Id: fl_rect.cxx 8630 2011-05-01 12:45:29Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_round_box.cxx b/plugins/zynaddsubfx/fltk/src/fl_round_box.cxx index a27694a38..f5a802ce0 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_round_box.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_round_box.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_round_box.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: fl_round_box.cxx 8630 2011-05-01 12:45:29Z AlbrechtS $" // // Round box drawing routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -35,7 +35,7 @@ // A compiler from a certain very large software company will not compile // the function pointer assignment due to the name conflict with fl_arc. // This function is to fix that: -void fl_arc_i(int x,int y,int w,int h,double a1,double a2) { +static void fl_arc_i(int x,int y,int w,int h,double a1,double a2) { fl_arc(x,y,w,h,a1,a2); } @@ -52,6 +52,7 @@ static void draw(int which, int x,int y,int w,int h, int inset, Fl_Color color) int d = w <= h ? w : h; if (d <= 1) return; fl_color(color); + fl_line_style(0,1); void (*f)(int,int,int,int,double,double); f = (which==FILL) ? fl_pie : fl_arc_i; if (which >= CLOSED) { @@ -78,6 +79,7 @@ static void draw(int which, int x,int y,int w,int h, int inset, Fl_Color color) if (which != LOWER_RIGHT) fl_xyline(x+d/2-1, y, x+w-d/2+1); } } + fl_line_style(0); } extern uchar* fl_gray_ramp(); @@ -118,5 +120,5 @@ Fl_Boxtype fl_define_FL_ROUND_UP_BOX() { } // -// End of "$Id: fl_round_box.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: fl_round_box.cxx 8630 2011-05-01 12:45:29Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_rounded_box.cxx b/plugins/zynaddsubfx/fltk/src/fl_rounded_box.cxx index ed1c0b053..ca7f009d4 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_rounded_box.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_rounded_box.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_rounded_box.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: fl_rounded_box.cxx 7903 2010-11-28 21:06:39Z matt $" // // Rounded box drawing routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -95,5 +95,5 @@ Fl_Boxtype fl_define_FL_RSHADOW_BOX() { } // -// End of "$Id: fl_rounded_box.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: fl_rounded_box.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_scroll_area.cxx b/plugins/zynaddsubfx/fltk/src/fl_scroll_area.cxx index 25f32c208..515a8cdde 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_scroll_area.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_scroll_area.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_scroll_area.cxx 7351 2010-03-29 10:35:00Z matt $" +// "$Id: fl_scroll_area.cxx 8055 2010-12-18 22:31:01Z manolo $" // // Scrolling routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -151,8 +151,7 @@ void fl_scroll(int X, int Y, int W, int H, int dx, int dy, BitBlt(fl_gc, dest_x, dest_y, src_w, src_h, fl_gc, src_x, src_y,SRCCOPY); #elif defined(__APPLE_QUARTZ__) - extern CGImageRef MAC_CGImageFromRectOfWindow(Fl_Window*, int x, int y, int w, int h); - CGImageRef img = MAC_CGImageFromRectOfWindow(Fl_Window::current(), src_x, src_y, src_w, src_h); + CGImageRef img = Fl_X::CGImage_from_window_rect(Fl_Window::current(), src_x, src_y, src_w, src_h); CGRect rect = { { dest_x, dest_y }, { src_w, src_h } }; Fl_X::q_begin_image(rect, 0, 0, src_w, src_h); CGContextDrawImage(fl_gc, rect, img); @@ -166,5 +165,5 @@ void fl_scroll(int X, int Y, int W, int H, int dx, int dy, } // -// End of "$Id: fl_scroll_area.cxx 7351 2010-03-29 10:35:00Z matt $". +// End of "$Id: fl_scroll_area.cxx 8055 2010-12-18 22:31:01Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_set_font.cxx b/plugins/zynaddsubfx/fltk/src/fl_set_font.cxx index d46a78252..0ae7305de 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_set_font.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_set_font.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_set_font.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: fl_set_font.cxx 7903 2010-11-28 21:06:39Z matt $" // // Font utilities for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -93,5 +93,5 @@ void Fl::set_font(Fl_Font fnum, Fl_Font from) { const char* Fl::get_font(Fl_Font fnum) {return fl_fonts[fnum].name;} // -// End of "$Id: fl_set_font.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: fl_set_font.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_set_fonts.cxx b/plugins/zynaddsubfx/fltk/src/fl_set_fonts.cxx index f39595bf8..d8973c172 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_set_fonts.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_set_fonts.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_set_fonts.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: fl_set_fonts.cxx 7903 2010-11-28 21:06:39Z matt $" // // More font utilities for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -42,5 +42,5 @@ #endif // WIN32 // -// End of "$Id: fl_set_fonts.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: fl_set_fonts.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_set_fonts_mac.cxx b/plugins/zynaddsubfx/fltk/src/fl_set_fonts_mac.cxx index d12a38ff8..7c3eb6f50 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_set_fonts_mac.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_set_fonts_mac.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_set_fonts_mac.cxx 7351 2010-03-29 10:35:00Z matt $" +// "$Id: fl_set_fonts_mac.cxx 8504 2011-03-04 16:48:10Z manolo $" // // MacOS font utilities for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -56,14 +56,21 @@ const char* Fl::get_font_name(Fl_Font fnum, int* ap) { return f->fontname; } +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 +static int name_compare(const void *a, const void *b) +{ + return strcmp(*(char**)a, *(char**)b); +} +#endif + static int fl_free_font = FL_FREE_FONT; Fl_Font Fl::set_fonts(const char* xstarname) { #pragma unused ( xstarname ) +if (fl_free_font > FL_FREE_FONT) return (Fl_Font)fl_free_font; // if already called + #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -static SInt32 MACsystemVersion = 0; -if(MACsystemVersion == 0) Gestalt(gestaltSystemVersion, &MACsystemVersion); -if(MACsystemVersion >= 0x1050) { +if(fl_mac_os_version >= 100500) { //if(CTFontCreateWithFontDescriptor != NULL) {// CTFontCreateWithFontDescriptor != NULL on 10.4 also! int value[1] = {1}; CFDictionaryRef dict = CFDictionaryCreate(NULL, @@ -75,17 +82,23 @@ if(MACsystemVersion >= 0x1050) { CFRelease(fcref); CFIndex count = CFArrayGetCount(arrayref); CFIndex i; + char **tabfontnames = new char*[count]; for (i = 0; i < count; i++) { CTFontDescriptorRef fdesc = (CTFontDescriptorRef)CFArrayGetValueAtIndex(arrayref, i); CTFontRef font = CTFontCreateWithFontDescriptor(fdesc, 0., NULL); - CFStringRef cfname = CTFontCopyPostScriptName(font); + CFStringRef cfname = CTFontCopyFullName(font); CFRelease(font); static char fname[100]; CFStringGetCString(cfname, fname, sizeof(fname), kCFStringEncodingUTF8); + tabfontnames[i] = strdup(fname); // never free'ed CFRelease(cfname); - Fl::set_font((Fl_Font)(fl_free_font++), strdup(fname)); } CFRelease(arrayref); + qsort(tabfontnames, count, sizeof(char*), name_compare); + for (i = 0; i < count; i++) { + Fl::set_font((Fl_Font)(fl_free_font++), tabfontnames[i]); + } + delete[] tabfontnames; return (Fl_Font)fl_free_font; } else { @@ -129,7 +142,7 @@ else { #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 } #endif - return 0; // FIXME: I do not understand the shuffeling of the above ifdef's and why they are here! + return 0; } static int array[128]; @@ -147,5 +160,5 @@ int Fl::get_font_sizes(Fl_Font fnum, int*& sizep) { } // -// End of "$Id: fl_set_fonts_mac.cxx 7351 2010-03-29 10:35:00Z matt $". +// End of "$Id: fl_set_fonts_mac.cxx 8504 2011-03-04 16:48:10Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_set_fonts_win32.cxx b/plugins/zynaddsubfx/fltk/src/fl_set_fonts_win32.cxx index 34f28244e..18aeb26be 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_set_fonts_win32.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_set_fonts_win32.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_set_fonts_win32.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: fl_set_fonts_win32.cxx 7913 2010-11-29 18:18:27Z greg.ercolano $" // // WIN32 font utilities for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -169,5 +169,5 @@ Fl::get_font_sizes(Fl_Font fnum, int*& sizep) { // -// End of "$Id: fl_set_fonts_win32.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: fl_set_fonts_win32.cxx 7913 2010-11-29 18:18:27Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_set_fonts_x.cxx b/plugins/zynaddsubfx/fltk/src/fl_set_fonts_x.cxx index d21400df0..0cc344c8a 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_set_fonts_x.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_set_fonts_x.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_set_fonts_x.cxx 6712 2009-03-22 19:21:34Z AlbrechtS $" +// "$Id: fl_set_fonts_x.cxx 8037 2010-12-15 13:54:34Z manolo $" // // X11 font utilities for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -260,7 +260,7 @@ static int to_canonical(char *to, const char *from, size_t tolen) { static unsigned int fl_free_font = FL_FREE_FONT; Fl_Font Fl::set_fonts(const char* xstarname) { - if (fl_free_font > FL_FREE_FONT) // already been here + if (fl_free_font > (unsigned)FL_FREE_FONT) // already been here return (Fl_Font)fl_free_font; fl_open_display(); int xlistsize; @@ -346,5 +346,5 @@ int Fl::get_font_sizes(Fl_Font fnum, int*& sizep) { } // -// End of "$Id: fl_set_fonts_x.cxx 6712 2009-03-22 19:21:34Z AlbrechtS $". +// End of "$Id: fl_set_fonts_x.cxx 8037 2010-12-15 13:54:34Z manolo $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_set_fonts_xft.cxx b/plugins/zynaddsubfx/fltk/src/fl_set_fonts_xft.cxx index 65237d686..2b18178e2 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_set_fonts_xft.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_set_fonts_xft.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_set_fonts_xft.cxx 6833 2009-07-23 22:51:56Z AlbrechtS $" +// "$Id: fl_set_fonts_xft.cxx 7913 2010-11-29 18:18:27Z greg.ercolano $" // // More font utilities for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -116,7 +116,7 @@ static void make_raw_name(char *raw, char *pretty) char *nm2 = strchr(pretty, ','); if(nm2) *nm2 = 0; // terminate name after first entry raw[0] = ' '; raw[1] = 0; // Default start of "raw name" text - strncat(raw, pretty, LOCAL_RAW_NAME_MAX); + strncat(raw, pretty, LOCAL_RAW_NAME_MAX-1); #endif // At this point, the name is "marked" as regular... if (style) @@ -380,5 +380,5 @@ int Fl::get_font_sizes(Fl_Font fnum, int*& sizep) { } // -// End of "$Id: fl_set_fonts_xft.cxx 6833 2009-07-23 22:51:56Z AlbrechtS $". +// End of "$Id: fl_set_fonts_xft.cxx 7913 2010-11-29 18:18:27Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_shadow_box.cxx b/plugins/zynaddsubfx/fltk/src/fl_shadow_box.cxx index ca9a77c8e..02cf66084 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_shadow_box.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_shadow_box.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_shadow_box.cxx 6616 2009-01-01 21:28:26Z matt $" +// "$Id: fl_shadow_box.cxx 7903 2010-11-28 21:06:39Z matt $" // // Shadow box drawing routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -52,5 +52,5 @@ Fl_Boxtype fl_define_FL_SHADOW_BOX() { } // -// End of "$Id: fl_shadow_box.cxx 6616 2009-01-01 21:28:26Z matt $". +// End of "$Id: fl_shadow_box.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_shortcut.cxx b/plugins/zynaddsubfx/fltk/src/fl_shortcut.cxx index 22b316655..84c84f7f2 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_shortcut.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_shortcut.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_shortcut.cxx 7496 2010-04-13 21:08:06Z greg.ercolano $" +// "$Id: fl_shortcut.cxx 8621 2011-04-23 15:46:30Z AlbrechtS $" // // Shortcut support routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -34,7 +34,7 @@ // To make it easier to match some things it is more complex: // // Only FL_META, FL_ALT, FL_SHIFT, and FL_CTRL must be "off". A -// zero in the other shift flags indicates "dont care". +// zero in the other shift flags indicates "don't care". // // It also checks against the first character of Fl::event_text(), // and zero for FL_SHIFT means "don't care". @@ -52,11 +52,12 @@ #endif /** - Test the current event, which must be an FL_KEYBOARD or - FL_SHORTCUT, against a shortcut value (described in - Fl_Button). Returns non-zero if there is a match. Not to - be confused with - Fl_Widget::test_shortcut(). + Tests the current event, which must be an FL_KEYBOARD or + FL_SHORTCUT, against a shortcut value (described in Fl_Button). + + Not to be confused with Fl_Widget::test_shortcut(). + + \return non-zero if there is a match. */ int Fl::test_shortcut(unsigned int shortcut) { if (!shortcut) return 0; @@ -81,7 +82,7 @@ int Fl::test_shortcut(unsigned int shortcut) { // try matching utf8, ignore shift: unsigned int firstChar = fl_utf8decode(Fl::event_text(), Fl::event_text()+Fl::event_length(), 0); - if (key==firstChar) return 1; + if ( ! (FL_CAPS_LOCK&shift) && key==firstChar) return 1; // kludge so that Ctrl+'_' works (as opposed to Ctrl+'^_'): if ((shift&FL_CTRL) && key >= 0x3f && key <= 0x5F @@ -127,7 +128,7 @@ static Keyname table[] = { }; #elif defined(__APPLE__) static Keyname table[] = { - // v - this column contains utf8 characters + // v - this column contains UTF-8 characters {' ', "Space"}, {FL_BackSpace,"\xe2\x8c\xab"}, // erase to the left {FL_Tab, "\xe2\x87\xa5"}, // rightwards arrow to bar @@ -142,7 +143,7 @@ static Keyname table[] = { {FL_Right, "\xe2\x86\x92"}, // rightwards arrow {FL_Down, "\xe2\x86\x93"}, // downwards arrow {FL_Page_Up, "\xe2\x87\x9e"}, // upwards arrow with double stroke - {FL_Page_Down,"\xe2\x87\x9f"}, // downward arrow with double stroke + {FL_Page_Down,"\xe2\x87\x9f"}, // downwards arrow with double stroke {FL_End, "\xe2\x86\x98"}, // south east arrow {FL_Print, "Print"}, {FL_Insert, "Insert"}, @@ -171,7 +172,7 @@ static Keyname table[] = { zero then an empty string is returned. The return value points at a static buffer that is overwritten with each call. - \param [in] shortcut the integer value containing the ascii charcter or extended keystroke plus modifiers + \param [in] shortcut the integer value containing the ascii character or extended keystroke plus modifiers \return a pointer to a static buffer containing human readable text for the shortcut */ const char* fl_shortcut_label(unsigned int shortcut) { @@ -181,7 +182,7 @@ const char* fl_shortcut_label(unsigned int shortcut) { /** Get a human-readable string from a shortcut value. - \param [in] shortcut the integer value containing the ascii charcter or extended keystroke plus modifiers + \param [in] shortcut the integer value containing the ascii character or extended keystroke plus modifiers \param [in] eom if this pointer is set, it will receive a pointer to the end of the modifier text \return a pointer to a static buffer containing human readable text for the shortcut \see fl_shortcut_label(unsigned int shortcut) @@ -292,6 +293,18 @@ unsigned int fl_old_shortcut(const char* s) { // Tests for &x shortcuts in button labels: +/** Returns the Unicode value of the '&x' shortcut in a given text. + + The given text \p t (usually a widget's label or a menu text) is + searched for a '&x' shortcut label, and if found, the Unicode + value (code point) of the '&x' shortcut is returned. + + \param t text or label to search for '&x' shortcut. + + \return Unicode (UCS-4) value of shortcut in \p t or 0. + + \note Internal use only. +*/ unsigned int Fl_Widget::label_shortcut(const char *t) { if (!t) return 0; for (;;) { @@ -306,24 +319,68 @@ unsigned int Fl_Widget::label_shortcut(const char *t) { } } -int Fl_Widget::test_shortcut(const char *t) { - #ifdef WIN32 - // on MSWindows, users expect shortcuts to work only when the Alt modifier is pressed - if (Fl::event_state(FL_ALT)==0) return 0; - #endif +/** Returns true if the given text \p t contains the entered '&x' shortcut. + + This method must only be called in handle() methods or callbacks after + a keypress event (usually FL_KEYDOWN or FL_SHORTCUT). The given text + \p t (usually a widget's label or menu text) is searched for a '&x' + shortcut, and if found, this is compared with the entered key value. + + Fl::event_text() is used to get the entered key value. + Fl::event_state() is used to get the Alt modifier, if \p require_alt + is true. + + \param t text or label to search for '&x' shortcut. + \param require_alt if true: match only if Alt key is pressed. + + \return true, if the entered text matches the '&x' shortcut in \p t + false (0) otherwise. + + \note Internal use only. +*/ +int Fl_Widget::test_shortcut(const char *t, const bool require_alt) { if (!t) return 0; + // for menubars etc. shortcuts must work only if the Alt modifier is pressed + if (require_alt && Fl::event_state(FL_ALT)==0) return 0; unsigned int c = fl_utf8decode(Fl::event_text(), Fl::event_text()+Fl::event_length(), 0); +#ifdef __APPLE__ + // this line makes underline shortcuts work the same way they do on MSWindow + // and Linux. + if (c && Fl::event_state(FL_ALT)) + c = Fl::event_key(); +#endif if (!c) return 0; - if (c == label_shortcut(t)) + unsigned int ls = label_shortcut(t); + if (c == ls) return 1; +#ifdef __APPLE__ + // On OS X, we need to simulate the upper case keystroke as well + if (Fl::event_state(FL_ALT) && c<128 && isalpha(c) && (unsigned)toupper(c)==ls) + return 1; +#endif return 0; } +/** Returns true if the widget's label contains the entered '&x' shortcut. + + This method must only be called in handle() methods or callbacks after + a keypress event (usually FL_KEYDOWN or FL_SHORTCUT). + The widget's label is searched for a '&x' + shortcut, and if found, this is compared with the entered key value. + + Fl::event_text() is used to get the entered key value. + + \return true, if the entered text matches the widget's'&x' shortcut, + false (0) otherwise. + + \note Internal use only. +*/ + int Fl_Widget::test_shortcut() { if (!(flags()&SHORTCUT_LABEL)) return 0; return test_shortcut(label()); } // -// End of "$Id: fl_shortcut.cxx 7496 2010-04-13 21:08:06Z greg.ercolano $". +// End of "$Id: fl_shortcut.cxx 8621 2011-04-23 15:46:30Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_show_colormap.cxx b/plugins/zynaddsubfx/fltk/src/fl_show_colormap.cxx index 3992c8e7d..b3d705a05 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_show_colormap.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_show_colormap.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_show_colormap.cxx 7147 2010-02-25 23:29:42Z matt $" +// "$Id: fl_show_colormap.cxx 7903 2010-11-28 21:06:39Z matt $" // // Colormap color selection dialog for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -158,5 +158,5 @@ Fl_Color fl_show_colormap(Fl_Color oldcol) { } // -// End of "$Id: fl_show_colormap.cxx 7147 2010-02-25 23:29:42Z matt $". +// End of "$Id: fl_show_colormap.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_symbols.cxx b/plugins/zynaddsubfx/fltk/src/fl_symbols.cxx index e89178537..a68f39a48 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_symbols.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_symbols.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_symbols.cxx 6716 2009-03-24 01:40:44Z fabien $" +// "$Id: fl_symbols.cxx 7903 2010-11-28 21:06:39Z matt $" // // Symbol drawing code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -710,5 +710,5 @@ static void fl_init_symbols(void) { } // -// End of "$Id: fl_symbols.cxx 6716 2009-03-24 01:40:44Z fabien $". +// End of "$Id: fl_symbols.cxx 7903 2010-11-28 21:06:39Z matt $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_utf.c b/plugins/zynaddsubfx/fltk/src/fl_utf.c index e57c32e2c..dbdcd502e 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_utf.c +++ b/plugins/zynaddsubfx/fltk/src/fl_utf.c @@ -1,9 +1,9 @@ /* - * "$Id: fl_utf.c 7609 2010-05-17 20:03:47Z engelsman $" + * "$Id: fl_utf.c 8585 2011-04-13 15:43:22Z ianmacarthur $" * * This is the utf.c file from fltk2 adapted for use in my fltk1.1 port */ -/* Copyright 2006-2009 by Bill Spitzak and others. +/* Copyright 2006-2011 by Bill Spitzak and others. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -37,11 +37,11 @@ #if 0 - /** + /** \defgroup fl_unichar Unicode Character Functions Global Functions Handling Single Unicode Characters @{ */ - + /** Converts a Unicode character into a utf-8 sequence. \param[in] uc Unicode character @@ -50,24 +50,24 @@ \return length of the sequence in bytes */ /* FL_EXPORT int fl_unichar_to_utf8(unsigned int uc, char *text); */ - - /** @} */ - - /** + + /** @} */ + + /** \defgroup fl_utf8 Unicode String Functions Global Functions Handling Unicode Text @{ */ - + /** Calculate the size of a utf-8 sequence for a Unicode character. \param[in] uc Unicode character \return length of the sequence in bytes */ /* FL_EXPORT int fl_utf8_size(unsigned int uc); */ - - /** @} */ + + /** @} */ #endif /* 0 */ - + /*!Set to 1 to turn bad UTF8 bytes into ISO-8859-1. If this is to zero they are instead turned into the Unicode REPLACEMENT CHARACTER, of value 0xfffd. @@ -124,10 +124,10 @@ static unsigned short cp1252[32] = { unexpectedly 1 will work: \code - if (*p & 0x80) { // what should be a multibyte encoding + if (*p & 0x80) { // what should be a multibyte encoding code = fl_utf8decode(p,end,&len); - if (len<2) code = 0xFFFD; // Turn errors into REPLACEMENT CHARACTER - } else { // handle the 1-byte utf8 encoding: + if (len<2) code = 0xFFFD; // Turn errors into REPLACEMENT CHARACTER + } else { // handle the 1-byte utf8 encoding: code = *p; len = 1; } @@ -151,7 +151,7 @@ unsigned fl_utf8decode(const char* p, const char* end, int* len) } else if (c < 0xc2) { goto FAIL; } - if (p+1 >= end || (p[1]&0xc0) != 0x80) goto FAIL; + if ( (end && p+1 >= end) || (p[1]&0xc0) != 0x80) goto FAIL; if (c < 0xe0) { if (len) *len = 2; return @@ -173,7 +173,7 @@ unsigned fl_utf8decode(const char* p, const char* end, int* len) #endif } else if (c < 0xf0) { UTF8_3: - if (p+2 >= end || (p[2]&0xc0) != 0x80) goto FAIL; + if ( (end && p+2 >= end) || (p[2]&0xc0) != 0x80) goto FAIL; if (len) *len = 3; return ((p[0] & 0x0f) << 12) + @@ -184,7 +184,7 @@ unsigned fl_utf8decode(const char* p, const char* end, int* len) goto UTF8_4; } else if (c < 0xf4) { UTF8_4: - if (p+3 >= end || (p[2]&0xc0) != 0x80 || (p[3]&0xc0) != 0x80) goto FAIL; + if ( (end && p+3 >= end) || (p[2]&0xc0) != 0x80 || (p[3]&0xc0) != 0x80) goto FAIL; if (len) *len = 4; #if STRICT_RFC3629 /* RFC 3629 says all codes ending in fffe or ffff are illegal: */ @@ -337,7 +337,74 @@ int fl_utf8encode(unsigned ucs, char* buf) { } } -/*! Convert a UTF-8 sequence into an array of wchar_t. These +/*! Convert a single 32-bit Unicode codepoint into an array of 16-bit + characters. These are used by some system calls, especially on Windows. + + \p ucs is the value to convert. + + \p dst points at an array to write, and \p dstlen is the number of + locations in this array. At most \p dstlen words will be + written, and a 0 terminating word will be added if \p dstlen is + large enough. Thus this function will never overwrite the buffer + and will attempt return a zero-terminated string if space permits. + If \p dstlen is zero then \p dst can be set to NULL and no data + is written, but the length is returned. + + The return value is the number of 16-bit words that \e would be written + to \p dst if it is large enough, not counting any terminating + zero. + + If the return value is greater than \p dstlen it indicates truncation, + you should then allocate a new array of size return+1 and call this again. + + Unicode characters in the range 0x10000 to 0x10ffff are converted to + "surrogate pairs" which take two words each (in UTF-16 encoding). + Typically, setting \p dstlen to 2 will ensure that any valid Unicode + value can be converted, and setting \p dstlen to 3 or more will allow + a NULL terminated sequence to be returned. +*/ +unsigned fl_ucs_to_Utf16(const unsigned ucs, unsigned short *dst, const unsigned dstlen) +{ + /* The rule for direct conversion from UCS to UTF16 is: + * - if UCS > 0x0010FFFF then UCS is invalid + * - if UCS >= 0xD800 && UCS <= 0xDFFF UCS is invalid + * - if UCS <= 0x0000FFFF then U16 = UCS, len = 1 + * - else + * -- U16[0] = ((UCS - 0x00010000) >> 10) & 0x3FF + 0xD800 + * -- U16[1] = (UCS & 0x3FF) + 0xDC00 + * -- len = 2; + */ + unsigned count; /* Count of converted UTF16 cells */ + unsigned short u16[4]; /* Alternate buffer if dst is not set */ + unsigned short *out; /* points to the active buffer */ + /* Ensure we have a valid buffer to write to */ + if((!dstlen) || (!dst)) { + out = u16; + } else { + out = dst; + } + /* Convert from UCS to UTF16 */ + if((ucs > 0x0010FFFF) || /* UCS is too large */ + ((ucs > 0xD7FF) && (ucs < 0xE000))) { /* UCS in invalid range */ + out[0] = 0xFFFD; /* REPLACEMENT CHARACTER */ + count = 1; + } else if(ucs < 0x00010000) { + out[0] = (unsigned short)ucs; + count = 1; + } else if(dstlen < 2) { /* dst is too small for the result */ + out[0] = 0xFFFD; /* REPLACEMENT CHARACTER */ + count = 2; + } else { + out[0] = (((ucs - 0x00010000) >> 10) & 0x3FF) + 0xD800; + out[1] = (ucs & 0x3FF) + 0xDC00; + count = 2; + } + /* NULL terminate the output, if there is space */ + if(count < dstlen) { out[count] = 0; } + return count; +} /* fl_ucs_to_Utf16 */ + +/*! Convert a UTF-8 sequence into an array of 16-bit characters. These are used by some system calls, especially on Windows. \p src points at the UTF-8, and \p srclen is the number of bytes to @@ -350,7 +417,7 @@ int fl_utf8encode(unsigned ucs, char* buf) { zero-terminated string. If \p dstlen is zero then \p dst can be null and no data is written, but the length is returned. - The return value is the number of words that \e would be written + The return value is the number of 16-bit words that \e would be written to \p dst if it were long enough, not counting the terminating zero. If the return value is greater or equal to \p dstlen it indicates truncation, you can then allocate a new array of size @@ -361,12 +428,9 @@ int fl_utf8encode(unsigned ucs, char* buf) { ISO-8859-1 text mistakenly identified as UTF-8 to be printed correctly. - Notice that sizeof(wchar_t) is 2 on Windows and is 4 on Linux - and most other systems. Where wchar_t is 16 bits, Unicode - characters in the range 0x10000 to 0x10ffff are converted to + Unicode characters in the range 0x10000 to 0x10ffff are converted to "surrogate pairs" which take two words each (this is called UTF-16 - encoding). If wchar_t is 32 bits this rather nasty problem is - avoided. + encoding). */ unsigned fl_utf8toUtf16(const char* src, unsigned srclen, unsigned short* dst, unsigned dstlen) @@ -410,19 +474,46 @@ unsigned fl_utf8toUtf16(const char* src, unsigned srclen, Converts a UTF-8 string into a wide character string. This function generates 32-bit wchar_t (e.g. "ucs4" as it were) except - on win32 where it returns Utf16 with surrogate pairs where required. + on Windows where it is equivalent to fl_utf8toUtf16 and returns + UTF-16. + + \p src points at the UTF-8, and \p srclen is the number of bytes to + convert. + + \p dst points at an array to write, and \p dstlen is the number of + locations in this array. At most \p dstlen-1 wchar_t will be + written there, plus a 0 terminating wchar_t. + + The return value is the number of wchar_t that \e would be written + to \p dst if it were long enough, not counting the terminating + zero. If the return value is greater or equal to \p dstlen it + indicates truncation, you can then allocate a new array of size + return+1 and call this again. + + Notice that sizeof(wchar_t) is 2 on Windows and is 4 on Linux + and most other systems. Where wchar_t is 16 bits, Unicode + characters in the range 0x10000 to 0x10ffff are converted to + "surrogate pairs" which take two words each (this is called UTF-16 + encoding). If wchar_t is 32 bits this rather nasty problem is + avoided. + + Note that Windows includes Cygwin, i.e. compiled with Cygwin's POSIX + layer (cygwin1.dll, --enable-cygwin), either native (GDI) or X11. */ unsigned fl_utf8towc(const char* src, unsigned srclen, wchar_t* dst, unsigned dstlen) { -#ifdef WIN32 - return fl_utf8toUtf16(src, srclen, (unsigned short*)dst, dstlen); +#if defined(WIN32) || defined(__CYGWIN__) + return fl_utf8toUtf16(src, srclen, (unsigned short*)dst, dstlen); #else const char* p = src; const char* e = src+srclen; unsigned count = 0; if (dstlen) for (;;) { - if (p >= e) {dst[count] = 0; return count;} + if (p >= e) { + dst[count] = 0; + return count; + } if (!(*p & 0x80)) { /* ascii */ dst[count] = *p++; } else { @@ -511,7 +602,7 @@ unsigned fl_utf8toa(const char* src, unsigned srclen, needed. \p srclen is the number of words in \p src to convert. On Windows - this is not necessairly the number of characters, due to there + this is not necessarily the number of characters, due to there possibly being "surrogate pairs" in the UTF-16 encoding used. On Unix wchar_t is 32 bits and each location is a character. @@ -541,7 +632,7 @@ unsigned fl_utf8fromwc(char* dst, unsigned dstlen, if (count+2 >= dstlen) {dst[count] = 0; count += 2; break;} dst[count++] = 0xc0 | (ucs >> 6); dst[count++] = 0x80 | (ucs & 0x3F); -#ifdef WIN32 +#if defined(WIN32) || defined(__CYGWIN__) } else if (ucs >= 0xd800 && ucs <= 0xdbff && i < srclen && src[i] >= 0xdc00 && src[i] <= 0xdfff) { /* surrogate pair */ @@ -561,7 +652,7 @@ unsigned fl_utf8fromwc(char* dst, unsigned dstlen, dst[count++] = 0x80 | ((ucs >> 6) & 0x3F); dst[count++] = 0x80 | (ucs & 0x3F); } else { -#ifndef WIN32 +#if !(defined(WIN32) || defined(__CYGWIN__)) J1: #endif /* all others are 3 bytes: */ @@ -578,7 +669,7 @@ unsigned fl_utf8fromwc(char* dst, unsigned dstlen, count++; } else if (ucs < 0x800U) { /* 2 bytes */ count += 2; -#ifdef WIN32 +#if defined(WIN32) || defined(__CYGWIN__) } else if (ucs >= 0xd800 && ucs <= 0xdbff && i < srclen-1 && src[i+1] >= 0xdc00 && src[i+1] <= 0xdfff) { /* surrogate pair */ @@ -692,8 +783,6 @@ int fl_utf8locale(void) { needed. If fl_utf8locale() returns true then this does not change the data. - It is copied and truncated as necessary to - the destination buffer and \p srclen is always returned. */ unsigned fl_utf8to_mb(const char* src, unsigned srclen, char* dst, unsigned dstlen) @@ -747,8 +836,7 @@ unsigned fl_utf8to_mb(const char* src, unsigned srclen, memcpy(dst, src, srclen); dst[srclen] = 0; } else { - memcpy(dst, src, dstlen-1); - dst[dstlen-1] = 0; + /* Buffer insufficent or buffer query */ } return srclen; } @@ -765,8 +853,7 @@ unsigned fl_utf8to_mb(const char* src, unsigned srclen, needed. On Unix or on Windows when a UTF-8 locale is in effect, this - does not change the data. It is copied and truncated as necessary to - the destination buffer and \p srclen is always returned. + does not change the data. You may also want to check if fl_utf8test() returns non-zero, so that the filesystem can store filenames in UTF-8 encoding regardless of the locale. @@ -813,8 +900,7 @@ unsigned fl_utf8from_mb(char* dst, unsigned dstlen, memcpy(dst, src, srclen); dst[srclen] = 0; } else { - memcpy(dst, src, dstlen-1); - dst[dstlen-1] = 0; + /* Buffer insufficent or buffer query */ } return srclen; } @@ -905,5 +991,5 @@ int fl_wcwidth(const char* src) { /** @} */ /* - * End of "$Id: fl_utf.c 7609 2010-05-17 20:03:47Z engelsman $". + * End of "$Id: fl_utf.c 8585 2011-04-13 15:43:22Z ianmacarthur $". */ diff --git a/plugins/zynaddsubfx/fltk/src/fl_utf8.cxx b/plugins/zynaddsubfx/fltk/src/fl_utf8.cxx index 8621c1f7e..553353266 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_utf8.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_utf8.cxx @@ -1,10 +1,10 @@ // -// "$Id: fl_utf8.cxx 6943 2009-11-18 12:43:21Z AlbrechtS $" +// "$Id: fl_utf8.cxx 7975 2010-12-08 12:15:48Z AlbrechtS $" // // Unicode to UTF-8 conversion functions. // // Author: Jean-Marc Lienher ( http://oksid.ch ) -// Copyright 2000-2009 by O'ksi'D. +// Copyright 2000-2010 by O'ksi'D. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -60,7 +60,7 @@ extern "C" { extern "C" { int XUtf8Tolower(int ucs); unsigned short XUtf8IsNonSpacing(unsigned int ucs); -}; +} #else // X-windows platform @@ -112,9 +112,11 @@ Toupper( } /** - return the byte length of the UTF-8 sequence with first byte \p c, - or -1 if \p c is not valid. - */ + return the byte length of the UTF-8 sequence with first byte \p c, + or -1 if \p c is not valid. + This function is helpful for finding faulty UTF8 sequences. + \see fl_utf8len1 + */ int fl_utf8len(char c) { if (!(c & 0x80)) return 1; @@ -137,15 +139,34 @@ int fl_utf8len(char c) } // fl_utf8len -#if 0 -int fl_utflen( - const unsigned char *buf, - int len) +/** + Return the byte length of the UTF-8 sequence with first byte \p c, + or 1 if \p c is not valid. + This function can be used to scan faulty UTF8 sequence, albeit ignoring invalid + codes. + \see fl_utf8len + */ +int fl_utf8len1(char c) { - unsigned int ucs; - return fl_utf2ucs(buf, len, &ucs); -} -#endif + if (!(c & 0x80)) return 1; + if (c & 0x40) { + if (c & 0x20) { + if (c & 0x10) { + if (c & 0x08) { + if (c & 0x04) { + return 6; + } + return 5; + } + return 4; + } + return 3; + } + return 2; + } + return 1; +} // fl_utf8len1 + /** returns the number of Unicode chars in the UTF-8 string @@ -399,9 +420,10 @@ static char *buf = NULL; static int buf_len = 0; static unsigned short *wbufa = NULL; +// FIXME: This should *maybe* return 'const char *' instead of 'char *' char *fl_utf8_to_locale(const char *s, int len, UINT codepage) { - if (!s) return ""; + if (!s) return (char *)""; int l = 0; // if (buf_len < len * 2 + 1) { // buf_len = len * 2 + 1; @@ -426,9 +448,10 @@ char *fl_utf8_to_locale(const char *s, int len, UINT codepage) return buf; } +// FIXME: This should maybe return 'const char *' instead of 'char *' char *fl_locale_to_utf8(const char *s, int len, UINT codepage) { - if (!s) return ""; + if (!s) return (char *)""; int l = 0; if (buf_len < len * 5 + 1) { buf_len = len * 5 + 1; @@ -823,5 +846,5 @@ void fl_make_path_for_file( const char *path ) /** @} */ // -// End of "$Id: fl_utf8.cxx 6943 2009-11-18 12:43:21Z AlbrechtS $". +// End of "$Id: fl_utf8.cxx 7975 2010-12-08 12:15:48Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/src/fl_vertex.cxx b/plugins/zynaddsubfx/fltk/src/fl_vertex.cxx index 5b695a44e..756436dd9 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_vertex.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_vertex.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_vertex.cxx 7617 2010-05-27 17:20:18Z manolo $" +// "$Id: fl_vertex.cxx 8621 2011-04-23 15:46:30Z AlbrechtS $" // // Portable drawing routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2011 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -44,42 +44,21 @@ #include #include -struct matrix {double a, b, c, d, x, y;}; - -static matrix m = {1, 0, 0, 1, 0, 0}; - -static matrix stack[32]; -matrix * fl_matrix = &m; -static int sptr = 0; - -/** - Saves the current transformation matrix on the stack. - The maximum depth of the stack is 4. -*/ -void fl_push_matrix() { - if (sptr==32) +void Fl_Graphics_Driver::push_matrix() { + if (sptr==matrix_stack_size) Fl::error("fl_push_matrix(): matrix stack overflow."); else stack[sptr++] = m; } -/** - Restores the current transformation matrix from the stack. -*/ -void fl_pop_matrix() { +void Fl_Graphics_Driver::pop_matrix() { if (sptr==0) Fl::error("fl_pop_matrix(): matrix stack underflow."); else m = stack[--sptr]; } -/** - Concatenates another transformation onto the current one. - - \param[in] a,b,c,d,x,y transformation matrix elements such that - X' = aX + cY + x and Y' = bX +dY + y -*/ -void fl_mult_matrix(double a, double b, double c, double d, double x, double y) { +void Fl_Graphics_Driver::mult_matrix(double a, double b, double c, double d, double x, double y) { matrix o; o.a = a*m.a + b*m.c; o.b = a*m.b + b*m.d; @@ -90,29 +69,7 @@ void fl_mult_matrix(double a, double b, double c, double d, double x, double y) m = o; } -/** - Concatenates scaling transformation onto the current one. - \param[in] x,y scale factors in x-direction and y-direction -*/ -void fl_scale(double x,double y) {fl_mult_matrix(x,0,0,y,0,0);} - -/** - Concatenates scaling transformation onto the current one. - \param[in] x scale factor in both x-direction and y-direction -*/ -void fl_scale(double x) {fl_mult_matrix(x,0,0,x,0,0);} - -/** - Concatenates translation transformation onto the current one. - \param[in] x,y translation factor in x-direction and y-direction -*/ -void fl_translate(double x,double y) {fl_mult_matrix(1,0,0,1,x,y);} - -/** - Concatenates rotation transformation onto the current one. - \param[in] d - rotation angle, counter-clockwise in degrees (not radians) -*/ -void fl_rotate(double d) { +void Fl_Graphics_Driver::rotate(double d) { if (d) { double s, c; if (d == 0) {s = 0; c = 1;} @@ -120,31 +77,10 @@ void fl_rotate(double d) { else if (d == 180) {s = 0; c = -1;} else if (d == 270 || d == -90) {s = -1; c = 0;} else {s = sin(d*M_PI/180); c = cos(d*M_PI/180);} - fl_mult_matrix(c,-s,s,c,0,0); + mult_matrix(c,-s,s,c,0,0); } } -// typedef what the x,y fields in a point are: -#ifdef WIN32 -typedef int COORD_T; -# define XPOINT XPoint -#elif defined(__APPLE_QUARTZ__) -typedef float COORD_T; -typedef struct { float x; float y; } QPoint; -# define XPOINT QPoint -extern float fl_quartz_line_width_; -#else -typedef short COORD_T; -# define XPOINT XPoint -#endif - -static XPOINT *p = (XPOINT *)0; - -static int p_size; -static int n; -static int what; -enum {LINE, LOOP, POLYGON, POINT_}; - void Fl_Graphics_Driver::begin_points() {n = 0; what = POINT_;} void Fl_Graphics_Driver::begin_line() {n = 0; what = LINE;} @@ -153,31 +89,15 @@ void Fl_Graphics_Driver::begin_loop() {n = 0; what = LOOP;} void Fl_Graphics_Driver::begin_polygon() {n = 0; what = POLYGON;} -/** - Transforms coordinate using the current transformation matrix. - \param[in] x,y coordinate -*/ -double fl_transform_x(double x, double y) {return x*m.a + y*m.c + m.x;} +double Fl_Graphics_Driver::transform_x(double x, double y) {return x*m.a + y*m.c + m.x;} -/** - Transform coordinate using the current transformation matrix. - \param[in] x,y coordinate -*/ -double fl_transform_y(double x, double y) {return x*m.b + y*m.d + m.y;} +double Fl_Graphics_Driver::transform_y(double x, double y) {return x*m.b + y*m.d + m.y;} -/** - Transforms distance using current transformation matrix. - \param[in] x,y coordinate -*/ -double fl_transform_dx(double x, double y) {return x*m.a + y*m.c;} +double Fl_Graphics_Driver::transform_dx(double x, double y) {return x*m.a + y*m.c;} -/** - Transforms distance using current transformation matrix. - \param[in] x,y coordinate -*/ -double fl_transform_dy(double x, double y) {return x*m.b + y*m.d;} +double Fl_Graphics_Driver::transform_dy(double x, double y) {return x*m.b + y*m.d;} -static void fl_transformed_vertex(COORD_T x, COORD_T y) { +void Fl_Graphics_Driver::transformed_vertex0(COORD_T x, COORD_T y) { if (!n || x != p[n-1].x || y != p[n-1].y) { if (n >= p_size) { p_size = p ? 2*p_size : 16; @@ -191,14 +111,14 @@ static void fl_transformed_vertex(COORD_T x, COORD_T y) { void Fl_Graphics_Driver::transformed_vertex(double xf, double yf) { #ifdef __APPLE_QUARTZ__ - fl_transformed_vertex(COORD_T(xf), COORD_T(yf)); + transformed_vertex0(COORD_T(xf), COORD_T(yf)); #else - fl_transformed_vertex(COORD_T(rint(xf)), COORD_T(rint(yf))); + transformed_vertex0(COORD_T(rint(xf)), COORD_T(rint(yf))); #endif } void Fl_Graphics_Driver::vertex(double x,double y) { - fl_transformed_vertex(x*m.a + y*m.c + m.x, x*m.b + y*m.d + m.y); + transformed_vertex0(COORD_T(x*m.a + y*m.c + m.x), COORD_T(x*m.b + y*m.d + m.y)); } void Fl_Graphics_Driver::end_points() { @@ -241,7 +161,7 @@ void Fl_Graphics_Driver::end_line() { #endif } -static void fixloop() { // remove equal points from closed path +void Fl_Graphics_Driver::fixloop() { // remove equal points from closed path while (n>2 && p[n-1].x == p[0].x && p[n-1].y == p[0].y) n--; } @@ -278,12 +198,6 @@ void Fl_Graphics_Driver::end_polygon() { #endif } -static int gap_; -#if defined(WIN32) -static int counts[20]; -static int numcount; -#endif - void Fl_Graphics_Driver::begin_complex_polygon() { fl_begin_polygon(); gap_ = 0; @@ -356,8 +270,8 @@ void Fl_Graphics_Driver::circle(double x, double y,double r) { } else Arc(fl_gc, llx, lly, llx+w, lly+h, 0,0, 0,0); #elif defined(__APPLE_QUARTZ__) - // Quartz warning : circle won't scale to current matrix! -//last argument must be 0 (counterclockwise) or it draws nothing under __LP64__ !!!! + // Quartz warning: circle won't scale to current matrix! + // Last argument must be 0 (counter-clockwise) or it draws nothing under __LP64__ !!!! CGContextSetShouldAntialias(fl_gc, true); CGContextAddArc(fl_gc, xt, yt, (w+h)*0.25f, 0, 2.0f*M_PI, 0); (what == POLYGON ? CGContextFillPath : CGContextStrokePath)(fl_gc); @@ -368,5 +282,5 @@ void Fl_Graphics_Driver::circle(double x, double y,double r) { } // -// End of "$Id: fl_vertex.cxx 7617 2010-05-27 17:20:18Z manolo $". +// End of "$Id: fl_vertex.cxx 8621 2011-04-23 15:46:30Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/src/flstring.c b/plugins/zynaddsubfx/fltk/src/flstring.c index 5bb678d5c..1be88f20f 100644 --- a/plugins/zynaddsubfx/fltk/src/flstring.c +++ b/plugins/zynaddsubfx/fltk/src/flstring.c @@ -1,9 +1,9 @@ /* - * "$Id: flstring.c 6616 2009-01-01 21:28:26Z matt $" + * "$Id: flstring.c 7903 2010-11-28 21:06:39Z matt $" * * BSD string functions for the Fast Light Tool Kit (FLTK). * - * Copyright 1998-2009 by Bill Spitzak and others. + * Copyright 1998-2010 by Bill Spitzak and others. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -101,5 +101,5 @@ fl_strlcpy(char *dst, /* O - Destination string */ /* - * End of "$Id: flstring.c 6616 2009-01-01 21:28:26Z matt $". + * End of "$Id: flstring.c 7903 2010-11-28 21:06:39Z matt $". */ diff --git a/plugins/zynaddsubfx/fltk/src/flstring.h b/plugins/zynaddsubfx/fltk/src/flstring.h index 1ab39d13f..679e490bf 100644 --- a/plugins/zynaddsubfx/fltk/src/flstring.h +++ b/plugins/zynaddsubfx/fltk/src/flstring.h @@ -1,9 +1,9 @@ /* - * "$Id: flstring.h 7352 2010-03-29 10:47:11Z matt $" + * "$Id: flstring.h 7913 2010-11-29 18:18:27Z greg.ercolano $" * * Common string header file for the Fast Light Tool Kit (FLTK). * - * Copyright 1998-2009 by Bill Spitzak and others. + * Copyright 1998-2010 by Bill Spitzak and others. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -100,5 +100,5 @@ FL_EXPORT extern size_t fl_strlcpy(char *, const char *, size_t); /* - * End of "$Id: flstring.h 7352 2010-03-29 10:47:11Z matt $". + * End of "$Id: flstring.h 7913 2010-11-29 18:18:27Z greg.ercolano $". */ diff --git a/plugins/zynaddsubfx/fltk/src/numericsort.c b/plugins/zynaddsubfx/fltk/src/numericsort.c index a9db08772..e780b892a 100644 --- a/plugins/zynaddsubfx/fltk/src/numericsort.c +++ b/plugins/zynaddsubfx/fltk/src/numericsort.c @@ -1,9 +1,9 @@ /* - * "$Id: numericsort.c 6616 2009-01-01 21:28:26Z matt $" + * "$Id: numericsort.c 8074 2010-12-20 13:45:26Z ianmacarthur $" * * Numeric sorting routine for the Fast Light Tool Kit (FLTK). * - * Copyright 1998-2009 by Bill Spitzak and others. + * Copyright 1998-2010 by Bill Spitzak and others. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -33,8 +33,6 @@ #include #include -#include - #if !defined(WIN32) || defined(__CYGWIN__) # ifdef HAVE_DIRENT_H # include @@ -50,6 +48,8 @@ # include # endif /* HAVE_NDIR_H */ # endif /* HAVE_DIRENT_H */ +#else /* For WIN32 variants */ +# include #endif /* !WIN32 || __CYGWIN__ */ /* @@ -107,5 +107,5 @@ int fl_numericsort(struct dirent **A, struct dirent **B) { } /* - * End of "$Id: numericsort.c 6616 2009-01-01 21:28:26Z matt $". + * End of "$Id: numericsort.c 8074 2010-12-20 13:45:26Z ianmacarthur $". */ diff --git a/plugins/zynaddsubfx/fltk/src/print_panel.cxx b/plugins/zynaddsubfx/fltk/src/print_panel.cxx index d9d87817e..ad6a590be 100644 --- a/plugins/zynaddsubfx/fltk/src/print_panel.cxx +++ b/plugins/zynaddsubfx/fltk/src/print_panel.cxx @@ -1,9 +1,9 @@ // -// "$Id: print_panel.cxx 7480 2010-04-11 18:42:35Z AlbrechtS $" +// "$Id: print_panel.cxx 7913 2010-11-29 18:18:27Z greg.ercolano $" // // Print panel for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -67,7 +67,6 @@ static Fl_Int_Input *print_to=(Fl_Int_Input *)0; static Fl_Spinner *print_copies=(Fl_Spinner *)0; static int print_start = 0; // 1 if print_okay has been clicked -static int print_pipe = 0; // 0 = file, 1 = pipe (lp) static void cb_print_choice(Fl_Choice*, void*) { print_update_status(); @@ -574,7 +573,7 @@ void print_update_status() { if (print_choice->value()) { snprintf(command, sizeof(command), "lpstat -p '%s'", printer); if ((lpstat = popen(command, "r")) != NULL) { - fgets(status, sizeof(status), lpstat); + if (fgets(status, sizeof(status), lpstat)==0) { /* ignore */ } pclose(lpstat); } else strcpy(status, "printer status unavailable"); } else status[0] = '\0'; @@ -594,5 +593,5 @@ void print_update_status() { } // -// End of "$Id: print_panel.cxx 7480 2010-04-11 18:42:35Z AlbrechtS $". +// End of "$Id: print_panel.cxx 7913 2010-11-29 18:18:27Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/src/print_panel.h b/plugins/zynaddsubfx/fltk/src/print_panel.h index 7c7ae6237..6c96e4752 100644 --- a/plugins/zynaddsubfx/fltk/src/print_panel.h +++ b/plugins/zynaddsubfx/fltk/src/print_panel.h @@ -1,9 +1,9 @@ // -// "$Id: print_panel.h 7263 2010-03-14 18:07:24Z AlbrechtS $" +// "$Id: print_panel.h 7913 2010-11-29 18:18:27Z greg.ercolano $" // // Print panel for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -51,5 +51,5 @@ static void print_update_status(); #endif // -// End of "$Id: print_panel.h 7263 2010-03-14 18:07:24Z AlbrechtS $". +// End of "$Id: print_panel.h 7913 2010-11-29 18:18:27Z greg.ercolano $". // diff --git a/plugins/zynaddsubfx/fltk/src/ps_image.cxx b/plugins/zynaddsubfx/fltk/src/ps_image.cxx index 51646efa6..6e1cbfc13 100644 --- a/plugins/zynaddsubfx/fltk/src/ps_image.cxx +++ b/plugins/zynaddsubfx/fltk/src/ps_image.cxx @@ -3,7 +3,7 @@ // // Postscript image drawing implementation for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2005 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -39,7 +39,7 @@ int Fl_PostScript_Graphics_Driver::alpha_mask(const uchar * data, int w, int h, int D, int LD){ mask = 0; - if((D/2)*2 != D){ //no mask info + if ((D/2)*2 != D){ //no mask info return 0; } int xx; @@ -48,30 +48,29 @@ int Fl_PostScript_Graphics_Driver::alpha_mask(const uchar * data, int w, int h, int V255=0; int V0 =0; int V_=0; -// uchar d; - for(j=0;j0){ + if (error >0){ next[ii] += o1 = (error * 3 + 8)/16; current[ii+2] += o2 = (error * 7 + 8)/16; next[ii+2] = o3 =(error + 8)/16; // *1 - ok replacing (cleaning) - }else{ + } else { next[ii] += o1 = (error * 3 - 8)/16; current[ii+2] += o2 = (error * 7 - 8)/16; next[ii+2] = o3 = (error - 8)/16; @@ -148,9 +147,9 @@ int Fl_PostScript_Graphics_Driver::alpha_mask(const uchar * data, int w, int h, current = swap; *(next+1) = 0; // must clean the first cell, next are overriden by *1 - for(i=w-1;i>=0;i--){ + for (i = w-1; i >= 0; i--){ - for(k=3;k>=0;k--){ // generating 4 x-pixels for 1 RGB + for (k=3; k>=0; k--){ // generating 4 x-pixels for 1 RGB short error, o1, o2, o3; int ii = i*4+k; // mask cell index @@ -159,15 +158,15 @@ int Fl_PostScript_Graphics_Driver::alpha_mask(const uchar * data, int w, int h, mask[jj*xx+ii/8] |= 1 << (ii % 8); //set mask bit error = val-255; - }else + } else error = val; ////// error spreading ///// - if(error >0){ + if (error >0){ next[ii+2] += o1 = (error * 3 + 8)/16; current[ii] += o2 = (error * 7 + 8)/16; next[ii] = o3 =(error + 8)/16; // *1 - ok replacing (cleaning) - }else{ + } else { next[ii+2] += o1 = (error * 3 - 8)/16; current[ii] += o2 = (error * 7 - 8)/16; @@ -196,11 +195,11 @@ static inline uchar swap_byte(const uchar b) { extern uchar **fl_mask_bitmap; -void Fl_PostScript_Graphics_Driver::draw_scaled_image(const uchar *data, double x, double y, double w, double h, int iw, int ih, int D, int LD) { +void Fl_PostScript_Graphics_Driver::draw_image(const uchar *data, int ix, int iy, int iw, int ih, int D, int LD) { + double x = ix, y = iy, w = iw, h = ih; - - if(D<3){ //mono - draw_scaled_image_mono(data, x, y, w, h, iw, ih, D, LD); + if (D<3){ //mono + draw_image_mono(data, ix, iy, iw, ih, D, LD); return; } @@ -210,26 +209,26 @@ void Fl_PostScript_Graphics_Driver::draw_scaled_image(const uchar *data, double fprintf(output,"save\n"); const char * interpol; - if(lang_level_>1){ - if(interpolate_) + if (lang_level_>1){ + if (interpolate_) interpol="true"; else interpol="false"; - if(mask && lang_level_>2) + if (mask && lang_level_>2) fprintf(output, "%g %g %g %g %i %i %i %i %s CIM\n", x , y+h , w , -h , iw , ih, mx, my, interpol); else fprintf(output, "%g %g %g %g %i %i %s CII\n", x , y+h , w , -h , iw , ih, interpol); - }else + } else fprintf(output , "%g %g %g %g %i %i CI", x , y+h , w , -h , iw , ih); - if(!LD) LD = iw*D; + if (!LD) LD = iw*D; uchar *curmask=mask; for (j=0; j3) { //can do mixing using bg_* colors) + if (lang_level_<3 && D>3) { //can do mixing using bg_* colors) unsigned int a2 = curdata[3]; //must be int unsigned int a = 255-a2; r = (a2 * r + bg_r * a)/255; @@ -261,9 +260,10 @@ void Fl_PostScript_Graphics_Driver::draw_scaled_image(const uchar *data, double fprintf(output," >\nrestore\n" ); -}; +} -void Fl_PostScript_Graphics_Driver::draw_scaled_image(Fl_Draw_Image_Cb call, void *data, double x, double y, double w, double h, int iw, int ih, int D) { +void Fl_PostScript_Graphics_Driver::draw_image(Fl_Draw_Image_Cb call, void *data, int ix, int iy, int iw, int ih, int D) { + double x = ix, y = iy, w = iw, h = ih; int level2_mask = 0; fprintf(output,"save\n"); @@ -277,7 +277,7 @@ void Fl_PostScript_Graphics_Driver::draw_scaled_image(Fl_Draw_Image_Cb call, voi } else if (mask && lang_level_ == 2) { level2_mask = 1; // use method for drawing masked color image with PostScript level 2 - fprintf(output, "%d %d pixmap_size\n pixmap_loadmask\n", iw, ih); + fprintf(output, " %g %g %g %g %d %d pixmap_plot\n", x, y, w, h, iw, ih); } else { fprintf(output, "%g %g %g %g %i %i %s CII\n", x , y+h , w , -h , iw , ih, interpol); @@ -290,39 +290,37 @@ void Fl_PostScript_Graphics_Driver::draw_scaled_image(Fl_Draw_Image_Cb call, voi uchar *rgbdata=new uchar[LD]; uchar *curmask=mask; - if(level2_mask) { - for (j = ih - 1; j >= 0; j--) { - curmask = mask + j * my/ih * ((mx+7)/8); - for(k=0; k < my/ih; k++) { // output mask data - for (i=0; i < ((mx+7)/8); i++) { - fprintf(output, "%.2x",swap_byte(*curmask)); - curmask++; - } - fprintf(output,"\n"); - } - } - fprintf(output,"pop def\n\npixmap_loaddata\n"); + if (level2_mask) { for (j = ih - 1; j >= 0; j--) { // output full image data - call(data,0,j,iw,rgbdata); - uchar *curdata=rgbdata; - for(i=0 ; i\n", output); + for (j = ih - 1; j >= 0; j--) { // output mask data + curmask = mask + j * (my/ih) * ((mx+7)/8); + for (k=0; k < my/ih; k++) { + for (i=0; i < ((mx+7)/8); i++) { + if (!(i%40)) fputs("\n", output); + fprintf(output, "%.2x",swap_byte(*curmask)); + curmask++; + } + fputs("\n", output); } - fprintf(output,"pop def\n\n%g %g pixmap_plot\n", x, y); // draw the masked image } + fputs(">\n", output); + } else { for (j=0; j 2) { // InterleaveType 2 mask data - for(k=0; k 2) { // InterleaveType 2 mask data + for (k=0; k\n"); + fputs(">\n", output); } fprintf(output,"restore\n"); delete[] rgbdata; } -void Fl_PostScript_Graphics_Driver::draw_scaled_image_mono(const uchar *data, double x, double y, double w, double h, int iw, int ih, int D, int LD) { +void Fl_PostScript_Graphics_Driver::draw_image_mono(const uchar *data, int ix, int iy, int iw, int ih, int D, int LD) { + double x = ix, y = iy, w = iw, h = ih; fprintf(output,"save\n"); int i,j, k; const char * interpol; - if(lang_level_>1){ - if(interpolate_) + if (lang_level_>1){ + if (interpolate_) interpol="true"; else interpol="false"; - if(mask && lang_level_>2) + if (mask && lang_level_>2) fprintf(output, "%g %g %g %g %i %i %i %i %s GIM\n", x , y+h , w , -h , iw , ih, mx, my, interpol); else fprintf(output, "%g %g %g %g %i %i %s GII\n", x , y+h , w , -h , iw , ih, interpol); @@ -371,15 +370,15 @@ void Fl_PostScript_Graphics_Driver::draw_scaled_image_mono(const uchar *data, do fprintf(output , "%g %g %g %g %i %i GI", x , y+h , w , -h , iw , ih); - if(!LD) LD = iw*D; + if (!LD) LD = iw*D; int bg = (bg_r + bg_g + bg_b)/3; uchar *curmask=mask; for (j=0; j1) { //can do mixing + if (lang_level_<3 && D>1) { //can do mixing unsigned int a2 = curdata[1]; //must be int unsigned int a = 255-a2; @@ -408,23 +407,24 @@ void Fl_PostScript_Graphics_Driver::draw_scaled_image_mono(const uchar *data, do fprintf(output," >\nrestore\n" ); -}; +} -void Fl_PostScript_Graphics_Driver::draw_scaled_image_mono(Fl_Draw_Image_Cb call, void *data, double x, double y, double w, double h, int iw, int ih, int D) { +void Fl_PostScript_Graphics_Driver::draw_image_mono(Fl_Draw_Image_Cb call, void *data, int ix, int iy, int iw, int ih, int D) { + double x = ix, y = iy, w = iw, h = ih; fprintf(output,"save\n"); int i,j,k; const char * interpol; - if(lang_level_>1){ - if(interpolate_) interpol="true"; + if (lang_level_>1){ + if (interpolate_) interpol="true"; else interpol="false"; - if(mask && lang_level_>2) + if (mask && lang_level_>2) fprintf(output, "%g %g %g %g %i %i %i %i %s GIM\n", x , y+h , w , -h , iw , ih, mx, my, interpol); else fprintf(output, "%g %g %g %g %i %i %s GII\n", x , y+h , w , -h , iw , ih, interpol); - }else + } else fprintf(output , "%g %g %g %g %i %i GI", x , y+h , w , -h , iw , ih); int LD=iw*D; @@ -432,8 +432,8 @@ void Fl_PostScript_Graphics_Driver::draw_scaled_image_mono(Fl_Draw_Image_Cb call uchar *curmask=mask; for (j=0; j2){ // InterleaveType 2 mask data - for(k=0; k2){ // InterleaveType 2 mask data + for (k=0; karray; int w = rgb->w(); int h = rgb->h(); mask=0; - if(lang_level_>2) //when not true, not making alphamask, mixing colors instead... + if (lang_level_>2) //when not true, not making alphamask, mixing colors instead... if (alpha_mask(di, w, h, rgb->d(),rgb->ld())) return; //everthing masked, no need for painting! push_clip(XP, YP, WP, HP); - draw_scaled_image(di, XP + cx, YP + cy, w, h, w, h, rgb->d(), rgb->ld()); + draw_image(di, XP + cx, YP + cy, w, h, rgb->d(), rgb->ld()); pop_clip(); delete[]mask; mask=0; -}; +} void Fl_PostScript_Graphics_Driver::draw(Fl_Bitmap * bitmap,int XP, int YP, int WP, int HP, int cx, int cy){ const uchar * di = bitmap->array; @@ -504,7 +504,7 @@ void Fl_PostScript_Graphics_Driver::draw(Fl_Bitmap * bitmap,int XP, int YP, int w =WP; xx = (w+7)/8 - cx/8; } - if( HP > bitmap->h()-cy) + if ( HP > bitmap->h()-cy) h = bitmap->h() - cy; else h = HP; @@ -519,14 +519,14 @@ void Fl_PostScript_Graphics_Driver::draw(Fl_Bitmap * bitmap,int XP, int YP, int for (j=0; j\n"); pop_clip(); -}; +} #endif // FL_DOXYGEN diff --git a/plugins/zynaddsubfx/fltk/src/scandir.c b/plugins/zynaddsubfx/fltk/src/scandir.c index 1a3bd0d5b..ffe5803d8 100644 --- a/plugins/zynaddsubfx/fltk/src/scandir.c +++ b/plugins/zynaddsubfx/fltk/src/scandir.c @@ -21,7 +21,6 @@ USA. */ #else # include "flstring.h" -# include # if !HAVE_SCANDIR # include @@ -50,7 +49,7 @@ fl_scandir(const char *dir, struct dirent ***namelist, int (*select)(struct dirent *), int (*compar)(struct dirent **, struct dirent **)) { - DIR *dp = opendir (fl_utf2mbcs(dir)); + DIR *dp = opendir (dir); struct dirent **v = NULL; size_t vsize = 0, i; struct dirent *d; @@ -121,5 +120,5 @@ fl_scandir(const char *dir, struct dirent ***namelist, #endif /* - * End of "$Id: scandir.c 6311 2008-09-19 17:40:20Z matt $". + * End of "$Id: scandir.c 8192 2011-01-05 16:50:10Z manolo $". */ diff --git a/plugins/zynaddsubfx/fltk/src/scandir_win32.c b/plugins/zynaddsubfx/fltk/src/scandir_win32.c index 63ff71208..dcefdf6e4 100644 --- a/plugins/zynaddsubfx/fltk/src/scandir_win32.c +++ b/plugins/zynaddsubfx/fltk/src/scandir_win32.c @@ -1,9 +1,9 @@ /* - * "$Id: scandir_win32.c 6687 2009-03-15 03:14:43Z greg.ercolano $" + * "$Id: scandir_win32.c 8347 2011-02-01 01:06:27Z greg.ercolano $" * * WIN32 scandir function for the Fast Light Tool Kit (FLTK). * - * Copyright 1998-2009 by Bill Spitzak and others. + * Copyright 1998-2010 by Bill Spitzak and others. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -49,9 +49,9 @@ int fl_scandir(const char *dirname, struct dirent ***namelist, if (!findIn) return -1; strcpy(findIn, dirname); - //#if defined(__GNUC__) - //#warning FIXME This probably needs to be MORE UTF8 aware now - //#endif /*__GNUC__*/ + /* #if defined(__GNUC__) */ + /* #warning FIXME This probably needs to be MORE UTF8 aware now */ + /* #endif */ for (d = findIn; *d; d++) if (*d=='/') *d='\\'; if ((len==0)) { strcpy(findIn, ".\\*"); } if ((len==2)&&findIn[1]==':'&&isalpha(findIn[0])) { *d++ = '\\'; *d = 0; } @@ -64,8 +64,8 @@ int fl_scandir(const char *dirname, struct dirent ***namelist, strcpy(d, "\\*"); } { /* Create a block to limit the scope while we find the initial "wide" filename */ -// unsigned short * wbuf = (unsigned short*)malloc(sizeof(short) *(len + 10)); -// wbuf[fl_utf2unicode(findIn, strlen(findIn), wbuf)] = 0; + /* unsigned short * wbuf = (unsigned short*)malloc(sizeof(short) *(len + 10)); */ + /* wbuf[fl_utf2unicode(findIn, strlen(findIn), wbuf)] = 0; */ unsigned short *wbuf = NULL; unsigned wlen = fl_utf8toUtf16(findIn, strlen(findIn), NULL, 0); /* Pass NULL to query length */ wlen++; /* add a little extra for termination etc. */ @@ -89,7 +89,7 @@ int fl_scandir(const char *dirname, struct dirent ***namelist, int dstlen = l * 5 + 1; selectDir=(struct dirent*)malloc(sizeof(struct dirent)+dstlen); -// l = fl_unicode2utf(findw.cFileName, l, selectDir->d_name); + /* l = fl_unicode2utf(findw.cFileName, l, selectDir->d_name); */ l = fl_utf8fromwc(selectDir->d_name, dstlen, findw.cFileName, l); selectDir->d_name[l] = 0; @@ -131,5 +131,5 @@ int fl_scandir(const char *dirname, struct dirent ***namelist, #endif /* - * End of "$Id: scandir_win32.c 6687 2009-03-15 03:14:43Z greg.ercolano $". + * End of "$Id: scandir_win32.c 8347 2011-02-01 01:06:27Z greg.ercolano $". */ diff --git a/plugins/zynaddsubfx/fltk/src/screen_xywh.cxx b/plugins/zynaddsubfx/fltk/src/screen_xywh.cxx index a6446e978..5cf375986 100644 --- a/plugins/zynaddsubfx/fltk/src/screen_xywh.cxx +++ b/plugins/zynaddsubfx/fltk/src/screen_xywh.cxx @@ -1,9 +1,9 @@ // -// "$Id: screen_xywh.cxx 7351 2010-03-29 10:35:00Z matt $" +// "$Id: screen_xywh.cxx 8783 2011-06-06 09:37:21Z AlbrechtS $" // // Screen/monitor bounding box API for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -31,8 +31,8 @@ #include -// Number of screens... -static int num_screens = 0; +// Number of screens returned by multi monitor aware API; -1 before init +static int num_screens = -1; #ifdef WIN32 # if !defined(HMONITOR_DECLARED) && (_WIN32_WINNT < 0x0500) @@ -56,23 +56,36 @@ typedef BOOL (WINAPI* fl_gmi_func)(HMONITOR, LPMONITORINFO); static fl_gmi_func fl_gmi = NULL; // used to get a proc pointer for GetMonitorInfoA static RECT screens[16]; +static float dpi[16][2]; static BOOL CALLBACK screen_cb(HMONITOR mon, HDC, LPRECT r, LPARAM) { if (num_screens >= 16) return TRUE; - MONITORINFO mi; + MONITORINFOEX mi; mi.cbSize = sizeof(mi); // GetMonitorInfo(mon, &mi); // (but we use our self-aquired function pointer instead) if (fl_gmi(mon, &mi)) { - screens[num_screens] = mi.rcWork; + screens[num_screens] = mi.rcMonitor; + + // find the pixel size + if (mi.cbSize == sizeof(mi)) { + HDC screen = CreateDC(mi.szDevice, NULL, NULL, NULL); + if (screen) { + dpi[num_screens][0] = (float)GetDeviceCaps(screen, LOGPIXELSX); + dpi[num_screens][1] = (float)GetDeviceCaps(screen, LOGPIXELSY); + } + ReleaseDC(0L, screen); + } + num_screens ++; } return TRUE; } static void screen_init() { + num_screens = 0; // Since not all versions of Windows include multiple monitor support, // we do a run-time check for the required functions... HMODULE hMod = GetModuleHandle("USER32.DLL"); @@ -85,48 +98,90 @@ static void screen_init() { // We do have EnumDisplayMonitors, so lets find out how many monitors... num_screens = GetSystemMetrics(SM_CMONITORS); - if (num_screens > 1) { +// if (num_screens > 1) { // If there is more than 1 monitor, enumerate them... fl_gmi = (fl_gmi_func)GetProcAddress(hMod, "GetMonitorInfoA"); if (fl_gmi) { // We have GetMonitorInfoA, enumerate all the screens... - num_screens = 0; // EnumDisplayMonitors(0,0,screen_cb,0); // (but we use our self-aquired function pointer instead) fl_edm(0, 0, screen_cb, 0); return; } - } +// } } } // If we get here, assume we have 1 monitor... num_screens = 1; + screens[0].top = 0; + screens[0].left = 0; + screens[0].right = GetSystemMetrics(SM_CXSCREEN); + screens[0].bottom = GetSystemMetrics(SM_CYSCREEN); } #elif defined(__APPLE__) -XRectangle screens[16]; +static XRectangle screens[16]; +static float dpi_h[16]; +static float dpi_v[16]; -extern int MACscreen_init(XRectangle screens[]); static void screen_init() { - num_screens = MACscreen_init(screens); + CGDirectDisplayID displays[16]; + CGDisplayCount count, i; + CGRect r; + CGGetActiveDisplayList(16, displays, &count); + for( i = 0; i < count; i++) { + r = CGDisplayBounds(displays[i]); + screens[i].x = int(r.origin.x); + screens[i].y = int(r.origin.y); + screens[i].width = int(r.size.width); + screens[i].height = int(r.size.height); + CGSize s = CGDisplayScreenSize(displays[i]); + dpi_h[i] = screens[i].width / (s.width/25.4); + dpi_v[i] = screens[i].height / (s.height/25.4); + } + num_screens = count; } #elif HAVE_XINERAMA # include // Screen data... static XineramaScreenInfo *screens; +static float dpi[16][2]; static void screen_init() { if (!fl_display) fl_open_display(); if (XineramaIsActive(fl_display)) { screens = XineramaQueryScreens(fl_display, &num_screens); - } else num_screens = 1; + int i; + // Xlib and Xinerama may disagree on the screen count. Sigh... + // Use the minimum of the reported counts. + // Use the previous screen's info for non-existent ones. + int sc = ScreenCount(fl_display); // Xlib screen count + for (i=0; i 0) ? dpi[i-1][0] : 0.0f; + mm = (i < sc) ? DisplayHeightMM(fl_display, i) : 0; + dpi[i][1] = mm ? screens[i].height*25.4f/mm : (i > 0) ? dpi[i-1][1] : 0.0f; + } + } else { // ! XineramaIsActive() + num_screens = 1; + int mm = DisplayWidthMM(fl_display, fl_screen); + dpi[0][0] = mm ? Fl::w()*25.4f/mm : 0.0f; + mm = DisplayHeightMM(fl_display, fl_screen); + dpi[0][1] = mm ? Fl::h()*25.4f/mm : dpi[0][0]; + } } #else +static float dpi[2]; static void screen_init() { num_screens = 1; + if (!fl_display) fl_open_display(); + int mm = DisplayWidthMM(fl_display, fl_screen); + dpi[0] = mm ? Fl::w()*25.4f/mm : 0.0f; + mm = DisplayHeightMM(fl_display, fl_screen); + dpi[1] = mm ? Fl::h()*25.4f/mm : dpi[0]; } #endif // WIN32 @@ -135,9 +190,9 @@ static void screen_init() { Gets the number of available screens. */ int Fl::screen_count() { - if (!num_screens) screen_init(); + if (num_screens < 0) screen_init(); - return num_screens; + return num_screens ? num_screens : 1; } /** @@ -147,66 +202,21 @@ int Fl::screen_count() { \param[in] mx, my the absolute screen position */ void Fl::screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my) { - if (!num_screens) screen_init(); + int screen = 0; + int i; -#ifdef WIN32 - if (num_screens > 1) { - int i; + if (num_screens < 0) screen_init(); - for (i = 0; i < num_screens; i ++) { - if (mx >= screens[i].left && mx < screens[i].right && - my >= screens[i].top && my < screens[i].bottom) { - X = screens[i].left; - Y = screens[i].top; - W = screens[i].right - screens[i].left; - H = screens[i].bottom - screens[i].top; - return; - } + for (i = 0; i < num_screens; i ++) { + int sx, sy, sw, sh; + Fl::screen_xywh(sx, sy, sw, sh, i); + if ((mx >= sx) && (mx < (sx+sw)) && (my >= sy) && (my < (sy+sh))) { + screen = i; + break; } } -#elif defined(__APPLE__) - if (num_screens > 1) { - int i; - for (i = 0; i < num_screens; i ++) { - if (mx >= screens[i].x && - mx < (screens[i].x + screens[i].width) && - my >= screens[i].y && - my < (screens[i].y + screens[i].height)) { - X = screens[i].x; - Y = screens[i].y; - W = screens[i].width; - H = screens[i].height; - return; - } - } - } -#elif HAVE_XINERAMA - if (num_screens > 1) { - int i; - - for (i = 0; i < num_screens; i ++) { - if (mx >= screens[i].x_org && - mx < (screens[i].x_org + screens[i].width) && - my >= screens[i].y_org && - my < (screens[i].y_org + screens[i].height)) { - X = screens[i].x_org; - Y = screens[i].y_org; - W = screens[i].width; - H = screens[i].height; - return; - } - } - } -#else - (void)mx; - (void)my; -#endif // WIN32 - - X = Fl::x(); - Y = Fl::y(); - W = Fl::w(); - H = Fl::h(); + screen_xywh(X, Y, W, H, screen); } /** @@ -216,43 +226,128 @@ void Fl::screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my) { \see void screen_xywh(int &x, int &y, int &w, int &h, int mx, int my) */ void Fl::screen_xywh(int &X, int &Y, int &W, int &H, int n) { - if (!num_screens) screen_init(); + if (num_screens < 0) screen_init(); + + if ((n < 0) || (n >= num_screens)) + n = 0; #ifdef WIN32 - if (num_screens > 1 && n >= 0 && n < num_screens) { + if (num_screens > 0) { X = screens[n].left; Y = screens[n].top; W = screens[n].right - screens[n].left; H = screens[n].bottom - screens[n].top; - return; + } else { + /* Fallback if something is broken... */ + X = 0; + Y = 0; + W = GetSystemMetrics(SM_CXSCREEN); + H = GetSystemMetrics(SM_CYSCREEN); } #elif defined(__APPLE__) - if (num_screens > 1 && n >= 0 && n < num_screens) { + if (num_screens > 0) { X = screens[n].x; Y = screens[n].y; W = screens[n].width; H = screens[n].height; - return; + } else { + /* Fallback if something is broken... */ + X = Fl::x(); + Y = Fl::y(); + W = Fl::w(); + H = Fl::h(); } -#elif HAVE_XINERAMA - if (num_screens > 1 && n >= 0 && n < num_screens) { +#else +#if HAVE_XINERAMA + if (num_screens > 0 && screens) { X = screens[n].x_org; Y = screens[n].y_org; W = screens[n].width; H = screens[n].height; - return; + } else +#endif // HAVE_XINERAMA + { + /* Fallback if something is broken (or no Xinerama)... */ + X = 0; + Y = 0; + W = DisplayWidth(fl_display, fl_screen); + H = DisplayHeight(fl_display, fl_screen); + } +#endif // WIN32 +} + +static inline float fl_intersection(int x1, int y1, int w1, int h1, + int x2, int y2, int w2, int h2) { + if(x1+w1 < x2 || x2+w2 < x1 || y1+h1 < y2 || y2+h2 < y1) + return 0.; + int int_left = x1 > x2 ? x1 : x2; + int int_right = x1+w1 > x2+w2 ? x2+w2 : x1+w1; + int int_top = y1 > y2 ? y1 : y2; + int int_bottom = y1+h1 > y2+h2 ? y2+h2 : y1+h1; + return (float)(int_right - int_left) * (int_bottom - int_top); +} + +/** + Gets the screen bounding rect for the screen + which intersects the most with the rectangle + defined by \p mx, \p my, \p mw, \p mh. + \param[out] X,Y,W,H the corresponding screen bounding box + \param[in] mx, my, mw, mh the rectangle to search for intersection with + \see void screen_xywh(int &X, int &Y, int &W, int &H, int n) + */ +void Fl::screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my, int mw, int mh) { + int best_screen = 0; + float best_intersection = 0.; + for(int i = 0; i < Fl::screen_count(); i++) { + int sx, sy, sw, sh; + Fl::screen_xywh(sx, sy, sw, sh, i); + float sintersection = fl_intersection(mx, my, mw, mh, sx, sy, sw, sh); + if(sintersection > best_intersection) { + best_screen = i; + best_intersection = sintersection; + } + } + screen_xywh(X, Y, W, H, best_screen); +} + + + +/** + Gets the screen resolution in dots-per-inch for the given screen. + \param[out] h, v horizontal and vertical resolution + \param[in] n the screen number (0 to Fl::screen_count() - 1) + \see void screen_xywh(int &x, int &y, int &w, int &h, int mx, int my) + */ +void Fl::screen_dpi(float &h, float &v, int n) +{ + if (num_screens < 0) screen_init(); + h = v = 0.0f; + +#ifdef WIN32 + if (n >= 0 && n < num_screens) { + h = float(dpi[n][0]); + v = float(dpi[n][1]); + } +#elif defined(__APPLE__) + if (n >= 0 && n < num_screens) { + h = dpi_h[n]; + v = dpi_v[n]; + } +#elif HAVE_XINERAMA + if (n >= 0 && n < num_screens) { + h = dpi[n][0]; + v = dpi[n][1]; } #else - (void)n; + if (n >= 0 && n < num_screens) { + h = dpi[0]; + v = dpi[1]; + } #endif // WIN32 - - X = Fl::x(); - Y = Fl::y(); - W = Fl::w(); - H = Fl::h(); } + // -// End of "$Id: screen_xywh.cxx 7351 2010-03-29 10:35:00Z matt $". +// End of "$Id: screen_xywh.cxx 8783 2011-06-06 09:37:21Z AlbrechtS $". // diff --git a/plugins/zynaddsubfx/fltk/src/vsnprintf.c b/plugins/zynaddsubfx/fltk/src/vsnprintf.c index 8bdb32ab1..d479f8a01 100644 --- a/plugins/zynaddsubfx/fltk/src/vsnprintf.c +++ b/plugins/zynaddsubfx/fltk/src/vsnprintf.c @@ -1,9 +1,9 @@ /* - * "$Id: vsnprintf.c 6616 2009-01-01 21:28:26Z matt $" + * "$Id: vsnprintf.c 7903 2010-11-28 21:06:39Z matt $" * * snprintf() and vsnprintf() functions for the Fast Light Tool Kit (FLTK). * - * Copyright 1998-2009 by Bill Spitzak and others. + * Copyright 1998-2010 by Bill Spitzak and others. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -276,6 +276,6 @@ int fl_snprintf(char* str, size_t size, const char* fmt, ...) { #endif /* - * End of "$Id: vsnprintf.c 6616 2009-01-01 21:28:26Z matt $". + * End of "$Id: vsnprintf.c 7903 2010-11-28 21:06:39Z matt $". */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/README b/plugins/zynaddsubfx/fltk/src/xutf8/README index a9abb8a52..cc9c51d96 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/README +++ b/plugins/zynaddsubfx/fltk/src/xutf8/README @@ -21,6 +21,7 @@ iso8859-15 koi8-r koi8-u big5-0 +gbk gb2312.1980-0 jisx0201.1976-0 jisx0208.1983-0 diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/case.c b/plugins/zynaddsubfx/fltk/src/xutf8/case.c index e21c96202..6e9ac67c3 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/case.c +++ b/plugins/zynaddsubfx/fltk/src/xutf8/case.c @@ -1,7 +1,8 @@ -/* "$Id: $" +/* + * "$Id: $" * * Author: Jean-Marc Lienher ( http://oksid.ch ) - * Copyright 2000-2003 by O'ksi'D. + * Copyright 2000-2010 by O'ksi'D. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/is_right2left.c b/plugins/zynaddsubfx/fltk/src/xutf8/is_right2left.c index 737b85266..d823452ca 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/is_right2left.c +++ b/plugins/zynaddsubfx/fltk/src/xutf8/is_right2left.c @@ -1,7 +1,7 @@ /* "$Id: $" * * Author: Jean-Marc Lienher ( http://oksid.ch ) - * Copyright 2000-2003 by O'ksi'D. + * Copyright 2000-2010 by O'ksi'D. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/is_spacing.c b/plugins/zynaddsubfx/fltk/src/xutf8/is_spacing.c index 94557302c..2035ff707 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/is_spacing.c +++ b/plugins/zynaddsubfx/fltk/src/xutf8/is_spacing.c @@ -1,7 +1,7 @@ /* "$Id: $" * * Author: Jean-Marc Lienher ( http://oksid.ch ) - * Copyright 2000-2003 by O'ksi'D. + * Copyright 2000-2010 by O'ksi'D. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/README b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/README index 6ce59c7bc..6c0ca937e 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/README +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/README @@ -3,7 +3,7 @@ $XFree86: xc/lib/X11/lcUniConv/README,v 1.3 2003/10/24 15:34:01 tsi Exp $ The files in this directory are taken from the libiconv-1.1 package. The *.h files were generated from tables (mostly from ftp.unicode.org) using -the programs '8bit_tab_to_h.c' and 'cjk_tab_to_h.c'. On some of them, further +the programs '8bit_tab_to_h.c', 'cjk_tab_to_h.c' and 'gbk_tab_to_h.c'. On some of them, further optimizations were applied by hand. If you find a bug in these files, instead of modifying them in XFree86 diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/big5.h b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/big5.h index deff86692..3b39c80cd 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/big5.h +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/big5.h @@ -3,7 +3,7 @@ /* * BIG5 */ - +#ifdef NEED_TOWC static const unsigned short big5_2uni_pagea1[6121] = { /* 0xa1 */ 0x3000, 0xff0c, 0x3001, 0x3002, 0xff0e, 0x2022, 0xff1b, 0xff1a, @@ -1880,7 +1880,9 @@ big5_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) } return RET_ILSEQ; } +#endif /* NEED_TOWC */ +#ifdef NEED_TOMB static const unsigned short big5_2charset[13703] = { 0xa246, 0xa247, 0xa244, 0xa1b1, 0xa258, 0xa1d3, 0xa150, 0xa1d1, 0xa1d2, 0xa3be, 0xa3bc, 0xa3bd, 0xa3bf, 0xa3bb, 0xa344, 0xa345, @@ -4140,3 +4142,4 @@ big5_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } return RET_TOOSMALL; } +#endif /* NEED_TOMB */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/cp1251.h b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/cp1251.h index f3f7577f1..8c0b54c5c 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/cp1251.h +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/cp1251.h @@ -3,6 +3,7 @@ /* * CP1251 */ +#ifdef NEED_TOWC static const unsigned short cp1251_2uni[128] = { /* 0x80 */ @@ -48,7 +49,9 @@ cp1251_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) } return RET_ILSEQ; } +#endif /* NEED_TOWC */ +#ifdef NEED_TOMB static const unsigned char cp1251_page00[32] = { 0xa0, 0x00, 0x00, 0x00, 0xa4, 0x00, 0xa6, 0xa7, /* 0xa0-0xa7 */ 0x00, 0xa9, 0x00, 0xab, 0xac, 0xad, 0xae, 0x00, /* 0xa8-0xaf */ @@ -111,3 +114,4 @@ cp1251_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } return RET_ILSEQ; } +#endif /* NEED_TOMB */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/cp936ext.h b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/cp936ext.h new file mode 100644 index 000000000..578db9561 --- /dev/null +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/cp936ext.h @@ -0,0 +1,6259 @@ +/* + * "$Id$" + * + * Character encoding support for the Fast Light Tool Kit (FLTK). + * + * Copyright 1998-2010 by Bill Spitzak and others. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA. + * + * Please report all bugs and problems on the following page: + * + * http://www.fltk.org/str.php + */ + +#if !defined(WIN32) && !defined(__APPLE__) + +#ifndef CP936 +#ifdef NEED_TOWC +static int +cp936ext_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) +{ + return 0; +} +#endif /* NEED_TOWC */ + +#ifdef NEED_TOMB +static int +cp936ext_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) +{ + return 0; +} +#endif /* NEED_TOMB */ + +#else +/* + * CP936EXT + */ +#ifdef NEED_TOWC + +static const unsigned short cp936ext_2uni_page81[23766] = { + /* 0x81 */ + 0x4e02, 0x4e04, 0x4e05, 0x4e06, 0x4e0f, 0x4e12, 0x4e17, 0x4e1f, + 0x4e20, 0x4e21, 0x4e23, 0x4e26, 0x4e29, 0x4e2e, 0x4e2f, 0x4e31, + 0x4e33, 0x4e35, 0x4e37, 0x4e3c, 0x4e40, 0x4e41, 0x4e42, 0x4e44, + 0x4e46, 0x4e4a, 0x4e51, 0x4e55, 0x4e57, 0x4e5a, 0x4e5b, 0x4e62, + 0x4e63, 0x4e64, 0x4e65, 0x4e67, 0x4e68, 0x4e6a, 0x4e6b, 0x4e6c, + 0x4e6d, 0x4e6e, 0x4e6f, 0x4e72, 0x4e74, 0x4e75, 0x4e76, 0x4e77, + 0x4e78, 0x4e79, 0x4e7a, 0x4e7b, 0x4e7c, 0x4e7d, 0x4e7f, 0x4e80, + 0x4e81, 0x4e82, 0x4e83, 0x4e84, 0x4e85, 0x4e87, 0x4e8a, 0x4e90, + 0x4e96, 0x4e97, 0x4e99, 0x4e9c, 0x4e9d, 0x4e9e, 0x4ea3, 0x4eaa, + 0x4eaf, 0x4eb0, 0x4eb1, 0x4eb4, 0x4eb6, 0x4eb7, 0x4eb8, 0x4eb9, + 0x4ebc, 0x4ebd, 0x4ebe, 0x4ec8, 0x4ecc, 0x4ecf, 0x4ed0, 0x4ed2, + 0x4eda, 0x4edb, 0x4edc, 0x4ee0, 0x4ee2, 0x4ee6, 0x4ee7, 0x4ee9, + 0x4eed, 0x4eee, 0x4eef, 0x4ef1, 0x4ef4, 0x4ef8, 0x4ef9, 0x4efa, + 0x4efc, 0x4efe, 0x4f00, 0x4f02, 0x4f03, 0x4f04, 0x4f05, 0x4f06, + 0x4f07, 0x4f08, 0x4f0b, 0x4f0c, 0x4f12, 0x4f13, 0x4f14, 0x4f15, + 0x4f16, 0x4f1c, 0x4f1d, 0x4f21, 0x4f23, 0x4f28, 0x4f29, 0x4f2c, + 0x4f2d, 0x4f2e, 0x4f31, 0x4f33, 0x4f35, 0x4f37, 0x4f39, 0x4f3b, + 0x4f3e, 0x4f3f, 0x4f40, 0x4f41, 0x4f42, 0x4f44, 0x4f45, 0x4f47, + 0x4f48, 0x4f49, 0x4f4a, 0x4f4b, 0x4f4c, 0x4f52, 0x4f54, 0x4f56, + 0x4f61, 0x4f62, 0x4f66, 0x4f68, 0x4f6a, 0x4f6b, 0x4f6d, 0x4f6e, + 0x4f71, 0x4f72, 0x4f75, 0x4f77, 0x4f78, 0x4f79, 0x4f7a, 0x4f7d, + 0x4f80, 0x4f81, 0x4f82, 0x4f85, 0x4f86, 0x4f87, 0x4f8a, 0x4f8c, + 0x4f8e, 0x4f90, 0x4f92, 0x4f93, 0x4f95, 0x4f96, 0x4f98, 0x4f99, + 0x4f9a, 0x4f9c, 0x4f9e, 0x4f9f, 0x4fa1, 0x4fa2, + /* 0x82 */ + 0x4fa4, 0x4fab, 0x4fad, 0x4fb0, 0x4fb1, 0x4fb2, 0x4fb3, 0x4fb4, + 0x4fb6, 0x4fb7, 0x4fb8, 0x4fb9, 0x4fba, 0x4fbb, 0x4fbc, 0x4fbd, + 0x4fbe, 0x4fc0, 0x4fc1, 0x4fc2, 0x4fc6, 0x4fc7, 0x4fc8, 0x4fc9, + 0x4fcb, 0x4fcc, 0x4fcd, 0x4fd2, 0x4fd3, 0x4fd4, 0x4fd5, 0x4fd6, + 0x4fd9, 0x4fdb, 0x4fe0, 0x4fe2, 0x4fe4, 0x4fe5, 0x4fe7, 0x4feb, + 0x4fec, 0x4ff0, 0x4ff2, 0x4ff4, 0x4ff5, 0x4ff6, 0x4ff7, 0x4ff9, + 0x4ffb, 0x4ffc, 0x4ffd, 0x4fff, 0x5000, 0x5001, 0x5002, 0x5003, + 0x5004, 0x5005, 0x5006, 0x5007, 0x5008, 0x5009, 0x500a, 0x500b, + 0x500e, 0x5010, 0x5011, 0x5013, 0x5015, 0x5016, 0x5017, 0x501b, + 0x501d, 0x501e, 0x5020, 0x5022, 0x5023, 0x5024, 0x5027, 0x502b, + 0x502f, 0x5030, 0x5031, 0x5032, 0x5033, 0x5034, 0x5035, 0x5036, + 0x5037, 0x5038, 0x5039, 0x503b, 0x503d, 0x503f, 0x5040, 0x5041, + 0x5042, 0x5044, 0x5045, 0x5046, 0x5049, 0x504a, 0x504b, 0x504d, + 0x5050, 0x5051, 0x5052, 0x5053, 0x5054, 0x5056, 0x5057, 0x5058, + 0x5059, 0x505b, 0x505d, 0x505e, 0x505f, 0x5060, 0x5061, 0x5062, + 0x5063, 0x5064, 0x5066, 0x5067, 0x5068, 0x5069, 0x506a, 0x506b, + 0x506d, 0x506e, 0x506f, 0x5070, 0x5071, 0x5072, 0x5073, 0x5074, + 0x5075, 0x5078, 0x5079, 0x507a, 0x507c, 0x507d, 0x5081, 0x5082, + 0x5083, 0x5084, 0x5086, 0x5087, 0x5089, 0x508a, 0x508b, 0x508c, + 0x508e, 0x508f, 0x5090, 0x5091, 0x5092, 0x5093, 0x5094, 0x5095, + 0x5096, 0x5097, 0x5098, 0x5099, 0x509a, 0x509b, 0x509c, 0x509d, + 0x509e, 0x509f, 0x50a0, 0x50a1, 0x50a2, 0x50a4, 0x50a6, 0x50aa, + 0x50ab, 0x50ad, 0x50ae, 0x50af, 0x50b0, 0x50b1, 0x50b3, 0x50b4, + 0x50b5, 0x50b6, 0x50b7, 0x50b8, 0x50b9, 0x50bc, + /* 0x83 */ + 0x50bd, 0x50be, 0x50bf, 0x50c0, 0x50c1, 0x50c2, 0x50c3, 0x50c4, + 0x50c5, 0x50c6, 0x50c7, 0x50c8, 0x50c9, 0x50ca, 0x50cb, 0x50cc, + 0x50cd, 0x50ce, 0x50d0, 0x50d1, 0x50d2, 0x50d3, 0x50d4, 0x50d5, + 0x50d7, 0x50d8, 0x50d9, 0x50db, 0x50dc, 0x50dd, 0x50de, 0x50df, + 0x50e0, 0x50e1, 0x50e2, 0x50e3, 0x50e4, 0x50e5, 0x50e8, 0x50e9, + 0x50ea, 0x50eb, 0x50ef, 0x50f0, 0x50f1, 0x50f2, 0x50f4, 0x50f6, + 0x50f7, 0x50f8, 0x50f9, 0x50fa, 0x50fc, 0x50fd, 0x50fe, 0x50ff, + 0x5100, 0x5101, 0x5102, 0x5103, 0x5104, 0x5105, 0x5108, 0x5109, + 0x510a, 0x510c, 0x510d, 0x510e, 0x510f, 0x5110, 0x5111, 0x5113, + 0x5114, 0x5115, 0x5116, 0x5117, 0x5118, 0x5119, 0x511a, 0x511b, + 0x511c, 0x511d, 0x511e, 0x511f, 0x5120, 0x5122, 0x5123, 0x5124, + 0x5125, 0x5126, 0x5127, 0x5128, 0x5129, 0x512a, 0x512b, 0x512c, + 0x512d, 0x512e, 0x512f, 0x5130, 0x5131, 0x5132, 0x5133, 0x5134, + 0x5135, 0x5136, 0x5137, 0x5138, 0x5139, 0x513a, 0x513b, 0x513c, + 0x513d, 0x513e, 0x5142, 0x5147, 0x514a, 0x514c, 0x514e, 0x514f, + 0x5150, 0x5152, 0x5153, 0x5157, 0x5158, 0x5159, 0x515b, 0x515d, + 0x515e, 0x515f, 0x5160, 0x5161, 0x5163, 0x5164, 0x5166, 0x5167, + 0x5169, 0x516a, 0x516f, 0x5172, 0x517a, 0x517e, 0x517f, 0x5183, + 0x5184, 0x5186, 0x5187, 0x518a, 0x518b, 0x518e, 0x518f, 0x5190, + 0x5191, 0x5193, 0x5194, 0x5198, 0x519a, 0x519d, 0x519e, 0x519f, + 0x51a1, 0x51a3, 0x51a6, 0x51a7, 0x51a8, 0x51a9, 0x51aa, 0x51ad, + 0x51ae, 0x51b4, 0x51b8, 0x51b9, 0x51ba, 0x51be, 0x51bf, 0x51c1, + 0x51c2, 0x51c3, 0x51c5, 0x51c8, 0x51ca, 0x51cd, 0x51ce, 0x51d0, + 0x51d2, 0x51d3, 0x51d4, 0x51d5, 0x51d6, 0x51d7, + /* 0x84 */ + 0x51d8, 0x51d9, 0x51da, 0x51dc, 0x51de, 0x51df, 0x51e2, 0x51e3, + 0x51e5, 0x51e6, 0x51e7, 0x51e8, 0x51e9, 0x51ea, 0x51ec, 0x51ee, + 0x51f1, 0x51f2, 0x51f4, 0x51f7, 0x51fe, 0x5204, 0x5205, 0x5209, + 0x520b, 0x520c, 0x520f, 0x5210, 0x5213, 0x5214, 0x5215, 0x521c, + 0x521e, 0x521f, 0x5221, 0x5222, 0x5223, 0x5225, 0x5226, 0x5227, + 0x522a, 0x522c, 0x522f, 0x5231, 0x5232, 0x5234, 0x5235, 0x523c, + 0x523e, 0x5244, 0x5245, 0x5246, 0x5247, 0x5248, 0x5249, 0x524b, + 0x524e, 0x524f, 0x5252, 0x5253, 0x5255, 0x5257, 0x5258, 0x5259, + 0x525a, 0x525b, 0x525d, 0x525f, 0x5260, 0x5262, 0x5263, 0x5264, + 0x5266, 0x5268, 0x526b, 0x526c, 0x526d, 0x526e, 0x5270, 0x5271, + 0x5273, 0x5274, 0x5275, 0x5276, 0x5277, 0x5278, 0x5279, 0x527a, + 0x527b, 0x527c, 0x527e, 0x5280, 0x5283, 0x5284, 0x5285, 0x5286, + 0x5287, 0x5289, 0x528a, 0x528b, 0x528c, 0x528d, 0x528e, 0x528f, + 0x5291, 0x5292, 0x5294, 0x5295, 0x5296, 0x5297, 0x5298, 0x5299, + 0x529a, 0x529c, 0x52a4, 0x52a5, 0x52a6, 0x52a7, 0x52ae, 0x52af, + 0x52b0, 0x52b4, 0x52b5, 0x52b6, 0x52b7, 0x52b8, 0x52b9, 0x52ba, + 0x52bb, 0x52bc, 0x52bd, 0x52c0, 0x52c1, 0x52c2, 0x52c4, 0x52c5, + 0x52c6, 0x52c8, 0x52ca, 0x52cc, 0x52cd, 0x52ce, 0x52cf, 0x52d1, + 0x52d3, 0x52d4, 0x52d5, 0x52d7, 0x52d9, 0x52da, 0x52db, 0x52dc, + 0x52dd, 0x52de, 0x52e0, 0x52e1, 0x52e2, 0x52e3, 0x52e5, 0x52e6, + 0x52e7, 0x52e8, 0x52e9, 0x52ea, 0x52eb, 0x52ec, 0x52ed, 0x52ee, + 0x52ef, 0x52f1, 0x52f2, 0x52f3, 0x52f4, 0x52f5, 0x52f6, 0x52f7, + 0x52f8, 0x52fb, 0x52fc, 0x52fd, 0x5301, 0x5302, 0x5303, 0x5304, + 0x5307, 0x5309, 0x530a, 0x530b, 0x530c, 0x530e, + /* 0x85 */ + 0x5311, 0x5312, 0x5313, 0x5314, 0x5318, 0x531b, 0x531c, 0x531e, + 0x531f, 0x5322, 0x5324, 0x5325, 0x5327, 0x5328, 0x5329, 0x532b, + 0x532c, 0x532d, 0x532f, 0x5330, 0x5331, 0x5332, 0x5333, 0x5334, + 0x5335, 0x5336, 0x5337, 0x5338, 0x533c, 0x533d, 0x5340, 0x5342, + 0x5344, 0x5346, 0x534b, 0x534c, 0x534d, 0x5350, 0x5354, 0x5358, + 0x5359, 0x535b, 0x535d, 0x5365, 0x5368, 0x536a, 0x536c, 0x536d, + 0x5372, 0x5376, 0x5379, 0x537b, 0x537c, 0x537d, 0x537e, 0x5380, + 0x5381, 0x5383, 0x5387, 0x5388, 0x538a, 0x538e, 0x538f, 0x5390, + 0x5391, 0x5392, 0x5393, 0x5394, 0x5396, 0x5397, 0x5399, 0x539b, + 0x539c, 0x539e, 0x53a0, 0x53a1, 0x53a4, 0x53a7, 0x53aa, 0x53ab, + 0x53ac, 0x53ad, 0x53af, 0x53b0, 0x53b1, 0x53b2, 0x53b3, 0x53b4, + 0x53b5, 0x53b7, 0x53b8, 0x53b9, 0x53ba, 0x53bc, 0x53bd, 0x53be, + 0x53c0, 0x53c3, 0x53c4, 0x53c5, 0x53c6, 0x53c7, 0x53ce, 0x53cf, + 0x53d0, 0x53d2, 0x53d3, 0x53d5, 0x53da, 0x53dc, 0x53dd, 0x53de, + 0x53e1, 0x53e2, 0x53e7, 0x53f4, 0x53fa, 0x53fe, 0x53ff, 0x5400, + 0x5402, 0x5405, 0x5407, 0x540b, 0x5414, 0x5418, 0x5419, 0x541a, + 0x541c, 0x5422, 0x5424, 0x5425, 0x542a, 0x5430, 0x5433, 0x5436, + 0x5437, 0x543a, 0x543d, 0x543f, 0x5441, 0x5442, 0x5444, 0x5445, + 0x5447, 0x5449, 0x544c, 0x544d, 0x544e, 0x544f, 0x5451, 0x545a, + 0x545d, 0x545e, 0x545f, 0x5460, 0x5461, 0x5463, 0x5465, 0x5467, + 0x5469, 0x546a, 0x546b, 0x546c, 0x546d, 0x546e, 0x546f, 0x5470, + 0x5474, 0x5479, 0x547a, 0x547e, 0x547f, 0x5481, 0x5483, 0x5485, + 0x5487, 0x5488, 0x5489, 0x548a, 0x548d, 0x5491, 0x5493, 0x5497, + 0x5498, 0x549c, 0x549e, 0x549f, 0x54a0, 0x54a1, + /* 0x86 */ + 0x54a2, 0x54a5, 0x54ae, 0x54b0, 0x54b2, 0x54b5, 0x54b6, 0x54b7, + 0x54b9, 0x54ba, 0x54bc, 0x54be, 0x54c3, 0x54c5, 0x54ca, 0x54cb, + 0x54d6, 0x54d8, 0x54db, 0x54e0, 0x54e1, 0x54e2, 0x54e3, 0x54e4, + 0x54eb, 0x54ec, 0x54ef, 0x54f0, 0x54f1, 0x54f4, 0x54f5, 0x54f6, + 0x54f7, 0x54f8, 0x54f9, 0x54fb, 0x54fe, 0x5500, 0x5502, 0x5503, + 0x5504, 0x5505, 0x5508, 0x550a, 0x550b, 0x550c, 0x550d, 0x550e, + 0x5512, 0x5513, 0x5515, 0x5516, 0x5517, 0x5518, 0x5519, 0x551a, + 0x551c, 0x551d, 0x551e, 0x551f, 0x5521, 0x5525, 0x5526, 0x5528, + 0x5529, 0x552b, 0x552d, 0x5532, 0x5534, 0x5535, 0x5536, 0x5538, + 0x5539, 0x553a, 0x553b, 0x553d, 0x5540, 0x5542, 0x5545, 0x5547, + 0x5548, 0x554b, 0x554c, 0x554d, 0x554e, 0x554f, 0x5551, 0x5552, + 0x5553, 0x5554, 0x5557, 0x5558, 0x5559, 0x555a, 0x555b, 0x555d, + 0x555e, 0x555f, 0x5560, 0x5562, 0x5563, 0x5568, 0x5569, 0x556b, + 0x556f, 0x5570, 0x5571, 0x5572, 0x5573, 0x5574, 0x5579, 0x557a, + 0x557d, 0x557f, 0x5585, 0x5586, 0x558c, 0x558d, 0x558e, 0x5590, + 0x5592, 0x5593, 0x5595, 0x5596, 0x5597, 0x559a, 0x559b, 0x559e, + 0x55a0, 0x55a1, 0x55a2, 0x55a3, 0x55a4, 0x55a5, 0x55a6, 0x55a8, + 0x55a9, 0x55aa, 0x55ab, 0x55ac, 0x55ad, 0x55ae, 0x55af, 0x55b0, + 0x55b2, 0x55b4, 0x55b6, 0x55b8, 0x55ba, 0x55bc, 0x55bf, 0x55c0, + 0x55c1, 0x55c2, 0x55c3, 0x55c6, 0x55c7, 0x55c8, 0x55ca, 0x55cb, + 0x55ce, 0x55cf, 0x55d0, 0x55d5, 0x55d7, 0x55d8, 0x55d9, 0x55da, + 0x55db, 0x55de, 0x55e0, 0x55e2, 0x55e7, 0x55e9, 0x55ed, 0x55ee, + 0x55f0, 0x55f1, 0x55f4, 0x55f6, 0x55f8, 0x55f9, 0x55fa, 0x55fb, + 0x55fc, 0x55ff, 0x5602, 0x5603, 0x5604, 0x5605, + /* 0x87 */ + 0x5606, 0x5607, 0x560a, 0x560b, 0x560d, 0x5610, 0x5611, 0x5612, + 0x5613, 0x5614, 0x5615, 0x5616, 0x5617, 0x5619, 0x561a, 0x561c, + 0x561d, 0x5620, 0x5621, 0x5622, 0x5625, 0x5626, 0x5628, 0x5629, + 0x562a, 0x562b, 0x562e, 0x562f, 0x5630, 0x5633, 0x5635, 0x5637, + 0x5638, 0x563a, 0x563c, 0x563d, 0x563e, 0x5640, 0x5641, 0x5642, + 0x5643, 0x5644, 0x5645, 0x5646, 0x5647, 0x5648, 0x5649, 0x564a, + 0x564b, 0x564f, 0x5650, 0x5651, 0x5652, 0x5653, 0x5655, 0x5656, + 0x565a, 0x565b, 0x565d, 0x565e, 0x565f, 0x5660, 0x5661, 0x5663, + 0x5665, 0x5666, 0x5667, 0x566d, 0x566e, 0x566f, 0x5670, 0x5672, + 0x5673, 0x5674, 0x5675, 0x5677, 0x5678, 0x5679, 0x567a, 0x567d, + 0x567e, 0x567f, 0x5680, 0x5681, 0x5682, 0x5683, 0x5684, 0x5687, + 0x5688, 0x5689, 0x568a, 0x568b, 0x568c, 0x568d, 0x5690, 0x5691, + 0x5692, 0x5694, 0x5695, 0x5696, 0x5697, 0x5698, 0x5699, 0x569a, + 0x569b, 0x569c, 0x569d, 0x569e, 0x569f, 0x56a0, 0x56a1, 0x56a2, + 0x56a4, 0x56a5, 0x56a6, 0x56a7, 0x56a8, 0x56a9, 0x56aa, 0x56ab, + 0x56ac, 0x56ad, 0x56ae, 0x56b0, 0x56b1, 0x56b2, 0x56b3, 0x56b4, + 0x56b5, 0x56b6, 0x56b8, 0x56b9, 0x56ba, 0x56bb, 0x56bd, 0x56be, + 0x56bf, 0x56c0, 0x56c1, 0x56c2, 0x56c3, 0x56c4, 0x56c5, 0x56c6, + 0x56c7, 0x56c8, 0x56c9, 0x56cb, 0x56cc, 0x56cd, 0x56ce, 0x56cf, + 0x56d0, 0x56d1, 0x56d2, 0x56d3, 0x56d5, 0x56d6, 0x56d8, 0x56d9, + 0x56dc, 0x56e3, 0x56e5, 0x56e6, 0x56e7, 0x56e8, 0x56e9, 0x56ea, + 0x56ec, 0x56ee, 0x56ef, 0x56f2, 0x56f3, 0x56f6, 0x56f7, 0x56f8, + 0x56fb, 0x56fc, 0x5700, 0x5701, 0x5702, 0x5705, 0x5707, 0x570b, + 0x570c, 0x570d, 0x570e, 0x570f, 0x5710, 0x5711, + /* 0x88 */ + 0x5712, 0x5713, 0x5714, 0x5715, 0x5716, 0x5717, 0x5718, 0x5719, + 0x571a, 0x571b, 0x571d, 0x571e, 0x5720, 0x5721, 0x5722, 0x5724, + 0x5725, 0x5726, 0x5727, 0x572b, 0x5731, 0x5732, 0x5734, 0x5735, + 0x5736, 0x5737, 0x5738, 0x573c, 0x573d, 0x573f, 0x5741, 0x5743, + 0x5744, 0x5745, 0x5746, 0x5748, 0x5749, 0x574b, 0x5752, 0x5753, + 0x5754, 0x5755, 0x5756, 0x5758, 0x5759, 0x5762, 0x5763, 0x5765, + 0x5767, 0x576c, 0x576e, 0x5770, 0x5771, 0x5772, 0x5774, 0x5775, + 0x5778, 0x5779, 0x577a, 0x577d, 0x577e, 0x577f, 0x5780, 0x5781, + 0x5787, 0x5788, 0x5789, 0x578a, 0x578d, 0x578e, 0x578f, 0x5790, + 0x5791, 0x5794, 0x5795, 0x5796, 0x5797, 0x5798, 0x5799, 0x579a, + 0x579c, 0x579d, 0x579e, 0x579f, 0x57a5, 0x57a8, 0x57aa, 0x57ac, + 0x57af, 0x57b0, 0x57b1, 0x57b3, 0x57b5, 0x57b6, 0x57b7, 0x57b9, + 0x57ba, 0x57bb, 0x57bc, 0x57bd, 0x57be, 0x57bf, 0x57c0, 0x57c1, + 0x57c4, 0x57c5, 0x57c6, 0x57c7, 0x57c8, 0x57c9, 0x57ca, 0x57cc, + 0x57cd, 0x57d0, 0x57d1, 0x57d3, 0x57d6, 0x57d7, 0x57db, 0x57dc, + 0x57de, 0x57e1, 0x57e2, 0x57e3, 0x57e5, 0x57e6, 0x57e7, 0x57e8, + 0x57e9, 0x57ea, 0x57eb, 0x57ec, 0x57ee, 0x57f0, 0x57f1, 0x57f2, + 0x57f3, 0x57f5, 0x57f6, 0x57f7, 0x57fb, 0x57fc, 0x57fe, 0x57ff, + 0x5801, 0x5803, 0x5804, 0x5805, 0x5808, 0x5809, 0x580a, 0x580c, + 0x580e, 0x580f, 0x5810, 0x5812, 0x5813, 0x5814, 0x5816, 0x5817, + 0x5818, 0x581a, 0x581b, 0x581c, 0x581d, 0x581f, 0x5822, 0x5823, + 0x5825, 0x5826, 0x5827, 0x5828, 0x5829, 0x582b, 0x582c, 0x582d, + 0x582e, 0x582f, 0x5831, 0x5832, 0x5833, 0x5834, 0x5836, 0x5837, + 0x5838, 0x5839, 0x583a, 0x583b, 0x583c, 0x583d, + /* 0x89 */ + 0x583e, 0x583f, 0x5840, 0x5841, 0x5842, 0x5843, 0x5845, 0x5846, + 0x5847, 0x5848, 0x5849, 0x584a, 0x584b, 0x584e, 0x584f, 0x5850, + 0x5852, 0x5853, 0x5855, 0x5856, 0x5857, 0x5859, 0x585a, 0x585b, + 0x585c, 0x585d, 0x585f, 0x5860, 0x5861, 0x5862, 0x5863, 0x5864, + 0x5866, 0x5867, 0x5868, 0x5869, 0x586a, 0x586d, 0x586e, 0x586f, + 0x5870, 0x5871, 0x5872, 0x5873, 0x5874, 0x5875, 0x5876, 0x5877, + 0x5878, 0x5879, 0x587a, 0x587b, 0x587c, 0x587d, 0x587f, 0x5882, + 0x5884, 0x5886, 0x5887, 0x5888, 0x588a, 0x588b, 0x588c, 0x588d, + 0x588e, 0x588f, 0x5890, 0x5891, 0x5894, 0x5895, 0x5896, 0x5897, + 0x5898, 0x589b, 0x589c, 0x589d, 0x58a0, 0x58a1, 0x58a2, 0x58a3, + 0x58a4, 0x58a5, 0x58a6, 0x58a7, 0x58aa, 0x58ab, 0x58ac, 0x58ad, + 0x58ae, 0x58af, 0x58b0, 0x58b1, 0x58b2, 0x58b3, 0x58b4, 0x58b5, + 0x58b6, 0x58b7, 0x58b8, 0x58b9, 0x58ba, 0x58bb, 0x58bd, 0x58be, + 0x58bf, 0x58c0, 0x58c2, 0x58c3, 0x58c4, 0x58c6, 0x58c7, 0x58c8, + 0x58c9, 0x58ca, 0x58cb, 0x58cc, 0x58cd, 0x58ce, 0x58cf, 0x58d0, + 0x58d2, 0x58d3, 0x58d4, 0x58d6, 0x58d7, 0x58d8, 0x58d9, 0x58da, + 0x58db, 0x58dc, 0x58dd, 0x58de, 0x58df, 0x58e0, 0x58e1, 0x58e2, + 0x58e3, 0x58e5, 0x58e6, 0x58e7, 0x58e8, 0x58e9, 0x58ea, 0x58ed, + 0x58ef, 0x58f1, 0x58f2, 0x58f4, 0x58f5, 0x58f7, 0x58f8, 0x58fa, + 0x58fb, 0x58fc, 0x58fd, 0x58fe, 0x58ff, 0x5900, 0x5901, 0x5903, + 0x5905, 0x5906, 0x5908, 0x5909, 0x590a, 0x590b, 0x590c, 0x590e, + 0x5910, 0x5911, 0x5912, 0x5913, 0x5917, 0x5918, 0x591b, 0x591d, + 0x591e, 0x5920, 0x5921, 0x5922, 0x5923, 0x5926, 0x5928, 0x592c, + 0x5930, 0x5932, 0x5933, 0x5935, 0x5936, 0x593b, + /* 0x8a */ + 0x593d, 0x593e, 0x593f, 0x5940, 0x5943, 0x5945, 0x5946, 0x594a, + 0x594c, 0x594d, 0x5950, 0x5952, 0x5953, 0x5959, 0x595b, 0x595c, + 0x595d, 0x595e, 0x595f, 0x5961, 0x5963, 0x5964, 0x5966, 0x5967, + 0x5968, 0x5969, 0x596a, 0x596b, 0x596c, 0x596d, 0x596e, 0x596f, + 0x5970, 0x5971, 0x5972, 0x5975, 0x5977, 0x597a, 0x597b, 0x597c, + 0x597e, 0x597f, 0x5980, 0x5985, 0x5989, 0x598b, 0x598c, 0x598e, + 0x598f, 0x5990, 0x5991, 0x5994, 0x5995, 0x5998, 0x599a, 0x599b, + 0x599c, 0x599d, 0x599f, 0x59a0, 0x59a1, 0x59a2, 0x59a6, 0x59a7, + 0x59ac, 0x59ad, 0x59b0, 0x59b1, 0x59b3, 0x59b4, 0x59b5, 0x59b6, + 0x59b7, 0x59b8, 0x59ba, 0x59bc, 0x59bd, 0x59bf, 0x59c0, 0x59c1, + 0x59c2, 0x59c3, 0x59c4, 0x59c5, 0x59c7, 0x59c8, 0x59c9, 0x59cc, + 0x59cd, 0x59ce, 0x59cf, 0x59d5, 0x59d6, 0x59d9, 0x59db, 0x59de, + 0x59df, 0x59e0, 0x59e1, 0x59e2, 0x59e4, 0x59e6, 0x59e7, 0x59e9, + 0x59ea, 0x59eb, 0x59ed, 0x59ee, 0x59ef, 0x59f0, 0x59f1, 0x59f2, + 0x59f3, 0x59f4, 0x59f5, 0x59f6, 0x59f7, 0x59f8, 0x59fa, 0x59fc, + 0x59fd, 0x59fe, 0x5a00, 0x5a02, 0x5a0a, 0x5a0b, 0x5a0d, 0x5a0e, + 0x5a0f, 0x5a10, 0x5a12, 0x5a14, 0x5a15, 0x5a16, 0x5a17, 0x5a19, + 0x5a1a, 0x5a1b, 0x5a1d, 0x5a1e, 0x5a21, 0x5a22, 0x5a24, 0x5a26, + 0x5a27, 0x5a28, 0x5a2a, 0x5a2b, 0x5a2c, 0x5a2d, 0x5a2e, 0x5a2f, + 0x5a30, 0x5a33, 0x5a35, 0x5a37, 0x5a38, 0x5a39, 0x5a3a, 0x5a3b, + 0x5a3d, 0x5a3e, 0x5a3f, 0x5a41, 0x5a42, 0x5a43, 0x5a44, 0x5a45, + 0x5a47, 0x5a48, 0x5a4b, 0x5a4c, 0x5a4d, 0x5a4e, 0x5a4f, 0x5a50, + 0x5a51, 0x5a52, 0x5a53, 0x5a54, 0x5a56, 0x5a57, 0x5a58, 0x5a59, + 0x5a5b, 0x5a5c, 0x5a5d, 0x5a5e, 0x5a5f, 0x5a60, + /* 0x8b */ + 0x5a61, 0x5a63, 0x5a64, 0x5a65, 0x5a66, 0x5a68, 0x5a69, 0x5a6b, + 0x5a6c, 0x5a6d, 0x5a6e, 0x5a6f, 0x5a70, 0x5a71, 0x5a72, 0x5a73, + 0x5a78, 0x5a79, 0x5a7b, 0x5a7c, 0x5a7d, 0x5a7e, 0x5a80, 0x5a81, + 0x5a82, 0x5a83, 0x5a84, 0x5a85, 0x5a86, 0x5a87, 0x5a88, 0x5a89, + 0x5a8a, 0x5a8b, 0x5a8c, 0x5a8d, 0x5a8e, 0x5a8f, 0x5a90, 0x5a91, + 0x5a93, 0x5a94, 0x5a95, 0x5a96, 0x5a97, 0x5a98, 0x5a99, 0x5a9c, + 0x5a9d, 0x5a9e, 0x5a9f, 0x5aa0, 0x5aa1, 0x5aa2, 0x5aa3, 0x5aa4, + 0x5aa5, 0x5aa6, 0x5aa7, 0x5aa8, 0x5aa9, 0x5aab, 0x5aac, 0x5aad, + 0x5aae, 0x5aaf, 0x5ab0, 0x5ab1, 0x5ab4, 0x5ab6, 0x5ab7, 0x5ab9, + 0x5aba, 0x5abb, 0x5abc, 0x5abd, 0x5abf, 0x5ac0, 0x5ac3, 0x5ac4, + 0x5ac5, 0x5ac6, 0x5ac7, 0x5ac8, 0x5aca, 0x5acb, 0x5acd, 0x5ace, + 0x5acf, 0x5ad0, 0x5ad1, 0x5ad3, 0x5ad5, 0x5ad7, 0x5ad9, 0x5ada, + 0x5adb, 0x5add, 0x5ade, 0x5adf, 0x5ae2, 0x5ae4, 0x5ae5, 0x5ae7, + 0x5ae8, 0x5aea, 0x5aec, 0x5aed, 0x5aee, 0x5aef, 0x5af0, 0x5af2, + 0x5af3, 0x5af4, 0x5af5, 0x5af6, 0x5af7, 0x5af8, 0x5af9, 0x5afa, + 0x5afb, 0x5afc, 0x5afd, 0x5afe, 0x5aff, 0x5b00, 0x5b01, 0x5b02, + 0x5b03, 0x5b04, 0x5b05, 0x5b06, 0x5b07, 0x5b08, 0x5b0a, 0x5b0b, + 0x5b0c, 0x5b0d, 0x5b0e, 0x5b0f, 0x5b10, 0x5b11, 0x5b12, 0x5b13, + 0x5b14, 0x5b15, 0x5b18, 0x5b19, 0x5b1a, 0x5b1b, 0x5b1c, 0x5b1d, + 0x5b1e, 0x5b1f, 0x5b20, 0x5b21, 0x5b22, 0x5b23, 0x5b24, 0x5b25, + 0x5b26, 0x5b27, 0x5b28, 0x5b29, 0x5b2a, 0x5b2b, 0x5b2c, 0x5b2d, + 0x5b2e, 0x5b2f, 0x5b30, 0x5b31, 0x5b33, 0x5b35, 0x5b36, 0x5b38, + 0x5b39, 0x5b3a, 0x5b3b, 0x5b3c, 0x5b3d, 0x5b3e, 0x5b3f, 0x5b41, + 0x5b42, 0x5b43, 0x5b44, 0x5b45, 0x5b46, 0x5b47, + /* 0x8c */ + 0x5b48, 0x5b49, 0x5b4a, 0x5b4b, 0x5b4c, 0x5b4d, 0x5b4e, 0x5b4f, + 0x5b52, 0x5b56, 0x5b5e, 0x5b60, 0x5b61, 0x5b67, 0x5b68, 0x5b6b, + 0x5b6d, 0x5b6e, 0x5b6f, 0x5b72, 0x5b74, 0x5b76, 0x5b77, 0x5b78, + 0x5b79, 0x5b7b, 0x5b7c, 0x5b7e, 0x5b7f, 0x5b82, 0x5b86, 0x5b8a, + 0x5b8d, 0x5b8e, 0x5b90, 0x5b91, 0x5b92, 0x5b94, 0x5b96, 0x5b9f, + 0x5ba7, 0x5ba8, 0x5ba9, 0x5bac, 0x5bad, 0x5bae, 0x5baf, 0x5bb1, + 0x5bb2, 0x5bb7, 0x5bba, 0x5bbb, 0x5bbc, 0x5bc0, 0x5bc1, 0x5bc3, + 0x5bc8, 0x5bc9, 0x5bca, 0x5bcb, 0x5bcd, 0x5bce, 0x5bcf, 0x5bd1, + 0x5bd4, 0x5bd5, 0x5bd6, 0x5bd7, 0x5bd8, 0x5bd9, 0x5bda, 0x5bdb, + 0x5bdc, 0x5be0, 0x5be2, 0x5be3, 0x5be6, 0x5be7, 0x5be9, 0x5bea, + 0x5beb, 0x5bec, 0x5bed, 0x5bef, 0x5bf1, 0x5bf2, 0x5bf3, 0x5bf4, + 0x5bf5, 0x5bf6, 0x5bf7, 0x5bfd, 0x5bfe, 0x5c00, 0x5c02, 0x5c03, + 0x5c05, 0x5c07, 0x5c08, 0x5c0b, 0x5c0c, 0x5c0d, 0x5c0e, 0x5c10, + 0x5c12, 0x5c13, 0x5c17, 0x5c19, 0x5c1b, 0x5c1e, 0x5c1f, 0x5c20, + 0x5c21, 0x5c23, 0x5c26, 0x5c28, 0x5c29, 0x5c2a, 0x5c2b, 0x5c2d, + 0x5c2e, 0x5c2f, 0x5c30, 0x5c32, 0x5c33, 0x5c35, 0x5c36, 0x5c37, + 0x5c43, 0x5c44, 0x5c46, 0x5c47, 0x5c4c, 0x5c4d, 0x5c52, 0x5c53, + 0x5c54, 0x5c56, 0x5c57, 0x5c58, 0x5c5a, 0x5c5b, 0x5c5c, 0x5c5d, + 0x5c5f, 0x5c62, 0x5c64, 0x5c67, 0x5c68, 0x5c69, 0x5c6a, 0x5c6b, + 0x5c6c, 0x5c6d, 0x5c70, 0x5c72, 0x5c73, 0x5c74, 0x5c75, 0x5c76, + 0x5c77, 0x5c78, 0x5c7b, 0x5c7c, 0x5c7d, 0x5c7e, 0x5c80, 0x5c83, + 0x5c84, 0x5c85, 0x5c86, 0x5c87, 0x5c89, 0x5c8a, 0x5c8b, 0x5c8e, + 0x5c8f, 0x5c92, 0x5c93, 0x5c95, 0x5c9d, 0x5c9e, 0x5c9f, 0x5ca0, + 0x5ca1, 0x5ca4, 0x5ca5, 0x5ca6, 0x5ca7, 0x5ca8, + /* 0x8d */ + 0x5caa, 0x5cae, 0x5caf, 0x5cb0, 0x5cb2, 0x5cb4, 0x5cb6, 0x5cb9, + 0x5cba, 0x5cbb, 0x5cbc, 0x5cbe, 0x5cc0, 0x5cc2, 0x5cc3, 0x5cc5, + 0x5cc6, 0x5cc7, 0x5cc8, 0x5cc9, 0x5cca, 0x5ccc, 0x5ccd, 0x5cce, + 0x5ccf, 0x5cd0, 0x5cd1, 0x5cd3, 0x5cd4, 0x5cd5, 0x5cd6, 0x5cd7, + 0x5cd8, 0x5cda, 0x5cdb, 0x5cdc, 0x5cdd, 0x5cde, 0x5cdf, 0x5ce0, + 0x5ce2, 0x5ce3, 0x5ce7, 0x5ce9, 0x5ceb, 0x5cec, 0x5cee, 0x5cef, + 0x5cf1, 0x5cf2, 0x5cf3, 0x5cf4, 0x5cf5, 0x5cf6, 0x5cf7, 0x5cf8, + 0x5cf9, 0x5cfa, 0x5cfc, 0x5cfd, 0x5cfe, 0x5cff, 0x5d00, 0x5d01, + 0x5d04, 0x5d05, 0x5d08, 0x5d09, 0x5d0a, 0x5d0b, 0x5d0c, 0x5d0d, + 0x5d0f, 0x5d10, 0x5d11, 0x5d12, 0x5d13, 0x5d15, 0x5d17, 0x5d18, + 0x5d19, 0x5d1a, 0x5d1c, 0x5d1d, 0x5d1f, 0x5d20, 0x5d21, 0x5d22, + 0x5d23, 0x5d25, 0x5d28, 0x5d2a, 0x5d2b, 0x5d2c, 0x5d2f, 0x5d30, + 0x5d31, 0x5d32, 0x5d33, 0x5d35, 0x5d36, 0x5d37, 0x5d38, 0x5d39, + 0x5d3a, 0x5d3b, 0x5d3c, 0x5d3f, 0x5d40, 0x5d41, 0x5d42, 0x5d43, + 0x5d44, 0x5d45, 0x5d46, 0x5d48, 0x5d49, 0x5d4d, 0x5d4e, 0x5d4f, + 0x5d50, 0x5d51, 0x5d52, 0x5d53, 0x5d54, 0x5d55, 0x5d56, 0x5d57, + 0x5d59, 0x5d5a, 0x5d5c, 0x5d5e, 0x5d5f, 0x5d60, 0x5d61, 0x5d62, + 0x5d63, 0x5d64, 0x5d65, 0x5d66, 0x5d67, 0x5d68, 0x5d6a, 0x5d6d, + 0x5d6e, 0x5d70, 0x5d71, 0x5d72, 0x5d73, 0x5d75, 0x5d76, 0x5d77, + 0x5d78, 0x5d79, 0x5d7a, 0x5d7b, 0x5d7c, 0x5d7d, 0x5d7e, 0x5d7f, + 0x5d80, 0x5d81, 0x5d83, 0x5d84, 0x5d85, 0x5d86, 0x5d87, 0x5d88, + 0x5d89, 0x5d8a, 0x5d8b, 0x5d8c, 0x5d8d, 0x5d8e, 0x5d8f, 0x5d90, + 0x5d91, 0x5d92, 0x5d93, 0x5d94, 0x5d95, 0x5d96, 0x5d97, 0x5d98, + 0x5d9a, 0x5d9b, 0x5d9c, 0x5d9e, 0x5d9f, 0x5da0, + /* 0x8e */ + 0x5da1, 0x5da2, 0x5da3, 0x5da4, 0x5da5, 0x5da6, 0x5da7, 0x5da8, + 0x5da9, 0x5daa, 0x5dab, 0x5dac, 0x5dad, 0x5dae, 0x5daf, 0x5db0, + 0x5db1, 0x5db2, 0x5db3, 0x5db4, 0x5db5, 0x5db6, 0x5db8, 0x5db9, + 0x5dba, 0x5dbb, 0x5dbc, 0x5dbd, 0x5dbe, 0x5dbf, 0x5dc0, 0x5dc1, + 0x5dc2, 0x5dc3, 0x5dc4, 0x5dc6, 0x5dc7, 0x5dc8, 0x5dc9, 0x5dca, + 0x5dcb, 0x5dcc, 0x5dce, 0x5dcf, 0x5dd0, 0x5dd1, 0x5dd2, 0x5dd3, + 0x5dd4, 0x5dd5, 0x5dd6, 0x5dd7, 0x5dd8, 0x5dd9, 0x5dda, 0x5ddc, + 0x5ddf, 0x5de0, 0x5de3, 0x5de4, 0x5dea, 0x5dec, 0x5ded, 0x5df0, + 0x5df5, 0x5df6, 0x5df8, 0x5df9, 0x5dfa, 0x5dfb, 0x5dfc, 0x5dff, + 0x5e00, 0x5e04, 0x5e07, 0x5e09, 0x5e0a, 0x5e0b, 0x5e0d, 0x5e0e, + 0x5e12, 0x5e13, 0x5e17, 0x5e1e, 0x5e1f, 0x5e20, 0x5e21, 0x5e22, + 0x5e23, 0x5e24, 0x5e25, 0x5e28, 0x5e29, 0x5e2a, 0x5e2b, 0x5e2c, + 0x5e2f, 0x5e30, 0x5e32, 0x5e33, 0x5e34, 0x5e35, 0x5e36, 0x5e39, + 0x5e3a, 0x5e3e, 0x5e3f, 0x5e40, 0x5e41, 0x5e43, 0x5e46, 0x5e47, + 0x5e48, 0x5e49, 0x5e4a, 0x5e4b, 0x5e4d, 0x5e4e, 0x5e4f, 0x5e50, + 0x5e51, 0x5e52, 0x5e53, 0x5e56, 0x5e57, 0x5e58, 0x5e59, 0x5e5a, + 0x5e5c, 0x5e5d, 0x5e5f, 0x5e60, 0x5e63, 0x5e64, 0x5e65, 0x5e66, + 0x5e67, 0x5e68, 0x5e69, 0x5e6a, 0x5e6b, 0x5e6c, 0x5e6d, 0x5e6e, + 0x5e6f, 0x5e70, 0x5e71, 0x5e75, 0x5e77, 0x5e79, 0x5e7e, 0x5e81, + 0x5e82, 0x5e83, 0x5e85, 0x5e88, 0x5e89, 0x5e8c, 0x5e8d, 0x5e8e, + 0x5e92, 0x5e98, 0x5e9b, 0x5e9d, 0x5ea1, 0x5ea2, 0x5ea3, 0x5ea4, + 0x5ea8, 0x5ea9, 0x5eaa, 0x5eab, 0x5eac, 0x5eae, 0x5eaf, 0x5eb0, + 0x5eb1, 0x5eb2, 0x5eb4, 0x5eba, 0x5ebb, 0x5ebc, 0x5ebd, 0x5ebf, + 0x5ec0, 0x5ec1, 0x5ec2, 0x5ec3, 0x5ec4, 0x5ec5, + /* 0x8f */ + 0x5ec6, 0x5ec7, 0x5ec8, 0x5ecb, 0x5ecc, 0x5ecd, 0x5ece, 0x5ecf, + 0x5ed0, 0x5ed4, 0x5ed5, 0x5ed7, 0x5ed8, 0x5ed9, 0x5eda, 0x5edc, + 0x5edd, 0x5ede, 0x5edf, 0x5ee0, 0x5ee1, 0x5ee2, 0x5ee3, 0x5ee4, + 0x5ee5, 0x5ee6, 0x5ee7, 0x5ee9, 0x5eeb, 0x5eec, 0x5eed, 0x5eee, + 0x5eef, 0x5ef0, 0x5ef1, 0x5ef2, 0x5ef3, 0x5ef5, 0x5ef8, 0x5ef9, + 0x5efb, 0x5efc, 0x5efd, 0x5f05, 0x5f06, 0x5f07, 0x5f09, 0x5f0c, + 0x5f0d, 0x5f0e, 0x5f10, 0x5f12, 0x5f14, 0x5f16, 0x5f19, 0x5f1a, + 0x5f1c, 0x5f1d, 0x5f1e, 0x5f21, 0x5f22, 0x5f23, 0x5f24, 0x5f28, + 0x5f2b, 0x5f2c, 0x5f2e, 0x5f30, 0x5f32, 0x5f33, 0x5f34, 0x5f35, + 0x5f36, 0x5f37, 0x5f38, 0x5f3b, 0x5f3d, 0x5f3e, 0x5f3f, 0x5f41, + 0x5f42, 0x5f43, 0x5f44, 0x5f45, 0x5f46, 0x5f47, 0x5f48, 0x5f49, + 0x5f4a, 0x5f4b, 0x5f4c, 0x5f4d, 0x5f4e, 0x5f4f, 0x5f51, 0x5f54, + 0x5f59, 0x5f5a, 0x5f5b, 0x5f5c, 0x5f5e, 0x5f5f, 0x5f60, 0x5f63, + 0x5f65, 0x5f67, 0x5f68, 0x5f6b, 0x5f6e, 0x5f6f, 0x5f72, 0x5f74, + 0x5f75, 0x5f76, 0x5f78, 0x5f7a, 0x5f7d, 0x5f7e, 0x5f7f, 0x5f83, + 0x5f86, 0x5f8d, 0x5f8e, 0x5f8f, 0x5f91, 0x5f93, 0x5f94, 0x5f96, + 0x5f9a, 0x5f9b, 0x5f9d, 0x5f9e, 0x5f9f, 0x5fa0, 0x5fa2, 0x5fa3, + 0x5fa4, 0x5fa5, 0x5fa6, 0x5fa7, 0x5fa9, 0x5fab, 0x5fac, 0x5faf, + 0x5fb0, 0x5fb1, 0x5fb2, 0x5fb3, 0x5fb4, 0x5fb6, 0x5fb8, 0x5fb9, + 0x5fba, 0x5fbb, 0x5fbe, 0x5fbf, 0x5fc0, 0x5fc1, 0x5fc2, 0x5fc7, + 0x5fc8, 0x5fca, 0x5fcb, 0x5fce, 0x5fd3, 0x5fd4, 0x5fd5, 0x5fda, + 0x5fdb, 0x5fdc, 0x5fde, 0x5fdf, 0x5fe2, 0x5fe3, 0x5fe5, 0x5fe6, + 0x5fe8, 0x5fe9, 0x5fec, 0x5fef, 0x5ff0, 0x5ff2, 0x5ff3, 0x5ff4, + 0x5ff6, 0x5ff7, 0x5ff9, 0x5ffa, 0x5ffc, 0x6007, + /* 0x90 */ + 0x6008, 0x6009, 0x600b, 0x600c, 0x6010, 0x6011, 0x6013, 0x6017, + 0x6018, 0x601a, 0x601e, 0x601f, 0x6022, 0x6023, 0x6024, 0x602c, + 0x602d, 0x602e, 0x6030, 0x6031, 0x6032, 0x6033, 0x6034, 0x6036, + 0x6037, 0x6038, 0x6039, 0x603a, 0x603d, 0x603e, 0x6040, 0x6044, + 0x6045, 0x6046, 0x6047, 0x6048, 0x6049, 0x604a, 0x604c, 0x604e, + 0x604f, 0x6051, 0x6053, 0x6054, 0x6056, 0x6057, 0x6058, 0x605b, + 0x605c, 0x605e, 0x605f, 0x6060, 0x6061, 0x6065, 0x6066, 0x606e, + 0x6071, 0x6072, 0x6074, 0x6075, 0x6077, 0x607e, 0x6080, 0x6081, + 0x6082, 0x6085, 0x6086, 0x6087, 0x6088, 0x608a, 0x608b, 0x608e, + 0x608f, 0x6090, 0x6091, 0x6093, 0x6095, 0x6097, 0x6098, 0x6099, + 0x609c, 0x609e, 0x60a1, 0x60a2, 0x60a4, 0x60a5, 0x60a7, 0x60a9, + 0x60aa, 0x60ae, 0x60b0, 0x60b3, 0x60b5, 0x60b6, 0x60b7, 0x60b9, + 0x60ba, 0x60bd, 0x60be, 0x60bf, 0x60c0, 0x60c1, 0x60c2, 0x60c3, + 0x60c4, 0x60c7, 0x60c8, 0x60c9, 0x60cc, 0x60cd, 0x60ce, 0x60cf, + 0x60d0, 0x60d2, 0x60d3, 0x60d4, 0x60d6, 0x60d7, 0x60d9, 0x60db, + 0x60de, 0x60e1, 0x60e2, 0x60e3, 0x60e4, 0x60e5, 0x60ea, 0x60f1, + 0x60f2, 0x60f5, 0x60f7, 0x60f8, 0x60fb, 0x60fc, 0x60fd, 0x60fe, + 0x60ff, 0x6102, 0x6103, 0x6104, 0x6105, 0x6107, 0x610a, 0x610b, + 0x610c, 0x6110, 0x6111, 0x6112, 0x6113, 0x6114, 0x6116, 0x6117, + 0x6118, 0x6119, 0x611b, 0x611c, 0x611d, 0x611e, 0x6121, 0x6122, + 0x6125, 0x6128, 0x6129, 0x612a, 0x612c, 0x612d, 0x612e, 0x612f, + 0x6130, 0x6131, 0x6132, 0x6133, 0x6134, 0x6135, 0x6136, 0x6137, + 0x6138, 0x6139, 0x613a, 0x613b, 0x613c, 0x613d, 0x613e, 0x6140, + 0x6141, 0x6142, 0x6143, 0x6144, 0x6145, 0x6146, + /* 0x91 */ + 0x6147, 0x6149, 0x614b, 0x614d, 0x614f, 0x6150, 0x6152, 0x6153, + 0x6154, 0x6156, 0x6157, 0x6158, 0x6159, 0x615a, 0x615b, 0x615c, + 0x615e, 0x615f, 0x6160, 0x6161, 0x6163, 0x6164, 0x6165, 0x6166, + 0x6169, 0x616a, 0x616b, 0x616c, 0x616d, 0x616e, 0x616f, 0x6171, + 0x6172, 0x6173, 0x6174, 0x6176, 0x6178, 0x6179, 0x617a, 0x617b, + 0x617c, 0x617d, 0x617e, 0x617f, 0x6180, 0x6181, 0x6182, 0x6183, + 0x6184, 0x6185, 0x6186, 0x6187, 0x6188, 0x6189, 0x618a, 0x618c, + 0x618d, 0x618f, 0x6190, 0x6191, 0x6192, 0x6193, 0x6195, 0x6196, + 0x6197, 0x6198, 0x6199, 0x619a, 0x619b, 0x619c, 0x619e, 0x619f, + 0x61a0, 0x61a1, 0x61a2, 0x61a3, 0x61a4, 0x61a5, 0x61a6, 0x61aa, + 0x61ab, 0x61ad, 0x61ae, 0x61af, 0x61b0, 0x61b1, 0x61b2, 0x61b3, + 0x61b4, 0x61b5, 0x61b6, 0x61b8, 0x61b9, 0x61ba, 0x61bb, 0x61bc, + 0x61bd, 0x61bf, 0x61c0, 0x61c1, 0x61c3, 0x61c4, 0x61c5, 0x61c6, + 0x61c7, 0x61c9, 0x61cc, 0x61cd, 0x61ce, 0x61cf, 0x61d0, 0x61d3, + 0x61d5, 0x61d6, 0x61d7, 0x61d8, 0x61d9, 0x61da, 0x61db, 0x61dc, + 0x61dd, 0x61de, 0x61df, 0x61e0, 0x61e1, 0x61e2, 0x61e3, 0x61e4, + 0x61e5, 0x61e7, 0x61e8, 0x61e9, 0x61ea, 0x61eb, 0x61ec, 0x61ed, + 0x61ee, 0x61ef, 0x61f0, 0x61f1, 0x61f2, 0x61f3, 0x61f4, 0x61f6, + 0x61f7, 0x61f8, 0x61f9, 0x61fa, 0x61fb, 0x61fc, 0x61fd, 0x61fe, + 0x6200, 0x6201, 0x6202, 0x6203, 0x6204, 0x6205, 0x6207, 0x6209, + 0x6213, 0x6214, 0x6219, 0x621c, 0x621d, 0x621e, 0x6220, 0x6223, + 0x6226, 0x6227, 0x6228, 0x6229, 0x622b, 0x622d, 0x622f, 0x6230, + 0x6231, 0x6232, 0x6235, 0x6236, 0x6238, 0x6239, 0x623a, 0x623b, + 0x623c, 0x6242, 0x6244, 0x6245, 0x6246, 0x624a, + /* 0x92 */ + 0x624f, 0x6250, 0x6255, 0x6256, 0x6257, 0x6259, 0x625a, 0x625c, + 0x625d, 0x625e, 0x625f, 0x6260, 0x6261, 0x6262, 0x6264, 0x6265, + 0x6268, 0x6271, 0x6272, 0x6274, 0x6275, 0x6277, 0x6278, 0x627a, + 0x627b, 0x627d, 0x6281, 0x6282, 0x6283, 0x6285, 0x6286, 0x6287, + 0x6288, 0x628b, 0x628c, 0x628d, 0x628e, 0x628f, 0x6290, 0x6294, + 0x6299, 0x629c, 0x629d, 0x629e, 0x62a3, 0x62a6, 0x62a7, 0x62a9, + 0x62aa, 0x62ad, 0x62ae, 0x62af, 0x62b0, 0x62b2, 0x62b3, 0x62b4, + 0x62b6, 0x62b7, 0x62b8, 0x62ba, 0x62be, 0x62c0, 0x62c1, 0x62c3, + 0x62cb, 0x62cf, 0x62d1, 0x62d5, 0x62dd, 0x62de, 0x62e0, 0x62e1, + 0x62e4, 0x62ea, 0x62eb, 0x62f0, 0x62f2, 0x62f5, 0x62f8, 0x62f9, + 0x62fa, 0x62fb, 0x6300, 0x6303, 0x6304, 0x6305, 0x6306, 0x630a, + 0x630b, 0x630c, 0x630d, 0x630f, 0x6310, 0x6312, 0x6313, 0x6314, + 0x6315, 0x6317, 0x6318, 0x6319, 0x631c, 0x6326, 0x6327, 0x6329, + 0x632c, 0x632d, 0x632e, 0x6330, 0x6331, 0x6333, 0x6334, 0x6335, + 0x6336, 0x6337, 0x6338, 0x633b, 0x633c, 0x633e, 0x633f, 0x6340, + 0x6341, 0x6344, 0x6347, 0x6348, 0x634a, 0x6351, 0x6352, 0x6353, + 0x6354, 0x6356, 0x6357, 0x6358, 0x6359, 0x635a, 0x635b, 0x635c, + 0x635d, 0x6360, 0x6364, 0x6365, 0x6366, 0x6368, 0x636a, 0x636b, + 0x636c, 0x636f, 0x6370, 0x6372, 0x6373, 0x6374, 0x6375, 0x6378, + 0x6379, 0x637c, 0x637d, 0x637e, 0x637f, 0x6381, 0x6383, 0x6384, + 0x6385, 0x6386, 0x638b, 0x638d, 0x6391, 0x6393, 0x6394, 0x6395, + 0x6397, 0x6399, 0x639a, 0x639b, 0x639c, 0x639d, 0x639e, 0x639f, + 0x63a1, 0x63a4, 0x63a6, 0x63ab, 0x63af, 0x63b1, 0x63b2, 0x63b5, + 0x63b6, 0x63b9, 0x63bb, 0x63bd, 0x63bf, 0x63c0, + /* 0x93 */ + 0x63c1, 0x63c2, 0x63c3, 0x63c5, 0x63c7, 0x63c8, 0x63ca, 0x63cb, + 0x63cc, 0x63d1, 0x63d3, 0x63d4, 0x63d5, 0x63d7, 0x63d8, 0x63d9, + 0x63da, 0x63db, 0x63dc, 0x63dd, 0x63df, 0x63e2, 0x63e4, 0x63e5, + 0x63e6, 0x63e7, 0x63e8, 0x63eb, 0x63ec, 0x63ee, 0x63ef, 0x63f0, + 0x63f1, 0x63f3, 0x63f5, 0x63f7, 0x63f9, 0x63fa, 0x63fb, 0x63fc, + 0x63fe, 0x6403, 0x6404, 0x6406, 0x6407, 0x6408, 0x6409, 0x640a, + 0x640d, 0x640e, 0x6411, 0x6412, 0x6415, 0x6416, 0x6417, 0x6418, + 0x6419, 0x641a, 0x641d, 0x641f, 0x6422, 0x6423, 0x6424, 0x6425, + 0x6427, 0x6428, 0x6429, 0x642b, 0x642e, 0x642f, 0x6430, 0x6431, + 0x6432, 0x6433, 0x6435, 0x6436, 0x6437, 0x6438, 0x6439, 0x643b, + 0x643c, 0x643e, 0x6440, 0x6442, 0x6443, 0x6449, 0x644b, 0x644c, + 0x644d, 0x644e, 0x644f, 0x6450, 0x6451, 0x6453, 0x6455, 0x6456, + 0x6457, 0x6459, 0x645a, 0x645b, 0x645c, 0x645d, 0x645f, 0x6460, + 0x6461, 0x6462, 0x6463, 0x6464, 0x6465, 0x6466, 0x6468, 0x646a, + 0x646b, 0x646c, 0x646e, 0x646f, 0x6470, 0x6471, 0x6472, 0x6473, + 0x6474, 0x6475, 0x6476, 0x6477, 0x647b, 0x647c, 0x647d, 0x647e, + 0x647f, 0x6480, 0x6481, 0x6483, 0x6486, 0x6488, 0x6489, 0x648a, + 0x648b, 0x648c, 0x648d, 0x648e, 0x648f, 0x6490, 0x6493, 0x6494, + 0x6497, 0x6498, 0x649a, 0x649b, 0x649c, 0x649d, 0x649f, 0x64a0, + 0x64a1, 0x64a2, 0x64a3, 0x64a5, 0x64a6, 0x64a7, 0x64a8, 0x64aa, + 0x64ab, 0x64af, 0x64b1, 0x64b2, 0x64b3, 0x64b4, 0x64b6, 0x64b9, + 0x64bb, 0x64bd, 0x64be, 0x64bf, 0x64c1, 0x64c3, 0x64c4, 0x64c6, + 0x64c7, 0x64c8, 0x64c9, 0x64ca, 0x64cb, 0x64cc, 0x64cf, 0x64d1, + 0x64d3, 0x64d4, 0x64d5, 0x64d6, 0x64d9, 0x64da, + /* 0x94 */ + 0x64db, 0x64dc, 0x64dd, 0x64df, 0x64e0, 0x64e1, 0x64e3, 0x64e5, + 0x64e7, 0x64e8, 0x64e9, 0x64ea, 0x64eb, 0x64ec, 0x64ed, 0x64ee, + 0x64ef, 0x64f0, 0x64f1, 0x64f2, 0x64f3, 0x64f4, 0x64f5, 0x64f6, + 0x64f7, 0x64f8, 0x64f9, 0x64fa, 0x64fb, 0x64fc, 0x64fd, 0x64fe, + 0x64ff, 0x6501, 0x6502, 0x6503, 0x6504, 0x6505, 0x6506, 0x6507, + 0x6508, 0x650a, 0x650b, 0x650c, 0x650d, 0x650e, 0x650f, 0x6510, + 0x6511, 0x6513, 0x6514, 0x6515, 0x6516, 0x6517, 0x6519, 0x651a, + 0x651b, 0x651c, 0x651d, 0x651e, 0x651f, 0x6520, 0x6521, 0x6522, + 0x6523, 0x6524, 0x6526, 0x6527, 0x6528, 0x6529, 0x652a, 0x652c, + 0x652d, 0x6530, 0x6531, 0x6532, 0x6533, 0x6537, 0x653a, 0x653c, + 0x653d, 0x6540, 0x6541, 0x6542, 0x6543, 0x6544, 0x6546, 0x6547, + 0x654a, 0x654b, 0x654d, 0x654e, 0x6550, 0x6552, 0x6553, 0x6554, + 0x6557, 0x6558, 0x655a, 0x655c, 0x655f, 0x6560, 0x6561, 0x6564, + 0x6565, 0x6567, 0x6568, 0x6569, 0x656a, 0x656d, 0x656e, 0x656f, + 0x6571, 0x6573, 0x6575, 0x6576, 0x6578, 0x6579, 0x657a, 0x657b, + 0x657c, 0x657d, 0x657e, 0x657f, 0x6580, 0x6581, 0x6582, 0x6583, + 0x6584, 0x6585, 0x6586, 0x6588, 0x6589, 0x658a, 0x658d, 0x658e, + 0x658f, 0x6592, 0x6594, 0x6595, 0x6596, 0x6598, 0x659a, 0x659d, + 0x659e, 0x65a0, 0x65a2, 0x65a3, 0x65a6, 0x65a8, 0x65aa, 0x65ac, + 0x65ae, 0x65b1, 0x65b2, 0x65b3, 0x65b4, 0x65b5, 0x65b6, 0x65b7, + 0x65b8, 0x65ba, 0x65bb, 0x65be, 0x65bf, 0x65c0, 0x65c2, 0x65c7, + 0x65c8, 0x65c9, 0x65ca, 0x65cd, 0x65d0, 0x65d1, 0x65d3, 0x65d4, + 0x65d5, 0x65d8, 0x65d9, 0x65da, 0x65db, 0x65dc, 0x65dd, 0x65de, + 0x65df, 0x65e1, 0x65e3, 0x65e4, 0x65ea, 0x65eb, + /* 0x95 */ + 0x65f2, 0x65f3, 0x65f4, 0x65f5, 0x65f8, 0x65f9, 0x65fb, 0x65fc, + 0x65fd, 0x65fe, 0x65ff, 0x6601, 0x6604, 0x6605, 0x6607, 0x6608, + 0x6609, 0x660b, 0x660d, 0x6610, 0x6611, 0x6612, 0x6616, 0x6617, + 0x6618, 0x661a, 0x661b, 0x661c, 0x661e, 0x6621, 0x6622, 0x6623, + 0x6624, 0x6626, 0x6629, 0x662a, 0x662b, 0x662c, 0x662e, 0x6630, + 0x6632, 0x6633, 0x6637, 0x6638, 0x6639, 0x663a, 0x663b, 0x663d, + 0x663f, 0x6640, 0x6642, 0x6644, 0x6645, 0x6646, 0x6647, 0x6648, + 0x6649, 0x664a, 0x664d, 0x664e, 0x6650, 0x6651, 0x6658, 0x6659, + 0x665b, 0x665c, 0x665d, 0x665e, 0x6660, 0x6662, 0x6663, 0x6665, + 0x6667, 0x6669, 0x666a, 0x666b, 0x666c, 0x666d, 0x6671, 0x6672, + 0x6673, 0x6675, 0x6678, 0x6679, 0x667b, 0x667c, 0x667d, 0x667f, + 0x6680, 0x6681, 0x6683, 0x6685, 0x6686, 0x6688, 0x6689, 0x668a, + 0x668b, 0x668d, 0x668e, 0x668f, 0x6690, 0x6692, 0x6693, 0x6694, + 0x6695, 0x6698, 0x6699, 0x669a, 0x669b, 0x669c, 0x669e, 0x669f, + 0x66a0, 0x66a1, 0x66a2, 0x66a3, 0x66a4, 0x66a5, 0x66a6, 0x66a9, + 0x66aa, 0x66ab, 0x66ac, 0x66ad, 0x66af, 0x66b0, 0x66b1, 0x66b2, + 0x66b3, 0x66b5, 0x66b6, 0x66b7, 0x66b8, 0x66ba, 0x66bb, 0x66bc, + 0x66bd, 0x66bf, 0x66c0, 0x66c1, 0x66c2, 0x66c3, 0x66c4, 0x66c5, + 0x66c6, 0x66c7, 0x66c8, 0x66c9, 0x66ca, 0x66cb, 0x66cc, 0x66cd, + 0x66ce, 0x66cf, 0x66d0, 0x66d1, 0x66d2, 0x66d3, 0x66d4, 0x66d5, + 0x66d6, 0x66d7, 0x66d8, 0x66da, 0x66de, 0x66df, 0x66e0, 0x66e1, + 0x66e2, 0x66e3, 0x66e4, 0x66e5, 0x66e7, 0x66e8, 0x66ea, 0x66eb, + 0x66ec, 0x66ed, 0x66ee, 0x66ef, 0x66f1, 0x66f5, 0x66f6, 0x66f8, + 0x66fa, 0x66fb, 0x66fd, 0x6701, 0x6702, 0x6703, + /* 0x96 */ + 0x6704, 0x6705, 0x6706, 0x6707, 0x670c, 0x670e, 0x670f, 0x6711, + 0x6712, 0x6713, 0x6716, 0x6718, 0x6719, 0x671a, 0x671c, 0x671e, + 0x6720, 0x6721, 0x6722, 0x6723, 0x6724, 0x6725, 0x6727, 0x6729, + 0x672e, 0x6730, 0x6732, 0x6733, 0x6736, 0x6737, 0x6738, 0x6739, + 0x673b, 0x673c, 0x673e, 0x673f, 0x6741, 0x6744, 0x6745, 0x6747, + 0x674a, 0x674b, 0x674d, 0x6752, 0x6754, 0x6755, 0x6757, 0x6758, + 0x6759, 0x675a, 0x675b, 0x675d, 0x6762, 0x6763, 0x6764, 0x6766, + 0x6767, 0x676b, 0x676c, 0x676e, 0x6771, 0x6774, 0x6776, 0x6778, + 0x6779, 0x677a, 0x677b, 0x677d, 0x6780, 0x6782, 0x6783, 0x6785, + 0x6786, 0x6788, 0x678a, 0x678c, 0x678d, 0x678e, 0x678f, 0x6791, + 0x6792, 0x6793, 0x6794, 0x6796, 0x6799, 0x679b, 0x679f, 0x67a0, + 0x67a1, 0x67a4, 0x67a6, 0x67a9, 0x67ac, 0x67ae, 0x67b1, 0x67b2, + 0x67b4, 0x67b9, 0x67ba, 0x67bb, 0x67bc, 0x67bd, 0x67be, 0x67bf, + 0x67c0, 0x67c2, 0x67c5, 0x67c6, 0x67c7, 0x67c8, 0x67c9, 0x67ca, + 0x67cb, 0x67cc, 0x67cd, 0x67ce, 0x67d5, 0x67d6, 0x67d7, 0x67db, + 0x67df, 0x67e1, 0x67e3, 0x67e4, 0x67e6, 0x67e7, 0x67e8, 0x67ea, + 0x67eb, 0x67ed, 0x67ee, 0x67f2, 0x67f5, 0x67f6, 0x67f7, 0x67f8, + 0x67f9, 0x67fa, 0x67fb, 0x67fc, 0x67fe, 0x6801, 0x6802, 0x6803, + 0x6804, 0x6806, 0x680d, 0x6810, 0x6812, 0x6814, 0x6815, 0x6818, + 0x6819, 0x681a, 0x681b, 0x681c, 0x681e, 0x681f, 0x6820, 0x6822, + 0x6823, 0x6824, 0x6825, 0x6826, 0x6827, 0x6828, 0x682b, 0x682c, + 0x682d, 0x682e, 0x682f, 0x6830, 0x6831, 0x6834, 0x6835, 0x6836, + 0x683a, 0x683b, 0x683f, 0x6847, 0x684b, 0x684d, 0x684f, 0x6852, + 0x6856, 0x6857, 0x6858, 0x6859, 0x685a, 0x685b, + /* 0x97 */ + 0x685c, 0x685d, 0x685e, 0x685f, 0x686a, 0x686c, 0x686d, 0x686e, + 0x686f, 0x6870, 0x6871, 0x6872, 0x6873, 0x6875, 0x6878, 0x6879, + 0x687a, 0x687b, 0x687c, 0x687d, 0x687e, 0x687f, 0x6880, 0x6882, + 0x6884, 0x6887, 0x6888, 0x6889, 0x688a, 0x688b, 0x688c, 0x688d, + 0x688e, 0x6890, 0x6891, 0x6892, 0x6894, 0x6895, 0x6896, 0x6898, + 0x6899, 0x689a, 0x689b, 0x689c, 0x689d, 0x689e, 0x689f, 0x68a0, + 0x68a1, 0x68a3, 0x68a4, 0x68a5, 0x68a9, 0x68aa, 0x68ab, 0x68ac, + 0x68ae, 0x68b1, 0x68b2, 0x68b4, 0x68b6, 0x68b7, 0x68b8, 0x68b9, + 0x68ba, 0x68bb, 0x68bc, 0x68bd, 0x68be, 0x68bf, 0x68c1, 0x68c3, + 0x68c4, 0x68c5, 0x68c6, 0x68c7, 0x68c8, 0x68ca, 0x68cc, 0x68ce, + 0x68cf, 0x68d0, 0x68d1, 0x68d3, 0x68d4, 0x68d6, 0x68d7, 0x68d9, + 0x68db, 0x68dc, 0x68dd, 0x68de, 0x68df, 0x68e1, 0x68e2, 0x68e4, + 0x68e5, 0x68e6, 0x68e7, 0x68e8, 0x68e9, 0x68ea, 0x68eb, 0x68ec, + 0x68ed, 0x68ef, 0x68f2, 0x68f3, 0x68f4, 0x68f6, 0x68f7, 0x68f8, + 0x68fb, 0x68fd, 0x68fe, 0x68ff, 0x6900, 0x6902, 0x6903, 0x6904, + 0x6906, 0x6907, 0x6908, 0x6909, 0x690a, 0x690c, 0x690f, 0x6911, + 0x6913, 0x6914, 0x6915, 0x6916, 0x6917, 0x6918, 0x6919, 0x691a, + 0x691b, 0x691c, 0x691d, 0x691e, 0x6921, 0x6922, 0x6923, 0x6925, + 0x6926, 0x6927, 0x6928, 0x6929, 0x692a, 0x692b, 0x692c, 0x692e, + 0x692f, 0x6931, 0x6932, 0x6933, 0x6935, 0x6936, 0x6937, 0x6938, + 0x693a, 0x693b, 0x693c, 0x693e, 0x6940, 0x6941, 0x6943, 0x6944, + 0x6945, 0x6946, 0x6947, 0x6948, 0x6949, 0x694a, 0x694b, 0x694c, + 0x694d, 0x694e, 0x694f, 0x6950, 0x6951, 0x6952, 0x6953, 0x6955, + 0x6956, 0x6958, 0x6959, 0x695b, 0x695c, 0x695f, + /* 0x98 */ + 0x6961, 0x6962, 0x6964, 0x6965, 0x6967, 0x6968, 0x6969, 0x696a, + 0x696c, 0x696d, 0x696f, 0x6970, 0x6972, 0x6973, 0x6974, 0x6975, + 0x6976, 0x697a, 0x697b, 0x697d, 0x697e, 0x697f, 0x6981, 0x6983, + 0x6985, 0x698a, 0x698b, 0x698c, 0x698e, 0x698f, 0x6990, 0x6991, + 0x6992, 0x6993, 0x6996, 0x6997, 0x6999, 0x699a, 0x699d, 0x699e, + 0x699f, 0x69a0, 0x69a1, 0x69a2, 0x69a3, 0x69a4, 0x69a5, 0x69a6, + 0x69a9, 0x69aa, 0x69ac, 0x69ae, 0x69af, 0x69b0, 0x69b2, 0x69b3, + 0x69b5, 0x69b6, 0x69b8, 0x69b9, 0x69ba, 0x69bc, 0x69bd, 0x69be, + 0x69bf, 0x69c0, 0x69c2, 0x69c3, 0x69c4, 0x69c5, 0x69c6, 0x69c7, + 0x69c8, 0x69c9, 0x69cb, 0x69cd, 0x69cf, 0x69d1, 0x69d2, 0x69d3, + 0x69d5, 0x69d6, 0x69d7, 0x69d8, 0x69d9, 0x69da, 0x69dc, 0x69dd, + 0x69de, 0x69e1, 0x69e2, 0x69e3, 0x69e4, 0x69e5, 0x69e6, 0x69e7, + 0x69e8, 0x69e9, 0x69ea, 0x69eb, 0x69ec, 0x69ee, 0x69ef, 0x69f0, + 0x69f1, 0x69f3, 0x69f4, 0x69f5, 0x69f6, 0x69f7, 0x69f8, 0x69f9, + 0x69fa, 0x69fb, 0x69fc, 0x69fe, 0x6a00, 0x6a01, 0x6a02, 0x6a03, + 0x6a04, 0x6a05, 0x6a06, 0x6a07, 0x6a08, 0x6a09, 0x6a0b, 0x6a0c, + 0x6a0d, 0x6a0e, 0x6a0f, 0x6a10, 0x6a11, 0x6a12, 0x6a13, 0x6a14, + 0x6a15, 0x6a16, 0x6a19, 0x6a1a, 0x6a1b, 0x6a1c, 0x6a1d, 0x6a1e, + 0x6a20, 0x6a22, 0x6a23, 0x6a24, 0x6a25, 0x6a26, 0x6a27, 0x6a29, + 0x6a2b, 0x6a2c, 0x6a2d, 0x6a2e, 0x6a30, 0x6a32, 0x6a33, 0x6a34, + 0x6a36, 0x6a37, 0x6a38, 0x6a39, 0x6a3a, 0x6a3b, 0x6a3c, 0x6a3f, + 0x6a40, 0x6a41, 0x6a42, 0x6a43, 0x6a45, 0x6a46, 0x6a48, 0x6a49, + 0x6a4a, 0x6a4b, 0x6a4c, 0x6a4d, 0x6a4e, 0x6a4f, 0x6a51, 0x6a52, + 0x6a53, 0x6a54, 0x6a55, 0x6a56, 0x6a57, 0x6a5a, + /* 0x99 */ + 0x6a5c, 0x6a5d, 0x6a5e, 0x6a5f, 0x6a60, 0x6a62, 0x6a63, 0x6a64, + 0x6a66, 0x6a67, 0x6a68, 0x6a69, 0x6a6a, 0x6a6b, 0x6a6c, 0x6a6d, + 0x6a6e, 0x6a6f, 0x6a70, 0x6a72, 0x6a73, 0x6a74, 0x6a75, 0x6a76, + 0x6a77, 0x6a78, 0x6a7a, 0x6a7b, 0x6a7d, 0x6a7e, 0x6a7f, 0x6a81, + 0x6a82, 0x6a83, 0x6a85, 0x6a86, 0x6a87, 0x6a88, 0x6a89, 0x6a8a, + 0x6a8b, 0x6a8c, 0x6a8d, 0x6a8f, 0x6a92, 0x6a93, 0x6a94, 0x6a95, + 0x6a96, 0x6a98, 0x6a99, 0x6a9a, 0x6a9b, 0x6a9c, 0x6a9d, 0x6a9e, + 0x6a9f, 0x6aa1, 0x6aa2, 0x6aa3, 0x6aa4, 0x6aa5, 0x6aa6, 0x6aa7, + 0x6aa8, 0x6aaa, 0x6aad, 0x6aae, 0x6aaf, 0x6ab0, 0x6ab1, 0x6ab2, + 0x6ab3, 0x6ab4, 0x6ab5, 0x6ab6, 0x6ab7, 0x6ab8, 0x6ab9, 0x6aba, + 0x6abb, 0x6abc, 0x6abd, 0x6abe, 0x6abf, 0x6ac0, 0x6ac1, 0x6ac2, + 0x6ac3, 0x6ac4, 0x6ac5, 0x6ac6, 0x6ac7, 0x6ac8, 0x6ac9, 0x6aca, + 0x6acb, 0x6acc, 0x6acd, 0x6ace, 0x6acf, 0x6ad0, 0x6ad1, 0x6ad2, + 0x6ad3, 0x6ad4, 0x6ad5, 0x6ad6, 0x6ad7, 0x6ad8, 0x6ad9, 0x6ada, + 0x6adb, 0x6adc, 0x6add, 0x6ade, 0x6adf, 0x6ae0, 0x6ae1, 0x6ae2, + 0x6ae3, 0x6ae4, 0x6ae5, 0x6ae6, 0x6ae7, 0x6ae8, 0x6ae9, 0x6aea, + 0x6aeb, 0x6aec, 0x6aed, 0x6aee, 0x6aef, 0x6af0, 0x6af1, 0x6af2, + 0x6af3, 0x6af4, 0x6af5, 0x6af6, 0x6af7, 0x6af8, 0x6af9, 0x6afa, + 0x6afb, 0x6afc, 0x6afd, 0x6afe, 0x6aff, 0x6b00, 0x6b01, 0x6b02, + 0x6b03, 0x6b04, 0x6b05, 0x6b06, 0x6b07, 0x6b08, 0x6b09, 0x6b0a, + 0x6b0b, 0x6b0c, 0x6b0d, 0x6b0e, 0x6b0f, 0x6b10, 0x6b11, 0x6b12, + 0x6b13, 0x6b14, 0x6b15, 0x6b16, 0x6b17, 0x6b18, 0x6b19, 0x6b1a, + 0x6b1b, 0x6b1c, 0x6b1d, 0x6b1e, 0x6b1f, 0x6b25, 0x6b26, 0x6b28, + 0x6b29, 0x6b2a, 0x6b2b, 0x6b2c, 0x6b2d, 0x6b2e, + /* 0x9a */ + 0x6b2f, 0x6b30, 0x6b31, 0x6b33, 0x6b34, 0x6b35, 0x6b36, 0x6b38, + 0x6b3b, 0x6b3c, 0x6b3d, 0x6b3f, 0x6b40, 0x6b41, 0x6b42, 0x6b44, + 0x6b45, 0x6b48, 0x6b4a, 0x6b4b, 0x6b4d, 0x6b4e, 0x6b4f, 0x6b50, + 0x6b51, 0x6b52, 0x6b53, 0x6b54, 0x6b55, 0x6b56, 0x6b57, 0x6b58, + 0x6b5a, 0x6b5b, 0x6b5c, 0x6b5d, 0x6b5e, 0x6b5f, 0x6b60, 0x6b61, + 0x6b68, 0x6b69, 0x6b6b, 0x6b6c, 0x6b6d, 0x6b6e, 0x6b6f, 0x6b70, + 0x6b71, 0x6b72, 0x6b73, 0x6b74, 0x6b75, 0x6b76, 0x6b77, 0x6b78, + 0x6b7a, 0x6b7d, 0x6b7e, 0x6b7f, 0x6b80, 0x6b85, 0x6b88, 0x6b8c, + 0x6b8e, 0x6b8f, 0x6b90, 0x6b91, 0x6b94, 0x6b95, 0x6b97, 0x6b98, + 0x6b99, 0x6b9c, 0x6b9d, 0x6b9e, 0x6b9f, 0x6ba0, 0x6ba2, 0x6ba3, + 0x6ba4, 0x6ba5, 0x6ba6, 0x6ba7, 0x6ba8, 0x6ba9, 0x6bab, 0x6bac, + 0x6bad, 0x6bae, 0x6baf, 0x6bb0, 0x6bb1, 0x6bb2, 0x6bb6, 0x6bb8, + 0x6bb9, 0x6bba, 0x6bbb, 0x6bbc, 0x6bbd, 0x6bbe, 0x6bc0, 0x6bc3, + 0x6bc4, 0x6bc6, 0x6bc7, 0x6bc8, 0x6bc9, 0x6bca, 0x6bcc, 0x6bce, + 0x6bd0, 0x6bd1, 0x6bd8, 0x6bda, 0x6bdc, 0x6bdd, 0x6bde, 0x6bdf, + 0x6be0, 0x6be2, 0x6be3, 0x6be4, 0x6be5, 0x6be6, 0x6be7, 0x6be8, + 0x6be9, 0x6bec, 0x6bed, 0x6bee, 0x6bf0, 0x6bf1, 0x6bf2, 0x6bf4, + 0x6bf6, 0x6bf7, 0x6bf8, 0x6bfa, 0x6bfb, 0x6bfc, 0x6bfe, 0x6bff, + 0x6c00, 0x6c01, 0x6c02, 0x6c03, 0x6c04, 0x6c08, 0x6c09, 0x6c0a, + 0x6c0b, 0x6c0c, 0x6c0e, 0x6c12, 0x6c17, 0x6c1c, 0x6c1d, 0x6c1e, + 0x6c20, 0x6c23, 0x6c25, 0x6c2b, 0x6c2c, 0x6c2d, 0x6c31, 0x6c33, + 0x6c36, 0x6c37, 0x6c39, 0x6c3a, 0x6c3b, 0x6c3c, 0x6c3e, 0x6c3f, + 0x6c43, 0x6c44, 0x6c45, 0x6c48, 0x6c4b, 0x6c4c, 0x6c4d, 0x6c4e, + 0x6c4f, 0x6c51, 0x6c52, 0x6c53, 0x6c56, 0x6c58, + /* 0x9b */ + 0x6c59, 0x6c5a, 0x6c62, 0x6c63, 0x6c65, 0x6c66, 0x6c67, 0x6c6b, + 0x6c6c, 0x6c6d, 0x6c6e, 0x6c6f, 0x6c71, 0x6c73, 0x6c75, 0x6c77, + 0x6c78, 0x6c7a, 0x6c7b, 0x6c7c, 0x6c7f, 0x6c80, 0x6c84, 0x6c87, + 0x6c8a, 0x6c8b, 0x6c8d, 0x6c8e, 0x6c91, 0x6c92, 0x6c95, 0x6c96, + 0x6c97, 0x6c98, 0x6c9a, 0x6c9c, 0x6c9d, 0x6c9e, 0x6ca0, 0x6ca2, + 0x6ca8, 0x6cac, 0x6caf, 0x6cb0, 0x6cb4, 0x6cb5, 0x6cb6, 0x6cb7, + 0x6cba, 0x6cc0, 0x6cc1, 0x6cc2, 0x6cc3, 0x6cc6, 0x6cc7, 0x6cc8, + 0x6ccb, 0x6ccd, 0x6cce, 0x6ccf, 0x6cd1, 0x6cd2, 0x6cd8, 0x6cd9, + 0x6cda, 0x6cdc, 0x6cdd, 0x6cdf, 0x6ce4, 0x6ce6, 0x6ce7, 0x6ce9, + 0x6cec, 0x6ced, 0x6cf2, 0x6cf4, 0x6cf9, 0x6cff, 0x6d00, 0x6d02, + 0x6d03, 0x6d05, 0x6d06, 0x6d08, 0x6d09, 0x6d0a, 0x6d0d, 0x6d0f, + 0x6d10, 0x6d11, 0x6d13, 0x6d14, 0x6d15, 0x6d16, 0x6d18, 0x6d1c, + 0x6d1d, 0x6d1f, 0x6d20, 0x6d21, 0x6d22, 0x6d23, 0x6d24, 0x6d26, + 0x6d28, 0x6d29, 0x6d2c, 0x6d2d, 0x6d2f, 0x6d30, 0x6d34, 0x6d36, + 0x6d37, 0x6d38, 0x6d3a, 0x6d3f, 0x6d40, 0x6d42, 0x6d44, 0x6d49, + 0x6d4c, 0x6d50, 0x6d55, 0x6d56, 0x6d57, 0x6d58, 0x6d5b, 0x6d5d, + 0x6d5f, 0x6d61, 0x6d62, 0x6d64, 0x6d65, 0x6d67, 0x6d68, 0x6d6b, + 0x6d6c, 0x6d6d, 0x6d70, 0x6d71, 0x6d72, 0x6d73, 0x6d75, 0x6d76, + 0x6d79, 0x6d7a, 0x6d7b, 0x6d7d, 0x6d7e, 0x6d7f, 0x6d80, 0x6d81, + 0x6d83, 0x6d84, 0x6d86, 0x6d87, 0x6d8a, 0x6d8b, 0x6d8d, 0x6d8f, + 0x6d90, 0x6d92, 0x6d96, 0x6d97, 0x6d98, 0x6d99, 0x6d9a, 0x6d9c, + 0x6da2, 0x6da5, 0x6dac, 0x6dad, 0x6db0, 0x6db1, 0x6db3, 0x6db4, + 0x6db6, 0x6db7, 0x6db9, 0x6dba, 0x6dbb, 0x6dbc, 0x6dbd, 0x6dbe, + 0x6dc1, 0x6dc2, 0x6dc3, 0x6dc8, 0x6dc9, 0x6dca, + /* 0x9c */ + 0x6dcd, 0x6dce, 0x6dcf, 0x6dd0, 0x6dd2, 0x6dd3, 0x6dd4, 0x6dd5, + 0x6dd7, 0x6dda, 0x6ddb, 0x6ddc, 0x6ddf, 0x6de2, 0x6de3, 0x6de5, + 0x6de7, 0x6de8, 0x6de9, 0x6dea, 0x6ded, 0x6def, 0x6df0, 0x6df2, + 0x6df4, 0x6df5, 0x6df6, 0x6df8, 0x6dfa, 0x6dfd, 0x6dfe, 0x6dff, + 0x6e00, 0x6e01, 0x6e02, 0x6e03, 0x6e04, 0x6e06, 0x6e07, 0x6e08, + 0x6e09, 0x6e0b, 0x6e0f, 0x6e12, 0x6e13, 0x6e15, 0x6e18, 0x6e19, + 0x6e1b, 0x6e1c, 0x6e1e, 0x6e1f, 0x6e22, 0x6e26, 0x6e27, 0x6e28, + 0x6e2a, 0x6e2c, 0x6e2e, 0x6e30, 0x6e31, 0x6e33, 0x6e35, 0x6e36, + 0x6e37, 0x6e39, 0x6e3b, 0x6e3c, 0x6e3d, 0x6e3e, 0x6e3f, 0x6e40, + 0x6e41, 0x6e42, 0x6e45, 0x6e46, 0x6e47, 0x6e48, 0x6e49, 0x6e4a, + 0x6e4b, 0x6e4c, 0x6e4f, 0x6e50, 0x6e51, 0x6e52, 0x6e55, 0x6e57, + 0x6e59, 0x6e5a, 0x6e5c, 0x6e5d, 0x6e5e, 0x6e60, 0x6e61, 0x6e62, + 0x6e63, 0x6e64, 0x6e65, 0x6e66, 0x6e67, 0x6e68, 0x6e69, 0x6e6a, + 0x6e6c, 0x6e6d, 0x6e6f, 0x6e70, 0x6e71, 0x6e72, 0x6e73, 0x6e74, + 0x6e75, 0x6e76, 0x6e77, 0x6e78, 0x6e79, 0x6e7a, 0x6e7b, 0x6e7c, + 0x6e7d, 0x6e80, 0x6e81, 0x6e82, 0x6e84, 0x6e87, 0x6e88, 0x6e8a, + 0x6e8b, 0x6e8c, 0x6e8d, 0x6e8e, 0x6e91, 0x6e92, 0x6e93, 0x6e94, + 0x6e95, 0x6e96, 0x6e97, 0x6e99, 0x6e9a, 0x6e9b, 0x6e9d, 0x6e9e, + 0x6ea0, 0x6ea1, 0x6ea3, 0x6ea4, 0x6ea6, 0x6ea8, 0x6ea9, 0x6eab, + 0x6eac, 0x6ead, 0x6eae, 0x6eb0, 0x6eb3, 0x6eb5, 0x6eb8, 0x6eb9, + 0x6ebc, 0x6ebe, 0x6ebf, 0x6ec0, 0x6ec3, 0x6ec4, 0x6ec5, 0x6ec6, + 0x6ec8, 0x6ec9, 0x6eca, 0x6ecc, 0x6ecd, 0x6ece, 0x6ed0, 0x6ed2, + 0x6ed6, 0x6ed8, 0x6ed9, 0x6edb, 0x6edc, 0x6edd, 0x6ee3, 0x6ee7, + 0x6eea, 0x6eeb, 0x6eec, 0x6eed, 0x6eee, 0x6eef, + /* 0x9d */ + 0x6ef0, 0x6ef1, 0x6ef2, 0x6ef3, 0x6ef5, 0x6ef6, 0x6ef7, 0x6ef8, + 0x6efa, 0x6efb, 0x6efc, 0x6efd, 0x6efe, 0x6eff, 0x6f00, 0x6f01, + 0x6f03, 0x6f04, 0x6f05, 0x6f07, 0x6f08, 0x6f0a, 0x6f0b, 0x6f0c, + 0x6f0d, 0x6f0e, 0x6f10, 0x6f11, 0x6f12, 0x6f16, 0x6f17, 0x6f18, + 0x6f19, 0x6f1a, 0x6f1b, 0x6f1c, 0x6f1d, 0x6f1e, 0x6f1f, 0x6f21, + 0x6f22, 0x6f23, 0x6f25, 0x6f26, 0x6f27, 0x6f28, 0x6f2c, 0x6f2e, + 0x6f30, 0x6f32, 0x6f34, 0x6f35, 0x6f37, 0x6f38, 0x6f39, 0x6f3a, + 0x6f3b, 0x6f3c, 0x6f3d, 0x6f3f, 0x6f40, 0x6f41, 0x6f42, 0x6f43, + 0x6f44, 0x6f45, 0x6f48, 0x6f49, 0x6f4a, 0x6f4c, 0x6f4e, 0x6f4f, + 0x6f50, 0x6f51, 0x6f52, 0x6f53, 0x6f54, 0x6f55, 0x6f56, 0x6f57, + 0x6f59, 0x6f5a, 0x6f5b, 0x6f5d, 0x6f5f, 0x6f60, 0x6f61, 0x6f63, + 0x6f64, 0x6f65, 0x6f67, 0x6f68, 0x6f69, 0x6f6a, 0x6f6b, 0x6f6c, + 0x6f6f, 0x6f70, 0x6f71, 0x6f73, 0x6f75, 0x6f76, 0x6f77, 0x6f79, + 0x6f7b, 0x6f7d, 0x6f7e, 0x6f7f, 0x6f80, 0x6f81, 0x6f82, 0x6f83, + 0x6f85, 0x6f86, 0x6f87, 0x6f8a, 0x6f8b, 0x6f8f, 0x6f90, 0x6f91, + 0x6f92, 0x6f93, 0x6f94, 0x6f95, 0x6f96, 0x6f97, 0x6f98, 0x6f99, + 0x6f9a, 0x6f9b, 0x6f9d, 0x6f9e, 0x6f9f, 0x6fa0, 0x6fa2, 0x6fa3, + 0x6fa4, 0x6fa5, 0x6fa6, 0x6fa8, 0x6fa9, 0x6faa, 0x6fab, 0x6fac, + 0x6fad, 0x6fae, 0x6faf, 0x6fb0, 0x6fb1, 0x6fb2, 0x6fb4, 0x6fb5, + 0x6fb7, 0x6fb8, 0x6fba, 0x6fbb, 0x6fbc, 0x6fbd, 0x6fbe, 0x6fbf, + 0x6fc1, 0x6fc3, 0x6fc4, 0x6fc5, 0x6fc6, 0x6fc7, 0x6fc8, 0x6fca, + 0x6fcb, 0x6fcc, 0x6fcd, 0x6fce, 0x6fcf, 0x6fd0, 0x6fd3, 0x6fd4, + 0x6fd5, 0x6fd6, 0x6fd7, 0x6fd8, 0x6fd9, 0x6fda, 0x6fdb, 0x6fdc, + 0x6fdd, 0x6fdf, 0x6fe2, 0x6fe3, 0x6fe4, 0x6fe5, + /* 0x9e */ + 0x6fe6, 0x6fe7, 0x6fe8, 0x6fe9, 0x6fea, 0x6feb, 0x6fec, 0x6fed, + 0x6ff0, 0x6ff1, 0x6ff2, 0x6ff3, 0x6ff4, 0x6ff5, 0x6ff6, 0x6ff7, + 0x6ff8, 0x6ff9, 0x6ffa, 0x6ffb, 0x6ffc, 0x6ffd, 0x6ffe, 0x6fff, + 0x7000, 0x7001, 0x7002, 0x7003, 0x7004, 0x7005, 0x7006, 0x7007, + 0x7008, 0x7009, 0x700a, 0x700b, 0x700c, 0x700d, 0x700e, 0x700f, + 0x7010, 0x7012, 0x7013, 0x7014, 0x7015, 0x7016, 0x7017, 0x7018, + 0x7019, 0x701c, 0x701d, 0x701e, 0x701f, 0x7020, 0x7021, 0x7022, + 0x7024, 0x7025, 0x7026, 0x7027, 0x7028, 0x7029, 0x702a, 0x702b, + 0x702c, 0x702d, 0x702e, 0x702f, 0x7030, 0x7031, 0x7032, 0x7033, + 0x7034, 0x7036, 0x7037, 0x7038, 0x703a, 0x703b, 0x703c, 0x703d, + 0x703e, 0x703f, 0x7040, 0x7041, 0x7042, 0x7043, 0x7044, 0x7045, + 0x7046, 0x7047, 0x7048, 0x7049, 0x704a, 0x704b, 0x704d, 0x704e, + 0x7050, 0x7051, 0x7052, 0x7053, 0x7054, 0x7055, 0x7056, 0x7057, + 0x7058, 0x7059, 0x705a, 0x705b, 0x705c, 0x705d, 0x705f, 0x7060, + 0x7061, 0x7062, 0x7063, 0x7064, 0x7065, 0x7066, 0x7067, 0x7068, + 0x7069, 0x706a, 0x706e, 0x7071, 0x7072, 0x7073, 0x7074, 0x7077, + 0x7079, 0x707a, 0x707b, 0x707d, 0x7081, 0x7082, 0x7083, 0x7084, + 0x7086, 0x7087, 0x7088, 0x708b, 0x708c, 0x708d, 0x708f, 0x7090, + 0x7091, 0x7093, 0x7097, 0x7098, 0x709a, 0x709b, 0x709e, 0x709f, + 0x70a0, 0x70a1, 0x70a2, 0x70a3, 0x70a4, 0x70a5, 0x70a6, 0x70a7, + 0x70a8, 0x70a9, 0x70aa, 0x70b0, 0x70b2, 0x70b4, 0x70b5, 0x70b6, + 0x70ba, 0x70be, 0x70bf, 0x70c4, 0x70c5, 0x70c6, 0x70c7, 0x70c9, + 0x70cb, 0x70cc, 0x70cd, 0x70ce, 0x70cf, 0x70d0, 0x70d1, 0x70d2, + 0x70d3, 0x70d4, 0x70d5, 0x70d6, 0x70d7, 0x70da, + /* 0x9f */ + 0x70dc, 0x70dd, 0x70de, 0x70e0, 0x70e1, 0x70e2, 0x70e3, 0x70e5, + 0x70ea, 0x70ee, 0x70f0, 0x70f1, 0x70f2, 0x70f3, 0x70f4, 0x70f5, + 0x70f6, 0x70f8, 0x70fa, 0x70fb, 0x70fc, 0x70fe, 0x70ff, 0x7100, + 0x7101, 0x7102, 0x7103, 0x7104, 0x7105, 0x7106, 0x7107, 0x7108, + 0x710b, 0x710c, 0x710d, 0x710e, 0x710f, 0x7111, 0x7112, 0x7114, + 0x7117, 0x711b, 0x711c, 0x711d, 0x711e, 0x711f, 0x7120, 0x7121, + 0x7122, 0x7123, 0x7124, 0x7125, 0x7127, 0x7128, 0x7129, 0x712a, + 0x712b, 0x712c, 0x712d, 0x712e, 0x7132, 0x7133, 0x7134, 0x7135, + 0x7137, 0x7138, 0x7139, 0x713a, 0x713b, 0x713c, 0x713d, 0x713e, + 0x713f, 0x7140, 0x7141, 0x7142, 0x7143, 0x7144, 0x7146, 0x7147, + 0x7148, 0x7149, 0x714b, 0x714d, 0x714f, 0x7150, 0x7151, 0x7152, + 0x7153, 0x7154, 0x7155, 0x7156, 0x7157, 0x7158, 0x7159, 0x715a, + 0x715b, 0x715d, 0x715f, 0x7160, 0x7161, 0x7162, 0x7163, 0x7165, + 0x7169, 0x716a, 0x716b, 0x716c, 0x716d, 0x716f, 0x7170, 0x7171, + 0x7174, 0x7175, 0x7176, 0x7177, 0x7179, 0x717b, 0x717c, 0x717e, + 0x717f, 0x7180, 0x7181, 0x7182, 0x7183, 0x7185, 0x7186, 0x7187, + 0x7188, 0x7189, 0x718b, 0x718c, 0x718d, 0x718e, 0x7190, 0x7191, + 0x7192, 0x7193, 0x7195, 0x7196, 0x7197, 0x719a, 0x719b, 0x719c, + 0x719d, 0x719e, 0x71a1, 0x71a2, 0x71a3, 0x71a4, 0x71a5, 0x71a6, + 0x71a7, 0x71a9, 0x71aa, 0x71ab, 0x71ad, 0x71ae, 0x71af, 0x71b0, + 0x71b1, 0x71b2, 0x71b4, 0x71b6, 0x71b7, 0x71b8, 0x71ba, 0x71bb, + 0x71bc, 0x71bd, 0x71be, 0x71bf, 0x71c0, 0x71c1, 0x71c2, 0x71c4, + 0x71c5, 0x71c6, 0x71c7, 0x71c8, 0x71c9, 0x71ca, 0x71cb, 0x71cc, + 0x71cd, 0x71cf, 0x71d0, 0x71d1, 0x71d2, 0x71d3, + /* 0xa0 */ + 0x71d6, 0x71d7, 0x71d8, 0x71d9, 0x71da, 0x71db, 0x71dc, 0x71dd, + 0x71de, 0x71df, 0x71e1, 0x71e2, 0x71e3, 0x71e4, 0x71e6, 0x71e8, + 0x71e9, 0x71ea, 0x71eb, 0x71ec, 0x71ed, 0x71ef, 0x71f0, 0x71f1, + 0x71f2, 0x71f3, 0x71f4, 0x71f5, 0x71f6, 0x71f7, 0x71f8, 0x71fa, + 0x71fb, 0x71fc, 0x71fd, 0x71fe, 0x71ff, 0x7200, 0x7201, 0x7202, + 0x7203, 0x7204, 0x7205, 0x7207, 0x7208, 0x7209, 0x720a, 0x720b, + 0x720c, 0x720d, 0x720e, 0x720f, 0x7210, 0x7211, 0x7212, 0x7213, + 0x7214, 0x7215, 0x7216, 0x7217, 0x7218, 0x7219, 0x721a, 0x721b, + 0x721c, 0x721e, 0x721f, 0x7220, 0x7221, 0x7222, 0x7223, 0x7224, + 0x7225, 0x7226, 0x7227, 0x7229, 0x722b, 0x722d, 0x722e, 0x722f, + 0x7232, 0x7233, 0x7234, 0x723a, 0x723c, 0x723e, 0x7240, 0x7241, + 0x7242, 0x7243, 0x7244, 0x7245, 0x7246, 0x7249, 0x724a, 0x724b, + 0x724e, 0x724f, 0x7250, 0x7251, 0x7253, 0x7254, 0x7255, 0x7257, + 0x7258, 0x725a, 0x725c, 0x725e, 0x7260, 0x7263, 0x7264, 0x7265, + 0x7268, 0x726a, 0x726b, 0x726c, 0x726d, 0x7270, 0x7271, 0x7273, + 0x7274, 0x7276, 0x7277, 0x7278, 0x727b, 0x727c, 0x727d, 0x7282, + 0x7283, 0x7285, 0x7286, 0x7287, 0x7288, 0x7289, 0x728c, 0x728e, + 0x7290, 0x7291, 0x7293, 0x7294, 0x7295, 0x7296, 0x7297, 0x7298, + 0x7299, 0x729a, 0x729b, 0x729c, 0x729d, 0x729e, 0x72a0, 0x72a1, + 0x72a2, 0x72a3, 0x72a4, 0x72a5, 0x72a6, 0x72a7, 0x72a8, 0x72a9, + 0x72aa, 0x72ab, 0x72ae, 0x72b1, 0x72b2, 0x72b3, 0x72b5, 0x72ba, + 0x72bb, 0x72bc, 0x72bd, 0x72be, 0x72bf, 0x72c0, 0x72c5, 0x72c6, + 0x72c7, 0x72c9, 0x72ca, 0x72cb, 0x72cc, 0x72cf, 0x72d1, 0x72d3, + 0x72d4, 0x72d5, 0x72d6, 0x72d8, 0x72da, 0x72db, + /* 0xa1 */ + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0x3000, 0x3001, 0x3002, 0x00b7, 0x02c9, 0x02c7, 0x00a8, 0x3003, + 0x3005, 0x2014, 0xff5e, 0x2016, 0x2026, 0x2018, 0x2019, 0x201c, + 0x201d, 0x3014, 0x3015, 0x3008, 0x3009, 0x300a, 0x300b, 0x300c, + 0x300d, 0x300e, 0x300f, 0x3016, 0x3017, 0x3010, 0x3011, 0x00b1, + 0x00d7, 0x00f7, 0x2236, 0x2227, 0x2228, 0x2211, 0x220f, 0x222a, + 0x2229, 0x2208, 0x2237, 0x221a, 0x22a5, 0x2225, 0x2220, 0x2312, + 0x2299, 0x222b, 0x222e, 0x2261, 0x224c, 0x2248, 0x223d, 0x221d, + 0x2260, 0x226e, 0x226f, 0x2264, 0x2265, 0x221e, 0x2235, 0x2234, + 0x2642, 0x2640, 0x00b0, 0x2032, 0x2033, 0x2103, 0xff04, 0x00a4, + 0xffe0, 0xffe1, 0x2030, 0x00a7, 0x2116, 0x2606, 0x2605, 0x25cb, + 0x25cf, 0x25ce, 0x25c7, 0x25c6, 0x25a1, 0x25a0, 0x25b3, 0x25b2, + 0x203b, 0x2192, 0x2190, 0x2191, 0x2193, 0x3013, + /* 0xa2 */ + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0x2170, 0x2171, 0x2172, 0x2173, 0x2174, 0x2175, 0x2176, 0x2177, + 0x2178, 0x2179, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0x2488, 0x2489, 0x248a, 0x248b, 0x248c, 0x248d, 0x248e, 0x248f, + 0x2490, 0x2491, 0x2492, 0x2493, 0x2494, 0x2495, 0x2496, 0x2497, + 0x2498, 0x2499, 0x249a, 0x249b, 0x2474, 0x2475, 0x2476, 0x2477, + 0x2478, 0x2479, 0x247a, 0x247b, 0x247c, 0x247d, 0x247e, 0x247f, + 0x2480, 0x2481, 0x2482, 0x2483, 0x2484, 0x2485, 0x2486, 0x2487, + 0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467, + 0x2468, 0x2469, 0xfffd, 0xfffd, 0x3220, 0x3221, 0x3222, 0x3223, + 0x3224, 0x3225, 0x3226, 0x3227, 0x3228, 0x3229, 0xfffd, 0xfffd, + 0x2160, 0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, + 0x2168, 0x2169, 0x216a, 0x216b, 0xfffd, 0xfffd, + /* 0xa3 */ + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xff01, 0xff02, 0xff03, 0xffe5, 0xff05, 0xff06, 0xff07, 0xff08, + 0xff09, 0xff0a, 0xff0b, 0xff0c, 0xff0d, 0xff0e, 0xff0f, 0xff10, + 0xff11, 0xff12, 0xff13, 0xff14, 0xff15, 0xff16, 0xff17, 0xff18, + 0xff19, 0xff1a, 0xff1b, 0xff1c, 0xff1d, 0xff1e, 0xff1f, 0xff20, + 0xff21, 0xff22, 0xff23, 0xff24, 0xff25, 0xff26, 0xff27, 0xff28, + 0xff29, 0xff2a, 0xff2b, 0xff2c, 0xff2d, 0xff2e, 0xff2f, 0xff30, + 0xff31, 0xff32, 0xff33, 0xff34, 0xff35, 0xff36, 0xff37, 0xff38, + 0xff39, 0xff3a, 0xff3b, 0xff3c, 0xff3d, 0xff3e, 0xff3f, 0xff40, + 0xff41, 0xff42, 0xff43, 0xff44, 0xff45, 0xff46, 0xff47, 0xff48, + 0xff49, 0xff4a, 0xff4b, 0xff4c, 0xff4d, 0xff4e, 0xff4f, 0xff50, + 0xff51, 0xff52, 0xff53, 0xff54, 0xff55, 0xff56, 0xff57, 0xff58, + 0xff59, 0xff5a, 0xff5b, 0xff5c, 0xff5d, 0xffe3, + /* 0xa4 */ + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046, 0x3047, 0x3048, + 0x3049, 0x304a, 0x304b, 0x304c, 0x304d, 0x304e, 0x304f, 0x3050, + 0x3051, 0x3052, 0x3053, 0x3054, 0x3055, 0x3056, 0x3057, 0x3058, + 0x3059, 0x305a, 0x305b, 0x305c, 0x305d, 0x305e, 0x305f, 0x3060, + 0x3061, 0x3062, 0x3063, 0x3064, 0x3065, 0x3066, 0x3067, 0x3068, + 0x3069, 0x306a, 0x306b, 0x306c, 0x306d, 0x306e, 0x306f, 0x3070, + 0x3071, 0x3072, 0x3073, 0x3074, 0x3075, 0x3076, 0x3077, 0x3078, + 0x3079, 0x307a, 0x307b, 0x307c, 0x307d, 0x307e, 0x307f, 0x3080, + 0x3081, 0x3082, 0x3083, 0x3084, 0x3085, 0x3086, 0x3087, 0x3088, + 0x3089, 0x308a, 0x308b, 0x308c, 0x308d, 0x308e, 0x308f, 0x3090, + 0x3091, 0x3092, 0x3093, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + /* 0xa5 */ + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0x30a1, 0x30a2, 0x30a3, 0x30a4, 0x30a5, 0x30a6, 0x30a7, 0x30a8, + 0x30a9, 0x30aa, 0x30ab, 0x30ac, 0x30ad, 0x30ae, 0x30af, 0x30b0, + 0x30b1, 0x30b2, 0x30b3, 0x30b4, 0x30b5, 0x30b6, 0x30b7, 0x30b8, + 0x30b9, 0x30ba, 0x30bb, 0x30bc, 0x30bd, 0x30be, 0x30bf, 0x30c0, + 0x30c1, 0x30c2, 0x30c3, 0x30c4, 0x30c5, 0x30c6, 0x30c7, 0x30c8, + 0x30c9, 0x30ca, 0x30cb, 0x30cc, 0x30cd, 0x30ce, 0x30cf, 0x30d0, + 0x30d1, 0x30d2, 0x30d3, 0x30d4, 0x30d5, 0x30d6, 0x30d7, 0x30d8, + 0x30d9, 0x30da, 0x30db, 0x30dc, 0x30dd, 0x30de, 0x30df, 0x30e0, + 0x30e1, 0x30e2, 0x30e3, 0x30e4, 0x30e5, 0x30e6, 0x30e7, 0x30e8, + 0x30e9, 0x30ea, 0x30eb, 0x30ec, 0x30ed, 0x30ee, 0x30ef, 0x30f0, + 0x30f1, 0x30f2, 0x30f3, 0x30f4, 0x30f5, 0x30f6, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + /* 0xa6 */ + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x0398, + 0x0399, 0x039a, 0x039b, 0x039c, 0x039d, 0x039e, 0x039f, 0x03a0, + 0x03a1, 0x03a3, 0x03a4, 0x03a5, 0x03a6, 0x03a7, 0x03a8, 0x03a9, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0x03b1, 0x03b2, 0x03b3, 0x03b4, 0x03b5, 0x03b6, 0x03b7, 0x03b8, + 0x03b9, 0x03ba, 0x03bb, 0x03bc, 0x03bd, 0x03be, 0x03bf, 0x03c0, + 0x03c1, 0x03c3, 0x03c4, 0x03c5, 0x03c6, 0x03c7, 0x03c8, 0x03c9, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfe35, + 0xfe36, 0xfe39, 0xfe3a, 0xfe3f, 0xfe40, 0xfe3d, 0xfe3e, 0xfe41, + 0xfe42, 0xfe43, 0xfe44, 0xfffd, 0xfffd, 0xfe3b, 0xfe3c, 0xfe37, + 0xfe38, 0xfe31, 0xfffd, 0xfe33, 0xfe34, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + /* 0xa7 */ + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0401, 0x0416, + 0x0417, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, + 0x041f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, + 0x0427, 0x0428, 0x0429, 0x042a, 0x042b, 0x042c, 0x042d, 0x042e, + 0x042f, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0451, 0x0436, + 0x0437, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, + 0x043f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, + 0x0447, 0x0448, 0x0449, 0x044a, 0x044b, 0x044c, 0x044d, 0x044e, + 0x044f, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + /* 0xa8 */ + 0x02ca, 0x02cb, 0x02d9, 0x2013, 0x2015, 0x2025, 0x2035, 0x2105, + 0x2109, 0x2196, 0x2197, 0x2198, 0x2199, 0x2215, 0x221f, 0x2223, + 0x2252, 0x2266, 0x2267, 0x22bf, 0x2550, 0x2551, 0x2552, 0x2553, + 0x2554, 0x2555, 0x2556, 0x2557, 0x2558, 0x2559, 0x255a, 0x255b, + 0x255c, 0x255d, 0x255e, 0x255f, 0x2560, 0x2561, 0x2562, 0x2563, + 0x2564, 0x2565, 0x2566, 0x2567, 0x2568, 0x2569, 0x256a, 0x256b, + 0x256c, 0x256d, 0x256e, 0x256f, 0x2570, 0x2571, 0x2572, 0x2573, + 0x2581, 0x2582, 0x2583, 0x2584, 0x2585, 0x2586, 0x2587, 0x2588, + 0x2589, 0x258a, 0x258b, 0x258c, 0x258d, 0x258e, 0x258f, 0x2593, + 0x2594, 0x2595, 0x25bc, 0x25bd, 0x25e2, 0x25e3, 0x25e4, 0x25e5, + 0x2609, 0x2295, 0x3012, 0x301d, 0x301e, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0x0101, 0x00e1, 0x01ce, 0x00e0, 0x0113, 0x00e9, 0x011b, 0x00e8, + 0x012b, 0x00ed, 0x01d0, 0x00ec, 0x014d, 0x00f3, 0x01d2, 0x00f2, + 0x016b, 0x00fa, 0x01d4, 0x00f9, 0x01d6, 0x01d8, 0x01da, 0x01dc, + 0x00fc, 0x00ea, 0x0251, 0xfffd, 0x0144, 0x0148, 0xfffd, 0x0261, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0x3105, 0x3106, 0x3107, 0x3108, + 0x3109, 0x310a, 0x310b, 0x310c, 0x310d, 0x310e, 0x310f, 0x3110, + 0x3111, 0x3112, 0x3113, 0x3114, 0x3115, 0x3116, 0x3117, 0x3118, + 0x3119, 0x311a, 0x311b, 0x311c, 0x311d, 0x311e, 0x311f, 0x3120, + 0x3121, 0x3122, 0x3123, 0x3124, 0x3125, 0x3126, 0x3127, 0x3128, + 0x3129, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + /* 0xa9 */ + 0x3021, 0x3022, 0x3023, 0x3024, 0x3025, 0x3026, 0x3027, 0x3028, + 0x3029, 0x32a3, 0x338e, 0x338f, 0x339c, 0x339d, 0x339e, 0x33a1, + 0x33c4, 0x33ce, 0x33d1, 0x33d2, 0x33d5, 0xfe30, 0xffe2, 0xffe4, + 0xfffd, 0x2121, 0x3231, 0xfffd, 0x2010, 0xfffd, 0xfffd, 0xfffd, + 0x30fc, 0x309b, 0x309c, 0x30fd, 0x30fe, 0x3006, 0x309d, 0x309e, + 0xfe49, 0xfe4a, 0xfe4b, 0xfe4c, 0xfe4d, 0xfe4e, 0xfe4f, 0xfe50, + 0xfe51, 0xfe52, 0xfe54, 0xfe55, 0xfe56, 0xfe57, 0xfe59, 0xfe5a, + 0xfe5b, 0xfe5c, 0xfe5d, 0xfe5e, 0xfe5f, 0xfe60, 0xfe61, 0xfe62, + 0xfe63, 0xfe64, 0xfe65, 0xfe66, 0xfe68, 0xfe69, 0xfe6a, 0xfe6b, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0x3007, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0x2500, 0x2501, 0x2502, 0x2503, 0x2504, + 0x2505, 0x2506, 0x2507, 0x2508, 0x2509, 0x250a, 0x250b, 0x250c, + 0x250d, 0x250e, 0x250f, 0x2510, 0x2511, 0x2512, 0x2513, 0x2514, + 0x2515, 0x2516, 0x2517, 0x2518, 0x2519, 0x251a, 0x251b, 0x251c, + 0x251d, 0x251e, 0x251f, 0x2520, 0x2521, 0x2522, 0x2523, 0x2524, + 0x2525, 0x2526, 0x2527, 0x2528, 0x2529, 0x252a, 0x252b, 0x252c, + 0x252d, 0x252e, 0x252f, 0x2530, 0x2531, 0x2532, 0x2533, 0x2534, + 0x2535, 0x2536, 0x2537, 0x2538, 0x2539, 0x253a, 0x253b, 0x253c, + 0x253d, 0x253e, 0x253f, 0x2540, 0x2541, 0x2542, 0x2543, 0x2544, + 0x2545, 0x2546, 0x2547, 0x2548, 0x2549, 0x254a, 0x254b, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + /* 0xaa */ + 0x72dc, 0x72dd, 0x72df, 0x72e2, 0x72e3, 0x72e4, 0x72e5, 0x72e6, + 0x72e7, 0x72ea, 0x72eb, 0x72f5, 0x72f6, 0x72f9, 0x72fd, 0x72fe, + 0x72ff, 0x7300, 0x7302, 0x7304, 0x7305, 0x7306, 0x7307, 0x7308, + 0x7309, 0x730b, 0x730c, 0x730d, 0x730f, 0x7310, 0x7311, 0x7312, + 0x7314, 0x7318, 0x7319, 0x731a, 0x731f, 0x7320, 0x7323, 0x7324, + 0x7326, 0x7327, 0x7328, 0x732d, 0x732f, 0x7330, 0x7332, 0x7333, + 0x7335, 0x7336, 0x733a, 0x733b, 0x733c, 0x733d, 0x7340, 0x7341, + 0x7342, 0x7343, 0x7344, 0x7345, 0x7346, 0x7347, 0x7348, 0x7349, + 0x734a, 0x734b, 0x734c, 0x734e, 0x734f, 0x7351, 0x7353, 0x7354, + 0x7355, 0x7356, 0x7358, 0x7359, 0x735a, 0x735b, 0x735c, 0x735d, + 0x735e, 0x735f, 0x7361, 0x7362, 0x7363, 0x7364, 0x7365, 0x7366, + 0x7367, 0x7368, 0x7369, 0x736a, 0x736b, 0x736e, 0x7370, 0x7371, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + /* 0xab */ + 0x7372, 0x7373, 0x7374, 0x7375, 0x7376, 0x7377, 0x7378, 0x7379, + 0x737a, 0x737b, 0x737c, 0x737d, 0x737f, 0x7380, 0x7381, 0x7382, + 0x7383, 0x7385, 0x7386, 0x7388, 0x738a, 0x738c, 0x738d, 0x738f, + 0x7390, 0x7392, 0x7393, 0x7394, 0x7395, 0x7397, 0x7398, 0x7399, + 0x739a, 0x739c, 0x739d, 0x739e, 0x73a0, 0x73a1, 0x73a3, 0x73a4, + 0x73a5, 0x73a6, 0x73a7, 0x73a8, 0x73aa, 0x73ac, 0x73ad, 0x73b1, + 0x73b4, 0x73b5, 0x73b6, 0x73b8, 0x73b9, 0x73bc, 0x73bd, 0x73be, + 0x73bf, 0x73c1, 0x73c3, 0x73c4, 0x73c5, 0x73c6, 0x73c7, 0x73cb, + 0x73cc, 0x73ce, 0x73d2, 0x73d3, 0x73d4, 0x73d5, 0x73d6, 0x73d7, + 0x73d8, 0x73da, 0x73db, 0x73dc, 0x73dd, 0x73df, 0x73e1, 0x73e2, + 0x73e3, 0x73e4, 0x73e6, 0x73e8, 0x73ea, 0x73eb, 0x73ec, 0x73ee, + 0x73ef, 0x73f0, 0x73f1, 0x73f3, 0x73f4, 0x73f5, 0x73f6, 0x73f7, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + /* 0xac */ + 0x73f8, 0x73f9, 0x73fa, 0x73fb, 0x73fc, 0x73fd, 0x73fe, 0x73ff, + 0x7400, 0x7401, 0x7402, 0x7404, 0x7407, 0x7408, 0x740b, 0x740c, + 0x740d, 0x740e, 0x7411, 0x7412, 0x7413, 0x7414, 0x7415, 0x7416, + 0x7417, 0x7418, 0x7419, 0x741c, 0x741d, 0x741e, 0x741f, 0x7420, + 0x7421, 0x7423, 0x7424, 0x7427, 0x7429, 0x742b, 0x742d, 0x742f, + 0x7431, 0x7432, 0x7437, 0x7438, 0x7439, 0x743a, 0x743b, 0x743d, + 0x743e, 0x743f, 0x7440, 0x7442, 0x7443, 0x7444, 0x7445, 0x7446, + 0x7447, 0x7448, 0x7449, 0x744a, 0x744b, 0x744c, 0x744d, 0x744e, + 0x744f, 0x7450, 0x7451, 0x7452, 0x7453, 0x7454, 0x7456, 0x7458, + 0x745d, 0x7460, 0x7461, 0x7462, 0x7463, 0x7464, 0x7465, 0x7466, + 0x7467, 0x7468, 0x7469, 0x746a, 0x746b, 0x746c, 0x746e, 0x746f, + 0x7471, 0x7472, 0x7473, 0x7474, 0x7475, 0x7478, 0x7479, 0x747a, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + /* 0xad */ + 0x747b, 0x747c, 0x747d, 0x747f, 0x7482, 0x7484, 0x7485, 0x7486, + 0x7488, 0x7489, 0x748a, 0x748c, 0x748d, 0x748f, 0x7491, 0x7492, + 0x7493, 0x7494, 0x7495, 0x7496, 0x7497, 0x7498, 0x7499, 0x749a, + 0x749b, 0x749d, 0x749f, 0x74a0, 0x74a1, 0x74a2, 0x74a3, 0x74a4, + 0x74a5, 0x74a6, 0x74aa, 0x74ab, 0x74ac, 0x74ad, 0x74ae, 0x74af, + 0x74b0, 0x74b1, 0x74b2, 0x74b3, 0x74b4, 0x74b5, 0x74b6, 0x74b7, + 0x74b8, 0x74b9, 0x74bb, 0x74bc, 0x74bd, 0x74be, 0x74bf, 0x74c0, + 0x74c1, 0x74c2, 0x74c3, 0x74c4, 0x74c5, 0x74c6, 0x74c7, 0x74c8, + 0x74c9, 0x74ca, 0x74cb, 0x74cc, 0x74cd, 0x74ce, 0x74cf, 0x74d0, + 0x74d1, 0x74d3, 0x74d4, 0x74d5, 0x74d6, 0x74d7, 0x74d8, 0x74d9, + 0x74da, 0x74db, 0x74dd, 0x74df, 0x74e1, 0x74e5, 0x74e7, 0x74e8, + 0x74e9, 0x74ea, 0x74eb, 0x74ec, 0x74ed, 0x74f0, 0x74f1, 0x74f2, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + /* 0xae */ + 0x74f3, 0x74f5, 0x74f8, 0x74f9, 0x74fa, 0x74fb, 0x74fc, 0x74fd, + 0x74fe, 0x7500, 0x7501, 0x7502, 0x7503, 0x7505, 0x7506, 0x7507, + 0x7508, 0x7509, 0x750a, 0x750b, 0x750c, 0x750e, 0x7510, 0x7512, + 0x7514, 0x7515, 0x7516, 0x7517, 0x751b, 0x751d, 0x751e, 0x7520, + 0x7521, 0x7522, 0x7523, 0x7524, 0x7526, 0x7527, 0x752a, 0x752e, + 0x7534, 0x7536, 0x7539, 0x753c, 0x753d, 0x753f, 0x7541, 0x7542, + 0x7543, 0x7544, 0x7546, 0x7547, 0x7549, 0x754a, 0x754d, 0x7550, + 0x7551, 0x7552, 0x7553, 0x7555, 0x7556, 0x7557, 0x7558, 0x755d, + 0x755e, 0x755f, 0x7560, 0x7561, 0x7562, 0x7563, 0x7564, 0x7567, + 0x7568, 0x7569, 0x756b, 0x756c, 0x756d, 0x756e, 0x756f, 0x7570, + 0x7571, 0x7573, 0x7575, 0x7576, 0x7577, 0x757a, 0x757b, 0x757c, + 0x757d, 0x757e, 0x7580, 0x7581, 0x7582, 0x7584, 0x7585, 0x7587, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + /* 0xaf */ + 0x7588, 0x7589, 0x758a, 0x758c, 0x758d, 0x758e, 0x7590, 0x7593, + 0x7595, 0x7598, 0x759b, 0x759c, 0x759e, 0x75a2, 0x75a6, 0x75a7, + 0x75a8, 0x75a9, 0x75aa, 0x75ad, 0x75b6, 0x75b7, 0x75ba, 0x75bb, + 0x75bf, 0x75c0, 0x75c1, 0x75c6, 0x75cb, 0x75cc, 0x75ce, 0x75cf, + 0x75d0, 0x75d1, 0x75d3, 0x75d7, 0x75d9, 0x75da, 0x75dc, 0x75dd, + 0x75df, 0x75e0, 0x75e1, 0x75e5, 0x75e9, 0x75ec, 0x75ed, 0x75ee, + 0x75ef, 0x75f2, 0x75f3, 0x75f5, 0x75f6, 0x75f7, 0x75f8, 0x75fa, + 0x75fb, 0x75fd, 0x75fe, 0x7602, 0x7604, 0x7606, 0x7607, 0x7608, + 0x7609, 0x760b, 0x760d, 0x760e, 0x760f, 0x7611, 0x7612, 0x7613, + 0x7614, 0x7616, 0x761a, 0x761c, 0x761d, 0x761e, 0x7621, 0x7623, + 0x7627, 0x7628, 0x762c, 0x762e, 0x762f, 0x7631, 0x7632, 0x7636, + 0x7637, 0x7639, 0x763a, 0x763b, 0x763d, 0x7641, 0x7642, 0x7644, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + /* 0xb0 */ + 0x7645, 0x7646, 0x7647, 0x7648, 0x7649, 0x764a, 0x764b, 0x764e, + 0x764f, 0x7650, 0x7651, 0x7652, 0x7653, 0x7655, 0x7657, 0x7658, + 0x7659, 0x765a, 0x765b, 0x765d, 0x765f, 0x7660, 0x7661, 0x7662, + 0x7664, 0x7665, 0x7666, 0x7667, 0x7668, 0x7669, 0x766a, 0x766c, + 0x766d, 0x766e, 0x7670, 0x7671, 0x7672, 0x7673, 0x7674, 0x7675, + 0x7676, 0x7677, 0x7679, 0x767a, 0x767c, 0x767f, 0x7680, 0x7681, + 0x7683, 0x7685, 0x7689, 0x768a, 0x768c, 0x768d, 0x768f, 0x7690, + 0x7692, 0x7694, 0x7695, 0x7697, 0x7698, 0x769a, 0x769b, 0x769c, + 0x769d, 0x769e, 0x769f, 0x76a0, 0x76a1, 0x76a2, 0x76a3, 0x76a5, + 0x76a6, 0x76a7, 0x76a8, 0x76a9, 0x76aa, 0x76ab, 0x76ac, 0x76ad, + 0x76af, 0x76b0, 0x76b3, 0x76b5, 0x76b6, 0x76b7, 0x76b8, 0x76b9, + 0x76ba, 0x76bb, 0x76bc, 0x76bd, 0x76be, 0x76c0, 0x76c1, 0x76c3, + 0x554a, 0x963f, 0x57c3, 0x6328, 0x54ce, 0x5509, 0x54c0, 0x7691, + 0x764c, 0x853c, 0x77ee, 0x827e, 0x788d, 0x7231, 0x9698, 0x978d, + 0x6c28, 0x5b89, 0x4ffa, 0x6309, 0x6697, 0x5cb8, 0x80fa, 0x6848, + 0x80ae, 0x6602, 0x76ce, 0x51f9, 0x6556, 0x71ac, 0x7ff1, 0x8884, + 0x50b2, 0x5965, 0x61ca, 0x6fb3, 0x82ad, 0x634c, 0x6252, 0x53ed, + 0x5427, 0x7b06, 0x516b, 0x75a4, 0x5df4, 0x62d4, 0x8dcb, 0x9776, + 0x628a, 0x8019, 0x575d, 0x9738, 0x7f62, 0x7238, 0x767d, 0x67cf, + 0x767e, 0x6446, 0x4f70, 0x8d25, 0x62dc, 0x7a17, 0x6591, 0x73ed, + 0x642c, 0x6273, 0x822c, 0x9881, 0x677f, 0x7248, 0x626e, 0x62cc, + 0x4f34, 0x74e3, 0x534a, 0x529e, 0x7eca, 0x90a6, 0x5e2e, 0x6886, + 0x699c, 0x8180, 0x7ed1, 0x68d2, 0x78c5, 0x868c, 0x9551, 0x508d, + 0x8c24, 0x82de, 0x80de, 0x5305, 0x8912, 0x5265, + /* 0xb1 */ + 0x76c4, 0x76c7, 0x76c9, 0x76cb, 0x76cc, 0x76d3, 0x76d5, 0x76d9, + 0x76da, 0x76dc, 0x76dd, 0x76de, 0x76e0, 0x76e1, 0x76e2, 0x76e3, + 0x76e4, 0x76e6, 0x76e7, 0x76e8, 0x76e9, 0x76ea, 0x76eb, 0x76ec, + 0x76ed, 0x76f0, 0x76f3, 0x76f5, 0x76f6, 0x76f7, 0x76fa, 0x76fb, + 0x76fd, 0x76ff, 0x7700, 0x7702, 0x7703, 0x7705, 0x7706, 0x770a, + 0x770c, 0x770e, 0x770f, 0x7710, 0x7711, 0x7712, 0x7713, 0x7714, + 0x7715, 0x7716, 0x7717, 0x7718, 0x771b, 0x771c, 0x771d, 0x771e, + 0x7721, 0x7723, 0x7724, 0x7725, 0x7727, 0x772a, 0x772b, 0x772c, + 0x772e, 0x7730, 0x7731, 0x7732, 0x7733, 0x7734, 0x7739, 0x773b, + 0x773d, 0x773e, 0x773f, 0x7742, 0x7744, 0x7745, 0x7746, 0x7748, + 0x7749, 0x774a, 0x774b, 0x774c, 0x774d, 0x774e, 0x774f, 0x7752, + 0x7753, 0x7754, 0x7755, 0x7756, 0x7757, 0x7758, 0x7759, 0x775c, + 0x8584, 0x96f9, 0x4fdd, 0x5821, 0x9971, 0x5b9d, 0x62b1, 0x62a5, + 0x66b4, 0x8c79, 0x9c8d, 0x7206, 0x676f, 0x7891, 0x60b2, 0x5351, + 0x5317, 0x8f88, 0x80cc, 0x8d1d, 0x94a1, 0x500d, 0x72c8, 0x5907, + 0x60eb, 0x7119, 0x88ab, 0x5954, 0x82ef, 0x672c, 0x7b28, 0x5d29, + 0x7ef7, 0x752d, 0x6cf5, 0x8e66, 0x8ff8, 0x903c, 0x9f3b, 0x6bd4, + 0x9119, 0x7b14, 0x5f7c, 0x78a7, 0x84d6, 0x853d, 0x6bd5, 0x6bd9, + 0x6bd6, 0x5e01, 0x5e87, 0x75f9, 0x95ed, 0x655d, 0x5f0a, 0x5fc5, + 0x8f9f, 0x58c1, 0x81c2, 0x907f, 0x965b, 0x97ad, 0x8fb9, 0x7f16, + 0x8d2c, 0x6241, 0x4fbf, 0x53d8, 0x535e, 0x8fa8, 0x8fa9, 0x8fab, + 0x904d, 0x6807, 0x5f6a, 0x8198, 0x8868, 0x9cd6, 0x618b, 0x522b, + 0x762a, 0x5f6c, 0x658c, 0x6fd2, 0x6ee8, 0x5bbe, 0x6448, 0x5175, + 0x51b0, 0x67c4, 0x4e19, 0x79c9, 0x997c, 0x70b3, + /* 0xb2 */ + 0x775d, 0x775e, 0x775f, 0x7760, 0x7764, 0x7767, 0x7769, 0x776a, + 0x776d, 0x776e, 0x776f, 0x7770, 0x7771, 0x7772, 0x7773, 0x7774, + 0x7775, 0x7776, 0x7777, 0x7778, 0x777a, 0x777b, 0x777c, 0x7781, + 0x7782, 0x7783, 0x7786, 0x7787, 0x7788, 0x7789, 0x778a, 0x778b, + 0x778f, 0x7790, 0x7793, 0x7794, 0x7795, 0x7796, 0x7797, 0x7798, + 0x7799, 0x779a, 0x779b, 0x779c, 0x779d, 0x779e, 0x77a1, 0x77a3, + 0x77a4, 0x77a6, 0x77a8, 0x77ab, 0x77ad, 0x77ae, 0x77af, 0x77b1, + 0x77b2, 0x77b4, 0x77b6, 0x77b7, 0x77b8, 0x77b9, 0x77ba, 0x77bc, + 0x77be, 0x77c0, 0x77c1, 0x77c2, 0x77c3, 0x77c4, 0x77c5, 0x77c6, + 0x77c7, 0x77c8, 0x77c9, 0x77ca, 0x77cb, 0x77cc, 0x77ce, 0x77cf, + 0x77d0, 0x77d1, 0x77d2, 0x77d3, 0x77d4, 0x77d5, 0x77d6, 0x77d8, + 0x77d9, 0x77da, 0x77dd, 0x77de, 0x77df, 0x77e0, 0x77e1, 0x77e4, + 0x75c5, 0x5e76, 0x73bb, 0x83e0, 0x64ad, 0x62e8, 0x94b5, 0x6ce2, + 0x535a, 0x52c3, 0x640f, 0x94c2, 0x7b94, 0x4f2f, 0x5e1b, 0x8236, + 0x8116, 0x818a, 0x6e24, 0x6cca, 0x9a73, 0x6355, 0x535c, 0x54fa, + 0x8865, 0x57e0, 0x4e0d, 0x5e03, 0x6b65, 0x7c3f, 0x90e8, 0x6016, + 0x64e6, 0x731c, 0x88c1, 0x6750, 0x624d, 0x8d22, 0x776c, 0x8e29, + 0x91c7, 0x5f69, 0x83dc, 0x8521, 0x9910, 0x53c2, 0x8695, 0x6b8b, + 0x60ed, 0x60e8, 0x707f, 0x82cd, 0x8231, 0x4ed3, 0x6ca7, 0x85cf, + 0x64cd, 0x7cd9, 0x69fd, 0x66f9, 0x8349, 0x5395, 0x7b56, 0x4fa7, + 0x518c, 0x6d4b, 0x5c42, 0x8e6d, 0x63d2, 0x53c9, 0x832c, 0x8336, + 0x67e5, 0x78b4, 0x643d, 0x5bdf, 0x5c94, 0x5dee, 0x8be7, 0x62c6, + 0x67f4, 0x8c7a, 0x6400, 0x63ba, 0x8749, 0x998b, 0x8c17, 0x7f20, + 0x94f2, 0x4ea7, 0x9610, 0x98a4, 0x660c, 0x7316, + /* 0xb3 */ + 0x77e6, 0x77e8, 0x77ea, 0x77ef, 0x77f0, 0x77f1, 0x77f2, 0x77f4, + 0x77f5, 0x77f7, 0x77f9, 0x77fa, 0x77fb, 0x77fc, 0x7803, 0x7804, + 0x7805, 0x7806, 0x7807, 0x7808, 0x780a, 0x780b, 0x780e, 0x780f, + 0x7810, 0x7813, 0x7815, 0x7819, 0x781b, 0x781e, 0x7820, 0x7821, + 0x7822, 0x7824, 0x7828, 0x782a, 0x782b, 0x782e, 0x782f, 0x7831, + 0x7832, 0x7833, 0x7835, 0x7836, 0x783d, 0x783f, 0x7841, 0x7842, + 0x7843, 0x7844, 0x7846, 0x7848, 0x7849, 0x784a, 0x784b, 0x784d, + 0x784f, 0x7851, 0x7853, 0x7854, 0x7858, 0x7859, 0x785a, 0x785b, + 0x785c, 0x785e, 0x785f, 0x7860, 0x7861, 0x7862, 0x7863, 0x7864, + 0x7865, 0x7866, 0x7867, 0x7868, 0x7869, 0x786f, 0x7870, 0x7871, + 0x7872, 0x7873, 0x7874, 0x7875, 0x7876, 0x7878, 0x7879, 0x787a, + 0x787b, 0x787d, 0x787e, 0x787f, 0x7880, 0x7881, 0x7882, 0x7883, + 0x573a, 0x5c1d, 0x5e38, 0x957f, 0x507f, 0x80a0, 0x5382, 0x655e, + 0x7545, 0x5531, 0x5021, 0x8d85, 0x6284, 0x949e, 0x671d, 0x5632, + 0x6f6e, 0x5de2, 0x5435, 0x7092, 0x8f66, 0x626f, 0x64a4, 0x63a3, + 0x5f7b, 0x6f88, 0x90f4, 0x81e3, 0x8fb0, 0x5c18, 0x6668, 0x5ff1, + 0x6c89, 0x9648, 0x8d81, 0x886c, 0x6491, 0x79f0, 0x57ce, 0x6a59, + 0x6210, 0x5448, 0x4e58, 0x7a0b, 0x60e9, 0x6f84, 0x8bda, 0x627f, + 0x901e, 0x9a8b, 0x79e4, 0x5403, 0x75f4, 0x6301, 0x5319, 0x6c60, + 0x8fdf, 0x5f1b, 0x9a70, 0x803b, 0x9f7f, 0x4f88, 0x5c3a, 0x8d64, + 0x7fc5, 0x65a5, 0x70bd, 0x5145, 0x51b2, 0x866b, 0x5d07, 0x5ba0, + 0x62bd, 0x916c, 0x7574, 0x8e0c, 0x7a20, 0x6101, 0x7b79, 0x4ec7, + 0x7ef8, 0x7785, 0x4e11, 0x81ed, 0x521d, 0x51fa, 0x6a71, 0x53a8, + 0x8e87, 0x9504, 0x96cf, 0x6ec1, 0x9664, 0x695a, + /* 0xb4 */ + 0x7884, 0x7885, 0x7886, 0x7888, 0x788a, 0x788b, 0x788f, 0x7890, + 0x7892, 0x7894, 0x7895, 0x7896, 0x7899, 0x789d, 0x789e, 0x78a0, + 0x78a2, 0x78a4, 0x78a6, 0x78a8, 0x78a9, 0x78aa, 0x78ab, 0x78ac, + 0x78ad, 0x78ae, 0x78af, 0x78b5, 0x78b6, 0x78b7, 0x78b8, 0x78ba, + 0x78bb, 0x78bc, 0x78bd, 0x78bf, 0x78c0, 0x78c2, 0x78c3, 0x78c4, + 0x78c6, 0x78c7, 0x78c8, 0x78cc, 0x78cd, 0x78ce, 0x78cf, 0x78d1, + 0x78d2, 0x78d3, 0x78d6, 0x78d7, 0x78d8, 0x78da, 0x78db, 0x78dc, + 0x78dd, 0x78de, 0x78df, 0x78e0, 0x78e1, 0x78e2, 0x78e3, 0x78e4, + 0x78e5, 0x78e6, 0x78e7, 0x78e9, 0x78ea, 0x78eb, 0x78ed, 0x78ee, + 0x78ef, 0x78f0, 0x78f1, 0x78f3, 0x78f5, 0x78f6, 0x78f8, 0x78f9, + 0x78fb, 0x78fc, 0x78fd, 0x78fe, 0x78ff, 0x7900, 0x7902, 0x7903, + 0x7904, 0x7906, 0x7907, 0x7908, 0x7909, 0x790a, 0x790b, 0x790c, + 0x7840, 0x50a8, 0x77d7, 0x6410, 0x89e6, 0x5904, 0x63e3, 0x5ddd, + 0x7a7f, 0x693d, 0x4f20, 0x8239, 0x5598, 0x4e32, 0x75ae, 0x7a97, + 0x5e62, 0x5e8a, 0x95ef, 0x521b, 0x5439, 0x708a, 0x6376, 0x9524, + 0x5782, 0x6625, 0x693f, 0x9187, 0x5507, 0x6df3, 0x7eaf, 0x8822, + 0x6233, 0x7ef0, 0x75b5, 0x8328, 0x78c1, 0x96cc, 0x8f9e, 0x6148, + 0x74f7, 0x8bcd, 0x6b64, 0x523a, 0x8d50, 0x6b21, 0x806a, 0x8471, + 0x56f1, 0x5306, 0x4ece, 0x4e1b, 0x51d1, 0x7c97, 0x918b, 0x7c07, + 0x4fc3, 0x8e7f, 0x7be1, 0x7a9c, 0x6467, 0x5d14, 0x50ac, 0x8106, + 0x7601, 0x7cb9, 0x6dec, 0x7fe0, 0x6751, 0x5b58, 0x5bf8, 0x78cb, + 0x64ae, 0x6413, 0x63aa, 0x632b, 0x9519, 0x642d, 0x8fbe, 0x7b54, + 0x7629, 0x6253, 0x5927, 0x5446, 0x6b79, 0x50a3, 0x6234, 0x5e26, + 0x6b86, 0x4ee3, 0x8d37, 0x888b, 0x5f85, 0x902e, + /* 0xb5 */ + 0x790d, 0x790e, 0x790f, 0x7910, 0x7911, 0x7912, 0x7914, 0x7915, + 0x7916, 0x7917, 0x7918, 0x7919, 0x791a, 0x791b, 0x791c, 0x791d, + 0x791f, 0x7920, 0x7921, 0x7922, 0x7923, 0x7925, 0x7926, 0x7927, + 0x7928, 0x7929, 0x792a, 0x792b, 0x792c, 0x792d, 0x792e, 0x792f, + 0x7930, 0x7931, 0x7932, 0x7933, 0x7935, 0x7936, 0x7937, 0x7938, + 0x7939, 0x793d, 0x793f, 0x7942, 0x7943, 0x7944, 0x7945, 0x7947, + 0x794a, 0x794b, 0x794c, 0x794d, 0x794e, 0x794f, 0x7950, 0x7951, + 0x7952, 0x7954, 0x7955, 0x7958, 0x7959, 0x7961, 0x7963, 0x7964, + 0x7966, 0x7969, 0x796a, 0x796b, 0x796c, 0x796e, 0x7970, 0x7971, + 0x7972, 0x7973, 0x7974, 0x7975, 0x7976, 0x7979, 0x797b, 0x797c, + 0x797d, 0x797e, 0x797f, 0x7982, 0x7983, 0x7986, 0x7987, 0x7988, + 0x7989, 0x798b, 0x798c, 0x798d, 0x798e, 0x7990, 0x7991, 0x7992, + 0x6020, 0x803d, 0x62c5, 0x4e39, 0x5355, 0x90f8, 0x63b8, 0x80c6, + 0x65e6, 0x6c2e, 0x4f46, 0x60ee, 0x6de1, 0x8bde, 0x5f39, 0x86cb, + 0x5f53, 0x6321, 0x515a, 0x8361, 0x6863, 0x5200, 0x6363, 0x8e48, + 0x5012, 0x5c9b, 0x7977, 0x5bfc, 0x5230, 0x7a3b, 0x60bc, 0x9053, + 0x76d7, 0x5fb7, 0x5f97, 0x7684, 0x8e6c, 0x706f, 0x767b, 0x7b49, + 0x77aa, 0x51f3, 0x9093, 0x5824, 0x4f4e, 0x6ef4, 0x8fea, 0x654c, + 0x7b1b, 0x72c4, 0x6da4, 0x7fdf, 0x5ae1, 0x62b5, 0x5e95, 0x5730, + 0x8482, 0x7b2c, 0x5e1d, 0x5f1f, 0x9012, 0x7f14, 0x98a0, 0x6382, + 0x6ec7, 0x7898, 0x70b9, 0x5178, 0x975b, 0x57ab, 0x7535, 0x4f43, + 0x7538, 0x5e97, 0x60e6, 0x5960, 0x6dc0, 0x6bbf, 0x7889, 0x53fc, + 0x96d5, 0x51cb, 0x5201, 0x6389, 0x540a, 0x9493, 0x8c03, 0x8dcc, + 0x7239, 0x789f, 0x8776, 0x8fed, 0x8c0d, 0x53e0, + /* 0xb6 */ + 0x7993, 0x7994, 0x7995, 0x7996, 0x7997, 0x7998, 0x7999, 0x799b, + 0x799c, 0x799d, 0x799e, 0x799f, 0x79a0, 0x79a1, 0x79a2, 0x79a3, + 0x79a4, 0x79a5, 0x79a6, 0x79a8, 0x79a9, 0x79aa, 0x79ab, 0x79ac, + 0x79ad, 0x79ae, 0x79af, 0x79b0, 0x79b1, 0x79b2, 0x79b4, 0x79b5, + 0x79b6, 0x79b7, 0x79b8, 0x79bc, 0x79bf, 0x79c2, 0x79c4, 0x79c5, + 0x79c7, 0x79c8, 0x79ca, 0x79cc, 0x79ce, 0x79cf, 0x79d0, 0x79d3, + 0x79d4, 0x79d6, 0x79d7, 0x79d9, 0x79da, 0x79db, 0x79dc, 0x79dd, + 0x79de, 0x79e0, 0x79e1, 0x79e2, 0x79e5, 0x79e8, 0x79ea, 0x79ec, + 0x79ee, 0x79f1, 0x79f2, 0x79f3, 0x79f4, 0x79f5, 0x79f6, 0x79f7, + 0x79f9, 0x79fa, 0x79fc, 0x79fe, 0x79ff, 0x7a01, 0x7a04, 0x7a05, + 0x7a07, 0x7a08, 0x7a09, 0x7a0a, 0x7a0c, 0x7a0f, 0x7a10, 0x7a11, + 0x7a12, 0x7a13, 0x7a15, 0x7a16, 0x7a18, 0x7a19, 0x7a1b, 0x7a1c, + 0x4e01, 0x76ef, 0x53ee, 0x9489, 0x9876, 0x9f0e, 0x952d, 0x5b9a, + 0x8ba2, 0x4e22, 0x4e1c, 0x51ac, 0x8463, 0x61c2, 0x52a8, 0x680b, + 0x4f97, 0x606b, 0x51bb, 0x6d1e, 0x515c, 0x6296, 0x6597, 0x9661, + 0x8c46, 0x9017, 0x75d8, 0x90fd, 0x7763, 0x6bd2, 0x728a, 0x72ec, + 0x8bfb, 0x5835, 0x7779, 0x8d4c, 0x675c, 0x9540, 0x809a, 0x5ea6, + 0x6e21, 0x5992, 0x7aef, 0x77ed, 0x953b, 0x6bb5, 0x65ad, 0x7f0e, + 0x5806, 0x5151, 0x961f, 0x5bf9, 0x58a9, 0x5428, 0x8e72, 0x6566, + 0x987f, 0x56e4, 0x949d, 0x76fe, 0x9041, 0x6387, 0x54c6, 0x591a, + 0x593a, 0x579b, 0x8eb2, 0x6735, 0x8dfa, 0x8235, 0x5241, 0x60f0, + 0x5815, 0x86fe, 0x5ce8, 0x9e45, 0x4fc4, 0x989d, 0x8bb9, 0x5a25, + 0x6076, 0x5384, 0x627c, 0x904f, 0x9102, 0x997f, 0x6069, 0x800c, + 0x513f, 0x8033, 0x5c14, 0x9975, 0x6d31, 0x4e8c, + /* 0xb7 */ + 0x7a1d, 0x7a1f, 0x7a21, 0x7a22, 0x7a24, 0x7a25, 0x7a26, 0x7a27, + 0x7a28, 0x7a29, 0x7a2a, 0x7a2b, 0x7a2c, 0x7a2d, 0x7a2e, 0x7a2f, + 0x7a30, 0x7a31, 0x7a32, 0x7a34, 0x7a35, 0x7a36, 0x7a38, 0x7a3a, + 0x7a3e, 0x7a40, 0x7a41, 0x7a42, 0x7a43, 0x7a44, 0x7a45, 0x7a47, + 0x7a48, 0x7a49, 0x7a4a, 0x7a4b, 0x7a4c, 0x7a4d, 0x7a4e, 0x7a4f, + 0x7a50, 0x7a52, 0x7a53, 0x7a54, 0x7a55, 0x7a56, 0x7a58, 0x7a59, + 0x7a5a, 0x7a5b, 0x7a5c, 0x7a5d, 0x7a5e, 0x7a5f, 0x7a60, 0x7a61, + 0x7a62, 0x7a63, 0x7a64, 0x7a65, 0x7a66, 0x7a67, 0x7a68, 0x7a69, + 0x7a6a, 0x7a6b, 0x7a6c, 0x7a6d, 0x7a6e, 0x7a6f, 0x7a71, 0x7a72, + 0x7a73, 0x7a75, 0x7a7b, 0x7a7c, 0x7a7d, 0x7a7e, 0x7a82, 0x7a85, + 0x7a87, 0x7a89, 0x7a8a, 0x7a8b, 0x7a8c, 0x7a8e, 0x7a8f, 0x7a90, + 0x7a93, 0x7a94, 0x7a99, 0x7a9a, 0x7a9b, 0x7a9e, 0x7aa1, 0x7aa2, + 0x8d30, 0x53d1, 0x7f5a, 0x7b4f, 0x4f10, 0x4e4f, 0x9600, 0x6cd5, + 0x73d0, 0x85e9, 0x5e06, 0x756a, 0x7ffb, 0x6a0a, 0x77fe, 0x9492, + 0x7e41, 0x51e1, 0x70e6, 0x53cd, 0x8fd4, 0x8303, 0x8d29, 0x72af, + 0x996d, 0x6cdb, 0x574a, 0x82b3, 0x65b9, 0x80aa, 0x623f, 0x9632, + 0x59a8, 0x4eff, 0x8bbf, 0x7eba, 0x653e, 0x83f2, 0x975e, 0x5561, + 0x98de, 0x80a5, 0x532a, 0x8bfd, 0x5420, 0x80ba, 0x5e9f, 0x6cb8, + 0x8d39, 0x82ac, 0x915a, 0x5429, 0x6c1b, 0x5206, 0x7eb7, 0x575f, + 0x711a, 0x6c7e, 0x7c89, 0x594b, 0x4efd, 0x5fff, 0x6124, 0x7caa, + 0x4e30, 0x5c01, 0x67ab, 0x8702, 0x5cf0, 0x950b, 0x98ce, 0x75af, + 0x70fd, 0x9022, 0x51af, 0x7f1d, 0x8bbd, 0x5949, 0x51e4, 0x4f5b, + 0x5426, 0x592b, 0x6577, 0x80a4, 0x5b75, 0x6276, 0x62c2, 0x8f90, + 0x5e45, 0x6c1f, 0x7b26, 0x4f0f, 0x4fd8, 0x670d, + /* 0xb8 */ + 0x7aa3, 0x7aa4, 0x7aa7, 0x7aa9, 0x7aaa, 0x7aab, 0x7aae, 0x7aaf, + 0x7ab0, 0x7ab1, 0x7ab2, 0x7ab4, 0x7ab5, 0x7ab6, 0x7ab7, 0x7ab8, + 0x7ab9, 0x7aba, 0x7abb, 0x7abc, 0x7abd, 0x7abe, 0x7ac0, 0x7ac1, + 0x7ac2, 0x7ac3, 0x7ac4, 0x7ac5, 0x7ac6, 0x7ac7, 0x7ac8, 0x7ac9, + 0x7aca, 0x7acc, 0x7acd, 0x7ace, 0x7acf, 0x7ad0, 0x7ad1, 0x7ad2, + 0x7ad3, 0x7ad4, 0x7ad5, 0x7ad7, 0x7ad8, 0x7ada, 0x7adb, 0x7adc, + 0x7add, 0x7ae1, 0x7ae2, 0x7ae4, 0x7ae7, 0x7ae8, 0x7ae9, 0x7aea, + 0x7aeb, 0x7aec, 0x7aee, 0x7af0, 0x7af1, 0x7af2, 0x7af3, 0x7af4, + 0x7af5, 0x7af6, 0x7af7, 0x7af8, 0x7afb, 0x7afc, 0x7afe, 0x7b00, + 0x7b01, 0x7b02, 0x7b05, 0x7b07, 0x7b09, 0x7b0c, 0x7b0d, 0x7b0e, + 0x7b10, 0x7b12, 0x7b13, 0x7b16, 0x7b17, 0x7b18, 0x7b1a, 0x7b1c, + 0x7b1d, 0x7b1f, 0x7b21, 0x7b22, 0x7b23, 0x7b27, 0x7b29, 0x7b2d, + 0x6d6e, 0x6daa, 0x798f, 0x88b1, 0x5f17, 0x752b, 0x629a, 0x8f85, + 0x4fef, 0x91dc, 0x65a7, 0x812f, 0x8151, 0x5e9c, 0x8150, 0x8d74, + 0x526f, 0x8986, 0x8d4b, 0x590d, 0x5085, 0x4ed8, 0x961c, 0x7236, + 0x8179, 0x8d1f, 0x5bcc, 0x8ba3, 0x9644, 0x5987, 0x7f1a, 0x5490, + 0x5676, 0x560e, 0x8be5, 0x6539, 0x6982, 0x9499, 0x76d6, 0x6e89, + 0x5e72, 0x7518, 0x6746, 0x67d1, 0x7aff, 0x809d, 0x8d76, 0x611f, + 0x79c6, 0x6562, 0x8d63, 0x5188, 0x521a, 0x94a2, 0x7f38, 0x809b, + 0x7eb2, 0x5c97, 0x6e2f, 0x6760, 0x7bd9, 0x768b, 0x9ad8, 0x818f, + 0x7f94, 0x7cd5, 0x641e, 0x9550, 0x7a3f, 0x544a, 0x54e5, 0x6b4c, + 0x6401, 0x6208, 0x9e3d, 0x80f3, 0x7599, 0x5272, 0x9769, 0x845b, + 0x683c, 0x86e4, 0x9601, 0x9694, 0x94ec, 0x4e2a, 0x5404, 0x7ed9, + 0x6839, 0x8ddf, 0x8015, 0x66f4, 0x5e9a, 0x7fb9, + /* 0xb9 */ + 0x7b2f, 0x7b30, 0x7b32, 0x7b34, 0x7b35, 0x7b36, 0x7b37, 0x7b39, + 0x7b3b, 0x7b3d, 0x7b3f, 0x7b40, 0x7b41, 0x7b42, 0x7b43, 0x7b44, + 0x7b46, 0x7b48, 0x7b4a, 0x7b4d, 0x7b4e, 0x7b53, 0x7b55, 0x7b57, + 0x7b59, 0x7b5c, 0x7b5e, 0x7b5f, 0x7b61, 0x7b63, 0x7b64, 0x7b65, + 0x7b66, 0x7b67, 0x7b68, 0x7b69, 0x7b6a, 0x7b6b, 0x7b6c, 0x7b6d, + 0x7b6f, 0x7b70, 0x7b73, 0x7b74, 0x7b76, 0x7b78, 0x7b7a, 0x7b7c, + 0x7b7d, 0x7b7f, 0x7b81, 0x7b82, 0x7b83, 0x7b84, 0x7b86, 0x7b87, + 0x7b88, 0x7b89, 0x7b8a, 0x7b8b, 0x7b8c, 0x7b8e, 0x7b8f, 0x7b91, + 0x7b92, 0x7b93, 0x7b96, 0x7b98, 0x7b99, 0x7b9a, 0x7b9b, 0x7b9e, + 0x7b9f, 0x7ba0, 0x7ba3, 0x7ba4, 0x7ba5, 0x7bae, 0x7baf, 0x7bb0, + 0x7bb2, 0x7bb3, 0x7bb5, 0x7bb6, 0x7bb7, 0x7bb9, 0x7bba, 0x7bbb, + 0x7bbc, 0x7bbd, 0x7bbe, 0x7bbf, 0x7bc0, 0x7bc2, 0x7bc3, 0x7bc4, + 0x57c2, 0x803f, 0x6897, 0x5de5, 0x653b, 0x529f, 0x606d, 0x9f9a, + 0x4f9b, 0x8eac, 0x516c, 0x5bab, 0x5f13, 0x5de9, 0x6c5e, 0x62f1, + 0x8d21, 0x5171, 0x94a9, 0x52fe, 0x6c9f, 0x82df, 0x72d7, 0x57a2, + 0x6784, 0x8d2d, 0x591f, 0x8f9c, 0x83c7, 0x5495, 0x7b8d, 0x4f30, + 0x6cbd, 0x5b64, 0x59d1, 0x9f13, 0x53e4, 0x86ca, 0x9aa8, 0x8c37, + 0x80a1, 0x6545, 0x987e, 0x56fa, 0x96c7, 0x522e, 0x74dc, 0x5250, + 0x5be1, 0x6302, 0x8902, 0x4e56, 0x62d0, 0x602a, 0x68fa, 0x5173, + 0x5b98, 0x51a0, 0x89c2, 0x7ba1, 0x9986, 0x7f50, 0x60ef, 0x704c, + 0x8d2f, 0x5149, 0x5e7f, 0x901b, 0x7470, 0x89c4, 0x572d, 0x7845, + 0x5f52, 0x9f9f, 0x95fa, 0x8f68, 0x9b3c, 0x8be1, 0x7678, 0x6842, + 0x67dc, 0x8dea, 0x8d35, 0x523d, 0x8f8a, 0x6eda, 0x68cd, 0x9505, + 0x90ed, 0x56fd, 0x679c, 0x88f9, 0x8fc7, 0x54c8, + /* 0xba */ + 0x7bc5, 0x7bc8, 0x7bc9, 0x7bca, 0x7bcb, 0x7bcd, 0x7bce, 0x7bcf, + 0x7bd0, 0x7bd2, 0x7bd4, 0x7bd5, 0x7bd6, 0x7bd7, 0x7bd8, 0x7bdb, + 0x7bdc, 0x7bde, 0x7bdf, 0x7be0, 0x7be2, 0x7be3, 0x7be4, 0x7be7, + 0x7be8, 0x7be9, 0x7beb, 0x7bec, 0x7bed, 0x7bef, 0x7bf0, 0x7bf2, + 0x7bf3, 0x7bf4, 0x7bf5, 0x7bf6, 0x7bf8, 0x7bf9, 0x7bfa, 0x7bfb, + 0x7bfd, 0x7bff, 0x7c00, 0x7c01, 0x7c02, 0x7c03, 0x7c04, 0x7c05, + 0x7c06, 0x7c08, 0x7c09, 0x7c0a, 0x7c0d, 0x7c0e, 0x7c10, 0x7c11, + 0x7c12, 0x7c13, 0x7c14, 0x7c15, 0x7c17, 0x7c18, 0x7c19, 0x7c1a, + 0x7c1b, 0x7c1c, 0x7c1d, 0x7c1e, 0x7c20, 0x7c21, 0x7c22, 0x7c23, + 0x7c24, 0x7c25, 0x7c28, 0x7c29, 0x7c2b, 0x7c2c, 0x7c2d, 0x7c2e, + 0x7c2f, 0x7c30, 0x7c31, 0x7c32, 0x7c33, 0x7c34, 0x7c35, 0x7c36, + 0x7c37, 0x7c39, 0x7c3a, 0x7c3b, 0x7c3c, 0x7c3d, 0x7c3e, 0x7c42, + 0x9ab8, 0x5b69, 0x6d77, 0x6c26, 0x4ea5, 0x5bb3, 0x9a87, 0x9163, + 0x61a8, 0x90af, 0x97e9, 0x542b, 0x6db5, 0x5bd2, 0x51fd, 0x558a, + 0x7f55, 0x7ff0, 0x64bc, 0x634d, 0x65f1, 0x61be, 0x608d, 0x710a, + 0x6c57, 0x6c49, 0x592f, 0x676d, 0x822a, 0x58d5, 0x568e, 0x8c6a, + 0x6beb, 0x90dd, 0x597d, 0x8017, 0x53f7, 0x6d69, 0x5475, 0x559d, + 0x8377, 0x83cf, 0x6838, 0x79be, 0x548c, 0x4f55, 0x5408, 0x76d2, + 0x8c89, 0x9602, 0x6cb3, 0x6db8, 0x8d6b, 0x8910, 0x9e64, 0x8d3a, + 0x563f, 0x9ed1, 0x75d5, 0x5f88, 0x72e0, 0x6068, 0x54fc, 0x4ea8, + 0x6a2a, 0x8861, 0x6052, 0x8f70, 0x54c4, 0x70d8, 0x8679, 0x9e3f, + 0x6d2a, 0x5b8f, 0x5f18, 0x7ea2, 0x5589, 0x4faf, 0x7334, 0x543c, + 0x539a, 0x5019, 0x540e, 0x547c, 0x4e4e, 0x5ffd, 0x745a, 0x58f6, + 0x846b, 0x80e1, 0x8774, 0x72d0, 0x7cca, 0x6e56, + /* 0xbb */ + 0x7c43, 0x7c44, 0x7c45, 0x7c46, 0x7c47, 0x7c48, 0x7c49, 0x7c4a, + 0x7c4b, 0x7c4c, 0x7c4e, 0x7c4f, 0x7c50, 0x7c51, 0x7c52, 0x7c53, + 0x7c54, 0x7c55, 0x7c56, 0x7c57, 0x7c58, 0x7c59, 0x7c5a, 0x7c5b, + 0x7c5c, 0x7c5d, 0x7c5e, 0x7c5f, 0x7c60, 0x7c61, 0x7c62, 0x7c63, + 0x7c64, 0x7c65, 0x7c66, 0x7c67, 0x7c68, 0x7c69, 0x7c6a, 0x7c6b, + 0x7c6c, 0x7c6d, 0x7c6e, 0x7c6f, 0x7c70, 0x7c71, 0x7c72, 0x7c75, + 0x7c76, 0x7c77, 0x7c78, 0x7c79, 0x7c7a, 0x7c7e, 0x7c7f, 0x7c80, + 0x7c81, 0x7c82, 0x7c83, 0x7c84, 0x7c85, 0x7c86, 0x7c87, 0x7c88, + 0x7c8a, 0x7c8b, 0x7c8c, 0x7c8d, 0x7c8e, 0x7c8f, 0x7c90, 0x7c93, + 0x7c94, 0x7c96, 0x7c99, 0x7c9a, 0x7c9b, 0x7ca0, 0x7ca1, 0x7ca3, + 0x7ca6, 0x7ca7, 0x7ca8, 0x7ca9, 0x7cab, 0x7cac, 0x7cad, 0x7caf, + 0x7cb0, 0x7cb4, 0x7cb5, 0x7cb6, 0x7cb7, 0x7cb8, 0x7cba, 0x7cbb, + 0x5f27, 0x864e, 0x552c, 0x62a4, 0x4e92, 0x6caa, 0x6237, 0x82b1, + 0x54d7, 0x534e, 0x733e, 0x6ed1, 0x753b, 0x5212, 0x5316, 0x8bdd, + 0x69d0, 0x5f8a, 0x6000, 0x6dee, 0x574f, 0x6b22, 0x73af, 0x6853, + 0x8fd8, 0x7f13, 0x6362, 0x60a3, 0x5524, 0x75ea, 0x8c62, 0x7115, + 0x6da3, 0x5ba6, 0x5e7b, 0x8352, 0x614c, 0x9ec4, 0x78fa, 0x8757, + 0x7c27, 0x7687, 0x51f0, 0x60f6, 0x714c, 0x6643, 0x5e4c, 0x604d, + 0x8c0e, 0x7070, 0x6325, 0x8f89, 0x5fbd, 0x6062, 0x86d4, 0x56de, + 0x6bc1, 0x6094, 0x6167, 0x5349, 0x60e0, 0x6666, 0x8d3f, 0x79fd, + 0x4f1a, 0x70e9, 0x6c47, 0x8bb3, 0x8bf2, 0x7ed8, 0x8364, 0x660f, + 0x5a5a, 0x9b42, 0x6d51, 0x6df7, 0x8c41, 0x6d3b, 0x4f19, 0x706b, + 0x83b7, 0x6216, 0x60d1, 0x970d, 0x8d27, 0x7978, 0x51fb, 0x573e, + 0x57fa, 0x673a, 0x7578, 0x7a3d, 0x79ef, 0x7b95, + /* 0xbc */ + 0x7cbf, 0x7cc0, 0x7cc2, 0x7cc3, 0x7cc4, 0x7cc6, 0x7cc9, 0x7ccb, + 0x7cce, 0x7ccf, 0x7cd0, 0x7cd1, 0x7cd2, 0x7cd3, 0x7cd4, 0x7cd8, + 0x7cda, 0x7cdb, 0x7cdd, 0x7cde, 0x7ce1, 0x7ce2, 0x7ce3, 0x7ce4, + 0x7ce5, 0x7ce6, 0x7ce7, 0x7ce9, 0x7cea, 0x7ceb, 0x7cec, 0x7ced, + 0x7cee, 0x7cf0, 0x7cf1, 0x7cf2, 0x7cf3, 0x7cf4, 0x7cf5, 0x7cf6, + 0x7cf7, 0x7cf9, 0x7cfa, 0x7cfc, 0x7cfd, 0x7cfe, 0x7cff, 0x7d00, + 0x7d01, 0x7d02, 0x7d03, 0x7d04, 0x7d05, 0x7d06, 0x7d07, 0x7d08, + 0x7d09, 0x7d0b, 0x7d0c, 0x7d0d, 0x7d0e, 0x7d0f, 0x7d10, 0x7d11, + 0x7d12, 0x7d13, 0x7d14, 0x7d15, 0x7d16, 0x7d17, 0x7d18, 0x7d19, + 0x7d1a, 0x7d1b, 0x7d1c, 0x7d1d, 0x7d1e, 0x7d1f, 0x7d21, 0x7d23, + 0x7d24, 0x7d25, 0x7d26, 0x7d28, 0x7d29, 0x7d2a, 0x7d2c, 0x7d2d, + 0x7d2e, 0x7d30, 0x7d31, 0x7d32, 0x7d33, 0x7d34, 0x7d35, 0x7d36, + 0x808c, 0x9965, 0x8ff9, 0x6fc0, 0x8ba5, 0x9e21, 0x59ec, 0x7ee9, + 0x7f09, 0x5409, 0x6781, 0x68d8, 0x8f91, 0x7c4d, 0x96c6, 0x53ca, + 0x6025, 0x75be, 0x6c72, 0x5373, 0x5ac9, 0x7ea7, 0x6324, 0x51e0, + 0x810a, 0x5df1, 0x84df, 0x6280, 0x5180, 0x5b63, 0x4f0e, 0x796d, + 0x5242, 0x60b8, 0x6d4e, 0x5bc4, 0x5bc2, 0x8ba1, 0x8bb0, 0x65e2, + 0x5fcc, 0x9645, 0x5993, 0x7ee7, 0x7eaa, 0x5609, 0x67b7, 0x5939, + 0x4f73, 0x5bb6, 0x52a0, 0x835a, 0x988a, 0x8d3e, 0x7532, 0x94be, + 0x5047, 0x7a3c, 0x4ef7, 0x67b6, 0x9a7e, 0x5ac1, 0x6b7c, 0x76d1, + 0x575a, 0x5c16, 0x7b3a, 0x95f4, 0x714e, 0x517c, 0x80a9, 0x8270, + 0x5978, 0x7f04, 0x8327, 0x68c0, 0x67ec, 0x78b1, 0x7877, 0x62e3, + 0x6361, 0x7b80, 0x4fed, 0x526a, 0x51cf, 0x8350, 0x69db, 0x9274, + 0x8df5, 0x8d31, 0x89c1, 0x952e, 0x7bad, 0x4ef6, + /* 0xbd */ + 0x7d37, 0x7d38, 0x7d39, 0x7d3a, 0x7d3b, 0x7d3c, 0x7d3d, 0x7d3e, + 0x7d3f, 0x7d40, 0x7d41, 0x7d42, 0x7d43, 0x7d44, 0x7d45, 0x7d46, + 0x7d47, 0x7d48, 0x7d49, 0x7d4a, 0x7d4b, 0x7d4c, 0x7d4d, 0x7d4e, + 0x7d4f, 0x7d50, 0x7d51, 0x7d52, 0x7d53, 0x7d54, 0x7d55, 0x7d56, + 0x7d57, 0x7d58, 0x7d59, 0x7d5a, 0x7d5b, 0x7d5c, 0x7d5d, 0x7d5e, + 0x7d5f, 0x7d60, 0x7d61, 0x7d62, 0x7d63, 0x7d64, 0x7d65, 0x7d66, + 0x7d67, 0x7d68, 0x7d69, 0x7d6a, 0x7d6b, 0x7d6c, 0x7d6d, 0x7d6f, + 0x7d70, 0x7d71, 0x7d72, 0x7d73, 0x7d74, 0x7d75, 0x7d76, 0x7d78, + 0x7d79, 0x7d7a, 0x7d7b, 0x7d7c, 0x7d7d, 0x7d7e, 0x7d7f, 0x7d80, + 0x7d81, 0x7d82, 0x7d83, 0x7d84, 0x7d85, 0x7d86, 0x7d87, 0x7d88, + 0x7d89, 0x7d8a, 0x7d8b, 0x7d8c, 0x7d8d, 0x7d8e, 0x7d8f, 0x7d90, + 0x7d91, 0x7d92, 0x7d93, 0x7d94, 0x7d95, 0x7d96, 0x7d97, 0x7d98, + 0x5065, 0x8230, 0x5251, 0x996f, 0x6e10, 0x6e85, 0x6da7, 0x5efa, + 0x50f5, 0x59dc, 0x5c06, 0x6d46, 0x6c5f, 0x7586, 0x848b, 0x6868, + 0x5956, 0x8bb2, 0x5320, 0x9171, 0x964d, 0x8549, 0x6912, 0x7901, + 0x7126, 0x80f6, 0x4ea4, 0x90ca, 0x6d47, 0x9a84, 0x5a07, 0x56bc, + 0x6405, 0x94f0, 0x77eb, 0x4fa5, 0x811a, 0x72e1, 0x89d2, 0x997a, + 0x7f34, 0x7ede, 0x527f, 0x6559, 0x9175, 0x8f7f, 0x8f83, 0x53eb, + 0x7a96, 0x63ed, 0x63a5, 0x7686, 0x79f8, 0x8857, 0x9636, 0x622a, + 0x52ab, 0x8282, 0x6854, 0x6770, 0x6377, 0x776b, 0x7aed, 0x6d01, + 0x7ed3, 0x89e3, 0x59d0, 0x6212, 0x85c9, 0x82a5, 0x754c, 0x501f, + 0x4ecb, 0x75a5, 0x8beb, 0x5c4a, 0x5dfe, 0x7b4b, 0x65a4, 0x91d1, + 0x4eca, 0x6d25, 0x895f, 0x7d27, 0x9526, 0x4ec5, 0x8c28, 0x8fdb, + 0x9773, 0x664b, 0x7981, 0x8fd1, 0x70ec, 0x6d78, + /* 0xbe */ + 0x7d99, 0x7d9a, 0x7d9b, 0x7d9c, 0x7d9d, 0x7d9e, 0x7d9f, 0x7da0, + 0x7da1, 0x7da2, 0x7da3, 0x7da4, 0x7da5, 0x7da7, 0x7da8, 0x7da9, + 0x7daa, 0x7dab, 0x7dac, 0x7dad, 0x7daf, 0x7db0, 0x7db1, 0x7db2, + 0x7db3, 0x7db4, 0x7db5, 0x7db6, 0x7db7, 0x7db8, 0x7db9, 0x7dba, + 0x7dbb, 0x7dbc, 0x7dbd, 0x7dbe, 0x7dbf, 0x7dc0, 0x7dc1, 0x7dc2, + 0x7dc3, 0x7dc4, 0x7dc5, 0x7dc6, 0x7dc7, 0x7dc8, 0x7dc9, 0x7dca, + 0x7dcb, 0x7dcc, 0x7dcd, 0x7dce, 0x7dcf, 0x7dd0, 0x7dd1, 0x7dd2, + 0x7dd3, 0x7dd4, 0x7dd5, 0x7dd6, 0x7dd7, 0x7dd8, 0x7dd9, 0x7dda, + 0x7ddb, 0x7ddc, 0x7ddd, 0x7dde, 0x7ddf, 0x7de0, 0x7de1, 0x7de2, + 0x7de3, 0x7de4, 0x7de5, 0x7de6, 0x7de7, 0x7de8, 0x7de9, 0x7dea, + 0x7deb, 0x7dec, 0x7ded, 0x7dee, 0x7def, 0x7df0, 0x7df1, 0x7df2, + 0x7df3, 0x7df4, 0x7df5, 0x7df6, 0x7df7, 0x7df8, 0x7df9, 0x7dfa, + 0x5c3d, 0x52b2, 0x8346, 0x5162, 0x830e, 0x775b, 0x6676, 0x9cb8, + 0x4eac, 0x60ca, 0x7cbe, 0x7cb3, 0x7ecf, 0x4e95, 0x8b66, 0x666f, + 0x9888, 0x9759, 0x5883, 0x656c, 0x955c, 0x5f84, 0x75c9, 0x9756, + 0x7adf, 0x7ade, 0x51c0, 0x70af, 0x7a98, 0x63ea, 0x7a76, 0x7ea0, + 0x7396, 0x97ed, 0x4e45, 0x7078, 0x4e5d, 0x9152, 0x53a9, 0x6551, + 0x65e7, 0x81fc, 0x8205, 0x548e, 0x5c31, 0x759a, 0x97a0, 0x62d8, + 0x72d9, 0x75bd, 0x5c45, 0x9a79, 0x83ca, 0x5c40, 0x5480, 0x77e9, + 0x4e3e, 0x6cae, 0x805a, 0x62d2, 0x636e, 0x5de8, 0x5177, 0x8ddd, + 0x8e1e, 0x952f, 0x4ff1, 0x53e5, 0x60e7, 0x70ac, 0x5267, 0x6350, + 0x9e43, 0x5a1f, 0x5026, 0x7737, 0x5377, 0x7ee2, 0x6485, 0x652b, + 0x6289, 0x6398, 0x5014, 0x7235, 0x89c9, 0x51b3, 0x8bc0, 0x7edd, + 0x5747, 0x83cc, 0x94a7, 0x519b, 0x541b, 0x5cfb, + /* 0xbf */ + 0x7dfb, 0x7dfc, 0x7dfd, 0x7dfe, 0x7dff, 0x7e00, 0x7e01, 0x7e02, + 0x7e03, 0x7e04, 0x7e05, 0x7e06, 0x7e07, 0x7e08, 0x7e09, 0x7e0a, + 0x7e0b, 0x7e0c, 0x7e0d, 0x7e0e, 0x7e0f, 0x7e10, 0x7e11, 0x7e12, + 0x7e13, 0x7e14, 0x7e15, 0x7e16, 0x7e17, 0x7e18, 0x7e19, 0x7e1a, + 0x7e1b, 0x7e1c, 0x7e1d, 0x7e1e, 0x7e1f, 0x7e20, 0x7e21, 0x7e22, + 0x7e23, 0x7e24, 0x7e25, 0x7e26, 0x7e27, 0x7e28, 0x7e29, 0x7e2a, + 0x7e2b, 0x7e2c, 0x7e2d, 0x7e2e, 0x7e2f, 0x7e30, 0x7e31, 0x7e32, + 0x7e33, 0x7e34, 0x7e35, 0x7e36, 0x7e37, 0x7e38, 0x7e39, 0x7e3a, + 0x7e3c, 0x7e3d, 0x7e3e, 0x7e3f, 0x7e40, 0x7e42, 0x7e43, 0x7e44, + 0x7e45, 0x7e46, 0x7e48, 0x7e49, 0x7e4a, 0x7e4b, 0x7e4c, 0x7e4d, + 0x7e4e, 0x7e4f, 0x7e50, 0x7e51, 0x7e52, 0x7e53, 0x7e54, 0x7e55, + 0x7e56, 0x7e57, 0x7e58, 0x7e59, 0x7e5a, 0x7e5b, 0x7e5c, 0x7e5d, + 0x4fca, 0x7ae3, 0x6d5a, 0x90e1, 0x9a8f, 0x5580, 0x5496, 0x5361, + 0x54af, 0x5f00, 0x63e9, 0x6977, 0x51ef, 0x6168, 0x520a, 0x582a, + 0x52d8, 0x574e, 0x780d, 0x770b, 0x5eb7, 0x6177, 0x7ce0, 0x625b, + 0x6297, 0x4ea2, 0x7095, 0x8003, 0x62f7, 0x70e4, 0x9760, 0x5777, + 0x82db, 0x67ef, 0x68f5, 0x78d5, 0x9897, 0x79d1, 0x58f3, 0x54b3, + 0x53ef, 0x6e34, 0x514b, 0x523b, 0x5ba2, 0x8bfe, 0x80af, 0x5543, + 0x57a6, 0x6073, 0x5751, 0x542d, 0x7a7a, 0x6050, 0x5b54, 0x63a7, + 0x62a0, 0x53e3, 0x6263, 0x5bc7, 0x67af, 0x54ed, 0x7a9f, 0x82e6, + 0x9177, 0x5e93, 0x88e4, 0x5938, 0x57ae, 0x630e, 0x8de8, 0x80ef, + 0x5757, 0x7b77, 0x4fa9, 0x5feb, 0x5bbd, 0x6b3e, 0x5321, 0x7b50, + 0x72c2, 0x6846, 0x77ff, 0x7736, 0x65f7, 0x51b5, 0x4e8f, 0x76d4, + 0x5cbf, 0x7aa5, 0x8475, 0x594e, 0x9b41, 0x5080, + /* 0xc0 */ + 0x7e5e, 0x7e5f, 0x7e60, 0x7e61, 0x7e62, 0x7e63, 0x7e64, 0x7e65, + 0x7e66, 0x7e67, 0x7e68, 0x7e69, 0x7e6a, 0x7e6b, 0x7e6c, 0x7e6d, + 0x7e6e, 0x7e6f, 0x7e70, 0x7e71, 0x7e72, 0x7e73, 0x7e74, 0x7e75, + 0x7e76, 0x7e77, 0x7e78, 0x7e79, 0x7e7a, 0x7e7b, 0x7e7c, 0x7e7d, + 0x7e7e, 0x7e7f, 0x7e80, 0x7e81, 0x7e83, 0x7e84, 0x7e85, 0x7e86, + 0x7e87, 0x7e88, 0x7e89, 0x7e8a, 0x7e8b, 0x7e8c, 0x7e8d, 0x7e8e, + 0x7e8f, 0x7e90, 0x7e91, 0x7e92, 0x7e93, 0x7e94, 0x7e95, 0x7e96, + 0x7e97, 0x7e98, 0x7e99, 0x7e9a, 0x7e9c, 0x7e9d, 0x7e9e, 0x7eae, + 0x7eb4, 0x7ebb, 0x7ebc, 0x7ed6, 0x7ee4, 0x7eec, 0x7ef9, 0x7f0a, + 0x7f10, 0x7f1e, 0x7f37, 0x7f39, 0x7f3b, 0x7f3c, 0x7f3d, 0x7f3e, + 0x7f3f, 0x7f40, 0x7f41, 0x7f43, 0x7f46, 0x7f47, 0x7f48, 0x7f49, + 0x7f4a, 0x7f4b, 0x7f4c, 0x7f4d, 0x7f4e, 0x7f4f, 0x7f52, 0x7f53, + 0x9988, 0x6127, 0x6e83, 0x5764, 0x6606, 0x6346, 0x56f0, 0x62ec, + 0x6269, 0x5ed3, 0x9614, 0x5783, 0x62c9, 0x5587, 0x8721, 0x814a, + 0x8fa3, 0x5566, 0x83b1, 0x6765, 0x8d56, 0x84dd, 0x5a6a, 0x680f, + 0x62e6, 0x7bee, 0x9611, 0x5170, 0x6f9c, 0x8c30, 0x63fd, 0x89c8, + 0x61d2, 0x7f06, 0x70c2, 0x6ee5, 0x7405, 0x6994, 0x72fc, 0x5eca, + 0x90ce, 0x6717, 0x6d6a, 0x635e, 0x52b3, 0x7262, 0x8001, 0x4f6c, + 0x59e5, 0x916a, 0x70d9, 0x6d9d, 0x52d2, 0x4e50, 0x96f7, 0x956d, + 0x857e, 0x78ca, 0x7d2f, 0x5121, 0x5792, 0x64c2, 0x808b, 0x7c7b, + 0x6cea, 0x68f1, 0x695e, 0x51b7, 0x5398, 0x68a8, 0x7281, 0x9ece, + 0x7bf1, 0x72f8, 0x79bb, 0x6f13, 0x7406, 0x674e, 0x91cc, 0x9ca4, + 0x793c, 0x8389, 0x8354, 0x540f, 0x6817, 0x4e3d, 0x5389, 0x52b1, + 0x783e, 0x5386, 0x5229, 0x5088, 0x4f8b, 0x4fd0, + /* 0xc1 */ + 0x7f56, 0x7f59, 0x7f5b, 0x7f5c, 0x7f5d, 0x7f5e, 0x7f60, 0x7f63, + 0x7f64, 0x7f65, 0x7f66, 0x7f67, 0x7f6b, 0x7f6c, 0x7f6d, 0x7f6f, + 0x7f70, 0x7f73, 0x7f75, 0x7f76, 0x7f77, 0x7f78, 0x7f7a, 0x7f7b, + 0x7f7c, 0x7f7d, 0x7f7f, 0x7f80, 0x7f82, 0x7f83, 0x7f84, 0x7f85, + 0x7f86, 0x7f87, 0x7f88, 0x7f89, 0x7f8b, 0x7f8d, 0x7f8f, 0x7f90, + 0x7f91, 0x7f92, 0x7f93, 0x7f95, 0x7f96, 0x7f97, 0x7f98, 0x7f99, + 0x7f9b, 0x7f9c, 0x7fa0, 0x7fa2, 0x7fa3, 0x7fa5, 0x7fa6, 0x7fa8, + 0x7fa9, 0x7faa, 0x7fab, 0x7fac, 0x7fad, 0x7fae, 0x7fb1, 0x7fb3, + 0x7fb4, 0x7fb5, 0x7fb6, 0x7fb7, 0x7fba, 0x7fbb, 0x7fbe, 0x7fc0, + 0x7fc2, 0x7fc3, 0x7fc4, 0x7fc6, 0x7fc7, 0x7fc8, 0x7fc9, 0x7fcb, + 0x7fcd, 0x7fcf, 0x7fd0, 0x7fd1, 0x7fd2, 0x7fd3, 0x7fd6, 0x7fd7, + 0x7fd9, 0x7fda, 0x7fdb, 0x7fdc, 0x7fdd, 0x7fde, 0x7fe2, 0x7fe3, + 0x75e2, 0x7acb, 0x7c92, 0x6ca5, 0x96b6, 0x529b, 0x7483, 0x54e9, + 0x4fe9, 0x8054, 0x83b2, 0x8fde, 0x9570, 0x5ec9, 0x601c, 0x6d9f, + 0x5e18, 0x655b, 0x8138, 0x94fe, 0x604b, 0x70bc, 0x7ec3, 0x7cae, + 0x51c9, 0x6881, 0x7cb1, 0x826f, 0x4e24, 0x8f86, 0x91cf, 0x667e, + 0x4eae, 0x8c05, 0x64a9, 0x804a, 0x50da, 0x7597, 0x71ce, 0x5be5, + 0x8fbd, 0x6f66, 0x4e86, 0x6482, 0x9563, 0x5ed6, 0x6599, 0x5217, + 0x88c2, 0x70c8, 0x52a3, 0x730e, 0x7433, 0x6797, 0x78f7, 0x9716, + 0x4e34, 0x90bb, 0x9cde, 0x6dcb, 0x51db, 0x8d41, 0x541d, 0x62ce, + 0x73b2, 0x83f1, 0x96f6, 0x9f84, 0x94c3, 0x4f36, 0x7f9a, 0x51cc, + 0x7075, 0x9675, 0x5cad, 0x9886, 0x53e6, 0x4ee4, 0x6e9c, 0x7409, + 0x69b4, 0x786b, 0x998f, 0x7559, 0x5218, 0x7624, 0x6d41, 0x67f3, + 0x516d, 0x9f99, 0x804b, 0x5499, 0x7b3c, 0x7abf, + /* 0xc2 */ + 0x7fe4, 0x7fe7, 0x7fe8, 0x7fea, 0x7feb, 0x7fec, 0x7fed, 0x7fef, + 0x7ff2, 0x7ff4, 0x7ff5, 0x7ff6, 0x7ff7, 0x7ff8, 0x7ff9, 0x7ffa, + 0x7ffd, 0x7ffe, 0x7fff, 0x8002, 0x8007, 0x8008, 0x8009, 0x800a, + 0x800e, 0x800f, 0x8011, 0x8013, 0x801a, 0x801b, 0x801d, 0x801e, + 0x801f, 0x8021, 0x8023, 0x8024, 0x802b, 0x802c, 0x802d, 0x802e, + 0x802f, 0x8030, 0x8032, 0x8034, 0x8039, 0x803a, 0x803c, 0x803e, + 0x8040, 0x8041, 0x8044, 0x8045, 0x8047, 0x8048, 0x8049, 0x804e, + 0x804f, 0x8050, 0x8051, 0x8053, 0x8055, 0x8056, 0x8057, 0x8059, + 0x805b, 0x805c, 0x805d, 0x805e, 0x805f, 0x8060, 0x8061, 0x8062, + 0x8063, 0x8064, 0x8065, 0x8066, 0x8067, 0x8068, 0x806b, 0x806c, + 0x806d, 0x806e, 0x806f, 0x8070, 0x8072, 0x8073, 0x8074, 0x8075, + 0x8076, 0x8077, 0x8078, 0x8079, 0x807a, 0x807b, 0x807c, 0x807d, + 0x9686, 0x5784, 0x62e2, 0x9647, 0x697c, 0x5a04, 0x6402, 0x7bd3, + 0x6f0f, 0x964b, 0x82a6, 0x5362, 0x9885, 0x5e90, 0x7089, 0x63b3, + 0x5364, 0x864f, 0x9c81, 0x9e93, 0x788c, 0x9732, 0x8def, 0x8d42, + 0x9e7f, 0x6f5e, 0x7984, 0x5f55, 0x9646, 0x622e, 0x9a74, 0x5415, + 0x94dd, 0x4fa3, 0x65c5, 0x5c65, 0x5c61, 0x7f15, 0x8651, 0x6c2f, + 0x5f8b, 0x7387, 0x6ee4, 0x7eff, 0x5ce6, 0x631b, 0x5b6a, 0x6ee6, + 0x5375, 0x4e71, 0x63a0, 0x7565, 0x62a1, 0x8f6e, 0x4f26, 0x4ed1, + 0x6ca6, 0x7eb6, 0x8bba, 0x841d, 0x87ba, 0x7f57, 0x903b, 0x9523, + 0x7ba9, 0x9aa1, 0x88f8, 0x843d, 0x6d1b, 0x9a86, 0x7edc, 0x5988, + 0x9ebb, 0x739b, 0x7801, 0x8682, 0x9a6c, 0x9a82, 0x561b, 0x5417, + 0x57cb, 0x4e70, 0x9ea6, 0x5356, 0x8fc8, 0x8109, 0x7792, 0x9992, + 0x86ee, 0x6ee1, 0x8513, 0x66fc, 0x6162, 0x6f2b, + /* 0xc3 */ + 0x807e, 0x8081, 0x8082, 0x8085, 0x8088, 0x808a, 0x808d, 0x808e, + 0x808f, 0x8090, 0x8091, 0x8092, 0x8094, 0x8095, 0x8097, 0x8099, + 0x809e, 0x80a3, 0x80a6, 0x80a7, 0x80a8, 0x80ac, 0x80b0, 0x80b3, + 0x80b5, 0x80b6, 0x80b8, 0x80b9, 0x80bb, 0x80c5, 0x80c7, 0x80c8, + 0x80c9, 0x80ca, 0x80cb, 0x80cf, 0x80d0, 0x80d1, 0x80d2, 0x80d3, + 0x80d4, 0x80d5, 0x80d8, 0x80df, 0x80e0, 0x80e2, 0x80e3, 0x80e6, + 0x80ee, 0x80f5, 0x80f7, 0x80f9, 0x80fb, 0x80fe, 0x80ff, 0x8100, + 0x8101, 0x8103, 0x8104, 0x8105, 0x8107, 0x8108, 0x810b, 0x810c, + 0x8115, 0x8117, 0x8119, 0x811b, 0x811c, 0x811d, 0x811f, 0x8120, + 0x8121, 0x8122, 0x8123, 0x8124, 0x8125, 0x8126, 0x8127, 0x8128, + 0x8129, 0x812a, 0x812b, 0x812d, 0x812e, 0x8130, 0x8133, 0x8134, + 0x8135, 0x8137, 0x8139, 0x813a, 0x813b, 0x813c, 0x813d, 0x813f, + 0x8c29, 0x8292, 0x832b, 0x76f2, 0x6c13, 0x5fd9, 0x83bd, 0x732b, + 0x8305, 0x951a, 0x6bdb, 0x77db, 0x94c6, 0x536f, 0x8302, 0x5192, + 0x5e3d, 0x8c8c, 0x8d38, 0x4e48, 0x73ab, 0x679a, 0x6885, 0x9176, + 0x9709, 0x7164, 0x6ca1, 0x7709, 0x5a92, 0x9541, 0x6bcf, 0x7f8e, + 0x6627, 0x5bd0, 0x59b9, 0x5a9a, 0x95e8, 0x95f7, 0x4eec, 0x840c, + 0x8499, 0x6aac, 0x76df, 0x9530, 0x731b, 0x68a6, 0x5b5f, 0x772f, + 0x919a, 0x9761, 0x7cdc, 0x8ff7, 0x8c1c, 0x5f25, 0x7c73, 0x79d8, + 0x89c5, 0x6ccc, 0x871c, 0x5bc6, 0x5e42, 0x68c9, 0x7720, 0x7ef5, + 0x5195, 0x514d, 0x52c9, 0x5a29, 0x7f05, 0x9762, 0x82d7, 0x63cf, + 0x7784, 0x85d0, 0x79d2, 0x6e3a, 0x5e99, 0x5999, 0x8511, 0x706d, + 0x6c11, 0x62bf, 0x76bf, 0x654f, 0x60af, 0x95fd, 0x660e, 0x879f, + 0x9e23, 0x94ed, 0x540d, 0x547d, 0x8c2c, 0x6478, + /* 0xc4 */ + 0x8140, 0x8141, 0x8142, 0x8143, 0x8144, 0x8145, 0x8147, 0x8149, + 0x814d, 0x814e, 0x814f, 0x8152, 0x8156, 0x8157, 0x8158, 0x815b, + 0x815c, 0x815d, 0x815e, 0x815f, 0x8161, 0x8162, 0x8163, 0x8164, + 0x8166, 0x8168, 0x816a, 0x816b, 0x816c, 0x816f, 0x8172, 0x8173, + 0x8175, 0x8176, 0x8177, 0x8178, 0x8181, 0x8183, 0x8184, 0x8185, + 0x8186, 0x8187, 0x8189, 0x818b, 0x818c, 0x818d, 0x818e, 0x8190, + 0x8192, 0x8193, 0x8194, 0x8195, 0x8196, 0x8197, 0x8199, 0x819a, + 0x819e, 0x819f, 0x81a0, 0x81a1, 0x81a2, 0x81a4, 0x81a5, 0x81a7, + 0x81a9, 0x81ab, 0x81ac, 0x81ad, 0x81ae, 0x81af, 0x81b0, 0x81b1, + 0x81b2, 0x81b4, 0x81b5, 0x81b6, 0x81b7, 0x81b8, 0x81b9, 0x81bc, + 0x81bd, 0x81be, 0x81bf, 0x81c4, 0x81c5, 0x81c7, 0x81c8, 0x81c9, + 0x81cb, 0x81cd, 0x81ce, 0x81cf, 0x81d0, 0x81d1, 0x81d2, 0x81d3, + 0x6479, 0x8611, 0x6a21, 0x819c, 0x78e8, 0x6469, 0x9b54, 0x62b9, + 0x672b, 0x83ab, 0x58a8, 0x9ed8, 0x6cab, 0x6f20, 0x5bde, 0x964c, + 0x8c0b, 0x725f, 0x67d0, 0x62c7, 0x7261, 0x4ea9, 0x59c6, 0x6bcd, + 0x5893, 0x66ae, 0x5e55, 0x52df, 0x6155, 0x6728, 0x76ee, 0x7766, + 0x7267, 0x7a46, 0x62ff, 0x54ea, 0x5450, 0x94a0, 0x90a3, 0x5a1c, + 0x7eb3, 0x6c16, 0x4e43, 0x5976, 0x8010, 0x5948, 0x5357, 0x7537, + 0x96be, 0x56ca, 0x6320, 0x8111, 0x607c, 0x95f9, 0x6dd6, 0x5462, + 0x9981, 0x5185, 0x5ae9, 0x80fd, 0x59ae, 0x9713, 0x502a, 0x6ce5, + 0x5c3c, 0x62df, 0x4f60, 0x533f, 0x817b, 0x9006, 0x6eba, 0x852b, + 0x62c8, 0x5e74, 0x78be, 0x64b5, 0x637b, 0x5ff5, 0x5a18, 0x917f, + 0x9e1f, 0x5c3f, 0x634f, 0x8042, 0x5b7d, 0x556e, 0x954a, 0x954d, + 0x6d85, 0x60a8, 0x67e0, 0x72de, 0x51dd, 0x5b81, + /* 0xc5 */ + 0x81d4, 0x81d5, 0x81d6, 0x81d7, 0x81d8, 0x81d9, 0x81da, 0x81db, + 0x81dc, 0x81dd, 0x81de, 0x81df, 0x81e0, 0x81e1, 0x81e2, 0x81e4, + 0x81e5, 0x81e6, 0x81e8, 0x81e9, 0x81eb, 0x81ee, 0x81ef, 0x81f0, + 0x81f1, 0x81f2, 0x81f5, 0x81f6, 0x81f7, 0x81f8, 0x81f9, 0x81fa, + 0x81fd, 0x81ff, 0x8203, 0x8207, 0x8208, 0x8209, 0x820a, 0x820b, + 0x820e, 0x820f, 0x8211, 0x8213, 0x8215, 0x8216, 0x8217, 0x8218, + 0x8219, 0x821a, 0x821d, 0x8220, 0x8224, 0x8225, 0x8226, 0x8227, + 0x8229, 0x822e, 0x8232, 0x823a, 0x823c, 0x823d, 0x823f, 0x8240, + 0x8241, 0x8242, 0x8243, 0x8245, 0x8246, 0x8248, 0x824a, 0x824c, + 0x824d, 0x824e, 0x8250, 0x8251, 0x8252, 0x8253, 0x8254, 0x8255, + 0x8256, 0x8257, 0x8259, 0x825b, 0x825c, 0x825d, 0x825e, 0x8260, + 0x8261, 0x8262, 0x8263, 0x8264, 0x8265, 0x8266, 0x8267, 0x8269, + 0x62e7, 0x6cde, 0x725b, 0x626d, 0x94ae, 0x7ebd, 0x8113, 0x6d53, + 0x519c, 0x5f04, 0x5974, 0x52aa, 0x6012, 0x5973, 0x6696, 0x8650, + 0x759f, 0x632a, 0x61e6, 0x7cef, 0x8bfa, 0x54e6, 0x6b27, 0x9e25, + 0x6bb4, 0x85d5, 0x5455, 0x5076, 0x6ca4, 0x556a, 0x8db4, 0x722c, + 0x5e15, 0x6015, 0x7436, 0x62cd, 0x6392, 0x724c, 0x5f98, 0x6e43, + 0x6d3e, 0x6500, 0x6f58, 0x76d8, 0x78d0, 0x76fc, 0x7554, 0x5224, + 0x53db, 0x4e53, 0x5e9e, 0x65c1, 0x802a, 0x80d6, 0x629b, 0x5486, + 0x5228, 0x70ae, 0x888d, 0x8dd1, 0x6ce1, 0x5478, 0x80da, 0x57f9, + 0x88f4, 0x8d54, 0x966a, 0x914d, 0x4f69, 0x6c9b, 0x55b7, 0x76c6, + 0x7830, 0x62a8, 0x70f9, 0x6f8e, 0x5f6d, 0x84ec, 0x68da, 0x787c, + 0x7bf7, 0x81a8, 0x670b, 0x9e4f, 0x6367, 0x78b0, 0x576f, 0x7812, + 0x9739, 0x6279, 0x62ab, 0x5288, 0x7435, 0x6bd7, + /* 0xc6 */ + 0x826a, 0x826b, 0x826c, 0x826d, 0x8271, 0x8275, 0x8276, 0x8277, + 0x8278, 0x827b, 0x827c, 0x8280, 0x8281, 0x8283, 0x8285, 0x8286, + 0x8287, 0x8289, 0x828c, 0x8290, 0x8293, 0x8294, 0x8295, 0x8296, + 0x829a, 0x829b, 0x829e, 0x82a0, 0x82a2, 0x82a3, 0x82a7, 0x82b2, + 0x82b5, 0x82b6, 0x82ba, 0x82bb, 0x82bc, 0x82bf, 0x82c0, 0x82c2, + 0x82c3, 0x82c5, 0x82c6, 0x82c9, 0x82d0, 0x82d6, 0x82d9, 0x82da, + 0x82dd, 0x82e2, 0x82e7, 0x82e8, 0x82e9, 0x82ea, 0x82ec, 0x82ed, + 0x82ee, 0x82f0, 0x82f2, 0x82f3, 0x82f5, 0x82f6, 0x82f8, 0x82fa, + 0x82fc, 0x82fd, 0x82fe, 0x82ff, 0x8300, 0x830a, 0x830b, 0x830d, + 0x8310, 0x8312, 0x8313, 0x8316, 0x8318, 0x8319, 0x831d, 0x831e, + 0x831f, 0x8320, 0x8321, 0x8322, 0x8323, 0x8324, 0x8325, 0x8326, + 0x8329, 0x832a, 0x832e, 0x8330, 0x8332, 0x8337, 0x833b, 0x833d, + 0x5564, 0x813e, 0x75b2, 0x76ae, 0x5339, 0x75de, 0x50fb, 0x5c41, + 0x8b6c, 0x7bc7, 0x504f, 0x7247, 0x9a97, 0x98d8, 0x6f02, 0x74e2, + 0x7968, 0x6487, 0x77a5, 0x62fc, 0x9891, 0x8d2b, 0x54c1, 0x8058, + 0x4e52, 0x576a, 0x82f9, 0x840d, 0x5e73, 0x51ed, 0x74f6, 0x8bc4, + 0x5c4f, 0x5761, 0x6cfc, 0x9887, 0x5a46, 0x7834, 0x9b44, 0x8feb, + 0x7c95, 0x5256, 0x6251, 0x94fa, 0x4ec6, 0x8386, 0x8461, 0x83e9, + 0x84b2, 0x57d4, 0x6734, 0x5703, 0x666e, 0x6d66, 0x8c31, 0x66dd, + 0x7011, 0x671f, 0x6b3a, 0x6816, 0x621a, 0x59bb, 0x4e03, 0x51c4, + 0x6f06, 0x67d2, 0x6c8f, 0x5176, 0x68cb, 0x5947, 0x6b67, 0x7566, + 0x5d0e, 0x8110, 0x9f50, 0x65d7, 0x7948, 0x7941, 0x9a91, 0x8d77, + 0x5c82, 0x4e5e, 0x4f01, 0x542f, 0x5951, 0x780c, 0x5668, 0x6c14, + 0x8fc4, 0x5f03, 0x6c7d, 0x6ce3, 0x8bab, 0x6390, + /* 0xc7 */ + 0x833e, 0x833f, 0x8341, 0x8342, 0x8344, 0x8345, 0x8348, 0x834a, + 0x834b, 0x834c, 0x834d, 0x834e, 0x8353, 0x8355, 0x8356, 0x8357, + 0x8358, 0x8359, 0x835d, 0x8362, 0x8370, 0x8371, 0x8372, 0x8373, + 0x8374, 0x8375, 0x8376, 0x8379, 0x837a, 0x837e, 0x837f, 0x8380, + 0x8381, 0x8382, 0x8383, 0x8384, 0x8387, 0x8388, 0x838a, 0x838b, + 0x838c, 0x838d, 0x838f, 0x8390, 0x8391, 0x8394, 0x8395, 0x8396, + 0x8397, 0x8399, 0x839a, 0x839d, 0x839f, 0x83a1, 0x83a2, 0x83a3, + 0x83a4, 0x83a5, 0x83a6, 0x83a7, 0x83ac, 0x83ad, 0x83ae, 0x83af, + 0x83b5, 0x83bb, 0x83be, 0x83bf, 0x83c2, 0x83c3, 0x83c4, 0x83c6, + 0x83c8, 0x83c9, 0x83cb, 0x83cd, 0x83ce, 0x83d0, 0x83d1, 0x83d2, + 0x83d3, 0x83d5, 0x83d7, 0x83d9, 0x83da, 0x83db, 0x83de, 0x83e2, + 0x83e3, 0x83e4, 0x83e6, 0x83e7, 0x83e8, 0x83eb, 0x83ec, 0x83ed, + 0x6070, 0x6d3d, 0x7275, 0x6266, 0x948e, 0x94c5, 0x5343, 0x8fc1, + 0x7b7e, 0x4edf, 0x8c26, 0x4e7e, 0x9ed4, 0x94b1, 0x94b3, 0x524d, + 0x6f5c, 0x9063, 0x6d45, 0x8c34, 0x5811, 0x5d4c, 0x6b20, 0x6b49, + 0x67aa, 0x545b, 0x8154, 0x7f8c, 0x5899, 0x8537, 0x5f3a, 0x62a2, + 0x6a47, 0x9539, 0x6572, 0x6084, 0x6865, 0x77a7, 0x4e54, 0x4fa8, + 0x5de7, 0x9798, 0x64ac, 0x7fd8, 0x5ced, 0x4fcf, 0x7a8d, 0x5207, + 0x8304, 0x4e14, 0x602f, 0x7a83, 0x94a6, 0x4fb5, 0x4eb2, 0x79e6, + 0x7434, 0x52e4, 0x82b9, 0x64d2, 0x79bd, 0x5bdd, 0x6c81, 0x9752, + 0x8f7b, 0x6c22, 0x503e, 0x537f, 0x6e05, 0x64ce, 0x6674, 0x6c30, + 0x60c5, 0x9877, 0x8bf7, 0x5e86, 0x743c, 0x7a77, 0x79cb, 0x4e18, + 0x90b1, 0x7403, 0x6c42, 0x56da, 0x914b, 0x6cc5, 0x8d8b, 0x533a, + 0x86c6, 0x66f2, 0x8eaf, 0x5c48, 0x9a71, 0x6e20, + /* 0xc8 */ + 0x83ee, 0x83ef, 0x83f3, 0x83f4, 0x83f5, 0x83f6, 0x83f7, 0x83fa, + 0x83fb, 0x83fc, 0x83fe, 0x83ff, 0x8400, 0x8402, 0x8405, 0x8407, + 0x8408, 0x8409, 0x840a, 0x8410, 0x8412, 0x8413, 0x8414, 0x8415, + 0x8416, 0x8417, 0x8419, 0x841a, 0x841b, 0x841e, 0x841f, 0x8420, + 0x8421, 0x8422, 0x8423, 0x8429, 0x842a, 0x842b, 0x842c, 0x842d, + 0x842e, 0x842f, 0x8430, 0x8432, 0x8433, 0x8434, 0x8435, 0x8436, + 0x8437, 0x8439, 0x843a, 0x843b, 0x843e, 0x843f, 0x8440, 0x8441, + 0x8442, 0x8443, 0x8444, 0x8445, 0x8447, 0x8448, 0x8449, 0x844a, + 0x844b, 0x844c, 0x844d, 0x844e, 0x844f, 0x8450, 0x8452, 0x8453, + 0x8454, 0x8455, 0x8456, 0x8458, 0x845d, 0x845e, 0x845f, 0x8460, + 0x8462, 0x8464, 0x8465, 0x8466, 0x8467, 0x8468, 0x846a, 0x846e, + 0x846f, 0x8470, 0x8472, 0x8474, 0x8477, 0x8479, 0x847b, 0x847c, + 0x53d6, 0x5a36, 0x9f8b, 0x8da3, 0x53bb, 0x5708, 0x98a7, 0x6743, + 0x919b, 0x6cc9, 0x5168, 0x75ca, 0x62f3, 0x72ac, 0x5238, 0x529d, + 0x7f3a, 0x7094, 0x7638, 0x5374, 0x9e4a, 0x69b7, 0x786e, 0x96c0, + 0x88d9, 0x7fa4, 0x7136, 0x71c3, 0x5189, 0x67d3, 0x74e4, 0x58e4, + 0x6518, 0x56b7, 0x8ba9, 0x9976, 0x6270, 0x7ed5, 0x60f9, 0x70ed, + 0x58ec, 0x4ec1, 0x4eba, 0x5fcd, 0x97e7, 0x4efb, 0x8ba4, 0x5203, + 0x598a, 0x7eab, 0x6254, 0x4ecd, 0x65e5, 0x620e, 0x8338, 0x84c9, + 0x8363, 0x878d, 0x7194, 0x6eb6, 0x5bb9, 0x7ed2, 0x5197, 0x63c9, + 0x67d4, 0x8089, 0x8339, 0x8815, 0x5112, 0x5b7a, 0x5982, 0x8fb1, + 0x4e73, 0x6c5d, 0x5165, 0x8925, 0x8f6f, 0x962e, 0x854a, 0x745e, + 0x9510, 0x95f0, 0x6da6, 0x82e5, 0x5f31, 0x6492, 0x6d12, 0x8428, + 0x816e, 0x9cc3, 0x585e, 0x8d5b, 0x4e09, 0x53c1, + /* 0xc9 */ + 0x847d, 0x847e, 0x847f, 0x8480, 0x8481, 0x8483, 0x8484, 0x8485, + 0x8486, 0x848a, 0x848d, 0x848f, 0x8490, 0x8491, 0x8492, 0x8493, + 0x8494, 0x8495, 0x8496, 0x8498, 0x849a, 0x849b, 0x849d, 0x849e, + 0x849f, 0x84a0, 0x84a2, 0x84a3, 0x84a4, 0x84a5, 0x84a6, 0x84a7, + 0x84a8, 0x84a9, 0x84aa, 0x84ab, 0x84ac, 0x84ad, 0x84ae, 0x84b0, + 0x84b1, 0x84b3, 0x84b5, 0x84b6, 0x84b7, 0x84bb, 0x84bc, 0x84be, + 0x84c0, 0x84c2, 0x84c3, 0x84c5, 0x84c6, 0x84c7, 0x84c8, 0x84cb, + 0x84cc, 0x84ce, 0x84cf, 0x84d2, 0x84d4, 0x84d5, 0x84d7, 0x84d8, + 0x84d9, 0x84da, 0x84db, 0x84dc, 0x84de, 0x84e1, 0x84e2, 0x84e4, + 0x84e7, 0x84e8, 0x84e9, 0x84ea, 0x84eb, 0x84ed, 0x84ee, 0x84ef, + 0x84f1, 0x84f2, 0x84f3, 0x84f4, 0x84f5, 0x84f6, 0x84f7, 0x84f8, + 0x84f9, 0x84fa, 0x84fb, 0x84fd, 0x84fe, 0x8500, 0x8501, 0x8502, + 0x4f1e, 0x6563, 0x6851, 0x55d3, 0x4e27, 0x6414, 0x9a9a, 0x626b, + 0x5ac2, 0x745f, 0x8272, 0x6da9, 0x68ee, 0x50e7, 0x838e, 0x7802, + 0x6740, 0x5239, 0x6c99, 0x7eb1, 0x50bb, 0x5565, 0x715e, 0x7b5b, + 0x6652, 0x73ca, 0x82eb, 0x6749, 0x5c71, 0x5220, 0x717d, 0x886b, + 0x95ea, 0x9655, 0x64c5, 0x8d61, 0x81b3, 0x5584, 0x6c55, 0x6247, + 0x7f2e, 0x5892, 0x4f24, 0x5546, 0x8d4f, 0x664c, 0x4e0a, 0x5c1a, + 0x88f3, 0x68a2, 0x634e, 0x7a0d, 0x70e7, 0x828d, 0x52fa, 0x97f6, + 0x5c11, 0x54e8, 0x90b5, 0x7ecd, 0x5962, 0x8d4a, 0x86c7, 0x820c, + 0x820d, 0x8d66, 0x6444, 0x5c04, 0x6151, 0x6d89, 0x793e, 0x8bbe, + 0x7837, 0x7533, 0x547b, 0x4f38, 0x8eab, 0x6df1, 0x5a20, 0x7ec5, + 0x795e, 0x6c88, 0x5ba1, 0x5a76, 0x751a, 0x80be, 0x614e, 0x6e17, + 0x58f0, 0x751f, 0x7525, 0x7272, 0x5347, 0x7ef3, + /* 0xca */ + 0x8503, 0x8504, 0x8505, 0x8506, 0x8507, 0x8508, 0x8509, 0x850a, + 0x850b, 0x850d, 0x850e, 0x850f, 0x8510, 0x8512, 0x8514, 0x8515, + 0x8516, 0x8518, 0x8519, 0x851b, 0x851c, 0x851d, 0x851e, 0x8520, + 0x8522, 0x8523, 0x8524, 0x8525, 0x8526, 0x8527, 0x8528, 0x8529, + 0x852a, 0x852d, 0x852e, 0x852f, 0x8530, 0x8531, 0x8532, 0x8533, + 0x8534, 0x8535, 0x8536, 0x853e, 0x853f, 0x8540, 0x8541, 0x8542, + 0x8544, 0x8545, 0x8546, 0x8547, 0x854b, 0x854c, 0x854d, 0x854e, + 0x854f, 0x8550, 0x8551, 0x8552, 0x8553, 0x8554, 0x8555, 0x8557, + 0x8558, 0x855a, 0x855b, 0x855c, 0x855d, 0x855f, 0x8560, 0x8561, + 0x8562, 0x8563, 0x8565, 0x8566, 0x8567, 0x8569, 0x856a, 0x856b, + 0x856c, 0x856d, 0x856e, 0x856f, 0x8570, 0x8571, 0x8573, 0x8575, + 0x8576, 0x8577, 0x8578, 0x857c, 0x857d, 0x857f, 0x8580, 0x8581, + 0x7701, 0x76db, 0x5269, 0x80dc, 0x5723, 0x5e08, 0x5931, 0x72ee, + 0x65bd, 0x6e7f, 0x8bd7, 0x5c38, 0x8671, 0x5341, 0x77f3, 0x62fe, + 0x65f6, 0x4ec0, 0x98df, 0x8680, 0x5b9e, 0x8bc6, 0x53f2, 0x77e2, + 0x4f7f, 0x5c4e, 0x9a76, 0x59cb, 0x5f0f, 0x793a, 0x58eb, 0x4e16, + 0x67ff, 0x4e8b, 0x62ed, 0x8a93, 0x901d, 0x52bf, 0x662f, 0x55dc, + 0x566c, 0x9002, 0x4ed5, 0x4f8d, 0x91ca, 0x9970, 0x6c0f, 0x5e02, + 0x6043, 0x5ba4, 0x89c6, 0x8bd5, 0x6536, 0x624b, 0x9996, 0x5b88, + 0x5bff, 0x6388, 0x552e, 0x53d7, 0x7626, 0x517d, 0x852c, 0x67a2, + 0x68b3, 0x6b8a, 0x6292, 0x8f93, 0x53d4, 0x8212, 0x6dd1, 0x758f, + 0x4e66, 0x8d4e, 0x5b70, 0x719f, 0x85af, 0x6691, 0x66d9, 0x7f72, + 0x8700, 0x9ecd, 0x9f20, 0x5c5e, 0x672f, 0x8ff0, 0x6811, 0x675f, + 0x620d, 0x7ad6, 0x5885, 0x5eb6, 0x6570, 0x6f31, + /* 0xcb */ + 0x8582, 0x8583, 0x8586, 0x8588, 0x8589, 0x858a, 0x858b, 0x858c, + 0x858d, 0x858e, 0x8590, 0x8591, 0x8592, 0x8593, 0x8594, 0x8595, + 0x8596, 0x8597, 0x8598, 0x8599, 0x859a, 0x859d, 0x859e, 0x859f, + 0x85a0, 0x85a1, 0x85a2, 0x85a3, 0x85a5, 0x85a6, 0x85a7, 0x85a9, + 0x85ab, 0x85ac, 0x85ad, 0x85b1, 0x85b2, 0x85b3, 0x85b4, 0x85b5, + 0x85b6, 0x85b8, 0x85ba, 0x85bb, 0x85bc, 0x85bd, 0x85be, 0x85bf, + 0x85c0, 0x85c2, 0x85c3, 0x85c4, 0x85c5, 0x85c6, 0x85c7, 0x85c8, + 0x85ca, 0x85cb, 0x85cc, 0x85cd, 0x85ce, 0x85d1, 0x85d2, 0x85d4, + 0x85d6, 0x85d7, 0x85d8, 0x85d9, 0x85da, 0x85db, 0x85dd, 0x85de, + 0x85df, 0x85e0, 0x85e1, 0x85e2, 0x85e3, 0x85e5, 0x85e6, 0x85e7, + 0x85e8, 0x85ea, 0x85eb, 0x85ec, 0x85ed, 0x85ee, 0x85ef, 0x85f0, + 0x85f1, 0x85f2, 0x85f3, 0x85f4, 0x85f5, 0x85f6, 0x85f7, 0x85f8, + 0x6055, 0x5237, 0x800d, 0x6454, 0x8870, 0x7529, 0x5e05, 0x6813, + 0x62f4, 0x971c, 0x53cc, 0x723d, 0x8c01, 0x6c34, 0x7761, 0x7a0e, + 0x542e, 0x77ac, 0x987a, 0x821c, 0x8bf4, 0x7855, 0x6714, 0x70c1, + 0x65af, 0x6495, 0x5636, 0x601d, 0x79c1, 0x53f8, 0x4e1d, 0x6b7b, + 0x8086, 0x5bfa, 0x55e3, 0x56db, 0x4f3a, 0x4f3c, 0x9972, 0x5df3, + 0x677e, 0x8038, 0x6002, 0x9882, 0x9001, 0x5b8b, 0x8bbc, 0x8bf5, + 0x641c, 0x8258, 0x64de, 0x55fd, 0x82cf, 0x9165, 0x4fd7, 0x7d20, + 0x901f, 0x7c9f, 0x50f3, 0x5851, 0x6eaf, 0x5bbf, 0x8bc9, 0x8083, + 0x9178, 0x849c, 0x7b97, 0x867d, 0x968b, 0x968f, 0x7ee5, 0x9ad3, + 0x788e, 0x5c81, 0x7a57, 0x9042, 0x96a7, 0x795f, 0x5b59, 0x635f, + 0x7b0b, 0x84d1, 0x68ad, 0x5506, 0x7f29, 0x7410, 0x7d22, 0x9501, + 0x6240, 0x584c, 0x4ed6, 0x5b83, 0x5979, 0x5854, + /* 0xcc */ + 0x85f9, 0x85fa, 0x85fc, 0x85fd, 0x85fe, 0x8600, 0x8601, 0x8602, + 0x8603, 0x8604, 0x8606, 0x8607, 0x8608, 0x8609, 0x860a, 0x860b, + 0x860c, 0x860d, 0x860e, 0x860f, 0x8610, 0x8612, 0x8613, 0x8614, + 0x8615, 0x8617, 0x8618, 0x8619, 0x861a, 0x861b, 0x861c, 0x861d, + 0x861e, 0x861f, 0x8620, 0x8621, 0x8622, 0x8623, 0x8624, 0x8625, + 0x8626, 0x8628, 0x862a, 0x862b, 0x862c, 0x862d, 0x862e, 0x862f, + 0x8630, 0x8631, 0x8632, 0x8633, 0x8634, 0x8635, 0x8636, 0x8637, + 0x8639, 0x863a, 0x863b, 0x863d, 0x863e, 0x863f, 0x8640, 0x8641, + 0x8642, 0x8643, 0x8644, 0x8645, 0x8646, 0x8647, 0x8648, 0x8649, + 0x864a, 0x864b, 0x864c, 0x8652, 0x8653, 0x8655, 0x8656, 0x8657, + 0x8658, 0x8659, 0x865b, 0x865c, 0x865d, 0x865f, 0x8660, 0x8661, + 0x8663, 0x8664, 0x8665, 0x8666, 0x8667, 0x8668, 0x8669, 0x866a, + 0x736d, 0x631e, 0x8e4b, 0x8e0f, 0x80ce, 0x82d4, 0x62ac, 0x53f0, + 0x6cf0, 0x915e, 0x592a, 0x6001, 0x6c70, 0x574d, 0x644a, 0x8d2a, + 0x762b, 0x6ee9, 0x575b, 0x6a80, 0x75f0, 0x6f6d, 0x8c2d, 0x8c08, + 0x5766, 0x6bef, 0x8892, 0x78b3, 0x63a2, 0x53f9, 0x70ad, 0x6c64, + 0x5858, 0x642a, 0x5802, 0x68e0, 0x819b, 0x5510, 0x7cd6, 0x5018, + 0x8eba, 0x6dcc, 0x8d9f, 0x70eb, 0x638f, 0x6d9b, 0x6ed4, 0x7ee6, + 0x8404, 0x6843, 0x9003, 0x6dd8, 0x9676, 0x8ba8, 0x5957, 0x7279, + 0x85e4, 0x817e, 0x75bc, 0x8a8a, 0x68af, 0x5254, 0x8e22, 0x9511, + 0x63d0, 0x9898, 0x8e44, 0x557c, 0x4f53, 0x66ff, 0x568f, 0x60d5, + 0x6d95, 0x5243, 0x5c49, 0x5929, 0x6dfb, 0x586b, 0x7530, 0x751c, + 0x606c, 0x8214, 0x8146, 0x6311, 0x6761, 0x8fe2, 0x773a, 0x8df3, + 0x8d34, 0x94c1, 0x5e16, 0x5385, 0x542c, 0x70c3, + /* 0xcd */ + 0x866d, 0x866f, 0x8670, 0x8672, 0x8673, 0x8674, 0x8675, 0x8676, + 0x8677, 0x8678, 0x8683, 0x8684, 0x8685, 0x8686, 0x8687, 0x8688, + 0x8689, 0x868e, 0x868f, 0x8690, 0x8691, 0x8692, 0x8694, 0x8696, + 0x8697, 0x8698, 0x8699, 0x869a, 0x869b, 0x869e, 0x869f, 0x86a0, + 0x86a1, 0x86a2, 0x86a5, 0x86a6, 0x86ab, 0x86ad, 0x86ae, 0x86b2, + 0x86b3, 0x86b7, 0x86b8, 0x86b9, 0x86bb, 0x86bc, 0x86bd, 0x86be, + 0x86bf, 0x86c1, 0x86c2, 0x86c3, 0x86c5, 0x86c8, 0x86cc, 0x86cd, + 0x86d2, 0x86d3, 0x86d5, 0x86d6, 0x86d7, 0x86da, 0x86dc, 0x86dd, + 0x86e0, 0x86e1, 0x86e2, 0x86e3, 0x86e5, 0x86e6, 0x86e7, 0x86e8, + 0x86ea, 0x86eb, 0x86ec, 0x86ef, 0x86f5, 0x86f6, 0x86f7, 0x86fa, + 0x86fb, 0x86fc, 0x86fd, 0x86ff, 0x8701, 0x8704, 0x8705, 0x8706, + 0x870b, 0x870c, 0x870e, 0x870f, 0x8710, 0x8711, 0x8714, 0x8716, + 0x6c40, 0x5ef7, 0x505c, 0x4ead, 0x5ead, 0x633a, 0x8247, 0x901a, + 0x6850, 0x916e, 0x77b3, 0x540c, 0x94dc, 0x5f64, 0x7ae5, 0x6876, + 0x6345, 0x7b52, 0x7edf, 0x75db, 0x5077, 0x6295, 0x5934, 0x900f, + 0x51f8, 0x79c3, 0x7a81, 0x56fe, 0x5f92, 0x9014, 0x6d82, 0x5c60, + 0x571f, 0x5410, 0x5154, 0x6e4d, 0x56e2, 0x63a8, 0x9893, 0x817f, + 0x8715, 0x892a, 0x9000, 0x541e, 0x5c6f, 0x81c0, 0x62d6, 0x6258, + 0x8131, 0x9e35, 0x9640, 0x9a6e, 0x9a7c, 0x692d, 0x59a5, 0x62d3, + 0x553e, 0x6316, 0x54c7, 0x86d9, 0x6d3c, 0x5a03, 0x74e6, 0x889c, + 0x6b6a, 0x5916, 0x8c4c, 0x5f2f, 0x6e7e, 0x73a9, 0x987d, 0x4e38, + 0x70f7, 0x5b8c, 0x7897, 0x633d, 0x665a, 0x7696, 0x60cb, 0x5b9b, + 0x5a49, 0x4e07, 0x8155, 0x6c6a, 0x738b, 0x4ea1, 0x6789, 0x7f51, + 0x5f80, 0x65fa, 0x671b, 0x5fd8, 0x5984, 0x5a01, + /* 0xce */ + 0x8719, 0x871b, 0x871d, 0x871f, 0x8720, 0x8724, 0x8726, 0x8727, + 0x8728, 0x872a, 0x872b, 0x872c, 0x872d, 0x872f, 0x8730, 0x8732, + 0x8733, 0x8735, 0x8736, 0x8738, 0x8739, 0x873a, 0x873c, 0x873d, + 0x8740, 0x8741, 0x8742, 0x8743, 0x8744, 0x8745, 0x8746, 0x874a, + 0x874b, 0x874d, 0x874f, 0x8750, 0x8751, 0x8752, 0x8754, 0x8755, + 0x8756, 0x8758, 0x875a, 0x875b, 0x875c, 0x875d, 0x875e, 0x875f, + 0x8761, 0x8762, 0x8766, 0x8767, 0x8768, 0x8769, 0x876a, 0x876b, + 0x876c, 0x876d, 0x876f, 0x8771, 0x8772, 0x8773, 0x8775, 0x8777, + 0x8778, 0x8779, 0x877a, 0x877f, 0x8780, 0x8781, 0x8784, 0x8786, + 0x8787, 0x8789, 0x878a, 0x878c, 0x878e, 0x878f, 0x8790, 0x8791, + 0x8792, 0x8794, 0x8795, 0x8796, 0x8798, 0x8799, 0x879a, 0x879b, + 0x879c, 0x879d, 0x879e, 0x87a0, 0x87a1, 0x87a2, 0x87a3, 0x87a4, + 0x5dcd, 0x5fae, 0x5371, 0x97e6, 0x8fdd, 0x6845, 0x56f4, 0x552f, + 0x60df, 0x4e3a, 0x6f4d, 0x7ef4, 0x82c7, 0x840e, 0x59d4, 0x4f1f, + 0x4f2a, 0x5c3e, 0x7eac, 0x672a, 0x851a, 0x5473, 0x754f, 0x80c3, + 0x5582, 0x9b4f, 0x4f4d, 0x6e2d, 0x8c13, 0x5c09, 0x6170, 0x536b, + 0x761f, 0x6e29, 0x868a, 0x6587, 0x95fb, 0x7eb9, 0x543b, 0x7a33, + 0x7d0a, 0x95ee, 0x55e1, 0x7fc1, 0x74ee, 0x631d, 0x8717, 0x6da1, + 0x7a9d, 0x6211, 0x65a1, 0x5367, 0x63e1, 0x6c83, 0x5deb, 0x545c, + 0x94a8, 0x4e4c, 0x6c61, 0x8bec, 0x5c4b, 0x65e0, 0x829c, 0x68a7, + 0x543e, 0x5434, 0x6bcb, 0x6b66, 0x4e94, 0x6342, 0x5348, 0x821e, + 0x4f0d, 0x4fae, 0x575e, 0x620a, 0x96fe, 0x6664, 0x7269, 0x52ff, + 0x52a1, 0x609f, 0x8bef, 0x6614, 0x7199, 0x6790, 0x897f, 0x7852, + 0x77fd, 0x6670, 0x563b, 0x5438, 0x9521, 0x727a, + /* 0xcf */ + 0x87a5, 0x87a6, 0x87a7, 0x87a9, 0x87aa, 0x87ae, 0x87b0, 0x87b1, + 0x87b2, 0x87b4, 0x87b6, 0x87b7, 0x87b8, 0x87b9, 0x87bb, 0x87bc, + 0x87be, 0x87bf, 0x87c1, 0x87c2, 0x87c3, 0x87c4, 0x87c5, 0x87c7, + 0x87c8, 0x87c9, 0x87cc, 0x87cd, 0x87ce, 0x87cf, 0x87d0, 0x87d4, + 0x87d5, 0x87d6, 0x87d7, 0x87d8, 0x87d9, 0x87da, 0x87dc, 0x87dd, + 0x87de, 0x87df, 0x87e1, 0x87e2, 0x87e3, 0x87e4, 0x87e6, 0x87e7, + 0x87e8, 0x87e9, 0x87eb, 0x87ec, 0x87ed, 0x87ef, 0x87f0, 0x87f1, + 0x87f2, 0x87f3, 0x87f4, 0x87f5, 0x87f6, 0x87f7, 0x87f8, 0x87fa, + 0x87fb, 0x87fc, 0x87fd, 0x87ff, 0x8800, 0x8801, 0x8802, 0x8804, + 0x8805, 0x8806, 0x8807, 0x8808, 0x8809, 0x880b, 0x880c, 0x880d, + 0x880e, 0x880f, 0x8810, 0x8811, 0x8812, 0x8814, 0x8817, 0x8818, + 0x8819, 0x881a, 0x881c, 0x881d, 0x881e, 0x881f, 0x8820, 0x8823, + 0x7a00, 0x606f, 0x5e0c, 0x6089, 0x819d, 0x5915, 0x60dc, 0x7184, + 0x70ef, 0x6eaa, 0x6c50, 0x7280, 0x6a84, 0x88ad, 0x5e2d, 0x4e60, + 0x5ab3, 0x559c, 0x94e3, 0x6d17, 0x7cfb, 0x9699, 0x620f, 0x7ec6, + 0x778e, 0x867e, 0x5323, 0x971e, 0x8f96, 0x6687, 0x5ce1, 0x4fa0, + 0x72ed, 0x4e0b, 0x53a6, 0x590f, 0x5413, 0x6380, 0x9528, 0x5148, + 0x4ed9, 0x9c9c, 0x7ea4, 0x54b8, 0x8d24, 0x8854, 0x8237, 0x95f2, + 0x6d8e, 0x5f26, 0x5acc, 0x663e, 0x9669, 0x73b0, 0x732e, 0x53bf, + 0x817a, 0x9985, 0x7fa1, 0x5baa, 0x9677, 0x9650, 0x7ebf, 0x76f8, + 0x53a2, 0x9576, 0x9999, 0x7bb1, 0x8944, 0x6e58, 0x4e61, 0x7fd4, + 0x7965, 0x8be6, 0x60f3, 0x54cd, 0x4eab, 0x9879, 0x5df7, 0x6a61, + 0x50cf, 0x5411, 0x8c61, 0x8427, 0x785d, 0x9704, 0x524a, 0x54ee, + 0x56a3, 0x9500, 0x6d88, 0x5bb5, 0x6dc6, 0x6653, + /* 0xd0 */ + 0x8824, 0x8825, 0x8826, 0x8827, 0x8828, 0x8829, 0x882a, 0x882b, + 0x882c, 0x882d, 0x882e, 0x882f, 0x8830, 0x8831, 0x8833, 0x8834, + 0x8835, 0x8836, 0x8837, 0x8838, 0x883a, 0x883b, 0x883d, 0x883e, + 0x883f, 0x8841, 0x8842, 0x8843, 0x8846, 0x8847, 0x8848, 0x8849, + 0x884a, 0x884b, 0x884e, 0x884f, 0x8850, 0x8851, 0x8852, 0x8853, + 0x8855, 0x8856, 0x8858, 0x885a, 0x885b, 0x885c, 0x885d, 0x885e, + 0x885f, 0x8860, 0x8866, 0x8867, 0x886a, 0x886d, 0x886f, 0x8871, + 0x8873, 0x8874, 0x8875, 0x8876, 0x8878, 0x8879, 0x887a, 0x887b, + 0x887c, 0x8880, 0x8883, 0x8886, 0x8887, 0x8889, 0x888a, 0x888c, + 0x888e, 0x888f, 0x8890, 0x8891, 0x8893, 0x8894, 0x8895, 0x8897, + 0x8898, 0x8899, 0x889a, 0x889b, 0x889d, 0x889e, 0x889f, 0x88a0, + 0x88a1, 0x88a3, 0x88a5, 0x88a6, 0x88a7, 0x88a8, 0x88a9, 0x88aa, + 0x5c0f, 0x5b5d, 0x6821, 0x8096, 0x5578, 0x7b11, 0x6548, 0x6954, + 0x4e9b, 0x6b47, 0x874e, 0x978b, 0x534f, 0x631f, 0x643a, 0x90aa, + 0x659c, 0x80c1, 0x8c10, 0x5199, 0x68b0, 0x5378, 0x87f9, 0x61c8, + 0x6cc4, 0x6cfb, 0x8c22, 0x5c51, 0x85aa, 0x82af, 0x950c, 0x6b23, + 0x8f9b, 0x65b0, 0x5ffb, 0x5fc3, 0x4fe1, 0x8845, 0x661f, 0x8165, + 0x7329, 0x60fa, 0x5174, 0x5211, 0x578b, 0x5f62, 0x90a2, 0x884c, + 0x9192, 0x5e78, 0x674f, 0x6027, 0x59d3, 0x5144, 0x51f6, 0x80f8, + 0x5308, 0x6c79, 0x96c4, 0x718a, 0x4f11, 0x4fee, 0x7f9e, 0x673d, + 0x55c5, 0x9508, 0x79c0, 0x8896, 0x7ee3, 0x589f, 0x620c, 0x9700, + 0x865a, 0x5618, 0x987b, 0x5f90, 0x8bb8, 0x84c4, 0x9157, 0x53d9, + 0x65ed, 0x5e8f, 0x755c, 0x6064, 0x7d6e, 0x5a7f, 0x7eea, 0x7eed, + 0x8f69, 0x55a7, 0x5ba3, 0x60ac, 0x65cb, 0x7384, + /* 0xd1 */ + 0x88ac, 0x88ae, 0x88af, 0x88b0, 0x88b2, 0x88b3, 0x88b4, 0x88b5, + 0x88b6, 0x88b8, 0x88b9, 0x88ba, 0x88bb, 0x88bd, 0x88be, 0x88bf, + 0x88c0, 0x88c3, 0x88c4, 0x88c7, 0x88c8, 0x88ca, 0x88cb, 0x88cc, + 0x88cd, 0x88cf, 0x88d0, 0x88d1, 0x88d3, 0x88d6, 0x88d7, 0x88da, + 0x88db, 0x88dc, 0x88dd, 0x88de, 0x88e0, 0x88e1, 0x88e6, 0x88e7, + 0x88e9, 0x88ea, 0x88eb, 0x88ec, 0x88ed, 0x88ee, 0x88ef, 0x88f2, + 0x88f5, 0x88f6, 0x88f7, 0x88fa, 0x88fb, 0x88fd, 0x88ff, 0x8900, + 0x8901, 0x8903, 0x8904, 0x8905, 0x8906, 0x8907, 0x8908, 0x8909, + 0x890b, 0x890c, 0x890d, 0x890e, 0x890f, 0x8911, 0x8914, 0x8915, + 0x8916, 0x8917, 0x8918, 0x891c, 0x891d, 0x891e, 0x891f, 0x8920, + 0x8922, 0x8923, 0x8924, 0x8926, 0x8927, 0x8928, 0x8929, 0x892c, + 0x892d, 0x892e, 0x892f, 0x8931, 0x8932, 0x8933, 0x8935, 0x8937, + 0x9009, 0x7663, 0x7729, 0x7eda, 0x9774, 0x859b, 0x5b66, 0x7a74, + 0x96ea, 0x8840, 0x52cb, 0x718f, 0x5faa, 0x65ec, 0x8be2, 0x5bfb, + 0x9a6f, 0x5de1, 0x6b89, 0x6c5b, 0x8bad, 0x8baf, 0x900a, 0x8fc5, + 0x538b, 0x62bc, 0x9e26, 0x9e2d, 0x5440, 0x4e2b, 0x82bd, 0x7259, + 0x869c, 0x5d16, 0x8859, 0x6daf, 0x96c5, 0x54d1, 0x4e9a, 0x8bb6, + 0x7109, 0x54bd, 0x9609, 0x70df, 0x6df9, 0x76d0, 0x4e25, 0x7814, + 0x8712, 0x5ca9, 0x5ef6, 0x8a00, 0x989c, 0x960e, 0x708e, 0x6cbf, + 0x5944, 0x63a9, 0x773c, 0x884d, 0x6f14, 0x8273, 0x5830, 0x71d5, + 0x538c, 0x781a, 0x96c1, 0x5501, 0x5f66, 0x7130, 0x5bb4, 0x8c1a, + 0x9a8c, 0x6b83, 0x592e, 0x9e2f, 0x79e7, 0x6768, 0x626c, 0x4f6f, + 0x75a1, 0x7f8a, 0x6d0b, 0x9633, 0x6c27, 0x4ef0, 0x75d2, 0x517b, + 0x6837, 0x6f3e, 0x9080, 0x8170, 0x5996, 0x7476, + /* 0xd2 */ + 0x8938, 0x8939, 0x893a, 0x893b, 0x893c, 0x893d, 0x893e, 0x893f, + 0x8940, 0x8942, 0x8943, 0x8945, 0x8946, 0x8947, 0x8948, 0x8949, + 0x894a, 0x894b, 0x894c, 0x894d, 0x894e, 0x894f, 0x8950, 0x8951, + 0x8952, 0x8953, 0x8954, 0x8955, 0x8956, 0x8957, 0x8958, 0x8959, + 0x895a, 0x895b, 0x895c, 0x895d, 0x8960, 0x8961, 0x8962, 0x8963, + 0x8964, 0x8965, 0x8967, 0x8968, 0x8969, 0x896a, 0x896b, 0x896c, + 0x896d, 0x896e, 0x896f, 0x8970, 0x8971, 0x8972, 0x8973, 0x8974, + 0x8975, 0x8976, 0x8977, 0x8978, 0x8979, 0x897a, 0x897c, 0x897d, + 0x897e, 0x8980, 0x8982, 0x8984, 0x8985, 0x8987, 0x8988, 0x8989, + 0x898a, 0x898b, 0x898c, 0x898d, 0x898e, 0x898f, 0x8990, 0x8991, + 0x8992, 0x8993, 0x8994, 0x8995, 0x8996, 0x8997, 0x8998, 0x8999, + 0x899a, 0x899b, 0x899c, 0x899d, 0x899e, 0x899f, 0x89a0, 0x89a1, + 0x6447, 0x5c27, 0x9065, 0x7a91, 0x8c23, 0x59da, 0x54ac, 0x8200, + 0x836f, 0x8981, 0x8000, 0x6930, 0x564e, 0x8036, 0x7237, 0x91ce, + 0x51b6, 0x4e5f, 0x9875, 0x6396, 0x4e1a, 0x53f6, 0x66f3, 0x814b, + 0x591c, 0x6db2, 0x4e00, 0x58f9, 0x533b, 0x63d6, 0x94f1, 0x4f9d, + 0x4f0a, 0x8863, 0x9890, 0x5937, 0x9057, 0x79fb, 0x4eea, 0x80f0, + 0x7591, 0x6c82, 0x5b9c, 0x59e8, 0x5f5d, 0x6905, 0x8681, 0x501a, + 0x5df2, 0x4e59, 0x77e3, 0x4ee5, 0x827a, 0x6291, 0x6613, 0x9091, + 0x5c79, 0x4ebf, 0x5f79, 0x81c6, 0x9038, 0x8084, 0x75ab, 0x4ea6, + 0x88d4, 0x610f, 0x6bc5, 0x5fc6, 0x4e49, 0x76ca, 0x6ea2, 0x8be3, + 0x8bae, 0x8c0a, 0x8bd1, 0x5f02, 0x7ffc, 0x7fcc, 0x7ece, 0x8335, + 0x836b, 0x56e0, 0x6bb7, 0x97f3, 0x9634, 0x59fb, 0x541f, 0x94f6, + 0x6deb, 0x5bc5, 0x996e, 0x5c39, 0x5f15, 0x9690, + /* 0xd3 */ + 0x89a2, 0x89a3, 0x89a4, 0x89a5, 0x89a6, 0x89a7, 0x89a8, 0x89a9, + 0x89aa, 0x89ab, 0x89ac, 0x89ad, 0x89ae, 0x89af, 0x89b0, 0x89b1, + 0x89b2, 0x89b3, 0x89b4, 0x89b5, 0x89b6, 0x89b7, 0x89b8, 0x89b9, + 0x89ba, 0x89bb, 0x89bc, 0x89bd, 0x89be, 0x89bf, 0x89c0, 0x89c3, + 0x89cd, 0x89d3, 0x89d4, 0x89d5, 0x89d7, 0x89d8, 0x89d9, 0x89db, + 0x89dd, 0x89df, 0x89e0, 0x89e1, 0x89e2, 0x89e4, 0x89e7, 0x89e8, + 0x89e9, 0x89ea, 0x89ec, 0x89ed, 0x89ee, 0x89f0, 0x89f1, 0x89f2, + 0x89f4, 0x89f5, 0x89f6, 0x89f7, 0x89f8, 0x89f9, 0x89fa, 0x89fb, + 0x89fc, 0x89fd, 0x89fe, 0x89ff, 0x8a01, 0x8a02, 0x8a03, 0x8a04, + 0x8a05, 0x8a06, 0x8a08, 0x8a09, 0x8a0a, 0x8a0b, 0x8a0c, 0x8a0d, + 0x8a0e, 0x8a0f, 0x8a10, 0x8a11, 0x8a12, 0x8a13, 0x8a14, 0x8a15, + 0x8a16, 0x8a17, 0x8a18, 0x8a19, 0x8a1a, 0x8a1b, 0x8a1c, 0x8a1d, + 0x5370, 0x82f1, 0x6a31, 0x5a74, 0x9e70, 0x5e94, 0x7f28, 0x83b9, + 0x8424, 0x8425, 0x8367, 0x8747, 0x8fce, 0x8d62, 0x76c8, 0x5f71, + 0x9896, 0x786c, 0x6620, 0x54df, 0x62e5, 0x4f63, 0x81c3, 0x75c8, + 0x5eb8, 0x96cd, 0x8e0a, 0x86f9, 0x548f, 0x6cf3, 0x6d8c, 0x6c38, + 0x607f, 0x52c7, 0x7528, 0x5e7d, 0x4f18, 0x60a0, 0x5fe7, 0x5c24, + 0x7531, 0x90ae, 0x94c0, 0x72b9, 0x6cb9, 0x6e38, 0x9149, 0x6709, + 0x53cb, 0x53f3, 0x4f51, 0x91c9, 0x8bf1, 0x53c8, 0x5e7c, 0x8fc2, + 0x6de4, 0x4e8e, 0x76c2, 0x6986, 0x865e, 0x611a, 0x8206, 0x4f59, + 0x4fde, 0x903e, 0x9c7c, 0x6109, 0x6e1d, 0x6e14, 0x9685, 0x4e88, + 0x5a31, 0x96e8, 0x4e0e, 0x5c7f, 0x79b9, 0x5b87, 0x8bed, 0x7fbd, + 0x7389, 0x57df, 0x828b, 0x90c1, 0x5401, 0x9047, 0x55bb, 0x5cea, + 0x5fa1, 0x6108, 0x6b32, 0x72f1, 0x80b2, 0x8a89, + /* 0xd4 */ + 0x8a1e, 0x8a1f, 0x8a20, 0x8a21, 0x8a22, 0x8a23, 0x8a24, 0x8a25, + 0x8a26, 0x8a27, 0x8a28, 0x8a29, 0x8a2a, 0x8a2b, 0x8a2c, 0x8a2d, + 0x8a2e, 0x8a2f, 0x8a30, 0x8a31, 0x8a32, 0x8a33, 0x8a34, 0x8a35, + 0x8a36, 0x8a37, 0x8a38, 0x8a39, 0x8a3a, 0x8a3b, 0x8a3c, 0x8a3d, + 0x8a3f, 0x8a40, 0x8a41, 0x8a42, 0x8a43, 0x8a44, 0x8a45, 0x8a46, + 0x8a47, 0x8a49, 0x8a4a, 0x8a4b, 0x8a4c, 0x8a4d, 0x8a4e, 0x8a4f, + 0x8a50, 0x8a51, 0x8a52, 0x8a53, 0x8a54, 0x8a55, 0x8a56, 0x8a57, + 0x8a58, 0x8a59, 0x8a5a, 0x8a5b, 0x8a5c, 0x8a5d, 0x8a5e, 0x8a5f, + 0x8a60, 0x8a61, 0x8a62, 0x8a63, 0x8a64, 0x8a65, 0x8a66, 0x8a67, + 0x8a68, 0x8a69, 0x8a6a, 0x8a6b, 0x8a6c, 0x8a6d, 0x8a6e, 0x8a6f, + 0x8a70, 0x8a71, 0x8a72, 0x8a73, 0x8a74, 0x8a75, 0x8a76, 0x8a77, + 0x8a78, 0x8a7a, 0x8a7b, 0x8a7c, 0x8a7d, 0x8a7e, 0x8a7f, 0x8a80, + 0x6d74, 0x5bd3, 0x88d5, 0x9884, 0x8c6b, 0x9a6d, 0x9e33, 0x6e0a, + 0x51a4, 0x5143, 0x57a3, 0x8881, 0x539f, 0x63f4, 0x8f95, 0x56ed, + 0x5458, 0x5706, 0x733f, 0x6e90, 0x7f18, 0x8fdc, 0x82d1, 0x613f, + 0x6028, 0x9662, 0x66f0, 0x7ea6, 0x8d8a, 0x8dc3, 0x94a5, 0x5cb3, + 0x7ca4, 0x6708, 0x60a6, 0x9605, 0x8018, 0x4e91, 0x90e7, 0x5300, + 0x9668, 0x5141, 0x8fd0, 0x8574, 0x915d, 0x6655, 0x97f5, 0x5b55, + 0x531d, 0x7838, 0x6742, 0x683d, 0x54c9, 0x707e, 0x5bb0, 0x8f7d, + 0x518d, 0x5728, 0x54b1, 0x6512, 0x6682, 0x8d5e, 0x8d43, 0x810f, + 0x846c, 0x906d, 0x7cdf, 0x51ff, 0x85fb, 0x67a3, 0x65e9, 0x6fa1, + 0x86a4, 0x8e81, 0x566a, 0x9020, 0x7682, 0x7076, 0x71e5, 0x8d23, + 0x62e9, 0x5219, 0x6cfd, 0x8d3c, 0x600e, 0x589e, 0x618e, 0x66fe, + 0x8d60, 0x624e, 0x55b3, 0x6e23, 0x672d, 0x8f67, + /* 0xd5 */ + 0x8a81, 0x8a82, 0x8a83, 0x8a84, 0x8a85, 0x8a86, 0x8a87, 0x8a88, + 0x8a8b, 0x8a8c, 0x8a8d, 0x8a8e, 0x8a8f, 0x8a90, 0x8a91, 0x8a92, + 0x8a94, 0x8a95, 0x8a96, 0x8a97, 0x8a98, 0x8a99, 0x8a9a, 0x8a9b, + 0x8a9c, 0x8a9d, 0x8a9e, 0x8a9f, 0x8aa0, 0x8aa1, 0x8aa2, 0x8aa3, + 0x8aa4, 0x8aa5, 0x8aa6, 0x8aa7, 0x8aa8, 0x8aa9, 0x8aaa, 0x8aab, + 0x8aac, 0x8aad, 0x8aae, 0x8aaf, 0x8ab0, 0x8ab1, 0x8ab2, 0x8ab3, + 0x8ab4, 0x8ab5, 0x8ab6, 0x8ab7, 0x8ab8, 0x8ab9, 0x8aba, 0x8abb, + 0x8abc, 0x8abd, 0x8abe, 0x8abf, 0x8ac0, 0x8ac1, 0x8ac2, 0x8ac3, + 0x8ac4, 0x8ac5, 0x8ac6, 0x8ac7, 0x8ac8, 0x8ac9, 0x8aca, 0x8acb, + 0x8acc, 0x8acd, 0x8ace, 0x8acf, 0x8ad0, 0x8ad1, 0x8ad2, 0x8ad3, + 0x8ad4, 0x8ad5, 0x8ad6, 0x8ad7, 0x8ad8, 0x8ad9, 0x8ada, 0x8adb, + 0x8adc, 0x8add, 0x8ade, 0x8adf, 0x8ae0, 0x8ae1, 0x8ae2, 0x8ae3, + 0x94e1, 0x95f8, 0x7728, 0x6805, 0x69a8, 0x548b, 0x4e4d, 0x70b8, + 0x8bc8, 0x6458, 0x658b, 0x5b85, 0x7a84, 0x503a, 0x5be8, 0x77bb, + 0x6be1, 0x8a79, 0x7c98, 0x6cbe, 0x76cf, 0x65a9, 0x8f97, 0x5d2d, + 0x5c55, 0x8638, 0x6808, 0x5360, 0x6218, 0x7ad9, 0x6e5b, 0x7efd, + 0x6a1f, 0x7ae0, 0x5f70, 0x6f33, 0x5f20, 0x638c, 0x6da8, 0x6756, + 0x4e08, 0x5e10, 0x8d26, 0x4ed7, 0x80c0, 0x7634, 0x969c, 0x62db, + 0x662d, 0x627e, 0x6cbc, 0x8d75, 0x7167, 0x7f69, 0x5146, 0x8087, + 0x53ec, 0x906e, 0x6298, 0x54f2, 0x86f0, 0x8f99, 0x8005, 0x9517, + 0x8517, 0x8fd9, 0x6d59, 0x73cd, 0x659f, 0x771f, 0x7504, 0x7827, + 0x81fb, 0x8d1e, 0x9488, 0x4fa6, 0x6795, 0x75b9, 0x8bca, 0x9707, + 0x632f, 0x9547, 0x9635, 0x84b8, 0x6323, 0x7741, 0x5f81, 0x72f0, + 0x4e89, 0x6014, 0x6574, 0x62ef, 0x6b63, 0x653f, + /* 0xd6 */ + 0x8ae4, 0x8ae5, 0x8ae6, 0x8ae7, 0x8ae8, 0x8ae9, 0x8aea, 0x8aeb, + 0x8aec, 0x8aed, 0x8aee, 0x8aef, 0x8af0, 0x8af1, 0x8af2, 0x8af3, + 0x8af4, 0x8af5, 0x8af6, 0x8af7, 0x8af8, 0x8af9, 0x8afa, 0x8afb, + 0x8afc, 0x8afd, 0x8afe, 0x8aff, 0x8b00, 0x8b01, 0x8b02, 0x8b03, + 0x8b04, 0x8b05, 0x8b06, 0x8b08, 0x8b09, 0x8b0a, 0x8b0b, 0x8b0c, + 0x8b0d, 0x8b0e, 0x8b0f, 0x8b10, 0x8b11, 0x8b12, 0x8b13, 0x8b14, + 0x8b15, 0x8b16, 0x8b17, 0x8b18, 0x8b19, 0x8b1a, 0x8b1b, 0x8b1c, + 0x8b1d, 0x8b1e, 0x8b1f, 0x8b20, 0x8b21, 0x8b22, 0x8b23, 0x8b24, + 0x8b25, 0x8b27, 0x8b28, 0x8b29, 0x8b2a, 0x8b2b, 0x8b2c, 0x8b2d, + 0x8b2e, 0x8b2f, 0x8b30, 0x8b31, 0x8b32, 0x8b33, 0x8b34, 0x8b35, + 0x8b36, 0x8b37, 0x8b38, 0x8b39, 0x8b3a, 0x8b3b, 0x8b3c, 0x8b3d, + 0x8b3e, 0x8b3f, 0x8b40, 0x8b41, 0x8b42, 0x8b43, 0x8b44, 0x8b45, + 0x5e27, 0x75c7, 0x90d1, 0x8bc1, 0x829d, 0x679d, 0x652f, 0x5431, + 0x8718, 0x77e5, 0x80a2, 0x8102, 0x6c41, 0x4e4b, 0x7ec7, 0x804c, + 0x76f4, 0x690d, 0x6b96, 0x6267, 0x503c, 0x4f84, 0x5740, 0x6307, + 0x6b62, 0x8dbe, 0x53ea, 0x65e8, 0x7eb8, 0x5fd7, 0x631a, 0x63b7, + 0x81f3, 0x81f4, 0x7f6e, 0x5e1c, 0x5cd9, 0x5236, 0x667a, 0x79e9, + 0x7a1a, 0x8d28, 0x7099, 0x75d4, 0x6ede, 0x6cbb, 0x7a92, 0x4e2d, + 0x76c5, 0x5fe0, 0x949f, 0x8877, 0x7ec8, 0x79cd, 0x80bf, 0x91cd, + 0x4ef2, 0x4f17, 0x821f, 0x5468, 0x5dde, 0x6d32, 0x8bcc, 0x7ca5, + 0x8f74, 0x8098, 0x5e1a, 0x5492, 0x76b1, 0x5b99, 0x663c, 0x9aa4, + 0x73e0, 0x682a, 0x86db, 0x6731, 0x732a, 0x8bf8, 0x8bdb, 0x9010, + 0x7af9, 0x70db, 0x716e, 0x62c4, 0x77a9, 0x5631, 0x4e3b, 0x8457, + 0x67f1, 0x52a9, 0x86c0, 0x8d2e, 0x94f8, 0x7b51, + /* 0xd7 */ + 0x8b46, 0x8b47, 0x8b48, 0x8b49, 0x8b4a, 0x8b4b, 0x8b4c, 0x8b4d, + 0x8b4e, 0x8b4f, 0x8b50, 0x8b51, 0x8b52, 0x8b53, 0x8b54, 0x8b55, + 0x8b56, 0x8b57, 0x8b58, 0x8b59, 0x8b5a, 0x8b5b, 0x8b5c, 0x8b5d, + 0x8b5e, 0x8b5f, 0x8b60, 0x8b61, 0x8b62, 0x8b63, 0x8b64, 0x8b65, + 0x8b67, 0x8b68, 0x8b69, 0x8b6a, 0x8b6b, 0x8b6d, 0x8b6e, 0x8b6f, + 0x8b70, 0x8b71, 0x8b72, 0x8b73, 0x8b74, 0x8b75, 0x8b76, 0x8b77, + 0x8b78, 0x8b79, 0x8b7a, 0x8b7b, 0x8b7c, 0x8b7d, 0x8b7e, 0x8b7f, + 0x8b80, 0x8b81, 0x8b82, 0x8b83, 0x8b84, 0x8b85, 0x8b86, 0x8b87, + 0x8b88, 0x8b89, 0x8b8a, 0x8b8b, 0x8b8c, 0x8b8d, 0x8b8e, 0x8b8f, + 0x8b90, 0x8b91, 0x8b92, 0x8b93, 0x8b94, 0x8b95, 0x8b96, 0x8b97, + 0x8b98, 0x8b99, 0x8b9a, 0x8b9b, 0x8b9c, 0x8b9d, 0x8b9e, 0x8b9f, + 0x8bac, 0x8bb1, 0x8bbb, 0x8bc7, 0x8bd0, 0x8bea, 0x8c09, 0x8c1e, + 0x4f4f, 0x6ce8, 0x795d, 0x9a7b, 0x6293, 0x722a, 0x62fd, 0x4e13, + 0x7816, 0x8f6c, 0x64b0, 0x8d5a, 0x7bc6, 0x6869, 0x5e84, 0x88c5, + 0x5986, 0x649e, 0x58ee, 0x72b6, 0x690e, 0x9525, 0x8ffd, 0x8d58, + 0x5760, 0x7f00, 0x8c06, 0x51c6, 0x6349, 0x62d9, 0x5353, 0x684c, + 0x7422, 0x8301, 0x914c, 0x5544, 0x7740, 0x707c, 0x6d4a, 0x5179, + 0x54a8, 0x8d44, 0x59ff, 0x6ecb, 0x6dc4, 0x5b5c, 0x7d2b, 0x4ed4, + 0x7c7d, 0x6ed3, 0x5b50, 0x81ea, 0x6e0d, 0x5b57, 0x9b03, 0x68d5, + 0x8e2a, 0x5b97, 0x7efc, 0x603b, 0x7eb5, 0x90b9, 0x8d70, 0x594f, + 0x63cd, 0x79df, 0x8db3, 0x5352, 0x65cf, 0x7956, 0x8bc5, 0x963b, + 0x7ec4, 0x94bb, 0x7e82, 0x5634, 0x9189, 0x6700, 0x7f6a, 0x5c0a, + 0x9075, 0x6628, 0x5de6, 0x4f50, 0x67de, 0x505a, 0x4f5c, 0x5750, + 0x5ea7, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + /* 0xd8 */ + 0x8c38, 0x8c39, 0x8c3a, 0x8c3b, 0x8c3c, 0x8c3d, 0x8c3e, 0x8c3f, + 0x8c40, 0x8c42, 0x8c43, 0x8c44, 0x8c45, 0x8c48, 0x8c4a, 0x8c4b, + 0x8c4d, 0x8c4e, 0x8c4f, 0x8c50, 0x8c51, 0x8c52, 0x8c53, 0x8c54, + 0x8c56, 0x8c57, 0x8c58, 0x8c59, 0x8c5b, 0x8c5c, 0x8c5d, 0x8c5e, + 0x8c5f, 0x8c60, 0x8c63, 0x8c64, 0x8c65, 0x8c66, 0x8c67, 0x8c68, + 0x8c69, 0x8c6c, 0x8c6d, 0x8c6e, 0x8c6f, 0x8c70, 0x8c71, 0x8c72, + 0x8c74, 0x8c75, 0x8c76, 0x8c77, 0x8c7b, 0x8c7c, 0x8c7d, 0x8c7e, + 0x8c7f, 0x8c80, 0x8c81, 0x8c83, 0x8c84, 0x8c86, 0x8c87, 0x8c88, + 0x8c8b, 0x8c8d, 0x8c8e, 0x8c8f, 0x8c90, 0x8c91, 0x8c92, 0x8c93, + 0x8c95, 0x8c96, 0x8c97, 0x8c99, 0x8c9a, 0x8c9b, 0x8c9c, 0x8c9d, + 0x8c9e, 0x8c9f, 0x8ca0, 0x8ca1, 0x8ca2, 0x8ca3, 0x8ca4, 0x8ca5, + 0x8ca6, 0x8ca7, 0x8ca8, 0x8ca9, 0x8caa, 0x8cab, 0x8cac, 0x8cad, + 0x4e8d, 0x4e0c, 0x5140, 0x4e10, 0x5eff, 0x5345, 0x4e15, 0x4e98, + 0x4e1e, 0x9b32, 0x5b6c, 0x5669, 0x4e28, 0x79ba, 0x4e3f, 0x5315, + 0x4e47, 0x592d, 0x723b, 0x536e, 0x6c10, 0x56df, 0x80e4, 0x9997, + 0x6bd3, 0x777e, 0x9f17, 0x4e36, 0x4e9f, 0x9f10, 0x4e5c, 0x4e69, + 0x4e93, 0x8288, 0x5b5b, 0x556c, 0x560f, 0x4ec4, 0x538d, 0x539d, + 0x53a3, 0x53a5, 0x53ae, 0x9765, 0x8d5d, 0x531a, 0x53f5, 0x5326, + 0x532e, 0x533e, 0x8d5c, 0x5366, 0x5363, 0x5202, 0x5208, 0x520e, + 0x522d, 0x5233, 0x523f, 0x5240, 0x524c, 0x525e, 0x5261, 0x525c, + 0x84af, 0x527d, 0x5282, 0x5281, 0x5290, 0x5293, 0x5182, 0x7f54, + 0x4ebb, 0x4ec3, 0x4ec9, 0x4ec2, 0x4ee8, 0x4ee1, 0x4eeb, 0x4ede, + 0x4f1b, 0x4ef3, 0x4f22, 0x4f64, 0x4ef5, 0x4f25, 0x4f27, 0x4f09, + 0x4f2b, 0x4f5e, 0x4f67, 0x6538, 0x4f5a, 0x4f5d, + /* 0xd9 */ + 0x8cae, 0x8caf, 0x8cb0, 0x8cb1, 0x8cb2, 0x8cb3, 0x8cb4, 0x8cb5, + 0x8cb6, 0x8cb7, 0x8cb8, 0x8cb9, 0x8cba, 0x8cbb, 0x8cbc, 0x8cbd, + 0x8cbe, 0x8cbf, 0x8cc0, 0x8cc1, 0x8cc2, 0x8cc3, 0x8cc4, 0x8cc5, + 0x8cc6, 0x8cc7, 0x8cc8, 0x8cc9, 0x8cca, 0x8ccb, 0x8ccc, 0x8ccd, + 0x8cce, 0x8ccf, 0x8cd0, 0x8cd1, 0x8cd2, 0x8cd3, 0x8cd4, 0x8cd5, + 0x8cd6, 0x8cd7, 0x8cd8, 0x8cd9, 0x8cda, 0x8cdb, 0x8cdc, 0x8cdd, + 0x8cde, 0x8cdf, 0x8ce0, 0x8ce1, 0x8ce2, 0x8ce3, 0x8ce4, 0x8ce5, + 0x8ce6, 0x8ce7, 0x8ce8, 0x8ce9, 0x8cea, 0x8ceb, 0x8cec, 0x8ced, + 0x8cee, 0x8cef, 0x8cf0, 0x8cf1, 0x8cf2, 0x8cf3, 0x8cf4, 0x8cf5, + 0x8cf6, 0x8cf7, 0x8cf8, 0x8cf9, 0x8cfa, 0x8cfb, 0x8cfc, 0x8cfd, + 0x8cfe, 0x8cff, 0x8d00, 0x8d01, 0x8d02, 0x8d03, 0x8d04, 0x8d05, + 0x8d06, 0x8d07, 0x8d08, 0x8d09, 0x8d0a, 0x8d0b, 0x8d0c, 0x8d0d, + 0x4f5f, 0x4f57, 0x4f32, 0x4f3d, 0x4f76, 0x4f74, 0x4f91, 0x4f89, + 0x4f83, 0x4f8f, 0x4f7e, 0x4f7b, 0x4faa, 0x4f7c, 0x4fac, 0x4f94, + 0x4fe6, 0x4fe8, 0x4fea, 0x4fc5, 0x4fda, 0x4fe3, 0x4fdc, 0x4fd1, + 0x4fdf, 0x4ff8, 0x5029, 0x504c, 0x4ff3, 0x502c, 0x500f, 0x502e, + 0x502d, 0x4ffe, 0x501c, 0x500c, 0x5025, 0x5028, 0x507e, 0x5043, + 0x5055, 0x5048, 0x504e, 0x506c, 0x507b, 0x50a5, 0x50a7, 0x50a9, + 0x50ba, 0x50d6, 0x5106, 0x50ed, 0x50ec, 0x50e6, 0x50ee, 0x5107, + 0x510b, 0x4edd, 0x6c3d, 0x4f58, 0x4f65, 0x4fce, 0x9fa0, 0x6c46, + 0x7c74, 0x516e, 0x5dfd, 0x9ec9, 0x9998, 0x5181, 0x5914, 0x52f9, + 0x530d, 0x8a07, 0x5310, 0x51eb, 0x5919, 0x5155, 0x4ea0, 0x5156, + 0x4eb3, 0x886e, 0x88a4, 0x4eb5, 0x8114, 0x88d2, 0x7980, 0x5b34, + 0x8803, 0x7fb8, 0x51ab, 0x51b1, 0x51bd, 0x51bc, + /* 0xda */ + 0x8d0e, 0x8d0f, 0x8d10, 0x8d11, 0x8d12, 0x8d13, 0x8d14, 0x8d15, + 0x8d16, 0x8d17, 0x8d18, 0x8d19, 0x8d1a, 0x8d1b, 0x8d1c, 0x8d20, + 0x8d51, 0x8d52, 0x8d57, 0x8d5f, 0x8d65, 0x8d68, 0x8d69, 0x8d6a, + 0x8d6c, 0x8d6e, 0x8d6f, 0x8d71, 0x8d72, 0x8d78, 0x8d79, 0x8d7a, + 0x8d7b, 0x8d7c, 0x8d7d, 0x8d7e, 0x8d7f, 0x8d80, 0x8d82, 0x8d83, + 0x8d86, 0x8d87, 0x8d88, 0x8d89, 0x8d8c, 0x8d8d, 0x8d8e, 0x8d8f, + 0x8d90, 0x8d92, 0x8d93, 0x8d95, 0x8d96, 0x8d97, 0x8d98, 0x8d99, + 0x8d9a, 0x8d9b, 0x8d9c, 0x8d9d, 0x8d9e, 0x8da0, 0x8da1, 0x8da2, + 0x8da4, 0x8da5, 0x8da6, 0x8da7, 0x8da8, 0x8da9, 0x8daa, 0x8dab, + 0x8dac, 0x8dad, 0x8dae, 0x8daf, 0x8db0, 0x8db2, 0x8db6, 0x8db7, + 0x8db9, 0x8dbb, 0x8dbd, 0x8dc0, 0x8dc1, 0x8dc2, 0x8dc5, 0x8dc7, + 0x8dc8, 0x8dc9, 0x8dca, 0x8dcd, 0x8dd0, 0x8dd2, 0x8dd3, 0x8dd4, + 0x51c7, 0x5196, 0x51a2, 0x51a5, 0x8ba0, 0x8ba6, 0x8ba7, 0x8baa, + 0x8bb4, 0x8bb5, 0x8bb7, 0x8bc2, 0x8bc3, 0x8bcb, 0x8bcf, 0x8bce, + 0x8bd2, 0x8bd3, 0x8bd4, 0x8bd6, 0x8bd8, 0x8bd9, 0x8bdc, 0x8bdf, + 0x8be0, 0x8be4, 0x8be8, 0x8be9, 0x8bee, 0x8bf0, 0x8bf3, 0x8bf6, + 0x8bf9, 0x8bfc, 0x8bff, 0x8c00, 0x8c02, 0x8c04, 0x8c07, 0x8c0c, + 0x8c0f, 0x8c11, 0x8c12, 0x8c14, 0x8c15, 0x8c16, 0x8c19, 0x8c1b, + 0x8c18, 0x8c1d, 0x8c1f, 0x8c20, 0x8c21, 0x8c25, 0x8c27, 0x8c2a, + 0x8c2b, 0x8c2e, 0x8c2f, 0x8c32, 0x8c33, 0x8c35, 0x8c36, 0x5369, + 0x537a, 0x961d, 0x9622, 0x9621, 0x9631, 0x962a, 0x963d, 0x963c, + 0x9642, 0x9649, 0x9654, 0x965f, 0x9667, 0x966c, 0x9672, 0x9674, + 0x9688, 0x968d, 0x9697, 0x96b0, 0x9097, 0x909b, 0x909d, 0x9099, + 0x90ac, 0x90a1, 0x90b4, 0x90b3, 0x90b6, 0x90ba, + /* 0xdb */ + 0x8dd5, 0x8dd8, 0x8dd9, 0x8ddc, 0x8de0, 0x8de1, 0x8de2, 0x8de5, + 0x8de6, 0x8de7, 0x8de9, 0x8ded, 0x8dee, 0x8df0, 0x8df1, 0x8df2, + 0x8df4, 0x8df6, 0x8dfc, 0x8dfe, 0x8dff, 0x8e00, 0x8e01, 0x8e02, + 0x8e03, 0x8e04, 0x8e06, 0x8e07, 0x8e08, 0x8e0b, 0x8e0d, 0x8e0e, + 0x8e10, 0x8e11, 0x8e12, 0x8e13, 0x8e15, 0x8e16, 0x8e17, 0x8e18, + 0x8e19, 0x8e1a, 0x8e1b, 0x8e1c, 0x8e20, 0x8e21, 0x8e24, 0x8e25, + 0x8e26, 0x8e27, 0x8e28, 0x8e2b, 0x8e2d, 0x8e30, 0x8e32, 0x8e33, + 0x8e34, 0x8e36, 0x8e37, 0x8e38, 0x8e3b, 0x8e3c, 0x8e3e, 0x8e3f, + 0x8e43, 0x8e45, 0x8e46, 0x8e4c, 0x8e4d, 0x8e4e, 0x8e4f, 0x8e50, + 0x8e53, 0x8e54, 0x8e55, 0x8e56, 0x8e57, 0x8e58, 0x8e5a, 0x8e5b, + 0x8e5c, 0x8e5d, 0x8e5e, 0x8e5f, 0x8e60, 0x8e61, 0x8e62, 0x8e63, + 0x8e64, 0x8e65, 0x8e67, 0x8e68, 0x8e6a, 0x8e6b, 0x8e6e, 0x8e71, + 0x90b8, 0x90b0, 0x90cf, 0x90c5, 0x90be, 0x90d0, 0x90c4, 0x90c7, + 0x90d3, 0x90e6, 0x90e2, 0x90dc, 0x90d7, 0x90db, 0x90eb, 0x90ef, + 0x90fe, 0x9104, 0x9122, 0x911e, 0x9123, 0x9131, 0x912f, 0x9139, + 0x9143, 0x9146, 0x520d, 0x5942, 0x52a2, 0x52ac, 0x52ad, 0x52be, + 0x54ff, 0x52d0, 0x52d6, 0x52f0, 0x53df, 0x71ee, 0x77cd, 0x5ef4, + 0x51f5, 0x51fc, 0x9b2f, 0x53b6, 0x5f01, 0x755a, 0x5def, 0x574c, + 0x57a9, 0x57a1, 0x587e, 0x58bc, 0x58c5, 0x58d1, 0x5729, 0x572c, + 0x572a, 0x5733, 0x5739, 0x572e, 0x572f, 0x575c, 0x573b, 0x5742, + 0x5769, 0x5785, 0x576b, 0x5786, 0x577c, 0x577b, 0x5768, 0x576d, + 0x5776, 0x5773, 0x57ad, 0x57a4, 0x578c, 0x57b2, 0x57cf, 0x57a7, + 0x57b4, 0x5793, 0x57a0, 0x57d5, 0x57d8, 0x57da, 0x57d9, 0x57d2, + 0x57b8, 0x57f4, 0x57ef, 0x57f8, 0x57e4, 0x57dd, + /* 0xdc */ + 0x8e73, 0x8e75, 0x8e77, 0x8e78, 0x8e79, 0x8e7a, 0x8e7b, 0x8e7d, + 0x8e7e, 0x8e80, 0x8e82, 0x8e83, 0x8e84, 0x8e86, 0x8e88, 0x8e89, + 0x8e8a, 0x8e8b, 0x8e8c, 0x8e8d, 0x8e8e, 0x8e91, 0x8e92, 0x8e93, + 0x8e95, 0x8e96, 0x8e97, 0x8e98, 0x8e99, 0x8e9a, 0x8e9b, 0x8e9d, + 0x8e9f, 0x8ea0, 0x8ea1, 0x8ea2, 0x8ea3, 0x8ea4, 0x8ea5, 0x8ea6, + 0x8ea7, 0x8ea8, 0x8ea9, 0x8eaa, 0x8ead, 0x8eae, 0x8eb0, 0x8eb1, + 0x8eb3, 0x8eb4, 0x8eb5, 0x8eb6, 0x8eb7, 0x8eb8, 0x8eb9, 0x8ebb, + 0x8ebc, 0x8ebd, 0x8ebe, 0x8ebf, 0x8ec0, 0x8ec1, 0x8ec2, 0x8ec3, + 0x8ec4, 0x8ec5, 0x8ec6, 0x8ec7, 0x8ec8, 0x8ec9, 0x8eca, 0x8ecb, + 0x8ecc, 0x8ecd, 0x8ecf, 0x8ed0, 0x8ed1, 0x8ed2, 0x8ed3, 0x8ed4, + 0x8ed5, 0x8ed6, 0x8ed7, 0x8ed8, 0x8ed9, 0x8eda, 0x8edb, 0x8edc, + 0x8edd, 0x8ede, 0x8edf, 0x8ee0, 0x8ee1, 0x8ee2, 0x8ee3, 0x8ee4, + 0x580b, 0x580d, 0x57fd, 0x57ed, 0x5800, 0x581e, 0x5819, 0x5844, + 0x5820, 0x5865, 0x586c, 0x5881, 0x5889, 0x589a, 0x5880, 0x99a8, + 0x9f19, 0x61ff, 0x8279, 0x827d, 0x827f, 0x828f, 0x828a, 0x82a8, + 0x8284, 0x828e, 0x8291, 0x8297, 0x8299, 0x82ab, 0x82b8, 0x82be, + 0x82b0, 0x82c8, 0x82ca, 0x82e3, 0x8298, 0x82b7, 0x82ae, 0x82cb, + 0x82cc, 0x82c1, 0x82a9, 0x82b4, 0x82a1, 0x82aa, 0x829f, 0x82c4, + 0x82ce, 0x82a4, 0x82e1, 0x8309, 0x82f7, 0x82e4, 0x830f, 0x8307, + 0x82dc, 0x82f4, 0x82d2, 0x82d8, 0x830c, 0x82fb, 0x82d3, 0x8311, + 0x831a, 0x8306, 0x8314, 0x8315, 0x82e0, 0x82d5, 0x831c, 0x8351, + 0x835b, 0x835c, 0x8308, 0x8392, 0x833c, 0x8334, 0x8331, 0x839b, + 0x835e, 0x832f, 0x834f, 0x8347, 0x8343, 0x835f, 0x8340, 0x8317, + 0x8360, 0x832d, 0x833a, 0x8333, 0x8366, 0x8365, + /* 0xdd */ + 0x8ee5, 0x8ee6, 0x8ee7, 0x8ee8, 0x8ee9, 0x8eea, 0x8eeb, 0x8eec, + 0x8eed, 0x8eee, 0x8eef, 0x8ef0, 0x8ef1, 0x8ef2, 0x8ef3, 0x8ef4, + 0x8ef5, 0x8ef6, 0x8ef7, 0x8ef8, 0x8ef9, 0x8efa, 0x8efb, 0x8efc, + 0x8efd, 0x8efe, 0x8eff, 0x8f00, 0x8f01, 0x8f02, 0x8f03, 0x8f04, + 0x8f05, 0x8f06, 0x8f07, 0x8f08, 0x8f09, 0x8f0a, 0x8f0b, 0x8f0c, + 0x8f0d, 0x8f0e, 0x8f0f, 0x8f10, 0x8f11, 0x8f12, 0x8f13, 0x8f14, + 0x8f15, 0x8f16, 0x8f17, 0x8f18, 0x8f19, 0x8f1a, 0x8f1b, 0x8f1c, + 0x8f1d, 0x8f1e, 0x8f1f, 0x8f20, 0x8f21, 0x8f22, 0x8f23, 0x8f24, + 0x8f25, 0x8f26, 0x8f27, 0x8f28, 0x8f29, 0x8f2a, 0x8f2b, 0x8f2c, + 0x8f2d, 0x8f2e, 0x8f2f, 0x8f30, 0x8f31, 0x8f32, 0x8f33, 0x8f34, + 0x8f35, 0x8f36, 0x8f37, 0x8f38, 0x8f39, 0x8f3a, 0x8f3b, 0x8f3c, + 0x8f3d, 0x8f3e, 0x8f3f, 0x8f40, 0x8f41, 0x8f42, 0x8f43, 0x8f44, + 0x8368, 0x831b, 0x8369, 0x836c, 0x836a, 0x836d, 0x836e, 0x83b0, + 0x8378, 0x83b3, 0x83b4, 0x83a0, 0x83aa, 0x8393, 0x839c, 0x8385, + 0x837c, 0x83b6, 0x83a9, 0x837d, 0x83b8, 0x837b, 0x8398, 0x839e, + 0x83a8, 0x83ba, 0x83bc, 0x83c1, 0x8401, 0x83e5, 0x83d8, 0x5807, + 0x8418, 0x840b, 0x83dd, 0x83fd, 0x83d6, 0x841c, 0x8438, 0x8411, + 0x8406, 0x83d4, 0x83df, 0x840f, 0x8403, 0x83f8, 0x83f9, 0x83ea, + 0x83c5, 0x83c0, 0x8426, 0x83f0, 0x83e1, 0x845c, 0x8451, 0x845a, + 0x8459, 0x8473, 0x8487, 0x8488, 0x847a, 0x8489, 0x8478, 0x843c, + 0x8446, 0x8469, 0x8476, 0x848c, 0x848e, 0x8431, 0x846d, 0x84c1, + 0x84cd, 0x84d0, 0x84e6, 0x84bd, 0x84d3, 0x84ca, 0x84bf, 0x84ba, + 0x84e0, 0x84a1, 0x84b9, 0x84b4, 0x8497, 0x84e5, 0x84e3, 0x850c, + 0x750d, 0x8538, 0x84f0, 0x8539, 0x851f, 0x853a, + /* 0xde */ + 0x8f45, 0x8f46, 0x8f47, 0x8f48, 0x8f49, 0x8f4a, 0x8f4b, 0x8f4c, + 0x8f4d, 0x8f4e, 0x8f4f, 0x8f50, 0x8f51, 0x8f52, 0x8f53, 0x8f54, + 0x8f55, 0x8f56, 0x8f57, 0x8f58, 0x8f59, 0x8f5a, 0x8f5b, 0x8f5c, + 0x8f5d, 0x8f5e, 0x8f5f, 0x8f60, 0x8f61, 0x8f62, 0x8f63, 0x8f64, + 0x8f65, 0x8f6a, 0x8f80, 0x8f8c, 0x8f92, 0x8f9d, 0x8fa0, 0x8fa1, + 0x8fa2, 0x8fa4, 0x8fa5, 0x8fa6, 0x8fa7, 0x8faa, 0x8fac, 0x8fad, + 0x8fae, 0x8faf, 0x8fb2, 0x8fb3, 0x8fb4, 0x8fb5, 0x8fb7, 0x8fb8, + 0x8fba, 0x8fbb, 0x8fbc, 0x8fbf, 0x8fc0, 0x8fc3, 0x8fc6, 0x8fc9, + 0x8fca, 0x8fcb, 0x8fcc, 0x8fcd, 0x8fcf, 0x8fd2, 0x8fd6, 0x8fd7, + 0x8fda, 0x8fe0, 0x8fe1, 0x8fe3, 0x8fe7, 0x8fec, 0x8fef, 0x8ff1, + 0x8ff2, 0x8ff4, 0x8ff5, 0x8ff6, 0x8ffa, 0x8ffb, 0x8ffc, 0x8ffe, + 0x8fff, 0x9007, 0x9008, 0x900c, 0x900e, 0x9013, 0x9015, 0x9018, + 0x8556, 0x853b, 0x84ff, 0x84fc, 0x8559, 0x8548, 0x8568, 0x8564, + 0x855e, 0x857a, 0x77a2, 0x8543, 0x8572, 0x857b, 0x85a4, 0x85a8, + 0x8587, 0x858f, 0x8579, 0x85ae, 0x859c, 0x8585, 0x85b9, 0x85b7, + 0x85b0, 0x85d3, 0x85c1, 0x85dc, 0x85ff, 0x8627, 0x8605, 0x8629, + 0x8616, 0x863c, 0x5efe, 0x5f08, 0x593c, 0x5941, 0x8037, 0x5955, + 0x595a, 0x5958, 0x530f, 0x5c22, 0x5c25, 0x5c2c, 0x5c34, 0x624c, + 0x626a, 0x629f, 0x62bb, 0x62ca, 0x62da, 0x62d7, 0x62ee, 0x6322, + 0x62f6, 0x6339, 0x634b, 0x6343, 0x63ad, 0x63f6, 0x6371, 0x637a, + 0x638e, 0x63b4, 0x636d, 0x63ac, 0x638a, 0x6369, 0x63ae, 0x63bc, + 0x63f2, 0x63f8, 0x63e0, 0x63ff, 0x63c4, 0x63de, 0x63ce, 0x6452, + 0x63c6, 0x63be, 0x6445, 0x6441, 0x640b, 0x641b, 0x6420, 0x640c, + 0x6426, 0x6421, 0x645e, 0x6484, 0x646d, 0x6496, + /* 0xdf */ + 0x9019, 0x901c, 0x9023, 0x9024, 0x9025, 0x9027, 0x9028, 0x9029, + 0x902a, 0x902b, 0x902c, 0x9030, 0x9031, 0x9032, 0x9033, 0x9034, + 0x9037, 0x9039, 0x903a, 0x903d, 0x903f, 0x9040, 0x9043, 0x9045, + 0x9046, 0x9048, 0x9049, 0x904a, 0x904b, 0x904c, 0x904e, 0x9054, + 0x9055, 0x9056, 0x9059, 0x905a, 0x905c, 0x905d, 0x905e, 0x905f, + 0x9060, 0x9061, 0x9064, 0x9066, 0x9067, 0x9069, 0x906a, 0x906b, + 0x906c, 0x906f, 0x9070, 0x9071, 0x9072, 0x9073, 0x9076, 0x9077, + 0x9078, 0x9079, 0x907a, 0x907b, 0x907c, 0x907e, 0x9081, 0x9084, + 0x9085, 0x9086, 0x9087, 0x9089, 0x908a, 0x908c, 0x908d, 0x908e, + 0x908f, 0x9090, 0x9092, 0x9094, 0x9096, 0x9098, 0x909a, 0x909c, + 0x909e, 0x909f, 0x90a0, 0x90a4, 0x90a5, 0x90a7, 0x90a8, 0x90a9, + 0x90ab, 0x90ad, 0x90b2, 0x90b7, 0x90bc, 0x90bd, 0x90bf, 0x90c0, + 0x647a, 0x64b7, 0x64b8, 0x6499, 0x64ba, 0x64c0, 0x64d0, 0x64d7, + 0x64e4, 0x64e2, 0x6509, 0x6525, 0x652e, 0x5f0b, 0x5fd2, 0x7519, + 0x5f11, 0x535f, 0x53f1, 0x53fd, 0x53e9, 0x53e8, 0x53fb, 0x5412, + 0x5416, 0x5406, 0x544b, 0x5452, 0x5453, 0x5454, 0x5456, 0x5443, + 0x5421, 0x5457, 0x5459, 0x5423, 0x5432, 0x5482, 0x5494, 0x5477, + 0x5471, 0x5464, 0x549a, 0x549b, 0x5484, 0x5476, 0x5466, 0x549d, + 0x54d0, 0x54ad, 0x54c2, 0x54b4, 0x54d2, 0x54a7, 0x54a6, 0x54d3, + 0x54d4, 0x5472, 0x54a3, 0x54d5, 0x54bb, 0x54bf, 0x54cc, 0x54d9, + 0x54da, 0x54dc, 0x54a9, 0x54aa, 0x54a4, 0x54dd, 0x54cf, 0x54de, + 0x551b, 0x54e7, 0x5520, 0x54fd, 0x5514, 0x54f3, 0x5522, 0x5523, + 0x550f, 0x5511, 0x5527, 0x552a, 0x5567, 0x558f, 0x55b5, 0x5549, + 0x556d, 0x5541, 0x5555, 0x553f, 0x5550, 0x553c, + /* 0xe0 */ + 0x90c2, 0x90c3, 0x90c6, 0x90c8, 0x90c9, 0x90cb, 0x90cc, 0x90cd, + 0x90d2, 0x90d4, 0x90d5, 0x90d6, 0x90d8, 0x90d9, 0x90da, 0x90de, + 0x90df, 0x90e0, 0x90e3, 0x90e4, 0x90e5, 0x90e9, 0x90ea, 0x90ec, + 0x90ee, 0x90f0, 0x90f1, 0x90f2, 0x90f3, 0x90f5, 0x90f6, 0x90f7, + 0x90f9, 0x90fa, 0x90fb, 0x90fc, 0x90ff, 0x9100, 0x9101, 0x9103, + 0x9105, 0x9106, 0x9107, 0x9108, 0x9109, 0x910a, 0x910b, 0x910c, + 0x910d, 0x910e, 0x910f, 0x9110, 0x9111, 0x9112, 0x9113, 0x9114, + 0x9115, 0x9116, 0x9117, 0x9118, 0x911a, 0x911b, 0x911c, 0x911d, + 0x911f, 0x9120, 0x9121, 0x9124, 0x9125, 0x9126, 0x9127, 0x9128, + 0x9129, 0x912a, 0x912b, 0x912c, 0x912d, 0x912e, 0x9130, 0x9132, + 0x9133, 0x9134, 0x9135, 0x9136, 0x9137, 0x9138, 0x913a, 0x913b, + 0x913c, 0x913d, 0x913e, 0x913f, 0x9140, 0x9141, 0x9142, 0x9144, + 0x5537, 0x5556, 0x5575, 0x5576, 0x5577, 0x5533, 0x5530, 0x555c, + 0x558b, 0x55d2, 0x5583, 0x55b1, 0x55b9, 0x5588, 0x5581, 0x559f, + 0x557e, 0x55d6, 0x5591, 0x557b, 0x55df, 0x55bd, 0x55be, 0x5594, + 0x5599, 0x55ea, 0x55f7, 0x55c9, 0x561f, 0x55d1, 0x55eb, 0x55ec, + 0x55d4, 0x55e6, 0x55dd, 0x55c4, 0x55ef, 0x55e5, 0x55f2, 0x55f3, + 0x55cc, 0x55cd, 0x55e8, 0x55f5, 0x55e4, 0x8f94, 0x561e, 0x5608, + 0x560c, 0x5601, 0x5624, 0x5623, 0x55fe, 0x5600, 0x5627, 0x562d, + 0x5658, 0x5639, 0x5657, 0x562c, 0x564d, 0x5662, 0x5659, 0x565c, + 0x564c, 0x5654, 0x5686, 0x5664, 0x5671, 0x566b, 0x567b, 0x567c, + 0x5685, 0x5693, 0x56af, 0x56d4, 0x56d7, 0x56dd, 0x56e1, 0x56f5, + 0x56eb, 0x56f9, 0x56ff, 0x5704, 0x570a, 0x5709, 0x571c, 0x5e0f, + 0x5e19, 0x5e14, 0x5e11, 0x5e31, 0x5e3b, 0x5e3c, + /* 0xe1 */ + 0x9145, 0x9147, 0x9148, 0x9151, 0x9153, 0x9154, 0x9155, 0x9156, + 0x9158, 0x9159, 0x915b, 0x915c, 0x915f, 0x9160, 0x9166, 0x9167, + 0x9168, 0x916b, 0x916d, 0x9173, 0x917a, 0x917b, 0x917c, 0x9180, + 0x9181, 0x9182, 0x9183, 0x9184, 0x9186, 0x9188, 0x918a, 0x918e, + 0x918f, 0x9193, 0x9194, 0x9195, 0x9196, 0x9197, 0x9198, 0x9199, + 0x919c, 0x919d, 0x919e, 0x919f, 0x91a0, 0x91a1, 0x91a4, 0x91a5, + 0x91a6, 0x91a7, 0x91a8, 0x91a9, 0x91ab, 0x91ac, 0x91b0, 0x91b1, + 0x91b2, 0x91b3, 0x91b6, 0x91b7, 0x91b8, 0x91b9, 0x91bb, 0x91bc, + 0x91bd, 0x91be, 0x91bf, 0x91c0, 0x91c1, 0x91c2, 0x91c3, 0x91c4, + 0x91c5, 0x91c6, 0x91c8, 0x91cb, 0x91d0, 0x91d2, 0x91d3, 0x91d4, + 0x91d5, 0x91d6, 0x91d7, 0x91d8, 0x91d9, 0x91da, 0x91db, 0x91dd, + 0x91de, 0x91df, 0x91e0, 0x91e1, 0x91e2, 0x91e3, 0x91e4, 0x91e5, + 0x5e37, 0x5e44, 0x5e54, 0x5e5b, 0x5e5e, 0x5e61, 0x5c8c, 0x5c7a, + 0x5c8d, 0x5c90, 0x5c96, 0x5c88, 0x5c98, 0x5c99, 0x5c91, 0x5c9a, + 0x5c9c, 0x5cb5, 0x5ca2, 0x5cbd, 0x5cac, 0x5cab, 0x5cb1, 0x5ca3, + 0x5cc1, 0x5cb7, 0x5cc4, 0x5cd2, 0x5ce4, 0x5ccb, 0x5ce5, 0x5d02, + 0x5d03, 0x5d27, 0x5d26, 0x5d2e, 0x5d24, 0x5d1e, 0x5d06, 0x5d1b, + 0x5d58, 0x5d3e, 0x5d34, 0x5d3d, 0x5d6c, 0x5d5b, 0x5d6f, 0x5d5d, + 0x5d6b, 0x5d4b, 0x5d4a, 0x5d69, 0x5d74, 0x5d82, 0x5d99, 0x5d9d, + 0x8c73, 0x5db7, 0x5dc5, 0x5f73, 0x5f77, 0x5f82, 0x5f87, 0x5f89, + 0x5f8c, 0x5f95, 0x5f99, 0x5f9c, 0x5fa8, 0x5fad, 0x5fb5, 0x5fbc, + 0x8862, 0x5f61, 0x72ad, 0x72b0, 0x72b4, 0x72b7, 0x72b8, 0x72c3, + 0x72c1, 0x72ce, 0x72cd, 0x72d2, 0x72e8, 0x72ef, 0x72e9, 0x72f2, + 0x72f4, 0x72f7, 0x7301, 0x72f3, 0x7303, 0x72fa, + /* 0xe2 */ + 0x91e6, 0x91e7, 0x91e8, 0x91e9, 0x91ea, 0x91eb, 0x91ec, 0x91ed, + 0x91ee, 0x91ef, 0x91f0, 0x91f1, 0x91f2, 0x91f3, 0x91f4, 0x91f5, + 0x91f6, 0x91f7, 0x91f8, 0x91f9, 0x91fa, 0x91fb, 0x91fc, 0x91fd, + 0x91fe, 0x91ff, 0x9200, 0x9201, 0x9202, 0x9203, 0x9204, 0x9205, + 0x9206, 0x9207, 0x9208, 0x9209, 0x920a, 0x920b, 0x920c, 0x920d, + 0x920e, 0x920f, 0x9210, 0x9211, 0x9212, 0x9213, 0x9214, 0x9215, + 0x9216, 0x9217, 0x9218, 0x9219, 0x921a, 0x921b, 0x921c, 0x921d, + 0x921e, 0x921f, 0x9220, 0x9221, 0x9222, 0x9223, 0x9224, 0x9225, + 0x9226, 0x9227, 0x9228, 0x9229, 0x922a, 0x922b, 0x922c, 0x922d, + 0x922e, 0x922f, 0x9230, 0x9231, 0x9232, 0x9233, 0x9234, 0x9235, + 0x9236, 0x9237, 0x9238, 0x9239, 0x923a, 0x923b, 0x923c, 0x923d, + 0x923e, 0x923f, 0x9240, 0x9241, 0x9242, 0x9243, 0x9244, 0x9245, + 0x72fb, 0x7317, 0x7313, 0x7321, 0x730a, 0x731e, 0x731d, 0x7315, + 0x7322, 0x7339, 0x7325, 0x732c, 0x7338, 0x7331, 0x7350, 0x734d, + 0x7357, 0x7360, 0x736c, 0x736f, 0x737e, 0x821b, 0x5925, 0x98e7, + 0x5924, 0x5902, 0x9963, 0x9967, 0x9968, 0x9969, 0x996a, 0x996b, + 0x996c, 0x9974, 0x9977, 0x997d, 0x9980, 0x9984, 0x9987, 0x998a, + 0x998d, 0x9990, 0x9991, 0x9993, 0x9994, 0x9995, 0x5e80, 0x5e91, + 0x5e8b, 0x5e96, 0x5ea5, 0x5ea0, 0x5eb9, 0x5eb5, 0x5ebe, 0x5eb3, + 0x8d53, 0x5ed2, 0x5ed1, 0x5edb, 0x5ee8, 0x5eea, 0x81ba, 0x5fc4, + 0x5fc9, 0x5fd6, 0x5fcf, 0x6003, 0x5fee, 0x6004, 0x5fe1, 0x5fe4, + 0x5ffe, 0x6005, 0x6006, 0x5fea, 0x5fed, 0x5ff8, 0x6019, 0x6035, + 0x6026, 0x601b, 0x600f, 0x600d, 0x6029, 0x602b, 0x600a, 0x603f, + 0x6021, 0x6078, 0x6079, 0x607b, 0x607a, 0x6042, + /* 0xe3 */ + 0x9246, 0x9247, 0x9248, 0x9249, 0x924a, 0x924b, 0x924c, 0x924d, + 0x924e, 0x924f, 0x9250, 0x9251, 0x9252, 0x9253, 0x9254, 0x9255, + 0x9256, 0x9257, 0x9258, 0x9259, 0x925a, 0x925b, 0x925c, 0x925d, + 0x925e, 0x925f, 0x9260, 0x9261, 0x9262, 0x9263, 0x9264, 0x9265, + 0x9266, 0x9267, 0x9268, 0x9269, 0x926a, 0x926b, 0x926c, 0x926d, + 0x926e, 0x926f, 0x9270, 0x9271, 0x9272, 0x9273, 0x9275, 0x9276, + 0x9277, 0x9278, 0x9279, 0x927a, 0x927b, 0x927c, 0x927d, 0x927e, + 0x927f, 0x9280, 0x9281, 0x9282, 0x9283, 0x9284, 0x9285, 0x9286, + 0x9287, 0x9288, 0x9289, 0x928a, 0x928b, 0x928c, 0x928d, 0x928f, + 0x9290, 0x9291, 0x9292, 0x9293, 0x9294, 0x9295, 0x9296, 0x9297, + 0x9298, 0x9299, 0x929a, 0x929b, 0x929c, 0x929d, 0x929e, 0x929f, + 0x92a0, 0x92a1, 0x92a2, 0x92a3, 0x92a4, 0x92a5, 0x92a6, 0x92a7, + 0x606a, 0x607d, 0x6096, 0x609a, 0x60ad, 0x609d, 0x6083, 0x6092, + 0x608c, 0x609b, 0x60ec, 0x60bb, 0x60b1, 0x60dd, 0x60d8, 0x60c6, + 0x60da, 0x60b4, 0x6120, 0x6126, 0x6115, 0x6123, 0x60f4, 0x6100, + 0x610e, 0x612b, 0x614a, 0x6175, 0x61ac, 0x6194, 0x61a7, 0x61b7, + 0x61d4, 0x61f5, 0x5fdd, 0x96b3, 0x95e9, 0x95eb, 0x95f1, 0x95f3, + 0x95f5, 0x95f6, 0x95fc, 0x95fe, 0x9603, 0x9604, 0x9606, 0x9608, + 0x960a, 0x960b, 0x960c, 0x960d, 0x960f, 0x9612, 0x9615, 0x9616, + 0x9617, 0x9619, 0x961a, 0x4e2c, 0x723f, 0x6215, 0x6c35, 0x6c54, + 0x6c5c, 0x6c4a, 0x6ca3, 0x6c85, 0x6c90, 0x6c94, 0x6c8c, 0x6c68, + 0x6c69, 0x6c74, 0x6c76, 0x6c86, 0x6ca9, 0x6cd0, 0x6cd4, 0x6cad, + 0x6cf7, 0x6cf8, 0x6cf1, 0x6cd7, 0x6cb2, 0x6ce0, 0x6cd6, 0x6cfa, + 0x6ceb, 0x6cee, 0x6cb1, 0x6cd3, 0x6cef, 0x6cfe, + /* 0xe4 */ + 0x92a8, 0x92a9, 0x92aa, 0x92ab, 0x92ac, 0x92ad, 0x92af, 0x92b0, + 0x92b1, 0x92b2, 0x92b3, 0x92b4, 0x92b5, 0x92b6, 0x92b7, 0x92b8, + 0x92b9, 0x92ba, 0x92bb, 0x92bc, 0x92bd, 0x92be, 0x92bf, 0x92c0, + 0x92c1, 0x92c2, 0x92c3, 0x92c4, 0x92c5, 0x92c6, 0x92c7, 0x92c9, + 0x92ca, 0x92cb, 0x92cc, 0x92cd, 0x92ce, 0x92cf, 0x92d0, 0x92d1, + 0x92d2, 0x92d3, 0x92d4, 0x92d5, 0x92d6, 0x92d7, 0x92d8, 0x92d9, + 0x92da, 0x92db, 0x92dc, 0x92dd, 0x92de, 0x92df, 0x92e0, 0x92e1, + 0x92e2, 0x92e3, 0x92e4, 0x92e5, 0x92e6, 0x92e7, 0x92e8, 0x92e9, + 0x92ea, 0x92eb, 0x92ec, 0x92ed, 0x92ee, 0x92ef, 0x92f0, 0x92f1, + 0x92f2, 0x92f3, 0x92f4, 0x92f5, 0x92f6, 0x92f7, 0x92f8, 0x92f9, + 0x92fa, 0x92fb, 0x92fc, 0x92fd, 0x92fe, 0x92ff, 0x9300, 0x9301, + 0x9302, 0x9303, 0x9304, 0x9305, 0x9306, 0x9307, 0x9308, 0x9309, + 0x6d39, 0x6d27, 0x6d0c, 0x6d43, 0x6d48, 0x6d07, 0x6d04, 0x6d19, + 0x6d0e, 0x6d2b, 0x6d4d, 0x6d2e, 0x6d35, 0x6d1a, 0x6d4f, 0x6d52, + 0x6d54, 0x6d33, 0x6d91, 0x6d6f, 0x6d9e, 0x6da0, 0x6d5e, 0x6d93, + 0x6d94, 0x6d5c, 0x6d60, 0x6d7c, 0x6d63, 0x6e1a, 0x6dc7, 0x6dc5, + 0x6dde, 0x6e0e, 0x6dbf, 0x6de0, 0x6e11, 0x6de6, 0x6ddd, 0x6dd9, + 0x6e16, 0x6dab, 0x6e0c, 0x6dae, 0x6e2b, 0x6e6e, 0x6e4e, 0x6e6b, + 0x6eb2, 0x6e5f, 0x6e86, 0x6e53, 0x6e54, 0x6e32, 0x6e25, 0x6e44, + 0x6edf, 0x6eb1, 0x6e98, 0x6ee0, 0x6f2d, 0x6ee2, 0x6ea5, 0x6ea7, + 0x6ebd, 0x6ebb, 0x6eb7, 0x6ed7, 0x6eb4, 0x6ecf, 0x6e8f, 0x6ec2, + 0x6e9f, 0x6f62, 0x6f46, 0x6f47, 0x6f24, 0x6f15, 0x6ef9, 0x6f2f, + 0x6f36, 0x6f4b, 0x6f74, 0x6f2a, 0x6f09, 0x6f29, 0x6f89, 0x6f8d, + 0x6f8c, 0x6f78, 0x6f72, 0x6f7c, 0x6f7a, 0x6fd1, + /* 0xe5 */ + 0x930a, 0x930b, 0x930c, 0x930d, 0x930e, 0x930f, 0x9310, 0x9311, + 0x9312, 0x9313, 0x9314, 0x9315, 0x9316, 0x9317, 0x9318, 0x9319, + 0x931a, 0x931b, 0x931c, 0x931d, 0x931e, 0x931f, 0x9320, 0x9321, + 0x9322, 0x9323, 0x9324, 0x9325, 0x9326, 0x9327, 0x9328, 0x9329, + 0x932a, 0x932b, 0x932c, 0x932d, 0x932e, 0x932f, 0x9330, 0x9331, + 0x9332, 0x9333, 0x9334, 0x9335, 0x9336, 0x9337, 0x9338, 0x9339, + 0x933a, 0x933b, 0x933c, 0x933d, 0x933f, 0x9340, 0x9341, 0x9342, + 0x9343, 0x9344, 0x9345, 0x9346, 0x9347, 0x9348, 0x9349, 0x934a, + 0x934b, 0x934c, 0x934d, 0x934e, 0x934f, 0x9350, 0x9351, 0x9352, + 0x9353, 0x9354, 0x9355, 0x9356, 0x9357, 0x9358, 0x9359, 0x935a, + 0x935b, 0x935c, 0x935d, 0x935e, 0x935f, 0x9360, 0x9361, 0x9362, + 0x9363, 0x9364, 0x9365, 0x9366, 0x9367, 0x9368, 0x9369, 0x936b, + 0x6fc9, 0x6fa7, 0x6fb9, 0x6fb6, 0x6fc2, 0x6fe1, 0x6fee, 0x6fde, + 0x6fe0, 0x6fef, 0x701a, 0x7023, 0x701b, 0x7039, 0x7035, 0x704f, + 0x705e, 0x5b80, 0x5b84, 0x5b95, 0x5b93, 0x5ba5, 0x5bb8, 0x752f, + 0x9a9e, 0x6434, 0x5be4, 0x5bee, 0x8930, 0x5bf0, 0x8e47, 0x8b07, + 0x8fb6, 0x8fd3, 0x8fd5, 0x8fe5, 0x8fee, 0x8fe4, 0x8fe9, 0x8fe6, + 0x8ff3, 0x8fe8, 0x9005, 0x9004, 0x900b, 0x9026, 0x9011, 0x900d, + 0x9016, 0x9021, 0x9035, 0x9036, 0x902d, 0x902f, 0x9044, 0x9051, + 0x9052, 0x9050, 0x9068, 0x9058, 0x9062, 0x905b, 0x66b9, 0x9074, + 0x907d, 0x9082, 0x9088, 0x9083, 0x908b, 0x5f50, 0x5f57, 0x5f56, + 0x5f58, 0x5c3b, 0x54ab, 0x5c50, 0x5c59, 0x5b71, 0x5c63, 0x5c66, + 0x7fbc, 0x5f2a, 0x5f29, 0x5f2d, 0x8274, 0x5f3c, 0x9b3b, 0x5c6e, + 0x5981, 0x5983, 0x598d, 0x59a9, 0x59aa, 0x59a3, + /* 0xe6 */ + 0x936c, 0x936d, 0x936e, 0x936f, 0x9370, 0x9371, 0x9372, 0x9373, + 0x9374, 0x9375, 0x9376, 0x9377, 0x9378, 0x9379, 0x937a, 0x937b, + 0x937c, 0x937d, 0x937e, 0x937f, 0x9380, 0x9381, 0x9382, 0x9383, + 0x9384, 0x9385, 0x9386, 0x9387, 0x9388, 0x9389, 0x938a, 0x938b, + 0x938c, 0x938d, 0x938e, 0x9390, 0x9391, 0x9392, 0x9393, 0x9394, + 0x9395, 0x9396, 0x9397, 0x9398, 0x9399, 0x939a, 0x939b, 0x939c, + 0x939d, 0x939e, 0x939f, 0x93a0, 0x93a1, 0x93a2, 0x93a3, 0x93a4, + 0x93a5, 0x93a6, 0x93a7, 0x93a8, 0x93a9, 0x93aa, 0x93ab, 0x93ac, + 0x93ad, 0x93ae, 0x93af, 0x93b0, 0x93b1, 0x93b2, 0x93b3, 0x93b4, + 0x93b5, 0x93b6, 0x93b7, 0x93b8, 0x93b9, 0x93ba, 0x93bb, 0x93bc, + 0x93bd, 0x93be, 0x93bf, 0x93c0, 0x93c1, 0x93c2, 0x93c3, 0x93c4, + 0x93c5, 0x93c6, 0x93c7, 0x93c8, 0x93c9, 0x93cb, 0x93cc, 0x93cd, + 0x5997, 0x59ca, 0x59ab, 0x599e, 0x59a4, 0x59d2, 0x59b2, 0x59af, + 0x59d7, 0x59be, 0x5a05, 0x5a06, 0x59dd, 0x5a08, 0x59e3, 0x59d8, + 0x59f9, 0x5a0c, 0x5a09, 0x5a32, 0x5a34, 0x5a11, 0x5a23, 0x5a13, + 0x5a40, 0x5a67, 0x5a4a, 0x5a55, 0x5a3c, 0x5a62, 0x5a75, 0x80ec, + 0x5aaa, 0x5a9b, 0x5a77, 0x5a7a, 0x5abe, 0x5aeb, 0x5ab2, 0x5ad2, + 0x5ad4, 0x5ab8, 0x5ae0, 0x5ae3, 0x5af1, 0x5ad6, 0x5ae6, 0x5ad8, + 0x5adc, 0x5b09, 0x5b17, 0x5b16, 0x5b32, 0x5b37, 0x5b40, 0x5c15, + 0x5c1c, 0x5b5a, 0x5b65, 0x5b73, 0x5b51, 0x5b53, 0x5b62, 0x9a75, + 0x9a77, 0x9a78, 0x9a7a, 0x9a7f, 0x9a7d, 0x9a80, 0x9a81, 0x9a85, + 0x9a88, 0x9a8a, 0x9a90, 0x9a92, 0x9a93, 0x9a96, 0x9a98, 0x9a9b, + 0x9a9c, 0x9a9d, 0x9a9f, 0x9aa0, 0x9aa2, 0x9aa3, 0x9aa5, 0x9aa7, + 0x7e9f, 0x7ea1, 0x7ea3, 0x7ea5, 0x7ea8, 0x7ea9, + /* 0xe7 */ + 0x93ce, 0x93cf, 0x93d0, 0x93d1, 0x93d2, 0x93d3, 0x93d4, 0x93d5, + 0x93d7, 0x93d8, 0x93d9, 0x93da, 0x93db, 0x93dc, 0x93dd, 0x93de, + 0x93df, 0x93e0, 0x93e1, 0x93e2, 0x93e3, 0x93e4, 0x93e5, 0x93e6, + 0x93e7, 0x93e8, 0x93e9, 0x93ea, 0x93eb, 0x93ec, 0x93ed, 0x93ee, + 0x93ef, 0x93f0, 0x93f1, 0x93f2, 0x93f3, 0x93f4, 0x93f5, 0x93f6, + 0x93f7, 0x93f8, 0x93f9, 0x93fa, 0x93fb, 0x93fc, 0x93fd, 0x93fe, + 0x93ff, 0x9400, 0x9401, 0x9402, 0x9403, 0x9404, 0x9405, 0x9406, + 0x9407, 0x9408, 0x9409, 0x940a, 0x940b, 0x940c, 0x940d, 0x940e, + 0x940f, 0x9410, 0x9411, 0x9412, 0x9413, 0x9414, 0x9415, 0x9416, + 0x9417, 0x9418, 0x9419, 0x941a, 0x941b, 0x941c, 0x941d, 0x941e, + 0x941f, 0x9420, 0x9421, 0x9422, 0x9423, 0x9424, 0x9425, 0x9426, + 0x9427, 0x9428, 0x9429, 0x942a, 0x942b, 0x942c, 0x942d, 0x942e, + 0x7ead, 0x7eb0, 0x7ebe, 0x7ec0, 0x7ec1, 0x7ec2, 0x7ec9, 0x7ecb, + 0x7ecc, 0x7ed0, 0x7ed4, 0x7ed7, 0x7edb, 0x7ee0, 0x7ee1, 0x7ee8, + 0x7eeb, 0x7eee, 0x7eef, 0x7ef1, 0x7ef2, 0x7f0d, 0x7ef6, 0x7efa, + 0x7efb, 0x7efe, 0x7f01, 0x7f02, 0x7f03, 0x7f07, 0x7f08, 0x7f0b, + 0x7f0c, 0x7f0f, 0x7f11, 0x7f12, 0x7f17, 0x7f19, 0x7f1c, 0x7f1b, + 0x7f1f, 0x7f21, 0x7f22, 0x7f23, 0x7f24, 0x7f25, 0x7f26, 0x7f27, + 0x7f2a, 0x7f2b, 0x7f2c, 0x7f2d, 0x7f2f, 0x7f30, 0x7f31, 0x7f32, + 0x7f33, 0x7f35, 0x5e7a, 0x757f, 0x5ddb, 0x753e, 0x9095, 0x738e, + 0x7391, 0x73ae, 0x73a2, 0x739f, 0x73cf, 0x73c2, 0x73d1, 0x73b7, + 0x73b3, 0x73c0, 0x73c9, 0x73c8, 0x73e5, 0x73d9, 0x987c, 0x740a, + 0x73e9, 0x73e7, 0x73de, 0x73ba, 0x73f2, 0x740f, 0x742a, 0x745b, + 0x7426, 0x7425, 0x7428, 0x7430, 0x742e, 0x742c, + /* 0xe8 */ + 0x942f, 0x9430, 0x9431, 0x9432, 0x9433, 0x9434, 0x9435, 0x9436, + 0x9437, 0x9438, 0x9439, 0x943a, 0x943b, 0x943c, 0x943d, 0x943f, + 0x9440, 0x9441, 0x9442, 0x9443, 0x9444, 0x9445, 0x9446, 0x9447, + 0x9448, 0x9449, 0x944a, 0x944b, 0x944c, 0x944d, 0x944e, 0x944f, + 0x9450, 0x9451, 0x9452, 0x9453, 0x9454, 0x9455, 0x9456, 0x9457, + 0x9458, 0x9459, 0x945a, 0x945b, 0x945c, 0x945d, 0x945e, 0x945f, + 0x9460, 0x9461, 0x9462, 0x9463, 0x9464, 0x9465, 0x9466, 0x9467, + 0x9468, 0x9469, 0x946a, 0x946c, 0x946d, 0x946e, 0x946f, 0x9470, + 0x9471, 0x9472, 0x9473, 0x9474, 0x9475, 0x9476, 0x9477, 0x9478, + 0x9479, 0x947a, 0x947b, 0x947c, 0x947d, 0x947e, 0x947f, 0x9480, + 0x9481, 0x9482, 0x9483, 0x9484, 0x9491, 0x9496, 0x9498, 0x94c7, + 0x94cf, 0x94d3, 0x94d4, 0x94da, 0x94e6, 0x94fb, 0x951c, 0x9520, + 0x741b, 0x741a, 0x7441, 0x745c, 0x7457, 0x7455, 0x7459, 0x7477, + 0x746d, 0x747e, 0x749c, 0x748e, 0x7480, 0x7481, 0x7487, 0x748b, + 0x749e, 0x74a8, 0x74a9, 0x7490, 0x74a7, 0x74d2, 0x74ba, 0x97ea, + 0x97eb, 0x97ec, 0x674c, 0x6753, 0x675e, 0x6748, 0x6769, 0x67a5, + 0x6787, 0x676a, 0x6773, 0x6798, 0x67a7, 0x6775, 0x67a8, 0x679e, + 0x67ad, 0x678b, 0x6777, 0x677c, 0x67f0, 0x6809, 0x67d8, 0x680a, + 0x67e9, 0x67b0, 0x680c, 0x67d9, 0x67b5, 0x67da, 0x67b3, 0x67dd, + 0x6800, 0x67c3, 0x67b8, 0x67e2, 0x680e, 0x67c1, 0x67fd, 0x6832, + 0x6833, 0x6860, 0x6861, 0x684e, 0x6862, 0x6844, 0x6864, 0x6883, + 0x681d, 0x6855, 0x6866, 0x6841, 0x6867, 0x6840, 0x683e, 0x684a, + 0x6849, 0x6829, 0x68b5, 0x688f, 0x6874, 0x6877, 0x6893, 0x686b, + 0x68c2, 0x696e, 0x68fc, 0x691f, 0x6920, 0x68f9, + /* 0xe9 */ + 0x9527, 0x9533, 0x953d, 0x9543, 0x9548, 0x954b, 0x9555, 0x955a, + 0x9560, 0x956e, 0x9574, 0x9575, 0x9577, 0x9578, 0x9579, 0x957a, + 0x957b, 0x957c, 0x957d, 0x957e, 0x9580, 0x9581, 0x9582, 0x9583, + 0x9584, 0x9585, 0x9586, 0x9587, 0x9588, 0x9589, 0x958a, 0x958b, + 0x958c, 0x958d, 0x958e, 0x958f, 0x9590, 0x9591, 0x9592, 0x9593, + 0x9594, 0x9595, 0x9596, 0x9597, 0x9598, 0x9599, 0x959a, 0x959b, + 0x959c, 0x959d, 0x959e, 0x959f, 0x95a0, 0x95a1, 0x95a2, 0x95a3, + 0x95a4, 0x95a5, 0x95a6, 0x95a7, 0x95a8, 0x95a9, 0x95aa, 0x95ab, + 0x95ac, 0x95ad, 0x95ae, 0x95af, 0x95b0, 0x95b1, 0x95b2, 0x95b3, + 0x95b4, 0x95b5, 0x95b6, 0x95b7, 0x95b8, 0x95b9, 0x95ba, 0x95bb, + 0x95bc, 0x95bd, 0x95be, 0x95bf, 0x95c0, 0x95c1, 0x95c2, 0x95c3, + 0x95c4, 0x95c5, 0x95c6, 0x95c7, 0x95c8, 0x95c9, 0x95ca, 0x95cb, + 0x6924, 0x68f0, 0x690b, 0x6901, 0x6957, 0x68e3, 0x6910, 0x6971, + 0x6939, 0x6960, 0x6942, 0x695d, 0x6984, 0x696b, 0x6980, 0x6998, + 0x6978, 0x6934, 0x69cc, 0x6987, 0x6988, 0x69ce, 0x6989, 0x6966, + 0x6963, 0x6979, 0x699b, 0x69a7, 0x69bb, 0x69ab, 0x69ad, 0x69d4, + 0x69b1, 0x69c1, 0x69ca, 0x69df, 0x6995, 0x69e0, 0x698d, 0x69ff, + 0x6a2f, 0x69ed, 0x6a17, 0x6a18, 0x6a65, 0x69f2, 0x6a44, 0x6a3e, + 0x6aa0, 0x6a50, 0x6a5b, 0x6a35, 0x6a8e, 0x6a79, 0x6a3d, 0x6a28, + 0x6a58, 0x6a7c, 0x6a91, 0x6a90, 0x6aa9, 0x6a97, 0x6aab, 0x7337, + 0x7352, 0x6b81, 0x6b82, 0x6b87, 0x6b84, 0x6b92, 0x6b93, 0x6b8d, + 0x6b9a, 0x6b9b, 0x6ba1, 0x6baa, 0x8f6b, 0x8f6d, 0x8f71, 0x8f72, + 0x8f73, 0x8f75, 0x8f76, 0x8f78, 0x8f77, 0x8f79, 0x8f7a, 0x8f7c, + 0x8f7e, 0x8f81, 0x8f82, 0x8f84, 0x8f87, 0x8f8b, + /* 0xea */ + 0x95cc, 0x95cd, 0x95ce, 0x95cf, 0x95d0, 0x95d1, 0x95d2, 0x95d3, + 0x95d4, 0x95d5, 0x95d6, 0x95d7, 0x95d8, 0x95d9, 0x95da, 0x95db, + 0x95dc, 0x95dd, 0x95de, 0x95df, 0x95e0, 0x95e1, 0x95e2, 0x95e3, + 0x95e4, 0x95e5, 0x95e6, 0x95e7, 0x95ec, 0x95ff, 0x9607, 0x9613, + 0x9618, 0x961b, 0x961e, 0x9620, 0x9623, 0x9624, 0x9625, 0x9626, + 0x9627, 0x9628, 0x9629, 0x962b, 0x962c, 0x962d, 0x962f, 0x9630, + 0x9637, 0x9638, 0x9639, 0x963a, 0x963e, 0x9641, 0x9643, 0x964a, + 0x964e, 0x964f, 0x9651, 0x9652, 0x9653, 0x9656, 0x9657, 0x9658, + 0x9659, 0x965a, 0x965c, 0x965d, 0x965e, 0x9660, 0x9663, 0x9665, + 0x9666, 0x966b, 0x966d, 0x966e, 0x966f, 0x9670, 0x9671, 0x9673, + 0x9678, 0x9679, 0x967a, 0x967b, 0x967c, 0x967d, 0x967e, 0x967f, + 0x9680, 0x9681, 0x9682, 0x9683, 0x9684, 0x9687, 0x9689, 0x968a, + 0x8f8d, 0x8f8e, 0x8f8f, 0x8f98, 0x8f9a, 0x8ece, 0x620b, 0x6217, + 0x621b, 0x621f, 0x6222, 0x6221, 0x6225, 0x6224, 0x622c, 0x81e7, + 0x74ef, 0x74f4, 0x74ff, 0x750f, 0x7511, 0x7513, 0x6534, 0x65ee, + 0x65ef, 0x65f0, 0x660a, 0x6619, 0x6772, 0x6603, 0x6615, 0x6600, + 0x7085, 0x66f7, 0x661d, 0x6634, 0x6631, 0x6636, 0x6635, 0x8006, + 0x665f, 0x6654, 0x6641, 0x664f, 0x6656, 0x6661, 0x6657, 0x6677, + 0x6684, 0x668c, 0x66a7, 0x669d, 0x66be, 0x66db, 0x66dc, 0x66e6, + 0x66e9, 0x8d32, 0x8d33, 0x8d36, 0x8d3b, 0x8d3d, 0x8d40, 0x8d45, + 0x8d46, 0x8d48, 0x8d49, 0x8d47, 0x8d4d, 0x8d55, 0x8d59, 0x89c7, + 0x89ca, 0x89cb, 0x89cc, 0x89ce, 0x89cf, 0x89d0, 0x89d1, 0x726e, + 0x729f, 0x725d, 0x7266, 0x726f, 0x727e, 0x727f, 0x7284, 0x728b, + 0x728d, 0x728f, 0x7292, 0x6308, 0x6332, 0x63b0, + /* 0xeb */ + 0x968c, 0x968e, 0x9691, 0x9692, 0x9693, 0x9695, 0x9696, 0x969a, + 0x969b, 0x969d, 0x969e, 0x969f, 0x96a0, 0x96a1, 0x96a2, 0x96a3, + 0x96a4, 0x96a5, 0x96a6, 0x96a8, 0x96a9, 0x96aa, 0x96ab, 0x96ac, + 0x96ad, 0x96ae, 0x96af, 0x96b1, 0x96b2, 0x96b4, 0x96b5, 0x96b7, + 0x96b8, 0x96ba, 0x96bb, 0x96bf, 0x96c2, 0x96c3, 0x96c8, 0x96ca, + 0x96cb, 0x96d0, 0x96d1, 0x96d3, 0x96d4, 0x96d6, 0x96d7, 0x96d8, + 0x96d9, 0x96da, 0x96db, 0x96dc, 0x96dd, 0x96de, 0x96df, 0x96e1, + 0x96e2, 0x96e3, 0x96e4, 0x96e5, 0x96e6, 0x96e7, 0x96eb, 0x96ec, + 0x96ed, 0x96ee, 0x96f0, 0x96f1, 0x96f2, 0x96f4, 0x96f5, 0x96f8, + 0x96fa, 0x96fb, 0x96fc, 0x96fd, 0x96ff, 0x9702, 0x9703, 0x9705, + 0x970a, 0x970b, 0x970c, 0x9710, 0x9711, 0x9712, 0x9714, 0x9715, + 0x9717, 0x9718, 0x9719, 0x971a, 0x971b, 0x971d, 0x971f, 0x9720, + 0x643f, 0x64d8, 0x8004, 0x6bea, 0x6bf3, 0x6bfd, 0x6bf5, 0x6bf9, + 0x6c05, 0x6c07, 0x6c06, 0x6c0d, 0x6c15, 0x6c18, 0x6c19, 0x6c1a, + 0x6c21, 0x6c29, 0x6c24, 0x6c2a, 0x6c32, 0x6535, 0x6555, 0x656b, + 0x724d, 0x7252, 0x7256, 0x7230, 0x8662, 0x5216, 0x809f, 0x809c, + 0x8093, 0x80bc, 0x670a, 0x80bd, 0x80b1, 0x80ab, 0x80ad, 0x80b4, + 0x80b7, 0x80e7, 0x80e8, 0x80e9, 0x80ea, 0x80db, 0x80c2, 0x80c4, + 0x80d9, 0x80cd, 0x80d7, 0x6710, 0x80dd, 0x80eb, 0x80f1, 0x80f4, + 0x80ed, 0x810d, 0x810e, 0x80f2, 0x80fc, 0x6715, 0x8112, 0x8c5a, + 0x8136, 0x811e, 0x812c, 0x8118, 0x8132, 0x8148, 0x814c, 0x8153, + 0x8174, 0x8159, 0x815a, 0x8171, 0x8160, 0x8169, 0x817c, 0x817d, + 0x816d, 0x8167, 0x584d, 0x5ab5, 0x8188, 0x8182, 0x8191, 0x6ed5, + 0x81a3, 0x81aa, 0x81cc, 0x6726, 0x81ca, 0x81bb, + /* 0xec */ + 0x9721, 0x9722, 0x9723, 0x9724, 0x9725, 0x9726, 0x9727, 0x9728, + 0x9729, 0x972b, 0x972c, 0x972e, 0x972f, 0x9731, 0x9733, 0x9734, + 0x9735, 0x9736, 0x9737, 0x973a, 0x973b, 0x973c, 0x973d, 0x973f, + 0x9740, 0x9741, 0x9742, 0x9743, 0x9744, 0x9745, 0x9746, 0x9747, + 0x9748, 0x9749, 0x974a, 0x974b, 0x974c, 0x974d, 0x974e, 0x974f, + 0x9750, 0x9751, 0x9754, 0x9755, 0x9757, 0x9758, 0x975a, 0x975c, + 0x975d, 0x975f, 0x9763, 0x9764, 0x9766, 0x9767, 0x9768, 0x976a, + 0x976b, 0x976c, 0x976d, 0x976e, 0x976f, 0x9770, 0x9771, 0x9772, + 0x9775, 0x9777, 0x9778, 0x9779, 0x977a, 0x977b, 0x977d, 0x977e, + 0x977f, 0x9780, 0x9781, 0x9782, 0x9783, 0x9784, 0x9786, 0x9787, + 0x9788, 0x9789, 0x978a, 0x978c, 0x978e, 0x978f, 0x9790, 0x9793, + 0x9795, 0x9796, 0x9797, 0x9799, 0x979a, 0x979b, 0x979c, 0x979d, + 0x81c1, 0x81a6, 0x6b24, 0x6b37, 0x6b39, 0x6b43, 0x6b46, 0x6b59, + 0x98d1, 0x98d2, 0x98d3, 0x98d5, 0x98d9, 0x98da, 0x6bb3, 0x5f40, + 0x6bc2, 0x89f3, 0x6590, 0x9f51, 0x6593, 0x65bc, 0x65c6, 0x65c4, + 0x65c3, 0x65cc, 0x65ce, 0x65d2, 0x65d6, 0x7080, 0x709c, 0x7096, + 0x709d, 0x70bb, 0x70c0, 0x70b7, 0x70ab, 0x70b1, 0x70e8, 0x70ca, + 0x7110, 0x7113, 0x7116, 0x712f, 0x7131, 0x7173, 0x715c, 0x7168, + 0x7145, 0x7172, 0x714a, 0x7178, 0x717a, 0x7198, 0x71b3, 0x71b5, + 0x71a8, 0x71a0, 0x71e0, 0x71d4, 0x71e7, 0x71f9, 0x721d, 0x7228, + 0x706c, 0x7118, 0x7166, 0x71b9, 0x623e, 0x623d, 0x6243, 0x6248, + 0x6249, 0x793b, 0x7940, 0x7946, 0x7949, 0x795b, 0x795c, 0x7953, + 0x795a, 0x7962, 0x7957, 0x7960, 0x796f, 0x7967, 0x797a, 0x7985, + 0x798a, 0x799a, 0x79a7, 0x79b3, 0x5fd1, 0x5fd0, + /* 0xed */ + 0x979e, 0x979f, 0x97a1, 0x97a2, 0x97a4, 0x97a5, 0x97a6, 0x97a7, + 0x97a8, 0x97a9, 0x97aa, 0x97ac, 0x97ae, 0x97b0, 0x97b1, 0x97b3, + 0x97b5, 0x97b6, 0x97b7, 0x97b8, 0x97b9, 0x97ba, 0x97bb, 0x97bc, + 0x97bd, 0x97be, 0x97bf, 0x97c0, 0x97c1, 0x97c2, 0x97c3, 0x97c4, + 0x97c5, 0x97c6, 0x97c7, 0x97c8, 0x97c9, 0x97ca, 0x97cb, 0x97cc, + 0x97cd, 0x97ce, 0x97cf, 0x97d0, 0x97d1, 0x97d2, 0x97d3, 0x97d4, + 0x97d5, 0x97d6, 0x97d7, 0x97d8, 0x97d9, 0x97da, 0x97db, 0x97dc, + 0x97dd, 0x97de, 0x97df, 0x97e0, 0x97e1, 0x97e2, 0x97e3, 0x97e4, + 0x97e5, 0x97e8, 0x97ee, 0x97ef, 0x97f0, 0x97f1, 0x97f2, 0x97f4, + 0x97f7, 0x97f8, 0x97f9, 0x97fa, 0x97fb, 0x97fc, 0x97fd, 0x97fe, + 0x97ff, 0x9800, 0x9801, 0x9802, 0x9803, 0x9804, 0x9805, 0x9806, + 0x9807, 0x9808, 0x9809, 0x980a, 0x980b, 0x980c, 0x980d, 0x980e, + 0x603c, 0x605d, 0x605a, 0x6067, 0x6041, 0x6059, 0x6063, 0x60ab, + 0x6106, 0x610d, 0x615d, 0x61a9, 0x619d, 0x61cb, 0x61d1, 0x6206, + 0x8080, 0x807f, 0x6c93, 0x6cf6, 0x6dfc, 0x77f6, 0x77f8, 0x7800, + 0x7809, 0x7817, 0x7818, 0x7811, 0x65ab, 0x782d, 0x781c, 0x781d, + 0x7839, 0x783a, 0x783b, 0x781f, 0x783c, 0x7825, 0x782c, 0x7823, + 0x7829, 0x784e, 0x786d, 0x7856, 0x7857, 0x7826, 0x7850, 0x7847, + 0x784c, 0x786a, 0x789b, 0x7893, 0x789a, 0x7887, 0x789c, 0x78a1, + 0x78a3, 0x78b2, 0x78b9, 0x78a5, 0x78d4, 0x78d9, 0x78c9, 0x78ec, + 0x78f2, 0x7905, 0x78f4, 0x7913, 0x7924, 0x791e, 0x7934, 0x9f9b, + 0x9ef9, 0x9efb, 0x9efc, 0x76f1, 0x7704, 0x770d, 0x76f9, 0x7707, + 0x7708, 0x771a, 0x7722, 0x7719, 0x772d, 0x7726, 0x7735, 0x7738, + 0x7750, 0x7751, 0x7747, 0x7743, 0x775a, 0x7768, + /* 0xee */ + 0x980f, 0x9810, 0x9811, 0x9812, 0x9813, 0x9814, 0x9815, 0x9816, + 0x9817, 0x9818, 0x9819, 0x981a, 0x981b, 0x981c, 0x981d, 0x981e, + 0x981f, 0x9820, 0x9821, 0x9822, 0x9823, 0x9824, 0x9825, 0x9826, + 0x9827, 0x9828, 0x9829, 0x982a, 0x982b, 0x982c, 0x982d, 0x982e, + 0x982f, 0x9830, 0x9831, 0x9832, 0x9833, 0x9834, 0x9835, 0x9836, + 0x9837, 0x9838, 0x9839, 0x983a, 0x983b, 0x983c, 0x983d, 0x983e, + 0x983f, 0x9840, 0x9841, 0x9842, 0x9843, 0x9844, 0x9845, 0x9846, + 0x9847, 0x9848, 0x9849, 0x984a, 0x984b, 0x984c, 0x984d, 0x984e, + 0x984f, 0x9850, 0x9851, 0x9852, 0x9853, 0x9854, 0x9855, 0x9856, + 0x9857, 0x9858, 0x9859, 0x985a, 0x985b, 0x985c, 0x985d, 0x985e, + 0x985f, 0x9860, 0x9861, 0x9862, 0x9863, 0x9864, 0x9865, 0x9866, + 0x9867, 0x9868, 0x9869, 0x986a, 0x986b, 0x986c, 0x986d, 0x986e, + 0x7762, 0x7765, 0x777f, 0x778d, 0x777d, 0x7780, 0x778c, 0x7791, + 0x779f, 0x77a0, 0x77b0, 0x77b5, 0x77bd, 0x753a, 0x7540, 0x754e, + 0x754b, 0x7548, 0x755b, 0x7572, 0x7579, 0x7583, 0x7f58, 0x7f61, + 0x7f5f, 0x8a48, 0x7f68, 0x7f74, 0x7f71, 0x7f79, 0x7f81, 0x7f7e, + 0x76cd, 0x76e5, 0x8832, 0x9485, 0x9486, 0x9487, 0x948b, 0x948a, + 0x948c, 0x948d, 0x948f, 0x9490, 0x9494, 0x9497, 0x9495, 0x949a, + 0x949b, 0x949c, 0x94a3, 0x94a4, 0x94ab, 0x94aa, 0x94ad, 0x94ac, + 0x94af, 0x94b0, 0x94b2, 0x94b4, 0x94b6, 0x94b7, 0x94b8, 0x94b9, + 0x94ba, 0x94bc, 0x94bd, 0x94bf, 0x94c4, 0x94c8, 0x94c9, 0x94ca, + 0x94cb, 0x94cc, 0x94cd, 0x94ce, 0x94d0, 0x94d1, 0x94d2, 0x94d5, + 0x94d6, 0x94d7, 0x94d9, 0x94d8, 0x94db, 0x94de, 0x94df, 0x94e0, + 0x94e2, 0x94e4, 0x94e5, 0x94e7, 0x94e8, 0x94ea, + /* 0xef */ + 0x986f, 0x9870, 0x9871, 0x9872, 0x9873, 0x9874, 0x988b, 0x988e, + 0x9892, 0x9895, 0x9899, 0x98a3, 0x98a8, 0x98a9, 0x98aa, 0x98ab, + 0x98ac, 0x98ad, 0x98ae, 0x98af, 0x98b0, 0x98b1, 0x98b2, 0x98b3, + 0x98b4, 0x98b5, 0x98b6, 0x98b7, 0x98b8, 0x98b9, 0x98ba, 0x98bb, + 0x98bc, 0x98bd, 0x98be, 0x98bf, 0x98c0, 0x98c1, 0x98c2, 0x98c3, + 0x98c4, 0x98c5, 0x98c6, 0x98c7, 0x98c8, 0x98c9, 0x98ca, 0x98cb, + 0x98cc, 0x98cd, 0x98cf, 0x98d0, 0x98d4, 0x98d6, 0x98d7, 0x98db, + 0x98dc, 0x98dd, 0x98e0, 0x98e1, 0x98e2, 0x98e3, 0x98e4, 0x98e5, + 0x98e6, 0x98e9, 0x98ea, 0x98eb, 0x98ec, 0x98ed, 0x98ee, 0x98ef, + 0x98f0, 0x98f1, 0x98f2, 0x98f3, 0x98f4, 0x98f5, 0x98f6, 0x98f7, + 0x98f8, 0x98f9, 0x98fa, 0x98fb, 0x98fc, 0x98fd, 0x98fe, 0x98ff, + 0x9900, 0x9901, 0x9902, 0x9903, 0x9904, 0x9905, 0x9906, 0x9907, + 0x94e9, 0x94eb, 0x94ee, 0x94ef, 0x94f3, 0x94f4, 0x94f5, 0x94f7, + 0x94f9, 0x94fc, 0x94fd, 0x94ff, 0x9503, 0x9502, 0x9506, 0x9507, + 0x9509, 0x950a, 0x950d, 0x950e, 0x950f, 0x9512, 0x9513, 0x9514, + 0x9515, 0x9516, 0x9518, 0x951b, 0x951d, 0x951e, 0x951f, 0x9522, + 0x952a, 0x952b, 0x9529, 0x952c, 0x9531, 0x9532, 0x9534, 0x9536, + 0x9537, 0x9538, 0x953c, 0x953e, 0x953f, 0x9542, 0x9535, 0x9544, + 0x9545, 0x9546, 0x9549, 0x954c, 0x954e, 0x954f, 0x9552, 0x9553, + 0x9554, 0x9556, 0x9557, 0x9558, 0x9559, 0x955b, 0x955e, 0x955f, + 0x955d, 0x9561, 0x9562, 0x9564, 0x9565, 0x9566, 0x9567, 0x9568, + 0x9569, 0x956a, 0x956b, 0x956c, 0x956f, 0x9571, 0x9572, 0x9573, + 0x953a, 0x77e7, 0x77ec, 0x96c9, 0x79d5, 0x79ed, 0x79e3, 0x79eb, + 0x7a06, 0x5d47, 0x7a03, 0x7a02, 0x7a1e, 0x7a14, + /* 0xf0 */ + 0x9908, 0x9909, 0x990a, 0x990b, 0x990c, 0x990e, 0x990f, 0x9911, + 0x9912, 0x9913, 0x9914, 0x9915, 0x9916, 0x9917, 0x9918, 0x9919, + 0x991a, 0x991b, 0x991c, 0x991d, 0x991e, 0x991f, 0x9920, 0x9921, + 0x9922, 0x9923, 0x9924, 0x9925, 0x9926, 0x9927, 0x9928, 0x9929, + 0x992a, 0x992b, 0x992c, 0x992d, 0x992f, 0x9930, 0x9931, 0x9932, + 0x9933, 0x9934, 0x9935, 0x9936, 0x9937, 0x9938, 0x9939, 0x993a, + 0x993b, 0x993c, 0x993d, 0x993e, 0x993f, 0x9940, 0x9941, 0x9942, + 0x9943, 0x9944, 0x9945, 0x9946, 0x9947, 0x9948, 0x9949, 0x994a, + 0x994b, 0x994c, 0x994d, 0x994e, 0x994f, 0x9950, 0x9951, 0x9952, + 0x9953, 0x9956, 0x9957, 0x9958, 0x9959, 0x995a, 0x995b, 0x995c, + 0x995d, 0x995e, 0x995f, 0x9960, 0x9961, 0x9962, 0x9964, 0x9966, + 0x9973, 0x9978, 0x9979, 0x997b, 0x997e, 0x9982, 0x9983, 0x9989, + 0x7a39, 0x7a37, 0x7a51, 0x9ecf, 0x99a5, 0x7a70, 0x7688, 0x768e, + 0x7693, 0x7699, 0x76a4, 0x74de, 0x74e0, 0x752c, 0x9e20, 0x9e22, + 0x9e28, 0x9e29, 0x9e2a, 0x9e2b, 0x9e2c, 0x9e32, 0x9e31, 0x9e36, + 0x9e38, 0x9e37, 0x9e39, 0x9e3a, 0x9e3e, 0x9e41, 0x9e42, 0x9e44, + 0x9e46, 0x9e47, 0x9e48, 0x9e49, 0x9e4b, 0x9e4c, 0x9e4e, 0x9e51, + 0x9e55, 0x9e57, 0x9e5a, 0x9e5b, 0x9e5c, 0x9e5e, 0x9e63, 0x9e66, + 0x9e67, 0x9e68, 0x9e69, 0x9e6a, 0x9e6b, 0x9e6c, 0x9e71, 0x9e6d, + 0x9e73, 0x7592, 0x7594, 0x7596, 0x75a0, 0x759d, 0x75ac, 0x75a3, + 0x75b3, 0x75b4, 0x75b8, 0x75c4, 0x75b1, 0x75b0, 0x75c3, 0x75c2, + 0x75d6, 0x75cd, 0x75e3, 0x75e8, 0x75e6, 0x75e4, 0x75eb, 0x75e7, + 0x7603, 0x75f1, 0x75fc, 0x75ff, 0x7610, 0x7600, 0x7605, 0x760c, + 0x7617, 0x760a, 0x7625, 0x7618, 0x7615, 0x7619, + /* 0xf1 */ + 0x998c, 0x998e, 0x999a, 0x999b, 0x999c, 0x999d, 0x999e, 0x999f, + 0x99a0, 0x99a1, 0x99a2, 0x99a3, 0x99a4, 0x99a6, 0x99a7, 0x99a9, + 0x99aa, 0x99ab, 0x99ac, 0x99ad, 0x99ae, 0x99af, 0x99b0, 0x99b1, + 0x99b2, 0x99b3, 0x99b4, 0x99b5, 0x99b6, 0x99b7, 0x99b8, 0x99b9, + 0x99ba, 0x99bb, 0x99bc, 0x99bd, 0x99be, 0x99bf, 0x99c0, 0x99c1, + 0x99c2, 0x99c3, 0x99c4, 0x99c5, 0x99c6, 0x99c7, 0x99c8, 0x99c9, + 0x99ca, 0x99cb, 0x99cc, 0x99cd, 0x99ce, 0x99cf, 0x99d0, 0x99d1, + 0x99d2, 0x99d3, 0x99d4, 0x99d5, 0x99d6, 0x99d7, 0x99d8, 0x99d9, + 0x99da, 0x99db, 0x99dc, 0x99dd, 0x99de, 0x99df, 0x99e0, 0x99e1, + 0x99e2, 0x99e3, 0x99e4, 0x99e5, 0x99e6, 0x99e7, 0x99e8, 0x99e9, + 0x99ea, 0x99eb, 0x99ec, 0x99ed, 0x99ee, 0x99ef, 0x99f0, 0x99f1, + 0x99f2, 0x99f3, 0x99f4, 0x99f5, 0x99f6, 0x99f7, 0x99f8, 0x99f9, + 0x761b, 0x763c, 0x7622, 0x7620, 0x7640, 0x762d, 0x7630, 0x763f, + 0x7635, 0x7643, 0x763e, 0x7633, 0x764d, 0x765e, 0x7654, 0x765c, + 0x7656, 0x766b, 0x766f, 0x7fca, 0x7ae6, 0x7a78, 0x7a79, 0x7a80, + 0x7a86, 0x7a88, 0x7a95, 0x7aa6, 0x7aa0, 0x7aac, 0x7aa8, 0x7aad, + 0x7ab3, 0x8864, 0x8869, 0x8872, 0x887d, 0x887f, 0x8882, 0x88a2, + 0x88c6, 0x88b7, 0x88bc, 0x88c9, 0x88e2, 0x88ce, 0x88e3, 0x88e5, + 0x88f1, 0x891a, 0x88fc, 0x88e8, 0x88fe, 0x88f0, 0x8921, 0x8919, + 0x8913, 0x891b, 0x890a, 0x8934, 0x892b, 0x8936, 0x8941, 0x8966, + 0x897b, 0x758b, 0x80e5, 0x76b2, 0x76b4, 0x77dc, 0x8012, 0x8014, + 0x8016, 0x801c, 0x8020, 0x8022, 0x8025, 0x8026, 0x8027, 0x8029, + 0x8028, 0x8031, 0x800b, 0x8035, 0x8043, 0x8046, 0x804d, 0x8052, + 0x8069, 0x8071, 0x8983, 0x9878, 0x9880, 0x9883, + /* 0xf2 */ + 0x99fa, 0x99fb, 0x99fc, 0x99fd, 0x99fe, 0x99ff, 0x9a00, 0x9a01, + 0x9a02, 0x9a03, 0x9a04, 0x9a05, 0x9a06, 0x9a07, 0x9a08, 0x9a09, + 0x9a0a, 0x9a0b, 0x9a0c, 0x9a0d, 0x9a0e, 0x9a0f, 0x9a10, 0x9a11, + 0x9a12, 0x9a13, 0x9a14, 0x9a15, 0x9a16, 0x9a17, 0x9a18, 0x9a19, + 0x9a1a, 0x9a1b, 0x9a1c, 0x9a1d, 0x9a1e, 0x9a1f, 0x9a20, 0x9a21, + 0x9a22, 0x9a23, 0x9a24, 0x9a25, 0x9a26, 0x9a27, 0x9a28, 0x9a29, + 0x9a2a, 0x9a2b, 0x9a2c, 0x9a2d, 0x9a2e, 0x9a2f, 0x9a30, 0x9a31, + 0x9a32, 0x9a33, 0x9a34, 0x9a35, 0x9a36, 0x9a37, 0x9a38, 0x9a39, + 0x9a3a, 0x9a3b, 0x9a3c, 0x9a3d, 0x9a3e, 0x9a3f, 0x9a40, 0x9a41, + 0x9a42, 0x9a43, 0x9a44, 0x9a45, 0x9a46, 0x9a47, 0x9a48, 0x9a49, + 0x9a4a, 0x9a4b, 0x9a4c, 0x9a4d, 0x9a4e, 0x9a4f, 0x9a50, 0x9a51, + 0x9a52, 0x9a53, 0x9a54, 0x9a55, 0x9a56, 0x9a57, 0x9a58, 0x9a59, + 0x9889, 0x988c, 0x988d, 0x988f, 0x9894, 0x989a, 0x989b, 0x989e, + 0x989f, 0x98a1, 0x98a2, 0x98a5, 0x98a6, 0x864d, 0x8654, 0x866c, + 0x866e, 0x867f, 0x867a, 0x867c, 0x867b, 0x86a8, 0x868d, 0x868b, + 0x86ac, 0x869d, 0x86a7, 0x86a3, 0x86aa, 0x8693, 0x86a9, 0x86b6, + 0x86c4, 0x86b5, 0x86ce, 0x86b0, 0x86ba, 0x86b1, 0x86af, 0x86c9, + 0x86cf, 0x86b4, 0x86e9, 0x86f1, 0x86f2, 0x86ed, 0x86f3, 0x86d0, + 0x8713, 0x86de, 0x86f4, 0x86df, 0x86d8, 0x86d1, 0x8703, 0x8707, + 0x86f8, 0x8708, 0x870a, 0x870d, 0x8709, 0x8723, 0x873b, 0x871e, + 0x8725, 0x872e, 0x871a, 0x873e, 0x8748, 0x8734, 0x8731, 0x8729, + 0x8737, 0x873f, 0x8782, 0x8722, 0x877d, 0x877e, 0x877b, 0x8760, + 0x8770, 0x874c, 0x876e, 0x878b, 0x8753, 0x8763, 0x877c, 0x8764, + 0x8759, 0x8765, 0x8793, 0x87af, 0x87a8, 0x87d2, + /* 0xf3 */ + 0x9a5a, 0x9a5b, 0x9a5c, 0x9a5d, 0x9a5e, 0x9a5f, 0x9a60, 0x9a61, + 0x9a62, 0x9a63, 0x9a64, 0x9a65, 0x9a66, 0x9a67, 0x9a68, 0x9a69, + 0x9a6a, 0x9a6b, 0x9a72, 0x9a83, 0x9a89, 0x9a8d, 0x9a8e, 0x9a94, + 0x9a95, 0x9a99, 0x9aa6, 0x9aa9, 0x9aaa, 0x9aab, 0x9aac, 0x9aad, + 0x9aae, 0x9aaf, 0x9ab2, 0x9ab3, 0x9ab4, 0x9ab5, 0x9ab9, 0x9abb, + 0x9abd, 0x9abe, 0x9abf, 0x9ac3, 0x9ac4, 0x9ac6, 0x9ac7, 0x9ac8, + 0x9ac9, 0x9aca, 0x9acd, 0x9ace, 0x9acf, 0x9ad0, 0x9ad2, 0x9ad4, + 0x9ad5, 0x9ad6, 0x9ad7, 0x9ad9, 0x9ada, 0x9adb, 0x9adc, 0x9add, + 0x9ade, 0x9ae0, 0x9ae2, 0x9ae3, 0x9ae4, 0x9ae5, 0x9ae7, 0x9ae8, + 0x9ae9, 0x9aea, 0x9aec, 0x9aee, 0x9af0, 0x9af1, 0x9af2, 0x9af3, + 0x9af4, 0x9af5, 0x9af6, 0x9af7, 0x9af8, 0x9afa, 0x9afc, 0x9afd, + 0x9afe, 0x9aff, 0x9b00, 0x9b01, 0x9b02, 0x9b04, 0x9b05, 0x9b06, + 0x87c6, 0x8788, 0x8785, 0x87ad, 0x8797, 0x8783, 0x87ab, 0x87e5, + 0x87ac, 0x87b5, 0x87b3, 0x87cb, 0x87d3, 0x87bd, 0x87d1, 0x87c0, + 0x87ca, 0x87db, 0x87ea, 0x87e0, 0x87ee, 0x8816, 0x8813, 0x87fe, + 0x880a, 0x881b, 0x8821, 0x8839, 0x883c, 0x7f36, 0x7f42, 0x7f44, + 0x7f45, 0x8210, 0x7afa, 0x7afd, 0x7b08, 0x7b03, 0x7b04, 0x7b15, + 0x7b0a, 0x7b2b, 0x7b0f, 0x7b47, 0x7b38, 0x7b2a, 0x7b19, 0x7b2e, + 0x7b31, 0x7b20, 0x7b25, 0x7b24, 0x7b33, 0x7b3e, 0x7b1e, 0x7b58, + 0x7b5a, 0x7b45, 0x7b75, 0x7b4c, 0x7b5d, 0x7b60, 0x7b6e, 0x7b7b, + 0x7b62, 0x7b72, 0x7b71, 0x7b90, 0x7ba6, 0x7ba7, 0x7bb8, 0x7bac, + 0x7b9d, 0x7ba8, 0x7b85, 0x7baa, 0x7b9c, 0x7ba2, 0x7bab, 0x7bb4, + 0x7bd1, 0x7bc1, 0x7bcc, 0x7bdd, 0x7bda, 0x7be5, 0x7be6, 0x7bea, + 0x7c0c, 0x7bfe, 0x7bfc, 0x7c0f, 0x7c16, 0x7c0b, + /* 0xf4 */ + 0x9b07, 0x9b09, 0x9b0a, 0x9b0b, 0x9b0c, 0x9b0d, 0x9b0e, 0x9b10, + 0x9b11, 0x9b12, 0x9b14, 0x9b15, 0x9b16, 0x9b17, 0x9b18, 0x9b19, + 0x9b1a, 0x9b1b, 0x9b1c, 0x9b1d, 0x9b1e, 0x9b20, 0x9b21, 0x9b22, + 0x9b24, 0x9b25, 0x9b26, 0x9b27, 0x9b28, 0x9b29, 0x9b2a, 0x9b2b, + 0x9b2c, 0x9b2d, 0x9b2e, 0x9b30, 0x9b31, 0x9b33, 0x9b34, 0x9b35, + 0x9b36, 0x9b37, 0x9b38, 0x9b39, 0x9b3a, 0x9b3d, 0x9b3e, 0x9b3f, + 0x9b40, 0x9b46, 0x9b4a, 0x9b4b, 0x9b4c, 0x9b4e, 0x9b50, 0x9b52, + 0x9b53, 0x9b55, 0x9b56, 0x9b57, 0x9b58, 0x9b59, 0x9b5a, 0x9b5b, + 0x9b5c, 0x9b5d, 0x9b5e, 0x9b5f, 0x9b60, 0x9b61, 0x9b62, 0x9b63, + 0x9b64, 0x9b65, 0x9b66, 0x9b67, 0x9b68, 0x9b69, 0x9b6a, 0x9b6b, + 0x9b6c, 0x9b6d, 0x9b6e, 0x9b6f, 0x9b70, 0x9b71, 0x9b72, 0x9b73, + 0x9b74, 0x9b75, 0x9b76, 0x9b77, 0x9b78, 0x9b79, 0x9b7a, 0x9b7b, + 0x7c1f, 0x7c2a, 0x7c26, 0x7c38, 0x7c41, 0x7c40, 0x81fe, 0x8201, + 0x8202, 0x8204, 0x81ec, 0x8844, 0x8221, 0x8222, 0x8223, 0x822d, + 0x822f, 0x8228, 0x822b, 0x8238, 0x823b, 0x8233, 0x8234, 0x823e, + 0x8244, 0x8249, 0x824b, 0x824f, 0x825a, 0x825f, 0x8268, 0x887e, + 0x8885, 0x8888, 0x88d8, 0x88df, 0x895e, 0x7f9d, 0x7f9f, 0x7fa7, + 0x7faf, 0x7fb0, 0x7fb2, 0x7c7c, 0x6549, 0x7c91, 0x7c9d, 0x7c9c, + 0x7c9e, 0x7ca2, 0x7cb2, 0x7cbc, 0x7cbd, 0x7cc1, 0x7cc7, 0x7ccc, + 0x7ccd, 0x7cc8, 0x7cc5, 0x7cd7, 0x7ce8, 0x826e, 0x66a8, 0x7fbf, + 0x7fce, 0x7fd5, 0x7fe5, 0x7fe1, 0x7fe6, 0x7fe9, 0x7fee, 0x7ff3, + 0x7cf8, 0x7d77, 0x7da6, 0x7dae, 0x7e47, 0x7e9b, 0x9eb8, 0x9eb4, + 0x8d73, 0x8d84, 0x8d94, 0x8d91, 0x8db1, 0x8d67, 0x8d6d, 0x8c47, + 0x8c49, 0x914a, 0x9150, 0x914e, 0x914f, 0x9164, + /* 0xf5 */ + 0x9b7c, 0x9b7d, 0x9b7e, 0x9b7f, 0x9b80, 0x9b81, 0x9b82, 0x9b83, + 0x9b84, 0x9b85, 0x9b86, 0x9b87, 0x9b88, 0x9b89, 0x9b8a, 0x9b8b, + 0x9b8c, 0x9b8d, 0x9b8e, 0x9b8f, 0x9b90, 0x9b91, 0x9b92, 0x9b93, + 0x9b94, 0x9b95, 0x9b96, 0x9b97, 0x9b98, 0x9b99, 0x9b9a, 0x9b9b, + 0x9b9c, 0x9b9d, 0x9b9e, 0x9b9f, 0x9ba0, 0x9ba1, 0x9ba2, 0x9ba3, + 0x9ba4, 0x9ba5, 0x9ba6, 0x9ba7, 0x9ba8, 0x9ba9, 0x9baa, 0x9bab, + 0x9bac, 0x9bad, 0x9bae, 0x9baf, 0x9bb0, 0x9bb1, 0x9bb2, 0x9bb3, + 0x9bb4, 0x9bb5, 0x9bb6, 0x9bb7, 0x9bb8, 0x9bb9, 0x9bba, 0x9bbb, + 0x9bbc, 0x9bbd, 0x9bbe, 0x9bbf, 0x9bc0, 0x9bc1, 0x9bc2, 0x9bc3, + 0x9bc4, 0x9bc5, 0x9bc6, 0x9bc7, 0x9bc8, 0x9bc9, 0x9bca, 0x9bcb, + 0x9bcc, 0x9bcd, 0x9bce, 0x9bcf, 0x9bd0, 0x9bd1, 0x9bd2, 0x9bd3, + 0x9bd4, 0x9bd5, 0x9bd6, 0x9bd7, 0x9bd8, 0x9bd9, 0x9bda, 0x9bdb, + 0x9162, 0x9161, 0x9170, 0x9169, 0x916f, 0x917d, 0x917e, 0x9172, + 0x9174, 0x9179, 0x918c, 0x9185, 0x9190, 0x918d, 0x9191, 0x91a2, + 0x91a3, 0x91aa, 0x91ad, 0x91ae, 0x91af, 0x91b5, 0x91b4, 0x91ba, + 0x8c55, 0x9e7e, 0x8db8, 0x8deb, 0x8e05, 0x8e59, 0x8e69, 0x8db5, + 0x8dbf, 0x8dbc, 0x8dba, 0x8dc4, 0x8dd6, 0x8dd7, 0x8dda, 0x8dde, + 0x8dce, 0x8dcf, 0x8ddb, 0x8dc6, 0x8dec, 0x8df7, 0x8df8, 0x8de3, + 0x8df9, 0x8dfb, 0x8de4, 0x8e09, 0x8dfd, 0x8e14, 0x8e1d, 0x8e1f, + 0x8e2c, 0x8e2e, 0x8e23, 0x8e2f, 0x8e3a, 0x8e40, 0x8e39, 0x8e35, + 0x8e3d, 0x8e31, 0x8e49, 0x8e41, 0x8e42, 0x8e51, 0x8e52, 0x8e4a, + 0x8e70, 0x8e76, 0x8e7c, 0x8e6f, 0x8e74, 0x8e85, 0x8e8f, 0x8e94, + 0x8e90, 0x8e9c, 0x8e9e, 0x8c78, 0x8c82, 0x8c8a, 0x8c85, 0x8c98, + 0x8c94, 0x659b, 0x89d6, 0x89de, 0x89da, 0x89dc, + /* 0xf6 */ + 0x9bdc, 0x9bdd, 0x9bde, 0x9bdf, 0x9be0, 0x9be1, 0x9be2, 0x9be3, + 0x9be4, 0x9be5, 0x9be6, 0x9be7, 0x9be8, 0x9be9, 0x9bea, 0x9beb, + 0x9bec, 0x9bed, 0x9bee, 0x9bef, 0x9bf0, 0x9bf1, 0x9bf2, 0x9bf3, + 0x9bf4, 0x9bf5, 0x9bf6, 0x9bf7, 0x9bf8, 0x9bf9, 0x9bfa, 0x9bfb, + 0x9bfc, 0x9bfd, 0x9bfe, 0x9bff, 0x9c00, 0x9c01, 0x9c02, 0x9c03, + 0x9c04, 0x9c05, 0x9c06, 0x9c07, 0x9c08, 0x9c09, 0x9c0a, 0x9c0b, + 0x9c0c, 0x9c0d, 0x9c0e, 0x9c0f, 0x9c10, 0x9c11, 0x9c12, 0x9c13, + 0x9c14, 0x9c15, 0x9c16, 0x9c17, 0x9c18, 0x9c19, 0x9c1a, 0x9c1b, + 0x9c1c, 0x9c1d, 0x9c1e, 0x9c1f, 0x9c20, 0x9c21, 0x9c22, 0x9c23, + 0x9c24, 0x9c25, 0x9c26, 0x9c27, 0x9c28, 0x9c29, 0x9c2a, 0x9c2b, + 0x9c2c, 0x9c2d, 0x9c2e, 0x9c2f, 0x9c30, 0x9c31, 0x9c32, 0x9c33, + 0x9c34, 0x9c35, 0x9c36, 0x9c37, 0x9c38, 0x9c39, 0x9c3a, 0x9c3b, + 0x89e5, 0x89eb, 0x89ef, 0x8a3e, 0x8b26, 0x9753, 0x96e9, 0x96f3, + 0x96ef, 0x9706, 0x9701, 0x9708, 0x970f, 0x970e, 0x972a, 0x972d, + 0x9730, 0x973e, 0x9f80, 0x9f83, 0x9f85, 0x9f86, 0x9f87, 0x9f88, + 0x9f89, 0x9f8a, 0x9f8c, 0x9efe, 0x9f0b, 0x9f0d, 0x96b9, 0x96bc, + 0x96bd, 0x96ce, 0x96d2, 0x77bf, 0x96e0, 0x928e, 0x92ae, 0x92c8, + 0x933e, 0x936a, 0x93ca, 0x938f, 0x943e, 0x946b, 0x9c7f, 0x9c82, + 0x9c85, 0x9c86, 0x9c87, 0x9c88, 0x7a23, 0x9c8b, 0x9c8e, 0x9c90, + 0x9c91, 0x9c92, 0x9c94, 0x9c95, 0x9c9a, 0x9c9b, 0x9c9e, 0x9c9f, + 0x9ca0, 0x9ca1, 0x9ca2, 0x9ca3, 0x9ca5, 0x9ca6, 0x9ca7, 0x9ca8, + 0x9ca9, 0x9cab, 0x9cad, 0x9cae, 0x9cb0, 0x9cb1, 0x9cb2, 0x9cb3, + 0x9cb4, 0x9cb5, 0x9cb6, 0x9cb7, 0x9cba, 0x9cbb, 0x9cbc, 0x9cbd, + 0x9cc4, 0x9cc5, 0x9cc6, 0x9cc7, 0x9cca, 0x9ccb, + /* 0xf7 */ + 0x9c3c, 0x9c3d, 0x9c3e, 0x9c3f, 0x9c40, 0x9c41, 0x9c42, 0x9c43, + 0x9c44, 0x9c45, 0x9c46, 0x9c47, 0x9c48, 0x9c49, 0x9c4a, 0x9c4b, + 0x9c4c, 0x9c4d, 0x9c4e, 0x9c4f, 0x9c50, 0x9c51, 0x9c52, 0x9c53, + 0x9c54, 0x9c55, 0x9c56, 0x9c57, 0x9c58, 0x9c59, 0x9c5a, 0x9c5b, + 0x9c5c, 0x9c5d, 0x9c5e, 0x9c5f, 0x9c60, 0x9c61, 0x9c62, 0x9c63, + 0x9c64, 0x9c65, 0x9c66, 0x9c67, 0x9c68, 0x9c69, 0x9c6a, 0x9c6b, + 0x9c6c, 0x9c6d, 0x9c6e, 0x9c6f, 0x9c70, 0x9c71, 0x9c72, 0x9c73, + 0x9c74, 0x9c75, 0x9c76, 0x9c77, 0x9c78, 0x9c79, 0x9c7a, 0x9c7b, + 0x9c7d, 0x9c7e, 0x9c80, 0x9c83, 0x9c84, 0x9c89, 0x9c8a, 0x9c8c, + 0x9c8f, 0x9c93, 0x9c96, 0x9c97, 0x9c98, 0x9c99, 0x9c9d, 0x9caa, + 0x9cac, 0x9caf, 0x9cb9, 0x9cbe, 0x9cbf, 0x9cc0, 0x9cc1, 0x9cc2, + 0x9cc8, 0x9cc9, 0x9cd1, 0x9cd2, 0x9cda, 0x9cdb, 0x9ce0, 0x9ce1, + 0x9ccc, 0x9ccd, 0x9cce, 0x9ccf, 0x9cd0, 0x9cd3, 0x9cd4, 0x9cd5, + 0x9cd7, 0x9cd8, 0x9cd9, 0x9cdc, 0x9cdd, 0x9cdf, 0x9ce2, 0x977c, + 0x9785, 0x9791, 0x9792, 0x9794, 0x97af, 0x97ab, 0x97a3, 0x97b2, + 0x97b4, 0x9ab1, 0x9ab0, 0x9ab7, 0x9e58, 0x9ab6, 0x9aba, 0x9abc, + 0x9ac1, 0x9ac0, 0x9ac5, 0x9ac2, 0x9acb, 0x9acc, 0x9ad1, 0x9b45, + 0x9b43, 0x9b47, 0x9b49, 0x9b48, 0x9b4d, 0x9b51, 0x98e8, 0x990d, + 0x992e, 0x9955, 0x9954, 0x9adf, 0x9ae1, 0x9ae6, 0x9aef, 0x9aeb, + 0x9afb, 0x9aed, 0x9af9, 0x9b08, 0x9b0f, 0x9b13, 0x9b1f, 0x9b23, + 0x9ebd, 0x9ebe, 0x7e3b, 0x9e82, 0x9e87, 0x9e88, 0x9e8b, 0x9e92, + 0x93d6, 0x9e9d, 0x9e9f, 0x9edb, 0x9edc, 0x9edd, 0x9ee0, 0x9edf, + 0x9ee2, 0x9ee9, 0x9ee7, 0x9ee5, 0x9eea, 0x9eef, 0x9f22, 0x9f2c, + 0x9f2f, 0x9f39, 0x9f37, 0x9f3d, 0x9f3e, 0x9f44, + /* 0xf8 */ + 0x9ce3, 0x9ce4, 0x9ce5, 0x9ce6, 0x9ce7, 0x9ce8, 0x9ce9, 0x9cea, + 0x9ceb, 0x9cec, 0x9ced, 0x9cee, 0x9cef, 0x9cf0, 0x9cf1, 0x9cf2, + 0x9cf3, 0x9cf4, 0x9cf5, 0x9cf6, 0x9cf7, 0x9cf8, 0x9cf9, 0x9cfa, + 0x9cfb, 0x9cfc, 0x9cfd, 0x9cfe, 0x9cff, 0x9d00, 0x9d01, 0x9d02, + 0x9d03, 0x9d04, 0x9d05, 0x9d06, 0x9d07, 0x9d08, 0x9d09, 0x9d0a, + 0x9d0b, 0x9d0c, 0x9d0d, 0x9d0e, 0x9d0f, 0x9d10, 0x9d11, 0x9d12, + 0x9d13, 0x9d14, 0x9d15, 0x9d16, 0x9d17, 0x9d18, 0x9d19, 0x9d1a, + 0x9d1b, 0x9d1c, 0x9d1d, 0x9d1e, 0x9d1f, 0x9d20, 0x9d21, 0x9d22, + 0x9d23, 0x9d24, 0x9d25, 0x9d26, 0x9d27, 0x9d28, 0x9d29, 0x9d2a, + 0x9d2b, 0x9d2c, 0x9d2d, 0x9d2e, 0x9d2f, 0x9d30, 0x9d31, 0x9d32, + 0x9d33, 0x9d34, 0x9d35, 0x9d36, 0x9d37, 0x9d38, 0x9d39, 0x9d3a, + 0x9d3b, 0x9d3c, 0x9d3d, 0x9d3e, 0x9d3f, 0x9d40, 0x9d41, 0x9d42, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + /* 0xf9 */ + 0x9d43, 0x9d44, 0x9d45, 0x9d46, 0x9d47, 0x9d48, 0x9d49, 0x9d4a, + 0x9d4b, 0x9d4c, 0x9d4d, 0x9d4e, 0x9d4f, 0x9d50, 0x9d51, 0x9d52, + 0x9d53, 0x9d54, 0x9d55, 0x9d56, 0x9d57, 0x9d58, 0x9d59, 0x9d5a, + 0x9d5b, 0x9d5c, 0x9d5d, 0x9d5e, 0x9d5f, 0x9d60, 0x9d61, 0x9d62, + 0x9d63, 0x9d64, 0x9d65, 0x9d66, 0x9d67, 0x9d68, 0x9d69, 0x9d6a, + 0x9d6b, 0x9d6c, 0x9d6d, 0x9d6e, 0x9d6f, 0x9d70, 0x9d71, 0x9d72, + 0x9d73, 0x9d74, 0x9d75, 0x9d76, 0x9d77, 0x9d78, 0x9d79, 0x9d7a, + 0x9d7b, 0x9d7c, 0x9d7d, 0x9d7e, 0x9d7f, 0x9d80, 0x9d81, 0x9d82, + 0x9d83, 0x9d84, 0x9d85, 0x9d86, 0x9d87, 0x9d88, 0x9d89, 0x9d8a, + 0x9d8b, 0x9d8c, 0x9d8d, 0x9d8e, 0x9d8f, 0x9d90, 0x9d91, 0x9d92, + 0x9d93, 0x9d94, 0x9d95, 0x9d96, 0x9d97, 0x9d98, 0x9d99, 0x9d9a, + 0x9d9b, 0x9d9c, 0x9d9d, 0x9d9e, 0x9d9f, 0x9da0, 0x9da1, 0x9da2, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + /* 0xfa */ + 0x9da3, 0x9da4, 0x9da5, 0x9da6, 0x9da7, 0x9da8, 0x9da9, 0x9daa, + 0x9dab, 0x9dac, 0x9dad, 0x9dae, 0x9daf, 0x9db0, 0x9db1, 0x9db2, + 0x9db3, 0x9db4, 0x9db5, 0x9db6, 0x9db7, 0x9db8, 0x9db9, 0x9dba, + 0x9dbb, 0x9dbc, 0x9dbd, 0x9dbe, 0x9dbf, 0x9dc0, 0x9dc1, 0x9dc2, + 0x9dc3, 0x9dc4, 0x9dc5, 0x9dc6, 0x9dc7, 0x9dc8, 0x9dc9, 0x9dca, + 0x9dcb, 0x9dcc, 0x9dcd, 0x9dce, 0x9dcf, 0x9dd0, 0x9dd1, 0x9dd2, + 0x9dd3, 0x9dd4, 0x9dd5, 0x9dd6, 0x9dd7, 0x9dd8, 0x9dd9, 0x9dda, + 0x9ddb, 0x9ddc, 0x9ddd, 0x9dde, 0x9ddf, 0x9de0, 0x9de1, 0x9de2, + 0x9de3, 0x9de4, 0x9de5, 0x9de6, 0x9de7, 0x9de8, 0x9de9, 0x9dea, + 0x9deb, 0x9dec, 0x9ded, 0x9dee, 0x9def, 0x9df0, 0x9df1, 0x9df2, + 0x9df3, 0x9df4, 0x9df5, 0x9df6, 0x9df7, 0x9df8, 0x9df9, 0x9dfa, + 0x9dfb, 0x9dfc, 0x9dfd, 0x9dfe, 0x9dff, 0x9e00, 0x9e01, 0x9e02, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + /* 0xfb */ + 0x9e03, 0x9e04, 0x9e05, 0x9e06, 0x9e07, 0x9e08, 0x9e09, 0x9e0a, + 0x9e0b, 0x9e0c, 0x9e0d, 0x9e0e, 0x9e0f, 0x9e10, 0x9e11, 0x9e12, + 0x9e13, 0x9e14, 0x9e15, 0x9e16, 0x9e17, 0x9e18, 0x9e19, 0x9e1a, + 0x9e1b, 0x9e1c, 0x9e1d, 0x9e1e, 0x9e24, 0x9e27, 0x9e2e, 0x9e30, + 0x9e34, 0x9e3b, 0x9e3c, 0x9e40, 0x9e4d, 0x9e50, 0x9e52, 0x9e53, + 0x9e54, 0x9e56, 0x9e59, 0x9e5d, 0x9e5f, 0x9e60, 0x9e61, 0x9e62, + 0x9e65, 0x9e6e, 0x9e6f, 0x9e72, 0x9e74, 0x9e75, 0x9e76, 0x9e77, + 0x9e78, 0x9e79, 0x9e7a, 0x9e7b, 0x9e7c, 0x9e7d, 0x9e80, 0x9e81, + 0x9e83, 0x9e84, 0x9e85, 0x9e86, 0x9e89, 0x9e8a, 0x9e8c, 0x9e8d, + 0x9e8e, 0x9e8f, 0x9e90, 0x9e91, 0x9e94, 0x9e95, 0x9e96, 0x9e97, + 0x9e98, 0x9e99, 0x9e9a, 0x9e9b, 0x9e9c, 0x9e9e, 0x9ea0, 0x9ea1, + 0x9ea2, 0x9ea3, 0x9ea4, 0x9ea5, 0x9ea7, 0x9ea8, 0x9ea9, 0x9eaa, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + /* 0xfc */ + 0x9eab, 0x9eac, 0x9ead, 0x9eae, 0x9eaf, 0x9eb0, 0x9eb1, 0x9eb2, + 0x9eb3, 0x9eb5, 0x9eb6, 0x9eb7, 0x9eb9, 0x9eba, 0x9ebc, 0x9ebf, + 0x9ec0, 0x9ec1, 0x9ec2, 0x9ec3, 0x9ec5, 0x9ec6, 0x9ec7, 0x9ec8, + 0x9eca, 0x9ecb, 0x9ecc, 0x9ed0, 0x9ed2, 0x9ed3, 0x9ed5, 0x9ed6, + 0x9ed7, 0x9ed9, 0x9eda, 0x9ede, 0x9ee1, 0x9ee3, 0x9ee4, 0x9ee6, + 0x9ee8, 0x9eeb, 0x9eec, 0x9eed, 0x9eee, 0x9ef0, 0x9ef1, 0x9ef2, + 0x9ef3, 0x9ef4, 0x9ef5, 0x9ef6, 0x9ef7, 0x9ef8, 0x9efa, 0x9efd, + 0x9eff, 0x9f00, 0x9f01, 0x9f02, 0x9f03, 0x9f04, 0x9f05, 0x9f06, + 0x9f07, 0x9f08, 0x9f09, 0x9f0a, 0x9f0c, 0x9f0f, 0x9f11, 0x9f12, + 0x9f14, 0x9f15, 0x9f16, 0x9f18, 0x9f1a, 0x9f1b, 0x9f1c, 0x9f1d, + 0x9f1e, 0x9f1f, 0x9f21, 0x9f23, 0x9f24, 0x9f25, 0x9f26, 0x9f27, + 0x9f28, 0x9f29, 0x9f2a, 0x9f2b, 0x9f2d, 0x9f2e, 0x9f30, 0x9f31, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + /* 0xfd */ + 0x9f32, 0x9f33, 0x9f34, 0x9f35, 0x9f36, 0x9f38, 0x9f3a, 0x9f3c, + 0x9f3f, 0x9f40, 0x9f41, 0x9f42, 0x9f43, 0x9f45, 0x9f46, 0x9f47, + 0x9f48, 0x9f49, 0x9f4a, 0x9f4b, 0x9f4c, 0x9f4d, 0x9f4e, 0x9f4f, + 0x9f52, 0x9f53, 0x9f54, 0x9f55, 0x9f56, 0x9f57, 0x9f58, 0x9f59, + 0x9f5a, 0x9f5b, 0x9f5c, 0x9f5d, 0x9f5e, 0x9f5f, 0x9f60, 0x9f61, + 0x9f62, 0x9f63, 0x9f64, 0x9f65, 0x9f66, 0x9f67, 0x9f68, 0x9f69, + 0x9f6a, 0x9f6b, 0x9f6c, 0x9f6d, 0x9f6e, 0x9f6f, 0x9f70, 0x9f71, + 0x9f72, 0x9f73, 0x9f74, 0x9f75, 0x9f76, 0x9f77, 0x9f78, 0x9f79, + 0x9f7a, 0x9f7b, 0x9f7c, 0x9f7d, 0x9f7e, 0x9f81, 0x9f82, 0x9f8d, + 0x9f8e, 0x9f8f, 0x9f90, 0x9f91, 0x9f92, 0x9f93, 0x9f94, 0x9f95, + 0x9f96, 0x9f97, 0x9f98, 0x9f9c, 0x9f9d, 0x9f9e, 0x9fa1, 0x9fa2, + 0x9fa3, 0x9fa4, 0x9fa5, 0xf92c, 0xf979, 0xf995, 0xf9e7, 0xf9f1, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0xfffd, + /* 0xfe */ + 0xfa0c, 0xfa0d, 0xfa0e, 0xfa0f, 0xfa11, 0xfa13, 0xfa14, 0xfa18, + 0xfa1f, 0xfa20, 0xfa21, 0xfa23, 0xfa24, 0xfa27, 0xfa28, 0xfa29, +}; + +static int +cp936ext_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) +{ + unsigned char c1 = s[0]; + if ((c1 >= 0x81 && c1 <= 0xfe)) { + if (n >= 2) { + unsigned char c2 = s[1]; + if ((c2 >= 0x40 && c2 < 0x7f) || (c2 >= 0x80 && c2 < 0xff)) { + unsigned int i = 190 * (c1 - 0x81) + (c2 - (c2 >= 0x80 ? 0x41 : 0x40)); + unsigned short wc = 0xfffd; + { + if (i < 23766) + wc = cp936ext_2uni_page81[i]; + } + if (wc != 0xfffd) { + *pwc = (ucs4_t) wc; + return 2; + } + } + return RET_ILSEQ; + } + return RET_TOOFEW(0); + } + return RET_ILSEQ; +} +#endif /* NEED_TOWC */ + +#ifdef NEED_TOMB + +static const unsigned short cp936ext_page0014[208] = { + 0x0000, 0x0000, 0x0000, 0x0000, 0xa1e8, 0x0000, 0x0000, 0xa1ec, /*0xa0-0xa7*/ + 0xa1a7, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0xa8-0xaf*/ + 0xa1e3, 0xa1c0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa1a4, /*0xb0-0xb7*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0xb8-0xbf*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0xc0-0xc7*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0xc8-0xcf*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa1c1, /*0xd0-0xd7*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0xd8-0xdf*/ + 0xa8a4, 0xa8a2, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0xe0-0xe7*/ + 0xa8a8, 0xa8a6, 0xa8ba, 0x0000, 0xa8ac, 0xa8aa, 0x0000, 0x0000, /*0xe8-0xef*/ + 0x0000, 0x0000, 0xa8b0, 0xa8ae, 0x0000, 0x0000, 0x0000, 0xa1c2, /*0xf0-0xf7*/ + 0x0000, 0xa8b4, 0xa8b2, 0x0000, 0xa8b9, 0x0000, 0x0000, 0x0000, /*0xf8-0xff*/ + /* 0x0100 */ + 0x0000, 0xa8a1, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x00-0x07*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x08-0x0f*/ + 0x0000, 0x0000, 0x0000, 0xa8a5, 0x0000, 0x0000, 0x0000, 0x0000, /*0x10-0x17*/ + 0x0000, 0x0000, 0x0000, 0xa8a7, 0x0000, 0x0000, 0x0000, 0x0000, /*0x18-0x1f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x20-0x27*/ + 0x0000, 0x0000, 0x0000, 0xa8a9, 0x0000, 0x0000, 0x0000, 0x0000, /*0x28-0x2f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x30-0x37*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x38-0x3f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0xa8bd, 0x0000, 0x0000, 0x0000, /*0x40-0x47*/ + 0xa8be, 0x0000, 0x0000, 0x0000, 0x0000, 0xa8ad, 0x0000, 0x0000, /*0x48-0x4f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x50-0x57*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x58-0x5f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x60-0x67*/ + 0x0000, 0x0000, 0x0000, 0xa8b1, 0x0000, 0x0000, 0x0000, 0x0000, /*0x68-0x6f*/ +}; +static const unsigned short cp936ext_page0039[24] = { + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa8a3, 0x0000, /*0xc8-0xcf*/ + 0xa8ab, 0x0000, 0xa8af, 0x0000, 0xa8b3, 0x0000, 0xa8b5, 0x0000, /*0xd0-0xd7*/ + 0xa8b6, 0x0000, 0xa8b7, 0x0000, 0xa8b8, 0x0000, 0x0000, 0x0000, /*0xd8-0xdf*/ +}; +static const unsigned short cp936ext_page004a[24] = { + 0x0000, 0xa8bb, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x50-0x57*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x58-0x5f*/ + 0x0000, 0xa8c0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x60-0x67*/ +}; +static const unsigned short cp936ext_page0058[32] = { + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa1a6, /*0xc0-0xc7*/ + 0x0000, 0xa1a5, 0xa840, 0xa841, 0x0000, 0x0000, 0x0000, 0x0000, /*0xc8-0xcf*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0xd0-0xd7*/ + 0x0000, 0xa842, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0xd8-0xdf*/ +}; +static const unsigned short cp936ext_page0072[64] = { + 0x0000, 0xa6a1, 0xa6a2, 0xa6a3, 0xa6a4, 0xa6a5, 0xa6a6, 0xa6a7, /*0x90-0x97*/ + 0xa6a8, 0xa6a9, 0xa6aa, 0xa6ab, 0xa6ac, 0xa6ad, 0xa6ae, 0xa6af, /*0x98-0x9f*/ + 0xa6b0, 0xa6b1, 0x0000, 0xa6b2, 0xa6b3, 0xa6b4, 0xa6b5, 0xa6b6, /*0xa0-0xa7*/ + 0xa6b7, 0xa6b8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0xa8-0xaf*/ + 0x0000, 0xa6c1, 0xa6c2, 0xa6c3, 0xa6c4, 0xa6c5, 0xa6c6, 0xa6c7, /*0xb0-0xb7*/ + 0xa6c8, 0xa6c9, 0xa6ca, 0xa6cb, 0xa6cc, 0xa6cd, 0xa6ce, 0xa6cf, /*0xb8-0xbf*/ + 0xa6d0, 0xa6d1, 0x0000, 0xa6d2, 0xa6d3, 0xa6d4, 0xa6d5, 0xa6d6, /*0xc0-0xc7*/ + 0xa6d7, 0xa6d8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0xc8-0xcf*/ +}; +static const unsigned short cp936ext_page0080[88] = { + 0x0000, 0xa7a7, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x00-0x07*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x08-0x0f*/ + 0xa7a1, 0xa7a2, 0xa7a3, 0xa7a4, 0xa7a5, 0xa7a6, 0xa7a8, 0xa7a9, /*0x10-0x17*/ + 0xa7aa, 0xa7ab, 0xa7ac, 0xa7ad, 0xa7ae, 0xa7af, 0xa7b0, 0xa7b1, /*0x18-0x1f*/ + 0xa7b2, 0xa7b3, 0xa7b4, 0xa7b5, 0xa7b6, 0xa7b7, 0xa7b8, 0xa7b9, /*0x20-0x27*/ + 0xa7ba, 0xa7bb, 0xa7bc, 0xa7bd, 0xa7be, 0xa7bf, 0xa7c0, 0xa7c1, /*0x28-0x2f*/ + 0xa7d1, 0xa7d2, 0xa7d3, 0xa7d4, 0xa7d5, 0xa7d6, 0xa7d8, 0xa7d9, /*0x30-0x37*/ + 0xa7da, 0xa7db, 0xa7dc, 0xa7dd, 0xa7de, 0xa7df, 0xa7e0, 0xa7e1, /*0x38-0x3f*/ + 0xa7e2, 0xa7e3, 0xa7e4, 0xa7e5, 0xa7e6, 0xa7e7, 0xa7e8, 0xa7e9, /*0x40-0x47*/ + 0xa7ea, 0xa7eb, 0xa7ec, 0xa7ed, 0xa7ee, 0xa7ef, 0xa7f0, 0xa7f1, /*0x48-0x4f*/ + 0x0000, 0xa7d7, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x50-0x57*/ +}; +static const unsigned short cp936ext_page0402[48] = { + 0xa95c, 0x0000, 0x0000, 0xa843, 0xa1aa, 0xa844, 0xa1ac, 0x0000, /*0x10-0x17*/ + 0xa1ae, 0xa1af, 0x0000, 0x0000, 0xa1b0, 0xa1b1, 0x0000, 0x0000, /*0x18-0x1f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa845, 0xa1ad, 0x0000, /*0x20-0x27*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x28-0x2f*/ + 0xa1eb, 0x0000, 0xa1e4, 0xa1e5, 0x0000, 0xa846, 0x0000, 0x0000, /*0x30-0x37*/ + 0x0000, 0x0000, 0x0000, 0xa1f9, 0x0000, 0x0000, 0x0000, 0x0000, /*0x38-0x3f*/ +}; +static const unsigned short cp936ext_page0420[160] = { + 0x0000, 0x0000, 0x0000, 0xa1e6, 0x0000, 0xa847, 0x0000, 0x0000, /*0x00-0x07*/ + 0x0000, 0xa848, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x08-0x0f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa1ed, 0x0000, /*0x10-0x17*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x18-0x1f*/ + 0x0000, 0xa959, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x20-0x27*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x28-0x2f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x30-0x37*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x38-0x3f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x40-0x47*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x48-0x4f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x50-0x57*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x58-0x5f*/ + 0xa2f1, 0xa2f2, 0xa2f3, 0xa2f4, 0xa2f5, 0xa2f6, 0xa2f7, 0xa2f8, /*0x60-0x67*/ + 0xa2f9, 0xa2fa, 0xa2fb, 0xa2fc, 0x0000, 0x0000, 0x0000, 0x0000, /*0x68-0x6f*/ + 0xa2a1, 0xa2a2, 0xa2a3, 0xa2a4, 0xa2a5, 0xa2a6, 0xa2a7, 0xa2a8, /*0x70-0x77*/ + 0xa2a9, 0xa2aa, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x78-0x7f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x80-0x87*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x88-0x8f*/ + 0xa1fb, 0xa1fc, 0xa1fa, 0xa1fd, 0x0000, 0x0000, 0xa849, 0xa84a, /*0x90-0x97*/ + 0xa84b, 0xa84c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x98-0x9f*/ +}; +static const unsigned short cp936ext_page0441[184] = { + 0xa1ca, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa1c7, /*0x08-0x0f*/ + 0x0000, 0xa1c6, 0x0000, 0x0000, 0x0000, 0xa84d, 0x0000, 0x0000, /*0x10-0x17*/ + 0x0000, 0x0000, 0xa1cc, 0x0000, 0x0000, 0xa1d8, 0xa1de, 0xa84e, /*0x18-0x1f*/ + 0xa1cf, 0x0000, 0x0000, 0xa84f, 0x0000, 0xa1ce, 0x0000, 0xa1c4, /*0x20-0x27*/ + 0xa1c5, 0xa1c9, 0xa1c8, 0xa1d2, 0x0000, 0x0000, 0xa1d3, 0x0000, /*0x28-0x2f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0xa1e0, 0xa1df, 0xa1c3, 0xa1cb, /*0x30-0x37*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa1d7, 0x0000, 0x0000, /*0x38-0x3f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x40-0x47*/ + 0xa1d6, 0x0000, 0x0000, 0x0000, 0xa1d5, 0x0000, 0x0000, 0x0000, /*0x48-0x4f*/ + 0x0000, 0x0000, 0xa850, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x50-0x57*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x58-0x5f*/ + 0xa1d9, 0xa1d4, 0x0000, 0x0000, 0xa1dc, 0xa1dd, 0xa851, 0xa852, /*0x60-0x67*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa1da, 0xa1db, /*0x68-0x6f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x70-0x77*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x78-0x7f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x80-0x87*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x88-0x8f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa892, 0x0000, 0x0000, /*0x90-0x97*/ + 0x0000, 0xa1d1, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x98-0x9f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa1cd, 0x0000, 0x0000, /*0xa0-0xa7*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0xa8-0xaf*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0xb0-0xb7*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa853, /*0xb8-0xbf*/ +}; +static const unsigned short cp936ext_page048c[64] = { + 0xa2d9, 0xa2da, 0xa2db, 0xa2dc, 0xa2dd, 0xa2de, 0xa2df, 0xa2e0, /*0x60-0x67*/ + 0xa2e1, 0xa2e2, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x68-0x6f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0xa2c5, 0xa2c6, 0xa2c7, 0xa2c8, /*0x70-0x77*/ + 0xa2c9, 0xa2ca, 0xa2cb, 0xa2cc, 0xa2cd, 0xa2ce, 0xa2cf, 0xa2d0, /*0x78-0x7f*/ + 0xa2d1, 0xa2d2, 0xa2d3, 0xa2d4, 0xa2d5, 0xa2d6, 0xa2d7, 0xa2d8, /*0x80-0x87*/ + 0xa2b1, 0xa2b2, 0xa2b3, 0xa2b4, 0xa2b5, 0xa2b6, 0xa2b7, 0xa2b8, /*0x88-0x8f*/ + 0xa2b9, 0xa2ba, 0xa2bb, 0xa2bc, 0xa2bd, 0xa2be, 0xa2bf, 0xa2c0, /*0x90-0x97*/ + 0xa2c1, 0xa2c2, 0xa2c3, 0xa2c4, 0x0000, 0x0000, 0x0000, 0x0000, /*0x98-0x9f*/ +}; +static const unsigned short cp936ext_page04a0[232] = { + 0xa9a4, 0xa9a5, 0xa9a6, 0xa9a7, 0xa9a8, 0xa9a9, 0xa9aa, 0xa9ab, /*0x00-0x07*/ + 0xa9ac, 0xa9ad, 0xa9ae, 0xa9af, 0xa9b0, 0xa9b1, 0xa9b2, 0xa9b3, /*0x08-0x0f*/ + 0xa9b4, 0xa9b5, 0xa9b6, 0xa9b7, 0xa9b8, 0xa9b9, 0xa9ba, 0xa9bb, /*0x10-0x17*/ + 0xa9bc, 0xa9bd, 0xa9be, 0xa9bf, 0xa9c0, 0xa9c1, 0xa9c2, 0xa9c3, /*0x18-0x1f*/ + 0xa9c4, 0xa9c5, 0xa9c6, 0xa9c7, 0xa9c8, 0xa9c9, 0xa9ca, 0xa9cb, /*0x20-0x27*/ + 0xa9cc, 0xa9cd, 0xa9ce, 0xa9cf, 0xa9d0, 0xa9d1, 0xa9d2, 0xa9d3, /*0x28-0x2f*/ + 0xa9d4, 0xa9d5, 0xa9d6, 0xa9d7, 0xa9d8, 0xa9d9, 0xa9da, 0xa9db, /*0x30-0x37*/ + 0xa9dc, 0xa9dd, 0xa9de, 0xa9df, 0xa9e0, 0xa9e1, 0xa9e2, 0xa9e3, /*0x38-0x3f*/ + 0xa9e4, 0xa9e5, 0xa9e6, 0xa9e7, 0xa9e8, 0xa9e9, 0xa9ea, 0xa9eb, /*0x40-0x47*/ + 0xa9ec, 0xa9ed, 0xa9ee, 0xa9ef, 0x0000, 0x0000, 0x0000, 0x0000, /*0x48-0x4f*/ + 0xa854, 0xa855, 0xa856, 0xa857, 0xa858, 0xa859, 0xa85a, 0xa85b, /*0x50-0x57*/ + 0xa85c, 0xa85d, 0xa85e, 0xa85f, 0xa860, 0xa861, 0xa862, 0xa863, /*0x58-0x5f*/ + 0xa864, 0xa865, 0xa866, 0xa867, 0xa868, 0xa869, 0xa86a, 0xa86b, /*0x60-0x67*/ + 0xa86c, 0xa86d, 0xa86e, 0xa86f, 0xa870, 0xa871, 0xa872, 0xa873, /*0x68-0x6f*/ + 0xa874, 0xa875, 0xa876, 0xa877, 0x0000, 0x0000, 0x0000, 0x0000, /*0x70-0x77*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x78-0x7f*/ + 0x0000, 0xa878, 0xa879, 0xa87a, 0xa87b, 0xa87c, 0xa87d, 0xa87e, /*0x80-0x87*/ + 0xa880, 0xa881, 0xa882, 0xa883, 0xa884, 0xa885, 0xa886, 0xa887, /*0x88-0x8f*/ + 0x0000, 0x0000, 0x0000, 0xa888, 0xa889, 0xa88a, 0x0000, 0x0000, /*0x90-0x97*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x98-0x9f*/ + 0xa1f6, 0xa1f5, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0xa0-0xa7*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0xa8-0xaf*/ + 0x0000, 0x0000, 0xa1f8, 0xa1f7, 0x0000, 0x0000, 0x0000, 0x0000, /*0xb0-0xb7*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0xa88b, 0xa88c, 0x0000, 0x0000, /*0xb8-0xbf*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa1f4, 0xa1f3, /*0xc0-0xc7*/ + 0x0000, 0x0000, 0x0000, 0xa1f0, 0x0000, 0x0000, 0xa1f2, 0xa1f1, /*0xc8-0xcf*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0xd0-0xd7*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0xd8-0xdf*/ + 0x0000, 0x0000, 0xa88d, 0xa88e, 0xa88f, 0xa890, 0x0000, 0x0000, /*0xe0-0xe7*/ +}; +static const unsigned short cp936ext_page04c0[72] = { + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa1ef, 0xa1ee, 0x0000, /*0x00-0x07*/ + 0x0000, 0xa891, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x08-0x0f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x10-0x17*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x18-0x1f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x20-0x27*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x28-0x2f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x30-0x37*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x38-0x3f*/ + 0xa1e2, 0x0000, 0xa1e1, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x40-0x47*/ +}; +static const unsigned short cp936ext_page0600[304] = { + 0xa1a1, 0xa1a2, 0xa1a3, 0xa1a8, 0x0000, 0xa1a9, 0xa965, 0xa996, /*0x00-0x07*/ + 0xa1b4, 0xa1b5, 0xa1b6, 0xa1b7, 0xa1b8, 0xa1b9, 0xa1ba, 0xa1bb, /*0x08-0x0f*/ + 0xa1be, 0xa1bf, 0xa893, 0xa1fe, 0xa1b2, 0xa1b3, 0xa1bc, 0xa1bd, /*0x10-0x17*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa894, 0xa895, 0x0000, /*0x18-0x1f*/ + 0x0000, 0xa940, 0xa941, 0xa942, 0xa943, 0xa944, 0xa945, 0xa946, /*0x20-0x27*/ + 0xa947, 0xa948, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x28-0x2f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x30-0x37*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x38-0x3f*/ + 0x0000, 0xa4a1, 0xa4a2, 0xa4a3, 0xa4a4, 0xa4a5, 0xa4a6, 0xa4a7, /*0x40-0x47*/ + 0xa4a8, 0xa4a9, 0xa4aa, 0xa4ab, 0xa4ac, 0xa4ad, 0xa4ae, 0xa4af, /*0x48-0x4f*/ + 0xa4b0, 0xa4b1, 0xa4b2, 0xa4b3, 0xa4b4, 0xa4b5, 0xa4b6, 0xa4b7, /*0x50-0x57*/ + 0xa4b8, 0xa4b9, 0xa4ba, 0xa4bb, 0xa4bc, 0xa4bd, 0xa4be, 0xa4bf, /*0x58-0x5f*/ + 0xa4c0, 0xa4c1, 0xa4c2, 0xa4c3, 0xa4c4, 0xa4c5, 0xa4c6, 0xa4c7, /*0x60-0x67*/ + 0xa4c8, 0xa4c9, 0xa4ca, 0xa4cb, 0xa4cc, 0xa4cd, 0xa4ce, 0xa4cf, /*0x68-0x6f*/ + 0xa4d0, 0xa4d1, 0xa4d2, 0xa4d3, 0xa4d4, 0xa4d5, 0xa4d6, 0xa4d7, /*0x70-0x77*/ + 0xa4d8, 0xa4d9, 0xa4da, 0xa4db, 0xa4dc, 0xa4dd, 0xa4de, 0xa4df, /*0x78-0x7f*/ + 0xa4e0, 0xa4e1, 0xa4e2, 0xa4e3, 0xa4e4, 0xa4e5, 0xa4e6, 0xa4e7, /*0x80-0x87*/ + 0xa4e8, 0xa4e9, 0xa4ea, 0xa4eb, 0xa4ec, 0xa4ed, 0xa4ee, 0xa4ef, /*0x88-0x8f*/ + 0xa4f0, 0xa4f1, 0xa4f2, 0xa4f3, 0x0000, 0x0000, 0x0000, 0x0000, /*0x90-0x97*/ + 0x0000, 0x0000, 0x0000, 0xa961, 0xa962, 0xa966, 0xa967, 0x0000, /*0x98-0x9f*/ + 0x0000, 0xa5a1, 0xa5a2, 0xa5a3, 0xa5a4, 0xa5a5, 0xa5a6, 0xa5a7, /*0xa0-0xa7*/ + 0xa5a8, 0xa5a9, 0xa5aa, 0xa5ab, 0xa5ac, 0xa5ad, 0xa5ae, 0xa5af, /*0xa8-0xaf*/ + 0xa5b0, 0xa5b1, 0xa5b2, 0xa5b3, 0xa5b4, 0xa5b5, 0xa5b6, 0xa5b7, /*0xb0-0xb7*/ + 0xa5b8, 0xa5b9, 0xa5ba, 0xa5bb, 0xa5bc, 0xa5bd, 0xa5be, 0xa5bf, /*0xb8-0xbf*/ + 0xa5c0, 0xa5c1, 0xa5c2, 0xa5c3, 0xa5c4, 0xa5c5, 0xa5c6, 0xa5c7, /*0xc0-0xc7*/ + 0xa5c8, 0xa5c9, 0xa5ca, 0xa5cb, 0xa5cc, 0xa5cd, 0xa5ce, 0xa5cf, /*0xc8-0xcf*/ + 0xa5d0, 0xa5d1, 0xa5d2, 0xa5d3, 0xa5d4, 0xa5d5, 0xa5d6, 0xa5d7, /*0xd0-0xd7*/ + 0xa5d8, 0xa5d9, 0xa5da, 0xa5db, 0xa5dc, 0xa5dd, 0xa5de, 0xa5df, /*0xd8-0xdf*/ + 0xa5e0, 0xa5e1, 0xa5e2, 0xa5e3, 0xa5e4, 0xa5e5, 0xa5e6, 0xa5e7, /*0xe0-0xe7*/ + 0xa5e8, 0xa5e9, 0xa5ea, 0xa5eb, 0xa5ec, 0xa5ed, 0xa5ee, 0xa5ef, /*0xe8-0xef*/ + 0xa5f0, 0xa5f1, 0xa5f2, 0xa5f3, 0xa5f4, 0xa5f5, 0xa5f6, 0x0000, /*0xf0-0xf7*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0xa960, 0xa963, 0xa964, 0x0000, /*0xf8-0xff*/ + /* 0x3100 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa8c5, 0xa8c6, 0xa8c7, /*0x00-0x07*/ + 0xa8c8, 0xa8c9, 0xa8ca, 0xa8cb, 0xa8cc, 0xa8cd, 0xa8ce, 0xa8cf, /*0x08-0x0f*/ + 0xa8d0, 0xa8d1, 0xa8d2, 0xa8d3, 0xa8d4, 0xa8d5, 0xa8d6, 0xa8d7, /*0x10-0x17*/ + 0xa8d8, 0xa8d9, 0xa8da, 0xa8db, 0xa8dc, 0xa8dd, 0xa8de, 0xa8df, /*0x18-0x1f*/ + 0xa8e0, 0xa8e1, 0xa8e2, 0xa8e3, 0xa8e4, 0xa8e5, 0xa8e6, 0xa8e7, /*0x20-0x27*/ + 0xa8e8, 0xa8e9, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x28-0x2f*/ +}; +static const unsigned short cp936ext_page0644[24] = { + 0xa2e5, 0xa2e6, 0xa2e7, 0xa2e8, 0xa2e9, 0xa2ea, 0xa2eb, 0xa2ec, /*0x20-0x27*/ + 0xa2ed, 0xa2ee, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x28-0x2f*/ + 0x0000, 0xa95a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x30-0x37*/ +}; +static const unsigned short cp936ext_page0671[80] = { + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa94a, 0xa94b, /*0x88-0x8f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x90-0x97*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0xa94c, 0xa94d, 0xa94e, 0x0000, /*0x98-0x9f*/ + 0x0000, 0xa94f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0xa0-0xa7*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0xa8-0xaf*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0xb0-0xb7*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0xb8-0xbf*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0xa950, 0x0000, 0x0000, 0x0000, /*0xc0-0xc7*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa951, 0x0000, /*0xc8-0xcf*/ + 0x0000, 0xa952, 0xa953, 0x0000, 0x0000, 0xa954, 0x0000, 0x0000, /*0xd0-0xd7*/ +}; +static const unsigned short cp936ext_page09c0[20904] = { + 0xd2bb, 0xb6a1, 0x8140, 0xc6df, 0x8141, 0x8142, 0x8143, 0xcdf2, /*0x00-0x07*/ + 0xd5c9, 0xc8fd, 0xc9cf, 0xcfc2, 0xd8a2, 0xb2bb, 0xd3eb, 0x8144, /*0x08-0x0f*/ + 0xd8a4, 0xb3f3, 0x8145, 0xd7a8, 0xc7d2, 0xd8a7, 0xcac0, 0x8146, /*0x10-0x17*/ + 0xc7f0, 0xb1fb, 0xd2b5, 0xb4d4, 0xb6ab, 0xcbbf, 0xd8a9, 0x8147, /*0x18-0x1f*/ + 0x8148, 0x8149, 0xb6aa, 0x814a, 0xc1bd, 0xd1cf, 0x814b, 0xc9a5, /*0x20-0x27*/ + 0xd8ad, 0x814c, 0xb8f6, 0xd1be, 0xe3dc, 0xd6d0, 0x814d, 0x814e, /*0x28-0x2f*/ + 0xb7e1, 0x814f, 0xb4ae, 0x8150, 0xc1d9, 0x8151, 0xd8bc, 0x8152, /*0x30-0x37*/ + 0xcde8, 0xb5a4, 0xceaa, 0xd6f7, 0x8153, 0xc0f6, 0xbed9, 0xd8af, /*0x38-0x3f*/ + 0x8154, 0x8155, 0x8156, 0xc4cb, 0x8157, 0xbec3, 0x8158, 0xd8b1, /*0x40-0x47*/ + 0xc3b4, 0xd2e5, 0x8159, 0xd6ae, 0xceda, 0xd5a7, 0xbaf5, 0xb7a6, /*0x48-0x4f*/ + 0xc0d6, 0x815a, 0xc6b9, 0xc5d2, 0xc7c7, 0x815b, 0xb9d4, 0x815c, /*0x50-0x57*/ + 0xb3cb, 0xd2d2, 0x815d, 0x815e, 0xd8bf, 0xbec5, 0xc6f2, 0xd2b2, /*0x58-0x5f*/ + 0xcfb0, 0xcfe7, 0x815f, 0x8160, 0x8161, 0x8162, 0xcae9, 0x8163, /*0x60-0x67*/ + 0x8164, 0xd8c0, 0x8165, 0x8166, 0x8167, 0x8168, 0x8169, 0x816a, /*0x68-0x6f*/ + 0xc2f2, 0xc2d2, 0x816b, 0xc8e9, 0x816c, 0x816d, 0x816e, 0x816f, /*0x70-0x77*/ + 0x8170, 0x8171, 0x8172, 0x8173, 0x8174, 0x8175, 0xc7ac, 0x8176, /*0x78-0x7f*/ + 0x8177, 0x8178, 0x8179, 0x817a, 0x817b, 0x817c, 0xc1cb, 0x817d, /*0x80-0x87*/ + 0xd3e8, 0xd5f9, 0x817e, 0xcac2, 0xb6fe, 0xd8a1, 0xd3da, 0xbff7, /*0x88-0x8f*/ + 0x8180, 0xd4c6, 0xbba5, 0xd8c1, 0xcee5, 0xbeae, 0x8181, 0x8182, /*0x90-0x97*/ + 0xd8a8, 0x8183, 0xd1c7, 0xd0a9, 0x8184, 0x8185, 0x8186, 0xd8bd, /*0x98-0x9f*/ + 0xd9ef, 0xcdf6, 0xbfba, 0x8187, 0xbdbb, 0xbaa5, 0xd2e0, 0xb2fa, /*0xa0-0xa7*/ + 0xbae0, 0xc4b6, 0x8188, 0xcfed, 0xbea9, 0xcda4, 0xc1c1, 0x8189, /*0xa8-0xaf*/ + 0x818a, 0x818b, 0xc7d7, 0xd9f1, 0x818c, 0xd9f4, 0x818d, 0x818e, /*0xb0-0xb7*/ + 0x818f, 0x8190, 0xc8cb, 0xd8e9, 0x8191, 0x8192, 0x8193, 0xd2da, /*0xb8-0xbf*/ + 0xcab2, 0xc8ca, 0xd8ec, 0xd8ea, 0xd8c6, 0xbdf6, 0xc6cd, 0xb3f0, /*0xc0-0xc7*/ + 0x8194, 0xd8eb, 0xbdf1, 0xbde9, 0x8195, 0xc8d4, 0xb4d3, 0x8196, /*0xc8-0xcf*/ + 0x8197, 0xc2d8, 0x8198, 0xb2d6, 0xd7d0, 0xcacb, 0xcbfb, 0xd5cc, /*0xd0-0xd7*/ + 0xb8b6, 0xcfc9, 0x8199, 0x819a, 0x819b, 0xd9da, 0xd8f0, 0xc7aa, /*0xd8-0xdf*/ + 0x819c, 0xd8ee, 0x819d, 0xb4fa, 0xc1ee, 0xd2d4, 0x819e, 0x819f, /*0xe0-0xe7*/ + 0xd8ed, 0x81a0, 0xd2c7, 0xd8ef, 0xc3c7, 0x81a1, 0x81a2, 0x81a3, /*0xe8-0xef*/ + 0xd1f6, 0x81a4, 0xd6d9, 0xd8f2, 0x81a5, 0xd8f5, 0xbcfe, 0xbcdb, /*0xf0-0xf7*/ + 0x81a6, 0x81a7, 0x81a8, 0xc8ce, 0x81a9, 0xb7dd, 0x81aa, 0xb7c2, /*0xf8-0xff*/ + /* 0x4f00 */ + 0x81ab, 0xc6f3, 0x81ac, 0x81ad, 0x81ae, 0x81af, 0x81b0, 0x81b1, /*0x00-0x07*/ + 0x81b2, 0xd8f8, 0xd2c1, 0x81b3, 0x81b4, 0xcee9, 0xbcbf, 0xb7fc, /*0x08-0x0f*/ + 0xb7a5, 0xd0dd, 0x81b5, 0x81b6, 0x81b7, 0x81b8, 0x81b9, 0xd6da, /*0x10-0x17*/ + 0xd3c5, 0xbbef, 0xbbe1, 0xd8f1, 0x81ba, 0x81bb, 0xc9a1, 0xceb0, /*0x18-0x1f*/ + 0xb4ab, 0x81bc, 0xd8f3, 0x81bd, 0xc9cb, 0xd8f6, 0xc2d7, 0xd8f7, /*0x20-0x27*/ + 0x81be, 0x81bf, 0xceb1, 0xd8f9, 0x81c0, 0x81c1, 0x81c2, 0xb2ae, /*0x28-0x2f*/ + 0xb9c0, 0x81c3, 0xd9a3, 0x81c4, 0xb0e9, 0x81c5, 0xc1e6, 0x81c6, /*0x30-0x37*/ + 0xc9ec, 0x81c7, 0xcbc5, 0x81c8, 0xcbc6, 0xd9a4, 0x81c9, 0x81ca, /*0x38-0x3f*/ + 0x81cb, 0x81cc, 0x81cd, 0xb5e8, 0x81ce, 0x81cf, 0xb5ab, 0x81d0, /*0x40-0x47*/ + 0x81d1, 0x81d2, 0x81d3, 0x81d4, 0x81d5, 0xcebb, 0xb5cd, 0xd7a1, /*0x48-0x4f*/ + 0xd7f4, 0xd3d3, 0x81d6, 0xcce5, 0x81d7, 0xbace, 0x81d8, 0xd9a2, /*0x50-0x57*/ + 0xd9dc, 0xd3e0, 0xd8fd, 0xb7f0, 0xd7f7, 0xd8fe, 0xd8fa, 0xd9a1, /*0x58-0x5f*/ + 0xc4e3, 0x81d9, 0x81da, 0xd3b6, 0xd8f4, 0xd9dd, 0x81db, 0xd8fb, /*0x60-0x67*/ + 0x81dc, 0xc5e5, 0x81dd, 0x81de, 0xc0d0, 0x81df, 0x81e0, 0xd1f0, /*0x68-0x6f*/ + 0xb0db, 0x81e1, 0x81e2, 0xbcd1, 0xd9a6, 0x81e3, 0xd9a5, 0x81e4, /*0x70-0x77*/ + 0x81e5, 0x81e6, 0x81e7, 0xd9ac, 0xd9ae, 0x81e8, 0xd9ab, 0xcab9, /*0x78-0x7f*/ + 0x81e9, 0x81ea, 0x81eb, 0xd9a9, 0xd6b6, 0x81ec, 0x81ed, 0x81ee, /*0x80-0x87*/ + 0xb3de, 0xd9a8, 0x81ef, 0xc0fd, 0x81f0, 0xcacc, 0x81f1, 0xd9aa, /*0x88-0x8f*/ + 0x81f2, 0xd9a7, 0x81f3, 0x81f4, 0xd9b0, 0x81f5, 0x81f6, 0xb6b1, /*0x90-0x97*/ + 0x81f7, 0x81f8, 0x81f9, 0xb9a9, 0x81fa, 0xd2c0, 0x81fb, 0x81fc, /*0x98-0x9f*/ + 0xcfc0, 0x81fd, 0x81fe, 0xc2c2, 0x8240, 0xbdc4, 0xd5ec, 0xb2e0, /*0xa0-0xa7*/ + 0xc7c8, 0xbfeb, 0xd9ad, 0x8241, 0xd9af, 0x8242, 0xceea, 0xbaee, /*0xa8-0xaf*/ + 0x8243, 0x8244, 0x8245, 0x8246, 0x8247, 0xc7d6, 0x8248, 0x8249, /*0xb0-0xb7*/ + 0x824a, 0x824b, 0x824c, 0x824d, 0x824e, 0x824f, 0x8250, 0xb1e3, /*0xb8-0xbf*/ + 0x8251, 0x8252, 0x8253, 0xb4d9, 0xb6ed, 0xd9b4, 0x8254, 0x8255, /*0xc0-0xc7*/ + 0x8256, 0x8257, 0xbfa1, 0x8258, 0x8259, 0x825a, 0xd9de, 0xc7ce, /*0xc8-0xcf*/ + 0xc0fe, 0xd9b8, 0x825b, 0x825c, 0x825d, 0x825e, 0x825f, 0xcbd7, /*0xd0-0xd7*/ + 0xb7fd, 0x8260, 0xd9b5, 0x8261, 0xd9b7, 0xb1a3, 0xd3e1, 0xd9b9, /*0xd8-0xdf*/ + 0x8262, 0xd0c5, 0x8263, 0xd9b6, 0x8264, 0x8265, 0xd9b1, 0x8266, /*0xe0-0xe7*/ + 0xd9b2, 0xc1a9, 0xd9b3, 0x8267, 0x8268, 0xbcf3, 0xd0de, 0xb8a9, /*0xe8-0xef*/ + 0x8269, 0xbee3, 0x826a, 0xd9bd, 0x826b, 0x826c, 0x826d, 0x826e, /*0xf0-0xf7*/ + 0xd9ba, 0x826f, 0xb0b3, 0x8270, 0x8271, 0x8272, 0xd9c2, 0x8273, /*0xf8-0xff*/ + /* 0x5000 */ + 0x8274, 0x8275, 0x8276, 0x8277, 0x8278, 0x8279, 0x827a, 0x827b, /*0x00-0x07*/ + 0x827c, 0x827d, 0x827e, 0x8280, 0xd9c4, 0xb1b6, 0x8281, 0xd9bf, /*0x08-0x0f*/ + 0x8282, 0x8283, 0xb5b9, 0x8284, 0xbef3, 0x8285, 0x8286, 0x8287, /*0x10-0x17*/ + 0xccc8, 0xbaf2, 0xd2d0, 0x8288, 0xd9c3, 0x8289, 0x828a, 0xbde8, /*0x18-0x1f*/ + 0x828b, 0xb3ab, 0x828c, 0x828d, 0x828e, 0xd9c5, 0xbeeb, 0x828f, /*0x20-0x27*/ + 0xd9c6, 0xd9bb, 0xc4df, 0x8290, 0xd9be, 0xd9c1, 0xd9c0, 0x8291, /*0x28-0x2f*/ + 0x8292, 0x8293, 0x8294, 0x8295, 0x8296, 0x8297, 0x8298, 0x8299, /*0x30-0x37*/ + 0x829a, 0x829b, 0xd5ae, 0x829c, 0xd6b5, 0x829d, 0xc7e3, 0x829e, /*0x38-0x3f*/ + 0x829f, 0x82a0, 0x82a1, 0xd9c8, 0x82a2, 0x82a3, 0x82a4, 0xbcd9, /*0x40-0x47*/ + 0xd9ca, 0x82a5, 0x82a6, 0x82a7, 0xd9bc, 0x82a8, 0xd9cb, 0xc6ab, /*0x48-0x4f*/ + 0x82a9, 0x82aa, 0x82ab, 0x82ac, 0x82ad, 0xd9c9, 0x82ae, 0x82af, /*0x50-0x57*/ + 0x82b0, 0x82b1, 0xd7f6, 0x82b2, 0xcda3, 0x82b3, 0x82b4, 0x82b5, /*0x58-0x5f*/ + 0x82b6, 0x82b7, 0x82b8, 0x82b9, 0x82ba, 0xbda1, 0x82bb, 0x82bc, /*0x60-0x67*/ + 0x82bd, 0x82be, 0x82bf, 0x82c0, 0xd9cc, 0x82c1, 0x82c2, 0x82c3, /*0x68-0x6f*/ + 0x82c4, 0x82c5, 0x82c6, 0x82c7, 0x82c8, 0x82c9, 0xc5bc, 0xcdb5, /*0x70-0x77*/ + 0x82ca, 0x82cb, 0x82cc, 0xd9cd, 0x82cd, 0x82ce, 0xd9c7, 0xb3a5, /*0x78-0x7f*/ + 0xbffe, 0x82cf, 0x82d0, 0x82d1, 0x82d2, 0xb8b5, 0x82d3, 0x82d4, /*0x80-0x87*/ + 0xc0fc, 0x82d5, 0x82d6, 0x82d7, 0x82d8, 0xb0f8, 0x82d9, 0x82da, /*0x88-0x8f*/ + 0x82db, 0x82dc, 0x82dd, 0x82de, 0x82df, 0x82e0, 0x82e1, 0x82e2, /*0x90-0x97*/ + 0x82e3, 0x82e4, 0x82e5, 0x82e6, 0x82e7, 0x82e8, 0x82e9, 0x82ea, /*0x98-0x9f*/ + 0x82eb, 0x82ec, 0x82ed, 0xb4f6, 0x82ee, 0xd9ce, 0x82ef, 0xd9cf, /*0xa0-0xa7*/ + 0xb4a2, 0xd9d0, 0x82f0, 0x82f1, 0xb4df, 0x82f2, 0x82f3, 0x82f4, /*0xa8-0xaf*/ + 0x82f5, 0x82f6, 0xb0c1, 0x82f7, 0x82f8, 0x82f9, 0x82fa, 0x82fb, /*0xb0-0xb7*/ + 0x82fc, 0x82fd, 0xd9d1, 0xc9b5, 0x82fe, 0x8340, 0x8341, 0x8342, /*0xb8-0xbf*/ + 0x8343, 0x8344, 0x8345, 0x8346, 0x8347, 0x8348, 0x8349, 0x834a, /*0xc0-0xc7*/ + 0x834b, 0x834c, 0x834d, 0x834e, 0x834f, 0x8350, 0x8351, 0xcff1, /*0xc8-0xcf*/ + 0x8352, 0x8353, 0x8354, 0x8355, 0x8356, 0x8357, 0xd9d2, 0x8358, /*0xd0-0xd7*/ + 0x8359, 0x835a, 0xc1c5, 0x835b, 0x835c, 0x835d, 0x835e, 0x835f, /*0xd8-0xdf*/ + 0x8360, 0x8361, 0x8362, 0x8363, 0x8364, 0x8365, 0xd9d6, 0xc9ae, /*0xe0-0xe7*/ + 0x8366, 0x8367, 0x8368, 0x8369, 0xd9d5, 0xd9d4, 0xd9d7, 0x836a, /*0xe8-0xef*/ + 0x836b, 0x836c, 0x836d, 0xcbdb, 0x836e, 0xbda9, 0x836f, 0x8370, /*0xf0-0xf7*/ + 0x8371, 0x8372, 0x8373, 0xc6a7, 0x8374, 0x8375, 0x8376, 0x8377, /*0xf8-0xff*/ + /* 0x5100 */ + 0x8378, 0x8379, 0x837a, 0x837b, 0x837c, 0x837d, 0xd9d3, 0xd9d8, /*0x00-0x07*/ + 0x837e, 0x8380, 0x8381, 0xd9d9, 0x8382, 0x8383, 0x8384, 0x8385, /*0x08-0x0f*/ + 0x8386, 0x8387, 0xc8e5, 0x8388, 0x8389, 0x838a, 0x838b, 0x838c, /*0x10-0x17*/ + 0x838d, 0x838e, 0x838f, 0x8390, 0x8391, 0x8392, 0x8393, 0x8394, /*0x18-0x1f*/ + 0x8395, 0xc0dc, 0x8396, 0x8397, 0x8398, 0x8399, 0x839a, 0x839b, /*0x20-0x27*/ + 0x839c, 0x839d, 0x839e, 0x839f, 0x83a0, 0x83a1, 0x83a2, 0x83a3, /*0x28-0x2f*/ + 0x83a4, 0x83a5, 0x83a6, 0x83a7, 0x83a8, 0x83a9, 0x83aa, 0x83ab, /*0x30-0x37*/ + 0x83ac, 0x83ad, 0x83ae, 0x83af, 0x83b0, 0x83b1, 0x83b2, 0xb6f9, /*0x38-0x3f*/ + 0xd8a3, 0xd4ca, 0x83b3, 0xd4aa, 0xd0d6, 0xb3e4, 0xd5d7, 0x83b4, /*0x40-0x47*/ + 0xcfc8, 0xb9e2, 0x83b5, 0xbfcb, 0x83b6, 0xc3e2, 0x83b7, 0x83b8, /*0x48-0x4f*/ + 0x83b9, 0xb6d2, 0x83ba, 0x83bb, 0xcdc3, 0xd9ee, 0xd9f0, 0x83bc, /*0x50-0x57*/ + 0x83bd, 0x83be, 0xb5b3, 0x83bf, 0xb6b5, 0x83c0, 0x83c1, 0x83c2, /*0x58-0x5f*/ + 0x83c3, 0x83c4, 0xbea4, 0x83c5, 0x83c6, 0xc8eb, 0x83c7, 0x83c8, /*0x60-0x67*/ + 0xc8ab, 0x83c9, 0x83ca, 0xb0cb, 0xb9ab, 0xc1f9, 0xd9e2, 0x83cb, /*0x68-0x6f*/ + 0xc0bc, 0xb9b2, 0x83cc, 0xb9d8, 0xd0cb, 0xb1f8, 0xc6e4, 0xbedf, /*0x70-0x77*/ + 0xb5e4, 0xd7c8, 0x83cd, 0xd1f8, 0xbce6, 0xcade, 0x83ce, 0x83cf, /*0x78-0x7f*/ + 0xbcbd, 0xd9e6, 0xd8e7, 0x83d0, 0x83d1, 0xc4da, 0x83d2, 0x83d3, /*0x80-0x87*/ + 0xb8d4, 0xc8bd, 0x83d4, 0x83d5, 0xb2e1, 0xd4d9, 0x83d6, 0x83d7, /*0x88-0x8f*/ + 0x83d8, 0x83d9, 0xc3b0, 0x83da, 0x83db, 0xc3e1, 0xdaa2, 0xc8df, /*0x90-0x97*/ + 0x83dc, 0xd0b4, 0x83dd, 0xbefc, 0xc5a9, 0x83de, 0x83df, 0x83e0, /*0x98-0x9f*/ + 0xb9da, 0x83e1, 0xdaa3, 0x83e2, 0xd4a9, 0xdaa4, 0x83e3, 0x83e4, /*0xa0-0xa7*/ + 0x83e5, 0x83e6, 0x83e7, 0xd9fb, 0xb6ac, 0x83e8, 0x83e9, 0xb7eb, /*0xa8-0xaf*/ + 0xb1f9, 0xd9fc, 0xb3e5, 0xbef6, 0x83ea, 0xbff6, 0xd2b1, 0xc0e4, /*0xb0-0xb7*/ + 0x83eb, 0x83ec, 0x83ed, 0xb6b3, 0xd9fe, 0xd9fd, 0x83ee, 0x83ef, /*0xb8-0xbf*/ + 0xbebb, 0x83f0, 0x83f1, 0x83f2, 0xc6e0, 0x83f3, 0xd7bc, 0xdaa1, /*0xc0-0xc7*/ + 0x83f4, 0xc1b9, 0x83f5, 0xb5f2, 0xc1e8, 0x83f6, 0x83f7, 0xbcf5, /*0xc8-0xcf*/ + 0x83f8, 0xb4d5, 0x83f9, 0x83fa, 0x83fb, 0x83fc, 0x83fd, 0x83fe, /*0xd0-0xd7*/ + 0x8440, 0x8441, 0x8442, 0xc1dd, 0x8443, 0xc4fd, 0x8444, 0x8445, /*0xd8-0xdf*/ + 0xbcb8, 0xb7b2, 0x8446, 0x8447, 0xb7ef, 0x8448, 0x8449, 0x844a, /*0xe0-0xe7*/ + 0x844b, 0x844c, 0x844d, 0xd9ec, 0x844e, 0xc6be, 0x844f, 0xbfad, /*0xe8-0xef*/ + 0xbbcb, 0x8450, 0x8451, 0xb5ca, 0x8452, 0xdbc9, 0xd0d7, 0x8453, /*0xf0-0xf7*/ + 0xcdb9, 0xb0bc, 0xb3f6, 0xbbf7, 0xdbca, 0xbaaf, 0x8454, 0xd4e4, /*0xf8-0xff*/ + /* 0x5200 */ + 0xb5b6, 0xb5f3, 0xd8d6, 0xc8d0, 0x8455, 0x8456, 0xb7d6, 0xc7d0, /*0x00-0x07*/ + 0xd8d7, 0x8457, 0xbfaf, 0x8458, 0x8459, 0xdbbb, 0xd8d8, 0x845a, /*0x08-0x0f*/ + 0x845b, 0xd0cc, 0xbbae, 0x845c, 0x845d, 0x845e, 0xebbe, 0xc1d0, /*0x10-0x17*/ + 0xc1f5, 0xd4f2, 0xb8d5, 0xb4b4, 0x845f, 0xb3f5, 0x8460, 0x8461, /*0x18-0x1f*/ + 0xc9be, 0x8462, 0x8463, 0x8464, 0xc5d0, 0x8465, 0x8466, 0x8467, /*0x20-0x27*/ + 0xc5d9, 0xc0fb, 0x8468, 0xb1f0, 0x8469, 0xd8d9, 0xb9ce, 0x846a, /*0x28-0x2f*/ + 0xb5bd, 0x846b, 0x846c, 0xd8da, 0x846d, 0x846e, 0xd6c6, 0xcba2, /*0x30-0x37*/ + 0xc8af, 0xc9b2, 0xb4cc, 0xbfcc, 0x846f, 0xb9f4, 0x8470, 0xd8db, /*0x38-0x3f*/ + 0xd8dc, 0xb6e7, 0xbcc1, 0xccea, 0x8471, 0x8472, 0x8473, 0x8474, /*0x40-0x47*/ + 0x8475, 0x8476, 0xcff7, 0x8477, 0xd8dd, 0xc7b0, 0x8478, 0x8479, /*0x48-0x4f*/ + 0xb9d0, 0xbda3, 0x847a, 0x847b, 0xccde, 0x847c, 0xc6ca, 0x847d, /*0x50-0x57*/ + 0x847e, 0x8480, 0x8481, 0x8482, 0xd8e0, 0x8483, 0xd8de, 0x8484, /*0x58-0x5f*/ + 0x8485, 0xd8df, 0x8486, 0x8487, 0x8488, 0xb0fe, 0x8489, 0xbee7, /*0x60-0x67*/ + 0x848a, 0xcaa3, 0xbcf4, 0x848b, 0x848c, 0x848d, 0x848e, 0xb8b1, /*0x68-0x6f*/ + 0x848f, 0x8490, 0xb8ee, 0x8491, 0x8492, 0x8493, 0x8494, 0x8495, /*0x70-0x77*/ + 0x8496, 0x8497, 0x8498, 0x8499, 0x849a, 0xd8e2, 0x849b, 0xbdcb, /*0x78-0x7f*/ + 0x849c, 0xd8e4, 0xd8e3, 0x849d, 0x849e, 0x849f, 0x84a0, 0x84a1, /*0x80-0x87*/ + 0xc5fc, 0x84a2, 0x84a3, 0x84a4, 0x84a5, 0x84a6, 0x84a7, 0x84a8, /*0x88-0x8f*/ + 0xd8e5, 0x84a9, 0x84aa, 0xd8e6, 0x84ab, 0x84ac, 0x84ad, 0x84ae, /*0x90-0x97*/ + 0x84af, 0x84b0, 0x84b1, 0xc1a6, 0x84b2, 0xc8b0, 0xb0ec, 0xb9a6, /*0x98-0x9f*/ + 0xbcd3, 0xcef1, 0xdbbd, 0xc1d3, 0x84b3, 0x84b4, 0x84b5, 0x84b6, /*0xa0-0xa7*/ + 0xb6af, 0xd6fa, 0xc5ac, 0xbdd9, 0xdbbe, 0xdbbf, 0x84b7, 0x84b8, /*0xa8-0xaf*/ + 0x84b9, 0xc0f8, 0xbea2, 0xc0cd, 0x84ba, 0x84bb, 0x84bc, 0x84bd, /*0xb0-0xb7*/ + 0x84be, 0x84bf, 0x84c0, 0x84c1, 0x84c2, 0x84c3, 0xdbc0, 0xcac6, /*0xb8-0xbf*/ + 0x84c4, 0x84c5, 0x84c6, 0xb2aa, 0x84c7, 0x84c8, 0x84c9, 0xd3c2, /*0xc0-0xc7*/ + 0x84ca, 0xc3e3, 0x84cb, 0xd1ab, 0x84cc, 0x84cd, 0x84ce, 0x84cf, /*0xc8-0xcf*/ + 0xdbc2, 0x84d0, 0xc0d5, 0x84d1, 0x84d2, 0x84d3, 0xdbc3, 0x84d4, /*0xd0-0xd7*/ + 0xbfb1, 0x84d5, 0x84d6, 0x84d7, 0x84d8, 0x84d9, 0x84da, 0xc4bc, /*0xd8-0xdf*/ + 0x84db, 0x84dc, 0x84dd, 0x84de, 0xc7da, 0x84df, 0x84e0, 0x84e1, /*0xe0-0xe7*/ + 0x84e2, 0x84e3, 0x84e4, 0x84e5, 0x84e6, 0x84e7, 0x84e8, 0x84e9, /*0xe8-0xef*/ + 0xdbc4, 0x84ea, 0x84eb, 0x84ec, 0x84ed, 0x84ee, 0x84ef, 0x84f0, /*0xf0-0xf7*/ + 0x84f1, 0xd9e8, 0xc9d7, 0x84f2, 0x84f3, 0x84f4, 0xb9b4, 0xcef0, /*0xf8-0xff*/ + /* 0x5300 */ + 0xd4c8, 0x84f5, 0x84f6, 0x84f7, 0x84f8, 0xb0fc, 0xb4d2, 0x84f9, /*0x00-0x07*/ + 0xd0d9, 0x84fa, 0x84fb, 0x84fc, 0x84fd, 0xd9e9, 0x84fe, 0xdecb, /*0x08-0x0f*/ + 0xd9eb, 0x8540, 0x8541, 0x8542, 0x8543, 0xd8b0, 0xbbaf, 0xb1b1, /*0x10-0x17*/ + 0x8544, 0xb3d7, 0xd8ce, 0x8545, 0x8546, 0xd4d1, 0x8547, 0x8548, /*0x18-0x1f*/ + 0xbdb3, 0xbfef, 0x8549, 0xcfbb, 0x854a, 0x854b, 0xd8d0, 0x854c, /*0x20-0x27*/ + 0x854d, 0x854e, 0xb7cb, 0x854f, 0x8550, 0x8551, 0xd8d1, 0x8552, /*0x28-0x2f*/ + 0x8553, 0x8554, 0x8555, 0x8556, 0x8557, 0x8558, 0x8559, 0x855a, /*0x30-0x37*/ + 0x855b, 0xc6a5, 0xc7f8, 0xd2bd, 0x855c, 0x855d, 0xd8d2, 0xc4e4, /*0x38-0x3f*/ + 0x855e, 0xcaae, 0x855f, 0xc7a7, 0x8560, 0xd8a6, 0x8561, 0xc9fd, /*0x40-0x47*/ + 0xcee7, 0xbbdc, 0xb0eb, 0x8562, 0x8563, 0x8564, 0xbbaa, 0xd0ad, /*0x48-0x4f*/ + 0x8565, 0xb1b0, 0xd7e4, 0xd7bf, 0x8566, 0xb5a5, 0xc2f4, 0xc4cf, /*0x50-0x57*/ + 0x8567, 0x8568, 0xb2a9, 0x8569, 0xb2b7, 0x856a, 0xb1e5, 0xdfb2, /*0x58-0x5f*/ + 0xd5bc, 0xbfa8, 0xc2ac, 0xd8d5, 0xc2b1, 0x856b, 0xd8d4, 0xced4, /*0x60-0x67*/ + 0x856c, 0xdae0, 0x856d, 0xcec0, 0x856e, 0x856f, 0xd8b4, 0xc3ae, /*0x68-0x6f*/ + 0xd3a1, 0xcea3, 0x8570, 0xbcb4, 0xc8b4, 0xc2d1, 0x8571, 0xbeed, /*0x70-0x77*/ + 0xd0b6, 0x8572, 0xdae1, 0x8573, 0x8574, 0x8575, 0x8576, 0xc7e4, /*0x78-0x7f*/ + 0x8577, 0x8578, 0xb3a7, 0x8579, 0xb6f2, 0xccfc, 0xc0fa, 0x857a, /*0x80-0x87*/ + 0x857b, 0xc0f7, 0x857c, 0xd1b9, 0xd1e1, 0xd8c7, 0x857d, 0x857e, /*0x88-0x8f*/ + 0x8580, 0x8581, 0x8582, 0x8583, 0x8584, 0xb2de, 0x8585, 0x8586, /*0x90-0x97*/ + 0xc0e5, 0x8587, 0xbaf1, 0x8588, 0x8589, 0xd8c8, 0x858a, 0xd4ad, /*0x98-0x9f*/ + 0x858b, 0x858c, 0xcfe1, 0xd8c9, 0x858d, 0xd8ca, 0xcfc3, 0x858e, /*0xa0-0xa7*/ + 0xb3f8, 0xbec7, 0x858f, 0x8590, 0x8591, 0x8592, 0xd8cb, 0x8593, /*0xa8-0xaf*/ + 0x8594, 0x8595, 0x8596, 0x8597, 0x8598, 0x8599, 0xdbcc, 0x859a, /*0xb0-0xb7*/ + 0x859b, 0x859c, 0x859d, 0xc8a5, 0x859e, 0x859f, 0x85a0, 0xcfd8, /*0xb8-0xbf*/ + 0x85a1, 0xc8fe, 0xb2ce, 0x85a2, 0x85a3, 0x85a4, 0x85a5, 0x85a6, /*0xc0-0xc7*/ + 0xd3d6, 0xb2e6, 0xbcb0, 0xd3d1, 0xcbab, 0xb7b4, 0x85a7, 0x85a8, /*0xc8-0xcf*/ + 0x85a9, 0xb7a2, 0x85aa, 0x85ab, 0xcae5, 0x85ac, 0xc8a1, 0xcadc, /*0xd0-0xd7*/ + 0xb1e4, 0xd0f0, 0x85ad, 0xc5d1, 0x85ae, 0x85af, 0x85b0, 0xdbc5, /*0xd8-0xdf*/ + 0xb5fe, 0x85b1, 0x85b2, 0xbfda, 0xb9c5, 0xbee4, 0xc1ed, 0x85b3, /*0xe0-0xe7*/ + 0xdfb6, 0xdfb5, 0xd6bb, 0xbdd0, 0xd5d9, 0xb0c8, 0xb6a3, 0xbfc9, /*0xe8-0xef*/ + 0xcca8, 0xdfb3, 0xcab7, 0xd3d2, 0x85b4, 0xd8cf, 0xd2b6, 0xbac5, /*0xf0-0xf7*/ + 0xcbbe, 0xccbe, 0x85b5, 0xdfb7, 0xb5f0, 0xdfb4, 0x85b6, 0x85b7, /*0xf8-0xff*/ + /* 0x5400 */ + 0x85b8, 0xd3f5, 0x85b9, 0xb3d4, 0xb8f7, 0x85ba, 0xdfba, 0x85bb, /*0x00-0x07*/ + 0xbacf, 0xbcaa, 0xb5f5, 0x85bc, 0xcdac, 0xc3fb, 0xbaf3, 0xc0f4, /*0x08-0x0f*/ + 0xcdc2, 0xcff2, 0xdfb8, 0xcfc5, 0x85bd, 0xc2c0, 0xdfb9, 0xc2f0, /*0x10-0x17*/ + 0x85be, 0x85bf, 0x85c0, 0xbefd, 0x85c1, 0xc1df, 0xcdcc, 0xd2f7, /*0x18-0x1f*/ + 0xb7cd, 0xdfc1, 0x85c2, 0xdfc4, 0x85c3, 0x85c4, 0xb7f1, 0xb0c9, /*0x20-0x27*/ + 0xb6d6, 0xb7d4, 0x85c5, 0xbaac, 0xccfd, 0xbfd4, 0xcbb1, 0xc6f4, /*0x28-0x2f*/ + 0x85c6, 0xd6a8, 0xdfc5, 0x85c7, 0xcee2, 0xb3b3, 0x85c8, 0x85c9, /*0x30-0x37*/ + 0xcefc, 0xb4b5, 0x85ca, 0xcec7, 0xbaf0, 0x85cb, 0xcee1, 0x85cc, /*0x38-0x3f*/ + 0xd1bd, 0x85cd, 0x85ce, 0xdfc0, 0x85cf, 0x85d0, 0xb4f4, 0x85d1, /*0x40-0x47*/ + 0xb3ca, 0x85d2, 0xb8e6, 0xdfbb, 0x85d3, 0x85d4, 0x85d5, 0x85d6, /*0x48-0x4f*/ + 0xc4c5, 0x85d7, 0xdfbc, 0xdfbd, 0xdfbe, 0xc5bb, 0xdfbf, 0xdfc2, /*0x50-0x57*/ + 0xd4b1, 0xdfc3, 0x85d8, 0xc7ba, 0xced8, 0x85d9, 0x85da, 0x85db, /*0x58-0x5f*/ + 0x85dc, 0x85dd, 0xc4d8, 0x85de, 0xdfca, 0x85df, 0xdfcf, 0x85e0, /*0x60-0x67*/ + 0xd6dc, 0x85e1, 0x85e2, 0x85e3, 0x85e4, 0x85e5, 0x85e6, 0x85e7, /*0x68-0x6f*/ + 0x85e8, 0xdfc9, 0xdfda, 0xceb6, 0x85e9, 0xbac7, 0xdfce, 0xdfc8, /*0x70-0x77*/ + 0xc5de, 0x85ea, 0x85eb, 0xc9eb, 0xbaf4, 0xc3fc, 0x85ec, 0x85ed, /*0x78-0x7f*/ + 0xbed7, 0x85ee, 0xdfc6, 0x85ef, 0xdfcd, 0x85f0, 0xc5d8, 0x85f1, /*0x80-0x87*/ + 0x85f2, 0x85f3, 0x85f4, 0xd5a6, 0xbacd, 0x85f5, 0xbecc, 0xd3bd, /*0x88-0x8f*/ + 0xb8c0, 0x85f6, 0xd6e4, 0x85f7, 0xdfc7, 0xb9be, 0xbfa7, 0x85f8, /*0x90-0x97*/ + 0x85f9, 0xc1fc, 0xdfcb, 0xdfcc, 0x85fa, 0xdfd0, 0x85fb, 0x85fc, /*0x98-0x9f*/ + 0x85fd, 0x85fe, 0x8640, 0xdfdb, 0xdfe5, 0x8641, 0xdfd7, 0xdfd6, /*0xa0-0xa7*/ + 0xd7c9, 0xdfe3, 0xdfe4, 0xe5eb, 0xd2a7, 0xdfd2, 0x8642, 0xbfa9, /*0xa8-0xaf*/ + 0x8643, 0xd4db, 0x8644, 0xbfc8, 0xdfd4, 0x8645, 0x8646, 0x8647, /*0xb0-0xb7*/ + 0xcfcc, 0x8648, 0x8649, 0xdfdd, 0x864a, 0xd1ca, 0x864b, 0xdfde, /*0xb8-0xbf*/ + 0xb0a7, 0xc6b7, 0xdfd3, 0x864c, 0xbae5, 0x864d, 0xb6df, 0xcddb, /*0xc0-0xc7*/ + 0xb9fe, 0xd4d5, 0x864e, 0x864f, 0xdfdf, 0xcfec, 0xb0a5, 0xdfe7, /*0xc8-0xcf*/ + 0xdfd1, 0xd1c6, 0xdfd5, 0xdfd8, 0xdfd9, 0xdfdc, 0x8650, 0xbba9, /*0xd0-0xd7*/ + 0x8651, 0xdfe0, 0xdfe1, 0x8652, 0xdfe2, 0xdfe6, 0xdfe8, 0xd3b4, /*0xd8-0xdf*/ + 0x8653, 0x8654, 0x8655, 0x8656, 0x8657, 0xb8e7, 0xc5b6, 0xdfea, /*0xe0-0xe7*/ + 0xc9da, 0xc1a8, 0xc4c4, 0x8658, 0x8659, 0xbfde, 0xcff8, 0x865a, /*0xe8-0xef*/ + 0x865b, 0x865c, 0xd5dc, 0xdfee, 0x865d, 0x865e, 0x865f, 0x8660, /*0xf0-0xf7*/ + 0x8661, 0x8662, 0xb2b8, 0x8663, 0xbadf, 0xdfec, 0x8664, 0xdbc1, /*0xf8-0xff*/ + /* 0x5500 */ + 0x8665, 0xd1e4, 0x8666, 0x8667, 0x8668, 0x8669, 0xcbf4, 0xb4bd, /*0x00-0x07*/ + 0x866a, 0xb0a6, 0x866b, 0x866c, 0x866d, 0x866e, 0x866f, 0xdff1, /*0x08-0x0f*/ + 0xccc6, 0xdff2, 0x8670, 0x8671, 0xdfed, 0x8672, 0x8673, 0x8674, /*0x10-0x17*/ + 0x8675, 0x8676, 0x8677, 0xdfe9, 0x8678, 0x8679, 0x867a, 0x867b, /*0x18-0x1f*/ + 0xdfeb, 0x867c, 0xdfef, 0xdff0, 0xbbbd, 0x867d, 0x867e, 0xdff3, /*0x20-0x27*/ + 0x8680, 0x8681, 0xdff4, 0x8682, 0xbba3, 0x8683, 0xcadb, 0xcea8, /*0x28-0x2f*/ + 0xe0a7, 0xb3aa, 0x8684, 0xe0a6, 0x8685, 0x8686, 0x8687, 0xe0a1, /*0x30-0x37*/ + 0x8688, 0x8689, 0x868a, 0x868b, 0xdffe, 0x868c, 0xcdd9, 0xdffc, /*0x38-0x3f*/ + 0x868d, 0xdffa, 0x868e, 0xbfd0, 0xd7c4, 0x868f, 0xc9cc, 0x8690, /*0x40-0x47*/ + 0x8691, 0xdff8, 0xb0a1, 0x8692, 0x8693, 0x8694, 0x8695, 0x8696, /*0x48-0x4f*/ + 0xdffd, 0x8697, 0x8698, 0x8699, 0x869a, 0xdffb, 0xe0a2, 0x869b, /*0x50-0x57*/ + 0x869c, 0x869d, 0x869e, 0x869f, 0xe0a8, 0x86a0, 0x86a1, 0x86a2, /*0x58-0x5f*/ + 0x86a3, 0xb7c8, 0x86a4, 0x86a5, 0xc6a1, 0xc9b6, 0xc0b2, 0xdff5, /*0x60-0x67*/ + 0x86a6, 0x86a7, 0xc5be, 0x86a8, 0xd8c4, 0xdff9, 0xc4f6, 0x86a9, /*0x68-0x6f*/ + 0x86aa, 0x86ab, 0x86ac, 0x86ad, 0x86ae, 0xe0a3, 0xe0a4, 0xe0a5, /*0x70-0x77*/ + 0xd0a5, 0x86af, 0x86b0, 0xe0b4, 0xcce4, 0x86b1, 0xe0b1, 0x86b2, /*0x78-0x7f*/ + 0xbfa6, 0xe0af, 0xceb9, 0xe0ab, 0xc9c6, 0x86b3, 0x86b4, 0xc0ae, /*0x80-0x87*/ + 0xe0ae, 0xbaed, 0xbab0, 0xe0a9, 0x86b5, 0x86b6, 0x86b7, 0xdff6, /*0x88-0x8f*/ + 0x86b8, 0xe0b3, 0x86b9, 0x86ba, 0xe0b8, 0x86bb, 0x86bc, 0x86bd, /*0x90-0x97*/ + 0xb4ad, 0xe0b9, 0x86be, 0x86bf, 0xcfb2, 0xbac8, 0x86c0, 0xe0b0, /*0x98-0x9f*/ + 0x86c1, 0x86c2, 0x86c3, 0x86c4, 0x86c5, 0x86c6, 0x86c7, 0xd0fa, /*0xa0-0xa7*/ + 0x86c8, 0x86c9, 0x86ca, 0x86cb, 0x86cc, 0x86cd, 0x86ce, 0x86cf, /*0xa8-0xaf*/ + 0x86d0, 0xe0ac, 0x86d1, 0xd4fb, 0x86d2, 0xdff7, 0x86d3, 0xc5e7, /*0xb0-0xb7*/ + 0x86d4, 0xe0ad, 0x86d5, 0xd3f7, 0x86d6, 0xe0b6, 0xe0b7, 0x86d7, /*0xb8-0xbf*/ + 0x86d8, 0x86d9, 0x86da, 0x86db, 0xe0c4, 0xd0e1, 0x86dc, 0x86dd, /*0xc0-0xc7*/ + 0x86de, 0xe0bc, 0x86df, 0x86e0, 0xe0c9, 0xe0ca, 0x86e1, 0x86e2, /*0xc8-0xcf*/ + 0x86e3, 0xe0be, 0xe0aa, 0xc9a4, 0xe0c1, 0x86e4, 0xe0b2, 0x86e5, /*0xd0-0xd7*/ + 0x86e6, 0x86e7, 0x86e8, 0x86e9, 0xcac8, 0xe0c3, 0x86ea, 0xe0b5, /*0xd8-0xdf*/ + 0x86eb, 0xcecb, 0x86ec, 0xcbc3, 0xe0cd, 0xe0c6, 0xe0c2, 0x86ed, /*0xe0-0xe7*/ + 0xe0cb, 0x86ee, 0xe0ba, 0xe0bf, 0xe0c0, 0x86ef, 0x86f0, 0xe0c5, /*0xe8-0xef*/ + 0x86f1, 0x86f2, 0xe0c7, 0xe0c8, 0x86f3, 0xe0cc, 0x86f4, 0xe0bb, /*0xf0-0xf7*/ + 0x86f5, 0x86f6, 0x86f7, 0x86f8, 0x86f9, 0xcbd4, 0xe0d5, 0x86fa, /*0xf8-0xff*/ + /* 0x5600 */ + 0xe0d6, 0xe0d2, 0x86fb, 0x86fc, 0x86fd, 0x86fe, 0x8740, 0x8741, /*0x00-0x07*/ + 0xe0d0, 0xbcce, 0x8742, 0x8743, 0xe0d1, 0x8744, 0xb8c2, 0xd8c5, /*0x08-0x0f*/ + 0x8745, 0x8746, 0x8747, 0x8748, 0x8749, 0x874a, 0x874b, 0x874c, /*0x10-0x17*/ + 0xd0ea, 0x874d, 0x874e, 0xc2ef, 0x874f, 0x8750, 0xe0cf, 0xe0bd, /*0x18-0x1f*/ + 0x8751, 0x8752, 0x8753, 0xe0d4, 0xe0d3, 0x8754, 0x8755, 0xe0d7, /*0x20-0x27*/ + 0x8756, 0x8757, 0x8758, 0x8759, 0xe0dc, 0xe0d8, 0x875a, 0x875b, /*0x28-0x2f*/ + 0x875c, 0xd6f6, 0xb3b0, 0x875d, 0xd7ec, 0x875e, 0xcbbb, 0x875f, /*0x30-0x37*/ + 0x8760, 0xe0da, 0x8761, 0xcefb, 0x8762, 0x8763, 0x8764, 0xbad9, /*0x38-0x3f*/ + 0x8765, 0x8766, 0x8767, 0x8768, 0x8769, 0x876a, 0x876b, 0x876c, /*0x40-0x47*/ + 0x876d, 0x876e, 0x876f, 0x8770, 0xe0e1, 0xe0dd, 0xd2ad, 0x8771, /*0x48-0x4f*/ + 0x8772, 0x8773, 0x8774, 0x8775, 0xe0e2, 0x8776, 0x8777, 0xe0db, /*0x50-0x57*/ + 0xe0d9, 0xe0df, 0x8778, 0x8779, 0xe0e0, 0x877a, 0x877b, 0x877c, /*0x58-0x5f*/ + 0x877d, 0x877e, 0xe0de, 0x8780, 0xe0e4, 0x8781, 0x8782, 0x8783, /*0x60-0x67*/ + 0xc6f7, 0xd8ac, 0xd4eb, 0xe0e6, 0xcac9, 0x8784, 0x8785, 0x8786, /*0x68-0x6f*/ + 0x8787, 0xe0e5, 0x8788, 0x8789, 0x878a, 0x878b, 0xb8c1, 0x878c, /*0x70-0x77*/ + 0x878d, 0x878e, 0x878f, 0xe0e7, 0xe0e8, 0x8790, 0x8791, 0x8792, /*0x78-0x7f*/ + 0x8793, 0x8794, 0x8795, 0x8796, 0x8797, 0xe0e9, 0xe0e3, 0x8798, /*0x80-0x87*/ + 0x8799, 0x879a, 0x879b, 0x879c, 0x879d, 0x879e, 0xbabf, 0xcce7, /*0x88-0x8f*/ + 0x879f, 0x87a0, 0x87a1, 0xe0ea, 0x87a2, 0x87a3, 0x87a4, 0x87a5, /*0x90-0x97*/ + 0x87a6, 0x87a7, 0x87a8, 0x87a9, 0x87aa, 0x87ab, 0x87ac, 0x87ad, /*0x98-0x9f*/ + 0x87ae, 0x87af, 0x87b0, 0xcff9, 0x87b1, 0x87b2, 0x87b3, 0x87b4, /*0xa0-0xa7*/ + 0x87b5, 0x87b6, 0x87b7, 0x87b8, 0x87b9, 0x87ba, 0x87bb, 0xe0eb, /*0xa8-0xaf*/ + 0x87bc, 0x87bd, 0x87be, 0x87bf, 0x87c0, 0x87c1, 0x87c2, 0xc8c2, /*0xb0-0xb7*/ + 0x87c3, 0x87c4, 0x87c5, 0x87c6, 0xbdc0, 0x87c7, 0x87c8, 0x87c9, /*0xb8-0xbf*/ + 0x87ca, 0x87cb, 0x87cc, 0x87cd, 0x87ce, 0x87cf, 0x87d0, 0x87d1, /*0xc0-0xc7*/ + 0x87d2, 0x87d3, 0xc4d2, 0x87d4, 0x87d5, 0x87d6, 0x87d7, 0x87d8, /*0xc8-0xcf*/ + 0x87d9, 0x87da, 0x87db, 0x87dc, 0xe0ec, 0x87dd, 0x87de, 0xe0ed, /*0xd0-0xd7*/ + 0x87df, 0x87e0, 0xc7f4, 0xcbc4, 0x87e1, 0xe0ee, 0xbbd8, 0xd8b6, /*0xd8-0xdf*/ + 0xd2f2, 0xe0ef, 0xcdc5, 0x87e2, 0xb6da, 0x87e3, 0x87e4, 0x87e5, /*0xe0-0xe7*/ + 0x87e6, 0x87e7, 0x87e8, 0xe0f1, 0x87e9, 0xd4b0, 0x87ea, 0x87eb, /*0xe8-0xef*/ + 0xc0a7, 0xb4d1, 0x87ec, 0x87ed, 0xcea7, 0xe0f0, 0x87ee, 0x87ef, /*0xf0-0xf7*/ + 0x87f0, 0xe0f2, 0xb9cc, 0x87f1, 0x87f2, 0xb9fa, 0xcdbc, 0xe0f3, /*0xf8-0xff*/ + /* 0x5700 */ + 0x87f3, 0x87f4, 0x87f5, 0xc6d4, 0xe0f4, 0x87f6, 0xd4b2, 0x87f7, /*0x00-0x07*/ + 0xc8a6, 0xe0f6, 0xe0f5, 0x87f8, 0x87f9, 0x87fa, 0x87fb, 0x87fc, /*0x08-0x0f*/ + 0x87fd, 0x87fe, 0x8840, 0x8841, 0x8842, 0x8843, 0x8844, 0x8845, /*0x10-0x17*/ + 0x8846, 0x8847, 0x8848, 0x8849, 0xe0f7, 0x884a, 0x884b, 0xcdc1, /*0x18-0x1f*/ + 0x884c, 0x884d, 0x884e, 0xcaa5, 0x884f, 0x8850, 0x8851, 0x8852, /*0x20-0x27*/ + 0xd4da, 0xdbd7, 0xdbd9, 0x8853, 0xdbd8, 0xb9e7, 0xdbdc, 0xdbdd, /*0x28-0x2f*/ + 0xb5d8, 0x8854, 0x8855, 0xdbda, 0x8856, 0x8857, 0x8858, 0x8859, /*0x30-0x37*/ + 0x885a, 0xdbdb, 0xb3a1, 0xdbdf, 0x885b, 0x885c, 0xbbf8, 0x885d, /*0x38-0x3f*/ + 0xd6b7, 0x885e, 0xdbe0, 0x885f, 0x8860, 0x8861, 0x8862, 0xbef9, /*0x40-0x47*/ + 0x8863, 0x8864, 0xb7bb, 0x8865, 0xdbd0, 0xccae, 0xbfb2, 0xbbb5, /*0x48-0x4f*/ + 0xd7f8, 0xbfd3, 0x8866, 0x8867, 0x8868, 0x8869, 0x886a, 0xbfe9, /*0x50-0x57*/ + 0x886b, 0x886c, 0xbce1, 0xccb3, 0xdbde, 0xb0d3, 0xceeb, 0xb7d8, /*0x58-0x5f*/ + 0xd7b9, 0xc6c2, 0x886d, 0x886e, 0xc0a4, 0x886f, 0xccb9, 0x8870, /*0x60-0x67*/ + 0xdbe7, 0xdbe1, 0xc6ba, 0xdbe3, 0x8871, 0xdbe8, 0x8872, 0xc5f7, /*0x68-0x6f*/ + 0x8873, 0x8874, 0x8875, 0xdbea, 0x8876, 0x8877, 0xdbe9, 0xbfc0, /*0x70-0x77*/ + 0x8878, 0x8879, 0x887a, 0xdbe6, 0xdbe5, 0x887b, 0x887c, 0x887d, /*0x78-0x7f*/ + 0x887e, 0x8880, 0xb4b9, 0xc0ac, 0xc2a2, 0xdbe2, 0xdbe4, 0x8881, /*0x80-0x87*/ + 0x8882, 0x8883, 0x8884, 0xd0cd, 0xdbed, 0x8885, 0x8886, 0x8887, /*0x88-0x8f*/ + 0x8888, 0x8889, 0xc0dd, 0xdbf2, 0x888a, 0x888b, 0x888c, 0x888d, /*0x90-0x97*/ + 0x888e, 0x888f, 0x8890, 0xb6e2, 0x8891, 0x8892, 0x8893, 0x8894, /*0x98-0x9f*/ + 0xdbf3, 0xdbd2, 0xb9b8, 0xd4ab, 0xdbec, 0x8895, 0xbfd1, 0xdbf0, /*0xa0-0xa7*/ + 0x8896, 0xdbd1, 0x8897, 0xb5e6, 0x8898, 0xdbeb, 0xbfe5, 0x8899, /*0xa8-0xaf*/ + 0x889a, 0x889b, 0xdbee, 0x889c, 0xdbf1, 0x889d, 0x889e, 0x889f, /*0xb0-0xb7*/ + 0xdbf9, 0x88a0, 0x88a1, 0x88a2, 0x88a3, 0x88a4, 0x88a5, 0x88a6, /*0xb8-0xbf*/ + 0x88a7, 0x88a8, 0xb9a1, 0xb0a3, 0x88a9, 0x88aa, 0x88ab, 0x88ac, /*0xc0-0xc7*/ + 0x88ad, 0x88ae, 0x88af, 0xc2f1, 0x88b0, 0x88b1, 0xb3c7, 0xdbef, /*0xc8-0xcf*/ + 0x88b2, 0x88b3, 0xdbf8, 0x88b4, 0xc6d2, 0xdbf4, 0x88b5, 0x88b6, /*0xd0-0xd7*/ + 0xdbf5, 0xdbf7, 0xdbf6, 0x88b7, 0x88b8, 0xdbfe, 0x88b9, 0xd3f2, /*0xd8-0xdf*/ + 0xb2ba, 0x88ba, 0x88bb, 0x88bc, 0xdbfd, 0x88bd, 0x88be, 0x88bf, /*0xe0-0xe7*/ + 0x88c0, 0x88c1, 0x88c2, 0x88c3, 0x88c4, 0xdca4, 0x88c5, 0xdbfb, /*0xe8-0xef*/ + 0x88c6, 0x88c7, 0x88c8, 0x88c9, 0xdbfa, 0x88ca, 0x88cb, 0x88cc, /*0xf0-0xf7*/ + 0xdbfc, 0xc5e0, 0xbbf9, 0x88cd, 0x88ce, 0xdca3, 0x88cf, 0x88d0, /*0xf8-0xff*/ + /* 0x5800 */ + 0xdca5, 0x88d1, 0xccc3, 0x88d2, 0x88d3, 0x88d4, 0xb6d1, 0xddc0, /*0x00-0x07*/ + 0x88d5, 0x88d6, 0x88d7, 0xdca1, 0x88d8, 0xdca2, 0x88d9, 0x88da, /*0x08-0x0f*/ + 0x88db, 0xc7b5, 0x88dc, 0x88dd, 0x88de, 0xb6e9, 0x88df, 0x88e0, /*0x10-0x17*/ + 0x88e1, 0xdca7, 0x88e2, 0x88e3, 0x88e4, 0x88e5, 0xdca6, 0x88e6, /*0x18-0x1f*/ + 0xdca9, 0xb1a4, 0x88e7, 0x88e8, 0xb5cc, 0x88e9, 0x88ea, 0x88eb, /*0x20-0x27*/ + 0x88ec, 0x88ed, 0xbfb0, 0x88ee, 0x88ef, 0x88f0, 0x88f1, 0x88f2, /*0x28-0x2f*/ + 0xd1df, 0x88f3, 0x88f4, 0x88f5, 0x88f6, 0xb6c2, 0x88f7, 0x88f8, /*0x30-0x37*/ + 0x88f9, 0x88fa, 0x88fb, 0x88fc, 0x88fd, 0x88fe, 0x8940, 0x8941, /*0x38-0x3f*/ + 0x8942, 0x8943, 0x8944, 0x8945, 0xdca8, 0x8946, 0x8947, 0x8948, /*0x40-0x47*/ + 0x8949, 0x894a, 0x894b, 0x894c, 0xcbfa, 0xebf3, 0x894d, 0x894e, /*0x48-0x4f*/ + 0x894f, 0xcbdc, 0x8950, 0x8951, 0xcbfe, 0x8952, 0x8953, 0x8954, /*0x50-0x57*/ + 0xccc1, 0x8955, 0x8956, 0x8957, 0x8958, 0x8959, 0xc8fb, 0x895a, /*0x58-0x5f*/ + 0x895b, 0x895c, 0x895d, 0x895e, 0x895f, 0xdcaa, 0x8960, 0x8961, /*0x60-0x67*/ + 0x8962, 0x8963, 0x8964, 0xccee, 0xdcab, 0x8965, 0x8966, 0x8967, /*0x68-0x6f*/ + 0x8968, 0x8969, 0x896a, 0x896b, 0x896c, 0x896d, 0x896e, 0x896f, /*0x70-0x77*/ + 0x8970, 0x8971, 0x8972, 0x8973, 0x8974, 0x8975, 0xdbd3, 0x8976, /*0x78-0x7f*/ + 0xdcaf, 0xdcac, 0x8977, 0xbeb3, 0x8978, 0xcafb, 0x8979, 0x897a, /*0x80-0x87*/ + 0x897b, 0xdcad, 0x897c, 0x897d, 0x897e, 0x8980, 0x8981, 0x8982, /*0x88-0x8f*/ + 0x8983, 0x8984, 0xc9ca, 0xc4b9, 0x8985, 0x8986, 0x8987, 0x8988, /*0x90-0x97*/ + 0x8989, 0xc7bd, 0xdcae, 0x898a, 0x898b, 0x898c, 0xd4f6, 0xd0e6, /*0x98-0x9f*/ + 0x898d, 0x898e, 0x898f, 0x8990, 0x8991, 0x8992, 0x8993, 0x8994, /*0xa0-0xa7*/ + 0xc4ab, 0xb6d5, 0x8995, 0x8996, 0x8997, 0x8998, 0x8999, 0x899a, /*0xa8-0xaf*/ + 0x899b, 0x899c, 0x899d, 0x899e, 0x899f, 0x89a0, 0x89a1, 0x89a2, /*0xb0-0xb7*/ + 0x89a3, 0x89a4, 0x89a5, 0x89a6, 0xdbd4, 0x89a7, 0x89a8, 0x89a9, /*0xb8-0xbf*/ + 0x89aa, 0xb1da, 0x89ab, 0x89ac, 0x89ad, 0xdbd5, 0x89ae, 0x89af, /*0xc0-0xc7*/ + 0x89b0, 0x89b1, 0x89b2, 0x89b3, 0x89b4, 0x89b5, 0x89b6, 0x89b7, /*0xc8-0xcf*/ + 0x89b8, 0xdbd6, 0x89b9, 0x89ba, 0x89bb, 0xbabe, 0x89bc, 0x89bd, /*0xd0-0xd7*/ + 0x89be, 0x89bf, 0x89c0, 0x89c1, 0x89c2, 0x89c3, 0x89c4, 0x89c5, /*0xd8-0xdf*/ + 0x89c6, 0x89c7, 0x89c8, 0x89c9, 0xc8c0, 0x89ca, 0x89cb, 0x89cc, /*0xe0-0xe7*/ + 0x89cd, 0x89ce, 0x89cf, 0xcabf, 0xc8c9, 0x89d0, 0xd7b3, 0x89d1, /*0xe8-0xef*/ + 0xc9f9, 0x89d2, 0x89d3, 0xbfc7, 0x89d4, 0x89d5, 0xbaf8, 0x89d6, /*0xf0-0xf7*/ + 0x89d7, 0xd2bc, 0x89d8, 0x89d9, 0x89da, 0x89db, 0x89dc, 0x89dd, /*0xf8-0xff*/ + /* 0x5900 */ + 0x89de, 0x89df, 0xe2ba, 0x89e0, 0xb4a6, 0x89e1, 0x89e2, 0xb1b8, /*0x00-0x07*/ + 0x89e3, 0x89e4, 0x89e5, 0x89e6, 0x89e7, 0xb8b4, 0x89e8, 0xcfc4, /*0x08-0x0f*/ + 0x89e9, 0x89ea, 0x89eb, 0x89ec, 0xd9e7, 0xcfa6, 0xcde2, 0x89ed, /*0x10-0x17*/ + 0x89ee, 0xd9ed, 0xb6e0, 0x89ef, 0xd2b9, 0x89f0, 0x89f1, 0xb9bb, /*0x18-0x1f*/ + 0x89f2, 0x89f3, 0x89f4, 0x89f5, 0xe2b9, 0xe2b7, 0x89f6, 0xb4f3, /*0x20-0x27*/ + 0x89f7, 0xccec, 0xccab, 0xb7f2, 0x89f8, 0xd8b2, 0xd1eb, 0xbabb, /*0x28-0x2f*/ + 0x89f9, 0xcaa7, 0x89fa, 0x89fb, 0xcdb7, 0x89fc, 0x89fd, 0xd2c4, /*0x30-0x37*/ + 0xbfe4, 0xbcd0, 0xb6e1, 0x89fe, 0xdec5, 0x8a40, 0x8a41, 0x8a42, /*0x38-0x3f*/ + 0x8a43, 0xdec6, 0xdbbc, 0x8a44, 0xd1d9, 0x8a45, 0x8a46, 0xc6e6, /*0x40-0x47*/ + 0xc4ce, 0xb7ee, 0x8a47, 0xb7dc, 0x8a48, 0x8a49, 0xbffc, 0xd7e0, /*0x48-0x4f*/ + 0x8a4a, 0xc6f5, 0x8a4b, 0x8a4c, 0xb1bc, 0xdec8, 0xbdb1, 0xccd7, /*0x50-0x57*/ + 0xdeca, 0x8a4d, 0xdec9, 0x8a4e, 0x8a4f, 0x8a50, 0x8a51, 0x8a52, /*0x58-0x5f*/ + 0xb5ec, 0x8a53, 0xc9dd, 0x8a54, 0x8a55, 0xb0c2, 0x8a56, 0x8a57, /*0x60-0x67*/ + 0x8a58, 0x8a59, 0x8a5a, 0x8a5b, 0x8a5c, 0x8a5d, 0x8a5e, 0x8a5f, /*0x68-0x6f*/ + 0x8a60, 0x8a61, 0x8a62, 0xc5ae, 0xc5ab, 0x8a63, 0xc4cc, 0x8a64, /*0x70-0x77*/ + 0xbce9, 0xcbfd, 0x8a65, 0x8a66, 0x8a67, 0xbac3, 0x8a68, 0x8a69, /*0x78-0x7f*/ + 0x8a6a, 0xe5f9, 0xc8e7, 0xe5fa, 0xcdfd, 0x8a6b, 0xd7b1, 0xb8be, /*0x80-0x87*/ + 0xc2e8, 0x8a6c, 0xc8d1, 0x8a6d, 0x8a6e, 0xe5fb, 0x8a6f, 0x8a70, /*0x88-0x8f*/ + 0x8a71, 0x8a72, 0xb6ca, 0xbccb, 0x8a73, 0x8a74, 0xd1fd, 0xe6a1, /*0x90-0x97*/ + 0x8a75, 0xc3ee, 0x8a76, 0x8a77, 0x8a78, 0x8a79, 0xe6a4, 0x8a7a, /*0x98-0x9f*/ + 0x8a7b, 0x8a7c, 0x8a7d, 0xe5fe, 0xe6a5, 0xcdd7, 0x8a7e, 0x8a80, /*0xa0-0xa7*/ + 0xb7c1, 0xe5fc, 0xe5fd, 0xe6a3, 0x8a81, 0x8a82, 0xc4dd, 0xe6a8, /*0xa8-0xaf*/ + 0x8a83, 0x8a84, 0xe6a7, 0x8a85, 0x8a86, 0x8a87, 0x8a88, 0x8a89, /*0xb0-0xb7*/ + 0x8a8a, 0xc3c3, 0x8a8b, 0xc6de, 0x8a8c, 0x8a8d, 0xe6aa, 0x8a8e, /*0xb8-0xbf*/ + 0x8a8f, 0x8a90, 0x8a91, 0x8a92, 0x8a93, 0x8a94, 0xc4b7, 0x8a95, /*0xc0-0xc7*/ + 0x8a96, 0x8a97, 0xe6a2, 0xcabc, 0x8a98, 0x8a99, 0x8a9a, 0x8a9b, /*0xc8-0xcf*/ + 0xbde3, 0xb9c3, 0xe6a6, 0xd0d5, 0xceaf, 0x8a9c, 0x8a9d, 0xe6a9, /*0xd0-0xd7*/ + 0xe6b0, 0x8a9e, 0xd2a6, 0x8a9f, 0xbdaa, 0xe6ad, 0x8aa0, 0x8aa1, /*0xd8-0xdf*/ + 0x8aa2, 0x8aa3, 0x8aa4, 0xe6af, 0x8aa5, 0xc0d1, 0x8aa6, 0x8aa7, /*0xe0-0xe7*/ + 0xd2cc, 0x8aa8, 0x8aa9, 0x8aaa, 0xbca7, 0x8aab, 0x8aac, 0x8aad, /*0xe8-0xef*/ + 0x8aae, 0x8aaf, 0x8ab0, 0x8ab1, 0x8ab2, 0x8ab3, 0x8ab4, 0x8ab5, /*0xf0-0xf7*/ + 0x8ab6, 0xe6b1, 0x8ab7, 0xd2f6, 0x8ab8, 0x8ab9, 0x8aba, 0xd7cb, /*0xf8-0xff*/ + /* 0x5a00 */ + 0x8abb, 0xcdfe, 0x8abc, 0xcdde, 0xc2a6, 0xe6ab, 0xe6ac, 0xbdbf, /*0x00-0x07*/ + 0xe6ae, 0xe6b3, 0x8abd, 0x8abe, 0xe6b2, 0x8abf, 0x8ac0, 0x8ac1, /*0x08-0x0f*/ + 0x8ac2, 0xe6b6, 0x8ac3, 0xe6b8, 0x8ac4, 0x8ac5, 0x8ac6, 0x8ac7, /*0x10-0x17*/ + 0xc4ef, 0x8ac8, 0x8ac9, 0x8aca, 0xc4c8, 0x8acb, 0x8acc, 0xbeea, /*0x18-0x1f*/ + 0xc9ef, 0x8acd, 0x8ace, 0xe6b7, 0x8acf, 0xb6f0, 0x8ad0, 0x8ad1, /*0x20-0x27*/ + 0x8ad2, 0xc3e4, 0x8ad3, 0x8ad4, 0x8ad5, 0x8ad6, 0x8ad7, 0x8ad8, /*0x28-0x2f*/ + 0x8ad9, 0xd3e9, 0xe6b4, 0x8ada, 0xe6b5, 0x8adb, 0xc8a2, 0x8adc, /*0x30-0x37*/ + 0x8add, 0x8ade, 0x8adf, 0x8ae0, 0xe6bd, 0x8ae1, 0x8ae2, 0x8ae3, /*0x38-0x3f*/ + 0xe6b9, 0x8ae4, 0x8ae5, 0x8ae6, 0x8ae7, 0x8ae8, 0xc6c5, 0x8ae9, /*0x40-0x47*/ + 0x8aea, 0xcdf1, 0xe6bb, 0x8aeb, 0x8aec, 0x8aed, 0x8aee, 0x8aef, /*0x48-0x4f*/ + 0x8af0, 0x8af1, 0x8af2, 0x8af3, 0x8af4, 0xe6bc, 0x8af5, 0x8af6, /*0x50-0x57*/ + 0x8af7, 0x8af8, 0xbbe9, 0x8af9, 0x8afa, 0x8afb, 0x8afc, 0x8afd, /*0x58-0x5f*/ + 0x8afe, 0x8b40, 0xe6be, 0x8b41, 0x8b42, 0x8b43, 0x8b44, 0xe6ba, /*0x60-0x67*/ + 0x8b45, 0x8b46, 0xc0b7, 0x8b47, 0x8b48, 0x8b49, 0x8b4a, 0x8b4b, /*0x68-0x6f*/ + 0x8b4c, 0x8b4d, 0x8b4e, 0x8b4f, 0xd3a4, 0xe6bf, 0xc9f4, 0xe6c3, /*0x70-0x77*/ + 0x8b50, 0x8b51, 0xe6c4, 0x8b52, 0x8b53, 0x8b54, 0x8b55, 0xd0f6, /*0x78-0x7f*/ + 0x8b56, 0x8b57, 0x8b58, 0x8b59, 0x8b5a, 0x8b5b, 0x8b5c, 0x8b5d, /*0x80-0x87*/ + 0x8b5e, 0x8b5f, 0x8b60, 0x8b61, 0x8b62, 0x8b63, 0x8b64, 0x8b65, /*0x88-0x8f*/ + 0x8b66, 0x8b67, 0xc3bd, 0x8b68, 0x8b69, 0x8b6a, 0x8b6b, 0x8b6c, /*0x90-0x97*/ + 0x8b6d, 0x8b6e, 0xc3c4, 0xe6c2, 0x8b6f, 0x8b70, 0x8b71, 0x8b72, /*0x98-0x9f*/ + 0x8b73, 0x8b74, 0x8b75, 0x8b76, 0x8b77, 0x8b78, 0x8b79, 0x8b7a, /*0xa0-0xa7*/ + 0x8b7b, 0x8b7c, 0xe6c1, 0x8b7d, 0x8b7e, 0x8b80, 0x8b81, 0x8b82, /*0xa8-0xaf*/ + 0x8b83, 0x8b84, 0xe6c7, 0xcfb1, 0x8b85, 0xebf4, 0x8b86, 0x8b87, /*0xb0-0xb7*/ + 0xe6ca, 0x8b88, 0x8b89, 0x8b8a, 0x8b8b, 0x8b8c, 0xe6c5, 0x8b8d, /*0xb8-0xbf*/ + 0x8b8e, 0xbcde, 0xc9a9, 0x8b8f, 0x8b90, 0x8b91, 0x8b92, 0x8b93, /*0xc0-0xc7*/ + 0x8b94, 0xbcb5, 0x8b95, 0x8b96, 0xcfd3, 0x8b97, 0x8b98, 0x8b99, /*0xc8-0xcf*/ + 0x8b9a, 0x8b9b, 0xe6c8, 0x8b9c, 0xe6c9, 0x8b9d, 0xe6ce, 0x8b9e, /*0xd0-0xd7*/ + 0xe6d0, 0x8b9f, 0x8ba0, 0x8ba1, 0xe6d1, 0x8ba2, 0x8ba3, 0x8ba4, /*0xd8-0xdf*/ + 0xe6cb, 0xb5d5, 0x8ba5, 0xe6cc, 0x8ba6, 0x8ba7, 0xe6cf, 0x8ba8, /*0xe0-0xe7*/ + 0x8ba9, 0xc4db, 0x8baa, 0xe6c6, 0x8bab, 0x8bac, 0x8bad, 0x8bae, /*0xe8-0xef*/ + 0x8baf, 0xe6cd, 0x8bb0, 0x8bb1, 0x8bb2, 0x8bb3, 0x8bb4, 0x8bb5, /*0xf0-0xf7*/ + 0x8bb6, 0x8bb7, 0x8bb8, 0x8bb9, 0x8bba, 0x8bbb, 0x8bbc, 0x8bbd, /*0xf8-0xff*/ + /* 0x5b00 */ + 0x8bbe, 0x8bbf, 0x8bc0, 0x8bc1, 0x8bc2, 0x8bc3, 0x8bc4, 0x8bc5, /*0x00-0x07*/ + 0x8bc6, 0xe6d2, 0x8bc7, 0x8bc8, 0x8bc9, 0x8bca, 0x8bcb, 0x8bcc, /*0x08-0x0f*/ + 0x8bcd, 0x8bce, 0x8bcf, 0x8bd0, 0x8bd1, 0x8bd2, 0xe6d4, 0xe6d3, /*0x10-0x17*/ + 0x8bd3, 0x8bd4, 0x8bd5, 0x8bd6, 0x8bd7, 0x8bd8, 0x8bd9, 0x8bda, /*0x18-0x1f*/ + 0x8bdb, 0x8bdc, 0x8bdd, 0x8bde, 0x8bdf, 0x8be0, 0x8be1, 0x8be2, /*0x20-0x27*/ + 0x8be3, 0x8be4, 0x8be5, 0x8be6, 0x8be7, 0x8be8, 0x8be9, 0x8bea, /*0x28-0x2f*/ + 0x8beb, 0x8bec, 0xe6d5, 0x8bed, 0xd9f8, 0x8bee, 0x8bef, 0xe6d6, /*0x30-0x37*/ + 0x8bf0, 0x8bf1, 0x8bf2, 0x8bf3, 0x8bf4, 0x8bf5, 0x8bf6, 0x8bf7, /*0x38-0x3f*/ + 0xe6d7, 0x8bf8, 0x8bf9, 0x8bfa, 0x8bfb, 0x8bfc, 0x8bfd, 0x8bfe, /*0x40-0x47*/ + 0x8c40, 0x8c41, 0x8c42, 0x8c43, 0x8c44, 0x8c45, 0x8c46, 0x8c47, /*0x48-0x4f*/ + 0xd7d3, 0xe6dd, 0x8c48, 0xe6de, 0xbfd7, 0xd4d0, 0x8c49, 0xd7d6, /*0x50-0x57*/ + 0xb4e6, 0xcbef, 0xe6da, 0xd8c3, 0xd7ce, 0xd0a2, 0x8c4a, 0xc3cf, /*0x58-0x5f*/ + 0x8c4b, 0x8c4c, 0xe6df, 0xbcbe, 0xb9c2, 0xe6db, 0xd1a7, 0x8c4d, /*0x60-0x67*/ + 0x8c4e, 0xbaa2, 0xc2cf, 0x8c4f, 0xd8ab, 0x8c50, 0x8c51, 0x8c52, /*0x68-0x6f*/ + 0xcaeb, 0xe5ee, 0x8c53, 0xe6dc, 0x8c54, 0xb7f5, 0x8c55, 0x8c56, /*0x70-0x77*/ + 0x8c57, 0x8c58, 0xc8e6, 0x8c59, 0x8c5a, 0xc4f5, 0x8c5b, 0x8c5c, /*0x78-0x7f*/ + 0xe5b2, 0xc4fe, 0x8c5d, 0xcbfc, 0xe5b3, 0xd5ac, 0x8c5e, 0xd3ee, /*0x80-0x87*/ + 0xcad8, 0xb0b2, 0x8c5f, 0xcbce, 0xcdea, 0x8c60, 0x8c61, 0xbaea, /*0x88-0x8f*/ + 0x8c62, 0x8c63, 0x8c64, 0xe5b5, 0x8c65, 0xe5b4, 0x8c66, 0xd7da, /*0x90-0x97*/ + 0xb9d9, 0xd6e6, 0xb6a8, 0xcdf0, 0xd2cb, 0xb1a6, 0xcab5, 0x8c67, /*0x98-0x9f*/ + 0xb3e8, 0xc9f3, 0xbfcd, 0xd0fb, 0xcad2, 0xe5b6, 0xbbc2, 0x8c68, /*0xa0-0xa7*/ + 0x8c69, 0x8c6a, 0xcfdc, 0xb9ac, 0x8c6b, 0x8c6c, 0x8c6d, 0x8c6e, /*0xa8-0xaf*/ + 0xd4d7, 0x8c6f, 0x8c70, 0xbaa6, 0xd1e7, 0xcffc, 0xbcd2, 0x8c71, /*0xb0-0xb7*/ + 0xe5b7, 0xc8dd, 0x8c72, 0x8c73, 0x8c74, 0xbfed, 0xb1f6, 0xcbde, /*0xb8-0xbf*/ + 0x8c75, 0x8c76, 0xbcc5, 0x8c77, 0xbcc4, 0xd2fa, 0xc3dc, 0xbfdc, /*0xc0-0xc7*/ + 0x8c78, 0x8c79, 0x8c7a, 0x8c7b, 0xb8bb, 0x8c7c, 0x8c7d, 0x8c7e, /*0xc8-0xcf*/ + 0xc3c2, 0x8c80, 0xbaae, 0xd4a2, 0x8c81, 0x8c82, 0x8c83, 0x8c84, /*0xd0-0xd7*/ + 0x8c85, 0x8c86, 0x8c87, 0x8c88, 0x8c89, 0xc7de, 0xc4af, 0xb2ec, /*0xd8-0xdf*/ + 0x8c8a, 0xb9d1, 0x8c8b, 0x8c8c, 0xe5bb, 0xc1c8, 0x8c8d, 0x8c8e, /*0xe0-0xe7*/ + 0xd5af, 0x8c8f, 0x8c90, 0x8c91, 0x8c92, 0x8c93, 0xe5bc, 0x8c94, /*0xe8-0xef*/ + 0xe5be, 0x8c95, 0x8c96, 0x8c97, 0x8c98, 0x8c99, 0x8c9a, 0x8c9b, /*0xf0-0xf7*/ + 0xb4e7, 0xb6d4, 0xcbc2, 0xd1b0, 0xb5bc, 0x8c9c, 0x8c9d, 0xcad9, /*0xf8-0xff*/ + /* 0x5c00 */ + 0x8c9e, 0xb7e2, 0x8c9f, 0x8ca0, 0xc9e4, 0x8ca1, 0xbdab, 0x8ca2, /*0x00-0x07*/ + 0x8ca3, 0xcebe, 0xd7f0, 0x8ca4, 0x8ca5, 0x8ca6, 0x8ca7, 0xd0a1, /*0x08-0x0f*/ + 0x8ca8, 0xc9d9, 0x8ca9, 0x8caa, 0xb6fb, 0xe6d8, 0xbce2, 0x8cab, /*0x10-0x17*/ + 0xb3be, 0x8cac, 0xc9d0, 0x8cad, 0xe6d9, 0xb3a2, 0x8cae, 0x8caf, /*0x18-0x1f*/ + 0x8cb0, 0x8cb1, 0xdecc, 0x8cb2, 0xd3c8, 0xdecd, 0x8cb3, 0xd2a2, /*0x20-0x27*/ + 0x8cb4, 0x8cb5, 0x8cb6, 0x8cb7, 0xdece, 0x8cb8, 0x8cb9, 0x8cba, /*0x28-0x2f*/ + 0x8cbb, 0xbecd, 0x8cbc, 0x8cbd, 0xdecf, 0x8cbe, 0x8cbf, 0x8cc0, /*0x30-0x37*/ + 0xcaac, 0xd2fc, 0xb3df, 0xe5ea, 0xc4e1, 0xbea1, 0xceb2, 0xc4f2, /*0x38-0x3f*/ + 0xbed6, 0xc6a8, 0xb2e3, 0x8cc1, 0x8cc2, 0xbed3, 0x8cc3, 0x8cc4, /*0x40-0x47*/ + 0xc7fc, 0xcceb, 0xbdec, 0xcedd, 0x8cc5, 0x8cc6, 0xcaba, 0xc6c1, /*0x48-0x4f*/ + 0xe5ec, 0xd0bc, 0x8cc7, 0x8cc8, 0x8cc9, 0xd5b9, 0x8cca, 0x8ccb, /*0x50-0x57*/ + 0x8ccc, 0xe5ed, 0x8ccd, 0x8cce, 0x8ccf, 0x8cd0, 0xcaf4, 0x8cd1, /*0x58-0x5f*/ + 0xcdc0, 0xc2c5, 0x8cd2, 0xe5ef, 0x8cd3, 0xc2c4, 0xe5f0, 0x8cd4, /*0x60-0x67*/ + 0x8cd5, 0x8cd6, 0x8cd7, 0x8cd8, 0x8cd9, 0x8cda, 0xe5f8, 0xcdcd, /*0x68-0x6f*/ + 0x8cdb, 0xc9bd, 0x8cdc, 0x8cdd, 0x8cde, 0x8cdf, 0x8ce0, 0x8ce1, /*0x70-0x77*/ + 0x8ce2, 0xd2d9, 0xe1a8, 0x8ce3, 0x8ce4, 0x8ce5, 0x8ce6, 0xd3ec, /*0x78-0x7f*/ + 0x8ce7, 0xcbea, 0xc6f1, 0x8ce8, 0x8ce9, 0x8cea, 0x8ceb, 0x8cec, /*0x80-0x87*/ + 0xe1ac, 0x8ced, 0x8cee, 0x8cef, 0xe1a7, 0xe1a9, 0x8cf0, 0x8cf1, /*0x88-0x8f*/ + 0xe1aa, 0xe1af, 0x8cf2, 0x8cf3, 0xb2ed, 0x8cf4, 0xe1ab, 0xb8da, /*0x90-0x97*/ + 0xe1ad, 0xe1ae, 0xe1b0, 0xb5ba, 0xe1b1, 0x8cf5, 0x8cf6, 0x8cf7, /*0x98-0x9f*/ + 0x8cf8, 0x8cf9, 0xe1b3, 0xe1b8, 0x8cfa, 0x8cfb, 0x8cfc, 0x8cfd, /*0xa0-0xa7*/ + 0x8cfe, 0xd1d2, 0x8d40, 0xe1b6, 0xe1b5, 0xc1eb, 0x8d41, 0x8d42, /*0xa8-0xaf*/ + 0x8d43, 0xe1b7, 0x8d44, 0xd4c0, 0x8d45, 0xe1b2, 0x8d46, 0xe1ba, /*0xb0-0xb7*/ + 0xb0b6, 0x8d47, 0x8d48, 0x8d49, 0x8d4a, 0xe1b4, 0x8d4b, 0xbff9, /*0xb8-0xbf*/ + 0x8d4c, 0xe1b9, 0x8d4d, 0x8d4e, 0xe1bb, 0x8d4f, 0x8d50, 0x8d51, /*0xc0-0xc7*/ + 0x8d52, 0x8d53, 0x8d54, 0xe1be, 0x8d55, 0x8d56, 0x8d57, 0x8d58, /*0xc8-0xcf*/ + 0x8d59, 0x8d5a, 0xe1bc, 0x8d5b, 0x8d5c, 0x8d5d, 0x8d5e, 0x8d5f, /*0xd0-0xd7*/ + 0x8d60, 0xd6c5, 0x8d61, 0x8d62, 0x8d63, 0x8d64, 0x8d65, 0x8d66, /*0xd8-0xdf*/ + 0x8d67, 0xcfbf, 0x8d68, 0x8d69, 0xe1bd, 0xe1bf, 0xc2cd, 0x8d6a, /*0xe0-0xe7*/ + 0xb6eb, 0x8d6b, 0xd3f8, 0x8d6c, 0x8d6d, 0xc7cd, 0x8d6e, 0x8d6f, /*0xe8-0xef*/ + 0xb7e5, 0x8d70, 0x8d71, 0x8d72, 0x8d73, 0x8d74, 0x8d75, 0x8d76, /*0xf0-0xf7*/ + 0x8d77, 0x8d78, 0x8d79, 0xbefe, 0x8d7a, 0x8d7b, 0x8d7c, 0x8d7d, /*0xf8-0xff*/ + /* 0x5d00 */ + 0x8d7e, 0x8d80, 0xe1c0, 0xe1c1, 0x8d81, 0x8d82, 0xe1c7, 0xb3e7, /*0x00-0x07*/ + 0x8d83, 0x8d84, 0x8d85, 0x8d86, 0x8d87, 0x8d88, 0xc6e9, 0x8d89, /*0x08-0x0f*/ + 0x8d8a, 0x8d8b, 0x8d8c, 0x8d8d, 0xb4de, 0x8d8e, 0xd1c2, 0x8d8f, /*0x10-0x17*/ + 0x8d90, 0x8d91, 0x8d92, 0xe1c8, 0x8d93, 0x8d94, 0xe1c6, 0x8d95, /*0x18-0x1f*/ + 0x8d96, 0x8d97, 0x8d98, 0x8d99, 0xe1c5, 0x8d9a, 0xe1c3, 0xe1c2, /*0x20-0x27*/ + 0x8d9b, 0xb1c0, 0x8d9c, 0x8d9d, 0x8d9e, 0xd5b8, 0xe1c4, 0x8d9f, /*0x28-0x2f*/ + 0x8da0, 0x8da1, 0x8da2, 0x8da3, 0xe1cb, 0x8da4, 0x8da5, 0x8da6, /*0x30-0x37*/ + 0x8da7, 0x8da8, 0x8da9, 0x8daa, 0x8dab, 0xe1cc, 0xe1ca, 0x8dac, /*0x38-0x3f*/ + 0x8dad, 0x8dae, 0x8daf, 0x8db0, 0x8db1, 0x8db2, 0x8db3, 0xeffa, /*0x40-0x47*/ + 0x8db4, 0x8db5, 0xe1d3, 0xe1d2, 0xc7b6, 0x8db6, 0x8db7, 0x8db8, /*0x48-0x4f*/ + 0x8db9, 0x8dba, 0x8dbb, 0x8dbc, 0x8dbd, 0x8dbe, 0x8dbf, 0x8dc0, /*0x50-0x57*/ + 0xe1c9, 0x8dc1, 0x8dc2, 0xe1ce, 0x8dc3, 0xe1d0, 0x8dc4, 0x8dc5, /*0x58-0x5f*/ + 0x8dc6, 0x8dc7, 0x8dc8, 0x8dc9, 0x8dca, 0x8dcb, 0x8dcc, 0x8dcd, /*0x60-0x67*/ + 0x8dce, 0xe1d4, 0x8dcf, 0xe1d1, 0xe1cd, 0x8dd0, 0x8dd1, 0xe1cf, /*0x68-0x6f*/ + 0x8dd2, 0x8dd3, 0x8dd4, 0x8dd5, 0xe1d5, 0x8dd6, 0x8dd7, 0x8dd8, /*0x70-0x77*/ + 0x8dd9, 0x8dda, 0x8ddb, 0x8ddc, 0x8ddd, 0x8dde, 0x8ddf, 0x8de0, /*0x78-0x7f*/ + 0x8de1, 0x8de2, 0xe1d6, 0x8de3, 0x8de4, 0x8de5, 0x8de6, 0x8de7, /*0x80-0x87*/ + 0x8de8, 0x8de9, 0x8dea, 0x8deb, 0x8dec, 0x8ded, 0x8dee, 0x8def, /*0x88-0x8f*/ + 0x8df0, 0x8df1, 0x8df2, 0x8df3, 0x8df4, 0x8df5, 0x8df6, 0x8df7, /*0x90-0x97*/ + 0x8df8, 0xe1d7, 0x8df9, 0x8dfa, 0x8dfb, 0xe1d8, 0x8dfc, 0x8dfd, /*0x98-0x9f*/ + 0x8dfe, 0x8e40, 0x8e41, 0x8e42, 0x8e43, 0x8e44, 0x8e45, 0x8e46, /*0xa0-0xa7*/ + 0x8e47, 0x8e48, 0x8e49, 0x8e4a, 0x8e4b, 0x8e4c, 0x8e4d, 0x8e4e, /*0xa8-0xaf*/ + 0x8e4f, 0x8e50, 0x8e51, 0x8e52, 0x8e53, 0x8e54, 0x8e55, 0xe1da, /*0xb0-0xb7*/ + 0x8e56, 0x8e57, 0x8e58, 0x8e59, 0x8e5a, 0x8e5b, 0x8e5c, 0x8e5d, /*0xb8-0xbf*/ + 0x8e5e, 0x8e5f, 0x8e60, 0x8e61, 0x8e62, 0xe1db, 0x8e63, 0x8e64, /*0xc0-0xc7*/ + 0x8e65, 0x8e66, 0x8e67, 0x8e68, 0x8e69, 0xcea1, 0x8e6a, 0x8e6b, /*0xc8-0xcf*/ + 0x8e6c, 0x8e6d, 0x8e6e, 0x8e6f, 0x8e70, 0x8e71, 0x8e72, 0x8e73, /*0xd0-0xd7*/ + 0x8e74, 0x8e75, 0x8e76, 0xe7dd, 0x8e77, 0xb4a8, 0xd6dd, 0x8e78, /*0xd8-0xdf*/ + 0x8e79, 0xd1b2, 0xb3b2, 0x8e7a, 0x8e7b, 0xb9a4, 0xd7f3, 0xc7c9, /*0xe0-0xe7*/ + 0xbede, 0xb9ae, 0x8e7c, 0xced7, 0x8e7d, 0x8e7e, 0xb2ee, 0xdbcf, /*0xe8-0xef*/ + 0x8e80, 0xbcba, 0xd2d1, 0xcbc8, 0xb0cd, 0x8e81, 0x8e82, 0xcfef, /*0xf0-0xf7*/ + 0x8e83, 0x8e84, 0x8e85, 0x8e86, 0x8e87, 0xd9e3, 0xbded, 0x8e88, /*0xf8-0xff*/ + /* 0x5e00 */ + 0x8e89, 0xb1d2, 0xcad0, 0xb2bc, 0x8e8a, 0xcba7, 0xb7ab, 0x8e8b, /*0x00-0x07*/ + 0xcaa6, 0x8e8c, 0x8e8d, 0x8e8e, 0xcfa3, 0x8e8f, 0x8e90, 0xe0f8, /*0x08-0x0f*/ + 0xd5ca, 0xe0fb, 0x8e91, 0x8e92, 0xe0fa, 0xc5c1, 0xccfb, 0x8e93, /*0x10-0x17*/ + 0xc1b1, 0xe0f9, 0xd6e3, 0xb2af, 0xd6c4, 0xb5db, 0x8e94, 0x8e95, /*0x18-0x1f*/ + 0x8e96, 0x8e97, 0x8e98, 0x8e99, 0x8e9a, 0x8e9b, 0xb4f8, 0xd6a1, /*0x20-0x27*/ + 0x8e9c, 0x8e9d, 0x8e9e, 0x8e9f, 0x8ea0, 0xcfaf, 0xb0ef, 0x8ea1, /*0x28-0x2f*/ + 0x8ea2, 0xe0fc, 0x8ea3, 0x8ea4, 0x8ea5, 0x8ea6, 0x8ea7, 0xe1a1, /*0x30-0x37*/ + 0xb3a3, 0x8ea8, 0x8ea9, 0xe0fd, 0xe0fe, 0xc3b1, 0x8eaa, 0x8eab, /*0x38-0x3f*/ + 0x8eac, 0x8ead, 0xc3dd, 0x8eae, 0xe1a2, 0xb7f9, 0x8eaf, 0x8eb0, /*0x40-0x47*/ + 0x8eb1, 0x8eb2, 0x8eb3, 0x8eb4, 0xbbcf, 0x8eb5, 0x8eb6, 0x8eb7, /*0x48-0x4f*/ + 0x8eb8, 0x8eb9, 0x8eba, 0x8ebb, 0xe1a3, 0xc4bb, 0x8ebc, 0x8ebd, /*0x50-0x57*/ + 0x8ebe, 0x8ebf, 0x8ec0, 0xe1a4, 0x8ec1, 0x8ec2, 0xe1a5, 0x8ec3, /*0x58-0x5f*/ + 0x8ec4, 0xe1a6, 0xb4b1, 0x8ec5, 0x8ec6, 0x8ec7, 0x8ec8, 0x8ec9, /*0x60-0x67*/ + 0x8eca, 0x8ecb, 0x8ecc, 0x8ecd, 0x8ece, 0x8ecf, 0x8ed0, 0x8ed1, /*0x68-0x6f*/ + 0x8ed2, 0x8ed3, 0xb8c9, 0xc6bd, 0xc4ea, 0x8ed4, 0xb2a2, 0x8ed5, /*0x70-0x77*/ + 0xd0d2, 0x8ed6, 0xe7db, 0xbbc3, 0xd3d7, 0xd3c4, 0x8ed7, 0xb9e3, /*0x78-0x7f*/ + 0xe2cf, 0x8ed8, 0x8ed9, 0x8eda, 0xd7af, 0x8edb, 0xc7ec, 0xb1d3, /*0x80-0x87*/ + 0x8edc, 0x8edd, 0xb4b2, 0xe2d1, 0x8ede, 0x8edf, 0x8ee0, 0xd0f2, /*0x88-0x8f*/ + 0xc2ae, 0xe2d0, 0x8ee1, 0xbfe2, 0xd3a6, 0xb5d7, 0xe2d2, 0xb5ea, /*0x90-0x97*/ + 0x8ee2, 0xc3ed, 0xb8fd, 0x8ee3, 0xb8ae, 0x8ee4, 0xc5d3, 0xb7cf, /*0x98-0x9f*/ + 0xe2d4, 0x8ee5, 0x8ee6, 0x8ee7, 0x8ee8, 0xe2d3, 0xb6c8, 0xd7f9, /*0xa0-0xa7*/ + 0x8ee9, 0x8eea, 0x8eeb, 0x8eec, 0x8eed, 0xcda5, 0x8eee, 0x8eef, /*0xa8-0xaf*/ + 0x8ef0, 0x8ef1, 0x8ef2, 0xe2d8, 0x8ef3, 0xe2d6, 0xcafc, 0xbfb5, /*0xb0-0xb7*/ + 0xd3b9, 0xe2d5, 0x8ef4, 0x8ef5, 0x8ef6, 0x8ef7, 0xe2d7, 0x8ef8, /*0xb8-0xbf*/ + 0x8ef9, 0x8efa, 0x8efb, 0x8efc, 0x8efd, 0x8efe, 0x8f40, 0x8f41, /*0xc0-0xc7*/ + 0x8f42, 0xc1ae, 0xc0c8, 0x8f43, 0x8f44, 0x8f45, 0x8f46, 0x8f47, /*0xc8-0xcf*/ + 0x8f48, 0xe2db, 0xe2da, 0xc0aa, 0x8f49, 0x8f4a, 0xc1ce, 0x8f4b, /*0xd0-0xd7*/ + 0x8f4c, 0x8f4d, 0x8f4e, 0xe2dc, 0x8f4f, 0x8f50, 0x8f51, 0x8f52, /*0xd8-0xdf*/ + 0x8f53, 0x8f54, 0x8f55, 0x8f56, 0x8f57, 0x8f58, 0x8f59, 0x8f5a, /*0xe0-0xe7*/ + 0xe2dd, 0x8f5b, 0xe2de, 0x8f5c, 0x8f5d, 0x8f5e, 0x8f5f, 0x8f60, /*0xe8-0xef*/ + 0x8f61, 0x8f62, 0x8f63, 0x8f64, 0xdbc8, 0x8f65, 0xd1d3, 0xcda2, /*0xf0-0xf7*/ + 0x8f66, 0x8f67, 0xbda8, 0x8f68, 0x8f69, 0x8f6a, 0xdec3, 0xd8a5, /*0xf8-0xff*/ + /* 0x5f00 */ + 0xbfaa, 0xdbcd, 0xd2ec, 0xc6fa, 0xc5aa, 0x8f6b, 0x8f6c, 0x8f6d, /*0x00-0x07*/ + 0xdec4, 0x8f6e, 0xb1d7, 0xdfae, 0x8f6f, 0x8f70, 0x8f71, 0xcabd, /*0x08-0x0f*/ + 0x8f72, 0xdfb1, 0x8f73, 0xb9ad, 0x8f74, 0xd2fd, 0x8f75, 0xb8a5, /*0x10-0x17*/ + 0xbaeb, 0x8f76, 0x8f77, 0xb3da, 0x8f78, 0x8f79, 0x8f7a, 0xb5dc, /*0x18-0x1f*/ + 0xd5c5, 0x8f7b, 0x8f7c, 0x8f7d, 0x8f7e, 0xc3d6, 0xcfd2, 0xbba1, /*0x20-0x27*/ + 0x8f80, 0xe5f3, 0xe5f2, 0x8f81, 0x8f82, 0xe5f4, 0x8f83, 0xcde4, /*0x28-0x2f*/ + 0x8f84, 0xc8f5, 0x8f85, 0x8f86, 0x8f87, 0x8f88, 0x8f89, 0x8f8a, /*0x30-0x37*/ + 0x8f8b, 0xb5af, 0xc7bf, 0x8f8c, 0xe5f6, 0x8f8d, 0x8f8e, 0x8f8f, /*0x38-0x3f*/ + 0xecb0, 0x8f90, 0x8f91, 0x8f92, 0x8f93, 0x8f94, 0x8f95, 0x8f96, /*0x40-0x47*/ + 0x8f97, 0x8f98, 0x8f99, 0x8f9a, 0x8f9b, 0x8f9c, 0x8f9d, 0x8f9e, /*0x48-0x4f*/ + 0xe5e6, 0x8f9f, 0xb9e9, 0xb5b1, 0x8fa0, 0xc2bc, 0xe5e8, 0xe5e7, /*0x50-0x57*/ + 0xe5e9, 0x8fa1, 0x8fa2, 0x8fa3, 0x8fa4, 0xd2cd, 0x8fa5, 0x8fa6, /*0x58-0x5f*/ + 0x8fa7, 0xe1ea, 0xd0ce, 0x8fa8, 0xcdae, 0x8fa9, 0xd1e5, 0x8faa, /*0x60-0x67*/ + 0x8fab, 0xb2ca, 0xb1eb, 0x8fac, 0xb1f2, 0xc5ed, 0x8fad, 0x8fae, /*0x68-0x6f*/ + 0xd5c3, 0xd3b0, 0x8faf, 0xe1dc, 0x8fb0, 0x8fb1, 0x8fb2, 0xe1dd, /*0x70-0x77*/ + 0x8fb3, 0xd2db, 0x8fb4, 0xb3b9, 0xb1cb, 0x8fb5, 0x8fb6, 0x8fb7, /*0x78-0x7f*/ + 0xcdf9, 0xd5f7, 0xe1de, 0x8fb8, 0xbeb6, 0xb4fd, 0x8fb9, 0xe1df, /*0x80-0x87*/ + 0xbadc, 0xe1e0, 0xbbb2, 0xc2c9, 0xe1e1, 0x8fba, 0x8fbb, 0x8fbc, /*0x88-0x8f*/ + 0xd0ec, 0x8fbd, 0xcdbd, 0x8fbe, 0x8fbf, 0xe1e2, 0x8fc0, 0xb5c3, /*0x90-0x97*/ + 0xc5c7, 0xe1e3, 0x8fc1, 0x8fc2, 0xe1e4, 0x8fc3, 0x8fc4, 0x8fc5, /*0x98-0x9f*/ + 0x8fc6, 0xd3f9, 0x8fc7, 0x8fc8, 0x8fc9, 0x8fca, 0x8fcb, 0x8fcc, /*0xa0-0xa7*/ + 0xe1e5, 0x8fcd, 0xd1ad, 0x8fce, 0x8fcf, 0xe1e6, 0xcea2, 0x8fd0, /*0xa8-0xaf*/ + 0x8fd1, 0x8fd2, 0x8fd3, 0x8fd4, 0x8fd5, 0xe1e7, 0x8fd6, 0xb5c2, /*0xb0-0xb7*/ + 0x8fd7, 0x8fd8, 0x8fd9, 0x8fda, 0xe1e8, 0xbbd5, 0x8fdb, 0x8fdc, /*0xb8-0xbf*/ + 0x8fdd, 0x8fde, 0x8fdf, 0xd0c4, 0xe2e0, 0xb1d8, 0xd2e4, 0x8fe0, /*0xc0-0xc7*/ + 0x8fe1, 0xe2e1, 0x8fe2, 0x8fe3, 0xbcc9, 0xc8cc, 0x8fe4, 0xe2e3, /*0xc8-0xcf*/ + 0xecfe, 0xecfd, 0xdfaf, 0x8fe5, 0x8fe6, 0x8fe7, 0xe2e2, 0xd6be, /*0xd0-0xd7*/ + 0xcdfc, 0xc3a6, 0x8fe8, 0x8fe9, 0x8fea, 0xe3c3, 0x8feb, 0x8fec, /*0xd8-0xdf*/ + 0xd6d2, 0xe2e7, 0x8fed, 0x8fee, 0xe2e8, 0x8fef, 0x8ff0, 0xd3c7, /*0xe0-0xe7*/ + 0x8ff1, 0x8ff2, 0xe2ec, 0xbfec, 0x8ff3, 0xe2ed, 0xe2e5, 0x8ff4, /*0xe8-0xef*/ + 0x8ff5, 0xb3c0, 0x8ff6, 0x8ff7, 0x8ff8, 0xc4ee, 0x8ff9, 0x8ffa, /*0xf0-0xf7*/ + 0xe2ee, 0x8ffb, 0x8ffc, 0xd0c3, 0x8ffd, 0xbaf6, 0xe2e9, 0xb7de, /*0xf8-0xff*/ + /* 0x6000 */ + 0xbbb3, 0xccac, 0xcbcb, 0xe2e4, 0xe2e6, 0xe2ea, 0xe2eb, 0x8ffe, /*0x00-0x07*/ + 0x9040, 0x9041, 0xe2f7, 0x9042, 0x9043, 0xe2f4, 0xd4f5, 0xe2f3, /*0x08-0x0f*/ + 0x9044, 0x9045, 0xc5ad, 0x9046, 0xd5fa, 0xc5c2, 0xb2c0, 0x9047, /*0x10-0x17*/ + 0x9048, 0xe2ef, 0x9049, 0xe2f2, 0xc1af, 0xcbbc, 0x904a, 0x904b, /*0x18-0x1f*/ + 0xb5a1, 0xe2f9, 0x904c, 0x904d, 0x904e, 0xbcb1, 0xe2f1, 0xd0d4, /*0x20-0x27*/ + 0xd4b9, 0xe2f5, 0xb9d6, 0xe2f6, 0x904f, 0x9050, 0x9051, 0xc7d3, /*0x28-0x2f*/ + 0x9052, 0x9053, 0x9054, 0x9055, 0x9056, 0xe2f0, 0x9057, 0x9058, /*0x30-0x37*/ + 0x9059, 0x905a, 0x905b, 0xd7dc, 0xeda1, 0x905c, 0x905d, 0xe2f8, /*0x38-0x3f*/ + 0x905e, 0xeda5, 0xe2fe, 0xcad1, 0x905f, 0x9060, 0x9061, 0x9062, /*0x40-0x47*/ + 0x9063, 0x9064, 0x9065, 0xc1b5, 0x9066, 0xbbd0, 0x9067, 0x9068, /*0x48-0x4f*/ + 0xbfd6, 0x9069, 0xbae3, 0x906a, 0x906b, 0xcba1, 0x906c, 0x906d, /*0x50-0x57*/ + 0x906e, 0xeda6, 0xeda3, 0x906f, 0x9070, 0xeda2, 0x9071, 0x9072, /*0x58-0x5f*/ + 0x9073, 0x9074, 0xbbd6, 0xeda7, 0xd0f4, 0x9075, 0x9076, 0xeda4, /*0x60-0x67*/ + 0xbade, 0xb6f7, 0xe3a1, 0xb6b2, 0xccf1, 0xb9a7, 0x9077, 0xcfa2, /*0x68-0x6f*/ + 0xc7a1, 0x9078, 0x9079, 0xbfd2, 0x907a, 0x907b, 0xb6f1, 0x907c, /*0x70-0x77*/ + 0xe2fa, 0xe2fb, 0xe2fd, 0xe2fc, 0xc4d5, 0xe3a2, 0x907d, 0xd3c1, /*0x78-0x7f*/ + 0x907e, 0x9080, 0x9081, 0xe3a7, 0xc7c4, 0x9082, 0x9083, 0x9084, /*0x80-0x87*/ + 0x9085, 0xcfa4, 0x9086, 0x9087, 0xe3a9, 0xbab7, 0x9088, 0x9089, /*0x88-0x8f*/ + 0x908a, 0x908b, 0xe3a8, 0x908c, 0xbbda, 0x908d, 0xe3a3, 0x908e, /*0x90-0x97*/ + 0x908f, 0x9090, 0xe3a4, 0xe3aa, 0x9091, 0xe3a6, 0x9092, 0xcef2, /*0x98-0x9f*/ + 0xd3c6, 0x9093, 0x9094, 0xbbbc, 0x9095, 0x9096, 0xd4c3, 0x9097, /*0xa0-0xa7*/ + 0xc4fa, 0x9098, 0x9099, 0xeda8, 0xd0fc, 0xe3a5, 0x909a, 0xc3f5, /*0xa8-0xaf*/ + 0x909b, 0xe3ad, 0xb1af, 0x909c, 0xe3b2, 0x909d, 0x909e, 0x909f, /*0xb0-0xb7*/ + 0xbcc2, 0x90a0, 0x90a1, 0xe3ac, 0xb5bf, 0x90a2, 0x90a3, 0x90a4, /*0xb8-0xbf*/ + 0x90a5, 0x90a6, 0x90a7, 0x90a8, 0x90a9, 0xc7e9, 0xe3b0, 0x90aa, /*0xc0-0xc7*/ + 0x90ab, 0x90ac, 0xbeaa, 0xcdef, 0x90ad, 0x90ae, 0x90af, 0x90b0, /*0xc8-0xcf*/ + 0x90b1, 0xbbf3, 0x90b2, 0x90b3, 0x90b4, 0xcce8, 0x90b5, 0x90b6, /*0xd0-0xd7*/ + 0xe3af, 0x90b7, 0xe3b1, 0x90b8, 0xcfa7, 0xe3ae, 0x90b9, 0xcea9, /*0xd8-0xdf*/ + 0xbbdd, 0x90ba, 0x90bb, 0x90bc, 0x90bd, 0x90be, 0xb5eb, 0xbee5, /*0xe0-0xe7*/ + 0xb2d2, 0xb3cd, 0x90bf, 0xb1b9, 0xe3ab, 0xb2d1, 0xb5ac, 0xb9df, /*0xe8-0xef*/ + 0xb6e8, 0x90c0, 0x90c1, 0xcfeb, 0xe3b7, 0x90c2, 0xbbcc, 0x90c3, /*0xf0-0xf7*/ + 0x90c4, 0xc8c7, 0xd0ca, 0x90c5, 0x90c6, 0x90c7, 0x90c8, 0x90c9, /*0xf8-0xff*/ + /* 0x6100 */ + 0xe3b8, 0xb3ee, 0x90ca, 0x90cb, 0x90cc, 0x90cd, 0xeda9, 0x90ce, /*0x00-0x07*/ + 0xd3fa, 0xd3e4, 0x90cf, 0x90d0, 0x90d1, 0xedaa, 0xe3b9, 0xd2e2, /*0x08-0x0f*/ + 0x90d2, 0x90d3, 0x90d4, 0x90d5, 0x90d6, 0xe3b5, 0x90d7, 0x90d8, /*0x10-0x17*/ + 0x90d9, 0x90da, 0xd3de, 0x90db, 0x90dc, 0x90dd, 0x90de, 0xb8d0, /*0x18-0x1f*/ + 0xe3b3, 0x90df, 0x90e0, 0xe3b6, 0xb7df, 0x90e1, 0xe3b4, 0xc0a2, /*0x20-0x27*/ + 0x90e2, 0x90e3, 0x90e4, 0xe3ba, 0x90e5, 0x90e6, 0x90e7, 0x90e8, /*0x28-0x2f*/ + 0x90e9, 0x90ea, 0x90eb, 0x90ec, 0x90ed, 0x90ee, 0x90ef, 0x90f0, /*0x30-0x37*/ + 0x90f1, 0x90f2, 0x90f3, 0x90f4, 0x90f5, 0x90f6, 0x90f7, 0xd4b8, /*0x38-0x3f*/ + 0x90f8, 0x90f9, 0x90fa, 0x90fb, 0x90fc, 0x90fd, 0x90fe, 0x9140, /*0x40-0x47*/ + 0xb4c8, 0x9141, 0xe3bb, 0x9142, 0xbbc5, 0x9143, 0xc9f7, 0x9144, /*0x48-0x4f*/ + 0x9145, 0xc9e5, 0x9146, 0x9147, 0x9148, 0xc4bd, 0x9149, 0x914a, /*0x50-0x57*/ + 0x914b, 0x914c, 0x914d, 0x914e, 0x914f, 0xedab, 0x9150, 0x9151, /*0x58-0x5f*/ + 0x9152, 0x9153, 0xc2fd, 0x9154, 0x9155, 0x9156, 0x9157, 0xbbdb, /*0x60-0x67*/ + 0xbfae, 0x9158, 0x9159, 0x915a, 0x915b, 0x915c, 0x915d, 0x915e, /*0x68-0x6f*/ + 0xcebf, 0x915f, 0x9160, 0x9161, 0x9162, 0xe3bc, 0x9163, 0xbfb6, /*0x70-0x77*/ + 0x9164, 0x9165, 0x9166, 0x9167, 0x9168, 0x9169, 0x916a, 0x916b, /*0x78-0x7f*/ + 0x916c, 0x916d, 0x916e, 0x916f, 0x9170, 0x9171, 0x9172, 0x9173, /*0x80-0x87*/ + 0x9174, 0x9175, 0x9176, 0xb1ef, 0x9177, 0x9178, 0xd4f7, 0x9179, /*0x88-0x8f*/ + 0x917a, 0x917b, 0x917c, 0x917d, 0xe3be, 0x917e, 0x9180, 0x9181, /*0x90-0x97*/ + 0x9182, 0x9183, 0x9184, 0x9185, 0x9186, 0xedad, 0x9187, 0x9188, /*0x98-0x9f*/ + 0x9189, 0x918a, 0x918b, 0x918c, 0x918d, 0x918e, 0x918f, 0xe3bf, /*0xa0-0xa7*/ + 0xbaa9, 0xedac, 0x9190, 0x9191, 0xe3bd, 0x9192, 0x9193, 0x9194, /*0xa8-0xaf*/ + 0x9195, 0x9196, 0x9197, 0x9198, 0x9199, 0x919a, 0x919b, 0xe3c0, /*0xb0-0xb7*/ + 0x919c, 0x919d, 0x919e, 0x919f, 0x91a0, 0x91a1, 0xbab6, 0x91a2, /*0xb8-0xbf*/ + 0x91a3, 0x91a4, 0xb6ae, 0x91a5, 0x91a6, 0x91a7, 0x91a8, 0x91a9, /*0xc0-0xc7*/ + 0xd0b8, 0x91aa, 0xb0c3, 0xedae, 0x91ab, 0x91ac, 0x91ad, 0x91ae, /*0xc8-0xcf*/ + 0x91af, 0xedaf, 0xc0c1, 0x91b0, 0xe3c1, 0x91b1, 0x91b2, 0x91b3, /*0xd0-0xd7*/ + 0x91b4, 0x91b5, 0x91b6, 0x91b7, 0x91b8, 0x91b9, 0x91ba, 0x91bb, /*0xd8-0xdf*/ + 0x91bc, 0x91bd, 0x91be, 0x91bf, 0x91c0, 0x91c1, 0xc5b3, 0x91c2, /*0xe0-0xe7*/ + 0x91c3, 0x91c4, 0x91c5, 0x91c6, 0x91c7, 0x91c8, 0x91c9, 0x91ca, /*0xe8-0xef*/ + 0x91cb, 0x91cc, 0x91cd, 0x91ce, 0x91cf, 0xe3c2, 0x91d0, 0x91d1, /*0xf0-0xf7*/ + 0x91d2, 0x91d3, 0x91d4, 0x91d5, 0x91d6, 0x91d7, 0x91d8, 0xdcb2, /*0xf8-0xff*/ + /* 0x6200 */ + 0x91d9, 0x91da, 0x91db, 0x91dc, 0x91dd, 0x91de, 0xedb0, 0x91df, /*0x00-0x07*/ + 0xb8ea, 0x91e0, 0xceec, 0xeaa7, 0xd0e7, 0xcaf9, 0xc8d6, 0xcfb7, /*0x08-0x0f*/ + 0xb3c9, 0xced2, 0xbde4, 0x91e1, 0x91e2, 0xe3de, 0xbbf2, 0xeaa8, /*0x10-0x17*/ + 0xd5bd, 0x91e3, 0xc6dd, 0xeaa9, 0x91e4, 0x91e5, 0x91e6, 0xeaaa, /*0x18-0x1f*/ + 0x91e7, 0xeaac, 0xeaab, 0x91e8, 0xeaae, 0xeaad, 0x91e9, 0x91ea, /*0x20-0x27*/ + 0x91eb, 0x91ec, 0xbdd8, 0x91ed, 0xeaaf, 0x91ee, 0xc2be, 0x91ef, /*0x28-0x2f*/ + 0x91f0, 0x91f1, 0x91f2, 0xb4c1, 0xb4f7, 0x91f3, 0x91f4, 0xbba7, /*0x30-0x37*/ + 0x91f5, 0x91f6, 0x91f7, 0x91f8, 0x91f9, 0xece6, 0xece5, 0xb7bf, /*0x38-0x3f*/ + 0xcbf9, 0xb1e2, 0x91fa, 0xece7, 0x91fb, 0x91fc, 0x91fd, 0xc9c8, /*0x40-0x47*/ + 0xece8, 0xece9, 0x91fe, 0xcad6, 0xded0, 0xb2c5, 0xd4fa, 0x9240, /*0x48-0x4f*/ + 0x9241, 0xc6cb, 0xb0c7, 0xb4f2, 0xc8d3, 0x9242, 0x9243, 0x9244, /*0x50-0x57*/ + 0xcdd0, 0x9245, 0x9246, 0xbfb8, 0x9247, 0x9248, 0x9249, 0x924a, /*0x58-0x5f*/ + 0x924b, 0x924c, 0x924d, 0xbfdb, 0x924e, 0x924f, 0xc7a4, 0xd6b4, /*0x60-0x67*/ + 0x9250, 0xc0a9, 0xded1, 0xc9a8, 0xd1ef, 0xc5a4, 0xb0e7, 0xb3b6, /*0x68-0x6f*/ + 0xc8c5, 0x9251, 0x9252, 0xb0e2, 0x9253, 0x9254, 0xb7f6, 0x9255, /*0x70-0x77*/ + 0x9256, 0xc5fa, 0x9257, 0x9258, 0xb6f3, 0x9259, 0xd5d2, 0xb3d0, /*0x78-0x7f*/ + 0xbcbc, 0x925a, 0x925b, 0x925c, 0xb3ad, 0x925d, 0x925e, 0x925f, /*0x80-0x87*/ + 0x9260, 0xbef1, 0xb0d1, 0x9261, 0x9262, 0x9263, 0x9264, 0x9265, /*0x88-0x8f*/ + 0x9266, 0xd2d6, 0xcae3, 0xd7a5, 0x9267, 0xcdb6, 0xb6b6, 0xbfb9, /*0x90-0x97*/ + 0xd5db, 0x9268, 0xb8a7, 0xc5d7, 0x9269, 0x926a, 0x926b, 0xded2, /*0x98-0x9f*/ + 0xbfd9, 0xc2d5, 0xc7c0, 0x926c, 0xbba4, 0xb1a8, 0x926d, 0x926e, /*0xa0-0xa7*/ + 0xc5ea, 0x926f, 0x9270, 0xc5fb, 0xcca7, 0x9271, 0x9272, 0x9273, /*0xa8-0xaf*/ + 0x9274, 0xb1a7, 0x9275, 0x9276, 0x9277, 0xb5d6, 0x9278, 0x9279, /*0xb0-0xb7*/ + 0x927a, 0xc4a8, 0x927b, 0xded3, 0xd1ba, 0xb3e9, 0x927c, 0xc3f2, /*0xb8-0xbf*/ + 0x927d, 0x927e, 0xb7f7, 0x9280, 0xd6f4, 0xb5a3, 0xb2f0, 0xc4b4, /*0xc0-0xc7*/ + 0xc4e9, 0xc0ad, 0xded4, 0x9281, 0xb0e8, 0xc5c4, 0xc1e0, 0x9282, /*0xc8-0xcf*/ + 0xb9d5, 0x9283, 0xbedc, 0xcdd8, 0xb0ce, 0x9284, 0xcdcf, 0xded6, /*0xd0-0xd7*/ + 0xbed0, 0xd7be, 0xded5, 0xd5d0, 0xb0dd, 0x9285, 0x9286, 0xc4e2, /*0xd8-0xdf*/ + 0x9287, 0x9288, 0xc2a3, 0xbcf0, 0x9289, 0xd3b5, 0xc0b9, 0xc5a1, /*0xe0-0xe7*/ + 0xb2a6, 0xd4f1, 0x928a, 0x928b, 0xc0a8, 0xcac3, 0xded7, 0xd5fc, /*0xe8-0xef*/ + 0x928c, 0xb9b0, 0x928d, 0xc8ad, 0xcba9, 0x928e, 0xded9, 0xbfbd, /*0xf0-0xf7*/ + 0x928f, 0x9290, 0x9291, 0x9292, 0xc6b4, 0xd7a7, 0xcab0, 0xc4c3, /*0xf8-0xff*/ + /* 0x6300 */ + 0x9293, 0xb3d6, 0xb9d2, 0x9294, 0x9295, 0x9296, 0x9297, 0xd6b8, /*0x00-0x07*/ + 0xeafc, 0xb0b4, 0x9298, 0x9299, 0x929a, 0x929b, 0xbfe6, 0x929c, /*0x08-0x0f*/ + 0x929d, 0xccf4, 0x929e, 0x929f, 0x92a0, 0x92a1, 0xcdda, 0x92a2, /*0x10-0x17*/ + 0x92a3, 0x92a4, 0xd6bf, 0xc2ce, 0x92a5, 0xcece, 0xcca2, 0xd0ae, /*0x18-0x1f*/ + 0xc4d3, 0xb5b2, 0xded8, 0xd5f5, 0xbcb7, 0xbbd3, 0x92a6, 0x92a7, /*0x20-0x27*/ + 0xb0a4, 0x92a8, 0xc5b2, 0xb4ec, 0x92a9, 0x92aa, 0x92ab, 0xd5f1, /*0x28-0x2f*/ + 0x92ac, 0x92ad, 0xeafd, 0x92ae, 0x92af, 0x92b0, 0x92b1, 0x92b2, /*0x30-0x37*/ + 0x92b3, 0xdeda, 0xcda6, 0x92b4, 0x92b5, 0xcdec, 0x92b6, 0x92b7, /*0x38-0x3f*/ + 0x92b8, 0x92b9, 0xcee6, 0xdedc, 0x92ba, 0xcdb1, 0xc0a6, 0x92bb, /*0x40-0x47*/ + 0x92bc, 0xd7bd, 0x92bd, 0xdedb, 0xb0c6, 0xbab4, 0xc9d3, 0xc4f3, /*0x48-0x4f*/ + 0xbee8, 0x92be, 0x92bf, 0x92c0, 0x92c1, 0xb2b6, 0x92c2, 0x92c3, /*0x50-0x57*/ + 0x92c4, 0x92c5, 0x92c6, 0x92c7, 0x92c8, 0x92c9, 0xc0cc, 0xcbf0, /*0x58-0x5f*/ + 0x92ca, 0xbcf1, 0xbbbb, 0xb5b7, 0x92cb, 0x92cc, 0x92cd, 0xc5f5, /*0x60-0x67*/ + 0x92ce, 0xdee6, 0x92cf, 0x92d0, 0x92d1, 0xdee3, 0xbedd, 0x92d2, /*0x68-0x6f*/ + 0x92d3, 0xdedf, 0x92d4, 0x92d5, 0x92d6, 0x92d7, 0xb4b7, 0xbddd, /*0x70-0x77*/ + 0x92d8, 0x92d9, 0xdee0, 0xc4ed, 0x92da, 0x92db, 0x92dc, 0x92dd, /*0x78-0x7f*/ + 0xcfc6, 0x92de, 0xb5e0, 0x92df, 0x92e0, 0x92e1, 0x92e2, 0xb6de, /*0x80-0x87*/ + 0xcada, 0xb5f4, 0xdee5, 0x92e3, 0xd5c6, 0x92e4, 0xdee1, 0xcccd, /*0x88-0x8f*/ + 0xc6fe, 0x92e5, 0xc5c5, 0x92e6, 0x92e7, 0x92e8, 0xd2b4, 0x92e9, /*0x90-0x97*/ + 0xbef2, 0x92ea, 0x92eb, 0x92ec, 0x92ed, 0x92ee, 0x92ef, 0x92f0, /*0x98-0x9f*/ + 0xc2d3, 0x92f1, 0xccbd, 0xb3b8, 0x92f2, 0xbdd3, 0x92f3, 0xbfd8, /*0xa0-0xa7*/ + 0xcdc6, 0xd1da, 0xb4eb, 0x92f4, 0xdee4, 0xdedd, 0xdee7, 0x92f5, /*0xa8-0xaf*/ + 0xeafe, 0x92f6, 0x92f7, 0xc2b0, 0xdee2, 0x92f8, 0x92f9, 0xd6c0, /*0xb0-0xb7*/ + 0xb5a7, 0x92fa, 0xb2f4, 0x92fb, 0xdee8, 0x92fc, 0xdef2, 0x92fd, /*0xb8-0xbf*/ + 0x92fe, 0x9340, 0x9341, 0x9342, 0xdeed, 0x9343, 0xdef1, 0x9344, /*0xc0-0xc7*/ + 0x9345, 0xc8e0, 0x9346, 0x9347, 0x9348, 0xd7e1, 0xdeef, 0xc3e8, /*0xc8-0xcf*/ + 0xcce1, 0x9349, 0xb2e5, 0x934a, 0x934b, 0x934c, 0xd2be, 0x934d, /*0xd0-0xd7*/ + 0x934e, 0x934f, 0x9350, 0x9351, 0x9352, 0x9353, 0xdeee, 0x9354, /*0xd8-0xdf*/ + 0xdeeb, 0xced5, 0x9355, 0xb4a7, 0x9356, 0x9357, 0x9358, 0x9359, /*0xe0-0xe7*/ + 0x935a, 0xbfab, 0xbebe, 0x935b, 0x935c, 0xbdd2, 0x935d, 0x935e, /*0xe8-0xef*/ + 0x935f, 0x9360, 0xdee9, 0x9361, 0xd4ae, 0x9362, 0xdede, 0x9363, /*0xf0-0xf7*/ + 0xdeea, 0x9364, 0x9365, 0x9366, 0x9367, 0xc0bf, 0x9368, 0xdeec, /*0xf8-0xff*/ + /* 0x6400 */ + 0xb2f3, 0xb8e9, 0xc2a7, 0x9369, 0x936a, 0xbdc1, 0x936b, 0x936c, /*0x00-0x07*/ + 0x936d, 0x936e, 0x936f, 0xdef5, 0xdef8, 0x9370, 0x9371, 0xb2ab, /*0x08-0x0f*/ + 0xb4a4, 0x9372, 0x9373, 0xb4ea, 0xc9a6, 0x9374, 0x9375, 0x9376, /*0x10-0x17*/ + 0x9377, 0x9378, 0x9379, 0xdef6, 0xcbd1, 0x937a, 0xb8e3, 0x937b, /*0x18-0x1f*/ + 0xdef7, 0xdefa, 0x937c, 0x937d, 0x937e, 0x9380, 0xdef9, 0x9381, /*0x20-0x27*/ + 0x9382, 0x9383, 0xccc2, 0x9384, 0xb0e1, 0xb4ee, 0x9385, 0x9386, /*0x28-0x2f*/ + 0x9387, 0x9388, 0x9389, 0x938a, 0xe5ba, 0x938b, 0x938c, 0x938d, /*0x30-0x37*/ + 0x938e, 0x938f, 0xd0af, 0x9390, 0x9391, 0xb2eb, 0x9392, 0xeba1, /*0x38-0x3f*/ + 0x9393, 0xdef4, 0x9394, 0x9395, 0xc9e3, 0xdef3, 0xb0da, 0xd2a1, /*0x40-0x47*/ + 0xb1f7, 0x9396, 0xccaf, 0x9397, 0x9398, 0x9399, 0x939a, 0x939b, /*0x48-0x4f*/ + 0x939c, 0x939d, 0xdef0, 0x939e, 0xcba4, 0x939f, 0x93a0, 0x93a1, /*0x50-0x57*/ + 0xd5aa, 0x93a2, 0x93a3, 0x93a4, 0x93a5, 0x93a6, 0xdefb, 0x93a7, /*0x58-0x5f*/ + 0x93a8, 0x93a9, 0x93aa, 0x93ab, 0x93ac, 0x93ad, 0x93ae, 0xb4dd, /*0x60-0x67*/ + 0x93af, 0xc4a6, 0x93b0, 0x93b1, 0x93b2, 0xdefd, 0x93b3, 0x93b4, /*0x68-0x6f*/ + 0x93b5, 0x93b6, 0x93b7, 0x93b8, 0x93b9, 0x93ba, 0x93bb, 0x93bc, /*0x70-0x77*/ + 0xc3fe, 0xc4a1, 0xdfa1, 0x93bd, 0x93be, 0x93bf, 0x93c0, 0x93c1, /*0x78-0x7f*/ + 0x93c2, 0x93c3, 0xc1cc, 0x93c4, 0xdefc, 0xbeef, 0x93c5, 0xc6b2, /*0x80-0x87*/ + 0x93c6, 0x93c7, 0x93c8, 0x93c9, 0x93ca, 0x93cb, 0x93cc, 0x93cd, /*0x88-0x8f*/ + 0x93ce, 0xb3c5, 0xc8f6, 0x93cf, 0x93d0, 0xcbba, 0xdefe, 0x93d1, /*0x90-0x97*/ + 0x93d2, 0xdfa4, 0x93d3, 0x93d4, 0x93d5, 0x93d6, 0xd7b2, 0x93d7, /*0x98-0x9f*/ + 0x93d8, 0x93d9, 0x93da, 0x93db, 0xb3b7, 0x93dc, 0x93dd, 0x93de, /*0xa0-0xa7*/ + 0x93df, 0xc1c3, 0x93e0, 0x93e1, 0xc7cb, 0xb2a5, 0xb4e9, 0x93e2, /*0xa8-0xaf*/ + 0xd7ab, 0x93e3, 0x93e4, 0x93e5, 0x93e6, 0xc4ec, 0x93e7, 0xdfa2, /*0xb0-0xb7*/ + 0xdfa3, 0x93e8, 0xdfa5, 0x93e9, 0xbab3, 0x93ea, 0x93eb, 0x93ec, /*0xb8-0xbf*/ + 0xdfa6, 0x93ed, 0xc0de, 0x93ee, 0x93ef, 0xc9c3, 0x93f0, 0x93f1, /*0xc0-0xc7*/ + 0x93f2, 0x93f3, 0x93f4, 0x93f5, 0x93f6, 0xb2d9, 0xc7e6, 0x93f7, /*0xc8-0xcf*/ + 0xdfa7, 0x93f8, 0xc7dc, 0x93f9, 0x93fa, 0x93fb, 0x93fc, 0xdfa8, /*0xd0-0xd7*/ + 0xeba2, 0x93fd, 0x93fe, 0x9440, 0x9441, 0x9442, 0xcbd3, 0x9443, /*0xd8-0xdf*/ + 0x9444, 0x9445, 0xdfaa, 0x9446, 0xdfa9, 0x9447, 0xb2c1, 0x9448, /*0xe0-0xe7*/ + 0x9449, 0x944a, 0x944b, 0x944c, 0x944d, 0x944e, 0x944f, 0x9450, /*0xe8-0xef*/ + 0x9451, 0x9452, 0x9453, 0x9454, 0x9455, 0x9456, 0x9457, 0x9458, /*0xf0-0xf7*/ + 0x9459, 0x945a, 0x945b, 0x945c, 0x945d, 0x945e, 0x945f, 0x9460, /*0xf8-0xff*/ + /* 0x6500 */ + 0xc5ca, 0x9461, 0x9462, 0x9463, 0x9464, 0x9465, 0x9466, 0x9467, /*0x00-0x07*/ + 0x9468, 0xdfab, 0x9469, 0x946a, 0x946b, 0x946c, 0x946d, 0x946e, /*0x08-0x0f*/ + 0x946f, 0x9470, 0xd4dc, 0x9471, 0x9472, 0x9473, 0x9474, 0x9475, /*0x10-0x17*/ + 0xc8c1, 0x9476, 0x9477, 0x9478, 0x9479, 0x947a, 0x947b, 0x947c, /*0x18-0x1f*/ + 0x947d, 0x947e, 0x9480, 0x9481, 0x9482, 0xdfac, 0x9483, 0x9484, /*0x20-0x27*/ + 0x9485, 0x9486, 0x9487, 0xbef0, 0x9488, 0x9489, 0xdfad, 0xd6a7, /*0x28-0x2f*/ + 0x948a, 0x948b, 0x948c, 0x948d, 0xeab7, 0xebb6, 0xcad5, 0x948e, /*0x30-0x37*/ + 0xd8fc, 0xb8c4, 0x948f, 0xb9a5, 0x9490, 0x9491, 0xb7c5, 0xd5fe, /*0x38-0x3f*/ + 0x9492, 0x9493, 0x9494, 0x9495, 0x9496, 0xb9ca, 0x9497, 0x9498, /*0x40-0x47*/ + 0xd0a7, 0xf4cd, 0x9499, 0x949a, 0xb5d0, 0x949b, 0x949c, 0xc3f4, /*0x48-0x4f*/ + 0x949d, 0xbec8, 0x949e, 0x949f, 0x94a0, 0xebb7, 0xb0bd, 0x94a1, /*0x50-0x57*/ + 0x94a2, 0xbdcc, 0x94a3, 0xc1b2, 0x94a4, 0xb1d6, 0xb3a8, 0x94a5, /*0x58-0x5f*/ + 0x94a6, 0x94a7, 0xb8d2, 0xc9a2, 0x94a8, 0x94a9, 0xb6d8, 0x94aa, /*0x60-0x67*/ + 0x94ab, 0x94ac, 0x94ad, 0xebb8, 0xbeb4, 0x94ae, 0x94af, 0x94b0, /*0x68-0x6f*/ + 0xcafd, 0x94b1, 0xc7c3, 0x94b2, 0xd5fb, 0x94b3, 0x94b4, 0xb7f3, /*0x70-0x77*/ + 0x94b5, 0x94b6, 0x94b7, 0x94b8, 0x94b9, 0x94ba, 0x94bb, 0x94bc, /*0x78-0x7f*/ + 0x94bd, 0x94be, 0x94bf, 0x94c0, 0x94c1, 0x94c2, 0x94c3, 0xcec4, /*0x80-0x87*/ + 0x94c4, 0x94c5, 0x94c6, 0xd5ab, 0xb1f3, 0x94c7, 0x94c8, 0x94c9, /*0x88-0x8f*/ + 0xecb3, 0xb0df, 0x94ca, 0xecb5, 0x94cb, 0x94cc, 0x94cd, 0xb6b7, /*0x90-0x97*/ + 0x94ce, 0xc1cf, 0x94cf, 0xf5fa, 0xd0b1, 0x94d0, 0x94d1, 0xd5e5, /*0x98-0x9f*/ + 0x94d2, 0xced3, 0x94d3, 0x94d4, 0xbdef, 0xb3e2, 0x94d5, 0xb8ab, /*0xa0-0xa7*/ + 0x94d6, 0xd5b6, 0x94d7, 0xedbd, 0x94d8, 0xb6cf, 0x94d9, 0xcbb9, /*0xa8-0xaf*/ + 0xd0c2, 0x94da, 0x94db, 0x94dc, 0x94dd, 0x94de, 0x94df, 0x94e0, /*0xb0-0xb7*/ + 0x94e1, 0xb7bd, 0x94e2, 0x94e3, 0xecb6, 0xcaa9, 0x94e4, 0x94e5, /*0xb8-0xbf*/ + 0x94e6, 0xc5d4, 0x94e7, 0xecb9, 0xecb8, 0xc2c3, 0xecb7, 0x94e8, /*0xc0-0xc7*/ + 0x94e9, 0x94ea, 0x94eb, 0xd0fd, 0xecba, 0x94ec, 0xecbb, 0xd7e5, /*0xc8-0xcf*/ + 0x94ed, 0x94ee, 0xecbc, 0x94ef, 0x94f0, 0x94f1, 0xecbd, 0xc6ec, /*0xd0-0xd7*/ + 0x94f2, 0x94f3, 0x94f4, 0x94f5, 0x94f6, 0x94f7, 0x94f8, 0x94f9, /*0xd8-0xdf*/ + 0xcede, 0x94fa, 0xbcc8, 0x94fb, 0x94fc, 0xc8d5, 0xb5a9, 0xbec9, /*0xe0-0xe7*/ + 0xd6bc, 0xd4e7, 0x94fd, 0x94fe, 0xd1ae, 0xd0f1, 0xeab8, 0xeab9, /*0xe8-0xef*/ + 0xeaba, 0xbab5, 0x9540, 0x9541, 0x9542, 0x9543, 0xcab1, 0xbff5, /*0xf0-0xf7*/ + 0x9544, 0x9545, 0xcdfa, 0x9546, 0x9547, 0x9548, 0x9549, 0x954a, /*0xf8-0xff*/ + /* 0x6600 */ + 0xeac0, 0x954b, 0xb0ba, 0xeabe, 0x954c, 0x954d, 0xc0a5, 0x954e, /*0x00-0x07*/ + 0x954f, 0x9550, 0xeabb, 0x9551, 0xb2fd, 0x9552, 0xc3f7, 0xbbe8, /*0x08-0x0f*/ + 0x9553, 0x9554, 0x9555, 0xd2d7, 0xcef4, 0xeabf, 0x9556, 0x9557, /*0x10-0x17*/ + 0x9558, 0xeabc, 0x9559, 0x955a, 0x955b, 0xeac3, 0x955c, 0xd0c7, /*0x18-0x1f*/ + 0xd3b3, 0x955d, 0x955e, 0x955f, 0x9560, 0xb4ba, 0x9561, 0xc3c1, /*0x20-0x27*/ + 0xd7f2, 0x9562, 0x9563, 0x9564, 0x9565, 0xd5d1, 0x9566, 0xcac7, /*0x28-0x2f*/ + 0x9567, 0xeac5, 0x9568, 0x9569, 0xeac4, 0xeac7, 0xeac6, 0x956a, /*0x30-0x37*/ + 0x956b, 0x956c, 0x956d, 0x956e, 0xd6e7, 0x956f, 0xcfd4, 0x9570, /*0x38-0x3f*/ + 0x9571, 0xeacb, 0x9572, 0xbbce, 0x9573, 0x9574, 0x9575, 0x9576, /*0x40-0x47*/ + 0x9577, 0x9578, 0x9579, 0xbdfa, 0xc9ce, 0x957a, 0x957b, 0xeacc, /*0x48-0x4f*/ + 0x957c, 0x957d, 0xc9b9, 0xcffe, 0xeaca, 0xd4ce, 0xeacd, 0xeacf, /*0x50-0x57*/ + 0x957e, 0x9580, 0xcded, 0x9581, 0x9582, 0x9583, 0x9584, 0xeac9, /*0x58-0x5f*/ + 0x9585, 0xeace, 0x9586, 0x9587, 0xceee, 0x9588, 0xbbde, 0x9589, /*0x60-0x67*/ + 0xb3bf, 0x958a, 0x958b, 0x958c, 0x958d, 0x958e, 0xc6d5, 0xbeb0, /*0x68-0x6f*/ + 0xcefa, 0x958f, 0x9590, 0x9591, 0xc7e7, 0x9592, 0xbea7, 0xead0, /*0x70-0x77*/ + 0x9593, 0x9594, 0xd6c7, 0x9595, 0x9596, 0x9597, 0xc1c0, 0x9598, /*0x78-0x7f*/ + 0x9599, 0x959a, 0xd4dd, 0x959b, 0xead1, 0x959c, 0x959d, 0xcfbe, /*0x80-0x87*/ + 0x959e, 0x959f, 0x95a0, 0x95a1, 0xead2, 0x95a2, 0x95a3, 0x95a4, /*0x88-0x8f*/ + 0x95a5, 0xcaee, 0x95a6, 0x95a7, 0x95a8, 0x95a9, 0xc5af, 0xb0b5, /*0x90-0x97*/ + 0x95aa, 0x95ab, 0x95ac, 0x95ad, 0x95ae, 0xead4, 0x95af, 0x95b0, /*0x98-0x9f*/ + 0x95b1, 0x95b2, 0x95b3, 0x95b4, 0x95b5, 0x95b6, 0x95b7, 0xead3, /*0xa0-0xa7*/ + 0xf4df, 0x95b8, 0x95b9, 0x95ba, 0x95bb, 0x95bc, 0xc4ba, 0x95bd, /*0xa8-0xaf*/ + 0x95be, 0x95bf, 0x95c0, 0x95c1, 0xb1a9, 0x95c2, 0x95c3, 0x95c4, /*0xb0-0xb7*/ + 0x95c5, 0xe5df, 0x95c6, 0x95c7, 0x95c8, 0x95c9, 0xead5, 0x95ca, /*0xb8-0xbf*/ + 0x95cb, 0x95cc, 0x95cd, 0x95ce, 0x95cf, 0x95d0, 0x95d1, 0x95d2, /*0xc0-0xc7*/ + 0x95d3, 0x95d4, 0x95d5, 0x95d6, 0x95d7, 0x95d8, 0x95d9, 0x95da, /*0xc8-0xcf*/ + 0x95db, 0x95dc, 0x95dd, 0x95de, 0x95df, 0x95e0, 0x95e1, 0x95e2, /*0xd0-0xd7*/ + 0x95e3, 0xcaef, 0x95e4, 0xead6, 0xead7, 0xc6d8, 0x95e5, 0x95e6, /*0xd8-0xdf*/ + 0x95e7, 0x95e8, 0x95e9, 0x95ea, 0x95eb, 0x95ec, 0xead8, 0x95ed, /*0xe0-0xe7*/ + 0x95ee, 0xead9, 0x95ef, 0x95f0, 0x95f1, 0x95f2, 0x95f3, 0x95f4, /*0xe8-0xef*/ + 0xd4bb, 0x95f5, 0xc7fa, 0xd2b7, 0xb8fc, 0x95f6, 0x95f7, 0xeac2, /*0xf0-0xf7*/ + 0x95f8, 0xb2dc, 0x95f9, 0x95fa, 0xc2fc, 0x95fb, 0xd4f8, 0xcce6, /*0xf8-0xff*/ + /* 0x6700 */ + 0xd7ee, 0x95fc, 0x95fd, 0x95fe, 0x9640, 0x9641, 0x9642, 0x9643, /*0x00-0x07*/ + 0xd4c2, 0xd3d0, 0xebc3, 0xc5f3, 0x9644, 0xb7fe, 0x9645, 0x9646, /*0x08-0x0f*/ + 0xebd4, 0x9647, 0x9648, 0x9649, 0xcbb7, 0xebde, 0x964a, 0xc0ca, /*0x10-0x17*/ + 0x964b, 0x964c, 0x964d, 0xcdfb, 0x964e, 0xb3af, 0x964f, 0xc6da, /*0x18-0x1f*/ + 0x9650, 0x9651, 0x9652, 0x9653, 0x9654, 0x9655, 0xebfc, 0x9656, /*0x20-0x27*/ + 0xc4be, 0x9657, 0xceb4, 0xc4a9, 0xb1be, 0xd4fd, 0x9658, 0xcaf5, /*0x28-0x2f*/ + 0x9659, 0xd6ec, 0x965a, 0x965b, 0xc6d3, 0xb6e4, 0x965c, 0x965d, /*0x30-0x37*/ + 0x965e, 0x965f, 0xbbfa, 0x9660, 0x9661, 0xd0e0, 0x9662, 0x9663, /*0x38-0x3f*/ + 0xc9b1, 0x9664, 0xd4d3, 0xc8a8, 0x9665, 0x9666, 0xb8cb, 0x9667, /*0x40-0x47*/ + 0xe8be, 0xc9bc, 0x9668, 0x9669, 0xe8bb, 0x966a, 0xc0ee, 0xd0d3, /*0x48-0x4f*/ + 0xb2c4, 0xb4e5, 0x966b, 0xe8bc, 0x966c, 0x966d, 0xd5c8, 0x966e, /*0x50-0x57*/ + 0x966f, 0x9670, 0x9671, 0x9672, 0xb6c5, 0x9673, 0xe8bd, 0xcaf8, /*0x58-0x5f*/ + 0xb8dc, 0xccf5, 0x9674, 0x9675, 0x9676, 0xc0b4, 0x9677, 0x9678, /*0x60-0x67*/ + 0xd1ee, 0xe8bf, 0xe8c2, 0x9679, 0x967a, 0xbabc, 0x967b, 0xb1ad, /*0x68-0x6f*/ + 0xbddc, 0x967c, 0xeabd, 0xe8c3, 0x967d, 0xe8c6, 0x967e, 0xe8cb, /*0x70-0x77*/ + 0x9680, 0x9681, 0x9682, 0x9683, 0xe8cc, 0x9684, 0xcbc9, 0xb0e5, /*0x78-0x7f*/ + 0x9685, 0xbcab, 0x9686, 0x9687, 0xb9b9, 0x9688, 0x9689, 0xe8c1, /*0x80-0x87*/ + 0x968a, 0xcdf7, 0x968b, 0xe8ca, 0x968c, 0x968d, 0x968e, 0x968f, /*0x88-0x8f*/ + 0xcef6, 0x9690, 0x9691, 0x9692, 0x9693, 0xd5ed, 0x9694, 0xc1d6, /*0x90-0x97*/ + 0xe8c4, 0x9695, 0xc3b6, 0x9696, 0xb9fb, 0xd6a6, 0xe8c8, 0x9697, /*0x98-0x9f*/ + 0x9698, 0x9699, 0xcae0, 0xd4e6, 0x969a, 0xe8c0, 0x969b, 0xe8c5, /*0xa0-0xa7*/ + 0xe8c7, 0x969c, 0xc7b9, 0xb7e3, 0x969d, 0xe8c9, 0x969e, 0xbfdd, /*0xa8-0xaf*/ + 0xe8d2, 0x969f, 0x96a0, 0xe8d7, 0x96a1, 0xe8d5, 0xbcdc, 0xbccf, /*0xb0-0xb7*/ + 0xe8db, 0x96a2, 0x96a3, 0x96a4, 0x96a5, 0x96a6, 0x96a7, 0x96a8, /*0xb8-0xbf*/ + 0x96a9, 0xe8de, 0x96aa, 0xe8da, 0xb1fa, 0x96ab, 0x96ac, 0x96ad, /*0xc0-0xc7*/ + 0x96ae, 0x96af, 0x96b0, 0x96b1, 0x96b2, 0x96b3, 0x96b4, 0xb0d8, /*0xc8-0xcf*/ + 0xc4b3, 0xb8cc, 0xc6e2, 0xc8be, 0xc8e1, 0x96b5, 0x96b6, 0x96b7, /*0xd0-0xd7*/ + 0xe8cf, 0xe8d4, 0xe8d6, 0x96b8, 0xb9f1, 0xe8d8, 0xd7f5, 0x96b9, /*0xd8-0xdf*/ + 0xc4fb, 0x96ba, 0xe8dc, 0x96bb, 0x96bc, 0xb2e9, 0x96bd, 0x96be, /*0xe0-0xe7*/ + 0x96bf, 0xe8d1, 0x96c0, 0x96c1, 0xbced, 0x96c2, 0x96c3, 0xbfc2, /*0xe8-0xef*/ + 0xe8cd, 0xd6f9, 0x96c4, 0xc1f8, 0xb2f1, 0x96c5, 0x96c6, 0x96c7, /*0xf0-0xf7*/ + 0x96c8, 0x96c9, 0x96ca, 0x96cb, 0x96cc, 0xe8df, 0x96cd, 0xcac1, /*0xf8-0xff*/ + /* 0x6800 */ + 0xe8d9, 0x96ce, 0x96cf, 0x96d0, 0x96d1, 0xd5a4, 0x96d2, 0xb1ea, /*0x00-0x07*/ + 0xd5bb, 0xe8ce, 0xe8d0, 0xb6b0, 0xe8d3, 0x96d3, 0xe8dd, 0xc0b8, /*0x08-0x0f*/ + 0x96d4, 0xcaf7, 0x96d5, 0xcba8, 0x96d6, 0x96d7, 0xc6dc, 0xc0f5, /*0x10-0x17*/ + 0x96d8, 0x96d9, 0x96da, 0x96db, 0x96dc, 0xe8e9, 0x96dd, 0x96de, /*0x18-0x1f*/ + 0x96df, 0xd0a3, 0x96e0, 0x96e1, 0x96e2, 0x96e3, 0x96e4, 0x96e5, /*0x20-0x27*/ + 0x96e6, 0xe8f2, 0xd6ea, 0x96e7, 0x96e8, 0x96e9, 0x96ea, 0x96eb, /*0x28-0x2f*/ + 0x96ec, 0x96ed, 0xe8e0, 0xe8e1, 0x96ee, 0x96ef, 0x96f0, 0xd1f9, /*0x30-0x37*/ + 0xbacb, 0xb8f9, 0x96f1, 0x96f2, 0xb8f1, 0xd4d4, 0xe8ef, 0x96f3, /*0x38-0x3f*/ + 0xe8ee, 0xe8ec, 0xb9f0, 0xccd2, 0xe8e6, 0xcea6, 0xbff2, 0x96f4, /*0x40-0x47*/ + 0xb0b8, 0xe8f1, 0xe8f0, 0x96f5, 0xd7c0, 0x96f6, 0xe8e4, 0x96f7, /*0x48-0x4f*/ + 0xcda9, 0xc9a3, 0x96f8, 0xbbb8, 0xbddb, 0xe8ea, 0x96f9, 0x96fa, /*0x50-0x57*/ + 0x96fb, 0x96fc, 0x96fd, 0x96fe, 0x9740, 0x9741, 0x9742, 0x9743, /*0x58-0x5f*/ + 0xe8e2, 0xe8e3, 0xe8e5, 0xb5b5, 0xe8e7, 0xc7c5, 0xe8eb, 0xe8ed, /*0x60-0x67*/ + 0xbdb0, 0xd7ae, 0x9744, 0xe8f8, 0x9745, 0x9746, 0x9747, 0x9748, /*0x68-0x6f*/ + 0x9749, 0x974a, 0x974b, 0x974c, 0xe8f5, 0x974d, 0xcdb0, 0xe8f6, /*0x70-0x77*/ + 0x974e, 0x974f, 0x9750, 0x9751, 0x9752, 0x9753, 0x9754, 0x9755, /*0x78-0x7f*/ + 0x9756, 0xc1ba, 0x9757, 0xe8e8, 0x9758, 0xc3b7, 0xb0f0, 0x9759, /*0x80-0x87*/ + 0x975a, 0x975b, 0x975c, 0x975d, 0x975e, 0x975f, 0x9760, 0xe8f4, /*0x88-0x8f*/ + 0x9761, 0x9762, 0x9763, 0xe8f7, 0x9764, 0x9765, 0x9766, 0xb9a3, /*0x90-0x97*/ + 0x9767, 0x9768, 0x9769, 0x976a, 0x976b, 0x976c, 0x976d, 0x976e, /*0x98-0x9f*/ + 0x976f, 0x9770, 0xc9d2, 0x9771, 0x9772, 0x9773, 0xc3ce, 0xcee0, /*0xa0-0xa7*/ + 0xc0e6, 0x9774, 0x9775, 0x9776, 0x9777, 0xcbf3, 0x9778, 0xccdd, /*0xa8-0xaf*/ + 0xd0b5, 0x9779, 0x977a, 0xcae1, 0x977b, 0xe8f3, 0x977c, 0x977d, /*0xb0-0xb7*/ + 0x977e, 0x9780, 0x9781, 0x9782, 0x9783, 0x9784, 0x9785, 0x9786, /*0xb8-0xbf*/ + 0xbcec, 0x9787, 0xe8f9, 0x9788, 0x9789, 0x978a, 0x978b, 0x978c, /*0xc0-0xc7*/ + 0x978d, 0xc3de, 0x978e, 0xc6e5, 0x978f, 0xb9f7, 0x9790, 0x9791, /*0xc8-0xcf*/ + 0x9792, 0x9793, 0xb0f4, 0x9794, 0x9795, 0xd7d8, 0x9796, 0x9797, /*0xd0-0xd7*/ + 0xbcac, 0x9798, 0xc5ef, 0x9799, 0x979a, 0x979b, 0x979c, 0x979d, /*0xd8-0xdf*/ + 0xccc4, 0x979e, 0x979f, 0xe9a6, 0x97a0, 0x97a1, 0x97a2, 0x97a3, /*0xe0-0xe7*/ + 0x97a4, 0x97a5, 0x97a6, 0x97a7, 0x97a8, 0x97a9, 0xc9ad, 0x97aa, /*0xe8-0xef*/ + 0xe9a2, 0xc0e2, 0x97ab, 0x97ac, 0x97ad, 0xbfc3, 0x97ae, 0x97af, /*0xf0-0xf7*/ + 0x97b0, 0xe8fe, 0xb9d7, 0x97b1, 0xe8fb, 0x97b2, 0x97b3, 0x97b4, /*0xf8-0xff*/ + /* 0x6900 */ + 0x97b5, 0xe9a4, 0x97b6, 0x97b7, 0x97b8, 0xd2ce, 0x97b9, 0x97ba, /*0x00-0x07*/ + 0x97bb, 0x97bc, 0x97bd, 0xe9a3, 0x97be, 0xd6b2, 0xd7b5, 0x97bf, /*0x08-0x0f*/ + 0xe9a7, 0x97c0, 0xbdb7, 0x97c1, 0x97c2, 0x97c3, 0x97c4, 0x97c5, /*0x10-0x17*/ + 0x97c6, 0x97c7, 0x97c8, 0x97c9, 0x97ca, 0x97cb, 0x97cc, 0xe8fc, /*0x18-0x1f*/ + 0xe8fd, 0x97cd, 0x97ce, 0x97cf, 0xe9a1, 0x97d0, 0x97d1, 0x97d2, /*0x20-0x27*/ + 0x97d3, 0x97d4, 0x97d5, 0x97d6, 0x97d7, 0xcdd6, 0x97d8, 0x97d9, /*0x28-0x2f*/ + 0xd2ac, 0x97da, 0x97db, 0x97dc, 0xe9b2, 0x97dd, 0x97de, 0x97df, /*0x30-0x37*/ + 0x97e0, 0xe9a9, 0x97e1, 0x97e2, 0x97e3, 0xb4aa, 0x97e4, 0xb4bb, /*0x38-0x3f*/ + 0x97e5, 0x97e6, 0xe9ab, 0x97e7, 0x97e8, 0x97e9, 0x97ea, 0x97eb, /*0x40-0x47*/ + 0x97ec, 0x97ed, 0x97ee, 0x97ef, 0x97f0, 0x97f1, 0x97f2, 0x97f3, /*0x48-0x4f*/ + 0x97f4, 0x97f5, 0x97f6, 0x97f7, 0xd0a8, 0x97f8, 0x97f9, 0xe9a5, /*0x50-0x57*/ + 0x97fa, 0x97fb, 0xb3fe, 0x97fc, 0x97fd, 0xe9ac, 0xc0e3, 0x97fe, /*0x58-0x5f*/ + 0xe9aa, 0x9840, 0x9841, 0xe9b9, 0x9842, 0x9843, 0xe9b8, 0x9844, /*0x60-0x67*/ + 0x9845, 0x9846, 0x9847, 0xe9ae, 0x9848, 0x9849, 0xe8fa, 0x984a, /*0x68-0x6f*/ + 0x984b, 0xe9a8, 0x984c, 0x984d, 0x984e, 0x984f, 0x9850, 0xbfac, /*0x70-0x77*/ + 0xe9b1, 0xe9ba, 0x9851, 0x9852, 0xc2a5, 0x9853, 0x9854, 0x9855, /*0x78-0x7f*/ + 0xe9af, 0x9856, 0xb8c5, 0x9857, 0xe9ad, 0x9858, 0xd3dc, 0xe9b4, /*0x80-0x87*/ + 0xe9b5, 0xe9b7, 0x9859, 0x985a, 0x985b, 0xe9c7, 0x985c, 0x985d, /*0x88-0x8f*/ + 0x985e, 0x985f, 0x9860, 0x9861, 0xc0c6, 0xe9c5, 0x9862, 0x9863, /*0x90-0x97*/ + 0xe9b0, 0x9864, 0x9865, 0xe9bb, 0xb0f1, 0x9866, 0x9867, 0x9868, /*0x98-0x9f*/ + 0x9869, 0x986a, 0x986b, 0x986c, 0x986d, 0x986e, 0x986f, 0xe9bc, /*0xa0-0xa7*/ + 0xd5a5, 0x9870, 0x9871, 0xe9be, 0x9872, 0xe9bf, 0x9873, 0x9874, /*0xa8-0xaf*/ + 0x9875, 0xe9c1, 0x9876, 0x9877, 0xc1f1, 0x9878, 0x9879, 0xc8b6, /*0xb0-0xb7*/ + 0x987a, 0x987b, 0x987c, 0xe9bd, 0x987d, 0x987e, 0x9880, 0x9881, /*0xb8-0xbf*/ + 0x9882, 0xe9c2, 0x9883, 0x9884, 0x9885, 0x9886, 0x9887, 0x9888, /*0xc0-0xc7*/ + 0x9889, 0x988a, 0xe9c3, 0x988b, 0xe9b3, 0x988c, 0xe9b6, 0x988d, /*0xc8-0xcf*/ + 0xbbb1, 0x988e, 0x988f, 0x9890, 0xe9c0, 0x9891, 0x9892, 0x9893, /*0xd0-0xd7*/ + 0x9894, 0x9895, 0x9896, 0xbcf7, 0x9897, 0x9898, 0x9899, 0xe9c4, /*0xd8-0xdf*/ + 0xe9c6, 0x989a, 0x989b, 0x989c, 0x989d, 0x989e, 0x989f, 0x98a0, /*0xe0-0xe7*/ + 0x98a1, 0x98a2, 0x98a3, 0x98a4, 0x98a5, 0xe9ca, 0x98a6, 0x98a7, /*0xe8-0xef*/ + 0x98a8, 0x98a9, 0xe9ce, 0x98aa, 0x98ab, 0x98ac, 0x98ad, 0x98ae, /*0xf0-0xf7*/ + 0x98af, 0x98b0, 0x98b1, 0x98b2, 0x98b3, 0xb2db, 0x98b4, 0xe9c8, /*0xf8-0xff*/ + /* 0x6a00 */ + 0x98b5, 0x98b6, 0x98b7, 0x98b8, 0x98b9, 0x98ba, 0x98bb, 0x98bc, /*0x00-0x07*/ + 0x98bd, 0x98be, 0xb7ae, 0x98bf, 0x98c0, 0x98c1, 0x98c2, 0x98c3, /*0x08-0x0f*/ + 0x98c4, 0x98c5, 0x98c6, 0x98c7, 0x98c8, 0x98c9, 0x98ca, 0xe9cb, /*0x10-0x17*/ + 0xe9cc, 0x98cb, 0x98cc, 0x98cd, 0x98ce, 0x98cf, 0x98d0, 0xd5c1, /*0x18-0x1f*/ + 0x98d1, 0xc4a3, 0x98d2, 0x98d3, 0x98d4, 0x98d5, 0x98d6, 0x98d7, /*0x20-0x27*/ + 0xe9d8, 0x98d8, 0xbae1, 0x98d9, 0x98da, 0x98db, 0x98dc, 0xe9c9, /*0x28-0x2f*/ + 0x98dd, 0xd3a3, 0x98de, 0x98df, 0x98e0, 0xe9d4, 0x98e1, 0x98e2, /*0x30-0x37*/ + 0x98e3, 0x98e4, 0x98e5, 0x98e6, 0x98e7, 0xe9d7, 0xe9d0, 0x98e8, /*0x38-0x3f*/ + 0x98e9, 0x98ea, 0x98eb, 0x98ec, 0xe9cf, 0x98ed, 0x98ee, 0xc7c1, /*0x40-0x47*/ + 0x98ef, 0x98f0, 0x98f1, 0x98f2, 0x98f3, 0x98f4, 0x98f5, 0x98f6, /*0x48-0x4f*/ + 0xe9d2, 0x98f7, 0x98f8, 0x98f9, 0x98fa, 0x98fb, 0x98fc, 0x98fd, /*0x50-0x57*/ + 0xe9d9, 0xb3c8, 0x98fe, 0xe9d3, 0x9940, 0x9941, 0x9942, 0x9943, /*0x58-0x5f*/ + 0x9944, 0xcff0, 0x9945, 0x9946, 0x9947, 0xe9cd, 0x9948, 0x9949, /*0x60-0x67*/ + 0x994a, 0x994b, 0x994c, 0x994d, 0x994e, 0x994f, 0x9950, 0x9951, /*0x68-0x6f*/ + 0x9952, 0xb3f7, 0x9953, 0x9954, 0x9955, 0x9956, 0x9957, 0x9958, /*0x70-0x77*/ + 0x9959, 0xe9d6, 0x995a, 0x995b, 0xe9da, 0x995c, 0x995d, 0x995e, /*0x78-0x7f*/ + 0xccb4, 0x995f, 0x9960, 0x9961, 0xcfad, 0x9962, 0x9963, 0x9964, /*0x80-0x87*/ + 0x9965, 0x9966, 0x9967, 0x9968, 0x9969, 0x996a, 0xe9d5, 0x996b, /*0x88-0x8f*/ + 0xe9dc, 0xe9db, 0x996c, 0x996d, 0x996e, 0x996f, 0x9970, 0xe9de, /*0x90-0x97*/ + 0x9971, 0x9972, 0x9973, 0x9974, 0x9975, 0x9976, 0x9977, 0x9978, /*0x98-0x9f*/ + 0xe9d1, 0x9979, 0x997a, 0x997b, 0x997c, 0x997d, 0x997e, 0x9980, /*0xa0-0xa7*/ + 0x9981, 0xe9dd, 0x9982, 0xe9df, 0xc3ca, 0x9983, 0x9984, 0x9985, /*0xa8-0xaf*/ + 0x9986, 0x9987, 0x9988, 0x9989, 0x998a, 0x998b, 0x998c, 0x998d, /*0xb0-0xb7*/ + 0x998e, 0x998f, 0x9990, 0x9991, 0x9992, 0x9993, 0x9994, 0x9995, /*0xb8-0xbf*/ + 0x9996, 0x9997, 0x9998, 0x9999, 0x999a, 0x999b, 0x999c, 0x999d, /*0xc0-0xc7*/ + 0x999e, 0x999f, 0x99a0, 0x99a1, 0x99a2, 0x99a3, 0x99a4, 0x99a5, /*0xc8-0xcf*/ + 0x99a6, 0x99a7, 0x99a8, 0x99a9, 0x99aa, 0x99ab, 0x99ac, 0x99ad, /*0xd0-0xd7*/ + 0x99ae, 0x99af, 0x99b0, 0x99b1, 0x99b2, 0x99b3, 0x99b4, 0x99b5, /*0xd8-0xdf*/ + 0x99b6, 0x99b7, 0x99b8, 0x99b9, 0x99ba, 0x99bb, 0x99bc, 0x99bd, /*0xe0-0xe7*/ + 0x99be, 0x99bf, 0x99c0, 0x99c1, 0x99c2, 0x99c3, 0x99c4, 0x99c5, /*0xe8-0xef*/ + 0x99c6, 0x99c7, 0x99c8, 0x99c9, 0x99ca, 0x99cb, 0x99cc, 0x99cd, /*0xf0-0xf7*/ + 0x99ce, 0x99cf, 0x99d0, 0x99d1, 0x99d2, 0x99d3, 0x99d4, 0x99d5, /*0xf8-0xff*/ + /* 0x6b00 */ + 0x99d6, 0x99d7, 0x99d8, 0x99d9, 0x99da, 0x99db, 0x99dc, 0x99dd, /*0x00-0x07*/ + 0x99de, 0x99df, 0x99e0, 0x99e1, 0x99e2, 0x99e3, 0x99e4, 0x99e5, /*0x08-0x0f*/ + 0x99e6, 0x99e7, 0x99e8, 0x99e9, 0x99ea, 0x99eb, 0x99ec, 0x99ed, /*0x10-0x17*/ + 0x99ee, 0x99ef, 0x99f0, 0x99f1, 0x99f2, 0x99f3, 0x99f4, 0x99f5, /*0x18-0x1f*/ + 0xc7b7, 0xb4ce, 0xbbb6, 0xd0c0, 0xeca3, 0x99f6, 0x99f7, 0xc5b7, /*0x20-0x27*/ + 0x99f8, 0x99f9, 0x99fa, 0x99fb, 0x99fc, 0x99fd, 0x99fe, 0x9a40, /*0x28-0x2f*/ + 0x9a41, 0x9a42, 0xd3fb, 0x9a43, 0x9a44, 0x9a45, 0x9a46, 0xeca4, /*0x30-0x37*/ + 0x9a47, 0xeca5, 0xc6db, 0x9a48, 0x9a49, 0x9a4a, 0xbfee, 0x9a4b, /*0x38-0x3f*/ + 0x9a4c, 0x9a4d, 0x9a4e, 0xeca6, 0x9a4f, 0x9a50, 0xeca7, 0xd0aa, /*0x40-0x47*/ + 0x9a51, 0xc7b8, 0x9a52, 0x9a53, 0xb8e8, 0x9a54, 0x9a55, 0x9a56, /*0x48-0x4f*/ + 0x9a57, 0x9a58, 0x9a59, 0x9a5a, 0x9a5b, 0x9a5c, 0x9a5d, 0x9a5e, /*0x50-0x57*/ + 0x9a5f, 0xeca8, 0x9a60, 0x9a61, 0x9a62, 0x9a63, 0x9a64, 0x9a65, /*0x58-0x5f*/ + 0x9a66, 0x9a67, 0xd6b9, 0xd5fd, 0xb4cb, 0xb2bd, 0xcee4, 0xc6e7, /*0x60-0x67*/ + 0x9a68, 0x9a69, 0xcde1, 0x9a6a, 0x9a6b, 0x9a6c, 0x9a6d, 0x9a6e, /*0x68-0x6f*/ + 0x9a6f, 0x9a70, 0x9a71, 0x9a72, 0x9a73, 0x9a74, 0x9a75, 0x9a76, /*0x70-0x77*/ + 0x9a77, 0xb4f5, 0x9a78, 0xcbc0, 0xbcdf, 0x9a79, 0x9a7a, 0x9a7b, /*0x78-0x7f*/ + 0x9a7c, 0xe9e2, 0xe9e3, 0xd1ea, 0xe9e5, 0x9a7d, 0xb4f9, 0xe9e4, /*0x80-0x87*/ + 0x9a7e, 0xd1b3, 0xcae2, 0xb2d0, 0x9a80, 0xe9e8, 0x9a81, 0x9a82, /*0x88-0x8f*/ + 0x9a83, 0x9a84, 0xe9e6, 0xe9e7, 0x9a85, 0x9a86, 0xd6b3, 0x9a87, /*0x90-0x97*/ + 0x9a88, 0x9a89, 0xe9e9, 0xe9ea, 0x9a8a, 0x9a8b, 0x9a8c, 0x9a8d, /*0x98-0x9f*/ + 0x9a8e, 0xe9eb, 0x9a8f, 0x9a90, 0x9a91, 0x9a92, 0x9a93, 0x9a94, /*0xa0-0xa7*/ + 0x9a95, 0x9a96, 0xe9ec, 0x9a97, 0x9a98, 0x9a99, 0x9a9a, 0x9a9b, /*0xa8-0xaf*/ + 0x9a9c, 0x9a9d, 0x9a9e, 0xecaf, 0xc5b9, 0xb6ce, 0x9a9f, 0xd2f3, /*0xb0-0xb7*/ + 0x9aa0, 0x9aa1, 0x9aa2, 0x9aa3, 0x9aa4, 0x9aa5, 0x9aa6, 0xb5ee, /*0xb8-0xbf*/ + 0x9aa7, 0xbbd9, 0xecb1, 0x9aa8, 0x9aa9, 0xd2e3, 0x9aaa, 0x9aab, /*0xc0-0xc7*/ + 0x9aac, 0x9aad, 0x9aae, 0xcee3, 0x9aaf, 0xc4b8, 0x9ab0, 0xc3bf, /*0xc8-0xcf*/ + 0x9ab1, 0x9ab2, 0xb6be, 0xd8b9, 0xb1c8, 0xb1cf, 0xb1d1, 0xc5fe, /*0xd0-0xd7*/ + 0x9ab3, 0xb1d0, 0x9ab4, 0xc3ab, 0x9ab5, 0x9ab6, 0x9ab7, 0x9ab8, /*0xd8-0xdf*/ + 0x9ab9, 0xd5b1, 0x9aba, 0x9abb, 0x9abc, 0x9abd, 0x9abe, 0x9abf, /*0xe0-0xe7*/ + 0x9ac0, 0x9ac1, 0xeba4, 0xbac1, 0x9ac2, 0x9ac3, 0x9ac4, 0xccba, /*0xe8-0xef*/ + 0x9ac5, 0x9ac6, 0x9ac7, 0xeba5, 0x9ac8, 0xeba7, 0x9ac9, 0x9aca, /*0xf0-0xf7*/ + 0x9acb, 0xeba8, 0x9acc, 0x9acd, 0x9ace, 0xeba6, 0x9acf, 0x9ad0, /*0xf8-0xff*/ + /* 0x6c00 */ + 0x9ad1, 0x9ad2, 0x9ad3, 0x9ad4, 0x9ad5, 0xeba9, 0xebab, 0xebaa, /*0x00-0x07*/ + 0x9ad6, 0x9ad7, 0x9ad8, 0x9ad9, 0x9ada, 0xebac, 0x9adb, 0xcacf, /*0x08-0x0f*/ + 0xd8b5, 0xc3f1, 0x9adc, 0xc3a5, 0xc6f8, 0xebad, 0xc4ca, 0x9add, /*0x10-0x17*/ + 0xebae, 0xebaf, 0xebb0, 0xb7d5, 0x9ade, 0x9adf, 0x9ae0, 0xb7fa, /*0x18-0x1f*/ + 0x9ae1, 0xebb1, 0xc7e2, 0x9ae2, 0xebb3, 0x9ae3, 0xbaa4, 0xd1f5, /*0x20-0x27*/ + 0xb0b1, 0xebb2, 0xebb4, 0x9ae4, 0x9ae5, 0x9ae6, 0xb5aa, 0xc2c8, /*0x28-0x2f*/ + 0xc7e8, 0x9ae7, 0xebb5, 0x9ae8, 0xcbae, 0xe3df, 0x9ae9, 0x9aea, /*0x30-0x37*/ + 0xd3c0, 0x9aeb, 0x9aec, 0x9aed, 0x9aee, 0xd9db, 0x9aef, 0x9af0, /*0x38-0x3f*/ + 0xcda1, 0xd6ad, 0xc7f3, 0x9af1, 0x9af2, 0x9af3, 0xd9e0, 0xbbe3, /*0x40-0x47*/ + 0x9af4, 0xbaba, 0xe3e2, 0x9af5, 0x9af6, 0x9af7, 0x9af8, 0x9af9, /*0x48-0x4f*/ + 0xcfab, 0x9afa, 0x9afb, 0x9afc, 0xe3e0, 0xc9c7, 0x9afd, 0xbab9, /*0x50-0x57*/ + 0x9afe, 0x9b40, 0x9b41, 0xd1b4, 0xe3e1, 0xc8ea, 0xb9af, 0xbdad, /*0x58-0x5f*/ + 0xb3d8, 0xcedb, 0x9b42, 0x9b43, 0xccc0, 0x9b44, 0x9b45, 0x9b46, /*0x60-0x67*/ + 0xe3e8, 0xe3e9, 0xcdf4, 0x9b47, 0x9b48, 0x9b49, 0x9b4a, 0x9b4b, /*0x68-0x6f*/ + 0xccad, 0x9b4c, 0xbcb3, 0x9b4d, 0xe3ea, 0x9b4e, 0xe3eb, 0x9b4f, /*0x70-0x77*/ + 0x9b50, 0xd0da, 0x9b51, 0x9b52, 0x9b53, 0xc6fb, 0xb7da, 0x9b54, /*0x78-0x7f*/ + 0x9b55, 0xc7df, 0xd2ca, 0xced6, 0x9b56, 0xe3e4, 0xe3ec, 0x9b57, /*0x80-0x87*/ + 0xc9f2, 0xb3c1, 0x9b58, 0x9b59, 0xe3e7, 0x9b5a, 0x9b5b, 0xc6e3, /*0x88-0x8f*/ + 0xe3e5, 0x9b5c, 0x9b5d, 0xedb3, 0xe3e6, 0x9b5e, 0x9b5f, 0x9b60, /*0x90-0x97*/ + 0x9b61, 0xc9b3, 0x9b62, 0xc5e6, 0x9b63, 0x9b64, 0x9b65, 0xb9b5, /*0x98-0x9f*/ + 0x9b66, 0xc3bb, 0x9b67, 0xe3e3, 0xc5bd, 0xc1a4, 0xc2d9, 0xb2d7, /*0xa0-0xa7*/ + 0x9b68, 0xe3ed, 0xbba6, 0xc4ad, 0x9b69, 0xe3f0, 0xbeda, 0x9b6a, /*0xa8-0xaf*/ + 0x9b6b, 0xe3fb, 0xe3f5, 0xbad3, 0x9b6c, 0x9b6d, 0x9b6e, 0x9b6f, /*0xb0-0xb7*/ + 0xb7d0, 0xd3cd, 0x9b70, 0xd6ce, 0xd5d3, 0xb9c1, 0xd5b4, 0xd1d8, /*0xb8-0xbf*/ + 0x9b71, 0x9b72, 0x9b73, 0x9b74, 0xd0b9, 0xc7f6, 0x9b75, 0x9b76, /*0xc0-0xc7*/ + 0x9b77, 0xc8aa, 0xb2b4, 0x9b78, 0xc3da, 0x9b79, 0x9b7a, 0x9b7b, /*0xc8-0xcf*/ + 0xe3ee, 0x9b7c, 0x9b7d, 0xe3fc, 0xe3ef, 0xb7a8, 0xe3f7, 0xe3f4, /*0xd0-0xd7*/ + 0x9b7e, 0x9b80, 0x9b81, 0xb7ba, 0x9b82, 0x9b83, 0xc5a2, 0x9b84, /*0xd8-0xdf*/ + 0xe3f6, 0xc5dd, 0xb2a8, 0xc6fc, 0x9b85, 0xc4e0, 0x9b86, 0x9b87, /*0xe0-0xe7*/ + 0xd7a2, 0x9b88, 0xc0e1, 0xe3f9, 0x9b89, 0x9b8a, 0xe3fa, 0xe3fd, /*0xe8-0xef*/ + 0xcca9, 0xe3f3, 0x9b8b, 0xd3be, 0x9b8c, 0xb1c3, 0xedb4, 0xe3f1, /*0xf0-0xf7*/ + 0xe3f2, 0x9b8d, 0xe3f8, 0xd0ba, 0xc6c3, 0xd4f3, 0xe3fe, 0x9b8e, /*0xf8-0xff*/ + /* 0x6d00 */ + 0x9b8f, 0xbde0, 0x9b90, 0x9b91, 0xe4a7, 0x9b92, 0x9b93, 0xe4a6, /*0x00-0x07*/ + 0x9b94, 0x9b95, 0x9b96, 0xd1f3, 0xe4a3, 0x9b97, 0xe4a9, 0x9b98, /*0x08-0x0f*/ + 0x9b99, 0x9b9a, 0xc8f7, 0x9b9b, 0x9b9c, 0x9b9d, 0x9b9e, 0xcfb4, /*0x10-0x17*/ + 0x9b9f, 0xe4a8, 0xe4ae, 0xc2e5, 0x9ba0, 0x9ba1, 0xb6b4, 0x9ba2, /*0x18-0x1f*/ + 0x9ba3, 0x9ba4, 0x9ba5, 0x9ba6, 0x9ba7, 0xbdf2, 0x9ba8, 0xe4a2, /*0x20-0x27*/ + 0x9ba9, 0x9baa, 0xbae9, 0xe4aa, 0x9bab, 0x9bac, 0xe4ac, 0x9bad, /*0x28-0x2f*/ + 0x9bae, 0xb6fd, 0xd6de, 0xe4b2, 0x9baf, 0xe4ad, 0x9bb0, 0x9bb1, /*0x30-0x37*/ + 0x9bb2, 0xe4a1, 0x9bb3, 0xbbee, 0xcddd, 0xc7a2, 0xc5c9, 0x9bb4, /*0x38-0x3f*/ + 0x9bb5, 0xc1f7, 0x9bb6, 0xe4a4, 0x9bb7, 0xc7b3, 0xbdac, 0xbdbd, /*0x40-0x47*/ + 0xe4a5, 0x9bb8, 0xd7c7, 0xb2e2, 0x9bb9, 0xe4ab, 0xbcc3, 0xe4af, /*0x48-0x4f*/ + 0x9bba, 0xbbeb, 0xe4b0, 0xc5a8, 0xe4b1, 0x9bbb, 0x9bbc, 0x9bbd, /*0x50-0x57*/ + 0x9bbe, 0xd5e3, 0xbfa3, 0x9bbf, 0xe4ba, 0x9bc0, 0xe4b7, 0x9bc1, /*0x58-0x5f*/ + 0xe4bb, 0x9bc2, 0x9bc3, 0xe4bd, 0x9bc4, 0x9bc5, 0xc6d6, 0x9bc6, /*0x60-0x67*/ + 0x9bc7, 0xbac6, 0xc0cb, 0x9bc8, 0x9bc9, 0x9bca, 0xb8a1, 0xe4b4, /*0x68-0x6f*/ + 0x9bcb, 0x9bcc, 0x9bcd, 0x9bce, 0xd4a1, 0x9bcf, 0x9bd0, 0xbaa3, /*0x70-0x77*/ + 0xbdfe, 0x9bd1, 0x9bd2, 0x9bd3, 0xe4bc, 0x9bd4, 0x9bd5, 0x9bd6, /*0x78-0x7f*/ + 0x9bd7, 0x9bd8, 0xcdbf, 0x9bd9, 0x9bda, 0xc4f9, 0x9bdb, 0x9bdc, /*0x80-0x87*/ + 0xcffb, 0xc9e6, 0x9bdd, 0x9bde, 0xd3bf, 0x9bdf, 0xcfd1, 0x9be0, /*0x88-0x8f*/ + 0x9be1, 0xe4b3, 0x9be2, 0xe4b8, 0xe4b9, 0xcce9, 0x9be3, 0x9be4, /*0x90-0x97*/ + 0x9be5, 0x9be6, 0x9be7, 0xccce, 0x9be8, 0xc0d4, 0xe4b5, 0xc1b0, /*0x98-0x9f*/ + 0xe4b6, 0xced0, 0x9be9, 0xbbc1, 0xb5d3, 0x9bea, 0xc8f3, 0xbda7, /*0xa0-0xa7*/ + 0xd5c7, 0xc9ac, 0xb8a2, 0xe4ca, 0x9beb, 0x9bec, 0xe4cc, 0xd1c4, /*0xa8-0xaf*/ + 0x9bed, 0x9bee, 0xd2ba, 0x9bef, 0x9bf0, 0xbaad, 0x9bf1, 0x9bf2, /*0xb0-0xb7*/ + 0xbad4, 0x9bf3, 0x9bf4, 0x9bf5, 0x9bf6, 0x9bf7, 0x9bf8, 0xe4c3, /*0xb8-0xbf*/ + 0xb5ed, 0x9bf9, 0x9bfa, 0x9bfb, 0xd7cd, 0xe4c0, 0xcffd, 0xe4bf, /*0xc0-0xc7*/ + 0x9bfc, 0x9bfd, 0x9bfe, 0xc1dc, 0xccca, 0x9c40, 0x9c41, 0x9c42, /*0xc8-0xcf*/ + 0x9c43, 0xcae7, 0x9c44, 0x9c45, 0x9c46, 0x9c47, 0xc4d7, 0x9c48, /*0xd0-0xd7*/ + 0xccd4, 0xe4c8, 0x9c49, 0x9c4a, 0x9c4b, 0xe4c7, 0xe4c1, 0x9c4c, /*0xd8-0xdf*/ + 0xe4c4, 0xb5ad, 0x9c4d, 0x9c4e, 0xd3d9, 0x9c4f, 0xe4c6, 0x9c50, /*0xe0-0xe7*/ + 0x9c51, 0x9c52, 0x9c53, 0xd2f9, 0xb4e3, 0x9c54, 0xbbb4, 0x9c55, /*0xe8-0xef*/ + 0x9c56, 0xc9ee, 0x9c57, 0xb4be, 0x9c58, 0x9c59, 0x9c5a, 0xbbec, /*0xf0-0xf7*/ + 0x9c5b, 0xd1cd, 0x9c5c, 0xcced, 0xedb5, 0x9c5d, 0x9c5e, 0x9c5f, /*0xf8-0xff*/ + /* 0x6e00 */ + 0x9c60, 0x9c61, 0x9c62, 0x9c63, 0x9c64, 0xc7e5, 0x9c65, 0x9c66, /*0x00-0x07*/ + 0x9c67, 0x9c68, 0xd4a8, 0x9c69, 0xe4cb, 0xd7d5, 0xe4c2, 0x9c6a, /*0x08-0x0f*/ + 0xbda5, 0xe4c5, 0x9c6b, 0x9c6c, 0xd3e6, 0x9c6d, 0xe4c9, 0xc9f8, /*0x10-0x17*/ + 0x9c6e, 0x9c6f, 0xe4be, 0x9c70, 0x9c71, 0xd3e5, 0x9c72, 0x9c73, /*0x18-0x1f*/ + 0xc7fe, 0xb6c9, 0x9c74, 0xd4fc, 0xb2b3, 0xe4d7, 0x9c75, 0x9c76, /*0x20-0x27*/ + 0x9c77, 0xcec2, 0x9c78, 0xe4cd, 0x9c79, 0xcebc, 0x9c7a, 0xb8db, /*0x28-0x2f*/ + 0x9c7b, 0x9c7c, 0xe4d6, 0x9c7d, 0xbfca, 0x9c7e, 0x9c80, 0x9c81, /*0x30-0x37*/ + 0xd3ce, 0x9c82, 0xc3ec, 0x9c83, 0x9c84, 0x9c85, 0x9c86, 0x9c87, /*0x38-0x3f*/ + 0x9c88, 0x9c89, 0x9c8a, 0xc5c8, 0xe4d8, 0x9c8b, 0x9c8c, 0x9c8d, /*0x40-0x47*/ + 0x9c8e, 0x9c8f, 0x9c90, 0x9c91, 0x9c92, 0xcdc4, 0xe4cf, 0x9c93, /*0x48-0x4f*/ + 0x9c94, 0x9c95, 0x9c96, 0xe4d4, 0xe4d5, 0x9c97, 0xbafe, 0x9c98, /*0x50-0x57*/ + 0xcfe6, 0x9c99, 0x9c9a, 0xd5bf, 0x9c9b, 0x9c9c, 0x9c9d, 0xe4d2, /*0x58-0x5f*/ + 0x9c9e, 0x9c9f, 0x9ca0, 0x9ca1, 0x9ca2, 0x9ca3, 0x9ca4, 0x9ca5, /*0x60-0x67*/ + 0x9ca6, 0x9ca7, 0x9ca8, 0xe4d0, 0x9ca9, 0x9caa, 0xe4ce, 0x9cab, /*0x68-0x6f*/ + 0x9cac, 0x9cad, 0x9cae, 0x9caf, 0x9cb0, 0x9cb1, 0x9cb2, 0x9cb3, /*0x70-0x77*/ + 0x9cb4, 0x9cb5, 0x9cb6, 0x9cb7, 0x9cb8, 0x9cb9, 0xcde5, 0xcaaa, /*0x78-0x7f*/ + 0x9cba, 0x9cbb, 0x9cbc, 0xc0a3, 0x9cbd, 0xbda6, 0xe4d3, 0x9cbe, /*0x80-0x87*/ + 0x9cbf, 0xb8c8, 0x9cc0, 0x9cc1, 0x9cc2, 0x9cc3, 0x9cc4, 0xe4e7, /*0x88-0x8f*/ + 0xd4b4, 0x9cc5, 0x9cc6, 0x9cc7, 0x9cc8, 0x9cc9, 0x9cca, 0x9ccb, /*0x90-0x97*/ + 0xe4db, 0x9ccc, 0x9ccd, 0x9cce, 0xc1ef, 0x9ccf, 0x9cd0, 0xe4e9, /*0x98-0x9f*/ + 0x9cd1, 0x9cd2, 0xd2e7, 0x9cd3, 0x9cd4, 0xe4df, 0x9cd5, 0xe4e0, /*0xa0-0xa7*/ + 0x9cd6, 0x9cd7, 0xcfaa, 0x9cd8, 0x9cd9, 0x9cda, 0x9cdb, 0xcbdd, /*0xa8-0xaf*/ + 0x9cdc, 0xe4da, 0xe4d1, 0x9cdd, 0xe4e5, 0x9cde, 0xc8dc, 0xe4e3, /*0xb0-0xb7*/ + 0x9cdf, 0x9ce0, 0xc4e7, 0xe4e2, 0x9ce1, 0xe4e1, 0x9ce2, 0x9ce3, /*0xb8-0xbf*/ + 0x9ce4, 0xb3fc, 0xe4e8, 0x9ce5, 0x9ce6, 0x9ce7, 0x9ce8, 0xb5e1, /*0xc0-0xc7*/ + 0x9ce9, 0x9cea, 0x9ceb, 0xd7cc, 0x9cec, 0x9ced, 0x9cee, 0xe4e6, /*0xc8-0xcf*/ + 0x9cef, 0xbbac, 0x9cf0, 0xd7d2, 0xcccf, 0xebf8, 0x9cf1, 0xe4e4, /*0xd0-0xd7*/ + 0x9cf2, 0x9cf3, 0xb9f6, 0x9cf4, 0x9cf5, 0x9cf6, 0xd6cd, 0xe4d9, /*0xd8-0xdf*/ + 0xe4dc, 0xc2fa, 0xe4de, 0x9cf7, 0xc2cb, 0xc0c4, 0xc2d0, 0x9cf8, /*0xe0-0xe7*/ + 0xb1f5, 0xccb2, 0x9cf9, 0x9cfa, 0x9cfb, 0x9cfc, 0x9cfd, 0x9cfe, /*0xe8-0xef*/ + 0x9d40, 0x9d41, 0x9d42, 0x9d43, 0xb5ce, 0x9d44, 0x9d45, 0x9d46, /*0xf0-0xf7*/ + 0x9d47, 0xe4ef, 0x9d48, 0x9d49, 0x9d4a, 0x9d4b, 0x9d4c, 0x9d4d, /*0xf8-0xff*/ + /* 0x6f00 */ + 0x9d4e, 0x9d4f, 0xc6af, 0x9d50, 0x9d51, 0x9d52, 0xc6e1, 0x9d53, /*0x00-0x07*/ + 0x9d54, 0xe4f5, 0x9d55, 0x9d56, 0x9d57, 0x9d58, 0x9d59, 0xc2a9, /*0x08-0x0f*/ + 0x9d5a, 0x9d5b, 0x9d5c, 0xc0ec, 0xd1dd, 0xe4ee, 0x9d5d, 0x9d5e, /*0x10-0x17*/ + 0x9d5f, 0x9d60, 0x9d61, 0x9d62, 0x9d63, 0x9d64, 0x9d65, 0x9d66, /*0x18-0x1f*/ + 0xc4ae, 0x9d67, 0x9d68, 0x9d69, 0xe4ed, 0x9d6a, 0x9d6b, 0x9d6c, /*0x20-0x27*/ + 0x9d6d, 0xe4f6, 0xe4f4, 0xc2fe, 0x9d6e, 0xe4dd, 0x9d6f, 0xe4f0, /*0x28-0x2f*/ + 0x9d70, 0xcafe, 0x9d71, 0xd5c4, 0x9d72, 0x9d73, 0xe4f1, 0x9d74, /*0x30-0x37*/ + 0x9d75, 0x9d76, 0x9d77, 0x9d78, 0x9d79, 0x9d7a, 0xd1fa, 0x9d7b, /*0x38-0x3f*/ + 0x9d7c, 0x9d7d, 0x9d7e, 0x9d80, 0x9d81, 0x9d82, 0xe4eb, 0xe4ec, /*0x40-0x47*/ + 0x9d83, 0x9d84, 0x9d85, 0xe4f2, 0x9d86, 0xceab, 0x9d87, 0x9d88, /*0x48-0x4f*/ + 0x9d89, 0x9d8a, 0x9d8b, 0x9d8c, 0x9d8d, 0x9d8e, 0x9d8f, 0x9d90, /*0x50-0x57*/ + 0xc5cb, 0x9d91, 0x9d92, 0x9d93, 0xc7b1, 0x9d94, 0xc2ba, 0x9d95, /*0x58-0x5f*/ + 0x9d96, 0x9d97, 0xe4ea, 0x9d98, 0x9d99, 0x9d9a, 0xc1ca, 0x9d9b, /*0x60-0x67*/ + 0x9d9c, 0x9d9d, 0x9d9e, 0x9d9f, 0x9da0, 0xccb6, 0xb3b1, 0x9da1, /*0x68-0x6f*/ + 0x9da2, 0x9da3, 0xe4fb, 0x9da4, 0xe4f3, 0x9da5, 0x9da6, 0x9da7, /*0x70-0x77*/ + 0xe4fa, 0x9da8, 0xe4fd, 0x9da9, 0xe4fc, 0x9daa, 0x9dab, 0x9dac, /*0x78-0x7f*/ + 0x9dad, 0x9dae, 0x9daf, 0x9db0, 0xb3ce, 0x9db1, 0x9db2, 0x9db3, /*0x80-0x87*/ + 0xb3ba, 0xe4f7, 0x9db4, 0x9db5, 0xe4f9, 0xe4f8, 0xc5ec, 0x9db6, /*0x88-0x8f*/ + 0x9db7, 0x9db8, 0x9db9, 0x9dba, 0x9dbb, 0x9dbc, 0x9dbd, 0x9dbe, /*0x90-0x97*/ + 0x9dbf, 0x9dc0, 0x9dc1, 0x9dc2, 0xc0bd, 0x9dc3, 0x9dc4, 0x9dc5, /*0x98-0x9f*/ + 0x9dc6, 0xd4e8, 0x9dc7, 0x9dc8, 0x9dc9, 0x9dca, 0x9dcb, 0xe5a2, /*0xa0-0xa7*/ + 0x9dcc, 0x9dcd, 0x9dce, 0x9dcf, 0x9dd0, 0x9dd1, 0x9dd2, 0x9dd3, /*0xa8-0xaf*/ + 0x9dd4, 0x9dd5, 0x9dd6, 0xb0c4, 0x9dd7, 0x9dd8, 0xe5a4, 0x9dd9, /*0xb0-0xb7*/ + 0x9dda, 0xe5a3, 0x9ddb, 0x9ddc, 0x9ddd, 0x9dde, 0x9ddf, 0x9de0, /*0xb8-0xbf*/ + 0xbca4, 0x9de1, 0xe5a5, 0x9de2, 0x9de3, 0x9de4, 0x9de5, 0x9de6, /*0xc0-0xc7*/ + 0x9de7, 0xe5a1, 0x9de8, 0x9de9, 0x9dea, 0x9deb, 0x9dec, 0x9ded, /*0xc8-0xcf*/ + 0x9dee, 0xe4fe, 0xb1f4, 0x9def, 0x9df0, 0x9df1, 0x9df2, 0x9df3, /*0xd0-0xd7*/ + 0x9df4, 0x9df5, 0x9df6, 0x9df7, 0x9df8, 0x9df9, 0xe5a8, 0x9dfa, /*0xd8-0xdf*/ + 0xe5a9, 0xe5a6, 0x9dfb, 0x9dfc, 0x9dfd, 0x9dfe, 0x9e40, 0x9e41, /*0xe0-0xe7*/ + 0x9e42, 0x9e43, 0x9e44, 0x9e45, 0x9e46, 0x9e47, 0xe5a7, 0xe5aa, /*0xe8-0xef*/ + 0x9e48, 0x9e49, 0x9e4a, 0x9e4b, 0x9e4c, 0x9e4d, 0x9e4e, 0x9e4f, /*0xf0-0xf7*/ + 0x9e50, 0x9e51, 0x9e52, 0x9e53, 0x9e54, 0x9e55, 0x9e56, 0x9e57, /*0xf8-0xff*/ + /* 0x7000 */ + 0x9e58, 0x9e59, 0x9e5a, 0x9e5b, 0x9e5c, 0x9e5d, 0x9e5e, 0x9e5f, /*0x00-0x07*/ + 0x9e60, 0x9e61, 0x9e62, 0x9e63, 0x9e64, 0x9e65, 0x9e66, 0x9e67, /*0x08-0x0f*/ + 0x9e68, 0xc6d9, 0x9e69, 0x9e6a, 0x9e6b, 0x9e6c, 0x9e6d, 0x9e6e, /*0x10-0x17*/ + 0x9e6f, 0x9e70, 0xe5ab, 0xe5ad, 0x9e71, 0x9e72, 0x9e73, 0x9e74, /*0x18-0x1f*/ + 0x9e75, 0x9e76, 0x9e77, 0xe5ac, 0x9e78, 0x9e79, 0x9e7a, 0x9e7b, /*0x20-0x27*/ + 0x9e7c, 0x9e7d, 0x9e7e, 0x9e80, 0x9e81, 0x9e82, 0x9e83, 0x9e84, /*0x28-0x2f*/ + 0x9e85, 0x9e86, 0x9e87, 0x9e88, 0x9e89, 0xe5af, 0x9e8a, 0x9e8b, /*0x30-0x37*/ + 0x9e8c, 0xe5ae, 0x9e8d, 0x9e8e, 0x9e8f, 0x9e90, 0x9e91, 0x9e92, /*0x38-0x3f*/ + 0x9e93, 0x9e94, 0x9e95, 0x9e96, 0x9e97, 0x9e98, 0x9e99, 0x9e9a, /*0x40-0x47*/ + 0x9e9b, 0x9e9c, 0x9e9d, 0x9e9e, 0xb9e0, 0x9e9f, 0x9ea0, 0xe5b0, /*0x48-0x4f*/ + 0x9ea1, 0x9ea2, 0x9ea3, 0x9ea4, 0x9ea5, 0x9ea6, 0x9ea7, 0x9ea8, /*0x50-0x57*/ + 0x9ea9, 0x9eaa, 0x9eab, 0x9eac, 0x9ead, 0x9eae, 0xe5b1, 0x9eaf, /*0x58-0x5f*/ + 0x9eb0, 0x9eb1, 0x9eb2, 0x9eb3, 0x9eb4, 0x9eb5, 0x9eb6, 0x9eb7, /*0x60-0x67*/ + 0x9eb8, 0x9eb9, 0x9eba, 0xbbf0, 0xece1, 0xc3f0, 0x9ebb, 0xb5c6, /*0x68-0x6f*/ + 0xbbd2, 0x9ebc, 0x9ebd, 0x9ebe, 0x9ebf, 0xc1e9, 0xd4ee, 0x9ec0, /*0x70-0x77*/ + 0xbec4, 0x9ec1, 0x9ec2, 0x9ec3, 0xd7c6, 0x9ec4, 0xd4d6, 0xb2d3, /*0x78-0x7f*/ + 0xecbe, 0x9ec5, 0x9ec6, 0x9ec7, 0x9ec8, 0xeac1, 0x9ec9, 0x9eca, /*0x80-0x87*/ + 0x9ecb, 0xc2af, 0xb4b6, 0x9ecc, 0x9ecd, 0x9ece, 0xd1d7, 0x9ecf, /*0x88-0x8f*/ + 0x9ed0, 0x9ed1, 0xb3b4, 0x9ed2, 0xc8b2, 0xbfbb, 0xecc0, 0x9ed3, /*0x90-0x97*/ + 0x9ed4, 0xd6cb, 0x9ed5, 0x9ed6, 0xecbf, 0xecc1, 0x9ed7, 0x9ed8, /*0x98-0x9f*/ + 0x9ed9, 0x9eda, 0x9edb, 0x9edc, 0x9edd, 0x9ede, 0x9edf, 0x9ee0, /*0xa0-0xa7*/ + 0x9ee1, 0x9ee2, 0x9ee3, 0xecc5, 0xbee6, 0xccbf, 0xc5da, 0xbebc, /*0xa8-0xaf*/ + 0x9ee4, 0xecc6, 0x9ee5, 0xb1fe, 0x9ee6, 0x9ee7, 0x9ee8, 0xecc4, /*0xb0-0xb7*/ + 0xd5a8, 0xb5e3, 0x9ee9, 0xecc2, 0xc1b6, 0xb3e3, 0x9eea, 0x9eeb, /*0xb8-0xbf*/ + 0xecc3, 0xcbb8, 0xc0c3, 0xccfe, 0x9eec, 0x9eed, 0x9eee, 0x9eef, /*0xc0-0xc7*/ + 0xc1d2, 0x9ef0, 0xecc8, 0x9ef1, 0x9ef2, 0x9ef3, 0x9ef4, 0x9ef5, /*0xc8-0xcf*/ + 0x9ef6, 0x9ef7, 0x9ef8, 0x9ef9, 0x9efa, 0x9efb, 0x9efc, 0x9efd, /*0xd0-0xd7*/ + 0xbae6, 0xc0d3, 0x9efe, 0xd6f2, 0x9f40, 0x9f41, 0x9f42, 0xd1cc, /*0xd8-0xdf*/ + 0x9f43, 0x9f44, 0x9f45, 0x9f46, 0xbfbe, 0x9f47, 0xb7b3, 0xc9d5, /*0xe0-0xe7*/ + 0xecc7, 0xbbe2, 0x9f48, 0xcccc, 0xbdfd, 0xc8c8, 0x9f49, 0xcfa9, /*0xe8-0xef*/ + 0x9f4a, 0x9f4b, 0x9f4c, 0x9f4d, 0x9f4e, 0x9f4f, 0x9f50, 0xcde9, /*0xf0-0xf7*/ + 0x9f51, 0xc5eb, 0x9f52, 0x9f53, 0x9f54, 0xb7e9, 0x9f55, 0x9f56, /*0xf8-0xff*/ + /* 0x7100 */ + 0x9f57, 0x9f58, 0x9f59, 0x9f5a, 0x9f5b, 0x9f5c, 0x9f5d, 0x9f5e, /*0x00-0x07*/ + 0x9f5f, 0xd1c9, 0xbab8, 0x9f60, 0x9f61, 0x9f62, 0x9f63, 0x9f64, /*0x08-0x0f*/ + 0xecc9, 0x9f65, 0x9f66, 0xecca, 0x9f67, 0xbbc0, 0xeccb, 0x9f68, /*0x10-0x17*/ + 0xece2, 0xb1ba, 0xb7d9, 0x9f69, 0x9f6a, 0x9f6b, 0x9f6c, 0x9f6d, /*0x18-0x1f*/ + 0x9f6e, 0x9f6f, 0x9f70, 0x9f71, 0x9f72, 0x9f73, 0xbdb9, 0x9f74, /*0x20-0x27*/ + 0x9f75, 0x9f76, 0x9f77, 0x9f78, 0x9f79, 0x9f7a, 0x9f7b, 0xeccc, /*0x28-0x2f*/ + 0xd1e6, 0xeccd, 0x9f7c, 0x9f7d, 0x9f7e, 0x9f80, 0xc8bb, 0x9f81, /*0x30-0x37*/ + 0x9f82, 0x9f83, 0x9f84, 0x9f85, 0x9f86, 0x9f87, 0x9f88, 0x9f89, /*0x38-0x3f*/ + 0x9f8a, 0x9f8b, 0x9f8c, 0x9f8d, 0x9f8e, 0xecd1, 0x9f8f, 0x9f90, /*0x40-0x47*/ + 0x9f91, 0x9f92, 0xecd3, 0x9f93, 0xbbcd, 0x9f94, 0xbce5, 0x9f95, /*0x48-0x4f*/ + 0x9f96, 0x9f97, 0x9f98, 0x9f99, 0x9f9a, 0x9f9b, 0x9f9c, 0x9f9d, /*0x50-0x57*/ + 0x9f9e, 0x9f9f, 0x9fa0, 0x9fa1, 0xeccf, 0x9fa2, 0xc9b7, 0x9fa3, /*0x58-0x5f*/ + 0x9fa4, 0x9fa5, 0x9fa6, 0x9fa7, 0xc3ba, 0x9fa8, 0xece3, 0xd5d5, /*0x60-0x67*/ + 0xecd0, 0x9fa9, 0x9faa, 0x9fab, 0x9fac, 0x9fad, 0xd6f3, 0x9fae, /*0x68-0x6f*/ + 0x9faf, 0x9fb0, 0xecd2, 0xecce, 0x9fb1, 0x9fb2, 0x9fb3, 0x9fb4, /*0x70-0x77*/ + 0xecd4, 0x9fb5, 0xecd5, 0x9fb6, 0x9fb7, 0xc9bf, 0x9fb8, 0x9fb9, /*0x78-0x7f*/ + 0x9fba, 0x9fbb, 0x9fbc, 0x9fbd, 0xcfa8, 0x9fbe, 0x9fbf, 0x9fc0, /*0x80-0x87*/ + 0x9fc1, 0x9fc2, 0xd0dc, 0x9fc3, 0x9fc4, 0x9fc5, 0x9fc6, 0xd1ac, /*0x88-0x8f*/ + 0x9fc7, 0x9fc8, 0x9fc9, 0x9fca, 0xc8db, 0x9fcb, 0x9fcc, 0x9fcd, /*0x90-0x97*/ + 0xecd6, 0xcef5, 0x9fce, 0x9fcf, 0x9fd0, 0x9fd1, 0x9fd2, 0xcaec, /*0x98-0x9f*/ + 0xecda, 0x9fd3, 0x9fd4, 0x9fd5, 0x9fd6, 0x9fd7, 0x9fd8, 0x9fd9, /*0xa0-0xa7*/ + 0xecd9, 0x9fda, 0x9fdb, 0x9fdc, 0xb0be, 0x9fdd, 0x9fde, 0x9fdf, /*0xa8-0xaf*/ + 0x9fe0, 0x9fe1, 0x9fe2, 0xecd7, 0x9fe3, 0xecd8, 0x9fe4, 0x9fe5, /*0xb0-0xb7*/ + 0x9fe6, 0xece4, 0x9fe7, 0x9fe8, 0x9fe9, 0x9fea, 0x9feb, 0x9fec, /*0xb8-0xbf*/ + 0x9fed, 0x9fee, 0x9fef, 0xc8bc, 0x9ff0, 0x9ff1, 0x9ff2, 0x9ff3, /*0xc0-0xc7*/ + 0x9ff4, 0x9ff5, 0x9ff6, 0x9ff7, 0x9ff8, 0x9ff9, 0xc1c7, 0x9ffa, /*0xc8-0xcf*/ + 0x9ffb, 0x9ffc, 0x9ffd, 0x9ffe, 0xecdc, 0xd1e0, 0xa040, 0xa041, /*0xd0-0xd7*/ + 0xa042, 0xa043, 0xa044, 0xa045, 0xa046, 0xa047, 0xa048, 0xa049, /*0xd8-0xdf*/ + 0xecdb, 0xa04a, 0xa04b, 0xa04c, 0xa04d, 0xd4ef, 0xa04e, 0xecdd, /*0xe0-0xe7*/ + 0xa04f, 0xa050, 0xa051, 0xa052, 0xa053, 0xa054, 0xdbc6, 0xa055, /*0xe8-0xef*/ + 0xa056, 0xa057, 0xa058, 0xa059, 0xa05a, 0xa05b, 0xa05c, 0xa05d, /*0xf0-0xf7*/ + 0xa05e, 0xecde, 0xa05f, 0xa060, 0xa061, 0xa062, 0xa063, 0xa064, /*0xf8-0xff*/ + /* 0x7200 */ + 0xa065, 0xa066, 0xa067, 0xa068, 0xa069, 0xa06a, 0xb1ac, 0xa06b, /*0x00-0x07*/ + 0xa06c, 0xa06d, 0xa06e, 0xa06f, 0xa070, 0xa071, 0xa072, 0xa073, /*0x08-0x0f*/ + 0xa074, 0xa075, 0xa076, 0xa077, 0xa078, 0xa079, 0xa07a, 0xa07b, /*0x10-0x17*/ + 0xa07c, 0xa07d, 0xa07e, 0xa080, 0xa081, 0xecdf, 0xa082, 0xa083, /*0x18-0x1f*/ + 0xa084, 0xa085, 0xa086, 0xa087, 0xa088, 0xa089, 0xa08a, 0xa08b, /*0x20-0x27*/ + 0xece0, 0xa08c, 0xd7a6, 0xa08d, 0xc5c0, 0xa08e, 0xa08f, 0xa090, /*0x28-0x2f*/ + 0xebbc, 0xb0ae, 0xa091, 0xa092, 0xa093, 0xbef4, 0xb8b8, 0xd2af, /*0x30-0x37*/ + 0xb0d6, 0xb5f9, 0xa094, 0xd8b3, 0xa095, 0xcbac, 0xa096, 0xe3dd, /*0x38-0x3f*/ + 0xa097, 0xa098, 0xa099, 0xa09a, 0xa09b, 0xa09c, 0xa09d, 0xc6ac, /*0x40-0x47*/ + 0xb0e6, 0xa09e, 0xa09f, 0xa0a0, 0xc5c6, 0xebb9, 0xa0a1, 0xa0a2, /*0x48-0x4f*/ + 0xa0a3, 0xa0a4, 0xebba, 0xa0a5, 0xa0a6, 0xa0a7, 0xebbb, 0xa0a8, /*0x50-0x57*/ + 0xa0a9, 0xd1c0, 0xa0aa, 0xc5a3, 0xa0ab, 0xeaf2, 0xa0ac, 0xc4b2, /*0x58-0x5f*/ + 0xa0ad, 0xc4b5, 0xc0ce, 0xa0ae, 0xa0af, 0xa0b0, 0xeaf3, 0xc4c1, /*0x60-0x67*/ + 0xa0b1, 0xceef, 0xa0b2, 0xa0b3, 0xa0b4, 0xa0b5, 0xeaf0, 0xeaf4, /*0x68-0x6f*/ + 0xa0b6, 0xa0b7, 0xc9fc, 0xa0b8, 0xa0b9, 0xc7a3, 0xa0ba, 0xa0bb, /*0x70-0x77*/ + 0xa0bc, 0xccd8, 0xcefe, 0xa0bd, 0xa0be, 0xa0bf, 0xeaf5, 0xeaf6, /*0x78-0x7f*/ + 0xcfac, 0xc0e7, 0xa0c0, 0xa0c1, 0xeaf7, 0xa0c2, 0xa0c3, 0xa0c4, /*0x80-0x87*/ + 0xa0c5, 0xa0c6, 0xb6bf, 0xeaf8, 0xa0c7, 0xeaf9, 0xa0c8, 0xeafa, /*0x88-0x8f*/ + 0xa0c9, 0xa0ca, 0xeafb, 0xa0cb, 0xa0cc, 0xa0cd, 0xa0ce, 0xa0cf, /*0x90-0x97*/ + 0xa0d0, 0xa0d1, 0xa0d2, 0xa0d3, 0xa0d4, 0xa0d5, 0xa0d6, 0xeaf1, /*0x98-0x9f*/ + 0xa0d7, 0xa0d8, 0xa0d9, 0xa0da, 0xa0db, 0xa0dc, 0xa0dd, 0xa0de, /*0xa0-0xa7*/ + 0xa0df, 0xa0e0, 0xa0e1, 0xa0e2, 0xc8ae, 0xe1eb, 0xa0e3, 0xb7b8, /*0xa8-0xaf*/ + 0xe1ec, 0xa0e4, 0xa0e5, 0xa0e6, 0xe1ed, 0xa0e7, 0xd7b4, 0xe1ee, /*0xb0-0xb7*/ + 0xe1ef, 0xd3cc, 0xa0e8, 0xa0e9, 0xa0ea, 0xa0eb, 0xa0ec, 0xa0ed, /*0xb8-0xbf*/ + 0xa0ee, 0xe1f1, 0xbff1, 0xe1f0, 0xb5d2, 0xa0ef, 0xa0f0, 0xa0f1, /*0xc0-0xc7*/ + 0xb1b7, 0xa0f2, 0xa0f3, 0xa0f4, 0xa0f5, 0xe1f3, 0xe1f2, 0xa0f6, /*0xc8-0xcf*/ + 0xbafc, 0xa0f7, 0xe1f4, 0xa0f8, 0xa0f9, 0xa0fa, 0xa0fb, 0xb9b7, /*0xd0-0xd7*/ + 0xa0fc, 0xbed1, 0xa0fd, 0xa0fe, 0xaa40, 0xaa41, 0xc4fc, 0xaa42, /*0xd8-0xdf*/ + 0xbadd, 0xbdc6, 0xaa43, 0xaa44, 0xaa45, 0xaa46, 0xaa47, 0xaa48, /*0xe0-0xe7*/ + 0xe1f5, 0xe1f7, 0xaa49, 0xaa4a, 0xb6c0, 0xcfc1, 0xcaa8, 0xe1f6, /*0xe8-0xef*/ + 0xd5f8, 0xd3fc, 0xe1f8, 0xe1fc, 0xe1f9, 0xaa4b, 0xaa4c, 0xe1fa, /*0xf0-0xf7*/ + 0xc0ea, 0xaa4d, 0xe1fe, 0xe2a1, 0xc0c7, 0xaa4e, 0xaa4f, 0xaa50, /*0xf8-0xff*/ + /* 0x7300 */ + 0xaa51, 0xe1fb, 0xaa52, 0xe1fd, 0xaa53, 0xaa54, 0xaa55, 0xaa56, /*0x00-0x07*/ + 0xaa57, 0xaa58, 0xe2a5, 0xaa59, 0xaa5a, 0xaa5b, 0xc1d4, 0xaa5c, /*0x08-0x0f*/ + 0xaa5d, 0xaa5e, 0xaa5f, 0xe2a3, 0xaa60, 0xe2a8, 0xb2fe, 0xe2a2, /*0x10-0x17*/ + 0xaa61, 0xaa62, 0xaa63, 0xc3cd, 0xb2c2, 0xe2a7, 0xe2a6, 0xaa64, /*0x18-0x1f*/ + 0xaa65, 0xe2a4, 0xe2a9, 0xaa66, 0xaa67, 0xe2ab, 0xaa68, 0xaa69, /*0x20-0x27*/ + 0xaa6a, 0xd0c9, 0xd6ed, 0xc3a8, 0xe2ac, 0xaa6b, 0xcfd7, 0xaa6c, /*0x28-0x2f*/ + 0xaa6d, 0xe2ae, 0xaa6e, 0xaa6f, 0xbaef, 0xaa70, 0xaa71, 0xe9e0, /*0x30-0x37*/ + 0xe2ad, 0xe2aa, 0xaa72, 0xaa73, 0xaa74, 0xaa75, 0xbbab, 0xd4b3, /*0x38-0x3f*/ + 0xaa76, 0xaa77, 0xaa78, 0xaa79, 0xaa7a, 0xaa7b, 0xaa7c, 0xaa7d, /*0x40-0x47*/ + 0xaa7e, 0xaa80, 0xaa81, 0xaa82, 0xaa83, 0xe2b0, 0xaa84, 0xaa85, /*0x48-0x4f*/ + 0xe2af, 0xaa86, 0xe9e1, 0xaa87, 0xaa88, 0xaa89, 0xaa8a, 0xe2b1, /*0x50-0x57*/ + 0xaa8b, 0xaa8c, 0xaa8d, 0xaa8e, 0xaa8f, 0xaa90, 0xaa91, 0xaa92, /*0x58-0x5f*/ + 0xe2b2, 0xaa93, 0xaa94, 0xaa95, 0xaa96, 0xaa97, 0xaa98, 0xaa99, /*0x60-0x67*/ + 0xaa9a, 0xaa9b, 0xaa9c, 0xaa9d, 0xe2b3, 0xcca1, 0xaa9e, 0xe2b4, /*0x68-0x6f*/ + 0xaa9f, 0xaaa0, 0xab40, 0xab41, 0xab42, 0xab43, 0xab44, 0xab45, /*0x70-0x77*/ + 0xab46, 0xab47, 0xab48, 0xab49, 0xab4a, 0xab4b, 0xe2b5, 0xab4c, /*0x78-0x7f*/ + 0xab4d, 0xab4e, 0xab4f, 0xab50, 0xd0fe, 0xab51, 0xab52, 0xc2ca, /*0x80-0x87*/ + 0xab53, 0xd3f1, 0xab54, 0xcdf5, 0xab55, 0xab56, 0xe7e0, 0xab57, /*0x88-0x8f*/ + 0xab58, 0xe7e1, 0xab59, 0xab5a, 0xab5b, 0xab5c, 0xbec1, 0xab5d, /*0x90-0x97*/ + 0xab5e, 0xab5f, 0xab60, 0xc2ea, 0xab61, 0xab62, 0xab63, 0xe7e4, /*0x98-0x9f*/ + 0xab64, 0xab65, 0xe7e3, 0xab66, 0xab67, 0xab68, 0xab69, 0xab6a, /*0xa0-0xa7*/ + 0xab6b, 0xcde6, 0xab6c, 0xc3b5, 0xab6d, 0xab6e, 0xe7e2, 0xbbb7, /*0xa8-0xaf*/ + 0xcfd6, 0xab6f, 0xc1e1, 0xe7e9, 0xab70, 0xab71, 0xab72, 0xe7e8, /*0xb0-0xb7*/ + 0xab73, 0xab74, 0xe7f4, 0xb2a3, 0xab75, 0xab76, 0xab77, 0xab78, /*0xb8-0xbf*/ + 0xe7ea, 0xab79, 0xe7e6, 0xab7a, 0xab7b, 0xab7c, 0xab7d, 0xab7e, /*0xc0-0xc7*/ + 0xe7ec, 0xe7eb, 0xc9ba, 0xab80, 0xab81, 0xd5e4, 0xab82, 0xe7e5, /*0xc8-0xcf*/ + 0xb7a9, 0xe7e7, 0xab83, 0xab84, 0xab85, 0xab86, 0xab87, 0xab88, /*0xd0-0xd7*/ + 0xab89, 0xe7ee, 0xab8a, 0xab8b, 0xab8c, 0xab8d, 0xe7f3, 0xab8e, /*0xd8-0xdf*/ + 0xd6e9, 0xab8f, 0xab90, 0xab91, 0xab92, 0xe7ed, 0xab93, 0xe7f2, /*0xe0-0xe7*/ + 0xab94, 0xe7f1, 0xab95, 0xab96, 0xab97, 0xb0e0, 0xab98, 0xab99, /*0xe8-0xef*/ + 0xab9a, 0xab9b, 0xe7f5, 0xab9c, 0xab9d, 0xab9e, 0xab9f, 0xaba0, /*0xf0-0xf7*/ + 0xac40, 0xac41, 0xac42, 0xac43, 0xac44, 0xac45, 0xac46, 0xac47, /*0xf8-0xff*/ + /* 0x7400 */ + 0xac48, 0xac49, 0xac4a, 0xc7f2, 0xac4b, 0xc0c5, 0xc0ed, 0xac4c, /*0x00-0x07*/ + 0xac4d, 0xc1f0, 0xe7f0, 0xac4e, 0xac4f, 0xac50, 0xac51, 0xe7f6, /*0x08-0x0f*/ + 0xcbf6, 0xac52, 0xac53, 0xac54, 0xac55, 0xac56, 0xac57, 0xac58, /*0x10-0x17*/ + 0xac59, 0xac5a, 0xe8a2, 0xe8a1, 0xac5b, 0xac5c, 0xac5d, 0xac5e, /*0x18-0x1f*/ + 0xac5f, 0xac60, 0xd7c1, 0xac61, 0xac62, 0xe7fa, 0xe7f9, 0xac63, /*0x20-0x27*/ + 0xe7fb, 0xac64, 0xe7f7, 0xac65, 0xe7fe, 0xac66, 0xe7fd, 0xac67, /*0x28-0x2f*/ + 0xe7fc, 0xac68, 0xac69, 0xc1d5, 0xc7d9, 0xc5fd, 0xc5c3, 0xac6a, /*0x30-0x37*/ + 0xac6b, 0xac6c, 0xac6d, 0xac6e, 0xc7ed, 0xac6f, 0xac70, 0xac71, /*0x38-0x3f*/ + 0xac72, 0xe8a3, 0xac73, 0xac74, 0xac75, 0xac76, 0xac77, 0xac78, /*0x40-0x47*/ + 0xac79, 0xac7a, 0xac7b, 0xac7c, 0xac7d, 0xac7e, 0xac80, 0xac81, /*0x48-0x4f*/ + 0xac82, 0xac83, 0xac84, 0xac85, 0xac86, 0xe8a6, 0xac87, 0xe8a5, /*0x50-0x57*/ + 0xac88, 0xe8a7, 0xbaf7, 0xe7f8, 0xe8a4, 0xac89, 0xc8f0, 0xc9aa, /*0x58-0x5f*/ + 0xac8a, 0xac8b, 0xac8c, 0xac8d, 0xac8e, 0xac8f, 0xac90, 0xac91, /*0x60-0x67*/ + 0xac92, 0xac93, 0xac94, 0xac95, 0xac96, 0xe8a9, 0xac97, 0xac98, /*0x68-0x6f*/ + 0xb9e5, 0xac99, 0xac9a, 0xac9b, 0xac9c, 0xac9d, 0xd1fe, 0xe8a8, /*0x70-0x77*/ + 0xac9e, 0xac9f, 0xaca0, 0xad40, 0xad41, 0xad42, 0xe8aa, 0xad43, /*0x78-0x7f*/ + 0xe8ad, 0xe8ae, 0xad44, 0xc1a7, 0xad45, 0xad46, 0xad47, 0xe8af, /*0x80-0x87*/ + 0xad48, 0xad49, 0xad4a, 0xe8b0, 0xad4b, 0xad4c, 0xe8ac, 0xad4d, /*0x88-0x8f*/ + 0xe8b4, 0xad4e, 0xad4f, 0xad50, 0xad51, 0xad52, 0xad53, 0xad54, /*0x90-0x97*/ + 0xad55, 0xad56, 0xad57, 0xad58, 0xe8ab, 0xad59, 0xe8b1, 0xad5a, /*0x98-0x9f*/ + 0xad5b, 0xad5c, 0xad5d, 0xad5e, 0xad5f, 0xad60, 0xad61, 0xe8b5, /*0xa0-0xa7*/ + 0xe8b2, 0xe8b3, 0xad62, 0xad63, 0xad64, 0xad65, 0xad66, 0xad67, /*0xa8-0xaf*/ + 0xad68, 0xad69, 0xad6a, 0xad6b, 0xad6c, 0xad6d, 0xad6e, 0xad6f, /*0xb0-0xb7*/ + 0xad70, 0xad71, 0xe8b7, 0xad72, 0xad73, 0xad74, 0xad75, 0xad76, /*0xb8-0xbf*/ + 0xad77, 0xad78, 0xad79, 0xad7a, 0xad7b, 0xad7c, 0xad7d, 0xad7e, /*0xc0-0xc7*/ + 0xad80, 0xad81, 0xad82, 0xad83, 0xad84, 0xad85, 0xad86, 0xad87, /*0xc8-0xcf*/ + 0xad88, 0xad89, 0xe8b6, 0xad8a, 0xad8b, 0xad8c, 0xad8d, 0xad8e, /*0xd0-0xd7*/ + 0xad8f, 0xad90, 0xad91, 0xad92, 0xb9cf, 0xad93, 0xf0ac, 0xad94, /*0xd8-0xdf*/ + 0xf0ad, 0xad95, 0xc6b0, 0xb0ea, 0xc8bf, 0xad96, 0xcddf, 0xad97, /*0xe0-0xe7*/ + 0xad98, 0xad99, 0xad9a, 0xad9b, 0xad9c, 0xad9d, 0xcecd, 0xeab1, /*0xe8-0xef*/ + 0xad9e, 0xad9f, 0xada0, 0xae40, 0xeab2, 0xae41, 0xc6bf, 0xb4c9, /*0xf0-0xf7*/ + 0xae42, 0xae43, 0xae44, 0xae45, 0xae46, 0xae47, 0xae48, 0xeab3, /*0xf8-0xff*/ + /* 0x7500 */ + 0xae49, 0xae4a, 0xae4b, 0xae4c, 0xd5e7, 0xae4d, 0xae4e, 0xae4f, /*0x00-0x07*/ + 0xae50, 0xae51, 0xae52, 0xae53, 0xae54, 0xddf9, 0xae55, 0xeab4, /*0x08-0x0f*/ + 0xae56, 0xeab5, 0xae57, 0xeab6, 0xae58, 0xae59, 0xae5a, 0xae5b, /*0x10-0x17*/ + 0xb8ca, 0xdfb0, 0xc9f5, 0xae5c, 0xccf0, 0xae5d, 0xae5e, 0xc9fa, /*0x18-0x1f*/ + 0xae5f, 0xae60, 0xae61, 0xae62, 0xae63, 0xc9fb, 0xae64, 0xae65, /*0x20-0x27*/ + 0xd3c3, 0xcba6, 0xae66, 0xb8a6, 0xf0ae, 0xb1c2, 0xae67, 0xe5b8, /*0x28-0x2f*/ + 0xccef, 0xd3c9, 0xbcd7, 0xc9ea, 0xae68, 0xb5e7, 0xae69, 0xc4d0, /*0x30-0x37*/ + 0xb5e9, 0xae6a, 0xeeae, 0xbbad, 0xae6b, 0xae6c, 0xe7de, 0xae6d, /*0x38-0x3f*/ + 0xeeaf, 0xae6e, 0xae6f, 0xae70, 0xae71, 0xb3a9, 0xae72, 0xae73, /*0x40-0x47*/ + 0xeeb2, 0xae74, 0xae75, 0xeeb1, 0xbde7, 0xae76, 0xeeb0, 0xceb7, /*0x48-0x4f*/ + 0xae77, 0xae78, 0xae79, 0xae7a, 0xc5cf, 0xae7b, 0xae7c, 0xae7d, /*0x50-0x57*/ + 0xae7e, 0xc1f4, 0xdbce, 0xeeb3, 0xd0f3, 0xae80, 0xae81, 0xae82, /*0x58-0x5f*/ + 0xae83, 0xae84, 0xae85, 0xae86, 0xae87, 0xc2d4, 0xc6e8, 0xae88, /*0x60-0x67*/ + 0xae89, 0xae8a, 0xb7ac, 0xae8b, 0xae8c, 0xae8d, 0xae8e, 0xae8f, /*0x68-0x6f*/ + 0xae90, 0xae91, 0xeeb4, 0xae92, 0xb3eb, 0xae93, 0xae94, 0xae95, /*0x70-0x77*/ + 0xbbfb, 0xeeb5, 0xae96, 0xae97, 0xae98, 0xae99, 0xae9a, 0xe7dc, /*0x78-0x7f*/ + 0xae9b, 0xae9c, 0xae9d, 0xeeb6, 0xae9e, 0xae9f, 0xbdae, 0xaea0, /*0x80-0x87*/ + 0xaf40, 0xaf41, 0xaf42, 0xf1e2, 0xaf43, 0xaf44, 0xaf45, 0xcae8, /*0x88-0x8f*/ + 0xaf46, 0xd2c9, 0xf0da, 0xaf47, 0xf0db, 0xaf48, 0xf0dc, 0xc1c6, /*0x90-0x97*/ + 0xaf49, 0xb8ed, 0xbece, 0xaf4a, 0xaf4b, 0xf0de, 0xaf4c, 0xc5b1, /*0x98-0x9f*/ + 0xf0dd, 0xd1f1, 0xaf4d, 0xf0e0, 0xb0cc, 0xbdea, 0xaf4e, 0xaf4f, /*0xa0-0xa7*/ + 0xaf50, 0xaf51, 0xaf52, 0xd2df, 0xf0df, 0xaf53, 0xb4af, 0xb7e8, /*0xa8-0xaf*/ + 0xf0e6, 0xf0e5, 0xc6a3, 0xf0e1, 0xf0e2, 0xb4c3, 0xaf54, 0xaf55, /*0xb0-0xb7*/ + 0xf0e3, 0xd5ee, 0xaf56, 0xaf57, 0xccdb, 0xbed2, 0xbcb2, 0xaf58, /*0xb8-0xbf*/ + 0xaf59, 0xaf5a, 0xf0e8, 0xf0e7, 0xf0e4, 0xb2a1, 0xaf5b, 0xd6a2, /*0xc0-0xc7*/ + 0xd3b8, 0xbeb7, 0xc8ac, 0xaf5c, 0xaf5d, 0xf0ea, 0xaf5e, 0xaf5f, /*0xc8-0xcf*/ + 0xaf60, 0xaf61, 0xd1f7, 0xaf62, 0xd6cc, 0xbadb, 0xf0e9, 0xaf63, /*0xd0-0xd7*/ + 0xb6bb, 0xaf64, 0xaf65, 0xcdb4, 0xaf66, 0xaf67, 0xc6a6, 0xaf68, /*0xd8-0xdf*/ + 0xaf69, 0xaf6a, 0xc1a1, 0xf0eb, 0xf0ee, 0xaf6b, 0xf0ed, 0xf0f0, /*0xe0-0xe7*/ + 0xf0ec, 0xaf6c, 0xbbbe, 0xf0ef, 0xaf6d, 0xaf6e, 0xaf6f, 0xaf70, /*0xe8-0xef*/ + 0xccb5, 0xf0f2, 0xaf71, 0xaf72, 0xb3d5, 0xaf73, 0xaf74, 0xaf75, /*0xf0-0xf7*/ + 0xaf76, 0xb1d4, 0xaf77, 0xaf78, 0xf0f3, 0xaf79, 0xaf7a, 0xf0f4, /*0xf8-0xff*/ + /* 0x7600 */ + 0xf0f6, 0xb4e1, 0xaf7b, 0xf0f1, 0xaf7c, 0xf0f7, 0xaf7d, 0xaf7e, /*0x00-0x07*/ + 0xaf80, 0xaf81, 0xf0fa, 0xaf82, 0xf0f8, 0xaf83, 0xaf84, 0xaf85, /*0x08-0x0f*/ + 0xf0f5, 0xaf86, 0xaf87, 0xaf88, 0xaf89, 0xf0fd, 0xaf8a, 0xf0f9, /*0x10-0x17*/ + 0xf0fc, 0xf0fe, 0xaf8b, 0xf1a1, 0xaf8c, 0xaf8d, 0xaf8e, 0xcec1, /*0x18-0x1f*/ + 0xf1a4, 0xaf8f, 0xf1a3, 0xaf90, 0xc1f6, 0xf0fb, 0xcadd, 0xaf91, /*0x20-0x27*/ + 0xaf92, 0xb4f1, 0xb1f1, 0xccb1, 0xaf93, 0xf1a6, 0xaf94, 0xaf95, /*0x28-0x2f*/ + 0xf1a7, 0xaf96, 0xaf97, 0xf1ac, 0xd5ce, 0xf1a9, 0xaf98, 0xaf99, /*0x30-0x37*/ + 0xc8b3, 0xaf9a, 0xaf9b, 0xaf9c, 0xf1a2, 0xaf9d, 0xf1ab, 0xf1a8, /*0x38-0x3f*/ + 0xf1a5, 0xaf9e, 0xaf9f, 0xf1aa, 0xafa0, 0xb040, 0xb041, 0xb042, /*0x40-0x47*/ + 0xb043, 0xb044, 0xb045, 0xb046, 0xb0a9, 0xf1ad, 0xb047, 0xb048, /*0x48-0x4f*/ + 0xb049, 0xb04a, 0xb04b, 0xb04c, 0xf1af, 0xb04d, 0xf1b1, 0xb04e, /*0x50-0x57*/ + 0xb04f, 0xb050, 0xb051, 0xb052, 0xf1b0, 0xb053, 0xf1ae, 0xb054, /*0x58-0x5f*/ + 0xb055, 0xb056, 0xb057, 0xd1a2, 0xb058, 0xb059, 0xb05a, 0xb05b, /*0x60-0x67*/ + 0xb05c, 0xb05d, 0xb05e, 0xf1b2, 0xb05f, 0xb060, 0xb061, 0xf1b3, /*0x68-0x6f*/ + 0xb062, 0xb063, 0xb064, 0xb065, 0xb066, 0xb067, 0xb068, 0xb069, /*0x70-0x77*/ + 0xb9ef, 0xb06a, 0xb06b, 0xb5c7, 0xb06c, 0xb0d7, 0xb0d9, 0xb06d, /*0x78-0x7f*/ + 0xb06e, 0xb06f, 0xd4ed, 0xb070, 0xb5c4, 0xb071, 0xbdd4, 0xbbca, /*0x80-0x87*/ + 0xf0a7, 0xb072, 0xb073, 0xb8de, 0xb074, 0xb075, 0xf0a8, 0xb076, /*0x88-0x8f*/ + 0xb077, 0xb0a8, 0xb078, 0xf0a9, 0xb079, 0xb07a, 0xcdee, 0xb07b, /*0x90-0x97*/ + 0xb07c, 0xf0aa, 0xb07d, 0xb07e, 0xb080, 0xb081, 0xb082, 0xb083, /*0x98-0x9f*/ + 0xb084, 0xb085, 0xb086, 0xb087, 0xf0ab, 0xb088, 0xb089, 0xb08a, /*0xa0-0xa7*/ + 0xb08b, 0xb08c, 0xb08d, 0xb08e, 0xb08f, 0xb090, 0xc6a4, 0xb091, /*0xa8-0xaf*/ + 0xb092, 0xd6e5, 0xf1e4, 0xb093, 0xf1e5, 0xb094, 0xb095, 0xb096, /*0xb0-0xb7*/ + 0xb097, 0xb098, 0xb099, 0xb09a, 0xb09b, 0xb09c, 0xb09d, 0xc3f3, /*0xb8-0xbf*/ + 0xb09e, 0xb09f, 0xd3db, 0xb0a0, 0xb140, 0xd6d1, 0xc5e8, 0xb141, /*0xc0-0xc7*/ + 0xd3af, 0xb142, 0xd2e6, 0xb143, 0xb144, 0xeec1, 0xb0bb, 0xd5b5, /*0xc8-0xcf*/ + 0xd1ce, 0xbce0, 0xbad0, 0xb145, 0xbff8, 0xb146, 0xb8c7, 0xb5c1, /*0xd0-0xd7*/ + 0xc5cc, 0xb147, 0xb148, 0xcaa2, 0xb149, 0xb14a, 0xb14b, 0xc3cb, /*0xd8-0xdf*/ + 0xb14c, 0xb14d, 0xb14e, 0xb14f, 0xb150, 0xeec2, 0xb151, 0xb152, /*0xe0-0xe7*/ + 0xb153, 0xb154, 0xb155, 0xb156, 0xb157, 0xb158, 0xc4bf, 0xb6a2, /*0xe8-0xef*/ + 0xb159, 0xedec, 0xc3a4, 0xb15a, 0xd6b1, 0xb15b, 0xb15c, 0xb15d, /*0xf0-0xf7*/ + 0xcfe0, 0xedef, 0xb15e, 0xb15f, 0xc5ce, 0xb160, 0xb6dc, 0xb161, /*0xf8-0xff*/ + /* 0x7700 */ + 0xb162, 0xcaa1, 0xb163, 0xb164, 0xeded, 0xb165, 0xb166, 0xedf0, /*0x00-0x07*/ + 0xedf1, 0xc3bc, 0xb167, 0xbfb4, 0xb168, 0xedee, 0xb169, 0xb16a, /*0x08-0x0f*/ + 0xb16b, 0xb16c, 0xb16d, 0xb16e, 0xb16f, 0xb170, 0xb171, 0xb172, /*0x10-0x17*/ + 0xb173, 0xedf4, 0xedf2, 0xb174, 0xb175, 0xb176, 0xb177, 0xd5e6, /*0x18-0x1f*/ + 0xc3df, 0xb178, 0xedf3, 0xb179, 0xb17a, 0xb17b, 0xedf6, 0xb17c, /*0x20-0x27*/ + 0xd5a3, 0xd1a3, 0xb17d, 0xb17e, 0xb180, 0xedf5, 0xb181, 0xc3d0, /*0x28-0x2f*/ + 0xb182, 0xb183, 0xb184, 0xb185, 0xb186, 0xedf7, 0xbff4, 0xbeec, /*0x30-0x37*/ + 0xedf8, 0xb187, 0xccf7, 0xb188, 0xd1db, 0xb189, 0xb18a, 0xb18b, /*0x38-0x3f*/ + 0xd7c5, 0xd5f6, 0xb18c, 0xedfc, 0xb18d, 0xb18e, 0xb18f, 0xedfb, /*0x40-0x47*/ + 0xb190, 0xb191, 0xb192, 0xb193, 0xb194, 0xb195, 0xb196, 0xb197, /*0x48-0x4f*/ + 0xedf9, 0xedfa, 0xb198, 0xb199, 0xb19a, 0xb19b, 0xb19c, 0xb19d, /*0x50-0x57*/ + 0xb19e, 0xb19f, 0xedfd, 0xbea6, 0xb1a0, 0xb240, 0xb241, 0xb242, /*0x58-0x5f*/ + 0xb243, 0xcbaf, 0xeea1, 0xb6bd, 0xb244, 0xeea2, 0xc4c0, 0xb245, /*0x60-0x67*/ + 0xedfe, 0xb246, 0xb247, 0xbdde, 0xb2c7, 0xb248, 0xb249, 0xb24a, /*0x68-0x6f*/ + 0xb24b, 0xb24c, 0xb24d, 0xb24e, 0xb24f, 0xb250, 0xb251, 0xb252, /*0x70-0x77*/ + 0xb253, 0xb6c3, 0xb254, 0xb255, 0xb256, 0xeea5, 0xd8ba, 0xeea3, /*0x78-0x7f*/ + 0xeea6, 0xb257, 0xb258, 0xb259, 0xc3e9, 0xb3f2, 0xb25a, 0xb25b, /*0x80-0x87*/ + 0xb25c, 0xb25d, 0xb25e, 0xb25f, 0xeea7, 0xeea4, 0xcfb9, 0xb260, /*0x88-0x8f*/ + 0xb261, 0xeea8, 0xc2f7, 0xb262, 0xb263, 0xb264, 0xb265, 0xb266, /*0x90-0x97*/ + 0xb267, 0xb268, 0xb269, 0xb26a, 0xb26b, 0xb26c, 0xb26d, 0xeea9, /*0x98-0x9f*/ + 0xeeaa, 0xb26e, 0xdeab, 0xb26f, 0xb270, 0xc6b3, 0xb271, 0xc7c6, /*0xa0-0xa7*/ + 0xb272, 0xd6f5, 0xb5c9, 0xb273, 0xcbb2, 0xb274, 0xb275, 0xb276, /*0xa8-0xaf*/ + 0xeeab, 0xb277, 0xb278, 0xcdab, 0xb279, 0xeeac, 0xb27a, 0xb27b, /*0xb0-0xb7*/ + 0xb27c, 0xb27d, 0xb27e, 0xd5b0, 0xb280, 0xeead, 0xb281, 0xf6c4, /*0xb8-0xbf*/ + 0xb282, 0xb283, 0xb284, 0xb285, 0xb286, 0xb287, 0xb288, 0xb289, /*0xc0-0xc7*/ + 0xb28a, 0xb28b, 0xb28c, 0xb28d, 0xb28e, 0xdbc7, 0xb28f, 0xb290, /*0xc8-0xcf*/ + 0xb291, 0xb292, 0xb293, 0xb294, 0xb295, 0xb296, 0xb297, 0xb4a3, /*0xd0-0xd7*/ + 0xb298, 0xb299, 0xb29a, 0xc3ac, 0xf1e6, 0xb29b, 0xb29c, 0xb29d, /*0xd8-0xdf*/ + 0xb29e, 0xb29f, 0xcab8, 0xd2d3, 0xb2a0, 0xd6aa, 0xb340, 0xeff2, /*0xe0-0xe7*/ + 0xb341, 0xbed8, 0xb342, 0xbdc3, 0xeff3, 0xb6cc, 0xb0ab, 0xb343, /*0xe8-0xef*/ + 0xb344, 0xb345, 0xb346, 0xcaaf, 0xb347, 0xb348, 0xedb6, 0xb349, /*0xf0-0xf7*/ + 0xedb7, 0xb34a, 0xb34b, 0xb34c, 0xb34d, 0xcef9, 0xb7af, 0xbff3, /*0xf8-0xff*/ + /* 0x7800 */ + 0xedb8, 0xc2eb, 0xc9b0, 0xb34e, 0xb34f, 0xb350, 0xb351, 0xb352, /*0x00-0x07*/ + 0xb353, 0xedb9, 0xb354, 0xb355, 0xc6f6, 0xbfb3, 0xb356, 0xb357, /*0x08-0x0f*/ + 0xb358, 0xedbc, 0xc5f8, 0xb359, 0xd1d0, 0xb35a, 0xd7a9, 0xedba, /*0x10-0x17*/ + 0xedbb, 0xb35b, 0xd1e2, 0xb35c, 0xedbf, 0xedc0, 0xb35d, 0xedc4, /*0x18-0x1f*/ + 0xb35e, 0xb35f, 0xb360, 0xedc8, 0xb361, 0xedc6, 0xedce, 0xd5e8, /*0x20-0x27*/ + 0xb362, 0xedc9, 0xb363, 0xb364, 0xedc7, 0xedbe, 0xb365, 0xb366, /*0x28-0x2f*/ + 0xc5e9, 0xb367, 0xb368, 0xb369, 0xc6c6, 0xb36a, 0xb36b, 0xc9e9, /*0x30-0x37*/ + 0xd4d2, 0xedc1, 0xedc2, 0xedc3, 0xedc5, 0xb36c, 0xc0f9, 0xb36d, /*0x38-0x3f*/ + 0xb4a1, 0xb36e, 0xb36f, 0xb370, 0xb371, 0xb9e8, 0xb372, 0xedd0, /*0x40-0x47*/ + 0xb373, 0xb374, 0xb375, 0xb376, 0xedd1, 0xb377, 0xedca, 0xb378, /*0x48-0x4f*/ + 0xedcf, 0xb379, 0xcef8, 0xb37a, 0xb37b, 0xcbb6, 0xedcc, 0xedcd, /*0x50-0x57*/ + 0xb37c, 0xb37d, 0xb37e, 0xb380, 0xb381, 0xcff5, 0xb382, 0xb383, /*0x58-0x5f*/ + 0xb384, 0xb385, 0xb386, 0xb387, 0xb388, 0xb389, 0xb38a, 0xb38b, /*0x60-0x67*/ + 0xb38c, 0xb38d, 0xedd2, 0xc1f2, 0xd3b2, 0xedcb, 0xc8b7, 0xb38e, /*0x68-0x6f*/ + 0xb38f, 0xb390, 0xb391, 0xb392, 0xb393, 0xb394, 0xb395, 0xbcef, /*0x70-0x77*/ + 0xb396, 0xb397, 0xb398, 0xb399, 0xc5f0, 0xb39a, 0xb39b, 0xb39c, /*0x78-0x7f*/ + 0xb39d, 0xb39e, 0xb39f, 0xb3a0, 0xb440, 0xb441, 0xb442, 0xedd6, /*0x80-0x87*/ + 0xb443, 0xb5ef, 0xb444, 0xb445, 0xc2b5, 0xb0ad, 0xcbe9, 0xb446, /*0x88-0x8f*/ + 0xb447, 0xb1ae, 0xb448, 0xedd4, 0xb449, 0xb44a, 0xb44b, 0xcdeb, /*0x90-0x97*/ + 0xb5e2, 0xb44c, 0xedd5, 0xedd3, 0xedd7, 0xb44d, 0xb44e, 0xb5fa, /*0x98-0x9f*/ + 0xb44f, 0xedd8, 0xb450, 0xedd9, 0xb451, 0xeddc, 0xb452, 0xb1cc, /*0xa0-0xa7*/ + 0xb453, 0xb454, 0xb455, 0xb456, 0xb457, 0xb458, 0xb459, 0xb45a, /*0xa8-0xaf*/ + 0xc5f6, 0xbcee, 0xedda, 0xccbc, 0xb2ea, 0xb45b, 0xb45c, 0xb45d, /*0xb0-0xb7*/ + 0xb45e, 0xeddb, 0xb45f, 0xb460, 0xb461, 0xb462, 0xc4eb, 0xb463, /*0xb8-0xbf*/ + 0xb464, 0xb4c5, 0xb465, 0xb466, 0xb467, 0xb0f5, 0xb468, 0xb469, /*0xc0-0xc7*/ + 0xb46a, 0xeddf, 0xc0da, 0xb4e8, 0xb46b, 0xb46c, 0xb46d, 0xb46e, /*0xc8-0xcf*/ + 0xc5cd, 0xb46f, 0xb470, 0xb471, 0xeddd, 0xbfc4, 0xb472, 0xb473, /*0xd0-0xd7*/ + 0xb474, 0xedde, 0xb475, 0xb476, 0xb477, 0xb478, 0xb479, 0xb47a, /*0xd8-0xdf*/ + 0xb47b, 0xb47c, 0xb47d, 0xb47e, 0xb480, 0xb481, 0xb482, 0xb483, /*0xe0-0xe7*/ + 0xc4a5, 0xb484, 0xb485, 0xb486, 0xede0, 0xb487, 0xb488, 0xb489, /*0xe8-0xef*/ + 0xb48a, 0xb48b, 0xede1, 0xb48c, 0xede3, 0xb48d, 0xb48e, 0xc1d7, /*0xf0-0xf7*/ + 0xb48f, 0xb490, 0xbbc7, 0xb491, 0xb492, 0xb493, 0xb494, 0xb495, /*0xf8-0xff*/ + /* 0x7900 */ + 0xb496, 0xbdb8, 0xb497, 0xb498, 0xb499, 0xede2, 0xb49a, 0xb49b, /*0x00-0x07*/ + 0xb49c, 0xb49d, 0xb49e, 0xb49f, 0xb4a0, 0xb540, 0xb541, 0xb542, /*0x08-0x0f*/ + 0xb543, 0xb544, 0xb545, 0xede4, 0xb546, 0xb547, 0xb548, 0xb549, /*0x10-0x17*/ + 0xb54a, 0xb54b, 0xb54c, 0xb54d, 0xb54e, 0xb54f, 0xede6, 0xb550, /*0x18-0x1f*/ + 0xb551, 0xb552, 0xb553, 0xb554, 0xede5, 0xb555, 0xb556, 0xb557, /*0x20-0x27*/ + 0xb558, 0xb559, 0xb55a, 0xb55b, 0xb55c, 0xb55d, 0xb55e, 0xb55f, /*0x28-0x2f*/ + 0xb560, 0xb561, 0xb562, 0xb563, 0xede7, 0xb564, 0xb565, 0xb566, /*0x30-0x37*/ + 0xb567, 0xb568, 0xcabe, 0xecea, 0xc0f1, 0xb569, 0xc9e7, 0xb56a, /*0x38-0x3f*/ + 0xeceb, 0xc6ee, 0xb56b, 0xb56c, 0xb56d, 0xb56e, 0xecec, 0xb56f, /*0x40-0x47*/ + 0xc6ed, 0xeced, 0xb570, 0xb571, 0xb572, 0xb573, 0xb574, 0xb575, /*0x48-0x4f*/ + 0xb576, 0xb577, 0xb578, 0xecf0, 0xb579, 0xb57a, 0xd7e6, 0xecf3, /*0x50-0x57*/ + 0xb57b, 0xb57c, 0xecf1, 0xecee, 0xecef, 0xd7a3, 0xc9f1, 0xcbee, /*0x58-0x5f*/ + 0xecf4, 0xb57d, 0xecf2, 0xb57e, 0xb580, 0xcfe9, 0xb581, 0xecf6, /*0x60-0x67*/ + 0xc6b1, 0xb582, 0xb583, 0xb584, 0xb585, 0xbcc0, 0xb586, 0xecf5, /*0x68-0x6f*/ + 0xb587, 0xb588, 0xb589, 0xb58a, 0xb58b, 0xb58c, 0xb58d, 0xb5bb, /*0x70-0x77*/ + 0xbbf6, 0xb58e, 0xecf7, 0xb58f, 0xb590, 0xb591, 0xb592, 0xb593, /*0x78-0x7f*/ + 0xd9f7, 0xbdfb, 0xb594, 0xb595, 0xc2bb, 0xecf8, 0xb596, 0xb597, /*0x80-0x87*/ + 0xb598, 0xb599, 0xecf9, 0xb59a, 0xb59b, 0xb59c, 0xb59d, 0xb8a3, /*0x88-0x8f*/ + 0xb59e, 0xb59f, 0xb5a0, 0xb640, 0xb641, 0xb642, 0xb643, 0xb644, /*0x90-0x97*/ + 0xb645, 0xb646, 0xecfa, 0xb647, 0xb648, 0xb649, 0xb64a, 0xb64b, /*0x98-0x9f*/ + 0xb64c, 0xb64d, 0xb64e, 0xb64f, 0xb650, 0xb651, 0xb652, 0xecfb, /*0xa0-0xa7*/ + 0xb653, 0xb654, 0xb655, 0xb656, 0xb657, 0xb658, 0xb659, 0xb65a, /*0xa8-0xaf*/ + 0xb65b, 0xb65c, 0xb65d, 0xecfc, 0xb65e, 0xb65f, 0xb660, 0xb661, /*0xb0-0xb7*/ + 0xb662, 0xd3ed, 0xd8ae, 0xc0eb, 0xb663, 0xc7dd, 0xbacc, 0xb664, /*0xb8-0xbf*/ + 0xd0e3, 0xcbbd, 0xb665, 0xcdba, 0xb666, 0xb667, 0xb8d1, 0xb668, /*0xc0-0xc7*/ + 0xb669, 0xb1fc, 0xb66a, 0xc7ef, 0xb66b, 0xd6d6, 0xb66c, 0xb66d, /*0xc8-0xcf*/ + 0xb66e, 0xbfc6, 0xc3eb, 0xb66f, 0xb670, 0xeff5, 0xb671, 0xb672, /*0xd0-0xd7*/ + 0xc3d8, 0xb673, 0xb674, 0xb675, 0xb676, 0xb677, 0xb678, 0xd7e2, /*0xd8-0xdf*/ + 0xb679, 0xb67a, 0xb67b, 0xeff7, 0xb3d3, 0xb67c, 0xc7d8, 0xd1ed, /*0xe0-0xe7*/ + 0xb67d, 0xd6c8, 0xb67e, 0xeff8, 0xb680, 0xeff6, 0xb681, 0xbbfd, /*0xe8-0xef*/ + 0xb3c6, 0xb682, 0xb683, 0xb684, 0xb685, 0xb686, 0xb687, 0xb688, /*0xf0-0xf7*/ + 0xbdd5, 0xb689, 0xb68a, 0xd2c6, 0xb68b, 0xbbe0, 0xb68c, 0xb68d, /*0xf8-0xff*/ + /* 0x7a00 */ + 0xcfa1, 0xb68e, 0xeffc, 0xeffb, 0xb68f, 0xb690, 0xeff9, 0xb691, /*0x00-0x07*/ + 0xb692, 0xb693, 0xb694, 0xb3cc, 0xb695, 0xc9d4, 0xcbb0, 0xb696, /*0x08-0x0f*/ + 0xb697, 0xb698, 0xb699, 0xb69a, 0xeffe, 0xb69b, 0xb69c, 0xb0de, /*0x10-0x17*/ + 0xb69d, 0xb69e, 0xd6c9, 0xb69f, 0xb6a0, 0xb740, 0xeffd, 0xb741, /*0x18-0x1f*/ + 0xb3ed, 0xb742, 0xb743, 0xf6d5, 0xb744, 0xb745, 0xb746, 0xb747, /*0x20-0x27*/ + 0xb748, 0xb749, 0xb74a, 0xb74b, 0xb74c, 0xb74d, 0xb74e, 0xb74f, /*0x28-0x2f*/ + 0xb750, 0xb751, 0xb752, 0xcec8, 0xb753, 0xb754, 0xb755, 0xf0a2, /*0x30-0x37*/ + 0xb756, 0xf0a1, 0xb757, 0xb5be, 0xbcda, 0xbbfc, 0xb758, 0xb8e5, /*0x38-0x3f*/ + 0xb759, 0xb75a, 0xb75b, 0xb75c, 0xb75d, 0xb75e, 0xc4c2, 0xb75f, /*0x40-0x47*/ + 0xb760, 0xb761, 0xb762, 0xb763, 0xb764, 0xb765, 0xb766, 0xb767, /*0x48-0x4f*/ + 0xb768, 0xf0a3, 0xb769, 0xb76a, 0xb76b, 0xb76c, 0xb76d, 0xcbeb, /*0x50-0x57*/ + 0xb76e, 0xb76f, 0xb770, 0xb771, 0xb772, 0xb773, 0xb774, 0xb775, /*0x58-0x5f*/ + 0xb776, 0xb777, 0xb778, 0xb779, 0xb77a, 0xb77b, 0xb77c, 0xb77d, /*0x60-0x67*/ + 0xb77e, 0xb780, 0xb781, 0xb782, 0xb783, 0xb784, 0xb785, 0xb786, /*0x68-0x6f*/ + 0xf0a6, 0xb787, 0xb788, 0xb789, 0xd1a8, 0xb78a, 0xbebf, 0xc7ee, /*0x70-0x77*/ + 0xf1b6, 0xf1b7, 0xbfd5, 0xb78b, 0xb78c, 0xb78d, 0xb78e, 0xb4a9, /*0x78-0x7f*/ + 0xf1b8, 0xcdbb, 0xb78f, 0xc7d4, 0xd5ad, 0xb790, 0xf1b9, 0xb791, /*0x80-0x87*/ + 0xf1ba, 0xb792, 0xb793, 0xb794, 0xb795, 0xc7cf, 0xb796, 0xb797, /*0x88-0x8f*/ + 0xb798, 0xd2a4, 0xd6cf, 0xb799, 0xb79a, 0xf1bb, 0xbdd1, 0xb4b0, /*0x90-0x97*/ + 0xbebd, 0xb79b, 0xb79c, 0xb79d, 0xb4dc, 0xced1, 0xb79e, 0xbfdf, /*0x98-0x9f*/ + 0xf1bd, 0xb79f, 0xb7a0, 0xb840, 0xb841, 0xbffa, 0xf1bc, 0xb842, /*0xa0-0xa7*/ + 0xf1bf, 0xb843, 0xb844, 0xb845, 0xf1be, 0xf1c0, 0xb846, 0xb847, /*0xa8-0xaf*/ + 0xb848, 0xb849, 0xb84a, 0xf1c1, 0xb84b, 0xb84c, 0xb84d, 0xb84e, /*0xb0-0xb7*/ + 0xb84f, 0xb850, 0xb851, 0xb852, 0xb853, 0xb854, 0xb855, 0xc1fe, /*0xb8-0xbf*/ + 0xb856, 0xb857, 0xb858, 0xb859, 0xb85a, 0xb85b, 0xb85c, 0xb85d, /*0xc0-0xc7*/ + 0xb85e, 0xb85f, 0xb860, 0xc1a2, 0xb861, 0xb862, 0xb863, 0xb864, /*0xc8-0xcf*/ + 0xb865, 0xb866, 0xb867, 0xb868, 0xb869, 0xb86a, 0xcafa, 0xb86b, /*0xd0-0xd7*/ + 0xb86c, 0xd5be, 0xb86d, 0xb86e, 0xb86f, 0xb870, 0xbeba, 0xbeb9, /*0xd8-0xdf*/ + 0xd5c2, 0xb871, 0xb872, 0xbfa2, 0xb873, 0xcdaf, 0xf1b5, 0xb874, /*0xe0-0xe7*/ + 0xb875, 0xb876, 0xb877, 0xb878, 0xb879, 0xbddf, 0xb87a, 0xb6cb, /*0xe8-0xef*/ + 0xb87b, 0xb87c, 0xb87d, 0xb87e, 0xb880, 0xb881, 0xb882, 0xb883, /*0xf0-0xf7*/ + 0xb884, 0xd6f1, 0xf3c3, 0xb885, 0xb886, 0xf3c4, 0xb887, 0xb8cd, /*0xf8-0xff*/ + /* 0x7b00 */ + 0xb888, 0xb889, 0xb88a, 0xf3c6, 0xf3c7, 0xb88b, 0xb0ca, 0xb88c, /*0x00-0x07*/ + 0xf3c5, 0xb88d, 0xf3c9, 0xcbf1, 0xb88e, 0xb88f, 0xb890, 0xf3cb, /*0x08-0x0f*/ + 0xb891, 0xd0a6, 0xb892, 0xb893, 0xb1ca, 0xf3c8, 0xb894, 0xb895, /*0x10-0x17*/ + 0xb896, 0xf3cf, 0xb897, 0xb5d1, 0xb898, 0xb899, 0xf3d7, 0xb89a, /*0x18-0x1f*/ + 0xf3d2, 0xb89b, 0xb89c, 0xb89d, 0xf3d4, 0xf3d3, 0xb7fb, 0xb89e, /*0x20-0x27*/ + 0xb1bf, 0xb89f, 0xf3ce, 0xf3ca, 0xb5da, 0xb8a0, 0xf3d0, 0xb940, /*0x28-0x2f*/ + 0xb941, 0xf3d1, 0xb942, 0xf3d5, 0xb943, 0xb944, 0xb945, 0xb946, /*0x30-0x37*/ + 0xf3cd, 0xb947, 0xbce3, 0xb948, 0xc1fd, 0xb949, 0xf3d6, 0xb94a, /*0x38-0x3f*/ + 0xb94b, 0xb94c, 0xb94d, 0xb94e, 0xb94f, 0xf3da, 0xb950, 0xf3cc, /*0x40-0x47*/ + 0xb951, 0xb5c8, 0xb952, 0xbdee, 0xf3dc, 0xb953, 0xb954, 0xb7a4, /*0x48-0x4f*/ + 0xbff0, 0xd6fe, 0xcdb2, 0xb955, 0xb4f0, 0xb956, 0xb2df, 0xb957, /*0x50-0x57*/ + 0xf3d8, 0xb958, 0xf3d9, 0xc9b8, 0xb959, 0xf3dd, 0xb95a, 0xb95b, /*0x58-0x5f*/ + 0xf3de, 0xb95c, 0xf3e1, 0xb95d, 0xb95e, 0xb95f, 0xb960, 0xb961, /*0x60-0x67*/ + 0xb962, 0xb963, 0xb964, 0xb965, 0xb966, 0xb967, 0xf3df, 0xb968, /*0x68-0x6f*/ + 0xb969, 0xf3e3, 0xf3e2, 0xb96a, 0xb96b, 0xf3db, 0xb96c, 0xbfea, /*0x70-0x77*/ + 0xb96d, 0xb3ef, 0xb96e, 0xf3e0, 0xb96f, 0xb970, 0xc7a9, 0xb971, /*0x78-0x7f*/ + 0xbcf2, 0xb972, 0xb973, 0xb974, 0xb975, 0xf3eb, 0xb976, 0xb977, /*0x80-0x87*/ + 0xb978, 0xb979, 0xb97a, 0xb97b, 0xb97c, 0xb9bf, 0xb97d, 0xb97e, /*0x88-0x8f*/ + 0xf3e4, 0xb980, 0xb981, 0xb982, 0xb2ad, 0xbbfe, 0xb983, 0xcbe3, /*0x90-0x97*/ + 0xb984, 0xb985, 0xb986, 0xb987, 0xf3ed, 0xf3e9, 0xb988, 0xb989, /*0x98-0x9f*/ + 0xb98a, 0xb9dc, 0xf3ee, 0xb98b, 0xb98c, 0xb98d, 0xf3e5, 0xf3e6, /*0xa0-0xa7*/ + 0xf3ea, 0xc2e1, 0xf3ec, 0xf3ef, 0xf3e8, 0xbcfd, 0xb98e, 0xb98f, /*0xa8-0xaf*/ + 0xb990, 0xcfe4, 0xb991, 0xb992, 0xf3f0, 0xb993, 0xb994, 0xb995, /*0xb0-0xb7*/ + 0xf3e7, 0xb996, 0xb997, 0xb998, 0xb999, 0xb99a, 0xb99b, 0xb99c, /*0xb8-0xbf*/ + 0xb99d, 0xf3f2, 0xb99e, 0xb99f, 0xb9a0, 0xba40, 0xd7ad, 0xc6aa, /*0xc0-0xc7*/ + 0xba41, 0xba42, 0xba43, 0xba44, 0xf3f3, 0xba45, 0xba46, 0xba47, /*0xc8-0xcf*/ + 0xba48, 0xf3f1, 0xba49, 0xc2a8, 0xba4a, 0xba4b, 0xba4c, 0xba4d, /*0xd0-0xd7*/ + 0xba4e, 0xb8dd, 0xf3f5, 0xba4f, 0xba50, 0xf3f4, 0xba51, 0xba52, /*0xd8-0xdf*/ + 0xba53, 0xb4db, 0xba54, 0xba55, 0xba56, 0xf3f6, 0xf3f7, 0xba57, /*0xe0-0xe7*/ + 0xba58, 0xba59, 0xf3f8, 0xba5a, 0xba5b, 0xba5c, 0xc0ba, 0xba5d, /*0xe8-0xef*/ + 0xba5e, 0xc0e9, 0xba5f, 0xba60, 0xba61, 0xba62, 0xba63, 0xc5f1, /*0xf0-0xf7*/ + 0xba64, 0xba65, 0xba66, 0xba67, 0xf3fb, 0xba68, 0xf3fa, 0xba69, /*0xf8-0xff*/ + /* 0x7c00 */ + 0xba6a, 0xba6b, 0xba6c, 0xba6d, 0xba6e, 0xba6f, 0xba70, 0xb4d8, /*0x00-0x07*/ + 0xba71, 0xba72, 0xba73, 0xf3fe, 0xf3f9, 0xba74, 0xba75, 0xf3fc, /*0x08-0x0f*/ + 0xba76, 0xba77, 0xba78, 0xba79, 0xba7a, 0xba7b, 0xf3fd, 0xba7c, /*0x10-0x17*/ + 0xba7d, 0xba7e, 0xba80, 0xba81, 0xba82, 0xba83, 0xba84, 0xf4a1, /*0x18-0x1f*/ + 0xba85, 0xba86, 0xba87, 0xba88, 0xba89, 0xba8a, 0xf4a3, 0xbbc9, /*0x20-0x27*/ + 0xba8b, 0xba8c, 0xf4a2, 0xba8d, 0xba8e, 0xba8f, 0xba90, 0xba91, /*0x28-0x2f*/ + 0xba92, 0xba93, 0xba94, 0xba95, 0xba96, 0xba97, 0xba98, 0xba99, /*0x30-0x37*/ + 0xf4a4, 0xba9a, 0xba9b, 0xba9c, 0xba9d, 0xba9e, 0xba9f, 0xb2be, /*0x38-0x3f*/ + 0xf4a6, 0xf4a5, 0xbaa0, 0xbb40, 0xbb41, 0xbb42, 0xbb43, 0xbb44, /*0x40-0x47*/ + 0xbb45, 0xbb46, 0xbb47, 0xbb48, 0xbb49, 0xbcae, 0xbb4a, 0xbb4b, /*0x48-0x4f*/ + 0xbb4c, 0xbb4d, 0xbb4e, 0xbb4f, 0xbb50, 0xbb51, 0xbb52, 0xbb53, /*0x50-0x57*/ + 0xbb54, 0xbb55, 0xbb56, 0xbb57, 0xbb58, 0xbb59, 0xbb5a, 0xbb5b, /*0x58-0x5f*/ + 0xbb5c, 0xbb5d, 0xbb5e, 0xbb5f, 0xbb60, 0xbb61, 0xbb62, 0xbb63, /*0x60-0x67*/ + 0xbb64, 0xbb65, 0xbb66, 0xbb67, 0xbb68, 0xbb69, 0xbb6a, 0xbb6b, /*0x68-0x6f*/ + 0xbb6c, 0xbb6d, 0xbb6e, 0xc3d7, 0xd9e1, 0xbb6f, 0xbb70, 0xbb71, /*0x70-0x77*/ + 0xbb72, 0xbb73, 0xbb74, 0xc0e0, 0xf4cc, 0xd7d1, 0xbb75, 0xbb76, /*0x78-0x7f*/ + 0xbb77, 0xbb78, 0xbb79, 0xbb7a, 0xbb7b, 0xbb7c, 0xbb7d, 0xbb7e, /*0x80-0x87*/ + 0xbb80, 0xb7db, 0xbb81, 0xbb82, 0xbb83, 0xbb84, 0xbb85, 0xbb86, /*0x88-0x8f*/ + 0xbb87, 0xf4ce, 0xc1a3, 0xbb88, 0xbb89, 0xc6c9, 0xbb8a, 0xb4d6, /*0x90-0x97*/ + 0xd5b3, 0xbb8b, 0xbb8c, 0xbb8d, 0xf4d0, 0xf4cf, 0xf4d1, 0xcbda, /*0x98-0x9f*/ + 0xbb8e, 0xbb8f, 0xf4d2, 0xbb90, 0xd4c1, 0xd6e0, 0xbb91, 0xbb92, /*0xa0-0xa7*/ + 0xbb93, 0xbb94, 0xb7e0, 0xbb95, 0xbb96, 0xbb97, 0xc1b8, 0xbb98, /*0xa8-0xaf*/ + 0xbb99, 0xc1bb, 0xf4d3, 0xbeac, 0xbb9a, 0xbb9b, 0xbb9c, 0xbb9d, /*0xb0-0xb7*/ + 0xbb9e, 0xb4e2, 0xbb9f, 0xbba0, 0xf4d4, 0xf4d5, 0xbeab, 0xbc40, /*0xb8-0xbf*/ + 0xbc41, 0xf4d6, 0xbc42, 0xbc43, 0xbc44, 0xf4db, 0xbc45, 0xf4d7, /*0xc0-0xc7*/ + 0xf4da, 0xbc46, 0xbafd, 0xbc47, 0xf4d8, 0xf4d9, 0xbc48, 0xbc49, /*0xc8-0xcf*/ + 0xbc4a, 0xbc4b, 0xbc4c, 0xbc4d, 0xbc4e, 0xb8e2, 0xccc7, 0xf4dc, /*0xd0-0xd7*/ + 0xbc4f, 0xb2da, 0xbc50, 0xbc51, 0xc3d3, 0xbc52, 0xbc53, 0xd4e3, /*0xd8-0xdf*/ + 0xbfb7, 0xbc54, 0xbc55, 0xbc56, 0xbc57, 0xbc58, 0xbc59, 0xbc5a, /*0xe0-0xe7*/ + 0xf4dd, 0xbc5b, 0xbc5c, 0xbc5d, 0xbc5e, 0xbc5f, 0xbc60, 0xc5b4, /*0xe8-0xef*/ + 0xbc61, 0xbc62, 0xbc63, 0xbc64, 0xbc65, 0xbc66, 0xbc67, 0xbc68, /*0xf0-0xf7*/ + 0xf4e9, 0xbc69, 0xbc6a, 0xcfb5, 0xbc6b, 0xbc6c, 0xbc6d, 0xbc6e, /*0xf8-0xff*/ + /* 0x7d00 */ + 0xbc6f, 0xbc70, 0xbc71, 0xbc72, 0xbc73, 0xbc74, 0xbc75, 0xbc76, /*0x00-0x07*/ + 0xbc77, 0xbc78, 0xcec9, 0xbc79, 0xbc7a, 0xbc7b, 0xbc7c, 0xbc7d, /*0x08-0x0f*/ + 0xbc7e, 0xbc80, 0xbc81, 0xbc82, 0xbc83, 0xbc84, 0xbc85, 0xbc86, /*0x10-0x17*/ + 0xbc87, 0xbc88, 0xbc89, 0xbc8a, 0xbc8b, 0xbc8c, 0xbc8d, 0xbc8e, /*0x18-0x1f*/ + 0xcbd8, 0xbc8f, 0xcbf7, 0xbc90, 0xbc91, 0xbc92, 0xbc93, 0xbdf4, /*0x20-0x27*/ + 0xbc94, 0xbc95, 0xbc96, 0xd7cf, 0xbc97, 0xbc98, 0xbc99, 0xc0db, /*0x28-0x2f*/ + 0xbc9a, 0xbc9b, 0xbc9c, 0xbc9d, 0xbc9e, 0xbc9f, 0xbca0, 0xbd40, /*0x30-0x37*/ + 0xbd41, 0xbd42, 0xbd43, 0xbd44, 0xbd45, 0xbd46, 0xbd47, 0xbd48, /*0x38-0x3f*/ + 0xbd49, 0xbd4a, 0xbd4b, 0xbd4c, 0xbd4d, 0xbd4e, 0xbd4f, 0xbd50, /*0x40-0x47*/ + 0xbd51, 0xbd52, 0xbd53, 0xbd54, 0xbd55, 0xbd56, 0xbd57, 0xbd58, /*0x48-0x4f*/ + 0xbd59, 0xbd5a, 0xbd5b, 0xbd5c, 0xbd5d, 0xbd5e, 0xbd5f, 0xbd60, /*0x50-0x57*/ + 0xbd61, 0xbd62, 0xbd63, 0xbd64, 0xbd65, 0xbd66, 0xbd67, 0xbd68, /*0x58-0x5f*/ + 0xbd69, 0xbd6a, 0xbd6b, 0xbd6c, 0xbd6d, 0xbd6e, 0xbd6f, 0xbd70, /*0x60-0x67*/ + 0xbd71, 0xbd72, 0xbd73, 0xbd74, 0xbd75, 0xbd76, 0xd0f5, 0xbd77, /*0x68-0x6f*/ + 0xbd78, 0xbd79, 0xbd7a, 0xbd7b, 0xbd7c, 0xbd7d, 0xbd7e, 0xf4ea, /*0x70-0x77*/ + 0xbd80, 0xbd81, 0xbd82, 0xbd83, 0xbd84, 0xbd85, 0xbd86, 0xbd87, /*0x78-0x7f*/ + 0xbd88, 0xbd89, 0xbd8a, 0xbd8b, 0xbd8c, 0xbd8d, 0xbd8e, 0xbd8f, /*0x80-0x87*/ + 0xbd90, 0xbd91, 0xbd92, 0xbd93, 0xbd94, 0xbd95, 0xbd96, 0xbd97, /*0x88-0x8f*/ + 0xbd98, 0xbd99, 0xbd9a, 0xbd9b, 0xbd9c, 0xbd9d, 0xbd9e, 0xbd9f, /*0x90-0x97*/ + 0xbda0, 0xbe40, 0xbe41, 0xbe42, 0xbe43, 0xbe44, 0xbe45, 0xbe46, /*0x98-0x9f*/ + 0xbe47, 0xbe48, 0xbe49, 0xbe4a, 0xbe4b, 0xbe4c, 0xf4eb, 0xbe4d, /*0xa0-0xa7*/ + 0xbe4e, 0xbe4f, 0xbe50, 0xbe51, 0xbe52, 0xbe53, 0xf4ec, 0xbe54, /*0xa8-0xaf*/ + 0xbe55, 0xbe56, 0xbe57, 0xbe58, 0xbe59, 0xbe5a, 0xbe5b, 0xbe5c, /*0xb0-0xb7*/ + 0xbe5d, 0xbe5e, 0xbe5f, 0xbe60, 0xbe61, 0xbe62, 0xbe63, 0xbe64, /*0xb8-0xbf*/ + 0xbe65, 0xbe66, 0xbe67, 0xbe68, 0xbe69, 0xbe6a, 0xbe6b, 0xbe6c, /*0xc0-0xc7*/ + 0xbe6d, 0xbe6e, 0xbe6f, 0xbe70, 0xbe71, 0xbe72, 0xbe73, 0xbe74, /*0xc8-0xcf*/ + 0xbe75, 0xbe76, 0xbe77, 0xbe78, 0xbe79, 0xbe7a, 0xbe7b, 0xbe7c, /*0xd0-0xd7*/ + 0xbe7d, 0xbe7e, 0xbe80, 0xbe81, 0xbe82, 0xbe83, 0xbe84, 0xbe85, /*0xd8-0xdf*/ + 0xbe86, 0xbe87, 0xbe88, 0xbe89, 0xbe8a, 0xbe8b, 0xbe8c, 0xbe8d, /*0xe0-0xe7*/ + 0xbe8e, 0xbe8f, 0xbe90, 0xbe91, 0xbe92, 0xbe93, 0xbe94, 0xbe95, /*0xe8-0xef*/ + 0xbe96, 0xbe97, 0xbe98, 0xbe99, 0xbe9a, 0xbe9b, 0xbe9c, 0xbe9d, /*0xf0-0xf7*/ + 0xbe9e, 0xbe9f, 0xbea0, 0xbf40, 0xbf41, 0xbf42, 0xbf43, 0xbf44, /*0xf8-0xff*/ + /* 0x7e00 */ + 0xbf45, 0xbf46, 0xbf47, 0xbf48, 0xbf49, 0xbf4a, 0xbf4b, 0xbf4c, /*0x00-0x07*/ + 0xbf4d, 0xbf4e, 0xbf4f, 0xbf50, 0xbf51, 0xbf52, 0xbf53, 0xbf54, /*0x08-0x0f*/ + 0xbf55, 0xbf56, 0xbf57, 0xbf58, 0xbf59, 0xbf5a, 0xbf5b, 0xbf5c, /*0x10-0x17*/ + 0xbf5d, 0xbf5e, 0xbf5f, 0xbf60, 0xbf61, 0xbf62, 0xbf63, 0xbf64, /*0x18-0x1f*/ + 0xbf65, 0xbf66, 0xbf67, 0xbf68, 0xbf69, 0xbf6a, 0xbf6b, 0xbf6c, /*0x20-0x27*/ + 0xbf6d, 0xbf6e, 0xbf6f, 0xbf70, 0xbf71, 0xbf72, 0xbf73, 0xbf74, /*0x28-0x2f*/ + 0xbf75, 0xbf76, 0xbf77, 0xbf78, 0xbf79, 0xbf7a, 0xbf7b, 0xbf7c, /*0x30-0x37*/ + 0xbf7d, 0xbf7e, 0xbf80, 0xf7e3, 0xbf81, 0xbf82, 0xbf83, 0xbf84, /*0x38-0x3f*/ + 0xbf85, 0xb7b1, 0xbf86, 0xbf87, 0xbf88, 0xbf89, 0xbf8a, 0xf4ed, /*0x40-0x47*/ + 0xbf8b, 0xbf8c, 0xbf8d, 0xbf8e, 0xbf8f, 0xbf90, 0xbf91, 0xbf92, /*0x48-0x4f*/ + 0xbf93, 0xbf94, 0xbf95, 0xbf96, 0xbf97, 0xbf98, 0xbf99, 0xbf9a, /*0x50-0x57*/ + 0xbf9b, 0xbf9c, 0xbf9d, 0xbf9e, 0xbf9f, 0xbfa0, 0xc040, 0xc041, /*0x58-0x5f*/ + 0xc042, 0xc043, 0xc044, 0xc045, 0xc046, 0xc047, 0xc048, 0xc049, /*0x60-0x67*/ + 0xc04a, 0xc04b, 0xc04c, 0xc04d, 0xc04e, 0xc04f, 0xc050, 0xc051, /*0x68-0x6f*/ + 0xc052, 0xc053, 0xc054, 0xc055, 0xc056, 0xc057, 0xc058, 0xc059, /*0x70-0x77*/ + 0xc05a, 0xc05b, 0xc05c, 0xc05d, 0xc05e, 0xc05f, 0xc060, 0xc061, /*0x78-0x7f*/ + 0xc062, 0xc063, 0xd7eb, 0xc064, 0xc065, 0xc066, 0xc067, 0xc068, /*0x80-0x87*/ + 0xc069, 0xc06a, 0xc06b, 0xc06c, 0xc06d, 0xc06e, 0xc06f, 0xc070, /*0x88-0x8f*/ + 0xc071, 0xc072, 0xc073, 0xc074, 0xc075, 0xc076, 0xc077, 0xc078, /*0x90-0x97*/ + 0xc079, 0xc07a, 0xc07b, 0xf4ee, 0xc07c, 0xc07d, 0xc07e, 0xe6f9, /*0x98-0x9f*/ + 0xbec0, 0xe6fa, 0xbaec, 0xe6fb, 0xcfcb, 0xe6fc, 0xd4bc, 0xbcb6, /*0xa0-0xa7*/ + 0xe6fd, 0xe6fe, 0xbccd, 0xc8d2, 0xceb3, 0xe7a1, 0xc080, 0xb4bf, /*0xa8-0xaf*/ + 0xe7a2, 0xc9b4, 0xb8d9, 0xc4c9, 0xc081, 0xd7dd, 0xc2da, 0xb7d7, /*0xb0-0xb7*/ + 0xd6bd, 0xcec6, 0xb7c4, 0xc082, 0xc083, 0xc5a6, 0xe7a3, 0xcfdf, /*0xb8-0xbf*/ + 0xe7a4, 0xe7a5, 0xe7a6, 0xc1b7, 0xd7e9, 0xc9f0, 0xcfb8, 0xd6af, /*0xc0-0xc7*/ + 0xd6d5, 0xe7a7, 0xb0ed, 0xe7a8, 0xe7a9, 0xc9dc, 0xd2ef, 0xbead, /*0xc8-0xcf*/ + 0xe7aa, 0xb0f3, 0xc8de, 0xbde1, 0xe7ab, 0xc8c6, 0xc084, 0xe7ac, /*0xd0-0xd7*/ + 0xbbe6, 0xb8f8, 0xd1a4, 0xe7ad, 0xc2e7, 0xbef8, 0xbdca, 0xcdb3, /*0xd8-0xdf*/ + 0xe7ae, 0xe7af, 0xbeee, 0xd0e5, 0xc085, 0xcbe7, 0xccd0, 0xbccc, /*0xe0-0xe7*/ + 0xe7b0, 0xbca8, 0xd0f7, 0xe7b1, 0xc086, 0xd0f8, 0xe7b2, 0xe7b3, /*0xe8-0xef*/ + 0xb4c2, 0xe7b4, 0xe7b5, 0xc9fe, 0xceac, 0xc3e0, 0xe7b7, 0xb1c1, /*0xf0-0xf7*/ + 0xb3f1, 0xc087, 0xe7b8, 0xe7b9, 0xd7db, 0xd5c0, 0xe7ba, 0xc2cc, /*0xf8-0xff*/ + /* 0x7f00 */ + 0xd7ba, 0xe7bb, 0xe7bc, 0xe7bd, 0xbcea, 0xc3e5, 0xc0c2, 0xe7be, /*0x00-0x07*/ + 0xe7bf, 0xbca9, 0xc088, 0xe7c0, 0xe7c1, 0xe7b6, 0xb6d0, 0xe7c2, /*0x08-0x0f*/ + 0xc089, 0xe7c3, 0xe7c4, 0xbbba, 0xb5de, 0xc2c6, 0xb1e0, 0xe7c5, /*0x10-0x17*/ + 0xd4b5, 0xe7c6, 0xb8bf, 0xe7c8, 0xe7c7, 0xb7ec, 0xc08a, 0xe7c9, /*0x18-0x1f*/ + 0xb2f8, 0xe7ca, 0xe7cb, 0xe7cc, 0xe7cd, 0xe7ce, 0xe7cf, 0xe7d0, /*0x20-0x27*/ + 0xd3a7, 0xcbf5, 0xe7d1, 0xe7d2, 0xe7d3, 0xe7d4, 0xc9c9, 0xe7d5, /*0x28-0x2f*/ + 0xe7d6, 0xe7d7, 0xe7d8, 0xe7d9, 0xbdc9, 0xe7da, 0xf3be, 0xc08b, /*0x30-0x37*/ + 0xb8d7, 0xc08c, 0xc8b1, 0xc08d, 0xc08e, 0xc08f, 0xc090, 0xc091, /*0x38-0x3f*/ + 0xc092, 0xc093, 0xf3bf, 0xc094, 0xf3c0, 0xf3c1, 0xc095, 0xc096, /*0x40-0x47*/ + 0xc097, 0xc098, 0xc099, 0xc09a, 0xc09b, 0xc09c, 0xc09d, 0xc09e, /*0x48-0x4f*/ + 0xb9de, 0xcdf8, 0xc09f, 0xc0a0, 0xd8e8, 0xbab1, 0xc140, 0xc2de, /*0x50-0x57*/ + 0xeeb7, 0xc141, 0xb7a3, 0xc142, 0xc143, 0xc144, 0xc145, 0xeeb9, /*0x58-0x5f*/ + 0xc146, 0xeeb8, 0xb0d5, 0xc147, 0xc148, 0xc149, 0xc14a, 0xc14b, /*0x60-0x67*/ + 0xeebb, 0xd5d6, 0xd7ef, 0xc14c, 0xc14d, 0xc14e, 0xd6c3, 0xc14f, /*0x68-0x6f*/ + 0xc150, 0xeebd, 0xcaf0, 0xc151, 0xeebc, 0xc152, 0xc153, 0xc154, /*0x70-0x77*/ + 0xc155, 0xeebe, 0xc156, 0xc157, 0xc158, 0xc159, 0xeec0, 0xc15a, /*0x78-0x7f*/ + 0xc15b, 0xeebf, 0xc15c, 0xc15d, 0xc15e, 0xc15f, 0xc160, 0xc161, /*0x80-0x87*/ + 0xc162, 0xc163, 0xd1f2, 0xc164, 0xc7bc, 0xc165, 0xc3c0, 0xc166, /*0x88-0x8f*/ + 0xc167, 0xc168, 0xc169, 0xc16a, 0xb8e1, 0xc16b, 0xc16c, 0xc16d, /*0x90-0x97*/ + 0xc16e, 0xc16f, 0xc1e7, 0xc170, 0xc171, 0xf4c6, 0xd0df, 0xf4c7, /*0x98-0x9f*/ + 0xc172, 0xcfdb, 0xc173, 0xc174, 0xc8ba, 0xc175, 0xc176, 0xf4c8, /*0xa0-0xa7*/ + 0xc177, 0xc178, 0xc179, 0xc17a, 0xc17b, 0xc17c, 0xc17d, 0xf4c9, /*0xa8-0xaf*/ + 0xf4ca, 0xc17e, 0xf4cb, 0xc180, 0xc181, 0xc182, 0xc183, 0xc184, /*0xb0-0xb7*/ + 0xd9fa, 0xb8fe, 0xc185, 0xc186, 0xe5f1, 0xd3f0, 0xc187, 0xf4e0, /*0xb8-0xbf*/ + 0xc188, 0xcecc, 0xc189, 0xc18a, 0xc18b, 0xb3e1, 0xc18c, 0xc18d, /*0xc0-0xc7*/ + 0xc18e, 0xc18f, 0xf1b4, 0xc190, 0xd2ee, 0xc191, 0xf4e1, 0xc192, /*0xc8-0xcf*/ + 0xc193, 0xc194, 0xc195, 0xc196, 0xcfe8, 0xf4e2, 0xc197, 0xc198, /*0xd0-0xd7*/ + 0xc7cc, 0xc199, 0xc19a, 0xc19b, 0xc19c, 0xc19d, 0xc19e, 0xb5d4, /*0xd8-0xdf*/ + 0xb4e4, 0xf4e4, 0xc19f, 0xc1a0, 0xc240, 0xf4e3, 0xf4e5, 0xc241, /*0xe0-0xe7*/ + 0xc242, 0xf4e6, 0xc243, 0xc244, 0xc245, 0xc246, 0xf4e7, 0xc247, /*0xe8-0xef*/ + 0xbab2, 0xb0bf, 0xc248, 0xf4e8, 0xc249, 0xc24a, 0xc24b, 0xc24c, /*0xf0-0xf7*/ + 0xc24d, 0xc24e, 0xc24f, 0xb7ad, 0xd2ed, 0xc250, 0xc251, 0xc252, /*0xf8-0xff*/ + /* 0x8000 */ + 0xd2ab, 0xc0cf, 0xc253, 0xbfbc, 0xeba3, 0xd5df, 0xeac8, 0xc254, /*0x00-0x07*/ + 0xc255, 0xc256, 0xc257, 0xf1f3, 0xb6f8, 0xcba3, 0xc258, 0xc259, /*0x08-0x0f*/ + 0xc4cd, 0xc25a, 0xf1e7, 0xc25b, 0xf1e8, 0xb8fb, 0xf1e9, 0xbac4, /*0x10-0x17*/ + 0xd4c5, 0xb0d2, 0xc25c, 0xc25d, 0xf1ea, 0xc25e, 0xc25f, 0xc260, /*0x18-0x1f*/ + 0xf1eb, 0xc261, 0xf1ec, 0xc262, 0xc263, 0xf1ed, 0xf1ee, 0xf1ef, /*0x20-0x27*/ + 0xf1f1, 0xf1f0, 0xc5d5, 0xc264, 0xc265, 0xc266, 0xc267, 0xc268, /*0x28-0x2f*/ + 0xc269, 0xf1f2, 0xc26a, 0xb6fa, 0xc26b, 0xf1f4, 0xd2ae, 0xdec7, /*0x30-0x37*/ + 0xcbca, 0xc26c, 0xc26d, 0xb3dc, 0xc26e, 0xb5a2, 0xc26f, 0xb9a2, /*0x38-0x3f*/ + 0xc270, 0xc271, 0xc4f4, 0xf1f5, 0xc272, 0xc273, 0xf1f6, 0xc274, /*0x40-0x47*/ + 0xc275, 0xc276, 0xc1c4, 0xc1fb, 0xd6b0, 0xf1f7, 0xc277, 0xc278, /*0x48-0x4f*/ + 0xc279, 0xc27a, 0xf1f8, 0xc27b, 0xc1aa, 0xc27c, 0xc27d, 0xc27e, /*0x50-0x57*/ + 0xc6b8, 0xc280, 0xbedb, 0xc281, 0xc282, 0xc283, 0xc284, 0xc285, /*0x58-0x5f*/ + 0xc286, 0xc287, 0xc288, 0xc289, 0xc28a, 0xc28b, 0xc28c, 0xc28d, /*0x60-0x67*/ + 0xc28e, 0xf1f9, 0xb4cf, 0xc28f, 0xc290, 0xc291, 0xc292, 0xc293, /*0x68-0x6f*/ + 0xc294, 0xf1fa, 0xc295, 0xc296, 0xc297, 0xc298, 0xc299, 0xc29a, /*0x70-0x77*/ + 0xc29b, 0xc29c, 0xc29d, 0xc29e, 0xc29f, 0xc2a0, 0xc340, 0xedb2, /*0x78-0x7f*/ + 0xedb1, 0xc341, 0xc342, 0xcbe0, 0xd2de, 0xc343, 0xcbc1, 0xd5d8, /*0x80-0x87*/ + 0xc344, 0xc8e2, 0xc345, 0xc0df, 0xbca1, 0xc346, 0xc347, 0xc348, /*0x88-0x8f*/ + 0xc349, 0xc34a, 0xc34b, 0xebc1, 0xc34c, 0xc34d, 0xd0a4, 0xc34e, /*0x90-0x97*/ + 0xd6e2, 0xc34f, 0xb6c7, 0xb8d8, 0xebc0, 0xb8ce, 0xc350, 0xebbf, /*0x98-0x9f*/ + 0xb3a6, 0xb9c9, 0xd6ab, 0xc351, 0xb7f4, 0xb7ca, 0xc352, 0xc353, /*0xa0-0xa7*/ + 0xc354, 0xbce7, 0xb7be, 0xebc6, 0xc355, 0xebc7, 0xb0b9, 0xbfcf, /*0xa8-0xaf*/ + 0xc356, 0xebc5, 0xd3fd, 0xc357, 0xebc8, 0xc358, 0xc359, 0xebc9, /*0xb0-0xb7*/ + 0xc35a, 0xc35b, 0xb7ce, 0xc35c, 0xebc2, 0xebc4, 0xc9f6, 0xd6d7, /*0xb8-0xbf*/ + 0xd5cd, 0xd0b2, 0xebcf, 0xceb8, 0xebd0, 0xc35d, 0xb5a8, 0xc35e, /*0xc0-0xc7*/ + 0xc35f, 0xc360, 0xc361, 0xc362, 0xb1b3, 0xebd2, 0xcca5, 0xc363, /*0xc8-0xcf*/ + 0xc364, 0xc365, 0xc366, 0xc367, 0xc368, 0xc369, 0xc5d6, 0xebd3, /*0xd0-0xd7*/ + 0xc36a, 0xebd1, 0xc5df, 0xebce, 0xcaa4, 0xebd5, 0xb0fb, 0xc36b, /*0xd8-0xdf*/ + 0xc36c, 0xbafa, 0xc36d, 0xc36e, 0xd8b7, 0xf1e3, 0xc36f, 0xebca, /*0xe0-0xe7*/ + 0xebcb, 0xebcc, 0xebcd, 0xebd6, 0xe6c0, 0xebd9, 0xc370, 0xbfe8, /*0xe8-0xef*/ + 0xd2c8, 0xebd7, 0xebdc, 0xb8ec, 0xebd8, 0xc371, 0xbdba, 0xc372, /*0xf0-0xf7*/ + 0xd0d8, 0xc373, 0xb0b7, 0xc374, 0xebdd, 0xc4dc, 0xc375, 0xc376, /*0xf8-0xff*/ + /* 0x8100 */ + 0xc377, 0xc378, 0xd6ac, 0xc379, 0xc37a, 0xc37b, 0xb4e0, 0xc37c, /*0x00-0x07*/ + 0xc37d, 0xc2f6, 0xbcb9, 0xc37e, 0xc380, 0xebda, 0xebdb, 0xd4e0, /*0x08-0x0f*/ + 0xc6ea, 0xc4d4, 0xebdf, 0xc5a7, 0xd9f5, 0xc381, 0xb2b1, 0xc382, /*0x10-0x17*/ + 0xebe4, 0xc383, 0xbdc5, 0xc384, 0xc385, 0xc386, 0xebe2, 0xc387, /*0x18-0x1f*/ + 0xc388, 0xc389, 0xc38a, 0xc38b, 0xc38c, 0xc38d, 0xc38e, 0xc38f, /*0x20-0x27*/ + 0xc390, 0xc391, 0xc392, 0xc393, 0xebe3, 0xc394, 0xc395, 0xb8ac, /*0x28-0x2f*/ + 0xc396, 0xcdd1, 0xebe5, 0xc397, 0xc398, 0xc399, 0xebe1, 0xc39a, /*0x30-0x37*/ + 0xc1b3, 0xc39b, 0xc39c, 0xc39d, 0xc39e, 0xc39f, 0xc6a2, 0xc3a0, /*0x38-0x3f*/ + 0xc440, 0xc441, 0xc442, 0xc443, 0xc444, 0xc445, 0xccf3, 0xc446, /*0x40-0x47*/ + 0xebe6, 0xc447, 0xc0b0, 0xd2b8, 0xebe7, 0xc448, 0xc449, 0xc44a, /*0x48-0x4f*/ + 0xb8af, 0xb8ad, 0xc44b, 0xebe8, 0xc7bb, 0xcdf3, 0xc44c, 0xc44d, /*0x50-0x57*/ + 0xc44e, 0xebea, 0xebeb, 0xc44f, 0xc450, 0xc451, 0xc452, 0xc453, /*0x58-0x5f*/ + 0xebed, 0xc454, 0xc455, 0xc456, 0xc457, 0xd0c8, 0xc458, 0xebf2, /*0x60-0x67*/ + 0xc459, 0xebee, 0xc45a, 0xc45b, 0xc45c, 0xebf1, 0xc8f9, 0xc45d, /*0x68-0x6f*/ + 0xd1fc, 0xebec, 0xc45e, 0xc45f, 0xebe9, 0xc460, 0xc461, 0xc462, /*0x70-0x77*/ + 0xc463, 0xb8b9, 0xcfd9, 0xc4e5, 0xebef, 0xebf0, 0xccda, 0xcdc8, /*0x78-0x7f*/ + 0xb0f2, 0xc464, 0xebf6, 0xc465, 0xc466, 0xc467, 0xc468, 0xc469, /*0x80-0x87*/ + 0xebf5, 0xc46a, 0xb2b2, 0xc46b, 0xc46c, 0xc46d, 0xc46e, 0xb8e0, /*0x88-0x8f*/ + 0xc46f, 0xebf7, 0xc470, 0xc471, 0xc472, 0xc473, 0xc474, 0xc475, /*0x90-0x97*/ + 0xb1ec, 0xc476, 0xc477, 0xccc5, 0xc4a4, 0xcfa5, 0xc478, 0xc479, /*0x98-0x9f*/ + 0xc47a, 0xc47b, 0xc47c, 0xebf9, 0xc47d, 0xc47e, 0xeca2, 0xc480, /*0xa0-0xa7*/ + 0xc5f2, 0xc481, 0xebfa, 0xc482, 0xc483, 0xc484, 0xc485, 0xc486, /*0xa8-0xaf*/ + 0xc487, 0xc488, 0xc489, 0xc9c5, 0xc48a, 0xc48b, 0xc48c, 0xc48d, /*0xb0-0xb7*/ + 0xc48e, 0xc48f, 0xe2df, 0xebfe, 0xc490, 0xc491, 0xc492, 0xc493, /*0xb8-0xbf*/ + 0xcdce, 0xeca1, 0xb1db, 0xd3b7, 0xc494, 0xc495, 0xd2dc, 0xc496, /*0xc0-0xc7*/ + 0xc497, 0xc498, 0xebfd, 0xc499, 0xebfb, 0xc49a, 0xc49b, 0xc49c, /*0xc8-0xcf*/ + 0xc49d, 0xc49e, 0xc49f, 0xc4a0, 0xc540, 0xc541, 0xc542, 0xc543, /*0xd0-0xd7*/ + 0xc544, 0xc545, 0xc546, 0xc547, 0xc548, 0xc549, 0xc54a, 0xc54b, /*0xd8-0xdf*/ + 0xc54c, 0xc54d, 0xc54e, 0xb3bc, 0xc54f, 0xc550, 0xc551, 0xeab0, /*0xe0-0xe7*/ + 0xc552, 0xc553, 0xd7d4, 0xc554, 0xf4ab, 0xb3f4, 0xc555, 0xc556, /*0xe8-0xef*/ + 0xc557, 0xc558, 0xc559, 0xd6c1, 0xd6c2, 0xc55a, 0xc55b, 0xc55c, /*0xf0-0xf7*/ + 0xc55d, 0xc55e, 0xc55f, 0xd5e9, 0xbeca, 0xc560, 0xf4a7, 0xc561, /*0xf8-0xff*/ + /* 0x8200 */ + 0xd2a8, 0xf4a8, 0xf4a9, 0xc562, 0xf4aa, 0xbecb, 0xd3df, 0xc563, /*0x00-0x07*/ + 0xc564, 0xc565, 0xc566, 0xc567, 0xc9e0, 0xc9e1, 0xc568, 0xc569, /*0x08-0x0f*/ + 0xf3c2, 0xc56a, 0xcae6, 0xc56b, 0xccf2, 0xc56c, 0xc56d, 0xc56e, /*0x10-0x17*/ + 0xc56f, 0xc570, 0xc571, 0xe2b6, 0xcbb4, 0xc572, 0xcee8, 0xd6db, /*0x18-0x1f*/ + 0xc573, 0xf4ad, 0xf4ae, 0xf4af, 0xc574, 0xc575, 0xc576, 0xc577, /*0x20-0x27*/ + 0xf4b2, 0xc578, 0xbabd, 0xf4b3, 0xb0e3, 0xf4b0, 0xc579, 0xf4b1, /*0x28-0x2f*/ + 0xbda2, 0xb2d5, 0xc57a, 0xf4b6, 0xf4b7, 0xb6e6, 0xb2b0, 0xcfcf, /*0x30-0x37*/ + 0xf4b4, 0xb4ac, 0xc57b, 0xf4b5, 0xc57c, 0xc57d, 0xf4b8, 0xc57e, /*0x38-0x3f*/ + 0xc580, 0xc581, 0xc582, 0xc583, 0xf4b9, 0xc584, 0xc585, 0xcda7, /*0x40-0x47*/ + 0xc586, 0xf4ba, 0xc587, 0xf4bb, 0xc588, 0xc589, 0xc58a, 0xf4bc, /*0x48-0x4f*/ + 0xc58b, 0xc58c, 0xc58d, 0xc58e, 0xc58f, 0xc590, 0xc591, 0xc592, /*0x50-0x57*/ + 0xcbd2, 0xc593, 0xf4bd, 0xc594, 0xc595, 0xc596, 0xc597, 0xf4be, /*0x58-0x5f*/ + 0xc598, 0xc599, 0xc59a, 0xc59b, 0xc59c, 0xc59d, 0xc59e, 0xc59f, /*0x60-0x67*/ + 0xf4bf, 0xc5a0, 0xc640, 0xc641, 0xc642, 0xc643, 0xf4de, 0xc1bc, /*0x68-0x6f*/ + 0xbce8, 0xc644, 0xc9ab, 0xd1de, 0xe5f5, 0xc645, 0xc646, 0xc647, /*0x70-0x77*/ + 0xc648, 0xdcb3, 0xd2d5, 0xc649, 0xc64a, 0xdcb4, 0xb0ac, 0xdcb5, /*0x78-0x7f*/ + 0xc64b, 0xc64c, 0xbdda, 0xc64d, 0xdcb9, 0xc64e, 0xc64f, 0xc650, /*0x80-0x87*/ + 0xd8c2, 0xc651, 0xdcb7, 0xd3f3, 0xc652, 0xc9d6, 0xdcba, 0xdcb6, /*0x88-0x8f*/ + 0xc653, 0xdcbb, 0xc3a2, 0xc654, 0xc655, 0xc656, 0xc657, 0xdcbc, /*0x90-0x97*/ + 0xdcc5, 0xdcbd, 0xc658, 0xc659, 0xcedf, 0xd6a5, 0xc65a, 0xdccf, /*0x98-0x9f*/ + 0xc65b, 0xdccd, 0xc65c, 0xc65d, 0xdcd2, 0xbde6, 0xc2ab, 0xc65e, /*0xa0-0xa7*/ + 0xdcb8, 0xdccb, 0xdcce, 0xdcbe, 0xb7d2, 0xb0c5, 0xdcc7, 0xd0be, /*0xa8-0xaf*/ + 0xdcc1, 0xbba8, 0xc65f, 0xb7bc, 0xdccc, 0xc660, 0xc661, 0xdcc6, /*0xb0-0xb7*/ + 0xdcbf, 0xc7db, 0xc662, 0xc663, 0xc664, 0xd1bf, 0xdcc0, 0xc665, /*0xb8-0xbf*/ + 0xc666, 0xdcca, 0xc667, 0xc668, 0xdcd0, 0xc669, 0xc66a, 0xcead, /*0xc0-0xc7*/ + 0xdcc2, 0xc66b, 0xdcc3, 0xdcc8, 0xdcc9, 0xb2d4, 0xdcd1, 0xcbd5, /*0xc8-0xcf*/ + 0xc66c, 0xd4b7, 0xdcdb, 0xdcdf, 0xcca6, 0xdce6, 0xc66d, 0xc3e7, /*0xd0-0xd7*/ + 0xdcdc, 0xc66e, 0xc66f, 0xbfc1, 0xdcd9, 0xc670, 0xb0fa, 0xb9b6, /*0xd8-0xdf*/ + 0xdce5, 0xdcd3, 0xc671, 0xdcc4, 0xdcd6, 0xc8f4, 0xbfe0, 0xc672, /*0xe0-0xe7*/ + 0xc673, 0xc674, 0xc675, 0xc9bb, 0xc676, 0xc677, 0xc678, 0xb1bd, /*0xe8-0xef*/ + 0xc679, 0xd3a2, 0xc67a, 0xc67b, 0xdcda, 0xc67c, 0xc67d, 0xdcd5, /*0xf0-0xf7*/ + 0xc67e, 0xc6bb, 0xc680, 0xdcde, 0xc681, 0xc682, 0xc683, 0xc684, /*0xf8-0xff*/ + /* 0x8300 */ + 0xc685, 0xd7c2, 0xc3af, 0xb7b6, 0xc7d1, 0xc3a9, 0xdce2, 0xdcd8, /*0x00-0x07*/ + 0xdceb, 0xdcd4, 0xc686, 0xc687, 0xdcdd, 0xc688, 0xbea5, 0xdcd7, /*0x08-0x0f*/ + 0xc689, 0xdce0, 0xc68a, 0xc68b, 0xdce3, 0xdce4, 0xc68c, 0xdcf8, /*0x10-0x17*/ + 0xc68d, 0xc68e, 0xdce1, 0xdda2, 0xdce7, 0xc68f, 0xc690, 0xc691, /*0x18-0x1f*/ + 0xc692, 0xc693, 0xc694, 0xc695, 0xc696, 0xc697, 0xc698, 0xbceb, /*0x20-0x27*/ + 0xb4c4, 0xc699, 0xc69a, 0xc3a3, 0xb2e7, 0xdcfa, 0xc69b, 0xdcf2, /*0x28-0x2f*/ + 0xc69c, 0xdcef, 0xc69d, 0xdcfc, 0xdcee, 0xd2f0, 0xb2e8, 0xc69e, /*0x30-0x37*/ + 0xc8d7, 0xc8e3, 0xdcfb, 0xc69f, 0xdced, 0xc6a0, 0xc740, 0xc741, /*0x38-0x3f*/ + 0xdcf7, 0xc742, 0xc743, 0xdcf5, 0xc744, 0xc745, 0xbea3, 0xdcf4, /*0x40-0x47*/ + 0xc746, 0xb2dd, 0xc747, 0xc748, 0xc749, 0xc74a, 0xc74b, 0xdcf3, /*0x48-0x4f*/ + 0xbcf6, 0xdce8, 0xbbc4, 0xc74c, 0xc0f3, 0xc74d, 0xc74e, 0xc74f, /*0x50-0x57*/ + 0xc750, 0xc751, 0xbcd4, 0xdce9, 0xdcea, 0xc752, 0xdcf1, 0xdcf6, /*0x58-0x5f*/ + 0xdcf9, 0xb5b4, 0xc753, 0xc8d9, 0xbbe7, 0xdcfe, 0xdcfd, 0xd3ab, /*0x60-0x67*/ + 0xdda1, 0xdda3, 0xdda5, 0xd2f1, 0xdda4, 0xdda6, 0xdda7, 0xd2a9, /*0x68-0x6f*/ + 0xc754, 0xc755, 0xc756, 0xc757, 0xc758, 0xc759, 0xc75a, 0xbac9, /*0x70-0x77*/ + 0xdda9, 0xc75b, 0xc75c, 0xddb6, 0xddb1, 0xddb4, 0xc75d, 0xc75e, /*0x78-0x7f*/ + 0xc75f, 0xc760, 0xc761, 0xc762, 0xc763, 0xddb0, 0xc6ce, 0xc764, /*0x80-0x87*/ + 0xc765, 0xc0f2, 0xc766, 0xc767, 0xc768, 0xc769, 0xc9af, 0xc76a, /*0x88-0x8f*/ + 0xc76b, 0xc76c, 0xdcec, 0xddae, 0xc76d, 0xc76e, 0xc76f, 0xc770, /*0x90-0x97*/ + 0xddb7, 0xc771, 0xc772, 0xdcf0, 0xddaf, 0xc773, 0xddb8, 0xc774, /*0x98-0x9f*/ + 0xddac, 0xc775, 0xc776, 0xc777, 0xc778, 0xc779, 0xc77a, 0xc77b, /*0xa0-0xa7*/ + 0xddb9, 0xddb3, 0xddad, 0xc4aa, 0xc77c, 0xc77d, 0xc77e, 0xc780, /*0xa8-0xaf*/ + 0xdda8, 0xc0b3, 0xc1ab, 0xddaa, 0xddab, 0xc781, 0xddb2, 0xbbf1, /*0xb0-0xb7*/ + 0xddb5, 0xd3a8, 0xddba, 0xc782, 0xddbb, 0xc3a7, 0xc783, 0xc784, /*0xb8-0xbf*/ + 0xddd2, 0xddbc, 0xc785, 0xc786, 0xc787, 0xddd1, 0xc788, 0xb9bd, /*0xc0-0xc7*/ + 0xc789, 0xc78a, 0xbed5, 0xc78b, 0xbefa, 0xc78c, 0xc78d, 0xbaca, /*0xc8-0xcf*/ + 0xc78e, 0xc78f, 0xc790, 0xc791, 0xddca, 0xc792, 0xddc5, 0xc793, /*0xd0-0xd7*/ + 0xddbf, 0xc794, 0xc795, 0xc796, 0xb2cb, 0xddc3, 0xc797, 0xddcb, /*0xd8-0xdf*/ + 0xb2a4, 0xddd5, 0xc798, 0xc799, 0xc79a, 0xddbe, 0xc79b, 0xc79c, /*0xe0-0xe7*/ + 0xc79d, 0xc6d0, 0xddd0, 0xc79e, 0xc79f, 0xc7a0, 0xc840, 0xc841, /*0xe8-0xef*/ + 0xddd4, 0xc1e2, 0xb7c6, 0xc842, 0xc843, 0xc844, 0xc845, 0xc846, /*0xf0-0xf7*/ + 0xddce, 0xddcf, 0xc847, 0xc848, 0xc849, 0xddc4, 0xc84a, 0xc84b, /*0xf8-0xff*/ + /* 0x8400 */ + 0xc84c, 0xddbd, 0xc84d, 0xddcd, 0xccd1, 0xc84e, 0xddc9, 0xc84f, /*0x00-0x07*/ + 0xc850, 0xc851, 0xc852, 0xddc2, 0xc3c8, 0xc6bc, 0xceae, 0xddcc, /*0x08-0x0f*/ + 0xc853, 0xddc8, 0xc854, 0xc855, 0xc856, 0xc857, 0xc858, 0xc859, /*0x10-0x17*/ + 0xddc1, 0xc85a, 0xc85b, 0xc85c, 0xddc6, 0xc2dc, 0xc85d, 0xc85e, /*0x18-0x1f*/ + 0xc85f, 0xc860, 0xc861, 0xc862, 0xd3a9, 0xd3aa, 0xddd3, 0xcff4, /*0x20-0x27*/ + 0xc8f8, 0xc863, 0xc864, 0xc865, 0xc866, 0xc867, 0xc868, 0xc869, /*0x28-0x2f*/ + 0xc86a, 0xdde6, 0xc86b, 0xc86c, 0xc86d, 0xc86e, 0xc86f, 0xc870, /*0x30-0x37*/ + 0xddc7, 0xc871, 0xc872, 0xc873, 0xdde0, 0xc2e4, 0xc874, 0xc875, /*0x38-0x3f*/ + 0xc876, 0xc877, 0xc878, 0xc879, 0xc87a, 0xc87b, 0xdde1, 0xc87c, /*0x40-0x47*/ + 0xc87d, 0xc87e, 0xc880, 0xc881, 0xc882, 0xc883, 0xc884, 0xc885, /*0x48-0x4f*/ + 0xc886, 0xddd7, 0xc887, 0xc888, 0xc889, 0xc88a, 0xc88b, 0xd6f8, /*0x50-0x57*/ + 0xc88c, 0xddd9, 0xddd8, 0xb8f0, 0xddd6, 0xc88d, 0xc88e, 0xc88f, /*0x58-0x5f*/ + 0xc890, 0xc6cf, 0xc891, 0xb6ad, 0xc892, 0xc893, 0xc894, 0xc895, /*0x60-0x67*/ + 0xc896, 0xdde2, 0xc897, 0xbaf9, 0xd4e1, 0xdde7, 0xc898, 0xc899, /*0x68-0x6f*/ + 0xc89a, 0xb4d0, 0xc89b, 0xddda, 0xc89c, 0xbffb, 0xdde3, 0xc89d, /*0x70-0x77*/ + 0xdddf, 0xc89e, 0xdddd, 0xc89f, 0xc8a0, 0xc940, 0xc941, 0xc942, /*0x78-0x7f*/ + 0xc943, 0xc944, 0xb5d9, 0xc945, 0xc946, 0xc947, 0xc948, 0xdddb, /*0x80-0x87*/ + 0xdddc, 0xddde, 0xc949, 0xbdaf, 0xdde4, 0xc94a, 0xdde5, 0xc94b, /*0x88-0x8f*/ + 0xc94c, 0xc94d, 0xc94e, 0xc94f, 0xc950, 0xc951, 0xc952, 0xddf5, /*0x90-0x97*/ + 0xc953, 0xc3c9, 0xc954, 0xc955, 0xcbe2, 0xc956, 0xc957, 0xc958, /*0x98-0x9f*/ + 0xc959, 0xddf2, 0xc95a, 0xc95b, 0xc95c, 0xc95d, 0xc95e, 0xc95f, /*0xa0-0xa7*/ + 0xc960, 0xc961, 0xc962, 0xc963, 0xc964, 0xc965, 0xc966, 0xd8e1, /*0xa8-0xaf*/ + 0xc967, 0xc968, 0xc6d1, 0xc969, 0xddf4, 0xc96a, 0xc96b, 0xc96c, /*0xb0-0xb7*/ + 0xd5f4, 0xddf3, 0xddf0, 0xc96d, 0xc96e, 0xddec, 0xc96f, 0xddef, /*0xb8-0xbf*/ + 0xc970, 0xdde8, 0xc971, 0xc972, 0xd0ee, 0xc973, 0xc974, 0xc975, /*0xc0-0xc7*/ + 0xc976, 0xc8d8, 0xddee, 0xc977, 0xc978, 0xdde9, 0xc979, 0xc97a, /*0xc8-0xcf*/ + 0xddea, 0xcbf2, 0xc97b, 0xdded, 0xc97c, 0xc97d, 0xb1cd, 0xc97e, /*0xd0-0xd7*/ + 0xc980, 0xc981, 0xc982, 0xc983, 0xc984, 0xc0b6, 0xc985, 0xbcbb, /*0xd8-0xdf*/ + 0xddf1, 0xc986, 0xc987, 0xddf7, 0xc988, 0xddf6, 0xddeb, 0xc989, /*0xe0-0xe7*/ + 0xc98a, 0xc98b, 0xc98c, 0xc98d, 0xc5ee, 0xc98e, 0xc98f, 0xc990, /*0xe8-0xef*/ + 0xddfb, 0xc991, 0xc992, 0xc993, 0xc994, 0xc995, 0xc996, 0xc997, /*0xf0-0xf7*/ + 0xc998, 0xc999, 0xc99a, 0xc99b, 0xdea4, 0xc99c, 0xc99d, 0xdea3, /*0xf8-0xff*/ + /* 0x8500 */ + 0xc99e, 0xc99f, 0xc9a0, 0xca40, 0xca41, 0xca42, 0xca43, 0xca44, /*0x00-0x07*/ + 0xca45, 0xca46, 0xca47, 0xca48, 0xddf8, 0xca49, 0xca4a, 0xca4b, /*0x08-0x0f*/ + 0xca4c, 0xc3ef, 0xca4d, 0xc2fb, 0xca4e, 0xca4f, 0xca50, 0xd5e1, /*0x10-0x17*/ + 0xca51, 0xca52, 0xceb5, 0xca53, 0xca54, 0xca55, 0xca56, 0xddfd, /*0x18-0x1f*/ + 0xca57, 0xb2cc, 0xca58, 0xca59, 0xca5a, 0xca5b, 0xca5c, 0xca5d, /*0x20-0x27*/ + 0xca5e, 0xca5f, 0xca60, 0xc4e8, 0xcadf, 0xca61, 0xca62, 0xca63, /*0x28-0x2f*/ + 0xca64, 0xca65, 0xca66, 0xca67, 0xca68, 0xca69, 0xca6a, 0xc7be, /*0x30-0x37*/ + 0xddfa, 0xddfc, 0xddfe, 0xdea2, 0xb0aa, 0xb1ce, 0xca6b, 0xca6c, /*0x38-0x3f*/ + 0xca6d, 0xca6e, 0xca6f, 0xdeac, 0xca70, 0xca71, 0xca72, 0xca73, /*0x40-0x47*/ + 0xdea6, 0xbdb6, 0xc8ef, 0xca74, 0xca75, 0xca76, 0xca77, 0xca78, /*0x48-0x4f*/ + 0xca79, 0xca7a, 0xca7b, 0xca7c, 0xca7d, 0xca7e, 0xdea1, 0xca80, /*0x50-0x57*/ + 0xca81, 0xdea5, 0xca82, 0xca83, 0xca84, 0xca85, 0xdea9, 0xca86, /*0x58-0x5f*/ + 0xca87, 0xca88, 0xca89, 0xca8a, 0xdea8, 0xca8b, 0xca8c, 0xca8d, /*0x60-0x67*/ + 0xdea7, 0xca8e, 0xca8f, 0xca90, 0xca91, 0xca92, 0xca93, 0xca94, /*0x68-0x6f*/ + 0xca95, 0xca96, 0xdead, 0xca97, 0xd4cc, 0xca98, 0xca99, 0xca9a, /*0x70-0x77*/ + 0xca9b, 0xdeb3, 0xdeaa, 0xdeae, 0xca9c, 0xca9d, 0xc0d9, 0xca9e, /*0x78-0x7f*/ + 0xca9f, 0xcaa0, 0xcb40, 0xcb41, 0xb1a1, 0xdeb6, 0xcb42, 0xdeb1, /*0x80-0x87*/ + 0xcb43, 0xcb44, 0xcb45, 0xcb46, 0xcb47, 0xcb48, 0xcb49, 0xdeb2, /*0x88-0x8f*/ + 0xcb4a, 0xcb4b, 0xcb4c, 0xcb4d, 0xcb4e, 0xcb4f, 0xcb50, 0xcb51, /*0x90-0x97*/ + 0xcb52, 0xcb53, 0xcb54, 0xd1a6, 0xdeb5, 0xcb55, 0xcb56, 0xcb57, /*0x98-0x9f*/ + 0xcb58, 0xcb59, 0xcb5a, 0xcb5b, 0xdeaf, 0xcb5c, 0xcb5d, 0xcb5e, /*0xa0-0xa7*/ + 0xdeb0, 0xcb5f, 0xd0bd, 0xcb60, 0xcb61, 0xcb62, 0xdeb4, 0xcaed, /*0xa8-0xaf*/ + 0xdeb9, 0xcb63, 0xcb64, 0xcb65, 0xcb66, 0xcb67, 0xcb68, 0xdeb8, /*0xb0-0xb7*/ + 0xcb69, 0xdeb7, 0xcb6a, 0xcb6b, 0xcb6c, 0xcb6d, 0xcb6e, 0xcb6f, /*0xb8-0xbf*/ + 0xcb70, 0xdebb, 0xcb71, 0xcb72, 0xcb73, 0xcb74, 0xcb75, 0xcb76, /*0xc0-0xc7*/ + 0xcb77, 0xbde5, 0xcb78, 0xcb79, 0xcb7a, 0xcb7b, 0xcb7c, 0xb2d8, /*0xc8-0xcf*/ + 0xc3ea, 0xcb7d, 0xcb7e, 0xdeba, 0xcb80, 0xc5ba, 0xcb81, 0xcb82, /*0xd0-0xd7*/ + 0xcb83, 0xcb84, 0xcb85, 0xcb86, 0xdebc, 0xcb87, 0xcb88, 0xcb89, /*0xd8-0xdf*/ + 0xcb8a, 0xcb8b, 0xcb8c, 0xcb8d, 0xccd9, 0xcb8e, 0xcb8f, 0xcb90, /*0xe0-0xe7*/ + 0xcb91, 0xb7aa, 0xcb92, 0xcb93, 0xcb94, 0xcb95, 0xcb96, 0xcb97, /*0xe8-0xef*/ + 0xcb98, 0xcb99, 0xcb9a, 0xcb9b, 0xcb9c, 0xcb9d, 0xcb9e, 0xcb9f, /*0xf0-0xf7*/ + 0xcba0, 0xcc40, 0xcc41, 0xd4e5, 0xcc42, 0xcc43, 0xcc44, 0xdebd, /*0xf8-0xff*/ + /* 0x8600 */ + 0xcc45, 0xcc46, 0xcc47, 0xcc48, 0xcc49, 0xdebf, 0xcc4a, 0xcc4b, /*0x00-0x07*/ + 0xcc4c, 0xcc4d, 0xcc4e, 0xcc4f, 0xcc50, 0xcc51, 0xcc52, 0xcc53, /*0x08-0x0f*/ + 0xcc54, 0xc4a2, 0xcc55, 0xcc56, 0xcc57, 0xcc58, 0xdec1, 0xcc59, /*0x10-0x17*/ + 0xcc5a, 0xcc5b, 0xcc5c, 0xcc5d, 0xcc5e, 0xcc5f, 0xcc60, 0xcc61, /*0x18-0x1f*/ + 0xcc62, 0xcc63, 0xcc64, 0xcc65, 0xcc66, 0xcc67, 0xcc68, 0xdebe, /*0x20-0x27*/ + 0xcc69, 0xdec0, 0xcc6a, 0xcc6b, 0xcc6c, 0xcc6d, 0xcc6e, 0xcc6f, /*0x28-0x2f*/ + 0xcc70, 0xcc71, 0xcc72, 0xcc73, 0xcc74, 0xcc75, 0xcc76, 0xcc77, /*0x30-0x37*/ + 0xd5ba, 0xcc78, 0xcc79, 0xcc7a, 0xdec2, 0xcc7b, 0xcc7c, 0xcc7d, /*0x38-0x3f*/ + 0xcc7e, 0xcc80, 0xcc81, 0xcc82, 0xcc83, 0xcc84, 0xcc85, 0xcc86, /*0x40-0x47*/ + 0xcc87, 0xcc88, 0xcc89, 0xcc8a, 0xcc8b, 0xf2ae, 0xbba2, 0xc2b2, /*0x48-0x4f*/ + 0xc5b0, 0xc2c7, 0xcc8c, 0xcc8d, 0xf2af, 0xcc8e, 0xcc8f, 0xcc90, /*0x50-0x57*/ + 0xcc91, 0xcc92, 0xd0e9, 0xcc93, 0xcc94, 0xcc95, 0xd3dd, 0xcc96, /*0x58-0x5f*/ + 0xcc97, 0xcc98, 0xebbd, 0xcc99, 0xcc9a, 0xcc9b, 0xcc9c, 0xcc9d, /*0x60-0x67*/ + 0xcc9e, 0xcc9f, 0xcca0, 0xb3e6, 0xf2b0, 0xcd40, 0xf2b1, 0xcd41, /*0x68-0x6f*/ + 0xcd42, 0xcaad, 0xcd43, 0xcd44, 0xcd45, 0xcd46, 0xcd47, 0xcd48, /*0x70-0x77*/ + 0xcd49, 0xbae7, 0xf2b3, 0xf2b5, 0xf2b4, 0xcbe4, 0xcfba, 0xf2b2, /*0x78-0x7f*/ + 0xcab4, 0xd2cf, 0xc2ec, 0xcd4a, 0xcd4b, 0xcd4c, 0xcd4d, 0xcd4e, /*0x80-0x87*/ + 0xcd4f, 0xcd50, 0xcec3, 0xf2b8, 0xb0f6, 0xf2b7, 0xcd51, 0xcd52, /*0x88-0x8f*/ + 0xcd53, 0xcd54, 0xcd55, 0xf2be, 0xcd56, 0xb2cf, 0xcd57, 0xcd58, /*0x90-0x97*/ + 0xcd59, 0xcd5a, 0xcd5b, 0xcd5c, 0xd1c1, 0xf2ba, 0xcd5d, 0xcd5e, /*0x98-0x9f*/ + 0xcd5f, 0xcd60, 0xcd61, 0xf2bc, 0xd4e9, 0xcd62, 0xcd63, 0xf2bb, /*0xa0-0xa7*/ + 0xf2b6, 0xf2bf, 0xf2bd, 0xcd64, 0xf2b9, 0xcd65, 0xcd66, 0xf2c7, /*0xa8-0xaf*/ + 0xf2c4, 0xf2c6, 0xcd67, 0xcd68, 0xf2ca, 0xf2c2, 0xf2c0, 0xcd69, /*0xb0-0xb7*/ + 0xcd6a, 0xcd6b, 0xf2c5, 0xcd6c, 0xcd6d, 0xcd6e, 0xcd6f, 0xcd70, /*0xb8-0xbf*/ + 0xd6fb, 0xcd71, 0xcd72, 0xcd73, 0xf2c1, 0xcd74, 0xc7f9, 0xc9df, /*0xc0-0xc7*/ + 0xcd75, 0xf2c8, 0xb9c6, 0xb5b0, 0xcd76, 0xcd77, 0xf2c3, 0xf2c9, /*0xc8-0xcf*/ + 0xf2d0, 0xf2d6, 0xcd78, 0xcd79, 0xbbd7, 0xcd7a, 0xcd7b, 0xcd7c, /*0xd0-0xd7*/ + 0xf2d5, 0xcddc, 0xcd7d, 0xd6eb, 0xcd7e, 0xcd80, 0xf2d2, 0xf2d4, /*0xd8-0xdf*/ + 0xcd81, 0xcd82, 0xcd83, 0xcd84, 0xb8f2, 0xcd85, 0xcd86, 0xcd87, /*0xe0-0xe7*/ + 0xcd88, 0xf2cb, 0xcd89, 0xcd8a, 0xcd8b, 0xf2ce, 0xc2f9, 0xcd8c, /*0xe8-0xef*/ + 0xd5dd, 0xf2cc, 0xf2cd, 0xf2cf, 0xf2d3, 0xcd8d, 0xcd8e, 0xcd8f, /*0xf0-0xf7*/ + 0xf2d9, 0xd3bc, 0xcd90, 0xcd91, 0xcd92, 0xcd93, 0xb6ea, 0xcd94, /*0xf8-0xff*/ + /* 0x8700 */ + 0xcaf1, 0xcd95, 0xb7e4, 0xf2d7, 0xcd96, 0xcd97, 0xcd98, 0xf2d8, /*0x00-0x07*/ + 0xf2da, 0xf2dd, 0xf2db, 0xcd99, 0xcd9a, 0xf2dc, 0xcd9b, 0xcd9c, /*0x08-0x0f*/ + 0xcd9d, 0xcd9e, 0xd1d1, 0xf2d1, 0xcd9f, 0xcdc9, 0xcda0, 0xcecf, /*0x10-0x17*/ + 0xd6a9, 0xce40, 0xf2e3, 0xce41, 0xc3db, 0xce42, 0xf2e0, 0xce43, /*0x18-0x1f*/ + 0xce44, 0xc0af, 0xf2ec, 0xf2de, 0xce45, 0xf2e1, 0xce46, 0xce47, /*0x20-0x27*/ + 0xce48, 0xf2e8, 0xce49, 0xce4a, 0xce4b, 0xce4c, 0xf2e2, 0xce4d, /*0x28-0x2f*/ + 0xce4e, 0xf2e7, 0xce4f, 0xce50, 0xf2e6, 0xce51, 0xce52, 0xf2e9, /*0x30-0x37*/ + 0xce53, 0xce54, 0xce55, 0xf2df, 0xce56, 0xce57, 0xf2e4, 0xf2ea, /*0x38-0x3f*/ + 0xce58, 0xce59, 0xce5a, 0xce5b, 0xce5c, 0xce5d, 0xce5e, 0xd3ac, /*0x40-0x47*/ + 0xf2e5, 0xb2f5, 0xce5f, 0xce60, 0xf2f2, 0xce61, 0xd0ab, 0xce62, /*0x48-0x4f*/ + 0xce63, 0xce64, 0xce65, 0xf2f5, 0xce66, 0xce67, 0xce68, 0xbbc8, /*0x50-0x57*/ + 0xce69, 0xf2f9, 0xce6a, 0xce6b, 0xce6c, 0xce6d, 0xce6e, 0xce6f, /*0x58-0x5f*/ + 0xf2f0, 0xce70, 0xce71, 0xf2f6, 0xf2f8, 0xf2fa, 0xce72, 0xce73, /*0x60-0x67*/ + 0xce74, 0xce75, 0xce76, 0xce77, 0xce78, 0xce79, 0xf2f3, 0xce7a, /*0x68-0x6f*/ + 0xf2f1, 0xce7b, 0xce7c, 0xce7d, 0xbafb, 0xce7e, 0xb5fb, 0xce80, /*0x70-0x77*/ + 0xce81, 0xce82, 0xce83, 0xf2ef, 0xf2f7, 0xf2ed, 0xf2ee, 0xce84, /*0x78-0x7f*/ + 0xce85, 0xce86, 0xf2eb, 0xf3a6, 0xce87, 0xf3a3, 0xce88, 0xce89, /*0x80-0x87*/ + 0xf3a2, 0xce8a, 0xce8b, 0xf2f4, 0xce8c, 0xc8da, 0xce8d, 0xce8e, /*0x88-0x8f*/ + 0xce8f, 0xce90, 0xce91, 0xf2fb, 0xce92, 0xce93, 0xce94, 0xf3a5, /*0x90-0x97*/ + 0xce95, 0xce96, 0xce97, 0xce98, 0xce99, 0xce9a, 0xce9b, 0xc3f8, /*0x98-0x9f*/ + 0xce9c, 0xce9d, 0xce9e, 0xce9f, 0xcea0, 0xcf40, 0xcf41, 0xcf42, /*0xa0-0xa7*/ + 0xf2fd, 0xcf43, 0xcf44, 0xf3a7, 0xf3a9, 0xf3a4, 0xcf45, 0xf2fc, /*0xa8-0xaf*/ + 0xcf46, 0xcf47, 0xcf48, 0xf3ab, 0xcf49, 0xf3aa, 0xcf4a, 0xcf4b, /*0xb0-0xb7*/ + 0xcf4c, 0xcf4d, 0xc2dd, 0xcf4e, 0xcf4f, 0xf3ae, 0xcf50, 0xcf51, /*0xb8-0xbf*/ + 0xf3b0, 0xcf52, 0xcf53, 0xcf54, 0xcf55, 0xcf56, 0xf3a1, 0xcf57, /*0xc0-0xc7*/ + 0xcf58, 0xcf59, 0xf3b1, 0xf3ac, 0xcf5a, 0xcf5b, 0xcf5c, 0xcf5d, /*0xc8-0xcf*/ + 0xcf5e, 0xf3af, 0xf2fe, 0xf3ad, 0xcf5f, 0xcf60, 0xcf61, 0xcf62, /*0xd0-0xd7*/ + 0xcf63, 0xcf64, 0xcf65, 0xf3b2, 0xcf66, 0xcf67, 0xcf68, 0xcf69, /*0xd8-0xdf*/ + 0xf3b4, 0xcf6a, 0xcf6b, 0xcf6c, 0xcf6d, 0xf3a8, 0xcf6e, 0xcf6f, /*0xe0-0xe7*/ + 0xcf70, 0xcf71, 0xf3b3, 0xcf72, 0xcf73, 0xcf74, 0xf3b5, 0xcf75, /*0xe8-0xef*/ + 0xcf76, 0xcf77, 0xcf78, 0xcf79, 0xcf7a, 0xcf7b, 0xcf7c, 0xcf7d, /*0xf0-0xf7*/ + 0xcf7e, 0xd0b7, 0xcf80, 0xcf81, 0xcf82, 0xcf83, 0xf3b8, 0xcf84, /*0xf8-0xff*/ + /* 0x8800 */ + 0xcf85, 0xcf86, 0xcf87, 0xd9f9, 0xcf88, 0xcf89, 0xcf8a, 0xcf8b, /*0x00-0x07*/ + 0xcf8c, 0xcf8d, 0xf3b9, 0xcf8e, 0xcf8f, 0xcf90, 0xcf91, 0xcf92, /*0x08-0x0f*/ + 0xcf93, 0xcf94, 0xcf95, 0xf3b7, 0xcf96, 0xc8e4, 0xf3b6, 0xcf97, /*0x10-0x17*/ + 0xcf98, 0xcf99, 0xcf9a, 0xf3ba, 0xcf9b, 0xcf9c, 0xcf9d, 0xcf9e, /*0x18-0x1f*/ + 0xcf9f, 0xf3bb, 0xb4c0, 0xcfa0, 0xd040, 0xd041, 0xd042, 0xd043, /*0x20-0x27*/ + 0xd044, 0xd045, 0xd046, 0xd047, 0xd048, 0xd049, 0xd04a, 0xd04b, /*0x28-0x2f*/ + 0xd04c, 0xd04d, 0xeec3, 0xd04e, 0xd04f, 0xd050, 0xd051, 0xd052, /*0x30-0x37*/ + 0xd053, 0xf3bc, 0xd054, 0xd055, 0xf3bd, 0xd056, 0xd057, 0xd058, /*0x38-0x3f*/ + 0xd1aa, 0xd059, 0xd05a, 0xd05b, 0xf4ac, 0xd0c6, 0xd05c, 0xd05d, /*0x40-0x47*/ + 0xd05e, 0xd05f, 0xd060, 0xd061, 0xd0d0, 0xd1dc, 0xd062, 0xd063, /*0x48-0x4f*/ + 0xd064, 0xd065, 0xd066, 0xd067, 0xcfce, 0xd068, 0xd069, 0xbdd6, /*0x50-0x57*/ + 0xd06a, 0xd1c3, 0xd06b, 0xd06c, 0xd06d, 0xd06e, 0xd06f, 0xd070, /*0x58-0x5f*/ + 0xd071, 0xbae2, 0xe1e9, 0xd2c2, 0xf1c2, 0xb2b9, 0xd072, 0xd073, /*0x60-0x67*/ + 0xb1ed, 0xf1c3, 0xd074, 0xc9c0, 0xb3c4, 0xd075, 0xd9f2, 0xd076, /*0x68-0x6f*/ + 0xcba5, 0xd077, 0xf1c4, 0xd078, 0xd079, 0xd07a, 0xd07b, 0xd6d4, /*0x70-0x77*/ + 0xd07c, 0xd07d, 0xd07e, 0xd080, 0xd081, 0xf1c5, 0xf4c0, 0xf1c6, /*0x78-0x7f*/ + 0xd082, 0xd4ac, 0xf1c7, 0xd083, 0xb0c0, 0xf4c1, 0xd084, 0xd085, /*0x80-0x87*/ + 0xf4c2, 0xd086, 0xd087, 0xb4fc, 0xd088, 0xc5db, 0xd089, 0xd08a, /*0x88-0x8f*/ + 0xd08b, 0xd08c, 0xccbb, 0xd08d, 0xd08e, 0xd08f, 0xd0e4, 0xd090, /*0x90-0x97*/ + 0xd091, 0xd092, 0xd093, 0xd094, 0xcde0, 0xd095, 0xd096, 0xd097, /*0x98-0x9f*/ + 0xd098, 0xd099, 0xf1c8, 0xd09a, 0xd9f3, 0xd09b, 0xd09c, 0xd09d, /*0xa0-0xa7*/ + 0xd09e, 0xd09f, 0xd0a0, 0xb1bb, 0xd140, 0xcfae, 0xd141, 0xd142, /*0xa8-0xaf*/ + 0xd143, 0xb8a4, 0xd144, 0xd145, 0xd146, 0xd147, 0xd148, 0xf1ca, /*0xb0-0xb7*/ + 0xd149, 0xd14a, 0xd14b, 0xd14c, 0xf1cb, 0xd14d, 0xd14e, 0xd14f, /*0xb8-0xbf*/ + 0xd150, 0xb2c3, 0xc1d1, 0xd151, 0xd152, 0xd7b0, 0xf1c9, 0xd153, /*0xc0-0xc7*/ + 0xd154, 0xf1cc, 0xd155, 0xd156, 0xd157, 0xd158, 0xf1ce, 0xd159, /*0xc8-0xcf*/ + 0xd15a, 0xd15b, 0xd9f6, 0xd15c, 0xd2e1, 0xd4a3, 0xd15d, 0xd15e, /*0xd0-0xd7*/ + 0xf4c3, 0xc8b9, 0xd15f, 0xd160, 0xd161, 0xd162, 0xd163, 0xf4c4, /*0xd8-0xdf*/ + 0xd164, 0xd165, 0xf1cd, 0xf1cf, 0xbfe3, 0xf1d0, 0xd166, 0xd167, /*0xe0-0xe7*/ + 0xf1d4, 0xd168, 0xd169, 0xd16a, 0xd16b, 0xd16c, 0xd16d, 0xd16e, /*0xe8-0xef*/ + 0xf1d6, 0xf1d1, 0xd16f, 0xc9d1, 0xc5e1, 0xd170, 0xd171, 0xd172, /*0xf0-0xf7*/ + 0xc2e3, 0xb9fc, 0xd173, 0xd174, 0xf1d3, 0xd175, 0xf1d5, 0xd176, /*0xf8-0xff*/ + /* 0x8900 */ + 0xd177, 0xd178, 0xb9d3, 0xd179, 0xd17a, 0xd17b, 0xd17c, 0xd17d, /*0x00-0x07*/ + 0xd17e, 0xd180, 0xf1db, 0xd181, 0xd182, 0xd183, 0xd184, 0xd185, /*0x08-0x0f*/ + 0xbad6, 0xd186, 0xb0fd, 0xf1d9, 0xd187, 0xd188, 0xd189, 0xd18a, /*0x10-0x17*/ + 0xd18b, 0xf1d8, 0xf1d2, 0xf1da, 0xd18c, 0xd18d, 0xd18e, 0xd18f, /*0x18-0x1f*/ + 0xd190, 0xf1d7, 0xd191, 0xd192, 0xd193, 0xc8ec, 0xd194, 0xd195, /*0x20-0x27*/ + 0xd196, 0xd197, 0xcdca, 0xf1dd, 0xd198, 0xd199, 0xd19a, 0xd19b, /*0x28-0x2f*/ + 0xe5bd, 0xd19c, 0xd19d, 0xd19e, 0xf1dc, 0xd19f, 0xf1de, 0xd1a0, /*0x30-0x37*/ + 0xd240, 0xd241, 0xd242, 0xd243, 0xd244, 0xd245, 0xd246, 0xd247, /*0x38-0x3f*/ + 0xd248, 0xf1df, 0xd249, 0xd24a, 0xcfe5, 0xd24b, 0xd24c, 0xd24d, /*0x40-0x47*/ + 0xd24e, 0xd24f, 0xd250, 0xd251, 0xd252, 0xd253, 0xd254, 0xd255, /*0x48-0x4f*/ + 0xd256, 0xd257, 0xd258, 0xd259, 0xd25a, 0xd25b, 0xd25c, 0xd25d, /*0x50-0x57*/ + 0xd25e, 0xd25f, 0xd260, 0xd261, 0xd262, 0xd263, 0xf4c5, 0xbdf3, /*0x58-0x5f*/ + 0xd264, 0xd265, 0xd266, 0xd267, 0xd268, 0xd269, 0xf1e0, 0xd26a, /*0x60-0x67*/ + 0xd26b, 0xd26c, 0xd26d, 0xd26e, 0xd26f, 0xd270, 0xd271, 0xd272, /*0x68-0x6f*/ + 0xd273, 0xd274, 0xd275, 0xd276, 0xd277, 0xd278, 0xd279, 0xd27a, /*0x70-0x77*/ + 0xd27b, 0xd27c, 0xd27d, 0xf1e1, 0xd27e, 0xd280, 0xd281, 0xcef7, /*0x78-0x7f*/ + 0xd282, 0xd2aa, 0xd283, 0xf1fb, 0xd284, 0xd285, 0xb8b2, 0xd286, /*0x80-0x87*/ + 0xd287, 0xd288, 0xd289, 0xd28a, 0xd28b, 0xd28c, 0xd28d, 0xd28e, /*0x88-0x8f*/ + 0xd28f, 0xd290, 0xd291, 0xd292, 0xd293, 0xd294, 0xd295, 0xd296, /*0x90-0x97*/ + 0xd297, 0xd298, 0xd299, 0xd29a, 0xd29b, 0xd29c, 0xd29d, 0xd29e, /*0x98-0x9f*/ + 0xd29f, 0xd2a0, 0xd340, 0xd341, 0xd342, 0xd343, 0xd344, 0xd345, /*0xa0-0xa7*/ + 0xd346, 0xd347, 0xd348, 0xd349, 0xd34a, 0xd34b, 0xd34c, 0xd34d, /*0xa8-0xaf*/ + 0xd34e, 0xd34f, 0xd350, 0xd351, 0xd352, 0xd353, 0xd354, 0xd355, /*0xb0-0xb7*/ + 0xd356, 0xd357, 0xd358, 0xd359, 0xd35a, 0xd35b, 0xd35c, 0xd35d, /*0xb8-0xbf*/ + 0xd35e, 0xbcfb, 0xb9db, 0xd35f, 0xb9e6, 0xc3d9, 0xcad3, 0xeae8, /*0xc0-0xc7*/ + 0xc0c0, 0xbef5, 0xeae9, 0xeaea, 0xeaeb, 0xd360, 0xeaec, 0xeaed, /*0xc8-0xcf*/ + 0xeaee, 0xeaef, 0xbdc7, 0xd361, 0xd362, 0xd363, 0xf5fb, 0xd364, /*0xd0-0xd7*/ + 0xd365, 0xd366, 0xf5fd, 0xd367, 0xf5fe, 0xd368, 0xf5fc, 0xd369, /*0xd8-0xdf*/ + 0xd36a, 0xd36b, 0xd36c, 0xbde2, 0xd36d, 0xf6a1, 0xb4a5, 0xd36e, /*0xe0-0xe7*/ + 0xd36f, 0xd370, 0xd371, 0xf6a2, 0xd372, 0xd373, 0xd374, 0xf6a3, /*0xe8-0xef*/ + 0xd375, 0xd376, 0xd377, 0xecb2, 0xd378, 0xd379, 0xd37a, 0xd37b, /*0xf0-0xf7*/ + 0xd37c, 0xd37d, 0xd37e, 0xd380, 0xd381, 0xd382, 0xd383, 0xd384, /*0xf8-0xff*/ + /* 0x8a00 */ + 0xd1d4, 0xd385, 0xd386, 0xd387, 0xd388, 0xd389, 0xd38a, 0xd9ea, /*0x00-0x07*/ + 0xd38b, 0xd38c, 0xd38d, 0xd38e, 0xd38f, 0xd390, 0xd391, 0xd392, /*0x08-0x0f*/ + 0xd393, 0xd394, 0xd395, 0xd396, 0xd397, 0xd398, 0xd399, 0xd39a, /*0x10-0x17*/ + 0xd39b, 0xd39c, 0xd39d, 0xd39e, 0xd39f, 0xd3a0, 0xd440, 0xd441, /*0x18-0x1f*/ + 0xd442, 0xd443, 0xd444, 0xd445, 0xd446, 0xd447, 0xd448, 0xd449, /*0x20-0x27*/ + 0xd44a, 0xd44b, 0xd44c, 0xd44d, 0xd44e, 0xd44f, 0xd450, 0xd451, /*0x28-0x2f*/ + 0xd452, 0xd453, 0xd454, 0xd455, 0xd456, 0xd457, 0xd458, 0xd459, /*0x30-0x37*/ + 0xd45a, 0xd45b, 0xd45c, 0xd45d, 0xd45e, 0xd45f, 0xf6a4, 0xd460, /*0x38-0x3f*/ + 0xd461, 0xd462, 0xd463, 0xd464, 0xd465, 0xd466, 0xd467, 0xd468, /*0x40-0x47*/ + 0xeeba, 0xd469, 0xd46a, 0xd46b, 0xd46c, 0xd46d, 0xd46e, 0xd46f, /*0x48-0x4f*/ + 0xd470, 0xd471, 0xd472, 0xd473, 0xd474, 0xd475, 0xd476, 0xd477, /*0x50-0x57*/ + 0xd478, 0xd479, 0xd47a, 0xd47b, 0xd47c, 0xd47d, 0xd47e, 0xd480, /*0x58-0x5f*/ + 0xd481, 0xd482, 0xd483, 0xd484, 0xd485, 0xd486, 0xd487, 0xd488, /*0x60-0x67*/ + 0xd489, 0xd48a, 0xd48b, 0xd48c, 0xd48d, 0xd48e, 0xd48f, 0xd490, /*0x68-0x6f*/ + 0xd491, 0xd492, 0xd493, 0xd494, 0xd495, 0xd496, 0xd497, 0xd498, /*0x70-0x77*/ + 0xd499, 0xd5b2, 0xd49a, 0xd49b, 0xd49c, 0xd49d, 0xd49e, 0xd49f, /*0x78-0x7f*/ + 0xd4a0, 0xd540, 0xd541, 0xd542, 0xd543, 0xd544, 0xd545, 0xd546, /*0x80-0x87*/ + 0xd547, 0xd3fe, 0xccdc, 0xd548, 0xd549, 0xd54a, 0xd54b, 0xd54c, /*0x88-0x8f*/ + 0xd54d, 0xd54e, 0xd54f, 0xcac4, 0xd550, 0xd551, 0xd552, 0xd553, /*0x90-0x97*/ + 0xd554, 0xd555, 0xd556, 0xd557, 0xd558, 0xd559, 0xd55a, 0xd55b, /*0x98-0x9f*/ + 0xd55c, 0xd55d, 0xd55e, 0xd55f, 0xd560, 0xd561, 0xd562, 0xd563, /*0xa0-0xa7*/ + 0xd564, 0xd565, 0xd566, 0xd567, 0xd568, 0xd569, 0xd56a, 0xd56b, /*0xa8-0xaf*/ + 0xd56c, 0xd56d, 0xd56e, 0xd56f, 0xd570, 0xd571, 0xd572, 0xd573, /*0xb0-0xb7*/ + 0xd574, 0xd575, 0xd576, 0xd577, 0xd578, 0xd579, 0xd57a, 0xd57b, /*0xb8-0xbf*/ + 0xd57c, 0xd57d, 0xd57e, 0xd580, 0xd581, 0xd582, 0xd583, 0xd584, /*0xc0-0xc7*/ + 0xd585, 0xd586, 0xd587, 0xd588, 0xd589, 0xd58a, 0xd58b, 0xd58c, /*0xc8-0xcf*/ + 0xd58d, 0xd58e, 0xd58f, 0xd590, 0xd591, 0xd592, 0xd593, 0xd594, /*0xd0-0xd7*/ + 0xd595, 0xd596, 0xd597, 0xd598, 0xd599, 0xd59a, 0xd59b, 0xd59c, /*0xd8-0xdf*/ + 0xd59d, 0xd59e, 0xd59f, 0xd5a0, 0xd640, 0xd641, 0xd642, 0xd643, /*0xe0-0xe7*/ + 0xd644, 0xd645, 0xd646, 0xd647, 0xd648, 0xd649, 0xd64a, 0xd64b, /*0xe8-0xef*/ + 0xd64c, 0xd64d, 0xd64e, 0xd64f, 0xd650, 0xd651, 0xd652, 0xd653, /*0xf0-0xf7*/ + 0xd654, 0xd655, 0xd656, 0xd657, 0xd658, 0xd659, 0xd65a, 0xd65b, /*0xf8-0xff*/ + /* 0x8b00 */ + 0xd65c, 0xd65d, 0xd65e, 0xd65f, 0xd660, 0xd661, 0xd662, 0xe5c0, /*0x00-0x07*/ + 0xd663, 0xd664, 0xd665, 0xd666, 0xd667, 0xd668, 0xd669, 0xd66a, /*0x08-0x0f*/ + 0xd66b, 0xd66c, 0xd66d, 0xd66e, 0xd66f, 0xd670, 0xd671, 0xd672, /*0x10-0x17*/ + 0xd673, 0xd674, 0xd675, 0xd676, 0xd677, 0xd678, 0xd679, 0xd67a, /*0x18-0x1f*/ + 0xd67b, 0xd67c, 0xd67d, 0xd67e, 0xd680, 0xd681, 0xf6a5, 0xd682, /*0x20-0x27*/ + 0xd683, 0xd684, 0xd685, 0xd686, 0xd687, 0xd688, 0xd689, 0xd68a, /*0x28-0x2f*/ + 0xd68b, 0xd68c, 0xd68d, 0xd68e, 0xd68f, 0xd690, 0xd691, 0xd692, /*0x30-0x37*/ + 0xd693, 0xd694, 0xd695, 0xd696, 0xd697, 0xd698, 0xd699, 0xd69a, /*0x38-0x3f*/ + 0xd69b, 0xd69c, 0xd69d, 0xd69e, 0xd69f, 0xd6a0, 0xd740, 0xd741, /*0x40-0x47*/ + 0xd742, 0xd743, 0xd744, 0xd745, 0xd746, 0xd747, 0xd748, 0xd749, /*0x48-0x4f*/ + 0xd74a, 0xd74b, 0xd74c, 0xd74d, 0xd74e, 0xd74f, 0xd750, 0xd751, /*0x50-0x57*/ + 0xd752, 0xd753, 0xd754, 0xd755, 0xd756, 0xd757, 0xd758, 0xd759, /*0x58-0x5f*/ + 0xd75a, 0xd75b, 0xd75c, 0xd75d, 0xd75e, 0xd75f, 0xbeaf, 0xd760, /*0x60-0x67*/ + 0xd761, 0xd762, 0xd763, 0xd764, 0xc6a9, 0xd765, 0xd766, 0xd767, /*0x68-0x6f*/ + 0xd768, 0xd769, 0xd76a, 0xd76b, 0xd76c, 0xd76d, 0xd76e, 0xd76f, /*0x70-0x77*/ + 0xd770, 0xd771, 0xd772, 0xd773, 0xd774, 0xd775, 0xd776, 0xd777, /*0x78-0x7f*/ + 0xd778, 0xd779, 0xd77a, 0xd77b, 0xd77c, 0xd77d, 0xd77e, 0xd780, /*0x80-0x87*/ + 0xd781, 0xd782, 0xd783, 0xd784, 0xd785, 0xd786, 0xd787, 0xd788, /*0x88-0x8f*/ + 0xd789, 0xd78a, 0xd78b, 0xd78c, 0xd78d, 0xd78e, 0xd78f, 0xd790, /*0x90-0x97*/ + 0xd791, 0xd792, 0xd793, 0xd794, 0xd795, 0xd796, 0xd797, 0xd798, /*0x98-0x9f*/ + 0xdaa5, 0xbcc6, 0xb6a9, 0xb8bc, 0xc8cf, 0xbca5, 0xdaa6, 0xdaa7, /*0xa0-0xa7*/ + 0xccd6, 0xc8c3, 0xdaa8, 0xc6fd, 0xd799, 0xd1b5, 0xd2e9, 0xd1b6, /*0xa8-0xaf*/ + 0xbcc7, 0xd79a, 0xbdb2, 0xbbe4, 0xdaa9, 0xdaaa, 0xd1c8, 0xdaab, /*0xb0-0xb7*/ + 0xd0ed, 0xb6ef, 0xc2db, 0xd79b, 0xcbcf, 0xb7ed, 0xc9e8, 0xb7c3, /*0xb8-0xbf*/ + 0xbef7, 0xd6a4, 0xdaac, 0xdaad, 0xc6c0, 0xd7e7, 0xcab6, 0xd79c, /*0xc0-0xc7*/ + 0xd5a9, 0xcbdf, 0xd5ef, 0xdaae, 0xd6df, 0xb4ca, 0xdab0, 0xdaaf, /*0xc8-0xcf*/ + 0xd79d, 0xd2eb, 0xdab1, 0xdab2, 0xdab3, 0xcad4, 0xdab4, 0xcaab, /*0xd0-0xd7*/ + 0xdab5, 0xdab6, 0xb3cf, 0xd6ef, 0xdab7, 0xbbb0, 0xb5ae, 0xdab8, /*0xd8-0xdf*/ + 0xdab9, 0xb9ee, 0xd1af, 0xd2e8, 0xdaba, 0xb8c3, 0xcfea, 0xb2ef, /*0xe0-0xe7*/ + 0xdabb, 0xdabc, 0xd79e, 0xbdeb, 0xcedc, 0xd3ef, 0xdabd, 0xcef3, /*0xe8-0xef*/ + 0xdabe, 0xd3d5, 0xbbe5, 0xdabf, 0xcbb5, 0xcbd0, 0xdac0, 0xc7eb, /*0xf0-0xf7*/ + 0xd6ee, 0xdac1, 0xc5b5, 0xb6c1, 0xdac2, 0xb7cc, 0xbfce, 0xdac3, /*0xf8-0xff*/ + /* 0x8c00 */ + 0xdac4, 0xcbad, 0xdac5, 0xb5f7, 0xdac6, 0xc1c2, 0xd7bb, 0xdac7, /*0x00-0x07*/ + 0xccb8, 0xd79f, 0xd2ea, 0xc4b1, 0xdac8, 0xb5fd, 0xbbd1, 0xdac9, /*0x08-0x0f*/ + 0xd0b3, 0xdaca, 0xdacb, 0xcebd, 0xdacc, 0xdacd, 0xdace, 0xb2f7, /*0x10-0x17*/ + 0xdad1, 0xdacf, 0xd1e8, 0xdad0, 0xc3d5, 0xdad2, 0xd7a0, 0xdad3, /*0x18-0x1f*/ + 0xdad4, 0xdad5, 0xd0bb, 0xd2a5, 0xb0f9, 0xdad6, 0xc7ab, 0xdad7, /*0x20-0x27*/ + 0xbdf7, 0xc3a1, 0xdad8, 0xdad9, 0xc3fd, 0xccb7, 0xdada, 0xdadb, /*0x28-0x2f*/ + 0xc0be, 0xc6d7, 0xdadc, 0xdadd, 0xc7b4, 0xdade, 0xdadf, 0xb9c8, /*0x30-0x37*/ + 0xd840, 0xd841, 0xd842, 0xd843, 0xd844, 0xd845, 0xd846, 0xd847, /*0x38-0x3f*/ + 0xd848, 0xbbed, 0xd849, 0xd84a, 0xd84b, 0xd84c, 0xb6b9, 0xf4f8, /*0x40-0x47*/ + 0xd84d, 0xf4f9, 0xd84e, 0xd84f, 0xcde3, 0xd850, 0xd851, 0xd852, /*0x48-0x4f*/ + 0xd853, 0xd854, 0xd855, 0xd856, 0xd857, 0xf5b9, 0xd858, 0xd859, /*0x50-0x57*/ + 0xd85a, 0xd85b, 0xebe0, 0xd85c, 0xd85d, 0xd85e, 0xd85f, 0xd860, /*0x58-0x5f*/ + 0xd861, 0xcff3, 0xbbbf, 0xd862, 0xd863, 0xd864, 0xd865, 0xd866, /*0x60-0x67*/ + 0xd867, 0xd868, 0xbac0, 0xd4a5, 0xd869, 0xd86a, 0xd86b, 0xd86c, /*0x68-0x6f*/ + 0xd86d, 0xd86e, 0xd86f, 0xe1d9, 0xd870, 0xd871, 0xd872, 0xd873, /*0x70-0x77*/ + 0xf5f4, 0xb1aa, 0xb2f2, 0xd874, 0xd875, 0xd876, 0xd877, 0xd878, /*0x78-0x7f*/ + 0xd879, 0xd87a, 0xf5f5, 0xd87b, 0xd87c, 0xf5f7, 0xd87d, 0xd87e, /*0x80-0x87*/ + 0xd880, 0xbad1, 0xf5f6, 0xd881, 0xc3b2, 0xd882, 0xd883, 0xd884, /*0x88-0x8f*/ + 0xd885, 0xd886, 0xd887, 0xd888, 0xf5f9, 0xd889, 0xd88a, 0xd88b, /*0x90-0x97*/ + 0xf5f8, 0xd88c, 0xd88d, 0xd88e, 0xd88f, 0xd890, 0xd891, 0xd892, /*0x98-0x9f*/ + 0xd893, 0xd894, 0xd895, 0xd896, 0xd897, 0xd898, 0xd899, 0xd89a, /*0xa0-0xa7*/ + 0xd89b, 0xd89c, 0xd89d, 0xd89e, 0xd89f, 0xd8a0, 0xd940, 0xd941, /*0xa8-0xaf*/ + 0xd942, 0xd943, 0xd944, 0xd945, 0xd946, 0xd947, 0xd948, 0xd949, /*0xb0-0xb7*/ + 0xd94a, 0xd94b, 0xd94c, 0xd94d, 0xd94e, 0xd94f, 0xd950, 0xd951, /*0xb8-0xbf*/ + 0xd952, 0xd953, 0xd954, 0xd955, 0xd956, 0xd957, 0xd958, 0xd959, /*0xc0-0xc7*/ + 0xd95a, 0xd95b, 0xd95c, 0xd95d, 0xd95e, 0xd95f, 0xd960, 0xd961, /*0xc8-0xcf*/ + 0xd962, 0xd963, 0xd964, 0xd965, 0xd966, 0xd967, 0xd968, 0xd969, /*0xd0-0xd7*/ + 0xd96a, 0xd96b, 0xd96c, 0xd96d, 0xd96e, 0xd96f, 0xd970, 0xd971, /*0xd8-0xdf*/ + 0xd972, 0xd973, 0xd974, 0xd975, 0xd976, 0xd977, 0xd978, 0xd979, /*0xe0-0xe7*/ + 0xd97a, 0xd97b, 0xd97c, 0xd97d, 0xd97e, 0xd980, 0xd981, 0xd982, /*0xe8-0xef*/ + 0xd983, 0xd984, 0xd985, 0xd986, 0xd987, 0xd988, 0xd989, 0xd98a, /*0xf0-0xf7*/ + 0xd98b, 0xd98c, 0xd98d, 0xd98e, 0xd98f, 0xd990, 0xd991, 0xd992, /*0xf8-0xff*/ + /* 0x8d00 */ + 0xd993, 0xd994, 0xd995, 0xd996, 0xd997, 0xd998, 0xd999, 0xd99a, /*0x00-0x07*/ + 0xd99b, 0xd99c, 0xd99d, 0xd99e, 0xd99f, 0xd9a0, 0xda40, 0xda41, /*0x08-0x0f*/ + 0xda42, 0xda43, 0xda44, 0xda45, 0xda46, 0xda47, 0xda48, 0xda49, /*0x10-0x17*/ + 0xda4a, 0xda4b, 0xda4c, 0xda4d, 0xda4e, 0xb1b4, 0xd5ea, 0xb8ba, /*0x18-0x1f*/ + 0xda4f, 0xb9b1, 0xb2c6, 0xd4f0, 0xcfcd, 0xb0dc, 0xd5cb, 0xbbf5, /*0x20-0x27*/ + 0xd6ca, 0xb7b7, 0xccb0, 0xc6b6, 0xb1e1, 0xb9ba, 0xd6fc, 0xb9e1, /*0x28-0x2f*/ + 0xb7a1, 0xbcfa, 0xeada, 0xeadb, 0xccf9, 0xb9f3, 0xeadc, 0xb4fb, /*0x30-0x37*/ + 0xc3b3, 0xb7d1, 0xbad8, 0xeadd, 0xd4f4, 0xeade, 0xbcd6, 0xbbdf, /*0x38-0x3f*/ + 0xeadf, 0xc1de, 0xc2b8, 0xd4df, 0xd7ca, 0xeae0, 0xeae1, 0xeae4, /*0x40-0x47*/ + 0xeae2, 0xeae3, 0xc9de, 0xb8b3, 0xb6c4, 0xeae5, 0xcaea, 0xc9cd, /*0x48-0x4f*/ + 0xb4cd, 0xda50, 0xda51, 0xe2d9, 0xc5e2, 0xeae6, 0xc0b5, 0xda52, /*0x50-0x57*/ + 0xd7b8, 0xeae7, 0xd7ac, 0xc8fc, 0xd8d3, 0xd8cd, 0xd4de, 0xda53, /*0x58-0x5f*/ + 0xd4f9, 0xc9c4, 0xd3ae, 0xb8d3, 0xb3e0, 0xda54, 0xc9e2, 0xf4f6, /*0x60-0x67*/ + 0xda55, 0xda56, 0xda57, 0xbad5, 0xda58, 0xf4f7, 0xda59, 0xda5a, /*0x68-0x6f*/ + 0xd7df, 0xda5b, 0xda5c, 0xf4f1, 0xb8b0, 0xd5d4, 0xb8cf, 0xc6f0, /*0x70-0x77*/ + 0xda5d, 0xda5e, 0xda5f, 0xda60, 0xda61, 0xda62, 0xda63, 0xda64, /*0x78-0x7f*/ + 0xda65, 0xb3c3, 0xda66, 0xda67, 0xf4f2, 0xb3ac, 0xda68, 0xda69, /*0x80-0x87*/ + 0xda6a, 0xda6b, 0xd4bd, 0xc7f7, 0xda6c, 0xda6d, 0xda6e, 0xda6f, /*0x88-0x8f*/ + 0xda70, 0xf4f4, 0xda71, 0xda72, 0xf4f3, 0xda73, 0xda74, 0xda75, /*0x90-0x97*/ + 0xda76, 0xda77, 0xda78, 0xda79, 0xda7a, 0xda7b, 0xda7c, 0xcccb, /*0x98-0x9f*/ + 0xda7d, 0xda7e, 0xda80, 0xc8a4, 0xda81, 0xda82, 0xda83, 0xda84, /*0xa0-0xa7*/ + 0xda85, 0xda86, 0xda87, 0xda88, 0xda89, 0xda8a, 0xda8b, 0xda8c, /*0xa8-0xaf*/ + 0xda8d, 0xf4f5, 0xda8e, 0xd7e3, 0xc5bf, 0xf5c0, 0xda8f, 0xda90, /*0xb0-0xb7*/ + 0xf5bb, 0xda91, 0xf5c3, 0xda92, 0xf5c2, 0xda93, 0xd6ba, 0xf5c1, /*0xb8-0xbf*/ + 0xda94, 0xda95, 0xda96, 0xd4be, 0xf5c4, 0xda97, 0xf5cc, 0xda98, /*0xc0-0xc7*/ + 0xda99, 0xda9a, 0xda9b, 0xb0cf, 0xb5f8, 0xda9c, 0xf5c9, 0xf5ca, /*0xc8-0xcf*/ + 0xda9d, 0xc5dc, 0xda9e, 0xda9f, 0xdaa0, 0xdb40, 0xf5c5, 0xf5c6, /*0xd0-0xd7*/ + 0xdb41, 0xdb42, 0xf5c7, 0xf5cb, 0xdb43, 0xbee0, 0xf5c8, 0xb8fa, /*0xd8-0xdf*/ + 0xdb44, 0xdb45, 0xdb46, 0xf5d0, 0xf5d3, 0xdb47, 0xdb48, 0xdb49, /*0xe0-0xe7*/ + 0xbfe7, 0xdb4a, 0xb9f2, 0xf5bc, 0xf5cd, 0xdb4b, 0xdb4c, 0xc2b7, /*0xe8-0xef*/ + 0xdb4d, 0xdb4e, 0xdb4f, 0xccf8, 0xdb50, 0xbcf9, 0xdb51, 0xf5ce, /*0xf0-0xf7*/ + 0xf5cf, 0xf5d1, 0xb6e5, 0xf5d2, 0xdb52, 0xf5d5, 0xdb53, 0xdb54, /*0xf8-0xff*/ + /* 0x8e00 */ + 0xdb55, 0xdb56, 0xdb57, 0xdb58, 0xdb59, 0xf5bd, 0xdb5a, 0xdb5b, /*0x00-0x07*/ + 0xdb5c, 0xf5d4, 0xd3bb, 0xdb5d, 0xb3ec, 0xdb5e, 0xdb5f, 0xcca4, /*0x08-0x0f*/ + 0xdb60, 0xdb61, 0xdb62, 0xdb63, 0xf5d6, 0xdb64, 0xdb65, 0xdb66, /*0x10-0x17*/ + 0xdb67, 0xdb68, 0xdb69, 0xdb6a, 0xdb6b, 0xf5d7, 0xbee1, 0xf5d8, /*0x18-0x1f*/ + 0xdb6c, 0xdb6d, 0xccdf, 0xf5db, 0xdb6e, 0xdb6f, 0xdb70, 0xdb71, /*0x20-0x27*/ + 0xdb72, 0xb2c8, 0xd7d9, 0xdb73, 0xf5d9, 0xdb74, 0xf5da, 0xf5dc, /*0x28-0x2f*/ + 0xdb75, 0xf5e2, 0xdb76, 0xdb77, 0xdb78, 0xf5e0, 0xdb79, 0xdb7a, /*0x30-0x37*/ + 0xdb7b, 0xf5df, 0xf5dd, 0xdb7c, 0xdb7d, 0xf5e1, 0xdb7e, 0xdb80, /*0x38-0x3f*/ + 0xf5de, 0xf5e4, 0xf5e5, 0xdb81, 0xcce3, 0xdb82, 0xdb83, 0xe5bf, /*0x40-0x47*/ + 0xb5b8, 0xf5e3, 0xf5e8, 0xcca3, 0xdb84, 0xdb85, 0xdb86, 0xdb87, /*0x48-0x4f*/ + 0xdb88, 0xf5e6, 0xf5e7, 0xdb89, 0xdb8a, 0xdb8b, 0xdb8c, 0xdb8d, /*0x50-0x57*/ + 0xdb8e, 0xf5be, 0xdb8f, 0xdb90, 0xdb91, 0xdb92, 0xdb93, 0xdb94, /*0x58-0x5f*/ + 0xdb95, 0xdb96, 0xdb97, 0xdb98, 0xdb99, 0xdb9a, 0xb1c4, 0xdb9b, /*0x60-0x67*/ + 0xdb9c, 0xf5bf, 0xdb9d, 0xdb9e, 0xb5c5, 0xb2e4, 0xdb9f, 0xf5ec, /*0x68-0x6f*/ + 0xf5e9, 0xdba0, 0xb6d7, 0xdc40, 0xf5ed, 0xdc41, 0xf5ea, 0xdc42, /*0x70-0x77*/ + 0xdc43, 0xdc44, 0xdc45, 0xdc46, 0xf5eb, 0xdc47, 0xdc48, 0xb4da, /*0x78-0x7f*/ + 0xdc49, 0xd4ea, 0xdc4a, 0xdc4b, 0xdc4c, 0xf5ee, 0xdc4d, 0xb3f9, /*0x80-0x87*/ + 0xdc4e, 0xdc4f, 0xdc50, 0xdc51, 0xdc52, 0xdc53, 0xdc54, 0xf5ef, /*0x88-0x8f*/ + 0xf5f1, 0xdc55, 0xdc56, 0xdc57, 0xf5f0, 0xdc58, 0xdc59, 0xdc5a, /*0x90-0x97*/ + 0xdc5b, 0xdc5c, 0xdc5d, 0xdc5e, 0xf5f2, 0xdc5f, 0xf5f3, 0xdc60, /*0x98-0x9f*/ + 0xdc61, 0xdc62, 0xdc63, 0xdc64, 0xdc65, 0xdc66, 0xdc67, 0xdc68, /*0xa0-0xa7*/ + 0xdc69, 0xdc6a, 0xdc6b, 0xc9ed, 0xb9aa, 0xdc6c, 0xdc6d, 0xc7fb, /*0xa8-0xaf*/ + 0xdc6e, 0xdc6f, 0xb6e3, 0xdc70, 0xdc71, 0xdc72, 0xdc73, 0xdc74, /*0xb0-0xb7*/ + 0xdc75, 0xdc76, 0xccc9, 0xdc77, 0xdc78, 0xdc79, 0xdc7a, 0xdc7b, /*0xb8-0xbf*/ + 0xdc7c, 0xdc7d, 0xdc7e, 0xdc80, 0xdc81, 0xdc82, 0xdc83, 0xdc84, /*0xc0-0xc7*/ + 0xdc85, 0xdc86, 0xdc87, 0xdc88, 0xdc89, 0xdc8a, 0xeaa6, 0xdc8b, /*0xc8-0xcf*/ + 0xdc8c, 0xdc8d, 0xdc8e, 0xdc8f, 0xdc90, 0xdc91, 0xdc92, 0xdc93, /*0xd0-0xd7*/ + 0xdc94, 0xdc95, 0xdc96, 0xdc97, 0xdc98, 0xdc99, 0xdc9a, 0xdc9b, /*0xd8-0xdf*/ + 0xdc9c, 0xdc9d, 0xdc9e, 0xdc9f, 0xdca0, 0xdd40, 0xdd41, 0xdd42, /*0xe0-0xe7*/ + 0xdd43, 0xdd44, 0xdd45, 0xdd46, 0xdd47, 0xdd48, 0xdd49, 0xdd4a, /*0xe8-0xef*/ + 0xdd4b, 0xdd4c, 0xdd4d, 0xdd4e, 0xdd4f, 0xdd50, 0xdd51, 0xdd52, /*0xf0-0xf7*/ + 0xdd53, 0xdd54, 0xdd55, 0xdd56, 0xdd57, 0xdd58, 0xdd59, 0xdd5a, /*0xf8-0xff*/ + /* 0x8f00 */ + 0xdd5b, 0xdd5c, 0xdd5d, 0xdd5e, 0xdd5f, 0xdd60, 0xdd61, 0xdd62, /*0x00-0x07*/ + 0xdd63, 0xdd64, 0xdd65, 0xdd66, 0xdd67, 0xdd68, 0xdd69, 0xdd6a, /*0x08-0x0f*/ + 0xdd6b, 0xdd6c, 0xdd6d, 0xdd6e, 0xdd6f, 0xdd70, 0xdd71, 0xdd72, /*0x10-0x17*/ + 0xdd73, 0xdd74, 0xdd75, 0xdd76, 0xdd77, 0xdd78, 0xdd79, 0xdd7a, /*0x18-0x1f*/ + 0xdd7b, 0xdd7c, 0xdd7d, 0xdd7e, 0xdd80, 0xdd81, 0xdd82, 0xdd83, /*0x20-0x27*/ + 0xdd84, 0xdd85, 0xdd86, 0xdd87, 0xdd88, 0xdd89, 0xdd8a, 0xdd8b, /*0x28-0x2f*/ + 0xdd8c, 0xdd8d, 0xdd8e, 0xdd8f, 0xdd90, 0xdd91, 0xdd92, 0xdd93, /*0x30-0x37*/ + 0xdd94, 0xdd95, 0xdd96, 0xdd97, 0xdd98, 0xdd99, 0xdd9a, 0xdd9b, /*0x38-0x3f*/ + 0xdd9c, 0xdd9d, 0xdd9e, 0xdd9f, 0xdda0, 0xde40, 0xde41, 0xde42, /*0x40-0x47*/ + 0xde43, 0xde44, 0xde45, 0xde46, 0xde47, 0xde48, 0xde49, 0xde4a, /*0x48-0x4f*/ + 0xde4b, 0xde4c, 0xde4d, 0xde4e, 0xde4f, 0xde50, 0xde51, 0xde52, /*0x50-0x57*/ + 0xde53, 0xde54, 0xde55, 0xde56, 0xde57, 0xde58, 0xde59, 0xde5a, /*0x58-0x5f*/ + 0xde5b, 0xde5c, 0xde5d, 0xde5e, 0xde5f, 0xde60, 0xb3b5, 0xd4fe, /*0x60-0x67*/ + 0xb9ec, 0xd0f9, 0xde61, 0xe9ed, 0xd7aa, 0xe9ee, 0xc2d6, 0xc8ed, /*0x68-0x6f*/ + 0xbae4, 0xe9ef, 0xe9f0, 0xe9f1, 0xd6e1, 0xe9f2, 0xe9f3, 0xe9f5, /*0x70-0x77*/ + 0xe9f4, 0xe9f6, 0xe9f7, 0xc7e1, 0xe9f8, 0xd4d8, 0xe9f9, 0xbdce, /*0x78-0x7f*/ + 0xde62, 0xe9fa, 0xe9fb, 0xbdcf, 0xe9fc, 0xb8a8, 0xc1be, 0xe9fd, /*0x80-0x87*/ + 0xb1b2, 0xbbd4, 0xb9f5, 0xe9fe, 0xde63, 0xeaa1, 0xeaa2, 0xeaa3, /*0x88-0x8f*/ + 0xb7f8, 0xbcad, 0xde64, 0xcae4, 0xe0ce, 0xd4af, 0xcfbd, 0xd5b7, /*0x90-0x97*/ + 0xeaa4, 0xd5de, 0xeaa5, 0xd0c1, 0xb9bc, 0xde65, 0xb4c7, 0xb1d9, /*0x98-0x9f*/ + 0xde66, 0xde67, 0xde68, 0xc0b1, 0xde69, 0xde6a, 0xde6b, 0xde6c, /*0xa0-0xa7*/ + 0xb1e6, 0xb1e7, 0xde6d, 0xb1e8, 0xde6e, 0xde6f, 0xde70, 0xde71, /*0xa8-0xaf*/ + 0xb3bd, 0xc8e8, 0xde72, 0xde73, 0xde74, 0xde75, 0xe5c1, 0xde76, /*0xb0-0xb7*/ + 0xde77, 0xb1df, 0xde78, 0xde79, 0xde7a, 0xc1c9, 0xb4ef, 0xde7b, /*0xb8-0xbf*/ + 0xde7c, 0xc7a8, 0xd3d8, 0xde7d, 0xc6f9, 0xd1b8, 0xde7e, 0xb9fd, /*0xc0-0xc7*/ + 0xc2f5, 0xde80, 0xde81, 0xde82, 0xde83, 0xde84, 0xd3ad, 0xde85, /*0xc8-0xcf*/ + 0xd4cb, 0xbdfc, 0xde86, 0xe5c2, 0xb7b5, 0xe5c3, 0xde87, 0xde88, /*0xd0-0xd7*/ + 0xbbb9, 0xd5e2, 0xde89, 0xbdf8, 0xd4b6, 0xcea5, 0xc1ac, 0xb3d9, /*0xd8-0xdf*/ + 0xde8a, 0xde8b, 0xccf6, 0xde8c, 0xe5c6, 0xe5c4, 0xe5c8, 0xde8d, /*0xe0-0xe7*/ + 0xe5ca, 0xe5c7, 0xb5cf, 0xc6c8, 0xde8e, 0xb5fc, 0xe5c5, 0xde8f, /*0xe8-0xef*/ + 0xcaf6, 0xde90, 0xde91, 0xe5c9, 0xde92, 0xde93, 0xde94, 0xc3d4, /*0xf0-0xf7*/ + 0xb1c5, 0xbca3, 0xde95, 0xde96, 0xde97, 0xd7b7, 0xde98, 0xde99, /*0xf8-0xff*/ + /* 0x9000 */ + 0xcdcb, 0xcbcd, 0xcaca, 0xccd3, 0xe5cc, 0xe5cb, 0xc4e6, 0xde9a, /*0x00-0x07*/ + 0xde9b, 0xd1a1, 0xd1b7, 0xe5cd, 0xde9c, 0xe5d0, 0xde9d, 0xcdb8, /*0x08-0x0f*/ + 0xd6f0, 0xe5cf, 0xb5dd, 0xde9e, 0xcdbe, 0xde9f, 0xe5d1, 0xb6ba, /*0x10-0x17*/ + 0xdea0, 0xdf40, 0xcda8, 0xb9e4, 0xdf41, 0xcac5, 0xb3d1, 0xcbd9, /*0x18-0x1f*/ + 0xd4ec, 0xe5d2, 0xb7ea, 0xdf42, 0xdf43, 0xdf44, 0xe5ce, 0xdf45, /*0x20-0x27*/ + 0xdf46, 0xdf47, 0xdf48, 0xdf49, 0xdf4a, 0xe5d5, 0xb4fe, 0xe5d6, /*0x28-0x2f*/ + 0xdf4b, 0xdf4c, 0xdf4d, 0xdf4e, 0xdf4f, 0xe5d3, 0xe5d4, 0xdf50, /*0x30-0x37*/ + 0xd2dd, 0xdf51, 0xdf52, 0xc2df, 0xb1c6, 0xdf53, 0xd3e2, 0xdf54, /*0x38-0x3f*/ + 0xdf55, 0xb6dd, 0xcbec, 0xdf56, 0xe5d7, 0xdf57, 0xdf58, 0xd3f6, /*0x40-0x47*/ + 0xdf59, 0xdf5a, 0xdf5b, 0xdf5c, 0xdf5d, 0xb1e9, 0xdf5e, 0xb6f4, /*0x48-0x4f*/ + 0xe5da, 0xe5d8, 0xe5d9, 0xb5c0, 0xdf5f, 0xdf60, 0xdf61, 0xd2c5, /*0x50-0x57*/ + 0xe5dc, 0xdf62, 0xdf63, 0xe5de, 0xdf64, 0xdf65, 0xdf66, 0xdf67, /*0x58-0x5f*/ + 0xdf68, 0xdf69, 0xe5dd, 0xc7b2, 0xdf6a, 0xd2a3, 0xdf6b, 0xdf6c, /*0x60-0x67*/ + 0xe5db, 0xdf6d, 0xdf6e, 0xdf6f, 0xdf70, 0xd4e2, 0xd5da, 0xdf71, /*0x68-0x6f*/ + 0xdf72, 0xdf73, 0xdf74, 0xdf75, 0xe5e0, 0xd7f1, 0xdf76, 0xdf77, /*0x70-0x77*/ + 0xdf78, 0xdf79, 0xdf7a, 0xdf7b, 0xdf7c, 0xe5e1, 0xdf7d, 0xb1dc, /*0x78-0x7f*/ + 0xd1fb, 0xdf7e, 0xe5e2, 0xe5e4, 0xdf80, 0xdf81, 0xdf82, 0xdf83, /*0x80-0x87*/ + 0xe5e3, 0xdf84, 0xdf85, 0xe5e5, 0xdf86, 0xdf87, 0xdf88, 0xdf89, /*0x88-0x8f*/ + 0xdf8a, 0xd2d8, 0xdf8b, 0xb5cb, 0xdf8c, 0xe7df, 0xdf8d, 0xdaf5, /*0x90-0x97*/ + 0xdf8e, 0xdaf8, 0xdf8f, 0xdaf6, 0xdf90, 0xdaf7, 0xdf91, 0xdf92, /*0x98-0x9f*/ + 0xdf93, 0xdafa, 0xd0cf, 0xc4c7, 0xdf94, 0xdf95, 0xb0ee, 0xdf96, /*0xa0-0xa7*/ + 0xdf97, 0xdf98, 0xd0b0, 0xdf99, 0xdaf9, 0xdf9a, 0xd3ca, 0xbaaa, /*0xa8-0xaf*/ + 0xdba2, 0xc7f1, 0xdf9b, 0xdafc, 0xdafb, 0xc9db, 0xdafd, 0xdf9c, /*0xb0-0xb7*/ + 0xdba1, 0xd7de, 0xdafe, 0xc1da, 0xdf9d, 0xdf9e, 0xdba5, 0xdf9f, /*0xb8-0xbf*/ + 0xdfa0, 0xd3f4, 0xe040, 0xe041, 0xdba7, 0xdba4, 0xe042, 0xdba8, /*0xc0-0xc7*/ + 0xe043, 0xe044, 0xbdbc, 0xe045, 0xe046, 0xe047, 0xc0c9, 0xdba3, /*0xc8-0xcf*/ + 0xdba6, 0xd6a3, 0xe048, 0xdba9, 0xe049, 0xe04a, 0xe04b, 0xdbad, /*0xd0-0xd7*/ + 0xe04c, 0xe04d, 0xe04e, 0xdbae, 0xdbac, 0xbac2, 0xe04f, 0xe050, /*0xd8-0xdf*/ + 0xe051, 0xbfa4, 0xdbab, 0xe052, 0xe053, 0xe054, 0xdbaa, 0xd4c7, /*0xe0-0xe7*/ + 0xb2bf, 0xe055, 0xe056, 0xdbaf, 0xe057, 0xb9f9, 0xe058, 0xdbb0, /*0xe8-0xef*/ + 0xe059, 0xe05a, 0xe05b, 0xe05c, 0xb3bb, 0xe05d, 0xe05e, 0xe05f, /*0xf0-0xf7*/ + 0xb5a6, 0xe060, 0xe061, 0xe062, 0xe063, 0xb6bc, 0xdbb1, 0xe064, /*0xf8-0xff*/ + /* 0x9100 */ + 0xe065, 0xe066, 0xb6f5, 0xe067, 0xdbb2, 0xe068, 0xe069, 0xe06a, /*0x00-0x07*/ + 0xe06b, 0xe06c, 0xe06d, 0xe06e, 0xe06f, 0xe070, 0xe071, 0xe072, /*0x08-0x0f*/ + 0xe073, 0xe074, 0xe075, 0xe076, 0xe077, 0xe078, 0xe079, 0xe07a, /*0x10-0x17*/ + 0xe07b, 0xb1c9, 0xe07c, 0xe07d, 0xe07e, 0xe080, 0xdbb4, 0xe081, /*0x18-0x1f*/ + 0xe082, 0xe083, 0xdbb3, 0xdbb5, 0xe084, 0xe085, 0xe086, 0xe087, /*0x20-0x27*/ + 0xe088, 0xe089, 0xe08a, 0xe08b, 0xe08c, 0xe08d, 0xe08e, 0xdbb7, /*0x28-0x2f*/ + 0xe08f, 0xdbb6, 0xe090, 0xe091, 0xe092, 0xe093, 0xe094, 0xe095, /*0x30-0x37*/ + 0xe096, 0xdbb8, 0xe097, 0xe098, 0xe099, 0xe09a, 0xe09b, 0xe09c, /*0x38-0x3f*/ + 0xe09d, 0xe09e, 0xe09f, 0xdbb9, 0xe0a0, 0xe140, 0xdbba, 0xe141, /*0x40-0x47*/ + 0xe142, 0xd3cf, 0xf4fa, 0xc7f5, 0xd7c3, 0xc5e4, 0xf4fc, 0xf4fd, /*0x48-0x4f*/ + 0xf4fb, 0xe143, 0xbec6, 0xe144, 0xe145, 0xe146, 0xe147, 0xd0ef, /*0x50-0x57*/ + 0xe148, 0xe149, 0xb7d3, 0xe14a, 0xe14b, 0xd4cd, 0xccaa, 0xe14c, /*0x58-0x5f*/ + 0xe14d, 0xf5a2, 0xf5a1, 0xbaa8, 0xf4fe, 0xcbd6, 0xe14e, 0xe14f, /*0x60-0x67*/ + 0xe150, 0xf5a4, 0xc0d2, 0xe151, 0xb3ea, 0xe152, 0xcdaa, 0xf5a5, /*0x68-0x6f*/ + 0xf5a3, 0xbdb4, 0xf5a8, 0xe153, 0xf5a9, 0xbdcd, 0xc3b8, 0xbfe1, /*0x70-0x77*/ + 0xcbe1, 0xf5aa, 0xe154, 0xe155, 0xe156, 0xf5a6, 0xf5a7, 0xc4f0, /*0x78-0x7f*/ + 0xe157, 0xe158, 0xe159, 0xe15a, 0xe15b, 0xf5ac, 0xe15c, 0xb4bc, /*0x80-0x87*/ + 0xe15d, 0xd7ed, 0xe15e, 0xb4d7, 0xf5ab, 0xf5ae, 0xe15f, 0xe160, /*0x88-0x8f*/ + 0xf5ad, 0xf5af, 0xd0d1, 0xe161, 0xe162, 0xe163, 0xe164, 0xe165, /*0x90-0x97*/ + 0xe166, 0xe167, 0xc3d1, 0xc8a9, 0xe168, 0xe169, 0xe16a, 0xe16b, /*0x98-0x9f*/ + 0xe16c, 0xe16d, 0xf5b0, 0xf5b1, 0xe16e, 0xe16f, 0xe170, 0xe171, /*0xa0-0xa7*/ + 0xe172, 0xe173, 0xf5b2, 0xe174, 0xe175, 0xf5b3, 0xf5b4, 0xf5b5, /*0xa8-0xaf*/ + 0xe176, 0xe177, 0xe178, 0xe179, 0xf5b7, 0xf5b6, 0xe17a, 0xe17b, /*0xb0-0xb7*/ + 0xe17c, 0xe17d, 0xf5b8, 0xe17e, 0xe180, 0xe181, 0xe182, 0xe183, /*0xb8-0xbf*/ + 0xe184, 0xe185, 0xe186, 0xe187, 0xe188, 0xe189, 0xe18a, 0xb2c9, /*0xc0-0xc7*/ + 0xe18b, 0xd3d4, 0xcacd, 0xe18c, 0xc0ef, 0xd6d8, 0xd2b0, 0xc1bf, /*0xc8-0xcf*/ + 0xe18d, 0xbdf0, 0xe18e, 0xe18f, 0xe190, 0xe191, 0xe192, 0xe193, /*0xd0-0xd7*/ + 0xe194, 0xe195, 0xe196, 0xe197, 0xb8aa, 0xe198, 0xe199, 0xe19a, /*0xd8-0xdf*/ + 0xe19b, 0xe19c, 0xe19d, 0xe19e, 0xe19f, 0xe1a0, 0xe240, 0xe241, /*0xe0-0xe7*/ + 0xe242, 0xe243, 0xe244, 0xe245, 0xe246, 0xe247, 0xe248, 0xe249, /*0xe8-0xef*/ + 0xe24a, 0xe24b, 0xe24c, 0xe24d, 0xe24e, 0xe24f, 0xe250, 0xe251, /*0xf0-0xf7*/ + 0xe252, 0xe253, 0xe254, 0xe255, 0xe256, 0xe257, 0xe258, 0xe259, /*0xf8-0xff*/ + /* 0x9200 */ + 0xe25a, 0xe25b, 0xe25c, 0xe25d, 0xe25e, 0xe25f, 0xe260, 0xe261, /*0x00-0x07*/ + 0xe262, 0xe263, 0xe264, 0xe265, 0xe266, 0xe267, 0xe268, 0xe269, /*0x08-0x0f*/ + 0xe26a, 0xe26b, 0xe26c, 0xe26d, 0xe26e, 0xe26f, 0xe270, 0xe271, /*0x10-0x17*/ + 0xe272, 0xe273, 0xe274, 0xe275, 0xe276, 0xe277, 0xe278, 0xe279, /*0x18-0x1f*/ + 0xe27a, 0xe27b, 0xe27c, 0xe27d, 0xe27e, 0xe280, 0xe281, 0xe282, /*0x20-0x27*/ + 0xe283, 0xe284, 0xe285, 0xe286, 0xe287, 0xe288, 0xe289, 0xe28a, /*0x28-0x2f*/ + 0xe28b, 0xe28c, 0xe28d, 0xe28e, 0xe28f, 0xe290, 0xe291, 0xe292, /*0x30-0x37*/ + 0xe293, 0xe294, 0xe295, 0xe296, 0xe297, 0xe298, 0xe299, 0xe29a, /*0x38-0x3f*/ + 0xe29b, 0xe29c, 0xe29d, 0xe29e, 0xe29f, 0xe2a0, 0xe340, 0xe341, /*0x40-0x47*/ + 0xe342, 0xe343, 0xe344, 0xe345, 0xe346, 0xe347, 0xe348, 0xe349, /*0x48-0x4f*/ + 0xe34a, 0xe34b, 0xe34c, 0xe34d, 0xe34e, 0xe34f, 0xe350, 0xe351, /*0x50-0x57*/ + 0xe352, 0xe353, 0xe354, 0xe355, 0xe356, 0xe357, 0xe358, 0xe359, /*0x58-0x5f*/ + 0xe35a, 0xe35b, 0xe35c, 0xe35d, 0xe35e, 0xe35f, 0xe360, 0xe361, /*0x60-0x67*/ + 0xe362, 0xe363, 0xe364, 0xe365, 0xe366, 0xe367, 0xe368, 0xe369, /*0x68-0x6f*/ + 0xe36a, 0xe36b, 0xe36c, 0xe36d, 0xbcf8, 0xe36e, 0xe36f, 0xe370, /*0x70-0x77*/ + 0xe371, 0xe372, 0xe373, 0xe374, 0xe375, 0xe376, 0xe377, 0xe378, /*0x78-0x7f*/ + 0xe379, 0xe37a, 0xe37b, 0xe37c, 0xe37d, 0xe37e, 0xe380, 0xe381, /*0x80-0x87*/ + 0xe382, 0xe383, 0xe384, 0xe385, 0xe386, 0xe387, 0xf6c6, 0xe388, /*0x88-0x8f*/ + 0xe389, 0xe38a, 0xe38b, 0xe38c, 0xe38d, 0xe38e, 0xe38f, 0xe390, /*0x90-0x97*/ + 0xe391, 0xe392, 0xe393, 0xe394, 0xe395, 0xe396, 0xe397, 0xe398, /*0x98-0x9f*/ + 0xe399, 0xe39a, 0xe39b, 0xe39c, 0xe39d, 0xe39e, 0xe39f, 0xe3a0, /*0xa0-0xa7*/ + 0xe440, 0xe441, 0xe442, 0xe443, 0xe444, 0xe445, 0xf6c7, 0xe446, /*0xa8-0xaf*/ + 0xe447, 0xe448, 0xe449, 0xe44a, 0xe44b, 0xe44c, 0xe44d, 0xe44e, /*0xb0-0xb7*/ + 0xe44f, 0xe450, 0xe451, 0xe452, 0xe453, 0xe454, 0xe455, 0xe456, /*0xb8-0xbf*/ + 0xe457, 0xe458, 0xe459, 0xe45a, 0xe45b, 0xe45c, 0xe45d, 0xe45e, /*0xc0-0xc7*/ + 0xf6c8, 0xe45f, 0xe460, 0xe461, 0xe462, 0xe463, 0xe464, 0xe465, /*0xc8-0xcf*/ + 0xe466, 0xe467, 0xe468, 0xe469, 0xe46a, 0xe46b, 0xe46c, 0xe46d, /*0xd0-0xd7*/ + 0xe46e, 0xe46f, 0xe470, 0xe471, 0xe472, 0xe473, 0xe474, 0xe475, /*0xd8-0xdf*/ + 0xe476, 0xe477, 0xe478, 0xe479, 0xe47a, 0xe47b, 0xe47c, 0xe47d, /*0xe0-0xe7*/ + 0xe47e, 0xe480, 0xe481, 0xe482, 0xe483, 0xe484, 0xe485, 0xe486, /*0xe8-0xef*/ + 0xe487, 0xe488, 0xe489, 0xe48a, 0xe48b, 0xe48c, 0xe48d, 0xe48e, /*0xf0-0xf7*/ + 0xe48f, 0xe490, 0xe491, 0xe492, 0xe493, 0xe494, 0xe495, 0xe496, /*0xf8-0xff*/ + /* 0x9300 */ + 0xe497, 0xe498, 0xe499, 0xe49a, 0xe49b, 0xe49c, 0xe49d, 0xe49e, /*0x00-0x07*/ + 0xe49f, 0xe4a0, 0xe540, 0xe541, 0xe542, 0xe543, 0xe544, 0xe545, /*0x08-0x0f*/ + 0xe546, 0xe547, 0xe548, 0xe549, 0xe54a, 0xe54b, 0xe54c, 0xe54d, /*0x10-0x17*/ + 0xe54e, 0xe54f, 0xe550, 0xe551, 0xe552, 0xe553, 0xe554, 0xe555, /*0x18-0x1f*/ + 0xe556, 0xe557, 0xe558, 0xe559, 0xe55a, 0xe55b, 0xe55c, 0xe55d, /*0x20-0x27*/ + 0xe55e, 0xe55f, 0xe560, 0xe561, 0xe562, 0xe563, 0xe564, 0xe565, /*0x28-0x2f*/ + 0xe566, 0xe567, 0xe568, 0xe569, 0xe56a, 0xe56b, 0xe56c, 0xe56d, /*0x30-0x37*/ + 0xe56e, 0xe56f, 0xe570, 0xe571, 0xe572, 0xe573, 0xf6c9, 0xe574, /*0x38-0x3f*/ + 0xe575, 0xe576, 0xe577, 0xe578, 0xe579, 0xe57a, 0xe57b, 0xe57c, /*0x40-0x47*/ + 0xe57d, 0xe57e, 0xe580, 0xe581, 0xe582, 0xe583, 0xe584, 0xe585, /*0x48-0x4f*/ + 0xe586, 0xe587, 0xe588, 0xe589, 0xe58a, 0xe58b, 0xe58c, 0xe58d, /*0x50-0x57*/ + 0xe58e, 0xe58f, 0xe590, 0xe591, 0xe592, 0xe593, 0xe594, 0xe595, /*0x58-0x5f*/ + 0xe596, 0xe597, 0xe598, 0xe599, 0xe59a, 0xe59b, 0xe59c, 0xe59d, /*0x60-0x67*/ + 0xe59e, 0xe59f, 0xf6ca, 0xe5a0, 0xe640, 0xe641, 0xe642, 0xe643, /*0x68-0x6f*/ + 0xe644, 0xe645, 0xe646, 0xe647, 0xe648, 0xe649, 0xe64a, 0xe64b, /*0x70-0x77*/ + 0xe64c, 0xe64d, 0xe64e, 0xe64f, 0xe650, 0xe651, 0xe652, 0xe653, /*0x78-0x7f*/ + 0xe654, 0xe655, 0xe656, 0xe657, 0xe658, 0xe659, 0xe65a, 0xe65b, /*0x80-0x87*/ + 0xe65c, 0xe65d, 0xe65e, 0xe65f, 0xe660, 0xe661, 0xe662, 0xf6cc, /*0x88-0x8f*/ + 0xe663, 0xe664, 0xe665, 0xe666, 0xe667, 0xe668, 0xe669, 0xe66a, /*0x90-0x97*/ + 0xe66b, 0xe66c, 0xe66d, 0xe66e, 0xe66f, 0xe670, 0xe671, 0xe672, /*0x98-0x9f*/ + 0xe673, 0xe674, 0xe675, 0xe676, 0xe677, 0xe678, 0xe679, 0xe67a, /*0xa0-0xa7*/ + 0xe67b, 0xe67c, 0xe67d, 0xe67e, 0xe680, 0xe681, 0xe682, 0xe683, /*0xa8-0xaf*/ + 0xe684, 0xe685, 0xe686, 0xe687, 0xe688, 0xe689, 0xe68a, 0xe68b, /*0xb0-0xb7*/ + 0xe68c, 0xe68d, 0xe68e, 0xe68f, 0xe690, 0xe691, 0xe692, 0xe693, /*0xb8-0xbf*/ + 0xe694, 0xe695, 0xe696, 0xe697, 0xe698, 0xe699, 0xe69a, 0xe69b, /*0xc0-0xc7*/ + 0xe69c, 0xe69d, 0xf6cb, 0xe69e, 0xe69f, 0xe6a0, 0xe740, 0xe741, /*0xc8-0xcf*/ + 0xe742, 0xe743, 0xe744, 0xe745, 0xe746, 0xe747, 0xf7e9, 0xe748, /*0xd0-0xd7*/ + 0xe749, 0xe74a, 0xe74b, 0xe74c, 0xe74d, 0xe74e, 0xe74f, 0xe750, /*0xd8-0xdf*/ + 0xe751, 0xe752, 0xe753, 0xe754, 0xe755, 0xe756, 0xe757, 0xe758, /*0xe0-0xe7*/ + 0xe759, 0xe75a, 0xe75b, 0xe75c, 0xe75d, 0xe75e, 0xe75f, 0xe760, /*0xe8-0xef*/ + 0xe761, 0xe762, 0xe763, 0xe764, 0xe765, 0xe766, 0xe767, 0xe768, /*0xf0-0xf7*/ + 0xe769, 0xe76a, 0xe76b, 0xe76c, 0xe76d, 0xe76e, 0xe76f, 0xe770, /*0xf8-0xff*/ + /* 0x9400 */ + 0xe771, 0xe772, 0xe773, 0xe774, 0xe775, 0xe776, 0xe777, 0xe778, /*0x00-0x07*/ + 0xe779, 0xe77a, 0xe77b, 0xe77c, 0xe77d, 0xe77e, 0xe780, 0xe781, /*0x08-0x0f*/ + 0xe782, 0xe783, 0xe784, 0xe785, 0xe786, 0xe787, 0xe788, 0xe789, /*0x10-0x17*/ + 0xe78a, 0xe78b, 0xe78c, 0xe78d, 0xe78e, 0xe78f, 0xe790, 0xe791, /*0x18-0x1f*/ + 0xe792, 0xe793, 0xe794, 0xe795, 0xe796, 0xe797, 0xe798, 0xe799, /*0x20-0x27*/ + 0xe79a, 0xe79b, 0xe79c, 0xe79d, 0xe79e, 0xe79f, 0xe7a0, 0xe840, /*0x28-0x2f*/ + 0xe841, 0xe842, 0xe843, 0xe844, 0xe845, 0xe846, 0xe847, 0xe848, /*0x30-0x37*/ + 0xe849, 0xe84a, 0xe84b, 0xe84c, 0xe84d, 0xe84e, 0xf6cd, 0xe84f, /*0x38-0x3f*/ + 0xe850, 0xe851, 0xe852, 0xe853, 0xe854, 0xe855, 0xe856, 0xe857, /*0x40-0x47*/ + 0xe858, 0xe859, 0xe85a, 0xe85b, 0xe85c, 0xe85d, 0xe85e, 0xe85f, /*0x48-0x4f*/ + 0xe860, 0xe861, 0xe862, 0xe863, 0xe864, 0xe865, 0xe866, 0xe867, /*0x50-0x57*/ + 0xe868, 0xe869, 0xe86a, 0xe86b, 0xe86c, 0xe86d, 0xe86e, 0xe86f, /*0x58-0x5f*/ + 0xe870, 0xe871, 0xe872, 0xe873, 0xe874, 0xe875, 0xe876, 0xe877, /*0x60-0x67*/ + 0xe878, 0xe879, 0xe87a, 0xf6ce, 0xe87b, 0xe87c, 0xe87d, 0xe87e, /*0x68-0x6f*/ + 0xe880, 0xe881, 0xe882, 0xe883, 0xe884, 0xe885, 0xe886, 0xe887, /*0x70-0x77*/ + 0xe888, 0xe889, 0xe88a, 0xe88b, 0xe88c, 0xe88d, 0xe88e, 0xe88f, /*0x78-0x7f*/ + 0xe890, 0xe891, 0xe892, 0xe893, 0xe894, 0xeec4, 0xeec5, 0xeec6, /*0x80-0x87*/ + 0xd5eb, 0xb6a4, 0xeec8, 0xeec7, 0xeec9, 0xeeca, 0xc7a5, 0xeecb, /*0x88-0x8f*/ + 0xeecc, 0xe895, 0xb7b0, 0xb5f6, 0xeecd, 0xeecf, 0xe896, 0xeece, /*0x90-0x97*/ + 0xe897, 0xb8c6, 0xeed0, 0xeed1, 0xeed2, 0xb6db, 0xb3ae, 0xd6d3, /*0x98-0x9f*/ + 0xc4c6, 0xb1b5, 0xb8d6, 0xeed3, 0xeed4, 0xd4bf, 0xc7d5, 0xbefb, /*0xa0-0xa7*/ + 0xced9, 0xb9b3, 0xeed6, 0xeed5, 0xeed8, 0xeed7, 0xc5a5, 0xeed9, /*0xa8-0xaf*/ + 0xeeda, 0xc7ae, 0xeedb, 0xc7af, 0xeedc, 0xb2a7, 0xeedd, 0xeede, /*0xb0-0xb7*/ + 0xeedf, 0xeee0, 0xeee1, 0xd7ea, 0xeee2, 0xeee3, 0xbcd8, 0xeee4, /*0xb8-0xbf*/ + 0xd3cb, 0xccfa, 0xb2ac, 0xc1e5, 0xeee5, 0xc7a6, 0xc3ad, 0xe898, /*0xc0-0xc7*/ + 0xeee6, 0xeee7, 0xeee8, 0xeee9, 0xeeea, 0xeeeb, 0xeeec, 0xe899, /*0xc8-0xcf*/ + 0xeeed, 0xeeee, 0xeeef, 0xe89a, 0xe89b, 0xeef0, 0xeef1, 0xeef2, /*0xd0-0xd7*/ + 0xeef4, 0xeef3, 0xe89c, 0xeef5, 0xcdad, 0xc2c1, 0xeef6, 0xeef7, /*0xd8-0xdf*/ + 0xeef8, 0xd5a1, 0xeef9, 0xcfb3, 0xeefa, 0xeefb, 0xe89d, 0xeefc, /*0xe0-0xe7*/ + 0xeefd, 0xefa1, 0xeefe, 0xefa2, 0xb8f5, 0xc3fa, 0xefa3, 0xefa4, /*0xe8-0xef*/ + 0xbdc2, 0xd2bf, 0xb2f9, 0xefa5, 0xefa6, 0xefa7, 0xd2f8, 0xefa8, /*0xf0-0xf7*/ + 0xd6fd, 0xefa9, 0xc6cc, 0xe89e, 0xefaa, 0xefab, 0xc1b4, 0xefac, /*0xf8-0xff*/ + /* 0x9500 */ + 0xcffa, 0xcbf8, 0xefae, 0xefad, 0xb3fa, 0xb9f8, 0xefaf, 0xefb0, /*0x00-0x07*/ + 0xd0e2, 0xefb1, 0xefb2, 0xb7e6, 0xd0bf, 0xefb3, 0xefb4, 0xefb5, /*0x08-0x0f*/ + 0xc8f1, 0xcce0, 0xefb6, 0xefb7, 0xefb8, 0xefb9, 0xefba, 0xd5e0, /*0x10-0x17*/ + 0xefbb, 0xb4ed, 0xc3aa, 0xefbc, 0xe89f, 0xefbd, 0xefbe, 0xefbf, /*0x18-0x1f*/ + 0xe8a0, 0xcefd, 0xefc0, 0xc2e0, 0xb4b8, 0xd7b6, 0xbdf5, 0xe940, /*0x20-0x27*/ + 0xcfc7, 0xefc3, 0xefc1, 0xefc2, 0xefc4, 0xb6a7, 0xbcfc, 0xbee2, /*0x28-0x2f*/ + 0xc3cc, 0xefc5, 0xefc6, 0xe941, 0xefc7, 0xefcf, 0xefc8, 0xefc9, /*0x30-0x37*/ + 0xefca, 0xc7c2, 0xeff1, 0xb6cd, 0xefcb, 0xe942, 0xefcc, 0xefcd, /*0x38-0x3f*/ + 0xb6c6, 0xc3be, 0xefce, 0xe943, 0xefd0, 0xefd1, 0xefd2, 0xd5f2, /*0x40-0x47*/ + 0xe944, 0xefd3, 0xc4f7, 0xe945, 0xefd4, 0xc4f8, 0xefd5, 0xefd6, /*0x48-0x4f*/ + 0xb8e4, 0xb0f7, 0xefd7, 0xefd8, 0xefd9, 0xe946, 0xefda, 0xefdb, /*0x50-0x57*/ + 0xefdc, 0xefdd, 0xe947, 0xefde, 0xbeb5, 0xefe1, 0xefdf, 0xefe0, /*0x58-0x5f*/ + 0xe948, 0xefe2, 0xefe3, 0xc1cd, 0xefe4, 0xefe5, 0xefe6, 0xefe7, /*0x60-0x67*/ + 0xefe8, 0xefe9, 0xefea, 0xefeb, 0xefec, 0xc0d8, 0xe949, 0xefed, /*0x68-0x6f*/ + 0xc1ad, 0xefee, 0xefef, 0xeff0, 0xe94a, 0xe94b, 0xcfe2, 0xe94c, /*0x70-0x77*/ + 0xe94d, 0xe94e, 0xe94f, 0xe950, 0xe951, 0xe952, 0xe953, 0xb3a4, /*0x78-0x7f*/ + 0xe954, 0xe955, 0xe956, 0xe957, 0xe958, 0xe959, 0xe95a, 0xe95b, /*0x80-0x87*/ + 0xe95c, 0xe95d, 0xe95e, 0xe95f, 0xe960, 0xe961, 0xe962, 0xe963, /*0x88-0x8f*/ + 0xe964, 0xe965, 0xe966, 0xe967, 0xe968, 0xe969, 0xe96a, 0xe96b, /*0x90-0x97*/ + 0xe96c, 0xe96d, 0xe96e, 0xe96f, 0xe970, 0xe971, 0xe972, 0xe973, /*0x98-0x9f*/ + 0xe974, 0xe975, 0xe976, 0xe977, 0xe978, 0xe979, 0xe97a, 0xe97b, /*0xa0-0xa7*/ + 0xe97c, 0xe97d, 0xe97e, 0xe980, 0xe981, 0xe982, 0xe983, 0xe984, /*0xa8-0xaf*/ + 0xe985, 0xe986, 0xe987, 0xe988, 0xe989, 0xe98a, 0xe98b, 0xe98c, /*0xb0-0xb7*/ + 0xe98d, 0xe98e, 0xe98f, 0xe990, 0xe991, 0xe992, 0xe993, 0xe994, /*0xb8-0xbf*/ + 0xe995, 0xe996, 0xe997, 0xe998, 0xe999, 0xe99a, 0xe99b, 0xe99c, /*0xc0-0xc7*/ + 0xe99d, 0xe99e, 0xe99f, 0xe9a0, 0xea40, 0xea41, 0xea42, 0xea43, /*0xc8-0xcf*/ + 0xea44, 0xea45, 0xea46, 0xea47, 0xea48, 0xea49, 0xea4a, 0xea4b, /*0xd0-0xd7*/ + 0xea4c, 0xea4d, 0xea4e, 0xea4f, 0xea50, 0xea51, 0xea52, 0xea53, /*0xd8-0xdf*/ + 0xea54, 0xea55, 0xea56, 0xea57, 0xea58, 0xea59, 0xea5a, 0xea5b, /*0xe0-0xe7*/ + 0xc3c5, 0xe3c5, 0xc9c1, 0xe3c6, 0xea5c, 0xb1d5, 0xceca, 0xb4b3, /*0xe8-0xef*/ + 0xc8f2, 0xe3c7, 0xcfd0, 0xe3c8, 0xbce4, 0xe3c9, 0xe3ca, 0xc3c6, /*0xf0-0xf7*/ + 0xd5a2, 0xc4d6, 0xb9eb, 0xcec5, 0xe3cb, 0xc3f6, 0xe3cc, 0xea5d, /*0xf8-0xff*/ + /* 0x9600 */ + 0xb7a7, 0xb8f3, 0xbad2, 0xe3cd, 0xe3ce, 0xd4c4, 0xe3cf, 0xea5e, /*0x00-0x07*/ + 0xe3d0, 0xd1cb, 0xe3d1, 0xe3d2, 0xe3d3, 0xe3d4, 0xd1d6, 0xe3d5, /*0x08-0x0f*/ + 0xb2fb, 0xc0bb, 0xe3d6, 0xea5f, 0xc0ab, 0xe3d7, 0xe3d8, 0xe3d9, /*0x10-0x17*/ + 0xea60, 0xe3da, 0xe3db, 0xea61, 0xb8b7, 0xdae2, 0xea62, 0xb6d3, /*0x18-0x1f*/ + 0xea63, 0xdae4, 0xdae3, 0xea64, 0xea65, 0xea66, 0xea67, 0xea68, /*0x20-0x27*/ + 0xea69, 0xea6a, 0xdae6, 0xea6b, 0xea6c, 0xea6d, 0xc8ee, 0xea6e, /*0x28-0x2f*/ + 0xea6f, 0xdae5, 0xb7c0, 0xd1f4, 0xd2f5, 0xd5f3, 0xbdd7, 0xea70, /*0x30-0x37*/ + 0xea71, 0xea72, 0xea73, 0xd7e8, 0xdae8, 0xdae7, 0xea74, 0xb0a2, /*0x38-0x3f*/ + 0xcdd3, 0xea75, 0xdae9, 0xea76, 0xb8bd, 0xbcca, 0xc2bd, 0xc2a4, /*0x40-0x47*/ + 0xb3c2, 0xdaea, 0xea77, 0xc2aa, 0xc4b0, 0xbdb5, 0xea78, 0xea79, /*0x48-0x4f*/ + 0xcfde, 0xea7a, 0xea7b, 0xea7c, 0xdaeb, 0xc9c2, 0xea7d, 0xea7e, /*0x50-0x57*/ + 0xea80, 0xea81, 0xea82, 0xb1dd, 0xea83, 0xea84, 0xea85, 0xdaec, /*0x58-0x5f*/ + 0xea86, 0xb6b8, 0xd4ba, 0xea87, 0xb3fd, 0xea88, 0xea89, 0xdaed, /*0x60-0x67*/ + 0xd4c9, 0xcfd5, 0xc5e3, 0xea8a, 0xdaee, 0xea8b, 0xea8c, 0xea8d, /*0x68-0x6f*/ + 0xea8e, 0xea8f, 0xdaef, 0xea90, 0xdaf0, 0xc1ea, 0xccd5, 0xcfdd, /*0x70-0x77*/ + 0xea91, 0xea92, 0xea93, 0xea94, 0xea95, 0xea96, 0xea97, 0xea98, /*0x78-0x7f*/ + 0xea99, 0xea9a, 0xea9b, 0xea9c, 0xea9d, 0xd3e7, 0xc2a1, 0xea9e, /*0x80-0x87*/ + 0xdaf1, 0xea9f, 0xeaa0, 0xcbe5, 0xeb40, 0xdaf2, 0xeb41, 0xcbe6, /*0x88-0x8f*/ + 0xd2fe, 0xeb42, 0xeb43, 0xeb44, 0xb8f4, 0xeb45, 0xeb46, 0xdaf3, /*0x90-0x97*/ + 0xb0af, 0xcfb6, 0xeb47, 0xeb48, 0xd5cf, 0xeb49, 0xeb4a, 0xeb4b, /*0x98-0x9f*/ + 0xeb4c, 0xeb4d, 0xeb4e, 0xeb4f, 0xeb50, 0xeb51, 0xeb52, 0xcbed, /*0xa0-0xa7*/ + 0xeb53, 0xeb54, 0xeb55, 0xeb56, 0xeb57, 0xeb58, 0xeb59, 0xeb5a, /*0xa8-0xaf*/ + 0xdaf4, 0xeb5b, 0xeb5c, 0xe3c4, 0xeb5d, 0xeb5e, 0xc1a5, 0xeb5f, /*0xb0-0xb7*/ + 0xeb60, 0xf6bf, 0xeb61, 0xeb62, 0xf6c0, 0xf6c1, 0xc4d1, 0xeb63, /*0xb8-0xbf*/ + 0xc8b8, 0xd1e3, 0xeb64, 0xeb65, 0xd0db, 0xd1c5, 0xbcaf, 0xb9cd, /*0xc0-0xc7*/ + 0xeb66, 0xeff4, 0xeb67, 0xeb68, 0xb4c6, 0xd3ba, 0xf6c2, 0xb3fb, /*0xc8-0xcf*/ + 0xeb69, 0xeb6a, 0xf6c3, 0xeb6b, 0xeb6c, 0xb5f1, 0xeb6d, 0xeb6e, /*0xd0-0xd7*/ + 0xeb6f, 0xeb70, 0xeb71, 0xeb72, 0xeb73, 0xeb74, 0xeb75, 0xeb76, /*0xd8-0xdf*/ + 0xf6c5, 0xeb77, 0xeb78, 0xeb79, 0xeb7a, 0xeb7b, 0xeb7c, 0xeb7d, /*0xe0-0xe7*/ + 0xd3ea, 0xf6a7, 0xd1a9, 0xeb7e, 0xeb80, 0xeb81, 0xeb82, 0xf6a9, /*0xe8-0xef*/ + 0xeb83, 0xeb84, 0xeb85, 0xf6a8, 0xeb86, 0xeb87, 0xc1e3, 0xc0d7, /*0xf0-0xf7*/ + 0xeb88, 0xb1a2, 0xeb89, 0xeb8a, 0xeb8b, 0xeb8c, 0xceed, 0xeb8d, /*0xf8-0xff*/ + /* 0x9700 */ + 0xd0e8, 0xf6ab, 0xeb8e, 0xeb8f, 0xcff6, 0xeb90, 0xf6aa, 0xd5f0, /*0x00-0x07*/ + 0xf6ac, 0xc3b9, 0xeb91, 0xeb92, 0xeb93, 0xbbf4, 0xf6ae, 0xf6ad, /*0x08-0x0f*/ + 0xeb94, 0xeb95, 0xeb96, 0xc4de, 0xeb97, 0xeb98, 0xc1d8, 0xeb99, /*0x10-0x17*/ + 0xeb9a, 0xeb9b, 0xeb9c, 0xeb9d, 0xcbaa, 0xeb9e, 0xcfbc, 0xeb9f, /*0x18-0x1f*/ + 0xeba0, 0xec40, 0xec41, 0xec42, 0xec43, 0xec44, 0xec45, 0xec46, /*0x20-0x27*/ + 0xec47, 0xec48, 0xf6af, 0xec49, 0xec4a, 0xf6b0, 0xec4b, 0xec4c, /*0x28-0x2f*/ + 0xf6b1, 0xec4d, 0xc2b6, 0xec4e, 0xec4f, 0xec50, 0xec51, 0xec52, /*0x30-0x37*/ + 0xb0d4, 0xc5f9, 0xec53, 0xec54, 0xec55, 0xec56, 0xf6b2, 0xec57, /*0x38-0x3f*/ + 0xec58, 0xec59, 0xec5a, 0xec5b, 0xec5c, 0xec5d, 0xec5e, 0xec5f, /*0x40-0x47*/ + 0xec60, 0xec61, 0xec62, 0xec63, 0xec64, 0xec65, 0xec66, 0xec67, /*0x48-0x4f*/ + 0xec68, 0xec69, 0xc7e0, 0xf6a6, 0xec6a, 0xec6b, 0xbeb8, 0xec6c, /*0x50-0x57*/ + 0xec6d, 0xbeb2, 0xec6e, 0xb5e5, 0xec6f, 0xec70, 0xb7c7, 0xec71, /*0x58-0x5f*/ + 0xbfbf, 0xc3d2, 0xc3e6, 0xec72, 0xec73, 0xd8cc, 0xec74, 0xec75, /*0x60-0x67*/ + 0xec76, 0xb8ef, 0xec77, 0xec78, 0xec79, 0xec7a, 0xec7b, 0xec7c, /*0x68-0x6f*/ + 0xec7d, 0xec7e, 0xec80, 0xbdf9, 0xd1a5, 0xec81, 0xb0d0, 0xec82, /*0x70-0x77*/ + 0xec83, 0xec84, 0xec85, 0xec86, 0xf7b0, 0xec87, 0xec88, 0xec89, /*0x78-0x7f*/ + 0xec8a, 0xec8b, 0xec8c, 0xec8d, 0xec8e, 0xf7b1, 0xec8f, 0xec90, /*0x80-0x87*/ + 0xec91, 0xec92, 0xec93, 0xd0ac, 0xec94, 0xb0b0, 0xec95, 0xec96, /*0x88-0x8f*/ + 0xec97, 0xf7b2, 0xf7b3, 0xec98, 0xf7b4, 0xec99, 0xec9a, 0xec9b, /*0x90-0x97*/ + 0xc7ca, 0xec9c, 0xec9d, 0xec9e, 0xec9f, 0xeca0, 0xed40, 0xed41, /*0x98-0x9f*/ + 0xbecf, 0xed42, 0xed43, 0xf7b7, 0xed44, 0xed45, 0xed46, 0xed47, /*0xa0-0xa7*/ + 0xed48, 0xed49, 0xed4a, 0xf7b6, 0xed4b, 0xb1de, 0xed4c, 0xf7b5, /*0xa8-0xaf*/ + 0xed4d, 0xed4e, 0xf7b8, 0xed4f, 0xf7b9, 0xed50, 0xed51, 0xed52, /*0xb0-0xb7*/ + 0xed53, 0xed54, 0xed55, 0xed56, 0xed57, 0xed58, 0xed59, 0xed5a, /*0xb8-0xbf*/ + 0xed5b, 0xed5c, 0xed5d, 0xed5e, 0xed5f, 0xed60, 0xed61, 0xed62, /*0xc0-0xc7*/ + 0xed63, 0xed64, 0xed65, 0xed66, 0xed67, 0xed68, 0xed69, 0xed6a, /*0xc8-0xcf*/ + 0xed6b, 0xed6c, 0xed6d, 0xed6e, 0xed6f, 0xed70, 0xed71, 0xed72, /*0xd0-0xd7*/ + 0xed73, 0xed74, 0xed75, 0xed76, 0xed77, 0xed78, 0xed79, 0xed7a, /*0xd8-0xdf*/ + 0xed7b, 0xed7c, 0xed7d, 0xed7e, 0xed80, 0xed81, 0xcea4, 0xc8cd, /*0xe0-0xe7*/ + 0xed82, 0xbaab, 0xe8b8, 0xe8b9, 0xe8ba, 0xbec2, 0xed83, 0xed84, /*0xe8-0xef*/ + 0xed85, 0xed86, 0xed87, 0xd2f4, 0xed88, 0xd4cf, 0xc9d8, 0xed89, /*0xf0-0xf7*/ + 0xed8a, 0xed8b, 0xed8c, 0xed8d, 0xed8e, 0xed8f, 0xed90, 0xed91, /*0xf8-0xff*/ + /* 0x9800 */ + 0xed92, 0xed93, 0xed94, 0xed95, 0xed96, 0xed97, 0xed98, 0xed99, /*0x00-0x07*/ + 0xed9a, 0xed9b, 0xed9c, 0xed9d, 0xed9e, 0xed9f, 0xeda0, 0xee40, /*0x08-0x0f*/ + 0xee41, 0xee42, 0xee43, 0xee44, 0xee45, 0xee46, 0xee47, 0xee48, /*0x10-0x17*/ + 0xee49, 0xee4a, 0xee4b, 0xee4c, 0xee4d, 0xee4e, 0xee4f, 0xee50, /*0x18-0x1f*/ + 0xee51, 0xee52, 0xee53, 0xee54, 0xee55, 0xee56, 0xee57, 0xee58, /*0x20-0x27*/ + 0xee59, 0xee5a, 0xee5b, 0xee5c, 0xee5d, 0xee5e, 0xee5f, 0xee60, /*0x28-0x2f*/ + 0xee61, 0xee62, 0xee63, 0xee64, 0xee65, 0xee66, 0xee67, 0xee68, /*0x30-0x37*/ + 0xee69, 0xee6a, 0xee6b, 0xee6c, 0xee6d, 0xee6e, 0xee6f, 0xee70, /*0x38-0x3f*/ + 0xee71, 0xee72, 0xee73, 0xee74, 0xee75, 0xee76, 0xee77, 0xee78, /*0x40-0x47*/ + 0xee79, 0xee7a, 0xee7b, 0xee7c, 0xee7d, 0xee7e, 0xee80, 0xee81, /*0x48-0x4f*/ + 0xee82, 0xee83, 0xee84, 0xee85, 0xee86, 0xee87, 0xee88, 0xee89, /*0x50-0x57*/ + 0xee8a, 0xee8b, 0xee8c, 0xee8d, 0xee8e, 0xee8f, 0xee90, 0xee91, /*0x58-0x5f*/ + 0xee92, 0xee93, 0xee94, 0xee95, 0xee96, 0xee97, 0xee98, 0xee99, /*0x60-0x67*/ + 0xee9a, 0xee9b, 0xee9c, 0xee9d, 0xee9e, 0xee9f, 0xeea0, 0xef40, /*0x68-0x6f*/ + 0xef41, 0xef42, 0xef43, 0xef44, 0xef45, 0xd2b3, 0xb6a5, 0xc7ea, /*0x70-0x77*/ + 0xf1fc, 0xcfee, 0xcbb3, 0xd0eb, 0xe7ef, 0xcde7, 0xb9cb, 0xb6d9, /*0x78-0x7f*/ + 0xf1fd, 0xb0e4, 0xcbcc, 0xf1fe, 0xd4a4, 0xc2ad, 0xc1ec, 0xc6c4, /*0x80-0x87*/ + 0xbeb1, 0xf2a1, 0xbcd5, 0xef46, 0xf2a2, 0xf2a3, 0xef47, 0xf2a4, /*0x88-0x8f*/ + 0xd2c3, 0xc6b5, 0xef48, 0xcdc7, 0xf2a5, 0xef49, 0xd3b1, 0xbfc5, /*0x90-0x97*/ + 0xcce2, 0xef4a, 0xf2a6, 0xf2a7, 0xd1d5, 0xb6ee, 0xf2a8, 0xf2a9, /*0x98-0x9f*/ + 0xb5df, 0xf2aa, 0xf2ab, 0xef4b, 0xb2fc, 0xf2ac, 0xf2ad, 0xc8a7, /*0xa0-0xa7*/ + 0xef4c, 0xef4d, 0xef4e, 0xef4f, 0xef50, 0xef51, 0xef52, 0xef53, /*0xa8-0xaf*/ + 0xef54, 0xef55, 0xef56, 0xef57, 0xef58, 0xef59, 0xef5a, 0xef5b, /*0xb0-0xb7*/ + 0xef5c, 0xef5d, 0xef5e, 0xef5f, 0xef60, 0xef61, 0xef62, 0xef63, /*0xb8-0xbf*/ + 0xef64, 0xef65, 0xef66, 0xef67, 0xef68, 0xef69, 0xef6a, 0xef6b, /*0xc0-0xc7*/ + 0xef6c, 0xef6d, 0xef6e, 0xef6f, 0xef70, 0xef71, 0xb7e7, 0xef72, /*0xc8-0xcf*/ + 0xef73, 0xeca9, 0xecaa, 0xecab, 0xef74, 0xecac, 0xef75, 0xef76, /*0xd0-0xd7*/ + 0xc6ae, 0xecad, 0xecae, 0xef77, 0xef78, 0xef79, 0xb7c9, 0xcab3, /*0xd8-0xdf*/ + 0xef7a, 0xef7b, 0xef7c, 0xef7d, 0xef7e, 0xef80, 0xef81, 0xe2b8, /*0xe0-0xe7*/ + 0xf7cf, 0xef82, 0xef83, 0xef84, 0xef85, 0xef86, 0xef87, 0xef88, /*0xe8-0xef*/ + 0xef89, 0xef8a, 0xef8b, 0xef8c, 0xef8d, 0xef8e, 0xef8f, 0xef90, /*0xf0-0xf7*/ + 0xef91, 0xef92, 0xef93, 0xef94, 0xef95, 0xef96, 0xef97, 0xef98, /*0xf8-0xff*/ + /* 0x9900 */ + 0xef99, 0xef9a, 0xef9b, 0xef9c, 0xef9d, 0xef9e, 0xef9f, 0xefa0, /*0x00-0x07*/ + 0xf040, 0xf041, 0xf042, 0xf043, 0xf044, 0xf7d0, 0xf045, 0xf046, /*0x08-0x0f*/ + 0xb2cd, 0xf047, 0xf048, 0xf049, 0xf04a, 0xf04b, 0xf04c, 0xf04d, /*0x10-0x17*/ + 0xf04e, 0xf04f, 0xf050, 0xf051, 0xf052, 0xf053, 0xf054, 0xf055, /*0x18-0x1f*/ + 0xf056, 0xf057, 0xf058, 0xf059, 0xf05a, 0xf05b, 0xf05c, 0xf05d, /*0x20-0x27*/ + 0xf05e, 0xf05f, 0xf060, 0xf061, 0xf062, 0xf063, 0xf7d1, 0xf064, /*0x28-0x2f*/ + 0xf065, 0xf066, 0xf067, 0xf068, 0xf069, 0xf06a, 0xf06b, 0xf06c, /*0x30-0x37*/ + 0xf06d, 0xf06e, 0xf06f, 0xf070, 0xf071, 0xf072, 0xf073, 0xf074, /*0x38-0x3f*/ + 0xf075, 0xf076, 0xf077, 0xf078, 0xf079, 0xf07a, 0xf07b, 0xf07c, /*0x40-0x47*/ + 0xf07d, 0xf07e, 0xf080, 0xf081, 0xf082, 0xf083, 0xf084, 0xf085, /*0x48-0x4f*/ + 0xf086, 0xf087, 0xf088, 0xf089, 0xf7d3, 0xf7d2, 0xf08a, 0xf08b, /*0x50-0x57*/ + 0xf08c, 0xf08d, 0xf08e, 0xf08f, 0xf090, 0xf091, 0xf092, 0xf093, /*0x58-0x5f*/ + 0xf094, 0xf095, 0xf096, 0xe2bb, 0xf097, 0xbca2, 0xf098, 0xe2bc, /*0x60-0x67*/ + 0xe2bd, 0xe2be, 0xe2bf, 0xe2c0, 0xe2c1, 0xb7b9, 0xd2fb, 0xbda4, /*0x68-0x6f*/ + 0xcace, 0xb1a5, 0xcbc7, 0xf099, 0xe2c2, 0xb6fc, 0xc8c4, 0xe2c3, /*0x70-0x77*/ + 0xf09a, 0xf09b, 0xbdc8, 0xf09c, 0xb1fd, 0xe2c4, 0xf09d, 0xb6f6, /*0x78-0x7f*/ + 0xe2c5, 0xc4d9, 0xf09e, 0xf09f, 0xe2c6, 0xcfda, 0xb9dd, 0xe2c7, /*0x80-0x87*/ + 0xc0a1, 0xf0a0, 0xe2c8, 0xb2f6, 0xf140, 0xe2c9, 0xf141, 0xc1f3, /*0x88-0x8f*/ + 0xe2ca, 0xe2cb, 0xc2f8, 0xe2cc, 0xe2cd, 0xe2ce, 0xcad7, 0xd8b8, /*0x90-0x97*/ + 0xd9e5, 0xcfe3, 0xf142, 0xf143, 0xf144, 0xf145, 0xf146, 0xf147, /*0x98-0x9f*/ + 0xf148, 0xf149, 0xf14a, 0xf14b, 0xf14c, 0xf0a5, 0xf14d, 0xf14e, /*0xa0-0xa7*/ + 0xdcb0, 0xf14f, 0xf150, 0xf151, 0xf152, 0xf153, 0xf154, 0xf155, /*0xa8-0xaf*/ + 0xf156, 0xf157, 0xf158, 0xf159, 0xf15a, 0xf15b, 0xf15c, 0xf15d, /*0xb0-0xb7*/ + 0xf15e, 0xf15f, 0xf160, 0xf161, 0xf162, 0xf163, 0xf164, 0xf165, /*0xb8-0xbf*/ + 0xf166, 0xf167, 0xf168, 0xf169, 0xf16a, 0xf16b, 0xf16c, 0xf16d, /*0xc0-0xc7*/ + 0xf16e, 0xf16f, 0xf170, 0xf171, 0xf172, 0xf173, 0xf174, 0xf175, /*0xc8-0xcf*/ + 0xf176, 0xf177, 0xf178, 0xf179, 0xf17a, 0xf17b, 0xf17c, 0xf17d, /*0xd0-0xd7*/ + 0xf17e, 0xf180, 0xf181, 0xf182, 0xf183, 0xf184, 0xf185, 0xf186, /*0xd8-0xdf*/ + 0xf187, 0xf188, 0xf189, 0xf18a, 0xf18b, 0xf18c, 0xf18d, 0xf18e, /*0xe0-0xe7*/ + 0xf18f, 0xf190, 0xf191, 0xf192, 0xf193, 0xf194, 0xf195, 0xf196, /*0xe8-0xef*/ + 0xf197, 0xf198, 0xf199, 0xf19a, 0xf19b, 0xf19c, 0xf19d, 0xf19e, /*0xf0-0xf7*/ + 0xf19f, 0xf1a0, 0xf240, 0xf241, 0xf242, 0xf243, 0xf244, 0xf245, /*0xf8-0xff*/ + /* 0x9a00 */ + 0xf246, 0xf247, 0xf248, 0xf249, 0xf24a, 0xf24b, 0xf24c, 0xf24d, /*0x00-0x07*/ + 0xf24e, 0xf24f, 0xf250, 0xf251, 0xf252, 0xf253, 0xf254, 0xf255, /*0x08-0x0f*/ + 0xf256, 0xf257, 0xf258, 0xf259, 0xf25a, 0xf25b, 0xf25c, 0xf25d, /*0x10-0x17*/ + 0xf25e, 0xf25f, 0xf260, 0xf261, 0xf262, 0xf263, 0xf264, 0xf265, /*0x18-0x1f*/ + 0xf266, 0xf267, 0xf268, 0xf269, 0xf26a, 0xf26b, 0xf26c, 0xf26d, /*0x20-0x27*/ + 0xf26e, 0xf26f, 0xf270, 0xf271, 0xf272, 0xf273, 0xf274, 0xf275, /*0x28-0x2f*/ + 0xf276, 0xf277, 0xf278, 0xf279, 0xf27a, 0xf27b, 0xf27c, 0xf27d, /*0x30-0x37*/ + 0xf27e, 0xf280, 0xf281, 0xf282, 0xf283, 0xf284, 0xf285, 0xf286, /*0x38-0x3f*/ + 0xf287, 0xf288, 0xf289, 0xf28a, 0xf28b, 0xf28c, 0xf28d, 0xf28e, /*0x40-0x47*/ + 0xf28f, 0xf290, 0xf291, 0xf292, 0xf293, 0xf294, 0xf295, 0xf296, /*0x48-0x4f*/ + 0xf297, 0xf298, 0xf299, 0xf29a, 0xf29b, 0xf29c, 0xf29d, 0xf29e, /*0x50-0x57*/ + 0xf29f, 0xf2a0, 0xf340, 0xf341, 0xf342, 0xf343, 0xf344, 0xf345, /*0x58-0x5f*/ + 0xf346, 0xf347, 0xf348, 0xf349, 0xf34a, 0xf34b, 0xf34c, 0xf34d, /*0x60-0x67*/ + 0xf34e, 0xf34f, 0xf350, 0xf351, 0xc2ed, 0xd4a6, 0xcdd4, 0xd1b1, /*0x68-0x6f*/ + 0xb3db, 0xc7fd, 0xf352, 0xb2b5, 0xc2bf, 0xe6e0, 0xcabb, 0xe6e1, /*0x70-0x77*/ + 0xe6e2, 0xbed4, 0xe6e3, 0xd7a4, 0xcdd5, 0xe6e5, 0xbcdd, 0xe6e4, /*0x78-0x7f*/ + 0xe6e6, 0xe6e7, 0xc2ee, 0xf353, 0xbdbe, 0xe6e8, 0xc2e6, 0xbaa7, /*0x80-0x87*/ + 0xe6e9, 0xf354, 0xe6ea, 0xb3d2, 0xd1e9, 0xf355, 0xf356, 0xbfa5, /*0x88-0x8f*/ + 0xe6eb, 0xc6ef, 0xe6ec, 0xe6ed, 0xf357, 0xf358, 0xe6ee, 0xc6ad, /*0x90-0x97*/ + 0xe6ef, 0xf359, 0xc9a7, 0xe6f0, 0xe6f1, 0xe6f2, 0xe5b9, 0xe6f3, /*0x98-0x9f*/ + 0xe6f4, 0xc2e2, 0xe6f5, 0xe6f6, 0xd6e8, 0xe6f7, 0xf35a, 0xe6f8, /*0xa0-0xa7*/ + 0xb9c7, 0xf35b, 0xf35c, 0xf35d, 0xf35e, 0xf35f, 0xf360, 0xf361, /*0xa8-0xaf*/ + 0xf7bb, 0xf7ba, 0xf362, 0xf363, 0xf364, 0xf365, 0xf7be, 0xf7bc, /*0xb0-0xb7*/ + 0xbaa1, 0xf366, 0xf7bf, 0xf367, 0xf7c0, 0xf368, 0xf369, 0xf36a, /*0xb8-0xbf*/ + 0xf7c2, 0xf7c1, 0xf7c4, 0xf36b, 0xf36c, 0xf7c3, 0xf36d, 0xf36e, /*0xc0-0xc7*/ + 0xf36f, 0xf370, 0xf371, 0xf7c5, 0xf7c6, 0xf372, 0xf373, 0xf374, /*0xc8-0xcf*/ + 0xf375, 0xf7c7, 0xf376, 0xcbe8, 0xf377, 0xf378, 0xf379, 0xf37a, /*0xd0-0xd7*/ + 0xb8df, 0xf37b, 0xf37c, 0xf37d, 0xf37e, 0xf380, 0xf381, 0xf7d4, /*0xd8-0xdf*/ + 0xf382, 0xf7d5, 0xf383, 0xf384, 0xf385, 0xf386, 0xf7d6, 0xf387, /*0xe0-0xe7*/ + 0xf388, 0xf389, 0xf38a, 0xf7d8, 0xf38b, 0xf7da, 0xf38c, 0xf7d7, /*0xe8-0xef*/ + 0xf38d, 0xf38e, 0xf38f, 0xf390, 0xf391, 0xf392, 0xf393, 0xf394, /*0xf0-0xf7*/ + 0xf395, 0xf7db, 0xf396, 0xf7d9, 0xf397, 0xf398, 0xf399, 0xf39a, /*0xf8-0xff*/ + /* 0x9b00 */ + 0xf39b, 0xf39c, 0xf39d, 0xd7d7, 0xf39e, 0xf39f, 0xf3a0, 0xf440, /*0x00-0x07*/ + 0xf7dc, 0xf441, 0xf442, 0xf443, 0xf444, 0xf445, 0xf446, 0xf7dd, /*0x08-0x0f*/ + 0xf447, 0xf448, 0xf449, 0xf7de, 0xf44a, 0xf44b, 0xf44c, 0xf44d, /*0x10-0x17*/ + 0xf44e, 0xf44f, 0xf450, 0xf451, 0xf452, 0xf453, 0xf454, 0xf7df, /*0x18-0x1f*/ + 0xf455, 0xf456, 0xf457, 0xf7e0, 0xf458, 0xf459, 0xf45a, 0xf45b, /*0x20-0x27*/ + 0xf45c, 0xf45d, 0xf45e, 0xf45f, 0xf460, 0xf461, 0xf462, 0xdbcb, /*0x28-0x2f*/ + 0xf463, 0xf464, 0xd8aa, 0xf465, 0xf466, 0xf467, 0xf468, 0xf469, /*0x30-0x37*/ + 0xf46a, 0xf46b, 0xf46c, 0xe5f7, 0xb9ed, 0xf46d, 0xf46e, 0xf46f, /*0x38-0x3f*/ + 0xf470, 0xbffd, 0xbbea, 0xf7c9, 0xc6c7, 0xf7c8, 0xf471, 0xf7ca, /*0x40-0x47*/ + 0xf7cc, 0xf7cb, 0xf472, 0xf473, 0xf474, 0xf7cd, 0xf475, 0xceba, /*0x48-0x4f*/ + 0xf476, 0xf7ce, 0xf477, 0xf478, 0xc4a7, 0xf479, 0xf47a, 0xf47b, /*0x50-0x57*/ + 0xf47c, 0xf47d, 0xf47e, 0xf480, 0xf481, 0xf482, 0xf483, 0xf484, /*0x58-0x5f*/ + 0xf485, 0xf486, 0xf487, 0xf488, 0xf489, 0xf48a, 0xf48b, 0xf48c, /*0x60-0x67*/ + 0xf48d, 0xf48e, 0xf48f, 0xf490, 0xf491, 0xf492, 0xf493, 0xf494, /*0x68-0x6f*/ + 0xf495, 0xf496, 0xf497, 0xf498, 0xf499, 0xf49a, 0xf49b, 0xf49c, /*0x70-0x77*/ + 0xf49d, 0xf49e, 0xf49f, 0xf4a0, 0xf540, 0xf541, 0xf542, 0xf543, /*0x78-0x7f*/ + 0xf544, 0xf545, 0xf546, 0xf547, 0xf548, 0xf549, 0xf54a, 0xf54b, /*0x80-0x87*/ + 0xf54c, 0xf54d, 0xf54e, 0xf54f, 0xf550, 0xf551, 0xf552, 0xf553, /*0x88-0x8f*/ + 0xf554, 0xf555, 0xf556, 0xf557, 0xf558, 0xf559, 0xf55a, 0xf55b, /*0x90-0x97*/ + 0xf55c, 0xf55d, 0xf55e, 0xf55f, 0xf560, 0xf561, 0xf562, 0xf563, /*0x98-0x9f*/ + 0xf564, 0xf565, 0xf566, 0xf567, 0xf568, 0xf569, 0xf56a, 0xf56b, /*0xa0-0xa7*/ + 0xf56c, 0xf56d, 0xf56e, 0xf56f, 0xf570, 0xf571, 0xf572, 0xf573, /*0xa8-0xaf*/ + 0xf574, 0xf575, 0xf576, 0xf577, 0xf578, 0xf579, 0xf57a, 0xf57b, /*0xb0-0xb7*/ + 0xf57c, 0xf57d, 0xf57e, 0xf580, 0xf581, 0xf582, 0xf583, 0xf584, /*0xb8-0xbf*/ + 0xf585, 0xf586, 0xf587, 0xf588, 0xf589, 0xf58a, 0xf58b, 0xf58c, /*0xc0-0xc7*/ + 0xf58d, 0xf58e, 0xf58f, 0xf590, 0xf591, 0xf592, 0xf593, 0xf594, /*0xc8-0xcf*/ + 0xf595, 0xf596, 0xf597, 0xf598, 0xf599, 0xf59a, 0xf59b, 0xf59c, /*0xd0-0xd7*/ + 0xf59d, 0xf59e, 0xf59f, 0xf5a0, 0xf640, 0xf641, 0xf642, 0xf643, /*0xd8-0xdf*/ + 0xf644, 0xf645, 0xf646, 0xf647, 0xf648, 0xf649, 0xf64a, 0xf64b, /*0xe0-0xe7*/ + 0xf64c, 0xf64d, 0xf64e, 0xf64f, 0xf650, 0xf651, 0xf652, 0xf653, /*0xe8-0xef*/ + 0xf654, 0xf655, 0xf656, 0xf657, 0xf658, 0xf659, 0xf65a, 0xf65b, /*0xf0-0xf7*/ + 0xf65c, 0xf65d, 0xf65e, 0xf65f, 0xf660, 0xf661, 0xf662, 0xf663, /*0xf8-0xff*/ + /* 0x9c00 */ + 0xf664, 0xf665, 0xf666, 0xf667, 0xf668, 0xf669, 0xf66a, 0xf66b, /*0x00-0x07*/ + 0xf66c, 0xf66d, 0xf66e, 0xf66f, 0xf670, 0xf671, 0xf672, 0xf673, /*0x08-0x0f*/ + 0xf674, 0xf675, 0xf676, 0xf677, 0xf678, 0xf679, 0xf67a, 0xf67b, /*0x10-0x17*/ + 0xf67c, 0xf67d, 0xf67e, 0xf680, 0xf681, 0xf682, 0xf683, 0xf684, /*0x18-0x1f*/ + 0xf685, 0xf686, 0xf687, 0xf688, 0xf689, 0xf68a, 0xf68b, 0xf68c, /*0x20-0x27*/ + 0xf68d, 0xf68e, 0xf68f, 0xf690, 0xf691, 0xf692, 0xf693, 0xf694, /*0x28-0x2f*/ + 0xf695, 0xf696, 0xf697, 0xf698, 0xf699, 0xf69a, 0xf69b, 0xf69c, /*0x30-0x37*/ + 0xf69d, 0xf69e, 0xf69f, 0xf6a0, 0xf740, 0xf741, 0xf742, 0xf743, /*0x38-0x3f*/ + 0xf744, 0xf745, 0xf746, 0xf747, 0xf748, 0xf749, 0xf74a, 0xf74b, /*0x40-0x47*/ + 0xf74c, 0xf74d, 0xf74e, 0xf74f, 0xf750, 0xf751, 0xf752, 0xf753, /*0x48-0x4f*/ + 0xf754, 0xf755, 0xf756, 0xf757, 0xf758, 0xf759, 0xf75a, 0xf75b, /*0x50-0x57*/ + 0xf75c, 0xf75d, 0xf75e, 0xf75f, 0xf760, 0xf761, 0xf762, 0xf763, /*0x58-0x5f*/ + 0xf764, 0xf765, 0xf766, 0xf767, 0xf768, 0xf769, 0xf76a, 0xf76b, /*0x60-0x67*/ + 0xf76c, 0xf76d, 0xf76e, 0xf76f, 0xf770, 0xf771, 0xf772, 0xf773, /*0x68-0x6f*/ + 0xf774, 0xf775, 0xf776, 0xf777, 0xf778, 0xf779, 0xf77a, 0xf77b, /*0x70-0x77*/ + 0xf77c, 0xf77d, 0xf77e, 0xf780, 0xd3e3, 0xf781, 0xf782, 0xf6cf, /*0x78-0x7f*/ + 0xf783, 0xc2b3, 0xf6d0, 0xf784, 0xf785, 0xf6d1, 0xf6d2, 0xf6d3, /*0x80-0x87*/ + 0xf6d4, 0xf786, 0xf787, 0xf6d6, 0xf788, 0xb1ab, 0xf6d7, 0xf789, /*0x88-0x8f*/ + 0xf6d8, 0xf6d9, 0xf6da, 0xf78a, 0xf6db, 0xf6dc, 0xf78b, 0xf78c, /*0x90-0x97*/ + 0xf78d, 0xf78e, 0xf6dd, 0xf6de, 0xcfca, 0xf78f, 0xf6df, 0xf6e0, /*0x98-0x9f*/ + 0xf6e1, 0xf6e2, 0xf6e3, 0xf6e4, 0xc0f0, 0xf6e5, 0xf6e6, 0xf6e7, /*0xa0-0xa7*/ + 0xf6e8, 0xf6e9, 0xf790, 0xf6ea, 0xf791, 0xf6eb, 0xf6ec, 0xf792, /*0xa8-0xaf*/ + 0xf6ed, 0xf6ee, 0xf6ef, 0xf6f0, 0xf6f1, 0xf6f2, 0xf6f3, 0xf6f4, /*0xb0-0xb7*/ + 0xbea8, 0xf793, 0xf6f5, 0xf6f6, 0xf6f7, 0xf6f8, 0xf794, 0xf795, /*0xb8-0xbf*/ + 0xf796, 0xf797, 0xf798, 0xc8fa, 0xf6f9, 0xf6fa, 0xf6fb, 0xf6fc, /*0xc0-0xc7*/ + 0xf799, 0xf79a, 0xf6fd, 0xf6fe, 0xf7a1, 0xf7a2, 0xf7a3, 0xf7a4, /*0xc8-0xcf*/ + 0xf7a5, 0xf79b, 0xf79c, 0xf7a6, 0xf7a7, 0xf7a8, 0xb1ee, 0xf7a9, /*0xd0-0xd7*/ + 0xf7aa, 0xf7ab, 0xf79d, 0xf79e, 0xf7ac, 0xf7ad, 0xc1db, 0xf7ae, /*0xd8-0xdf*/ + 0xf79f, 0xf7a0, 0xf7af, 0xf840, 0xf841, 0xf842, 0xf843, 0xf844, /*0xe0-0xe7*/ + 0xf845, 0xf846, 0xf847, 0xf848, 0xf849, 0xf84a, 0xf84b, 0xf84c, /*0xe8-0xef*/ + 0xf84d, 0xf84e, 0xf84f, 0xf850, 0xf851, 0xf852, 0xf853, 0xf854, /*0xf0-0xf7*/ + 0xf855, 0xf856, 0xf857, 0xf858, 0xf859, 0xf85a, 0xf85b, 0xf85c, /*0xf8-0xff*/ + /* 0x9d00 */ + 0xf85d, 0xf85e, 0xf85f, 0xf860, 0xf861, 0xf862, 0xf863, 0xf864, /*0x00-0x07*/ + 0xf865, 0xf866, 0xf867, 0xf868, 0xf869, 0xf86a, 0xf86b, 0xf86c, /*0x08-0x0f*/ + 0xf86d, 0xf86e, 0xf86f, 0xf870, 0xf871, 0xf872, 0xf873, 0xf874, /*0x10-0x17*/ + 0xf875, 0xf876, 0xf877, 0xf878, 0xf879, 0xf87a, 0xf87b, 0xf87c, /*0x18-0x1f*/ + 0xf87d, 0xf87e, 0xf880, 0xf881, 0xf882, 0xf883, 0xf884, 0xf885, /*0x20-0x27*/ + 0xf886, 0xf887, 0xf888, 0xf889, 0xf88a, 0xf88b, 0xf88c, 0xf88d, /*0x28-0x2f*/ + 0xf88e, 0xf88f, 0xf890, 0xf891, 0xf892, 0xf893, 0xf894, 0xf895, /*0x30-0x37*/ + 0xf896, 0xf897, 0xf898, 0xf899, 0xf89a, 0xf89b, 0xf89c, 0xf89d, /*0x38-0x3f*/ + 0xf89e, 0xf89f, 0xf8a0, 0xf940, 0xf941, 0xf942, 0xf943, 0xf944, /*0x40-0x47*/ + 0xf945, 0xf946, 0xf947, 0xf948, 0xf949, 0xf94a, 0xf94b, 0xf94c, /*0x48-0x4f*/ + 0xf94d, 0xf94e, 0xf94f, 0xf950, 0xf951, 0xf952, 0xf953, 0xf954, /*0x50-0x57*/ + 0xf955, 0xf956, 0xf957, 0xf958, 0xf959, 0xf95a, 0xf95b, 0xf95c, /*0x58-0x5f*/ + 0xf95d, 0xf95e, 0xf95f, 0xf960, 0xf961, 0xf962, 0xf963, 0xf964, /*0x60-0x67*/ + 0xf965, 0xf966, 0xf967, 0xf968, 0xf969, 0xf96a, 0xf96b, 0xf96c, /*0x68-0x6f*/ + 0xf96d, 0xf96e, 0xf96f, 0xf970, 0xf971, 0xf972, 0xf973, 0xf974, /*0x70-0x77*/ + 0xf975, 0xf976, 0xf977, 0xf978, 0xf979, 0xf97a, 0xf97b, 0xf97c, /*0x78-0x7f*/ + 0xf97d, 0xf97e, 0xf980, 0xf981, 0xf982, 0xf983, 0xf984, 0xf985, /*0x80-0x87*/ + 0xf986, 0xf987, 0xf988, 0xf989, 0xf98a, 0xf98b, 0xf98c, 0xf98d, /*0x88-0x8f*/ + 0xf98e, 0xf98f, 0xf990, 0xf991, 0xf992, 0xf993, 0xf994, 0xf995, /*0x90-0x97*/ + 0xf996, 0xf997, 0xf998, 0xf999, 0xf99a, 0xf99b, 0xf99c, 0xf99d, /*0x98-0x9f*/ + 0xf99e, 0xf99f, 0xf9a0, 0xfa40, 0xfa41, 0xfa42, 0xfa43, 0xfa44, /*0xa0-0xa7*/ + 0xfa45, 0xfa46, 0xfa47, 0xfa48, 0xfa49, 0xfa4a, 0xfa4b, 0xfa4c, /*0xa8-0xaf*/ + 0xfa4d, 0xfa4e, 0xfa4f, 0xfa50, 0xfa51, 0xfa52, 0xfa53, 0xfa54, /*0xb0-0xb7*/ + 0xfa55, 0xfa56, 0xfa57, 0xfa58, 0xfa59, 0xfa5a, 0xfa5b, 0xfa5c, /*0xb8-0xbf*/ + 0xfa5d, 0xfa5e, 0xfa5f, 0xfa60, 0xfa61, 0xfa62, 0xfa63, 0xfa64, /*0xc0-0xc7*/ + 0xfa65, 0xfa66, 0xfa67, 0xfa68, 0xfa69, 0xfa6a, 0xfa6b, 0xfa6c, /*0xc8-0xcf*/ + 0xfa6d, 0xfa6e, 0xfa6f, 0xfa70, 0xfa71, 0xfa72, 0xfa73, 0xfa74, /*0xd0-0xd7*/ + 0xfa75, 0xfa76, 0xfa77, 0xfa78, 0xfa79, 0xfa7a, 0xfa7b, 0xfa7c, /*0xd8-0xdf*/ + 0xfa7d, 0xfa7e, 0xfa80, 0xfa81, 0xfa82, 0xfa83, 0xfa84, 0xfa85, /*0xe0-0xe7*/ + 0xfa86, 0xfa87, 0xfa88, 0xfa89, 0xfa8a, 0xfa8b, 0xfa8c, 0xfa8d, /*0xe8-0xef*/ + 0xfa8e, 0xfa8f, 0xfa90, 0xfa91, 0xfa92, 0xfa93, 0xfa94, 0xfa95, /*0xf0-0xf7*/ + 0xfa96, 0xfa97, 0xfa98, 0xfa99, 0xfa9a, 0xfa9b, 0xfa9c, 0xfa9d, /*0xf8-0xff*/ + /* 0x9e00 */ + 0xfa9e, 0xfa9f, 0xfaa0, 0xfb40, 0xfb41, 0xfb42, 0xfb43, 0xfb44, /*0x00-0x07*/ + 0xfb45, 0xfb46, 0xfb47, 0xfb48, 0xfb49, 0xfb4a, 0xfb4b, 0xfb4c, /*0x08-0x0f*/ + 0xfb4d, 0xfb4e, 0xfb4f, 0xfb50, 0xfb51, 0xfb52, 0xfb53, 0xfb54, /*0x10-0x17*/ + 0xfb55, 0xfb56, 0xfb57, 0xfb58, 0xfb59, 0xfb5a, 0xfb5b, 0xc4f1, /*0x18-0x1f*/ + 0xf0af, 0xbca6, 0xf0b0, 0xc3f9, 0xfb5c, 0xc5b8, 0xd1bb, 0xfb5d, /*0x20-0x27*/ + 0xf0b1, 0xf0b2, 0xf0b3, 0xf0b4, 0xf0b5, 0xd1bc, 0xfb5e, 0xd1ec, /*0x28-0x2f*/ + 0xfb5f, 0xf0b7, 0xf0b6, 0xd4a7, 0xfb60, 0xcdd2, 0xf0b8, 0xf0ba, /*0x30-0x37*/ + 0xf0b9, 0xf0bb, 0xf0bc, 0xfb61, 0xfb62, 0xb8eb, 0xf0bd, 0xbae8, /*0x38-0x3f*/ + 0xfb63, 0xf0be, 0xf0bf, 0xbee9, 0xf0c0, 0xb6ec, 0xf0c1, 0xf0c2, /*0x40-0x47*/ + 0xf0c3, 0xf0c4, 0xc8b5, 0xf0c5, 0xf0c6, 0xfb64, 0xf0c7, 0xc5f4, /*0x48-0x4f*/ + 0xfb65, 0xf0c8, 0xfb66, 0xfb67, 0xfb68, 0xf0c9, 0xfb69, 0xf0ca, /*0x50-0x57*/ + 0xf7bd, 0xfb6a, 0xf0cb, 0xf0cc, 0xf0cd, 0xfb6b, 0xf0ce, 0xfb6c, /*0x58-0x5f*/ + 0xfb6d, 0xfb6e, 0xfb6f, 0xf0cf, 0xbad7, 0xfb70, 0xf0d0, 0xf0d1, /*0x60-0x67*/ + 0xf0d2, 0xf0d3, 0xf0d4, 0xf0d5, 0xf0d6, 0xf0d8, 0xfb71, 0xfb72, /*0x68-0x6f*/ + 0xd3a5, 0xf0d7, 0xfb73, 0xf0d9, 0xfb74, 0xfb75, 0xfb76, 0xfb77, /*0x70-0x77*/ + 0xfb78, 0xfb79, 0xfb7a, 0xfb7b, 0xfb7c, 0xfb7d, 0xf5ba, 0xc2b9, /*0x78-0x7f*/ + 0xfb7e, 0xfb80, 0xf7e4, 0xfb81, 0xfb82, 0xfb83, 0xfb84, 0xf7e5, /*0x80-0x87*/ + 0xf7e6, 0xfb85, 0xfb86, 0xf7e7, 0xfb87, 0xfb88, 0xfb89, 0xfb8a, /*0x88-0x8f*/ + 0xfb8b, 0xfb8c, 0xf7e8, 0xc2b4, 0xfb8d, 0xfb8e, 0xfb8f, 0xfb90, /*0x90-0x97*/ + 0xfb91, 0xfb92, 0xfb93, 0xfb94, 0xfb95, 0xf7ea, 0xfb96, 0xf7eb, /*0x98-0x9f*/ + 0xfb97, 0xfb98, 0xfb99, 0xfb9a, 0xfb9b, 0xfb9c, 0xc2f3, 0xfb9d, /*0xa0-0xa7*/ + 0xfb9e, 0xfb9f, 0xfba0, 0xfc40, 0xfc41, 0xfc42, 0xfc43, 0xfc44, /*0xa8-0xaf*/ + 0xfc45, 0xfc46, 0xfc47, 0xfc48, 0xf4f0, 0xfc49, 0xfc4a, 0xfc4b, /*0xb0-0xb7*/ + 0xf4ef, 0xfc4c, 0xfc4d, 0xc2e9, 0xfc4e, 0xf7e1, 0xf7e2, 0xfc4f, /*0xb8-0xbf*/ + 0xfc50, 0xfc51, 0xfc52, 0xfc53, 0xbbc6, 0xfc54, 0xfc55, 0xfc56, /*0xc0-0xc7*/ + 0xfc57, 0xd9e4, 0xfc58, 0xfc59, 0xfc5a, 0xcaf2, 0xc0e8, 0xf0a4, /*0xc8-0xcf*/ + 0xfc5b, 0xbada, 0xfc5c, 0xfc5d, 0xc7ad, 0xfc5e, 0xfc5f, 0xfc60, /*0xd0-0xd7*/ + 0xc4ac, 0xfc61, 0xfc62, 0xf7ec, 0xf7ed, 0xf7ee, 0xfc63, 0xf7f0, /*0xd8-0xdf*/ + 0xf7ef, 0xfc64, 0xf7f1, 0xfc65, 0xfc66, 0xf7f4, 0xfc67, 0xf7f3, /*0xe0-0xe7*/ + 0xfc68, 0xf7f2, 0xf7f5, 0xfc69, 0xfc6a, 0xfc6b, 0xfc6c, 0xf7f6, /*0xe8-0xef*/ + 0xfc6d, 0xfc6e, 0xfc6f, 0xfc70, 0xfc71, 0xfc72, 0xfc73, 0xfc74, /*0xf0-0xf7*/ + 0xfc75, 0xede9, 0xfc76, 0xedea, 0xedeb, 0xfc77, 0xf6bc, 0xfc78, /*0xf8-0xff*/ + /* 0x9f00 */ + 0xfc79, 0xfc7a, 0xfc7b, 0xfc7c, 0xfc7d, 0xfc7e, 0xfc80, 0xfc81, /*0x00-0x07*/ + 0xfc82, 0xfc83, 0xfc84, 0xf6bd, 0xfc85, 0xf6be, 0xb6a6, 0xfc86, /*0x08-0x0f*/ + 0xd8be, 0xfc87, 0xfc88, 0xb9c4, 0xfc89, 0xfc8a, 0xfc8b, 0xd8bb, /*0x10-0x17*/ + 0xfc8c, 0xdcb1, 0xfc8d, 0xfc8e, 0xfc8f, 0xfc90, 0xfc91, 0xfc92, /*0x18-0x1f*/ + 0xcaf3, 0xfc93, 0xf7f7, 0xfc94, 0xfc95, 0xfc96, 0xfc97, 0xfc98, /*0x20-0x27*/ + 0xfc99, 0xfc9a, 0xfc9b, 0xfc9c, 0xf7f8, 0xfc9d, 0xfc9e, 0xf7f9, /*0x28-0x2f*/ + 0xfc9f, 0xfca0, 0xfd40, 0xfd41, 0xfd42, 0xfd43, 0xfd44, 0xf7fb, /*0x30-0x37*/ + 0xfd45, 0xf7fa, 0xfd46, 0xb1c7, 0xfd47, 0xf7fc, 0xf7fd, 0xfd48, /*0x38-0x3f*/ + 0xfd49, 0xfd4a, 0xfd4b, 0xfd4c, 0xf7fe, 0xfd4d, 0xfd4e, 0xfd4f, /*0x40-0x47*/ + 0xfd50, 0xfd51, 0xfd52, 0xfd53, 0xfd54, 0xfd55, 0xfd56, 0xfd57, /*0x48-0x4f*/ + 0xc6eb, 0xecb4, 0xfd58, 0xfd59, 0xfd5a, 0xfd5b, 0xfd5c, 0xfd5d, /*0x50-0x57*/ + 0xfd5e, 0xfd5f, 0xfd60, 0xfd61, 0xfd62, 0xfd63, 0xfd64, 0xfd65, /*0x58-0x5f*/ + 0xfd66, 0xfd67, 0xfd68, 0xfd69, 0xfd6a, 0xfd6b, 0xfd6c, 0xfd6d, /*0x60-0x67*/ + 0xfd6e, 0xfd6f, 0xfd70, 0xfd71, 0xfd72, 0xfd73, 0xfd74, 0xfd75, /*0x68-0x6f*/ + 0xfd76, 0xfd77, 0xfd78, 0xfd79, 0xfd7a, 0xfd7b, 0xfd7c, 0xfd7d, /*0x70-0x77*/ + 0xfd7e, 0xfd80, 0xfd81, 0xfd82, 0xfd83, 0xfd84, 0xfd85, 0xb3dd, /*0x78-0x7f*/ + 0xf6b3, 0xfd86, 0xfd87, 0xf6b4, 0xc1e4, 0xf6b5, 0xf6b6, 0xf6b7, /*0x80-0x87*/ + 0xf6b8, 0xf6b9, 0xf6ba, 0xc8a3, 0xf6bb, 0xfd88, 0xfd89, 0xfd8a, /*0x88-0x8f*/ + 0xfd8b, 0xfd8c, 0xfd8d, 0xfd8e, 0xfd8f, 0xfd90, 0xfd91, 0xfd92, /*0x90-0x97*/ + 0xfd93, 0xc1fa, 0xb9a8, 0xede8, 0xfd94, 0xfd95, 0xfd96, 0xb9ea, /*0x98-0x9f*/ + 0xd9df, 0xfd97, 0xfd98, 0xfd99, 0xfd9a, 0xfd9b, 0x0000, 0x0000, /*0xa0-0xa7*/ +}; +static const unsigned short cp936ext_page1f2f[32] = { + 0x0000, 0xfd9d, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x78-0x7f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x80-0x87*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x88-0x8f*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xfd9e, 0x0000, 0x0000, /*0x90-0x97*/ +}; +static const unsigned short cp936ext_page1f3c[24] = { + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xfd9f, /*0xe0-0xe7*/ + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0xe8-0xef*/ + 0x0000, 0xfda0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0xf0-0xf7*/ +}; +static const unsigned short cp936ext_page1f41[40] = { + 0x0000, 0x0000, 0x0000, 0x0000, 0xfe40, 0xfe41, 0xfe42, 0xfe43, /*0x08-0x0f*/ + 0x0000, 0xfe44, 0x0000, 0xfe45, 0xfe46, 0x0000, 0x0000, 0x0000, /*0x10-0x17*/ + 0xfe47, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xfe48, /*0x18-0x1f*/ + 0xfe49, 0xfe4a, 0x0000, 0xfe4b, 0xfe4c, 0x0000, 0x0000, 0xfe4d, /*0x20-0x27*/ + 0xfe4e, 0xfe4f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /*0x28-0x2f*/ +}; +static const unsigned short cp936ext_page1fc6[64] = { + 0xa955, 0xa6f2, 0x0000, 0xa6f4, 0xa6f5, 0xa6e0, 0xa6e1, 0xa6f0, /*0x30-0x37*/ + 0xa6f1, 0xa6e2, 0xa6e3, 0xa6ee, 0xa6ef, 0xa6e6, 0xa6e7, 0xa6e4, /*0x38-0x3f*/ + 0xa6e5, 0xa6e8, 0xa6e9, 0xa6ea, 0xa6eb, 0x0000, 0x0000, 0x0000, /*0x40-0x47*/ + 0x0000, 0xa968, 0xa969, 0xa96a, 0xa96b, 0xa96c, 0xa96d, 0xa96e, /*0x48-0x4f*/ + 0xa96f, 0xa970, 0xa971, 0x0000, 0xa972, 0xa973, 0xa974, 0xa975, /*0x50-0x57*/ + 0x0000, 0xa976, 0xa977, 0xa978, 0xa979, 0xa97a, 0xa97b, 0xa97c, /*0x58-0x5f*/ + 0xa97d, 0xa97e, 0xa980, 0xa981, 0xa982, 0xa983, 0xa984, 0x0000, /*0x60-0x67*/ + 0xa985, 0xa986, 0xa987, 0xa988, 0x0000, 0x0000, 0x0000, 0x0000, /*0x68-0x6f*/ +}; +static const unsigned short cp936ext_page1fe0[96] = { + 0x0000, 0xa3a1, 0xa3a2, 0xa3a3, 0xa1e7, 0xa3a5, 0xa3a6, 0xa3a7, /*0x00-0x07*/ + 0xa3a8, 0xa3a9, 0xa3aa, 0xa3ab, 0xa3ac, 0xa3ad, 0xa3ae, 0xa3af, /*0x08-0x0f*/ + 0xa3b0, 0xa3b1, 0xa3b2, 0xa3b3, 0xa3b4, 0xa3b5, 0xa3b6, 0xa3b7, /*0x10-0x17*/ + 0xa3b8, 0xa3b9, 0xa3ba, 0xa3bb, 0xa3bc, 0xa3bd, 0xa3be, 0xa3bf, /*0x18-0x1f*/ + 0xa3c0, 0xa3c1, 0xa3c2, 0xa3c3, 0xa3c4, 0xa3c5, 0xa3c6, 0xa3c7, /*0x20-0x27*/ + 0xa3c8, 0xa3c9, 0xa3ca, 0xa3cb, 0xa3cc, 0xa3cd, 0xa3ce, 0xa3cf, /*0x28-0x2f*/ + 0xa3d0, 0xa3d1, 0xa3d2, 0xa3d3, 0xa3d4, 0xa3d5, 0xa3d6, 0xa3d7, /*0x30-0x37*/ + 0xa3d8, 0xa3d9, 0xa3da, 0xa3db, 0xa3dc, 0xa3dd, 0xa3de, 0xa3df, /*0x38-0x3f*/ + 0xa3e0, 0xa3e1, 0xa3e2, 0xa3e3, 0xa3e4, 0xa3e5, 0xa3e6, 0xa3e7, /*0x40-0x47*/ + 0xa3e8, 0xa3e9, 0xa3ea, 0xa3eb, 0xa3ec, 0xa3ed, 0xa3ee, 0xa3ef, /*0x48-0x4f*/ + 0xa3f0, 0xa3f1, 0xa3f2, 0xa3f3, 0xa3f4, 0xa3f5, 0xa3f6, 0xa3f7, /*0x50-0x57*/ + 0xa3f8, 0xa3f9, 0xa3fa, 0xa3fb, 0xa3fc, 0xa3fd, 0xa1ab, 0x0000, /*0x58-0x5f*/ +}; +static const unsigned short cp936ext_page1ffc[8] = { + 0xa1e9, 0xa1ea, 0xa956, 0xa3fe, 0xa957, 0xa3a4, 0x0000, 0x0000, /*0xe0-0xe7*/ +}; + +static int +cp936ext_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) +{ + if (n >= 2) { + unsigned short c = 0; + if (wc >= 0x00a0 && wc < 0x0170) + c = cp936ext_page0014[wc-0x00a0]; + else if (wc >= 0x01c8 && wc < 0x01e0) + c = cp936ext_page0039[wc-0x01c8]; + else if (wc >= 0x0250 && wc < 0x0268) + c = cp936ext_page004a[wc-0x0250]; + else if (wc >= 0x02c0 && wc < 0x02e0) + c = cp936ext_page0058[wc-0x02c0]; + else if (wc >= 0x0390 && wc < 0x03d0) + c = cp936ext_page0072[wc-0x0390]; + else if (wc >= 0x0400 && wc < 0x0458) + c = cp936ext_page0080[wc-0x0400]; + else if (wc >= 0x2010 && wc < 0x2040) + c = cp936ext_page0402[wc-0x2010]; + else if (wc >= 0x2100 && wc < 0x21a0) + c = cp936ext_page0420[wc-0x2100]; + else if (wc >= 0x2208 && wc < 0x22c0) + c = cp936ext_page0441[wc-0x2208]; + else if (wc == 0x2312) + c = 0xa1d0; + else if (wc >= 0x2460 && wc < 0x24a0) + c = cp936ext_page048c[wc-0x2460]; + else if (wc >= 0x2500 && wc < 0x25e8) + c = cp936ext_page04a0[wc-0x2500]; + else if (wc >= 0x2600 && wc < 0x2648) + c = cp936ext_page04c0[wc-0x2600]; + else if (wc >= 0x3000 && wc < 0x3130) + c = cp936ext_page0600[wc-0x3000]; + else if (wc >= 0x3220 && wc < 0x3238) + c = cp936ext_page0644[wc-0x3220]; + else if (wc == 0x32a3) + c = 0xa949; + else if (wc >= 0x3388 && wc < 0x33d8) + c = cp936ext_page0671[wc-0x3388]; + else if (wc >= 0x4e00 && wc < 0x9fa8) + c = cp936ext_page09c0[wc-0x4e00]; + else if (wc == 0xf92c) + c = 0xfd9c; + else if (wc >= 0xf978 && wc < 0xf998) + c = cp936ext_page1f2f[wc-0xf978]; + else if (wc >= 0xf9e0 && wc < 0xf9f8) + c = cp936ext_page1f3c[wc-0xf9e0]; + else if (wc >= 0xfa08 && wc < 0xfa30) + c = cp936ext_page1f41[wc-0xfa08]; + else if (wc >= 0xfe30 && wc < 0xfe70) + c = cp936ext_page1fc6[wc-0xfe30]; + else if (wc >= 0xff00 && wc < 0xff60) + c = cp936ext_page1fe0[wc-0xff00]; + else if (wc >= 0xffe0 && wc < 0xffe8) + c = cp936ext_page1ffc[wc-0xffe0]; + if (c != 0) { + r[0] = (c >> 8); r[1] = (c & 0xff); + return 2; + } + return RET_ILSEQ; + } + return RET_TOOSMALL; +} +#endif /* NEED_TOMB */ + +#endif /* CP936 */ + +#endif /* __APPLE__ WIN32 */ + +/* + * End of "$Id$". + */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/gb2312.h b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/gb2312.h index 3c0c35987..acd21be0f 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/gb2312.h +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/gb2312.h @@ -3,7 +3,7 @@ /* * GB2312.1980-0 */ - +#ifdef NEED_TOWC static const unsigned short gb2312_2uni_page21[831] = { /* 0x21 */ 0x3000, 0x3001, 0x3002, 0x30fb, 0x02c9, 0x02c7, 0x00a8, 0x3003, @@ -1088,7 +1088,9 @@ gb2312_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) } return RET_ILSEQ; } +#endif /* NEED_TOWC */ +#ifdef NEED_TOMB static const unsigned short gb2312_2charset[7445] = { 0x2168, 0x216c, 0x2127, 0x2163, 0x2140, 0x2141, 0x2824, 0x2822, 0x2828, 0x2826, 0x283a, 0x282c, 0x282a, 0x2830, 0x282e, 0x2142, @@ -2551,3 +2553,4 @@ gb2312_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } return RET_TOOSMALL; } +#endif /* NEED_TOMB */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/gbk_tab_to_h.c b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/gbk_tab_to_h.c new file mode 100644 index 000000000..0df963756 --- /dev/null +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/gbk_tab_to_h.c @@ -0,0 +1,1020 @@ +/* $XFree86: xc/lib/X11/lcUniConv/cjk_tab_to_h.c,v 1.2 2000/12/04 18:49:31 dawes Exp $ */ + +/* 2009-02-17 : Create gbk_tab_to_h.c from + * cjk_tab_to_h.c to generate GBK(cp936ext) table correctly. + * + * + * Generates a CJK character set table from a .TXT table as found on + * ftp.unicode.org or in the X nls directory. + * Examples: + * + * ./gbk_tab_to_h CP936EXT cp936ext > cp936ext.h < CP936EXT.TXT + * + */ + +#include +#include +#include +#include + +typedef struct { + int start; + int end; +} Block; + +typedef struct { + int rows; /* number of possible values for the 1st byte */ + int cols; /* number of possible values for the 2nd byte */ + int (*row_byte) (int row); /* returns the 1st byte value for a given row */ + int (*col_byte) (int col); /* returns the 2nd byte value for a given col */ + int (*byte_row) (int byte); /* converts a 1st byte value to a row, else -1 */ + int (*byte_col) (int byte); /* converts a 2nd byte value to a col, else -1 */ + const char* check_row_expr; /* format string for 1st byte value checking */ + const char* check_col_expr; /* format string for 2nd byte value checking */ + const char* byte_row_expr; /* format string for 1st byte value to row */ + const char* byte_col_expr; /* format string for 2nd byte value to col */ + int** charset2uni; /* charset2uni[0..rows-1][0..cols-1] is valid */ + /* You'll understand the terms "row" and "col" when you buy Ken Lunde's book. + Once a row is fixed, choosing a "col" is the same as choosing a "cell". */ + int* charsetpage; /* charsetpage[0..rows]: how large is a page for a row */ + int ncharsetblocks; + Block* charsetblocks; /* blocks[0..nblocks-1] */ + int* uni2charset; /* uni2charset[0x0000..0xffff] */ +} Encoding; + +/* + * Outputs the file title. + */ +static void output_title (const char *charsetname) +{ + printf("\n"); + printf("/*\n"); + printf(" * %s\n", charsetname); + printf(" */\n"); + printf("\n"); +} + +/* + * Reads the charset2uni table from standard input. + */ +static void read_table (Encoding* enc) +{ + int row, col, i, i1, i2, c, j; + + enc->charset2uni = (int**) malloc(enc->rows*sizeof(int*)); + for (row = 0; row < enc->rows; row++) + enc->charset2uni[row] = (int*) malloc(enc->cols*sizeof(int)); + + for (row = 0; row < enc->rows; row++) + for (col = 0; col < enc->cols; col++) + enc->charset2uni[row][col] = 0xfffd; + + c = getc(stdin); + ungetc(c,stdin); + if (c == '#') { + /* Read a unicode.org style .TXT file. */ + for (;;) { + c = getc(stdin); + if (c == EOF) + break; + if (c == '\n' || c == ' ' || c == '\t') + continue; + if (c == '#') { + do { c = getc(stdin); } while (!(c == EOF || c == '\n')); + continue; + } + ungetc(c,stdin); + if (scanf("0x%x", &j) != 1) + exit(1); + i1 = j >> 8; + i2 = j & 0xff; + row = enc->byte_row(i1); + col = enc->byte_col(i2); + if (row < 0 || col < 0) { + fprintf(stderr, "lost entry for %02x %02x\n", i1, i2); + exit(1); + } + if (scanf(" 0x%x", &enc->charset2uni[row][col]) != 1) + exit(1); + } + } else { + /* Read a table of hexadecimal Unicode values. */ + for (i1 = 32; i1 < 132; i1++) + for (i2 = 32; i2 < 132; i2++) { + i = scanf("%x", &j); + if (i == EOF) + goto read_done; + if (i != 1) + exit(1); + if (j < 0 || j == 0xffff) + j = 0xfffd; + if (j != 0xfffd) { + if (enc->byte_row(i1) < 0 || enc->byte_col(i2) < 0) { + fprintf(stderr, "lost entry at %02x %02x\n", i1, i2); + exit (1); + } + enc->charset2uni[enc->byte_row(i1)][enc->byte_col(i2)] = j; + } + } + read_done: ; + } +} + +/* + * Computes the charsetpage[0..rows] array. + */ +static void find_charset2uni_pages (Encoding* enc) +{ + int row, col; + + enc->charsetpage = (int*) malloc((enc->rows+1)*sizeof(int)); + + for (row = 0; row <= enc->rows; row++) + enc->charsetpage[row] = 0; + + for (row = 0; row < enc->rows; row++) { + int used = 0; + for (col = 0; col < enc->cols; col++) + if (enc->charset2uni[row][col] != 0xfffd) + used = col+1; + enc->charsetpage[row] = used; + } +} + +/* + * Fills in nblocks and blocks. + */ +static void find_charset2uni_blocks (Encoding* enc) +{ + int n, row, lastrow; + + enc->charsetblocks = (Block*) malloc(enc->rows*sizeof(Block)); + + n = 0; + for (row = 0; row < enc->rows; row++) + if (enc->charsetpage[row] > 0 && (row == 0 || enc->charsetpage[row-1] == 0)) { + for (lastrow = row; enc->charsetpage[lastrow+1] > 0; lastrow++); + enc->charsetblocks[n].start = row * enc->cols; + enc->charsetblocks[n].end = lastrow * enc->cols + enc->charsetpage[lastrow]; + n++; + } + enc->ncharsetblocks = n; +} + +/* + * Outputs the charset to unicode table and function. + */ +static void output_charset2uni (const char* name, Encoding* enc) +{ + int row, col, lastrow, col_max, i, i1_min, i1_max; + + find_charset2uni_pages(enc); + + find_charset2uni_blocks(enc); + + for (row = 0; row < enc->rows; row++) + if (enc->charsetpage[row] > 0) { + if (row == 0 || enc->charsetpage[row-1] == 0) { + /* Start a new block. */ + for (lastrow = row; enc->charsetpage[lastrow+1] > 0; lastrow++); + printf("static const unsigned short %s_2uni_page%02x[%d] = {\n", + name, enc->row_byte(row), + (lastrow-row) * enc->cols + enc->charsetpage[lastrow]); + } + printf(" /""* 0x%02x *""/\n ", enc->row_byte(row)); + col_max = (enc->charsetpage[row+1] > 0 ? enc->cols : enc->charsetpage[row]); + for (col = 0; col < col_max; col++) { + printf(" 0x%04x,", enc->charset2uni[row][col]); + if ((col % 8) == 7 && (col+1 < col_max)) printf("\n "); + } + printf("\n"); + if (enc->charsetpage[row+1] == 0) { + /* End a block. */ + printf("};\n"); + } + } + printf("\n"); + + printf("static int\n"); + printf("%s_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)\n", name); + printf("{\n"); + printf(" unsigned char c1 = s[0];\n"); + printf(" if ("); + for (i = 0; i < enc->ncharsetblocks; i++) { + i1_min = enc->row_byte(enc->charsetblocks[i].start / enc->cols); + i1_max = enc->row_byte((enc->charsetblocks[i].end-1) / enc->cols); + if (i > 0) + printf(" || "); + if (i1_min == i1_max) + printf("(c1 == 0x%02x)", i1_min); + else + printf("(c1 >= 0x%02x && c1 <= 0x%02x)", i1_min, i1_max); + } + printf(") {\n"); + printf(" if (n >= 2) {\n"); + printf(" unsigned char c2 = s[1];\n"); + printf(" if ("); + printf(enc->check_col_expr, "c2"); + printf(") {\n"); + printf(" unsigned int i = %d * (", enc->cols); + printf(enc->byte_row_expr, "c1"); + printf(") + ("); + printf(enc->byte_col_expr, "c2"); + printf(");\n"); + printf(" unsigned short wc = 0xfffd;\n"); + for (i = 0; i < enc->ncharsetblocks; i++) { + printf(" "); + if (i > 0) + printf("} else "); + if (i < enc->ncharsetblocks-1) + printf("if (i < %d) ", enc->charsetblocks[i+1].start); + printf("{\n"); + printf(" if (i < %d)\n", enc->charsetblocks[i].end); + printf(" wc = %s_2uni_page%02x[i", name, enc->row_byte(enc->charsetblocks[i].start / enc->cols)); + if (enc->charsetblocks[i].start > 0) + printf("-%d", enc->charsetblocks[i].start); + printf("];\n"); + } + printf(" }\n"); + printf(" if (wc != 0xfffd) {\n"); + printf(" *pwc = (ucs4_t) wc;\n"); + printf(" return 2;\n"); + printf(" }\n"); + printf(" }\n"); + printf(" return RET_ILSEQ;\n"); + printf(" }\n"); + printf(" return RET_TOOFEW(0);\n"); + printf(" }\n"); + printf(" return RET_ILSEQ;\n"); + printf("}\n"); + printf("\n"); +} + +/* + * Computes the uni2charset[0x0000..0xffff] array. + */ +static void invert (Encoding* enc) +{ + int row, col, j; + + enc->uni2charset = (int*) malloc(0x10000*sizeof(int)); + + for (j = 0; j < 0x10000; j++) + enc->uni2charset[j] = 0; + + for (row = 0; row < enc->rows; row++) + for (col = 0; col < enc->cols; col++) { + j = enc->charset2uni[row][col]; + if (j != 0xfffd) + enc->uni2charset[j] = 0x100 * enc->row_byte(row) + enc->col_byte(col); + } +} + +/* + * Outputs the unicode to charset table and function, using a linear array. + * (Suitable if the table is dense.) + */ +static void output_uni2charset_dense (const char* name, Encoding* enc) +{ + /* Like in 8bit_tab_to_h.c */ + bool pages[0x100]; + int line[0x2000]; + int tableno; + struct { int minline; int maxline; int usecount; } tables[0x2000]; + bool first; + int row, col, j, p, j1, j2, t; + + for (p = 0; p < 0x100; p++) + pages[p] = false; + for (row = 0; row < enc->rows; row++) + for (col = 0; col < enc->cols; col++) { + j = enc->charset2uni[row][col]; + if (j != 0xfffd) + pages[j>>8] = true; + } + for (j1 = 0; j1 < 0x2000; j1++) { + bool all_invalid = true; + for (j2 = 0; j2 < 8; j2++) { + j = 8*j1+j2; + if (enc->uni2charset[j] != 0) + all_invalid = false; + } + if (all_invalid) + line[j1] = -1; + else + line[j1] = 0; + } + tableno = 0; + for (j1 = 0; j1 < 0x2000; j1++) { + if (line[j1] >= 0) { + if (tableno > 0 + && ((j1 > 0 && line[j1-1] == tableno-1) + || ((tables[tableno-1].maxline >> 5) == (j1 >> 5) + && j1 - tables[tableno-1].maxline <= 8))) { + line[j1] = tableno-1; + tables[tableno-1].maxline = j1; + } else { + tableno++; + line[j1] = tableno-1; + tables[tableno-1].minline = tables[tableno-1].maxline = j1; + } + } + } + for (t = 0; t < tableno; t++) { + tables[t].usecount = 0; + j1 = 8*tables[t].minline; + j2 = 8*(tables[t].maxline+1); + for (j = j1; j < j2; j++) + if (enc->uni2charset[j] != 0) + tables[t].usecount++; + } + { + p = -1; + for (t = 0; t < tableno; t++) + if (tables[t].usecount > 1) { + /* p = tables[t].minline >> 5; */ + p = tables[t].minline ; + /* printf("static const unsigned short %s_page%02x[%d] = {\n", name, p, 8*(tables[t].maxline-tables[t].minline+1)); */ + printf("static const unsigned short %s_page%04x[%d] = {\n", name, p, 8*(tables[t].maxline-tables[t].minline+1)); + for (j1 = tables[t].minline; j1 <= tables[t].maxline; j1++) { + if ((j1 % 0x20) == 0 && j1 > tables[t].minline) + printf(" /* 0x%04x */\n", 8*j1); + printf(" "); + for (j2 = 0; j2 < 8; j2++) { + j = 8*j1+j2; + printf(" 0x%04x,", enc->uni2charset[j]); + } + printf(" /*0x%02x-0x%02x*/\n", 8*(j1 % 0x20), 8*(j1 % 0x20)+7); + } + printf("};\n"); + } + if (p >= 0) + printf("\n"); + } + printf("static int\n%s_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)\n", name); + printf("{\n"); + printf(" if (n >= 2) {\n"); + printf(" unsigned short c = 0;\n"); + first = true; + for (j1 = 0; j1 < 0x2000;) { + t = line[j1]; + for (j2 = j1; j2 < 0x2000 && line[j2] == t; j2++); + if (t >= 0) { + if (j1 != tables[t].minline) abort(); + if (j2 > tables[t].maxline+1) abort(); + j2 = tables[t].maxline+1; + if (first) + printf(" "); + else + printf(" else "); + first = false; + if (tables[t].usecount == 0) abort(); + if (tables[t].usecount == 1) { + if (j2 != j1+1) abort(); + for (j = 8*j1; j < 8*j2; j++) + if (enc->uni2charset[j] != 0) { + printf("if (wc == 0x%04x)\n c = 0x%02x;\n", j, enc->uni2charset[j]); + break; + } + } else { + if (j1 == 0) { + printf("if (wc < 0x%04x)", 8*j2); + } else { + printf("if (wc >= 0x%04x && wc < 0x%04x)", 8*j1, 8*j2); + } + /* printf("\n c = %s_page%02x[wc", name, j1 >> 5); */ + printf("\n c = %s_page%04x[wc", name, j1); + if (tables[t].minline > 0) + printf("-0x%04x", 8*j1); + printf("];\n"); + } + } + j1 = j2; + } + printf(" if (c != 0) {\n"); + printf(" r[0] = (c >> 8); r[1] = (c & 0xff);\n"); + printf(" return 2;\n"); + printf(" }\n"); + printf(" return RET_ILSEQ;\n"); + printf(" }\n"); + printf(" return RET_TOOSMALL;\n"); + printf("}\n"); +} + +/* + * Outputs the unicode to charset table and function, using a packed array. + * (Suitable if the table is sparse.) + */ +static void output_uni2charset_sparse (const char* name, Encoding* enc) +{ + bool pages[0x100]; + Block pageblocks[0x100]; int npageblocks; + int indx2charset[0x10000]; + int summary_indx[0x1000]; + int summary_used[0x1000]; + int i, row, col, j, p, j1, j2, indx; + + /* Fill pages[0x100]. */ + for (p = 0; p < 0x100; p++) + pages[p] = false; + for (row = 0; row < enc->rows; row++) + for (col = 0; col < enc->cols; col++) { + j = enc->charset2uni[row][col]; + if (j != 0xfffd) + pages[j>>8] = true; + } + +#if 0 + for (p = 0; p < 0x100; p++) + if (pages[p]) { + printf("static const unsigned short %s_page%02x[256] = {\n", name, p); + for (j1 = 0; j1 < 32; j1++) { + printf(" "); + for (j2 = 0; j2 < 8; j2++) + printf("0x%04x, ", enc->uni2charset[256*p+8*j1+j2]); + printf("/""*0x%02x-0x%02x*""/\n", 8*j1, 8*j1+7); + } + printf("};\n"); + } + printf("\n"); +#endif + + /* Fill summary_indx[] and summary_used[]. */ + indx = 0; + for (j1 = 0; j1 < 0x1000; j1++) { + summary_indx[j1] = indx; + summary_used[j1] = 0; + for (j2 = 0; j2 < 16; j2++) { + j = 16*j1+j2; + if (enc->uni2charset[j] != 0) { + indx2charset[indx++] = enc->uni2charset[j]; + summary_used[j1] |= (1 << j2); + } + } + } + + /* Fill npageblocks and pageblocks[]. */ + npageblocks = 0; + for (p = 0; p < 0x100; ) { + if (pages[p] && (p == 0 || !pages[p-1])) { + pageblocks[npageblocks].start = 16*p; + do p++; while (p < 0x100 && pages[p]); + j1 = 16*p; + while (summary_used[j1-1] == 0) j1--; + pageblocks[npageblocks].end = j1; + npageblocks++; + } else + p++; + } + + printf("static const unsigned short %s_2charset[%d] = {\n", name, indx); + for (i = 0; i < indx; ) { + if ((i % 8) == 0) printf(" "); + printf(" 0x%04x,", indx2charset[i]); + i++; + if ((i % 8) == 0 || i == indx) printf("\n"); + } + printf("};\n"); + printf("\n"); + for (i = 0; i < npageblocks; i++) { + printf("static const Summary16 %s_uni2indx_page%02x[%d] = {\n", name, + pageblocks[i].start/16, pageblocks[i].end-pageblocks[i].start); + for (j1 = pageblocks[i].start; j1 < pageblocks[i].end; ) { + if (((16*j1) % 0x100) == 0) printf(" /""* 0x%04x *""/\n", 16*j1); + if ((j1 % 4) == 0) printf(" "); + printf(" { %4d, 0x%04x },", summary_indx[j1], summary_used[j1]); + j1++; + if ((j1 % 4) == 0 || j1 == pageblocks[i].end) printf("\n"); + } + printf("};\n"); + } + printf("\n"); + + printf("static int\n"); + printf("%s_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)\n", name); + printf("{\n"); + printf(" if (n >= 2) {\n"); + printf(" const Summary16 *summary = NULL;\n"); + for (i = 0; i < npageblocks; i++) { + printf(" "); + if (i > 0) + printf("else "); + printf("if (wc >= 0x%04x && wc < 0x%04x)\n", + 16*pageblocks[i].start, 16*pageblocks[i].end); + printf(" summary = &%s_uni2indx_page%02x[(wc>>4)", name, + pageblocks[i].start/16); + if (pageblocks[i].start > 0) + printf("-0x%03x", pageblocks[i].start); + printf("];\n"); + } + printf(" if (summary) {\n"); + printf(" unsigned short used = summary->used;\n"); + printf(" unsigned int i = wc & 0x0f;\n"); + printf(" if (used & ((unsigned short) 1 << i)) {\n"); + printf(" unsigned short c;\n"); + printf(" /* Keep in `used' only the bits 0..i-1. */\n"); + printf(" used &= ((unsigned short) 1 << i) - 1;\n"); + printf(" /* Add `summary->indx' and the number of bits set in `used'. */\n"); + printf(" used = (used & 0x5555) + ((used & 0xaaaa) >> 1);\n"); + printf(" used = (used & 0x3333) + ((used & 0xcccc) >> 2);\n"); + printf(" used = (used & 0x0f0f) + ((used & 0xf0f0) >> 4);\n"); + printf(" used = (used & 0x00ff) + (used >> 8);\n"); + printf(" c = %s_2charset[summary->indx + used];\n", name); + printf(" r[0] = (c >> 8); r[1] = (c & 0xff);\n"); + printf(" return 2;\n"); + printf(" }\n"); + printf(" }\n"); + printf(" return RET_ILSEQ;\n"); + printf(" }\n"); + printf(" return RET_TOOSMALL;\n"); + printf("}\n"); +} + +/* ISO-2022/EUC specifics */ + +static int row_byte_normal (int row) { return 0x21+row; } +static int col_byte_normal (int col) { return 0x21+col; } +static int byte_row_normal (int byte) { return byte-0x21; } +static int byte_col_normal (int byte) { return byte-0x21; } + +static void do_normal (const char* name) +{ + Encoding enc; + + enc.rows = 94; + enc.cols = 94; + enc.row_byte = row_byte_normal; + enc.col_byte = col_byte_normal; + enc.byte_row = byte_row_normal; + enc.byte_col = byte_col_normal; + enc.check_row_expr = "%1$s >= 0x21 && %1$s < 0x7f"; + enc.check_col_expr = "%1$s >= 0x21 && %1$s < 0x7f"; + enc.byte_row_expr = "%1$s - 0x21"; + enc.byte_col_expr = "%1$s - 0x21"; + + read_table(&enc); + output_charset2uni(name,&enc); + invert(&enc); output_uni2charset_sparse(name,&enc); +} + +/* Note: On first sight, the jisx0212_2charset[] table seems to be in order, + starting from the charset=0x3021/uni=0x4e02 pair. But it's only mostly in + order. There are 75 out-of-order values, scattered all throughout the table. + */ + +static void do_normal_only_charset2uni (const char* name) +{ + Encoding enc; + + enc.rows = 94; + enc.cols = 94; + enc.row_byte = row_byte_normal; + enc.col_byte = col_byte_normal; + enc.byte_row = byte_row_normal; + enc.byte_col = byte_col_normal; + enc.check_row_expr = "%1$s >= 0x21 && %1$s < 0x7f"; + enc.check_col_expr = "%1$s >= 0x21 && %1$s < 0x7f"; + enc.byte_row_expr = "%1$s - 0x21"; + enc.byte_col_expr = "%1$s - 0x21"; + + read_table(&enc); + output_charset2uni(name,&enc); +} + +/* CNS 11643 specifics - trick to put two tables into one */ + +static int row_byte_cns11643 (int row) { + return 0x100 * (row / 94) + (row % 94) + 0x21; +} +static int byte_row_cns11643 (int byte) { + return (byte >= 0x100 && byte < 0x200 ? byte-0x121 : + byte >= 0x200 && byte < 0x300 ? byte-0x221+94 : + byte >= 0x300 && byte < 0x400 ? byte-0x321+2*94 : + -1); +} + +static void do_cns11643_only_uni2charset (const char* name) +{ + Encoding enc; + int j, x; + + enc.rows = 3*94; + enc.cols = 94; + enc.row_byte = row_byte_cns11643; + enc.col_byte = col_byte_normal; + enc.byte_row = byte_row_cns11643; + enc.byte_col = byte_col_normal; + enc.check_row_expr = "%1$s >= 0x21 && %1$s < 0x7f"; + enc.check_col_expr = "%1$s >= 0x21 && %1$s < 0x7f"; + enc.byte_row_expr = "%1$s - 0x21"; + enc.byte_col_expr = "%1$s - 0x21"; + + read_table(&enc); + invert(&enc); + /* Move the 2 plane bits into the unused bits 15 and 7. */ + for (j = 0; j < 0x10000; j++) { + x = enc.uni2charset[j]; + if (x != 0) { + if (x & 0x8080) abort(); + switch (x >> 16) { + case 0: /* plane 1 */ x = (x & 0xffff) | 0x0000; break; + case 1: /* plane 2 */ x = (x & 0xffff) | 0x0080; break; + case 2: /* plane 3 */ x = (x & 0xffff) | 0x8000; break; + default: abort(); + } + enc.uni2charset[j] = x; + } + } + output_uni2charset_sparse(name,&enc); +} + +/* GBK specifics */ + +static int row_byte_gbk1 (int row) { + return 0x81+row; +} +static int col_byte_gbk1 (int col) { + return (col >= 0x3f ? 0x41 : 0x40) + col; +} +static int byte_row_gbk1 (int byte) { + if (byte >= 0x81 && byte < 0xff) + return byte-0x81; + else + return -1; +} +static int byte_col_gbk1 (int byte) { + if (byte >= 0x40 && byte < 0x7f) + return byte-0x40; + else if (byte >= 0x80 && byte < 0xff) + return byte-0x41; + else + return -1; +} + +static void do_gbk1 (const char* name) +{ + Encoding enc; + + enc.rows = 126; + enc.cols = 190; + enc.row_byte = row_byte_gbk1; + enc.col_byte = col_byte_gbk1; + enc.byte_row = byte_row_gbk1; + enc.byte_col = byte_col_gbk1; + enc.check_row_expr = "%1$s >= 0x81 && %1$s < 0xff"; + enc.check_col_expr = "(%1$s >= 0x40 && %1$s < 0x7f) || (%1$s >= 0x80 && %1$s < 0xff)"; + enc.byte_row_expr = "%1$s - 0x81"; + enc.byte_col_expr = "%1$s - (%1$s >= 0x80 ? 0x41 : 0x40)"; + + read_table(&enc); + output_charset2uni(name,&enc); + invert(&enc); output_uni2charset_dense(name,&enc); +} + +static void do_gbk1_only_charset2uni (const char* name) +{ + Encoding enc; + + enc.rows = 126; + enc.cols = 190; + enc.row_byte = row_byte_gbk1; + enc.col_byte = col_byte_gbk1; + enc.byte_row = byte_row_gbk1; + enc.byte_col = byte_col_gbk1; + enc.check_row_expr = "%1$s >= 0x81 && %1$s < 0xff"; + enc.check_col_expr = "(%1$s >= 0x40 && %1$s < 0x7f) || (%1$s >= 0x80 && %1$s < 0xff)"; + enc.byte_row_expr = "%1$s - 0x81"; + enc.byte_col_expr = "%1$s - (%1$s >= 0x80 ? 0x41 : 0x40)"; + + read_table(&enc); + output_charset2uni(name,&enc); +} + +static int row_byte_gbk2 (int row) { + return 0x81+row; +} +static int col_byte_gbk2 (int col) { + return (col >= 0x3f ? 0x41 : 0x40) + col; +} +static int byte_row_gbk2 (int byte) { + if (byte >= 0x81 && byte < 0xff) + return byte-0x81; + else + return -1; +} +static int byte_col_gbk2 (int byte) { + if (byte >= 0x40 && byte < 0x7f) + return byte-0x40; + else if (byte >= 0x80 && byte < 0xa1) + return byte-0x41; + else + return -1; +} + +static void do_gbk2_only_charset2uni (const char* name) +{ + Encoding enc; + + enc.rows = 126; + enc.cols = 96; + enc.row_byte = row_byte_gbk2; + enc.col_byte = col_byte_gbk2; + enc.byte_row = byte_row_gbk2; + enc.byte_col = byte_col_gbk2; + enc.check_row_expr = "%1$s >= 0x81 && %1$s < 0xff"; + enc.check_col_expr = "(%1$s >= 0x40 && %1$s < 0x7f) || (%1$s >= 0x80 && %1$s < 0xa1)"; + enc.byte_row_expr = "%1$s - 0x81"; + enc.byte_col_expr = "%1$s - (%1$s >= 0x80 ? 0x41 : 0x40)"; + + read_table(&enc); + output_charset2uni(name,&enc); +} + +static void do_gbk1_only_uni2charset (const char* name) +{ + Encoding enc; + + enc.rows = 126; + enc.cols = 190; + enc.row_byte = row_byte_gbk1; + enc.col_byte = col_byte_gbk1; + enc.byte_row = byte_row_gbk1; + enc.byte_col = byte_col_gbk1; + enc.check_row_expr = "%1$s >= 0x81 && %1$s < 0xff"; + enc.check_col_expr = "(%1$s >= 0x40 && %1$s < 0x7f) || (%1$s >= 0x80 && %1$s < 0xff)"; + enc.byte_row_expr = "%1$s - 0x81"; + enc.byte_col_expr = "%1$s - (%1$s >= 0x80 ? 0x41 : 0x40)"; + + read_table(&enc); + invert(&enc); output_uni2charset_sparse(name,&enc); +} + +/* KSC 5601 specifics */ + +/* + * Reads the charset2uni table from standard input. + */ +static void read_table_ksc5601 (Encoding* enc) +{ + int row, col, i, i1, i2, c, j; + + enc->charset2uni = (int**) malloc(enc->rows*sizeof(int*)); + for (row = 0; row < enc->rows; row++) + enc->charset2uni[row] = (int*) malloc(enc->cols*sizeof(int)); + + for (row = 0; row < enc->rows; row++) + for (col = 0; col < enc->cols; col++) + enc->charset2uni[row][col] = 0xfffd; + + c = getc(stdin); + ungetc(c,stdin); + if (c == '#') { + /* Read a unicode.org style .TXT file. */ + for (;;) { + c = getc(stdin); + if (c == EOF) + break; + if (c == '\n' || c == ' ' || c == '\t') + continue; + if (c == '#') { + do { c = getc(stdin); } while (!(c == EOF || c == '\n')); + continue; + } + ungetc(c,stdin); + if (scanf("0x%x", &j) != 1) + exit(1); + i1 = j >> 8; + i2 = j & 0xff; + if (scanf(" 0x%x", &j) != 1) + exit(1); + /* Take only the range covered by KS C 5601.1987-0 = KS C 5601.1989-0 + = KS X 1001.1992, ignore the rest. */ + if (!(i1 >= 128+33 && i1 < 128+127 && i2 >= 128+33 && i2 < 128+127)) + continue; /* KSC5601 specific */ + i1 &= 0x7f; /* KSC5601 specific */ + i2 &= 0x7f; /* KSC5601 specific */ + row = enc->byte_row(i1); + col = enc->byte_col(i2); + if (row < 0 || col < 0) { + fprintf(stderr, "lost entry for %02x %02x\n", i1, i2); + exit(1); + } + enc->charset2uni[row][col] = j; + } + } else { + /* Read a table of hexadecimal Unicode values. */ + for (i1 = 33; i1 < 127; i1++) + for (i2 = 33; i2 < 127; i2++) { + i = scanf("%x", &j); + if (i == EOF) + goto read_done; + if (i != 1) + exit(1); + if (j < 0 || j == 0xffff) + j = 0xfffd; + if (j != 0xfffd) { + if (enc->byte_row(i1) < 0 || enc->byte_col(i2) < 0) { + fprintf(stderr, "lost entry at %02x %02x\n", i1, i2); + exit (1); + } + enc->charset2uni[enc->byte_row(i1)][enc->byte_col(i2)] = j; + } + } + read_done: ; + } +} + +static void do_ksc5601 (const char* name) +{ + Encoding enc; + + enc.rows = 94; + enc.cols = 94; + enc.row_byte = row_byte_normal; + enc.col_byte = col_byte_normal; + enc.byte_row = byte_row_normal; + enc.byte_col = byte_col_normal; + enc.check_row_expr = "%1$s >= 0x21 && %1$s < 0x7f"; + enc.check_col_expr = "%1$s >= 0x21 && %1$s < 0x7f"; + enc.byte_row_expr = "%1$s - 0x21"; + enc.byte_col_expr = "%1$s - 0x21"; + + read_table_ksc5601(&enc); + output_charset2uni(name,&enc); + invert(&enc); output_uni2charset_sparse(name,&enc); +} + +/* Big5 specifics */ + +static int row_byte_big5 (int row) { + return 0xa1+row; +} +static int col_byte_big5 (int col) { + return (col >= 0x3f ? 0x62 : 0x40) + col; +} +static int byte_row_big5 (int byte) { + if (byte >= 0xa1 && byte < 0xff) + return byte-0xa1; + else + return -1; +} +static int byte_col_big5 (int byte) { + if (byte >= 0x40 && byte < 0x7f) + return byte-0x40; + else if (byte >= 0xa1 && byte < 0xff) + return byte-0x62; + else + return -1; +} + +static void do_big5 (const char* name) +{ + Encoding enc; + + enc.rows = 94; + enc.cols = 157; + enc.row_byte = row_byte_big5; + enc.col_byte = col_byte_big5; + enc.byte_row = byte_row_big5; + enc.byte_col = byte_col_big5; + enc.check_row_expr = "%1$s >= 0xa1 && %1$s < 0xff"; + enc.check_col_expr = "(%1$s >= 0x40 && %1$s < 0x7f) || (%1$s >= 0xa1 && %1$s < 0xff)"; + enc.byte_row_expr = "%1$s - 0xa1"; + enc.byte_col_expr = "%1$s - (%1$s >= 0xa1 ? 0x62 : 0x40)"; + + read_table(&enc); + output_charset2uni(name,&enc); + invert(&enc); output_uni2charset_sparse(name,&enc); +} + +/* Johab Hangul specifics */ + +static int row_byte_johab_hangul (int row) { + return 0x84+row; +} +static int col_byte_johab_hangul (int col) { + return (col >= 0x3e ? 0x43 : 0x41) + col; +} +static int byte_row_johab_hangul (int byte) { + if (byte >= 0x84 && byte < 0xd4) + return byte-0x84; + else + return -1; +} +static int byte_col_johab_hangul (int byte) { + if (byte >= 0x41 && byte < 0x7f) + return byte-0x41; + else if (byte >= 0x81 && byte < 0xff) + return byte-0x43; + else + return -1; +} + +static void do_johab_hangul (const char* name) +{ + Encoding enc; + + enc.rows = 80; + enc.cols = 188; + enc.row_byte = row_byte_johab_hangul; + enc.col_byte = col_byte_johab_hangul; + enc.byte_row = byte_row_johab_hangul; + enc.byte_col = byte_col_johab_hangul; + enc.check_row_expr = "%1$s >= 0x84 && %1$s < 0xd4"; + enc.check_col_expr = "(%1$s >= 0x41 && %1$s < 0x7f) || (%1$s >= 0x81 && %1$s < 0xff)"; + enc.byte_row_expr = "%1$s - 0x84"; + enc.byte_col_expr = "%1$s - (%1$s >= 0x81 ? 0x43 : 0x41)"; + + read_table(&enc); + output_charset2uni(name,&enc); + invert(&enc); output_uni2charset_dense(name,&enc); +} + +/* SJIS specifics */ + +static int row_byte_sjis (int row) { + return (row >= 0x1f ? 0xc1 : 0x81) + row; +} +static int col_byte_sjis (int col) { + return (col >= 0x3f ? 0x41 : 0x40) + col; +} +static int byte_row_sjis (int byte) { + if (byte >= 0x81 && byte < 0xa0) + return byte-0x81; + else if (byte >= 0xe0) + return byte-0xc1; + else + return -1; +} +static int byte_col_sjis (int byte) { + if (byte >= 0x40 && byte < 0x7f) + return byte-0x40; + else if (byte >= 0x80 && byte < 0xfd) + return byte-0x41; + else + return -1; +} + +static void do_sjis (const char* name) +{ + Encoding enc; + + enc.rows = 94; + enc.cols = 188; + enc.row_byte = row_byte_sjis; + enc.col_byte = col_byte_sjis; + enc.byte_row = byte_row_sjis; + enc.byte_col = byte_col_sjis; + enc.check_row_expr = "(%1$s >= 0x81 && %1$s < 0xa0) || (%1$s >= 0xe0)"; + enc.check_col_expr = "(%1$s >= 0x40 && %1$s < 0x7f) || (%1$s >= 0x80 && %1$s < 0xfd)"; + enc.byte_row_expr = "%1$s - (%1$s >= 0xe0 ? 0xc1 : 0x81)"; + enc.byte_col_expr = "%1$s - (%1$s >= 0x80 ? 0x41 : 0x40)"; + + read_table(&enc); + output_charset2uni(name,&enc); + invert(&enc); output_uni2charset_sparse(name,&enc); +} + +/* Main program */ + +int main (int argc, char *argv[]) +{ + const char* charsetname; + const char* name; + + if (argc != 3) + exit(1); + charsetname = argv[1]; + name = argv[2]; + + output_title(charsetname); + + if (!strcmp(name,"gb2312") || !strcmp(name,"gb12345ext") + || !strcmp(name,"jisx0208") || !strcmp(name,"jisx0212")) + do_normal(name); + else if (!strcmp(name,"cns11643_1") || !strcmp(name,"cns11643_2") + || !strcmp(name,"cns11643_3")) + do_normal_only_charset2uni(name); + else if (!strcmp(name,"cns11643_inv")) + do_cns11643_only_uni2charset(name); + else if (!strcmp(name,"gbkext1")) + do_gbk1_only_charset2uni(name); + else if (!strcmp(name,"gbkext2")) + do_gbk2_only_charset2uni(name); + else if (!strcmp(name,"gbkext_inv")) + do_gbk1_only_uni2charset(name); + else if (!strcmp(name,"cp936ext")) + do_gbk1(name); + else if (!strcmp(name,"ksc5601")) + do_ksc5601(name); + else if (!strcmp(name,"big5") || !strcmp(name,"cp950ext")) + do_big5(name); + else if (!strcmp(name,"johab_hangul")) + do_johab_hangul(name); + else if (!strcmp(name,"cp932ext")) + do_sjis(name); + else + exit(1); + + return 0; +} diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_10.h b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_10.h index b63de3eb0..94e1c6985 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_10.h +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_10.h @@ -4,6 +4,7 @@ * ISO-8859-10 */ +#ifdef NEED_TOWC static const unsigned short iso8859_10_2uni[96] = { /* 0xa0 */ 0x00a0, 0x0104, 0x0112, 0x0122, 0x012a, 0x0128, 0x0136, 0x00a7, @@ -35,7 +36,9 @@ iso8859_10_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) *pwc = (ucs4_t) iso8859_10_2uni[c-0xa0]; return 1; } +#endif /* NEED_TOWC */ +#ifdef NEED_TOMB static const unsigned char iso8859_10_page00[224] = { 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa7, /* 0xa0-0xa7 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0xad, 0x00, 0x00, /* 0xa8-0xaf */ @@ -86,3 +89,4 @@ iso8859_10_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } return RET_ILSEQ; } +#endif /* NEED_TOMB */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_11.h b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_11.h index ced0b3f29..0d4d126fd 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_11.h +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_11.h @@ -4,6 +4,7 @@ * ISO8859-11 */ +#ifdef NEED_TOWC static const unsigned short iso8859_11_2uni[96] = { /* 0xa0 */ 0x00a0, 0x0e01, 0x0e02, 0x0e03, 0x0e04, 0x0e05, 0x0e06, 0x0e07, @@ -44,7 +45,9 @@ iso8859_11_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) } return RET_ILSEQ; } +#endif /* NEED_TOWC */ +#ifdef NEED_TOMB static const unsigned char iso8859_11_page0e[96] = { 0x00, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, /* 0x00-0x07 */ 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, /* 0x08-0x0f */ @@ -76,3 +79,4 @@ iso8859_11_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } return RET_ILSEQ; } +#endif /* NEED_TOMB */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_13.h b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_13.h index fe1d767bc..1f4ccd06c 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_13.h +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_13.h @@ -4,6 +4,7 @@ * ISO-8859-13 */ +#ifdef NEED_TOWC static const unsigned short iso8859_13_2uni[96] = { /* 0xa0 */ 0x00a0, 0x201d, 0x00a2, 0x00a3, 0x00a4, 0x201e, 0x00a6, 0x00a7, @@ -35,7 +36,9 @@ iso8859_13_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) *pwc = (ucs4_t) iso8859_13_2uni[c-0xa0]; return 1; } +#endif /* NEED_TOWC */ +#ifdef NEED_TOMB static const unsigned char iso8859_13_page00[224] = { 0xa0, 0x00, 0xa2, 0xa3, 0xa4, 0x00, 0xa6, 0xa7, /* 0xa0-0xa7 */ 0x00, 0xa9, 0x00, 0xab, 0xac, 0xad, 0xae, 0x00, /* 0xa8-0xaf */ @@ -89,3 +92,4 @@ iso8859_13_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } return RET_ILSEQ; } +#endif /* NEED_TOWC */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_14.h b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_14.h index c76c2c2ae..b36b6b916 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_14.h +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_14.h @@ -4,6 +4,7 @@ * ISO-8859-14 */ +#ifdef NEED_TOWC static const unsigned short iso8859_14_2uni[96] = { /* 0xa0 */ 0x00a0, 0x1e02, 0x1e03, 0x00a3, 0x010a, 0x010b, 0x1e0a, 0x00a7, @@ -35,7 +36,9 @@ iso8859_14_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) *pwc = (ucs4_t) c; return 1; } +#endif /* NEED_TOWC */ +#ifdef NEED_TOMB static const unsigned char iso8859_14_page00[96] = { 0xa0, 0x00, 0x00, 0xa3, 0x00, 0x00, 0x00, 0xa7, /* 0xa0-0xa7 */ 0x00, 0xa9, 0x00, 0x00, 0x00, 0xad, 0xae, 0x00, /* 0xa8-0xaf */ @@ -107,3 +110,4 @@ iso8859_14_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } return RET_ILSEQ; } +#endif /* NEED_TOMB */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_15.h b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_15.h index 8c613d7f7..99d5ceb1a 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_15.h +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_15.h @@ -4,6 +4,7 @@ * ISO-8859-15 */ +#ifdef NEED_TOWC static const unsigned short iso8859_15_2uni[32] = { /* 0xa0 */ 0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x20ac, 0x00a5, 0x0160, 0x00a7, @@ -23,7 +24,9 @@ iso8859_15_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) *pwc = (ucs4_t) c; return 1; } +#endif /* NEED_TOWC */ +#ifdef NEED_TOMB static const unsigned char iso8859_15_page00[32] = { 0xa0, 0xa1, 0xa2, 0xa3, 0x00, 0xa5, 0x00, 0xa7, /* 0xa0-0xa7 */ 0x00, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, /* 0xa8-0xaf */ @@ -61,3 +64,4 @@ iso8859_15_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } return RET_ILSEQ; } +#endif /* NEED_TOMB */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_2.h b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_2.h index 9598d54bd..28c5f1094 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_2.h +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_2.h @@ -4,6 +4,7 @@ * ISO-8859-2 */ +#ifdef NEED_TOWC static const unsigned short iso8859_2_2uni[96] = { /* 0xa0 */ 0x00a0, 0x0104, 0x02d8, 0x0141, 0x00a4, 0x013d, 0x015a, 0x00a7, @@ -35,7 +36,9 @@ iso8859_2_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) *pwc = (ucs4_t) iso8859_2_2uni[c-0xa0]; return 1; } +#endif /* NEED_TOWC */ +#ifdef NEED_TOMB static const unsigned char iso8859_2_page00[224] = { 0xa0, 0x00, 0x00, 0x00, 0xa4, 0x00, 0x00, 0xa7, /* 0xa0-0xa7 */ 0xa8, 0x00, 0x00, 0x00, 0x00, 0xad, 0x00, 0x00, /* 0xa8-0xaf */ @@ -74,6 +77,7 @@ static const unsigned char iso8859_2_page02[32] = { 0xa2, 0xff, 0x00, 0xb2, 0x00, 0xbd, 0x00, 0x00, /* 0xd8-0xdf */ }; +/* static int iso8859_2_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) { @@ -92,3 +96,5 @@ iso8859_2_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } return RET_ILSEQ; } +*/ +#endif /* NEED_TOMB */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_3.h b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_3.h index 1604c2545..b2f3c7154 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_3.h +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_3.h @@ -4,6 +4,7 @@ * ISO-8859-3 */ +#ifdef NEED_TOWC static const unsigned short iso8859_3_2uni[96] = { /* 0xa0 */ 0x00a0, 0x0126, 0x02d8, 0x00a3, 0x00a4, 0xfffd, 0x0124, 0x00a7, @@ -42,7 +43,9 @@ iso8859_3_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) } return RET_ILSEQ; } +#endif /* NEED_TOWC */ +#ifdef NEED_TOMB static const unsigned char iso8859_3_page00[96] = { 0xa0, 0x00, 0x00, 0xa3, 0xa4, 0x00, 0x00, 0xa7, /* 0xa0-0xa7 */ 0xa8, 0x00, 0x00, 0x00, 0x00, 0xad, 0x00, 0x00, /* 0xa8-0xaf */ @@ -98,3 +101,4 @@ iso8859_3_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } return RET_ILSEQ; } +#endif /* NEED_TOMB */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_4.h b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_4.h index 6ea62d1cf..c5e261f7d 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_4.h +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_4.h @@ -4,6 +4,7 @@ * ISO-8859-4 */ +#ifdef NEED_TOWC static const unsigned short iso8859_4_2uni[96] = { /* 0xa0 */ 0x00a0, 0x0104, 0x0138, 0x0156, 0x00a4, 0x0128, 0x013b, 0x00a7, @@ -35,7 +36,9 @@ iso8859_4_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) *pwc = (ucs4_t) iso8859_4_2uni[c-0xa0]; return 1; } +#endif /* NEED_TOWC */ +#ifdef NEED_TOMB static const unsigned char iso8859_4_page00[224] = { 0xa0, 0x00, 0x00, 0x00, 0xa4, 0x00, 0x00, 0xa7, /* 0xa0-0xa7 */ 0xa8, 0x00, 0x00, 0x00, 0x00, 0xad, 0x00, 0xaf, /* 0xa8-0xaf */ @@ -92,3 +95,4 @@ iso8859_4_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } return RET_ILSEQ; } +#endif /* NEED_TOMB */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_5.h b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_5.h index d47856772..6d1970100 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_5.h +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_5.h @@ -4,6 +4,7 @@ * ISO-8859-5 */ +#ifdef NEED_TOWC static const unsigned short iso8859_5_2uni[96] = { /* 0xa0 */ 0x00a0, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407, @@ -35,7 +36,9 @@ iso8859_5_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) *pwc = (ucs4_t) iso8859_5_2uni[c-0xa0]; return 1; } +#endif /* NEED_TOWC */ +#ifdef NEED_TOMB static const unsigned char iso8859_5_page00[16] = { 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, /* 0xa0-0xa7 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0xad, 0x00, 0x00, /* 0xa8-0xaf */ @@ -75,3 +78,4 @@ iso8859_5_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } return RET_ILSEQ; } +#endif /* NEED_TOMB */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_6.h b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_6.h index 4d57893ac..bcff11928 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_6.h +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_6.h @@ -4,6 +4,7 @@ * ISO-8859-6 */ +#ifdef NEED_TOWC static const unsigned short iso8859_6_2uni[96] = { /* 0xa0 */ 0x00a0, 0xfffd, 0xfffd, 0xfffd, 0x00a4, 0xfffd, 0xfffd, 0xfffd, @@ -42,7 +43,9 @@ iso8859_6_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) } return RET_ILSEQ; } +#endif /* NEED_TOWC */ +#ifdef NEED_TOMB static const unsigned char iso8859_6_page00[16] = { 0xa0, 0x00, 0x00, 0x00, 0xa4, 0x00, 0x00, 0x00, /* 0xa0-0xa7 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0xad, 0x00, 0x00, /* 0xa8-0xaf */ @@ -78,3 +81,4 @@ iso8859_6_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } return RET_ILSEQ; } +#endif /* NEED_TOMB */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_7.h b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_7.h index 790cec759..c85a68776 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_7.h +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_7.h @@ -4,6 +4,7 @@ * ISO-8859-7 */ +#ifdef NEED_TOWC static const unsigned short iso8859_7_2uni[96] = { /* 0xa0 */ 0x00a0, 0x2018, 0x2019, 0x00a3, 0xfffd, 0xfffd, 0x00a6, 0x00a7, @@ -42,7 +43,9 @@ iso8859_7_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) } return RET_ILSEQ; } +#endif /* NEED_TOWC */ +#ifdef NEED_TOMB static const unsigned char iso8859_7_page00[32] = { 0xa0, 0x00, 0x00, 0xa3, 0x00, 0x00, 0xa6, 0xa7, /* 0xa0-0xa7 */ 0xa8, 0xa9, 0x00, 0xab, 0xac, 0xad, 0x00, 0x00, /* 0xa8-0xaf */ @@ -86,3 +89,4 @@ iso8859_7_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } return RET_ILSEQ; } +#endif /* NEED_TOMB */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_8.h b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_8.h index 7b780f029..a31e2aca5 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_8.h +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_8.h @@ -4,6 +4,7 @@ * ISO-8859-8 */ +#ifdef NEED_TOWC static const unsigned short iso8859_8_2uni[96] = { /* 0xa0 */ 0x00a0, 0xfffd, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7, @@ -42,7 +43,9 @@ iso8859_8_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) } return RET_ILSEQ; } +#endif /* NEED_TOWC */ +#ifdef NEED_TOMB static const unsigned char iso8859_8_page00[88] = { 0xa0, 0x00, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, /* 0xa0-0xa7 */ 0xa8, 0xa9, 0x00, 0xab, 0xac, 0xad, 0xae, 0xaf, /* 0xa8-0xaf */ @@ -87,3 +90,4 @@ iso8859_8_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } return RET_ILSEQ; } +#endif /* NEED_TOMB */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_9.h b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_9.h index 55ec1cb11..0986c2292 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_9.h +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/iso8859_9.h @@ -4,6 +4,7 @@ * ISO-8859-9 */ +#ifdef NEED_TOWC static const unsigned short iso8859_9_2uni[48] = { /* 0xd0 */ 0x011e, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7, @@ -26,7 +27,9 @@ iso8859_9_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) *pwc = (ucs4_t) c; return 1; } +#endif /* NEED_TOWC */ +#ifdef NEED_TOMB static const unsigned char iso8859_9_page00[48] = { 0x00, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, /* 0xd0-0xd7 */ 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0x00, 0x00, 0xdf, /* 0xd8-0xdf */ @@ -65,3 +68,4 @@ iso8859_9_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } return RET_ILSEQ; } +#endif /* NEED_TOMB */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/jisx0201.h b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/jisx0201.h index 4a30f2847..1c7a8513d 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/jisx0201.h +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/jisx0201.h @@ -3,6 +3,7 @@ /* * JISX0201.1976-0 */ +#ifdef NEED_TOWC static int jisx0201_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) @@ -24,6 +25,9 @@ jisx0201_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) } return RET_ILSEQ; } +#endif /* NEED_TOWC */ + +#ifdef NEED_TOMB static int jisx0201_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) @@ -46,3 +50,4 @@ jisx0201_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } return RET_ILSEQ; } +#endif /* NEED_TOMB */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/jisx0208.h b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/jisx0208.h index 9c080522e..37db9150d 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/jisx0208.h +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/jisx0208.h @@ -3,6 +3,7 @@ /* * JISX0208.1990-0 */ +#ifdef NEED_TOWC static const unsigned short jisx0208_2uni_page21[690] = { /* 0x21 */ @@ -1019,7 +1020,9 @@ jisx0208_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) } return RET_ILSEQ; } +#endif /* NEED_TOWC */ +#ifdef NEED_TOMB static const unsigned short jisx0208_2charset[6879] = { 0x2140, 0x2171, 0x2172, 0x2178, 0x212f, 0x224c, 0x216b, 0x215e, 0x212d, 0x2279, 0x215f, 0x2160, 0x2621, 0x2622, 0x2623, 0x2624, @@ -2395,3 +2398,4 @@ jisx0208_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } return RET_TOOSMALL; } +#endif /* NEED_TOMB */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/jisx0212.h b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/jisx0212.h index a4857b9bd..d0cb69fb0 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/jisx0212.h +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/jisx0212.h @@ -3,6 +3,7 @@ /* * JISX0212.1990-0 */ +#ifdef NEED_TOWC static const unsigned short jisx0212_2uni_page22[81] = { /* 0x22 */ @@ -926,7 +927,9 @@ jisx0212_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) } return RET_ILSEQ; } +#endif /* NEED_TOWC */ +#ifdef NEED_TOMB static const unsigned short jisx0212_2charset[6067] = { 0x2237, 0x2242, 0x2270, 0x2243, 0x226d, 0x226c, 0x226e, 0x2234, 0x2231, 0x226b, 0x2244, 0x2a22, 0x2a21, 0x2a24, 0x2a2a, 0x2a23, @@ -2162,3 +2165,4 @@ jisx0212_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } return RET_TOOSMALL; } +#endif /* NEED_TOMB */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/koi8_r.h b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/koi8_r.h index a0d3d9b26..d85f41a28 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/koi8_r.h +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/koi8_r.h @@ -6,6 +6,7 @@ /* Specification: RFC 1489 */ +#ifdef NEED_TOWC static const unsigned short koi8_r_2uni[128] = { /* 0x80 */ 0x2500, 0x2502, 0x250c, 0x2510, 0x2514, 0x2518, 0x251c, 0x2524, @@ -43,7 +44,9 @@ koi8_r_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) *pwc = (ucs4_t) koi8_r_2uni[c-0x80]; return 1; } +#endif /* NEED_TOWC */ +#ifdef NEED_TOMB static const unsigned char koi8_r_page00[88] = { 0x9a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa0-0xa7 */ 0x00, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa8-0xaf */ @@ -133,3 +136,4 @@ koi8_r_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } return RET_ILSEQ; } +#endif /* NEED_TOMB */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/koi8_u.h b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/koi8_u.h index 43457afd9..abb6c8979 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/koi8_u.h +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/koi8_u.h @@ -5,7 +5,7 @@ */ /* Specification: RFC 2319 */ - +#ifdef NEED_TOWC static const unsigned short koi8_u_2uni[128] = { /* 0x80 */ 0x2500, 0x2502, 0x250c, 0x2510, 0x2514, 0x2518, 0x251c, 0x2524, @@ -43,7 +43,9 @@ koi8_u_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) *pwc = (ucs4_t) koi8_u_2uni[c-0x80]; return 1; } +#endif /* NEED_TOWC */ +#ifdef NEED_TOMB static const unsigned char koi8_u_page00[88] = { 0x9a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa0-0xa7 */ 0x00, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa8-0xaf */ @@ -141,3 +143,4 @@ koi8_u_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } return RET_ILSEQ; } +#endif /* NEED_TOMB */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/ksc5601.h b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/ksc5601.h index 62ac66d7f..277c8d44b 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/ksc5601.h +++ b/plugins/zynaddsubfx/fltk/src/xutf8/lcUniConv/ksc5601.h @@ -3,7 +3,7 @@ /* * KSC5601.1987-0 */ - +#ifdef NEED_TOWC static const unsigned short ksc5601_2uni_page21[1115] = { /* 0x21 */ 0x3000, 0x3001, 0x3002, 0x00b7, 0x2025, 0x2026, 0x00a8, 0x3003, @@ -1198,7 +1198,9 @@ ksc5601_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) } return RET_ILSEQ; } +#endif /* NEED_TOWC */ +#ifdef NEED_TOMB static const unsigned short ksc5601_2charset[8224] = { 0x222e, 0x2234, 0x2157, 0x2127, 0x2823, 0x2129, 0x2146, 0x213e, 0x2977, 0x2978, 0x2225, 0x2252, 0x2124, 0x222c, 0x2976, 0x282c, @@ -3001,3 +3003,4 @@ ksc5601_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } return RET_TOOSMALL; } +#endif /* NEED_TOMB */ diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/ucs2fontmap.c b/plugins/zynaddsubfx/fltk/src/xutf8/ucs2fontmap.c index f1b966981..fe3150ba4 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/ucs2fontmap.c +++ b/plugins/zynaddsubfx/fltk/src/xutf8/ucs2fontmap.c @@ -36,7 +36,8 @@ typedef struct { unsigned short used; } Summary16; - +#define NEED_TOMB /* indicates what part of these include files is needed here (avoid compilation warnings) */ +#include "lcUniConv/cp936ext.h" #include "lcUniConv/big5.h" #include "lcUniConv/gb2312.h" #include "lcUniConv/iso8859_10.h" @@ -295,11 +296,16 @@ int ucs2fontmap(char *s, unsigned int ucs, int enc) { return 24; } break; + case 26: /* gbk/cp936ext */ + if (cp936ext_wctomb(NULL, (unsigned char*)s, ucs, 2) > 0) { + return 26; + } + break; default: break; }; return -1; -}; +} /*const*/ int encoding_number(const char *enc) { @@ -363,9 +369,11 @@ int encoding_number(const char *enc) { return 24; } else if (!strcmp(enc, "iso8859-11")) { return 25; + } else if (!strcmp(enc, "gbk-0") || !strcmp(enc, "cp936") || !strcmp(enc, "gbk")) { + return 26; }; return -1; -}; +} /* * End of "$Id$". diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/utf8Input.c b/plugins/zynaddsubfx/fltk/src/xutf8/utf8Input.c index 8882c9ecf..2fb415b51 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/utf8Input.c +++ b/plugins/zynaddsubfx/fltk/src/xutf8/utf8Input.c @@ -25,7 +25,7 @@ #if !defined(WIN32) && !defined(__APPLE__) -#include "config.h" +#include #include "../../FL/Xutf8.h" #include #include @@ -52,8 +52,10 @@ typedef struct { unsigned short used; } Summary16; +#define NEED_TOWC /* indicates what part of these include files is needed here (avoid compilation warnings) */ #include "lcUniConv/big5.h" #include "lcUniConv/gb2312.h" +#include "lcUniConv/cp936ext.h" #include "lcUniConv/jisx0201.h" #include "lcUniConv/jisx0208.h" #include "lcUniConv/jisx0212.h" @@ -190,6 +192,43 @@ XConvertBig5ToUtf8(char* buffer_return, int len) { return l; } +int +XConvertCp936extToUtf8(char* buffer_return, int len) +{ + int i = 0, l = 0; + char *buf; + + if (len < 1) return 0; + buf = (char*) malloc((unsigned)len); + memcpy(buf, buffer_return, (unsigned)len); + + if (len == 1) { + l += XConvertUcsToUtf8((unsigned int)buf[i], buffer_return + l); + } + while (i + 1 < len) { + unsigned int ucs; + unsigned char b[2]; + b[0] = (unsigned char) buf[i]; + b[1] = (unsigned char) buf[i + 1]; + if (cp936ext_mbtowc(NULL, &ucs, b, 2) == 2) { + i += 2; + } else { + if ( b[0] < 0x80) { + ucs = b[0]; + }else{ + ucs = '?'; + } + i++; + } + l += XConvertUcsToUtf8(ucs, buffer_return + l); + } + if(i + 1 == len) { + l += XConvertUcsToUtf8((unsigned int)buf[i], buffer_return + l); + } + free(buf); + return l; +} + int XConvertGb2312ToUtf8(char* buffer_return, int len) { int i = 0, l = 0; @@ -207,7 +246,10 @@ XConvertGb2312ToUtf8(char* buffer_return, int len) { unsigned char b[2]; b[0] = (unsigned char) buf[i]; b[1] = (unsigned char) buf[i + 1]; - if (gb2312_mbtowc(NULL, &ucs, b, 2) == 2) { + if ( b[0] < 0x80 ) { + ucs = b[0]; + i++; + } else if (gb2312_mbtowc(NULL, &ucs, b, 2) == 2) { i += 2; } else { ucs = '?'; @@ -215,6 +257,9 @@ XConvertGb2312ToUtf8(char* buffer_return, int len) { } l += XConvertUcsToUtf8(ucs, buffer_return + l); } + if (i + 1 == len) { + l += XConvertUcsToUtf8((unsigned int)buf[i], buffer_return + l); + } free(buf); return l; } @@ -337,7 +382,9 @@ XConvertEucToUtf8(const char* locale, int len, int bytes_buffer) { - if (!locale/* || strstr(locale, "UTF") || strstr(locale, "utf")*/) { + /* if (!locale) { */ + /* if (!locale || strstr(locale, "UTF") || strstr(locale, "utf")) { */ + if (!locale || strstr(locale, "UTF") || strstr(locale, "utf")) { return len; } @@ -345,6 +392,8 @@ XConvertEucToUtf8(const char* locale, return XConvertEucJpToUtf8(buffer_return, len); } else if (strstr(locale, "Big5") || strstr(locale, "big5")) { /* BIG5 */ return XConvertBig5ToUtf8(buffer_return, len); + } else if (strstr(locale, "GBK") || strstr(locale, "gbk")) { + return XConvertCp936extToUtf8(buffer_return, len); } else if (strstr(locale, "zh") || strstr(locale, "chinese-")) { if (strstr(locale, "TW") || strstr(locale, "chinese-t")) { if (strstr(locale, "EUC") || strstr(locale, "euc") || strstr(locale, "chinese-t")) { diff --git a/plugins/zynaddsubfx/fltk/src/xutf8/utf8Wrap.c b/plugins/zynaddsubfx/fltk/src/xutf8/utf8Wrap.c index 8e513e767..1d7f5239a 100644 --- a/plugins/zynaddsubfx/fltk/src/xutf8/utf8Wrap.c +++ b/plugins/zynaddsubfx/fltk/src/xutf8/utf8Wrap.c @@ -1,4 +1,4 @@ -/* "$Id: $" +/* "$Id: utf8Wrap.c 8401 2011-02-08 10:06:19Z ianmacarthur $" * * Author: Jean-Marc Lienher ( http://oksid.ch ) * Copyright 2000-2003 by O'ksi'D. @@ -37,24 +37,41 @@ /* External auto generated functions : */ #include "ucs2fontmap.c" -/* +/* * extern int ucs2fontmap(char *s, unsigned int ucs, int enc); * extern int encoding_number(const char *enc); * extern const char *encoding_name(int num); */ +/* The ARM header files have a bug by not taking into account that ARM cpu + * likes pacing to 4 bytes. This little trick defines our own version of + * XChar2b which does not have this problem + */ + +#if defined(__GNUC__) && defined(__arm__) && !defined(__ARM_EABI__) +typedef struct { + unsigned char byte1; + unsigned char byte2; +} +__attribute__ ((packed)) +Fl_XChar2b; +#else +#define Fl_XChar2b XChar2b +#endif + + /*********************************************************************/ /** extract a list of font from the base font name list **/ /*********************************************************************/ -static int +static int get_font_list( - const char *base_font_name_list, + const char *base_font_name_list, char ***flist) { const char *ptr; const char *p; int nb; int nb_name; - + ptr = base_font_name_list; p = NULL; nb = 0; @@ -86,28 +103,28 @@ get_font_list( free(*flist); *flist = (char**)NULL; } - return nb; + return nb; } /*********************************************************************/ /** get the font name used as encoding for "fontspecific" encoding **/ /** (mainly used for adobe-symbol and adobe-zapfdingbats) **/ /*********************************************************************/ -static int +static int font_spec_enc(char *font) { int ret; char *enc; char *end; enc = font; - while (*enc != '-') enc++; + while (*enc != '-') enc++; enc++; while (*enc != '-') enc++; enc++; end = enc; while (*end != '-') end++; *end = '\0'; - + ret = encoding_number(enc); *end = '-'; @@ -142,14 +159,14 @@ get_range(const char *enc, val = strtol(ptr1, NULL, 0); if (val < *min) *min = val; if (val > *max) *max = val; - } + } } /*********************************************************************/ /** get the internal encoding number of each fonts **/ /*********************************************************************/ static int * -get_encodings(char **font_name_list, +get_encodings(char **font_name_list, int *ranges, int nb_font) { @@ -166,7 +183,7 @@ get_encodings(char **font_name_list, font_encoding_list[i] = -1; ranges[i * 2] = 0; ranges[i * 2 + 1] = 0xFFFF; - + if (ptr && strstr(ptr, "fontspecific")) { font_encoding_list[i] = font_spec_enc(ptr); ptr = NULL; @@ -177,13 +194,13 @@ get_encodings(char **font_name_list, if (ec == 13) { font_encoding_list[i] = encoding_number(ptr + 1); if (font_encoding_list[i] == 0) { - get_range(ptr + 1, + get_range(ptr + 1, ranges + i * 2, ranges + i * 2 + 1); } break; } - } + } ptr++; } if (font_encoding_list[i] < 0) font_encoding_list[i] = 1; @@ -217,8 +234,8 @@ find_best_font(Display *dpy, /*********************************************************************/ /** load all fonts **/ /*********************************************************************/ -static void -load_fonts(Display *dpy, +static void +load_fonts(Display *dpy, XUtf8FontStruct *font_set) { int i; @@ -229,8 +246,8 @@ load_fonts(Display *dpy, font_set->fonts = (XFontStruct**) malloc(sizeof(XFontStruct*) * font_set->nb_font); - - font_set->ranges = (int*) malloc(sizeof(int) * + + font_set->ranges = (int*) malloc(sizeof(int) * font_set->nb_font * 2); font_set->descent = 0; @@ -240,7 +257,7 @@ load_fonts(Display *dpy, while (i < font_set->nb_font) { XFontStruct *fnt; - fnt = font_set->fonts[i] = + fnt = font_set->fonts[i] = find_best_font(dpy, &(font_set->font_name_list[i])); if (fnt) { font_set->fid = fnt->fid; @@ -257,8 +274,8 @@ load_fonts(Display *dpy, i++; } - font_set->encodings = - get_encodings(font_set->font_name_list, + font_set->encodings = + get_encodings(font_set->font_name_list, font_set->ranges, font_set->nb_font); /* unload fonts with same encoding */ @@ -280,11 +297,11 @@ load_fonts(Display *dpy, } } } - } + } } /*********************************************************************/ -/** Creates an array of XFontStruct according to the comma separated **/ +/** Creates an array of XFontStruct acording to the comma separated **/ /** list of fonts. XLoad all fonts. **/ /*********************************************************************/ XUtf8FontStruct * @@ -292,14 +309,14 @@ XCreateUtf8FontStruct(Display *dpy, const char *base_font_name_list) { XUtf8FontStruct *font_set; - + font_set = (XUtf8FontStruct*)malloc(sizeof(XUtf8FontStruct)); if (!font_set) { return NULL; } - font_set->nb_font = get_font_list(base_font_name_list, + font_set->nb_font = get_font_list(base_font_name_list, &font_set->font_name_list); if (font_set->nb_font < 1) { @@ -316,26 +333,26 @@ XCreateUtf8FontStruct(Display *dpy, /*****************************************************************************/ /** draw a Right To Left UTF-8 string using multiple fonts as needed. **/ /*****************************************************************************/ -void -XUtf8DrawRtlString(Display *display, +void +XUtf8DrawRtlString(Display *display, Drawable d, - XUtf8FontStruct *font_set, - GC gc, - int x, - int y, + XUtf8FontStruct *font_set, + GC gc, + int x, + int y, const char *string, int num_bytes) { int *encodings; /* encodings array */ XFontStruct **fonts; /* fonts array */ - XChar2b buf[128]; /* drawing buffer */ - XChar2b *ptr; /* pointer to the drawing buffer */ + Fl_XChar2b buf[128]; /* drawing buffer */ + Fl_XChar2b *ptr; /* pointer to the drawing buffer */ int fnum; /* index of the current font in the fonts array*/ int i; /* current byte in the XChar2b buffer */ int first; /* first valid font index */ int last_fnum; /* font index of the previous char */ int nb_font; /* quantity of fonts in the font array */ - char glyph[2]; /* byte1 and byte1 value of the UTF-8 char */ + char glyph[2]; /* byte1 and byte2 value of the UTF-8 char */ int *ranges; /* sub range of iso10646 */ nb_font = font_set->nb_font; @@ -344,14 +361,14 @@ XUtf8DrawRtlString(Display *display, /* there is no font in the font_set :-( */ return; } - + ranges = font_set->ranges; fonts = font_set->fonts; encodings = font_set->encodings; i = 0; fnum = 0; ptr = buf + 128; - + while(fnum < nb_font && !fonts[fnum]) fnum++; if (fnum >= nb_font) { /* there is no valid font for the X server */ @@ -375,21 +392,21 @@ XUtf8DrawRtlString(Display *display, ptr = buf + 128; } - ulen = XFastConvertUtf8ToUcs((unsigned char*)string, num_bytes, &ucs); + ulen = XFastConvertUtf8ToUcs((unsigned char*)string, num_bytes, &ucs); - if (ulen < 1) ulen = 1; + if (ulen < 1) ulen = 1; no_spc = XUtf8IsNonSpacing(ucs); - if (no_spc) ucs = no_spc; + if (no_spc) ucs = no_spc; - /* - * find the first encoding which can be used to - * draw the glyph + /* + * find the first encoding which can be used to + * draw the glyph */ fnum = first; while (fnum < nb_font) { if (fonts[fnum] && ucs2fontmap(glyph, ucs, encodings[fnum]) >= 0) { - if (encodings[fnum] != 0 || + if (encodings[fnum] != 0 || (ucs >= ranges[fnum * 2] && ucs <= ranges[fnum * 2 + 1])) { break; } @@ -437,25 +454,25 @@ XUtf8DrawRtlString(Display *display, /*****************************************************************************/ /** draw an UTF-8 string using multiple fonts as needed. **/ /*****************************************************************************/ -void -XUtf8DrawString(Display *display, +void +XUtf8DrawString(Display *display, Drawable d, - XUtf8FontStruct *font_set, - GC gc, - int x, - int y, + XUtf8FontStruct *font_set, + GC gc, + int x, + int y, const char *string, int num_bytes) { int *encodings; /* encodings array */ XFontStruct **fonts; /* fonts array */ - XChar2b buf[128]; /* drawing buffer */ + Fl_XChar2b buf[128]; /* drawing buffer */ int fnum; /* index of the current font in the fonts array*/ int i; /* current byte in the XChar2b buffer */ int first; /* first valid font index */ int last_fnum; /* font index of the previous char */ int nb_font; /* quantity of fonts in the font array */ - char glyph[2]; /* byte1 and byte1 value of the UTF-8 char */ + char glyph[2]; /* byte1 and byte2 value of the UTF-8 char */ int *ranges; /* sub range of iso10646 */ nb_font = font_set->nb_font; @@ -469,7 +486,7 @@ XUtf8DrawString(Display *display, encodings = font_set->encodings; i = 0; fnum = 0; - + while(fnum < nb_font && !fonts[fnum]) fnum++; if (fnum >= nb_font) { /* there is no valid font for the X server */ @@ -492,21 +509,21 @@ XUtf8DrawString(Display *display, i = 0; } - ulen = XFastConvertUtf8ToUcs((unsigned char*)string, num_bytes, &ucs); + ulen = XFastConvertUtf8ToUcs((unsigned char*)string, num_bytes, &ucs); - if (ulen < 1) ulen = 1; + if (ulen < 1) ulen = 1; no_spc = XUtf8IsNonSpacing(ucs); - if (no_spc) ucs = no_spc; + if (no_spc) ucs = no_spc; - /* - * find the first encoding which can be used to - * draw the glyph + /* + * find the first encoding which can be used to + * draw the glyph */ fnum = first; while (fnum < nb_font) { if (fonts[fnum] && ucs2fontmap(glyph, ucs, encodings[fnum]) >= 0) { - if (encodings[fnum] != 0 || + if (encodings[fnum] != 0 || (ucs >= ranges[fnum * 2] && ucs <= ranges[fnum * 2 + 1])) { break; @@ -547,25 +564,170 @@ XUtf8DrawString(Display *display, } +/*****************************************************************************/ +/** Measure the inked extents of a UTF-8 string using multiple fonts as **/ +/** needed. Tries to mirror the behaviour of the draw function **/ +/** XUtf8DrawString() as closely as possible to get consistent sizes. **/ +/*****************************************************************************/ +void +XUtf8_measure_extents( + Display *display, + Drawable d, + XUtf8FontStruct *font_set, + GC gc, + int *xx, /* x-offset from origin */ + int *yy, /* y-offset from origin */ + int *ww, /* overall inked width */ + int *hh, /* maximum inked height */ + const char *string, /* text to measure */ + int num_bytes) { + int *encodings; /* encodings array */ + XFontStruct **fonts; /* fonts array */ + Fl_XChar2b buf[128]; /* drawing buffer */ + int fnum; /* index of the current font in the fonts array*/ + int i; /* current byte in the XChar2b buffer */ + int first; /* first valid font index */ + int last_fnum; /* font index of the previous char */ + int nb_font; /* quantity of fonts in the font array */ + char glyph[2]; /* byte1 and byte2 value of the UTF-8 char */ + int *ranges; /* sub range of iso10646 */ + + int wd = 0; /* accumulates the width of the text */ + int ht = 0; /* used to find max height in text */ + int hs; /* "height sum" of current text segment */ + int yt = 0x7FFFFFFF; /* used to find bounding rectangle delta-y */ + int res; /* result from calling XTextExtents16() - we should test this is OK! */ + + XCharStruct sizes; + int dir_ret = 0; + int fnt_asc = 0; + int fnt_dsc = 0; + + nb_font = font_set->nb_font; + + if (nb_font < 1) { + /* there is no font in the font_set :-( */ + return; + } + ranges = font_set->ranges; + fonts = font_set->fonts; + encodings = font_set->encodings; + i = 0; + fnum = 0; + + while(fnum < nb_font && !fonts[fnum]) fnum++; + if (fnum >= nb_font) { + /* there is no valid font for the X server */ + return; + } + + first = fnum; + last_fnum = fnum; + + while (num_bytes > 0) { + int ulen; /* byte length of the UTF-8 char */ + unsigned int ucs; /* Unicode value of the UTF-8 char */ + unsigned int no_spc; /* Spacing char equivalent of a non-spacing char */ + + if (i > 120) { + /*** draw the buffer **/ + XSetFont(display, gc, fonts[fnum]->fid); + res = XTextExtents16(fonts[fnum], buf, i, &dir_ret, &fnt_asc, &fnt_dsc, &sizes); + /* recover the dimensions - should verify that res == 0 first! */ + wd += sizes.width; /* accumulate the width */ + hs = sizes.ascent + sizes.descent; /* total height */ + if(hs > ht) ht = hs; /* new height exceeds previous height */ + if(yt > (-sizes.ascent)) yt = -sizes.ascent; /* delta y offset */ + i = 0; + } + + ulen = XFastConvertUtf8ToUcs((unsigned char*)string, num_bytes, &ucs); + + if (ulen < 1) ulen = 1; + + no_spc = XUtf8IsNonSpacing(ucs); + if (no_spc) ucs = no_spc; + + /* + * find the first encoding which can be used to + * draw the glyph + */ + fnum = first; + while (fnum < nb_font) { + if (fonts[fnum] && ucs2fontmap(glyph, ucs, encodings[fnum]) >= 0) { + if (encodings[fnum] != 0 || + (ucs >= ranges[fnum * 2] && + ucs <= ranges[fnum * 2 + 1])) { + break; + } + } + fnum++; + } + if (fnum == nb_font) { + /* the char is not valid in all encodings -> + * draw it using the first font :-( + */ + fnum = first; + ucs2fontmap(glyph, '?', encodings[fnum]); + } + + if (last_fnum != fnum || no_spc) { + XSetFont(display, gc, fonts[last_fnum]->fid); + res = XTextExtents16(fonts[last_fnum], buf, i, &dir_ret, &fnt_asc, &fnt_dsc, &sizes); + /* recover the dimensions - should verify that res == 0 first! */ + wd += sizes.width; /* accumulate the width */ + hs = sizes.ascent + sizes.descent; /* total height */ + if(hs > ht) ht = hs; /* new height exceeds previous height */ + if(yt > (-sizes.ascent)) yt = -sizes.ascent; /* delta y offset */ + i = 0; + (*buf).byte1 = glyph[0]; + (*buf).byte2 = glyph[1]; + if (no_spc) { + wd -= XTextWidth16(fonts[fnum], buf, 1); + } + } else { + (*(buf + i)).byte1 = glyph[0]; + (*(buf + i)).byte2 = glyph[1]; + } + last_fnum = fnum; + i++; + string += ulen; + num_bytes -= ulen; + } + + XSetFont(display, gc, fonts[fnum]->fid); + res = XTextExtents16(fonts[fnum], buf, i, &dir_ret, &fnt_asc, &fnt_dsc, &sizes); + /* recover the dimensions - should verify that res == 0 first! */ + wd += sizes.width; /* accumulate the width */ + hs = sizes.ascent + sizes.descent; /* total height */ + if(hs > ht) ht = hs; /* new height exceeds previous height */ + if(yt > (-sizes.ascent)) yt = -sizes.ascent; /* delta y offset */ + /* return values */ + *ww = wd; /* width of inked area rectangle */ + *hh = ht; /* max height of inked area rectangle */ + *xx = 0; /* x-offset from origin to start of inked area - this is wrong! */ + *yy = yt; /* y-offset from origin to start of inked rectangle */ +} + /*****************************************************************************/ /** returns the pixel width of a UTF-8 string **/ /*****************************************************************************/ -int -XUtf8TextWidth(XUtf8FontStruct *font_set, +int +XUtf8TextWidth(XUtf8FontStruct *font_set, const char *string, int num_bytes) { int x; int *encodings; /* encodings array */ XFontStruct **fonts; /* fonts array */ - XChar2b buf[128]; /* drawing buffer */ + Fl_XChar2b buf[128]; /* drawing buffer */ int fnum; /* index of the current font in the fonts array*/ int i; /* current byte in the XChar2b buffer */ int first; /* first valid font index */ int last_fnum; /* font index of the previous char */ int nb_font; /* quantity of fonts in the font array */ - char glyph[2]; /* byte1 and byte1 value of the UTF-8 char */ + char glyph[2]; /* byte1 and byte2 value of the UTF-8 char */ int *ranges; /* sub range of iso10646 */ nb_font = font_set->nb_font; @@ -581,7 +743,7 @@ XUtf8TextWidth(XUtf8FontStruct *font_set, encodings = font_set->encodings; i = 0; fnum = 0; - + while(fnum < nb_font && !fonts[fnum]) fnum++; if (fnum >= nb_font) { /* there is no valid font for the X server */ @@ -602,23 +764,23 @@ XUtf8TextWidth(XUtf8FontStruct *font_set, i = 0; } - ulen = XFastConvertUtf8ToUcs((unsigned char*)string, num_bytes, &ucs); + ulen = XFastConvertUtf8ToUcs((unsigned char*)string, num_bytes, &ucs); - if (ulen < 1) ulen = 1; + if (ulen < 1) ulen = 1; no_spc = XUtf8IsNonSpacing(ucs); if (no_spc) { ucs = no_spc; } - /* - * find the first encoding which can be used to - * draw the glyph + /* + * find the first encoding which can be used to + * draw the glyph */ fnum = first; while (fnum < nb_font) { if (fonts[fnum] && ucs2fontmap(glyph, ucs, encodings[fnum]) >= 0) { - if (encodings[fnum] != 0 || + if (encodings[fnum] != 0 || (ucs >= ranges[fnum * 2] && ucs <= ranges[fnum * 2 + 1])) { break; @@ -675,7 +837,7 @@ XGetUtf8FontAndGlyph(XUtf8FontStruct *font_set, int first; /* first valid font index */ int last_fnum; /* font index of the previous char */ int nb_font; /* quantity of fonts in the font array */ - char glyph[2]; /* byte1 and byte1 value of the UTF-8 char */ + char glyph[2]; /* byte1 and byte2 value of the UTF-8 char */ int *ranges; /* sub range of iso10646 */ nb_font = font_set->nb_font; @@ -701,14 +863,14 @@ XGetUtf8FontAndGlyph(XUtf8FontStruct *font_set, first = fnum; last_fnum = fnum; - /* - * find the first encoding which can be used to - * draw the glyph + /* + * find the first encoding which can be used to + * draw the glyph */ fnum = first; while (fnum < nb_font) { if (fonts[fnum] && ucs2fontmap(glyph, ucs, encodings[fnum]) >= 0) { - if (encodings[fnum] != 0 || + if (encodings[fnum] != 0 || (ucs >= ranges[fnum * 2] && ucs <= ranges[fnum * 2 + 1])) { break; @@ -739,13 +901,13 @@ XUtf8UcsWidth(XUtf8FontStruct *font_set, int x; int *encodings; /* encodings array */ XFontStruct **fonts; /* fonts array */ - XChar2b buf[8]; /* drawing buffer */ + Fl_XChar2b buf[8]; /* drawing buffer */ int fnum; /* index of the current font in the fonts array*/ int i; /* current byte in the XChar2b buffer */ int first; /* first valid font index */ int last_fnum; /* font index of the previous char */ int nb_font; /* quantity of fonts in the font array */ - char glyph[2]; /* byte1 and byte1 value of the UTF-8 char */ + char glyph[2]; /* byte1 and byte2 value of the UTF-8 char */ int *ranges; /* sub range of iso10646 */ nb_font = font_set->nb_font; @@ -761,7 +923,7 @@ XUtf8UcsWidth(XUtf8FontStruct *font_set, encodings = font_set->encodings; i = 0; fnum = 0; - + while(fnum < nb_font && !fonts[fnum]) fnum++; if (fnum >= nb_font) { /* there is no valid font for the X server */ @@ -773,13 +935,13 @@ XUtf8UcsWidth(XUtf8FontStruct *font_set, ucs = XUtf8IsNonSpacing(ucs); - /* - * find the first encoding which can be used to - * draw the glyph + /* + * find the first encoding which can be used to + * draw the glyph */ fnum = first; while (fnum < nb_font) { - if (fonts[fnum] && + if (fonts[fnum] && ucs2fontmap(glyph, ucs, encodings[fnum]) >= 0) { if (encodings[fnum] != 0 || (ucs >= ranges[fnum * 2] && ucs <= ranges[fnum * 2 + 1])) { @@ -826,10 +988,10 @@ XUtf8DrawImageString(Display *display, XGCValues xgcv; w = XUtf8TextWidth(font_set, string, num_bytes); - - XGetGCValues(display, gc, + + XGetGCValues(display, gc, GCFunction|GCForeground|GCBackground|GCFillStyle, &xgcv); - + function = xgcv.function; fill_style = xgcv.fill_style; foreground = xgcv.foreground; @@ -843,7 +1005,7 @@ XUtf8DrawImageString(Display *display, XChangeGC(display, gc, GCFunction|GCForeground|GCBackground|GCFillStyle, &xgcv); - XFillRectangle(display, d, gc, x, y - font_set->ascent, + XFillRectangle(display, d, gc, x, y - font_set->ascent, (unsigned)w, (unsigned)(font_set->ascent + font_set->descent)); xgcv.function = function; @@ -860,8 +1022,8 @@ XUtf8DrawImageString(Display *display, /*****************************************************************************/ /** free the XFontSet and others things created by XCreateUtf8FontSet **/ /*****************************************************************************/ -void -XFreeUtf8FontStruct(Display *dpy, +void +XFreeUtf8FontStruct(Display *dpy, XUtf8FontStruct *font_set) { int i; @@ -883,5 +1045,5 @@ XFreeUtf8FontStruct(Display *dpy, #endif /* X11 only */ /* - * End of "$Id: $". + * End of "$Id: utf8Wrap.c 8401 2011-02-08 10:06:19Z ianmacarthur $". */