comparison src/frame.c @ 111234:0576327092ab

merge trunk
author Kenichi Handa <handa@m17n.org>
date Thu, 28 Oct 2010 19:57:59 +0900
parents bf6806de6892
children cdad894f9ed0
comparison
equal deleted inserted replaced
111233:d86e0c3de741 111234:0576327092ab
1 /* Generic frame functions. 1 /* Generic frame functions.
2 Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, 2
3 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 3 Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003,
4 2004, 2005, 2006, 2007, 2008, 2009, 2010
5 Free Software Foundation, Inc.
4 6
5 This file is part of GNU Emacs. 7 This file is part of GNU Emacs.
6 8
7 GNU Emacs is free software: you can redistribute it and/or modify 9 GNU Emacs is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 10 it under the terms of the GNU General Public License as published by
199 Lisp_Object Vframe_list; 201 Lisp_Object Vframe_list;
200 202
201 203
202 DEFUN ("framep", Fframep, Sframep, 1, 1, 0, 204 DEFUN ("framep", Fframep, Sframep, 1, 1, 0,
203 doc: /* Return non-nil if OBJECT is a frame. 205 doc: /* Return non-nil if OBJECT is a frame.
204 Value is t for a termcap frame (a character-only terminal), 206 Value is:
205 `x' for an Emacs frame that is really an X window, 207 t for a termcap frame (a character-only terminal),
206 `w32' for an Emacs frame that is a window on MS-Windows display, 208 'x' for an Emacs frame that is really an X window,
207 `ns' for an Emacs frame on a GNUstep or Macintosh Cocoa display, 209 'w32' for an Emacs frame that is a window on MS-Windows display,
208 `pc' for a direct-write MS-DOS frame. 210 'ns' for an Emacs frame on a GNUstep or Macintosh Cocoa display,
211 'pc' for a direct-write MS-DOS frame.
209 See also `frame-live-p'. */) 212 See also `frame-live-p'. */)
210 (Lisp_Object object) 213 (Lisp_Object object)
211 { 214 {
212 if (!FRAMEP (object)) 215 if (!FRAMEP (object))
213 return Qnil; 216 return Qnil;
245 : Qnil); 248 : Qnil);
246 } 249 }
247 250
248 DEFUN ("window-system", Fwindow_system, Swindow_system, 0, 1, 0, 251 DEFUN ("window-system", Fwindow_system, Swindow_system, 0, 1, 0,
249 doc: /* The name of the window system that FRAME is displaying through. 252 doc: /* The name of the window system that FRAME is displaying through.
250 The value is a symbol---for instance, 'x' for X windows. 253 The value is a symbol:
251 The value is nil if Emacs is using a text-only terminal. 254 nil for a termcap frame (a character-only terminal),
252 255 'x' for an Emacs frame that is really an X window,
253 FRAME defaults to the currently selected frame. */) 256 'w32' for an Emacs frame that is a window on MS-Windows display,
257 'ns' for an Emacs frame on a GNUstep or Macintosh Cocoa display,
258 'pc' for a direct-write MS-DOS frame.
259
260 FRAME defaults to the currently selected frame.
261
262 Use of this function as a predicate is deprecated. Instead,
263 use `display-graphic-p' or any of the other `display-*-p'
264 predicates which report frame's specific UI-related capabilities. */)
254 (Lisp_Object frame) 265 (Lisp_Object frame)
255 { 266 {
256 Lisp_Object type; 267 Lisp_Object type;
257 if (NILP (frame)) 268 if (NILP (frame))
258 frame = selected_frame; 269 frame = selected_frame;
4312 FRAME_TERMINAL (f)->toggle_invisible_pointer_hook (f, 0); 4323 FRAME_TERMINAL (f)->toggle_invisible_pointer_hook (f, 0);
4313 f->pointer_invisible = 0; 4324 f->pointer_invisible = 0;
4314 } 4325 }
4315 } 4326 }
4316 4327
4328 DEFUN ("frame-pointer-visible-p", Fframe_pointer_visible_p,
4329 Sframe_pointer_visible_p, 0, 1, 0,
4330 doc: /* Return t if the mouse pointer displayed on FRAME is visible.
4331 Otherwise it returns nil. FRAME omitted or nil means the
4332 selected frame. This is useful when `make-pointer-invisible' is set. */)
4333 (Lisp_Object frame)
4334 {
4335 if (NILP (frame))
4336 frame = selected_frame;
4337
4338 CHECK_FRAME (frame);
4339
4340 return (XFRAME (frame)->pointer_invisible ? Qnil : Qt);
4341 }
4317 4342
4318 4343
4319 /*********************************************************************** 4344 /***********************************************************************
4320 Initialization 4345 Initialization
4321 ***********************************************************************/ 4346 ***********************************************************************/
4536 Vdelete_frame_functions = Qnil; 4561 Vdelete_frame_functions = Qnil;
4537 Qdelete_frame_functions = intern_c_string ("delete-frame-functions"); 4562 Qdelete_frame_functions = intern_c_string ("delete-frame-functions");
4538 staticpro (&Qdelete_frame_functions); 4563 staticpro (&Qdelete_frame_functions);
4539 4564
4540 DEFVAR_LISP ("menu-bar-mode", &Vmenu_bar_mode, 4565 DEFVAR_LISP ("menu-bar-mode", &Vmenu_bar_mode,
4541 doc: /* Non-nil if Menu-Bar mode is enabled. */); 4566 doc: /* Non-nil if Menu-Bar mode is enabled.
4567 See the command `menu-bar-mode' for a description of this minor mode.
4568 Setting this variable directly does not take effect;
4569 either customize it (see the info node `Easy Customization')
4570 or call the function `menu-bar-mode'. */);
4542 Vmenu_bar_mode = Qt; 4571 Vmenu_bar_mode = Qt;
4543 4572
4544 DEFVAR_LISP ("tool-bar-mode", &Vtool_bar_mode, 4573 DEFVAR_LISP ("tool-bar-mode", &Vtool_bar_mode,
4545 doc: /* Non-nil if Tool-Bar mode is enabled. */); 4574 doc: /* Non-nil if Tool-Bar mode is enabled. */);
4546 Vtool_bar_mode = Qt; 4575 Vtool_bar_mode = Qt;
4621 defsubr (&Stool_bar_pixel_width); 4650 defsubr (&Stool_bar_pixel_width);
4622 defsubr (&Sset_frame_height); 4651 defsubr (&Sset_frame_height);
4623 defsubr (&Sset_frame_width); 4652 defsubr (&Sset_frame_width);
4624 defsubr (&Sset_frame_size); 4653 defsubr (&Sset_frame_size);
4625 defsubr (&Sset_frame_position); 4654 defsubr (&Sset_frame_position);
4655 defsubr (&Sframe_pointer_visible_p);
4626 4656
4627 #ifdef HAVE_WINDOW_SYSTEM 4657 #ifdef HAVE_WINDOW_SYSTEM
4628 defsubr (&Sx_get_resource); 4658 defsubr (&Sx_get_resource);
4629 defsubr (&Sx_parse_geometry); 4659 defsubr (&Sx_parse_geometry);
4630 #endif 4660 #endif
4631 4661
4632 } 4662 }
4633 4663
4634 /* arch-tag: 7dbf2c69-9aad-45f8-8296-db893d6dd039
4635 (do not change this comment) */