Mercurial > hg > xemacs-beta
comparison src/emacs.c @ 462:0784d089fdc9 r21-2-46
Import from CVS: tag r21-2-46
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:44:37 +0200 |
parents | 223736d75acb |
children | 7039e6323819 |
comparison
equal
deleted
inserted
replaced
461:120ed4009e51 | 462:0784d089fdc9 |
---|---|
1110 if the display was specified on the command line. */ | 1110 if the display was specified on the command line. */ |
1111 if ((dpy = getenv ("DISPLAY")) && dpy[0]) | 1111 if ((dpy = getenv ("DISPLAY")) && dpy[0]) |
1112 display_use = "x"; | 1112 display_use = "x"; |
1113 | 1113 |
1114 #endif /* HAVE_X_WINDOWS */ | 1114 #endif /* HAVE_X_WINDOWS */ |
1115 #ifdef HAVE_GTK | |
1116 { | |
1117 char *dpy = getenv ("DISPLAY"); | |
1118 if (dpy && dpy[0]) | |
1119 display_use = "gtk"; | |
1120 } | |
1121 #endif | |
1115 #ifdef HAVE_MS_WINDOWS | 1122 #ifdef HAVE_MS_WINDOWS |
1116 if (strcmp(display_use, "x") != 0) | 1123 if (strcmp(display_use, "x") != 0) |
1117 display_use = "mswindows"; | 1124 display_use = "mswindows"; |
1118 #endif /* HAVE_MS_WINDOWS */ | 1125 #endif /* HAVE_MS_WINDOWS */ |
1119 } | 1126 } |
1259 syms_of_elhash (); | 1266 syms_of_elhash (); |
1260 syms_of_emacs (); | 1267 syms_of_emacs (); |
1261 syms_of_eval (); | 1268 syms_of_eval (); |
1262 #ifdef HAVE_X_WINDOWS | 1269 #ifdef HAVE_X_WINDOWS |
1263 syms_of_event_Xt (); | 1270 syms_of_event_Xt (); |
1271 #endif | |
1272 #ifdef HAVE_GTK | |
1273 syms_of_event_gtk (); | |
1264 #endif | 1274 #endif |
1265 #ifdef HAVE_DRAGNDROP | 1275 #ifdef HAVE_DRAGNDROP |
1266 syms_of_dragdrop (); | 1276 syms_of_dragdrop (); |
1267 #endif | 1277 #endif |
1268 syms_of_event_stream (); | 1278 syms_of_event_stream (); |
1335 syms_of_console_tty (); | 1345 syms_of_console_tty (); |
1336 syms_of_device_tty (); | 1346 syms_of_device_tty (); |
1337 syms_of_objects_tty (); | 1347 syms_of_objects_tty (); |
1338 #endif | 1348 #endif |
1339 | 1349 |
1350 #ifdef HAVE_GTK | |
1351 syms_of_device_gtk (); | |
1352 syms_of_frame_gtk (); | |
1353 syms_of_glyphs_gtk (); | |
1354 syms_of_objects_gtk (); | |
1355 syms_of_ui_gtk (); | |
1356 syms_of_select_gtk (); | |
1357 #ifdef HAVE_DIALOGS | |
1358 syms_of_dialog_gtk (); | |
1359 #endif | |
1360 #ifdef HAVE_MENUBARS | |
1361 syms_of_menubar_gtk (); | |
1362 #endif | |
1363 syms_of_select_gtk (); | |
1364 | |
1365 #if defined (HAVE_MENUBARS) || defined(HAVE_SCROLLBARS) || defined(HAVE_DIALOGS) || defined(HAVE_TOOLBARS) | |
1366 syms_of_gui_gtk (); | |
1367 #endif | |
1368 #endif /* HAVE_GTK */ | |
1369 | |
1340 #ifdef HAVE_X_WINDOWS | 1370 #ifdef HAVE_X_WINDOWS |
1341 #ifdef HAVE_BALLOON_HELP | 1371 #ifdef HAVE_BALLOON_HELP |
1342 syms_of_balloon_x (); | 1372 syms_of_balloon_x (); |
1343 #endif | 1373 #endif |
1344 syms_of_device_x (); | 1374 syms_of_device_x (); |
1466 console_type_create_device_tty (); | 1496 console_type_create_device_tty (); |
1467 console_type_create_frame_tty (); | 1497 console_type_create_frame_tty (); |
1468 console_type_create_objects_tty (); | 1498 console_type_create_objects_tty (); |
1469 console_type_create_redisplay_tty (); | 1499 console_type_create_redisplay_tty (); |
1470 #endif | 1500 #endif |
1501 | |
1502 #ifdef HAVE_GTK | |
1503 console_type_create_gtk (); | |
1504 console_type_create_select_gtk (); | |
1505 console_type_create_device_gtk (); | |
1506 console_type_create_frame_gtk (); | |
1507 console_type_create_objects_gtk (); | |
1508 console_type_create_glyphs_gtk (); | |
1509 console_type_create_redisplay_gtk (); | |
1510 #ifdef HAVE_MENUBARS | |
1511 console_type_create_menubar_gtk (); | |
1512 #endif | |
1513 #ifdef HAVE_SCROLLBARS | |
1514 console_type_create_scrollbar_gtk (); | |
1515 #endif | |
1516 #ifdef HAVE_TOOLBARS | |
1517 console_type_create_toolbar_gtk (); | |
1518 #endif | |
1519 #ifdef HAVE_DIALOGS | |
1520 console_type_create_dialog_gtk (); | |
1521 #endif | |
1522 #endif /* HAVE_GTK */ | |
1471 | 1523 |
1472 #ifdef HAVE_X_WINDOWS | 1524 #ifdef HAVE_X_WINDOWS |
1473 console_type_create_x (); | 1525 console_type_create_x (); |
1474 console_type_create_device_x (); | 1526 console_type_create_device_x (); |
1475 console_type_create_frame_x (); | 1527 console_type_create_frame_x (); |
1569 image_instantiator_format_create_glyphs_x (); | 1621 image_instantiator_format_create_glyphs_x (); |
1570 #endif /* HAVE_X_WINDOWS */ | 1622 #endif /* HAVE_X_WINDOWS */ |
1571 #ifdef HAVE_MS_WINDOWS | 1623 #ifdef HAVE_MS_WINDOWS |
1572 image_instantiator_format_create_glyphs_mswindows (); | 1624 image_instantiator_format_create_glyphs_mswindows (); |
1573 #endif /* HAVE_MSWINDOWS_WINDOWS */ | 1625 #endif /* HAVE_MSWINDOWS_WINDOWS */ |
1626 #ifdef HAVE_GTK | |
1627 image_instantiator_format_create_glyphs_gtk (); | |
1628 #endif | |
1574 | 1629 |
1575 /* Now initialize the lstream types and associated symbols. | 1630 /* Now initialize the lstream types and associated symbols. |
1576 Other than the first function below, the functions may | 1631 Other than the first function below, the functions may |
1577 make exactly the following function/macro calls: | 1632 make exactly the following function/macro calls: |
1578 | 1633 |
1771 vars_of_console_tty (); | 1826 vars_of_console_tty (); |
1772 vars_of_frame_tty (); | 1827 vars_of_frame_tty (); |
1773 vars_of_objects_tty (); | 1828 vars_of_objects_tty (); |
1774 #endif | 1829 #endif |
1775 | 1830 |
1831 #ifdef HAVE_GTK | |
1832 vars_of_device_gtk (); | |
1833 #ifdef HAVE_DIALOGS | |
1834 vars_of_dialog_gtk (); | |
1835 #endif | |
1836 vars_of_event_gtk (); | |
1837 vars_of_frame_gtk (); | |
1838 vars_of_glyphs_gtk (); | |
1839 vars_of_ui_gtk (); | |
1840 #ifdef HAVE_MENUBARS | |
1841 vars_of_menubar_gtk (); | |
1842 #endif | |
1843 vars_of_objects_gtk (); | |
1844 vars_of_select_gtk (); | |
1845 #ifdef HAVE_SCROLLBARS | |
1846 vars_of_scrollbar_gtk (); | |
1847 #endif | |
1848 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS) | |
1849 vars_of_gui_gtk (); | |
1850 #endif | |
1851 #endif /* HAVE_GTK */ | |
1852 | |
1776 #ifdef HAVE_X_WINDOWS | 1853 #ifdef HAVE_X_WINDOWS |
1777 #ifdef HAVE_BALLOON_HELP | 1854 #ifdef HAVE_BALLOON_HELP |
1778 vars_of_balloon_x (); | 1855 vars_of_balloon_x (); |
1779 #endif | 1856 #endif |
1780 vars_of_device_x (); | 1857 vars_of_device_x (); |
1793 #endif | 1870 #endif |
1794 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS) | 1871 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS) |
1795 vars_of_gui_x (); | 1872 vars_of_gui_x (); |
1796 #endif | 1873 #endif |
1797 #endif /* HAVE_X_WINDOWS */ | 1874 #endif /* HAVE_X_WINDOWS */ |
1875 | |
1798 | 1876 |
1799 #ifdef HAVE_MS_WINDOWS | 1877 #ifdef HAVE_MS_WINDOWS |
1800 vars_of_device_mswindows (); | 1878 vars_of_device_mswindows (); |
1801 vars_of_console_mswindows (); | 1879 vars_of_console_mswindows (); |
1802 vars_of_frame_mswindows (); | 1880 vars_of_frame_mswindows (); |
1914 complex_vars_of_glyphs (); | 1992 complex_vars_of_glyphs (); |
1915 | 1993 |
1916 /* These rely on the glyphs just created in the previous function, | 1994 /* These rely on the glyphs just created in the previous function, |
1917 and call Fadd_spec_to_specifier(), which relies on various | 1995 and call Fadd_spec_to_specifier(), which relies on various |
1918 variables initialized above. */ | 1996 variables initialized above. */ |
1997 #ifdef HAVE_GTK | |
1998 complex_vars_of_glyphs_gtk (); | |
1999 #endif | |
1919 #ifdef HAVE_X_WINDOWS | 2000 #ifdef HAVE_X_WINDOWS |
1920 complex_vars_of_glyphs_x (); | 2001 complex_vars_of_glyphs_x (); |
1921 #endif | 2002 #endif |
1922 #ifdef HAVE_MS_WINDOWS | 2003 #ifdef HAVE_MS_WINDOWS |
1923 complex_vars_of_glyphs_mswindows (); | 2004 complex_vars_of_glyphs_mswindows (); |
2000 reinit_console_type_create_device_x (); | 2081 reinit_console_type_create_device_x (); |
2001 #endif | 2082 #endif |
2002 #ifdef HAVE_MS_WINDOWS | 2083 #ifdef HAVE_MS_WINDOWS |
2003 reinit_console_type_create_mswindows (); | 2084 reinit_console_type_create_mswindows (); |
2004 #endif | 2085 #endif |
2086 #ifdef HAVE_GTK | |
2087 reinit_console_type_create_gtk (); | |
2088 #endif | |
2005 | 2089 |
2006 reinit_specifier_type_create (); | 2090 reinit_specifier_type_create (); |
2007 reinit_specifier_type_create_image (); | 2091 reinit_specifier_type_create_image (); |
2008 reinit_specifier_type_create_gutter (); | 2092 reinit_specifier_type_create_gutter (); |
2009 reinit_specifier_type_create_objects (); | 2093 reinit_specifier_type_create_objects (); |
2039 #endif | 2123 #endif |
2040 reinit_vars_of_device (); | 2124 reinit_vars_of_device (); |
2041 reinit_vars_of_eval (); | 2125 reinit_vars_of_eval (); |
2042 #ifdef HAVE_X_WINDOWS | 2126 #ifdef HAVE_X_WINDOWS |
2043 reinit_vars_of_event_Xt (); | 2127 reinit_vars_of_event_Xt (); |
2128 #endif | |
2129 #ifdef HAVE_GTK | |
2130 reinit_vars_of_event_gtk (); | |
2044 #endif | 2131 #endif |
2045 #if defined(HAVE_TTY) && (defined (DEBUG_TTY_EVENT_STREAM) || !defined (HAVE_X_WINDOWS)) | 2132 #if defined(HAVE_TTY) && (defined (DEBUG_TTY_EVENT_STREAM) || !defined (HAVE_X_WINDOWS)) |
2046 reinit_vars_of_event_tty (); | 2133 reinit_vars_of_event_tty (); |
2047 #endif | 2134 #endif |
2048 #ifdef HAVE_MS_WINDOWS | 2135 #ifdef HAVE_MS_WINDOWS |
2068 reinit_vars_of_undo (); | 2155 reinit_vars_of_undo (); |
2069 reinit_vars_of_window (); | 2156 reinit_vars_of_window (); |
2070 | 2157 |
2071 #ifdef HAVE_MS_WINDOWS | 2158 #ifdef HAVE_MS_WINDOWS |
2072 reinit_vars_of_frame_mswindows (); | 2159 reinit_vars_of_frame_mswindows (); |
2160 #endif | |
2161 | |
2162 #ifdef HAVE_GTK | |
2163 reinit_vars_of_menubar_gtk (); | |
2073 #endif | 2164 #endif |
2074 | 2165 |
2075 #ifdef HAVE_X_WINDOWS | 2166 #ifdef HAVE_X_WINDOWS |
2076 reinit_vars_of_device_x (); | 2167 reinit_vars_of_device_x (); |
2077 #ifdef HAVE_SCROLLBARS | 2168 #ifdef HAVE_SCROLLBARS |