comparison src/device-x.c @ 424:11054d720c21 r21-2-20

Import from CVS: tag r21-2-20
author cvs
date Mon, 13 Aug 2007 11:26:11 +0200
parents da8ed4261e83
children
comparison
equal deleted inserted replaced
423:28d9c139be4c 424:11054d720c21
741 { 741 {
742 call0 (Qinit_post_x_win); 742 call0 (Qinit_post_x_win);
743 } 743 }
744 744
745 static void 745 static void
746 x_mark_device (struct device *d, void (*markobj) (Lisp_Object)) 746 x_mark_device (struct device *d)
747 { 747 {
748 markobj (DEVICE_X_WM_COMMAND_FRAME (d)); 748 mark_object (DEVICE_X_WM_COMMAND_FRAME (d));
749 markobj (DEVICE_X_DATA (d)->x_keysym_map_hash_table); 749 mark_object (DEVICE_X_DATA (d)->x_keysym_map_hash_table);
750 } 750 }
751 751
752 752
753 /************************************************************************/ 753 /************************************************************************/
754 /* closing an X connection */ 754 /* closing an X connection */
1891 defsymbol (&Qinit_pre_x_win, "init-pre-x-win"); 1891 defsymbol (&Qinit_pre_x_win, "init-pre-x-win");
1892 defsymbol (&Qinit_post_x_win, "init-post-x-win"); 1892 defsymbol (&Qinit_post_x_win, "init-post-x-win");
1893 } 1893 }
1894 1894
1895 void 1895 void
1896 reinit_console_type_create_device_x (void)
1897 {
1898 /* Initialize variables to speed up X resource interactions */
1899 CONST char *valid_resource_chars =
1900 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
1901 while (*valid_resource_chars)
1902 valid_resource_char_p[(unsigned int) (*valid_resource_chars++)] = 1;
1903
1904 name_char_dynarr = Dynarr_new (char);
1905 class_char_dynarr = Dynarr_new (char);
1906 }
1907
1908 void
1896 console_type_create_device_x (void) 1909 console_type_create_device_x (void)
1897 { 1910 {
1911 reinit_console_type_create_device_x ();
1898 CONSOLE_HAS_METHOD (x, init_device); 1912 CONSOLE_HAS_METHOD (x, init_device);
1899 CONSOLE_HAS_METHOD (x, finish_init_device); 1913 CONSOLE_HAS_METHOD (x, finish_init_device);
1900 CONSOLE_HAS_METHOD (x, mark_device); 1914 CONSOLE_HAS_METHOD (x, mark_device);
1901 CONSOLE_HAS_METHOD (x, delete_device); 1915 CONSOLE_HAS_METHOD (x, delete_device);
1902 CONSOLE_HAS_METHOD (x, device_system_metrics); 1916 CONSOLE_HAS_METHOD (x, device_system_metrics);
1903 1917 }
1904 { 1918
1905 /* Initialize variables to speed up X resource interactions */ 1919 void
1906 CONST char *valid_resource_chars = 1920 reinit_vars_of_device_x (void)
1907 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"; 1921 {
1908 while (*valid_resource_chars) 1922 error_expected = 0;
1909 valid_resource_char_p[(unsigned int) (*valid_resource_chars++)] = 1; 1923 error_occurred = 0;
1910 1924
1911 name_char_dynarr = Dynarr_new (char); 1925 in_resource_setting = 0;
1912 class_char_dynarr = Dynarr_new (char);
1913 }
1914 } 1926 }
1915 1927
1916 void 1928 void
1917 vars_of_device_x (void) 1929 vars_of_device_x (void)
1918 { 1930 {
1931 reinit_vars_of_device_x ();
1932
1919 DEFVAR_LISP ("x-emacs-application-class", &Vx_emacs_application_class /* 1933 DEFVAR_LISP ("x-emacs-application-class", &Vx_emacs_application_class /*
1920 The X application class of the XEmacs process. 1934 The X application class of the XEmacs process.
1921 This controls, among other things, the name of the `app-defaults' file 1935 This controls, among other things, the name of the `app-defaults' file
1922 that XEmacs will use. For changes to this variable to take effect, they 1936 that XEmacs will use. For changes to this variable to take effect, they
1923 must be made before the connection to the X server is initialized, that is, 1937 must be made before the connection to the X server is initialized, that is,
1956 1970
1957 Fprovide (Qx); 1971 Fprovide (Qx);
1958 1972
1959 staticpro (&Vdefault_x_device); 1973 staticpro (&Vdefault_x_device);
1960 Vdefault_x_device = Qnil; 1974 Vdefault_x_device = Qnil;
1961 1975 }
1962 error_expected = 0;
1963 error_occurred = 0;
1964
1965 in_resource_setting = 0;
1966 }