# HG changeset patch # User John W. Eaton # Date 1405610361 14400 # Node ID edc4791fbcb25d52ee32c72264ef93a9fab93b7b # Parent dbb207d10d7c91bd2c8caf34ec61f3fa1cd47a31 avoid some old-style cast warnings * cdisplay.h, cdisplay.c: New files. Compile C code and headers with C compiler. * corefcn/module.mk: Include them in the appropriate lists. * display.cc (display_info::init): Call new octave_get_display_info function. diff -r dbb207d10d7c -r edc4791fbcb2 libinterp/corefcn/cdisplay.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libinterp/corefcn/cdisplay.c Thu Jul 17 11:19:21 2014 -0400 @@ -0,0 +1,164 @@ +/* + +Copyright (C) 2009-2014 John W. Eaton + +This file is part of Octave. + +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Octave; see the file COPYING. If not, see +. + +*/ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include + +#if defined (OCTAVE_USE_WINDOWS_API) +#include +#elif defined (HAVE_FRAMEWORK_CARBON) +#include +#elif defined (HAVE_X_WINDOWS) +#include +#endif + +#include "cdisplay.h" + +const char * +octave_get_display_info (int *ht, int *wd, int *dp, double *rx, double *ry, + int *dpy_avail) +{ + const char *msg = 0; + + *dpy_avail = 0; + +#if defined (OCTAVE_USE_WINDOWS_API) + + HDC hdc = GetDC (0); + + if (hdc) + { + *dp = GetDeviceCaps (hdc, BITSPIXEL); + + *ht = GetDeviceCaps (hdc, VERTRES); + *wd = GetDeviceCaps (hdc, HORZRES); + + double ht_mm = GetDeviceCaps (hdc, VERTSIZE); + double wd_mm = GetDeviceCaps (hdc, HORZSIZE); + + *rx = *wd * 25.4 / wd_mm; + *ry = *ht * 25.4 / ht_mm; + + *dpy_avail = 1; + } + else + msg = "no graphical display found"; + +#elif defined (HAVE_FRAMEWORK_CARBON) + + CGDirectDisplayID display = CGMainDisplayID (); + + if (display) + { +#if defined (HAVE_CARBON_CGDISPLAYBITSPERPIXEL) + + *dp = CGDisplayBitsPerPixel (display); + +#else + + /* FIXME: This will only work for MacOS > 10.5. For earlier versions + this code is not needed (use CGDisplayBitsPerPixel instead). */ + + CGDisplayModeRef mode = CGDisplayCopyDisplayMode (display); + CFStringRef pixelEncoding = CGDisplayModeCopyPixelEncoding (mode); + + if (CFStringCompare (pixelEncoding, CFSTR (IO32BitDirectPixels), 0) == 0) + *dp = 32; + else if (CFStringCompare (pixelEncoding, + CFSTR (IO16BitDirectPixels), 0) == 0) + *dp = 16; + else + *dp = 8; + +#endif + + *ht = CGDisplayPixelsHigh (display); + *wd = CGDisplayPixelsWide (display); + + CGSize sz_mm = CGDisplayScreenSize (display); + + /* For MacOS >= 10.6, CGSize is a struct keeping 2 CGFloat + values, but the CGFloat typedef is not present on older + systems, so use double instead. */ + + double ht_mm = sz_mm.height; + double wd_mm = sz_mm.width; + + *rx = *wd * 25.4 / wd_mm; + *ry = *ht * 25.4 / ht_mm; + + *dpy_avail = 1; + } + else + msg = "no graphical display found"; + +#elif defined (HAVE_X_WINDOWS) + + const char *display_name = getenv ("DISPLAY"); + + if (display_name && *display_name) + { + Display *display = XOpenDisplay (display_name); + + if (display) + { + Screen *screen = DefaultScreenOfDisplay (display); + + if (screen) + { + *dp = DefaultDepthOfScreen (screen); + + *ht = HeightOfScreen (screen); + *wd = WidthOfScreen (screen); + + int screen_number = XScreenNumberOfScreen (screen); + + double ht_mm = DisplayHeightMM (display, screen_number); + double wd_mm = DisplayWidthMM (display, screen_number); + + *rx = *wd * 25.4 / wd_mm; + *ry = *ht * 25.4 / ht_mm; + } + else + msg = "X11 display has no default screen"; + + XCloseDisplay (display); + + *dpy_avail = 1; + } + else + msg = "unable to open X11 DISPLAY"; + } + else + msg = "X11 DISPLAY environment variable not set"; + +#else + + msg = "no graphical display found"; + +#endif + + return msg; +} diff -r dbb207d10d7c -r edc4791fbcb2 libinterp/corefcn/cdisplay.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libinterp/corefcn/cdisplay.h Thu Jul 17 11:19:21 2014 -0400 @@ -0,0 +1,38 @@ +/* + +Copyright (C) 2014 John W. Eaton + +This file is part of Octave. + +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Octave; see the file COPYING. If not, see +. + +*/ + +#if !defined (octave_cdisplay_h) +#define octave_cdisplay_h 1 + +#ifdef __cplusplus +extern "C" { +#endif + +OCTINTERP_API extern const char * +octave_get_display_info (int *ht, int *wd, int *dp, double *rx, double *ry, + int *dpy_avail); + +#ifdef __cplusplus +} +#endif + +#endif diff -r dbb207d10d7c -r edc4791fbcb2 libinterp/corefcn/display.cc --- a/libinterp/corefcn/display.cc Thu Jul 17 10:27:24 2014 -0400 +++ b/libinterp/corefcn/display.cc Thu Jul 17 11:19:21 2014 -0400 @@ -24,143 +24,28 @@ #include #endif -#include - -#if defined (OCTAVE_USE_WINDOWS_API) -#include -#elif defined (HAVE_FRAMEWORK_CARBON) -#include -#elif defined (HAVE_X_WINDOWS) -#include -#endif - #include "singleton-cleanup.h" +#include "cdisplay.h" #include "display.h" #include "error.h" display_info *display_info::instance = 0; -#if defined (HAVE_FRAMEWORK_CARBON) && ! defined (HAVE_CARBON_CGDISPLAYBITSPERPIXEL) -// FIXME: This will only work for MacOS > 10.5. For earlier versions -// this code is not needed (use CGDisplayBitsPerPixel instead). -size_t DisplayBitsPerPixel (CGDirectDisplayID display) -{ - CGDisplayModeRef mode = CGDisplayCopyDisplayMode (display); - CFStringRef pixelEncoding = CGDisplayModeCopyPixelEncoding (mode); - - if (CFStringCompare (pixelEncoding, CFSTR (IO32BitDirectPixels), 0) == 0) - return 32; - else if (CFStringCompare (pixelEncoding, CFSTR (IO16BitDirectPixels), 0) == 0) - return 16; - else - return 8; -} -#endif - void display_info::init (bool query) { if (query) { -#if defined (OCTAVE_USE_WINDOWS_API) - - HDC hdc = GetDC (0); - - if (hdc) - { - dp = GetDeviceCaps (hdc, BITSPIXEL); - - ht = GetDeviceCaps (hdc, VERTRES); - wd = GetDeviceCaps (hdc, HORZRES); - - double ht_mm = GetDeviceCaps (hdc, VERTSIZE); - double wd_mm = GetDeviceCaps (hdc, HORZSIZE); - - rx = wd * 25.4 / wd_mm; - ry = ht * 25.4 / ht_mm; - - dpy_avail = true; - } - else - err_msg = "no graphical display found"; - -#elif defined (HAVE_FRAMEWORK_CARBON) + int avail = 0; - CGDirectDisplayID display = CGMainDisplayID (); - - if (display) - { -# if defined (HAVE_CARBON_CGDISPLAYBITSPERPIXEL) - // For MacOS < 10.7 use the line below - dp = CGDisplayBitsPerPixel (display); -# else - // For MacOS > 10.5 use the line below - dp = DisplayBitsPerPixel (display); -# endif - - ht = CGDisplayPixelsHigh (display); - wd = CGDisplayPixelsWide (display); - - CGSize sz_mm = CGDisplayScreenSize (display); - // For MacOS >= 10.6, CGSize is a struct keeping 2 CGFloat values, - // but the CGFloat typedef is not present on older systems, - // so use double instead. - double ht_mm = sz_mm.height; - double wd_mm = sz_mm.width; - - rx = wd * 25.4 / wd_mm; - ry = ht * 25.4 / ht_mm; + const char *msg = octave_get_display_info (&ht, &wd, &dp, &rx, &ry, + &avail); - dpy_avail = true; - } - else - err_msg = "no graphical display found"; - -#elif defined (HAVE_X_WINDOWS) - - const char *display_name = getenv ("DISPLAY"); - - if (display_name && *display_name) - { - Display *display = XOpenDisplay (display_name); - - if (display) - { - Screen *screen = DefaultScreenOfDisplay (display); - - if (screen) - { - dp = DefaultDepthOfScreen (screen); - - ht = HeightOfScreen (screen); - wd = WidthOfScreen (screen); + dpy_avail = avail; - int screen_number = XScreenNumberOfScreen (screen); - - double ht_mm = DisplayHeightMM (display, screen_number); - double wd_mm = DisplayWidthMM (display, screen_number); - - rx = wd * 25.4 / wd_mm; - ry = ht * 25.4 / ht_mm; - } - else - err_msg = "X11 display has no default screen"; - - XCloseDisplay (display); - - dpy_avail = true; - } - else - err_msg = "unable to open X11 DISPLAY"; - } - else - err_msg = "X11 DISPLAY environment variable not set"; -#else - - err_msg = "no graphical display found"; - -#endif + if (msg) + err_msg = msg; } } diff -r dbb207d10d7c -r edc4791fbcb2 libinterp/corefcn/module.mk --- a/libinterp/corefcn/module.mk Thu Jul 17 10:27:24 2014 -0400 +++ b/libinterp/corefcn/module.mk Thu Jul 17 11:19:21 2014 -0400 @@ -44,6 +44,7 @@ COREFCN_INC = \ corefcn/Cell.h \ corefcn/c-file-ptr-stream.h \ + corefcn/cdisplay.h \ corefcn/comment-list.h \ corefcn/cutils.h \ corefcn/data.h \ @@ -144,6 +145,7 @@ corefcn/bitfcns.cc \ corefcn/bsxfun.cc \ corefcn/c-file-ptr-stream.cc \ + corefcn/cdisplay.c \ corefcn/cellfun.cc \ corefcn/colloc.cc \ corefcn/comment-list.cc \