xemacs-beta: src/device.c comparison

comparison src/device.c @ 440:8de8e3f6228a r21-2-28

Import from CVS: tag r21-2-28

author	cvs
date	Mon, 13 Aug 2007 11:33:38 +0200
parents	3ecd8885ac67
children	abe6d1db359e

comparison

equal deleted inserted replaced

-:357dd071b03c
+:8de8e3f6228a
 Qcolor_menu_button, Qcolor_menu_disabled, Qcolor_toolbar,
 Qcolor_scrollbar, Qcolor_desktop, Qcolor_workspace, Qfont_default,
 Qfont_menubar, Qfont_dialog, Qsize_cursor, Qsize_scrollbar,
 Qsize_menu, Qsize_toolbar, Qsize_toolbar_button,
 Qsize_toolbar_border, Qsize_icon, Qsize_icon_small, Qsize_device,
-Qsize_workspace, Qsize_device_mm, Qdevice_dpi, Qnum_bit_planes,
+Qsize_workspace, Qoffset_workspace, Qsize_device_mm, Qdevice_dpi,
-Qnum_color_cells, Qmouse_buttons, Qswap_buttons, Qshow_sounds,
+Qnum_bit_planes, Qnum_color_cells, Qmouse_buttons, Qswap_buttons,
-Qslow_device, Qsecurity;
+Qshow_sounds, Qslow_device, Qsecurity;
 Lisp_Object Qdevicep, Qdevice_live_p;
 Lisp_Object Qcreate_device_hook;
 Lisp_Object Qdelete_device_hook;
 Lisp_Object Vdevice_class_list;
 	   XSTRING_DATA (d->name), d->header.uid);
 sprintf (buf, "#<%s-device", !DEVICE_LIVE_P (d) ? "dead" :
 	   DEVICE_TYPE_NAME (d));
 write_c_string (buf, printcharfun);
-if (DEVICE_LIVE_P (d))
+if (DEVICE_LIVE_P (d) && !NILP (DEVICE_CONNECTION (d)))
 {
 write_c_string (" on ", printcharfun);
 print_internal (DEVICE_CONNECTION (d), printcharfun, 1);
 }
 sprintf (buf, " 0x%x>", d->header.uid);
 static Lisp_Object
 semi_canonicalize_device_connection (struct console_methods *meths,
 				     Lisp_Object name, Error_behavior errb)
 {
-return CONTYPE_METH_OR_GIVEN (meths, semi_canonicalize_device_connection,
+if (HAS_CONTYPE_METH_P (meths, semi_canonicalize_device_connection))
-				(name, errb), name);
+return CONTYPE_METH (meths, semi_canonicalize_device_connection,
+			 (name, errb));
+else
+return CONTYPE_METH_OR_GIVEN (meths, canonicalize_device_connection,
+				  (name, errb), name);
 }
 static Lisp_Object
 canonicalize_device_connection (struct console_methods *meths,
 				Lisp_Object name, Error_behavior errb)
 {
-return CONTYPE_METH_OR_GIVEN (meths, canonicalize_device_connection,
+if (HAS_CONTYPE_METH_P (meths, canonicalize_device_connection))
-				(name, errb), name);
+return CONTYPE_METH (meths, canonicalize_device_connection,
+			 (name, errb));
+else
+return CONTYPE_METH_OR_GIVEN (meths, semi_canonicalize_device_connection,
+				  (name, errb), name);
 }
 static Lisp_Object
 find_device_of_type (struct console_methods *meths, Lisp_Object canon)
 {
 Return the output baud rate of DEVICE.
 */
 (device))
 {
 return make_int (DEVICE_BAUD_RATE (decode_device (device)));
+}
+DEFUN ("device-printer-p", Fdevice_printer_p, 0, 1, 0, /*
+Return t if DEVICE is a printer, nil if it is a display. DEVICE defaults
+to selected device if omitted, and must be live if specified.
+*/
+(device))
+{
+return (MAYBE_INT_DEVMETH (decode_device (device),
+			     device_implementation_flags, ())
+	  & XDEVIMPF_IS_A_PRINTER) ? Qt : Qnil;
 }
 DEFUN ("device-system-metric", Fdevice_system_metric, 1, 3, 0, /*
 Get a metric for DEVICE as provided by the system.
 size-toolbar          Toolbar width and height.
 size-toolbar-button   Toolbar button size.
 size-toolbar-border   Toolbar border width and height.
 size-icon             Icon dimensions.
 size-icon-small       Small icon dimensions.
-size-device           Device screen size in pixels.
+size-device           Device screen or paper size in pixels.
-size-workspace        Workspace size in pixels. This can be less than the
+size-workspace        Workspace size in pixels. This can be less than or
-above if window manager has decorations which
+equal to the above. For diplays, this is the area
-effectively shrink the area remaining for application
+available to applications less window manager
-windows.
+decorations. For printers, this is the size of
+printable area.
+offset-workspace      Offset of workspace area from the top left corner
+of screen or paper.
 size-device-mm        Device screen size in millimeters.
 device-dpi            Device resolution, in dots per inch.
 num-bit-planes        Integer, number of device bit planes.
 num-color-cells       Integer, number of device color cells.
 FROB (size_toolbar_border);
 FROB (size_icon);
 FROB (size_icon_small);
 FROB (size_device);
 FROB (size_workspace);
+FROB (offset_workspace);
 FROB (size_device_mm);
 FROB (device_dpi);
 FROB (num_bit_planes);
 FROB (num_color_cells);
 FROB (mouse_buttons);
 FROB (size_toolbar_border);
 FROB (size_icon);
 FROB (size_icon_small);
 FROB (size_device);
 FROB (size_workspace);
+FROB (offset_workspace);
 FROB (size_device_mm);
 FROB (device_dpi);
 FROB (num_bit_planes);
 FROB (num_color_cells);
 FROB (mouse_buttons);
 DEFSUBR (Fdevice_system_metrics);
 DEFSUBR (Fdevice_system_metric);
 DEFSUBR (Fset_device_baud_rate);
 DEFSUBR (Fdevice_baud_rate);
 DEFSUBR (Fdomain_device_type);
+DEFSUBR (Fdevice_printer_p);
 defsymbol (&Qdevicep, "devicep");
 defsymbol (&Qdevice_live_p, "device-live-p");
 defsymbol (&Qcreate_device_hook, "create-device-hook");
 defsymbol (&Qsize_toolbar_border, "size-toolbar-border");
 defsymbol (&Qsize_icon, "size-icon");
 defsymbol (&Qsize_icon_small, "size-icon-small");
 defsymbol (&Qsize_device, "size-device");
 defsymbol (&Qsize_workspace, "size-workspace");
+defsymbol (&Qoffset_workspace, "offset-workspace");
 defsymbol (&Qsize_device_mm, "size-device-mm");
 defsymbol (&Qnum_bit_planes, "num-bit-planes");
 defsymbol (&Qnum_color_cells, "num-color-cells");
 defsymbol (&Qdevice_dpi, "device-dpi");
 defsymbol (&Qmouse_buttons, "mouse-buttons");

Mercurial > hg > xemacs-beta

comparison src/device.c @ 440:8de8e3f6228a r21-2-28