X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fdevice.c;h=16c10a65ee08dad1523a73d0c8b2d53b2407e85f;hb=112b4eb6a71cd613a534b4246b4cc024ed9bf22e;hp=2de9feddd7b55f7d741c8590a7ca432f5e573495;hpb=c8aa261a7bf3eb1389d2e018be1d715f73cacd66;p=chise%2Fxemacs-chise.git- diff --git a/src/device.c b/src/device.c index 2de9fed..16c10a6 100644 --- a/src/device.c +++ b/src/device.c @@ -1,4 +1,4 @@ - /* Generic device functions. +/* Generic device functions. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 1994, 1995 Free Software Foundation, Inc. Copyright (C) 1995, 1996 Ben Wing @@ -227,9 +227,9 @@ DEFUN ("dfw-device", Fdfw_device, 1, 1, 0, /* Given a device, frame, or window, return the associated device. Return nil otherwise. */ - (obj)) + (object)) { - return DFW_DEVICE (obj); + return DFW_DEVICE (object); } @@ -891,6 +891,7 @@ behavior cannot necessarily be determined automatically. MARK_FRAME_GLYPHS_CHANGED (f); MARK_FRAME_SUBWINDOWS_CHANGED (f); MARK_FRAME_TOOLBARS_CHANGED (f); + MARK_FRAME_GUTTERS_CHANGED (f); f->menubar_changed = 1; } } @@ -925,9 +926,7 @@ 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; + return DEVICE_PRINTER_P (decode_device (device)) ? Qt : Qnil; } DEFUN ("device-system-metric", Fdevice_system_metric, 1, 3, 0, /* @@ -987,12 +986,12 @@ size-icon Icon dimensions. size-icon-small Small icon dimensions. size-device Device screen or paper size in pixels. size-workspace Workspace size in pixels. This can be less than or - equal to the above. For diplays, this is the area - available to applications less window manager + equal to the above. For displays, this is the area + available to applications less window manager 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. + of screen or paper, in pixels. 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. @@ -1201,12 +1200,12 @@ handle_asynch_device_change (void) /* reset the flag to 0 unless another notification occurred while we were processing this one. Block SIGWINCH during this check to prevent a possible race condition. */ -#ifndef WINDOWSNT +#ifdef SIGWINCH EMACS_BLOCK_SIGNAL (SIGWINCH); #endif if (old_asynch_device_change_pending == asynch_device_change_pending) asynch_device_change_pending = 0; -#ifndef WINDOWSNT +#ifdef SIGWINCH EMACS_UNBLOCK_SIGNAL (SIGWINCH); #endif } @@ -1246,6 +1245,8 @@ call_critical_lisp_code (struct device *d, Lisp_Object function, void syms_of_device (void) { + INIT_LRECORD_IMPLEMENTATION (device); + DEFSUBR (Fvalid_device_class_p); DEFSUBR (Fdevice_class_list);