diff options
Diffstat (limited to 'src/corelib/x11')
| -rw-r--r-- | src/corelib/x11/fpg_impl.pas | 36 | ||||
| -rw-r--r-- | src/corelib/x11/fpg_keyconv_x11.pas (renamed from src/corelib/x11/x11_keyconv.pas) | 20 | ||||
| -rw-r--r-- | src/corelib/x11/fpg_netlayer_x11.pas (renamed from src/corelib/x11/_netlayer.pas) | 19 | ||||
| -rw-r--r-- | src/corelib/x11/fpg_utils_impl.inc (renamed from src/corelib/x11/gfx_utils_impl.inc) | 2 | ||||
| -rw-r--r-- | src/corelib/x11/fpg_x11.pas (renamed from src/corelib/x11/gfx_x11.pas) | 39 | ||||
| -rw-r--r-- | src/corelib/x11/fpg_xft_x11.pas (renamed from src/corelib/x11/x11_xft.pas) | 19 | ||||
| -rw-r--r-- | src/corelib/x11/fpgui_toolkit.lpk | 224 | ||||
| -rw-r--r-- | src/corelib/x11/fpgui_toolkit.pas | 26 | ||||
| -rw-r--r-- | src/corelib/x11/gfx_impl.pas | 18 |
9 files changed, 234 insertions, 169 deletions
diff --git a/src/corelib/x11/fpg_impl.pas b/src/corelib/x11/fpg_impl.pas new file mode 100644 index 00000000..81b8012c --- /dev/null +++ b/src/corelib/x11/fpg_impl.pas @@ -0,0 +1,36 @@ +{ + fpGUI - Free Pascal GUI Library + + Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this + distribution, for details of the copyright. + + See the file COPYING.modifiedLGPL, included in this distribution, + for details about redistributing fpGUI. + + This program 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. + + Description: + This translates platform specific classes to platform independant + classes. +} + +unit fpg_impl; + +{$mode objfpc}{$H+} + +interface + +uses + x; + +type + TfpgWinHandle = TXID; + TfpgDCHandle = TXID; + + +implementation + +end. + diff --git a/src/corelib/x11/x11_keyconv.pas b/src/corelib/x11/fpg_keyconv_x11.pas index fe25b7a4..80c53417 100644 --- a/src/corelib/x11/x11_keyconv.pas +++ b/src/corelib/x11/fpg_keyconv_x11.pas @@ -1,4 +1,22 @@ -unit x11_keyconv; +{ + fpGUI - Free Pascal GUI Library + + Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this + distribution, for details of the copyright. + + See the file COPYING.modifiedLGPL, included in this distribution, + for details about redistributing fpGUI. + + This program 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. + + Description: + This was keycode lookup tables used when fpGUI used WideStrings. + This unit is not used anymore. +} + +unit fpg_keyconv_x11; {$mode objfpc}{$H+} diff --git a/src/corelib/x11/_netlayer.pas b/src/corelib/x11/fpg_netlayer_x11.pas index ab07c10a..b6d0dd70 100644 --- a/src/corelib/x11/_netlayer.pas +++ b/src/corelib/x11/fpg_netlayer_x11.pas @@ -1,4 +1,21 @@ -unit _netlayer; +{ + fpGUI - Free Pascal GUI Library + + Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this + distribution, for details of the copyright. + + See the file COPYING.modifiedLGPL, included in this distribution, + for details about redistributing fpGUI. + + This program 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. + + Description: + Xlib netlayer support +} + +unit fpg_netlayer_x11; {$mode objfpc}{$H+} diff --git a/src/corelib/x11/gfx_utils_impl.inc b/src/corelib/x11/fpg_utils_impl.inc index 499de82d..2099addb 100644 --- a/src/corelib/x11/gfx_utils_impl.inc +++ b/src/corelib/x11/fpg_utils_impl.inc @@ -1,4 +1,4 @@ -{%mainunit gfx_utils.pas} +{%mainunit fpg_utils.pas} uses Unix; diff --git a/src/corelib/x11/gfx_x11.pas b/src/corelib/x11/fpg_x11.pas index a5fc8e9e..66fa7a62 100644 --- a/src/corelib/x11/gfx_x11.pas +++ b/src/corelib/x11/fpg_x11.pas @@ -1,4 +1,21 @@ -unit gfx_x11; +{ + fpGUI - Free Pascal GUI Library + + Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this + distribution, for details of the copyright. + + See the file COPYING.modifiedLGPL, included in this distribution, + for details about redistributing fpGUI. + + This program 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. + + Description: + This unit implements X11 / Xlib support for fpGUI. +} + +unit fpg_x11; {$mode objfpc}{$H+} @@ -13,10 +30,10 @@ uses Xlib, XUtil, ctypes, - x11_xft, - _netlayer, - gfxbase, - gfx_impl; + fpg_xft_x11, + fpg_netlayer_x11, + fpg_base, + fpg_impl; const IconBitmapWidth = 16; @@ -282,13 +299,13 @@ uses baseunix, // Graeme: temporary. libc is not available for FreeBSD. {$if defined(linux) and defined(cpu386)}libc,{$endif} - fpgfx, - gfx_widget, - gui_form, + fpg_main, + fpg_widget, + fpg_popupwindow, + fpg_stringutils, // used for GetTextWidth + gui_form, // for modal event support cursorfont, - gfx_popupwindow, - xatom, // used for XA_WM_NAME - gfx_utf8utils; // used for GetTextWidth + xatom; // used for XA_WM_NAME var xapplication: TfpgApplication; diff --git a/src/corelib/x11/x11_xft.pas b/src/corelib/x11/fpg_xft_x11.pas index 805797cd..f517ecf9 100644 --- a/src/corelib/x11/x11_xft.pas +++ b/src/corelib/x11/fpg_xft_x11.pas @@ -1,24 +1,23 @@ { - fpGFX - Free Pascal Graphics Library - Copyright (C) 2006-2007 by Graeme Geldenhuys - member of the fpGFX development team. + fpGUI - Free Pascal GUI Library - Xft interface functions + Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this + distribution, for details of the copyright. - See the file COPYING.fpGFX, included in this distribution, - for details about the copyright. + See the file COPYING.modifiedLGPL, included in this distribution, + for details about redistributing fpGUI. This program 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. - **********************************************************************} + Description: + Xft interface functions +} - -unit x11_xft; +unit fpg_xft_x11; {$mode objfpc}{$H+} - {$linklib Xft} interface diff --git a/src/corelib/x11/fpgui_toolkit.lpk b/src/corelib/x11/fpgui_toolkit.lpk index ddbd27b9..e3a6b911 100644 --- a/src/corelib/x11/fpgui_toolkit.lpk +++ b/src/corelib/x11/fpgui_toolkit.lpk @@ -29,82 +29,82 @@ <License Value="Modified LGPL "/> <Version Minor="6" Release="2"/> - <Files Count="72"> + <Files Count="71"> <Item1> <Filename Value="../stdimages.inc"/> <Type Value="Include"/> </Item1> <Item2> - <Filename Value="../fpgfx.pas"/> - <UnitName Value="fpgfx"/> + <Filename Value="../fpg_base.pas"/> + <UnitName Value="fpg_base"/> </Item2> <Item3> - <Filename Value="../gfxbase.pas"/> - <UnitName Value="gfxbase"/> + <Filename Value="../fpg_main.pas"/> + <UnitName Value="fpg_main"/> </Item3> <Item4> - <Filename Value="../gfx_cmdlineparams.pas"/> - <UnitName Value="gfx_cmdlineparams"/> + <Filename Value="../fpg_cmdlineparams.pas"/> + <UnitName Value="fpg_cmdlineparams"/> </Item4> <Item5> - <Filename Value="../gfx_command_intf.pas"/> - <UnitName Value="gfx_command_intf"/> + <Filename Value="../fpg_command_intf.pas"/> + <UnitName Value="fpg_command_intf"/> </Item5> <Item6> - <Filename Value="../gfx_constants.pas"/> - <UnitName Value="gfx_constants"/> + <Filename Value="../fpg_constants.pas"/> + <UnitName Value="fpg_constants"/> </Item6> <Item7> - <Filename Value="../gfx_extinterpolation.pas"/> - <UnitName Value="gfx_extinterpolation"/> + <Filename Value="../fpg_extinterpolation.pas"/> + <UnitName Value="fpg_extinterpolation"/> </Item7> <Item8> - <Filename Value="../gfx_imagelist.pas"/> - <UnitName Value="gfx_imagelist"/> + <Filename Value="../fpg_imagelist.pas"/> + <UnitName Value="fpg_imagelist"/> </Item8> <Item9> - <Filename Value="../gfx_imgfmt_bmp.pas"/> - <UnitName Value="gfx_imgfmt_bmp"/> + <Filename Value="../fpg_imgfmt_bmp.pas"/> + <UnitName Value="fpg_imgfmt_bmp"/> </Item9> <Item10> - <Filename Value="../gfx_msgqueue.inc"/> + <Filename Value="../fpg_msgqueue.inc"/> <Type Value="Include"/> </Item10> <Item11> - <Filename Value="../gfx_pofiles.pas"/> - <UnitName Value="gfx_pofiles"/> + <Filename Value="../fpg_pofiles.pas"/> + <UnitName Value="fpg_pofiles"/> </Item11> <Item12> - <Filename Value="../gfx_popupwindow.pas"/> - <UnitName Value="gfx_popupwindow"/> + <Filename Value="../fpg_popupwindow.pas"/> + <UnitName Value="fpg_popupwindow"/> </Item12> <Item13> - <Filename Value="../gfx_stdimages.pas"/> - <UnitName Value="gfx_stdimages"/> + <Filename Value="../fpg_stdimages.pas"/> + <UnitName Value="fpg_stdimages"/> </Item13> <Item14> - <Filename Value="../gfx_stringhashlist.pas"/> - <UnitName Value="gfx_stringhashlist"/> + <Filename Value="../fpg_stringhashlist.pas"/> + <UnitName Value="fpg_stringhashlist"/> </Item14> <Item15> - <Filename Value="../gfx_translations.pas"/> - <UnitName Value="gfx_translations"/> + <Filename Value="../fpg_translations.pas"/> + <UnitName Value="fpg_translations"/> </Item15> <Item16> - <Filename Value="../gfx_utf8utils.pas"/> - <UnitName Value="gfx_UTF8utils"/> + <Filename Value="../fpg_stringutils.pas"/> + <UnitName Value="fpg_stringutils"/> </Item16> <Item17> - <Filename Value="../gfx_utils.pas"/> - <UnitName Value="gfx_utils"/> + <Filename Value="../fpg_utils.pas"/> + <UnitName Value="fpg_utils"/> </Item17> <Item18> - <Filename Value="../gfx_widget.pas"/> - <UnitName Value="gfx_widget"/> + <Filename Value="../fpg_widget.pas"/> + <UnitName Value="fpg_widget"/> </Item18> <Item19> - <Filename Value="../gfx_wuline.pas"/> - <UnitName Value="gfx_wuline"/> + <Filename Value="../fpg_wuline.pas"/> + <UnitName Value="fpg_wuline"/> </Item19> <Item20> <Filename Value="../keys.inc"/> @@ -147,28 +147,28 @@ <Type Value="Include"/> </Item29> <Item30> - <Filename Value="gfx_impl.pas"/> - <UnitName Value="gfx_impl"/> + <Filename Value="fpg_impl.pas"/> + <UnitName Value="fpg_impl"/> </Item30> <Item31> - <Filename Value="gfx_utils_impl.inc"/> + <Filename Value="fpg_utils_impl.inc"/> <Type Value="Include"/> </Item31> <Item32> - <Filename Value="gfx_x11.pas"/> - <UnitName Value="gfx_x11"/> + <Filename Value="fpg_x11.pas"/> + <UnitName Value="fpg_x11"/> </Item32> <Item33> - <Filename Value="_netlayer.pas"/> - <UnitName Value="_netlayer"/> + <Filename Value="fpg_netlayer_x11.pas"/> + <UnitName Value="fpg_netlayer_x11"/> </Item33> <Item34> - <Filename Value="x11_keyconv.pas"/> - <UnitName Value="x11_keyconv"/> + <Filename Value="fpg_keyconv_x11.pas"/> + <UnitName Value="fpg_keyconv_x11"/> </Item34> <Item35> - <Filename Value="x11_xft.pas"/> - <UnitName Value="x11_xft"/> + <Filename Value="fpg_xft_x11.pas"/> + <UnitName Value="fpg_xft_x11"/> </Item35> <Item36> <Filename Value="../../gui/promptuserdialog.inc"/> @@ -183,141 +183,137 @@ <UnitName Value="gui_basegrid"/> </Item38> <Item39> - <Filename Value="../../gui/gui_bevel.pas"/> - <UnitName Value="gui_bevel"/> - </Item39> - <Item40> <Filename Value="../../gui/gui_button.pas"/> <UnitName Value="gui_button"/> - </Item40> - <Item41> + </Item39> + <Item40> <Filename Value="../../gui/gui_checkbox.pas"/> <UnitName Value="gui_checkbox"/> - </Item41> - <Item42> + </Item40> + <Item41> <Filename Value="../../gui/gui_combobox.pas"/> <UnitName Value="gui_combobox"/> - </Item42> - <Item43> + </Item41> + <Item42> <Filename Value="../../gui/gui_customgrid.pas"/> <UnitName Value="gui_customgrid"/> - </Item43> - <Item44> + </Item42> + <Item43> <Filename Value="../../gui/gui_dialogs.pas"/> <UnitName Value="gui_dialogs"/> - </Item44> - <Item45> + </Item43> + <Item44> <Filename Value="../../gui/gui_editcombo.pas"/> <UnitName Value="gui_editcombo"/> - </Item45> - <Item46> + </Item44> + <Item45> <Filename Value="../../gui/gui_edit.pas"/> <UnitName Value="gui_edit"/> - </Item46> - <Item47> + </Item45> + <Item46> <Filename Value="../../gui/gui_form.pas"/> <UnitName Value="gui_form"/> - </Item47> - <Item48> + </Item46> + <Item47> <Filename Value="../../gui/gui_gauge.pas"/> <UnitName Value="gui_gauge"/> - </Item48> - <Item49> + </Item47> + <Item48> <Filename Value="../../gui/gui_grid.pas"/> <UnitName Value="gui_grid"/> - </Item49> - <Item50> + </Item48> + <Item49> <Filename Value="../../gui/gui_hyperlink.pas"/> <UnitName Value="gui_hyperlink"/> - </Item50> - <Item51> + </Item49> + <Item50> <Filename Value="../../gui/gui_iniutils.pas"/> <UnitName Value="gui_iniutils"/> - </Item51> - <Item52> + </Item50> + <Item51> <Filename Value="../../gui/gui_label.pas"/> <UnitName Value="gui_label"/> - </Item52> - <Item53> + </Item51> + <Item52> <Filename Value="../../gui/gui_listbox.pas"/> <UnitName Value="gui_listbox"/> - </Item53> - <Item54> + </Item52> + <Item53> <Filename Value="../../gui/gui_listview.pas"/> <UnitName Value="gui_listview"/> - </Item54> - <Item55> + </Item53> + <Item54> <Filename Value="../../gui/gui_memo.pas"/> <UnitName Value="gui_memo"/> - </Item55> - <Item56> + </Item54> + <Item55> <Filename Value="../../gui/gui_menu.pas"/> <UnitName Value="gui_menu"/> - </Item56> - <Item57> + </Item55> + <Item56> <Filename Value="../../gui/gui_mru.pas"/> <UnitName Value="gui_mru"/> - </Item57> - <Item58> + </Item56> + <Item57> <Filename Value="../../gui/gui_panel.pas"/> <UnitName Value="gui_panel"/> - </Item58> - <Item59> + </Item57> + <Item58> <Filename Value="../../gui/gui_popupcalendar.pas"/> <UnitName Value="gui_popupcalendar"/> - </Item59> - <Item60> + </Item58> + <Item59> <Filename Value="../../gui/gui_progressbar.pas"/> <UnitName Value="gui_progressbar"/> - </Item60> - <Item61> + </Item59> + <Item60> <Filename Value="../../gui/gui_radiobutton.pas"/> <UnitName Value="gui_radiobutton"/> - </Item61> - <Item62> + </Item60> + <Item61> <Filename Value="../../gui/gui_scrollbar.pas"/> <UnitName Value="gui_scrollbar"/> - </Item62> - <Item63> + </Item61> + <Item62> <Filename Value="../../gui/gui_style.pas"/> <UnitName Value="gui_style"/> - </Item63> - <Item64> + </Item62> + <Item63> <Filename Value="../../gui/gui_tab.pas"/> <UnitName Value="gui_tab"/> - </Item64> - <Item65> + </Item63> + <Item64> <Filename Value="../../gui/gui_trackbar.pas"/> <UnitName Value="gui_trackbar"/> - </Item65> - <Item66> + </Item64> + <Item65> <Filename Value="../../gui/gui_tree.pas"/> <UnitName Value="gui_tree"/> + </Item65> + <Item66> + <Filename Value="../../gui/logo.inc"/> + <Type Value="Include"/> </Item66> <Item67> - <Filename Value="../../gui/logo.inc"/> + <Filename Value="../../gui/messagedialog.inc"/> <Type Value="Include"/> </Item67> <Item68> - <Filename Value="../../gui/messagedialog.inc"/> + <Filename Value="../../gui/newdirdialog.inc"/> <Type Value="Include"/> </Item68> <Item69> - <Filename Value="../../gui/newdirdialog.inc"/> - <Type Value="Include"/> - </Item69> - <Item70> <Filename Value="../../gui/db/fpgui_db.pas"/> <UnitName Value="fpgui_db"/> - </Item70> - <Item71> + </Item69> + <Item70> <Filename Value="../../gui/gui_splitter.pas"/> <UnitName Value="gui_splitter"/> - </Item71> - <Item72> + </Item70> + <Item71> <Filename Value="../../gui/gui_hint.pas"/> <UnitName Value="gui_hint"/> - </Item72> + </Item71> </Files> <LazDoc Paths="../../../docs/xml/corelib/;../../../docs/xml/corelib/x11/;../../../docs/xml/corelib/gdi/;../../../docs/xml/gui/"/> <RequiredPkgs Count="1"> diff --git a/src/corelib/x11/fpgui_toolkit.pas b/src/corelib/x11/fpgui_toolkit.pas index 89d04a35..504536a2 100644 --- a/src/corelib/x11/fpgui_toolkit.pas +++ b/src/corelib/x11/fpgui_toolkit.pas @@ -1,5 +1,5 @@ -{ This file was automatically created by Lazarus. Do not edit! -This source is only used to compile and install the package. +{ This file was automatically created by Lazarus. do not edit! + This source is only used to compile and install the package. } unit fpgui_toolkit; @@ -7,17 +7,17 @@ unit fpgui_toolkit; interface uses - fpgfx, gfxbase, gfx_cmdlineparams, gfx_command_intf, gfx_constants, - gfx_extinterpolation, gfx_imagelist, gfx_imgfmt_bmp, gfx_pofiles, - gfx_popupwindow, gfx_stdimages, gfx_stringhashlist, gfx_translations, - gfx_UTF8utils, gfx_utils, gfx_widget, gfx_wuline, gfx_impl, gfx_x11, - _netlayer, x11_keyconv, x11_xft, gui_animation, gui_basegrid, gui_bevel, - gui_button, gui_checkbox, gui_combobox, gui_customgrid, gui_dialogs, - gui_editcombo, gui_edit, gui_form, gui_gauge, gui_grid, gui_hyperlink, - gui_iniutils, gui_label, gui_listbox, gui_listview, gui_memo, gui_menu, - gui_mru, gui_panel, gui_popupcalendar, gui_progressbar, gui_radiobutton, - gui_scrollbar, gui_style, gui_tab, gui_trackbar, gui_tree, fpgui_db, - gui_splitter, gui_hint; + fpg_base, fpg_main, fpg_cmdlineparams, fpg_command_intf, fpg_constants, + fpg_extinterpolation, fpg_imagelist, fpg_imgfmt_bmp, fpg_pofiles, + fpg_popupwindow, fpg_stdimages, fpg_stringhashlist, fpg_translations, + fpg_stringutils, fpg_utils, fpg_widget, fpg_wuline, fpg_impl, fpg_x11, + fpg_netlayer_x11, fpg_keyconv_x11, fpg_xft_x11, gui_animation, gui_basegrid, + gui_button, gui_checkbox, gui_combobox, gui_customgrid, gui_dialogs, + gui_editcombo, gui_edit, gui_form, gui_gauge, gui_grid, gui_hyperlink, + gui_iniutils, gui_label, gui_listbox, gui_listview, gui_memo, gui_menu, + gui_mru, gui_panel, gui_popupcalendar, gui_progressbar, gui_radiobutton, + gui_scrollbar, gui_style, gui_tab, gui_trackbar, gui_tree, fpgui_db, + gui_splitter, gui_hint; implementation diff --git a/src/corelib/x11/gfx_impl.pas b/src/corelib/x11/gfx_impl.pas deleted file mode 100644 index 897e0cbf..00000000 --- a/src/corelib/x11/gfx_impl.pas +++ /dev/null @@ -1,18 +0,0 @@ -unit gfx_impl; - -{$mode objfpc}{$H+} - -interface - -uses - x; - -type - TfpgWinHandle = TXID; - TfpgDCHandle = TXID; - - -implementation - -end. - |