diff src/globals.h @ 112370:7935463f385e

Fix NextStep build problems with globals.h introducion. * src/globals.h (struct emacs_globals): Add f_ns_input_file, f_ns_input_font, f_ns_input_fontsize, f_ns_input_line, f_ns_input_color, f_ns_input_text, f_ns_working_text, f_ns_input_spi_name, f_ns_input_spi_arg, f_ns_alternate_modifier, f_ns_right_alternate_modifier, f_ns_command_modifier, f_ns_right_command_modifier, f_ns_control_modifier, f_ns_right_control_modifier, f_ns_function_modifier, f_ns_antialias_text, f_ns_confirm_quit, f_Vns_icon_type_alist, f_Vns_version_string, f_Vns_sent_selection_hooks, f_Vns_lost_selection_hooks, f_Vselection_alist, f_Vns_reg_to_script and corresponding defines. * src/nsfns.m (Vmenu_bar_mode, Vtool_bar_mode): Remove declaration. (Vns_icon_type_alist, Vns_version_string): Move to globals.h. (syms_of_nsfns): Remove & from DEFVAR_LISP calls. * src/nsfont.m (Vns_reg_to_script, ns_antialias_text): Move to globals.h. (syms_of_nsfont): Remove & from DEFVAR_LISP. * src/nsselect.m (Vns_sent_selection_hooks, Vns_lost_selection_hooks (Vselection_alist, Vselection_converter_alist): Move to globals.h. (syms_of_nsselect): Remove & from DEFVAR_LISP. * src/nsterm.m (ns_input_file, ns_input_font, ns_input_fontsize) (ns_input_line, ns_input_color, ns_input_text, ns_working_text) (ns_input_spi_name, ns_input_spi_arg) (ns_alternate_modifier, ns_right_alternate_modifier) (ns_command_modifier, ns_right_command_modifier, ns_control_modifier) (ns_right_control_modifier, ns_function_modifier) (ns_antialias_text, ns_confirm_quit): Move to globals.h. (Vx_toolkit_scroll_bars, x_use_underline_position_properties) (x_underline_at_descent_line): Remove declaration. (syms_of_nsterm): Remove & from DEFVAR_LISP and DEFVAR_BOOL. * src/nsmenu.m (Voverriding_local_map, Voverriding_local_map_menu_flag): Remove declaration.

--- a/src/globals.h	Wed Jan 19 10:55:47 2011 -0500
+++ b/src/globals.h	Wed Jan 19 23:11:33 2011 +0100
@@ -1695,6 +1695,67 @@
   Lisp_Object f_Vx_super_keysym;
 
   Lisp_Object f_Vx_keysym_table;
+
+  /* Lisp communications */
+  Lisp_Object f_ns_input_file, f_ns_input_font, f_ns_input_fontsize,
+    f_ns_input_line;
+  Lisp_Object f_ns_input_color, f_ns_input_text, f_ns_working_text;
+  Lisp_Object f_ns_input_spi_name, f_ns_input_spi_arg;
+  
+  /* Specifies which emacs modifier should be generated when NS receives
+     the Alternate modifier.  May be Qnone or any of the modifier lisp symbols.
+  */
+  Lisp_Object f_ns_alternate_modifier;
+
+  /* Specifies which emacs modifier should be generated when NS receives
+     the right Alternate modifier.  Has same values as ns_alternate_modifier
+     plus the value Qleft which means whatever value ns_alternate_modifier has.
+  */
+  Lisp_Object f_ns_right_alternate_modifier;
+
+  /* Specifies which emacs modifier should be generated when NS receives
+     the Command modifier.  May be any of the modifier lisp symbols. */
+  Lisp_Object f_ns_command_modifier;
+
+  /* Specifies which emacs modifier should be generated when NS receives
+     the right Command modifier.  Has same values as ns_command_modifier plus
+     the value Qleft which means whatever value ns_command_modifier has.  */
+  Lisp_Object f_ns_right_command_modifier;
+
+  /* Specifies which emacs modifier should be generated when NS receives
+     the Control modifier.  May be any of the modifier lisp symbols. */
+  Lisp_Object f_ns_control_modifier;
+
+  /* Specifies which emacs modifier should be generated when NS receives
+     the right Control modifier.  Has same values as ns_control_modifier plus
+     the value Qleft which means whatever value ns_control_modifier has.  */
+  Lisp_Object f_ns_right_control_modifier;
+
+  /* Specifies which emacs modifier should be generated when NS receives
+     the Function modifier (laptops).  May be any of the modifier lisp symbols.
+  */
+  Lisp_Object f_ns_function_modifier;
+
+  /* Control via default 'GSFontAntiAlias' on OS X and GNUstep. */
+  Lisp_Object f_ns_antialias_text;
+
+  /* Confirm on exit. */
+  Lisp_Object f_ns_confirm_quit;
+
+  /* Alist of elements (REGEXP . IMAGE) for images of icons associated
+     to frames.*/
+  Lisp_Object f_Vns_icon_type_alist;
+
+  /* Toolkit version support. */
+  Lisp_Object f_Vns_version_string;
+
+  Lisp_Object f_Vns_sent_selection_hooks;
+  Lisp_Object f_Vns_lost_selection_hooks;
+  Lisp_Object f_Vselection_alist;
+
+  Lisp_Object f_Vns_reg_to_script;
+
+
 };
 
 extern struct emacs_globals globals;
@@ -2773,3 +2834,53 @@
     globals.f_x_underline_at_descent_line
 #define x_use_underline_position_properties \
     globals.f_x_use_underline_position_properties
+#define ns_input_file \
+    globals.f_ns_input_file
+#define ns_input_font \
+    globals.f_ns_input_font
+#define ns_input_fontsize \
+    globals.f_ns_input_fontsize
+#define ns_input_line \
+    globals.f_ns_input_line
+#define ns_input_color \
+    globals.f_ns_input_color
+#define ns_input_text \
+    globals.f_ns_input_text
+#define ns_working_text \
+    globals.f_ns_working_text
+#define ns_input_spi_name \
+    globals.f_ns_input_spi_name
+#define ns_input_spi_arg \
+    globals.f_ns_input_spi_arg
+#define ns_alternate_modifier \
+    globals.f_ns_alternate_modifier
+#define ns_right_alternate_modifier \
+    globals.f_ns_right_alternate_modifier
+#define ns_command_modifier \
+    globals.f_ns_command_modifier
+#define ns_right_command_modifier \
+    globals.f_ns_right_command_modifier
+#define ns_control_modifier \
+    globals.f_ns_control_modifier
+#define ns_right_control_modifier \
+    globals.f_ns_right_control_modifier
+#define ns_function_modifier \
+    globals.f_ns_function_modifier
+#define ns_antialias_text \
+    globals.f_ns_antialias_text
+#define ns_confirm_quit \
+    globals.f_ns_confirm_quit
+#define Vns_icon_type_alist \
+    globals.f_Vns_icon_type_alist
+#define Vns_version_string \
+    globals.f_Vns_version_string
+#define Vns_sent_selection_hooks \
+    globals.f_Vns_sent_selection_hooks
+#define Vns_lost_selection_hooks \
+    globals.f_Vns_lost_selection_hooks
+#define Vselection_alist \
+    globals.f_Vselection_alist
+#define Vns_reg_to_script \
+    globals.f_Vns_reg_to_script
+
+