From 2165e881272884e2075052e4e99c26f8e786f83a Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Fri, 18 Jul 2008 08:59:50 +0000 Subject: Backport of long term bug from trunk: 2008-07-18 David Robinow (tiny change) * w32inevt.c: Include dispextern.h. Don't declare change_frame_size here. (maybe_generate_resize_event, resize_event): Call change_frame_size with SAFE arg. --- src/ChangeLog | 7 +++++++ src/w32inevt.c | 8 +++----- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index e1c9305154..5604f8080d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2008-07-18 David Robinow (tiny change) + + * w32inevt.c: Include dispextern.h. Don't declare change_frame_size + here. + (maybe_generate_resize_event, resize_event): Call change_frame_size + with SAFE arg. + 2008-07-17 YAMAMOTO Mitsuharu * gtkutil.c: Include instead of "config.h". diff --git a/src/w32inevt.c b/src/w32inevt.c index 0eb73964aa..6f0401c956 100644 --- a/src/w32inevt.c +++ b/src/w32inevt.c @@ -39,6 +39,7 @@ Boston, MA 02110-1301, USA. #include "lisp.h" #include "keyboard.h" #include "frame.h" +#include "dispextern.h" #include "blockinput.h" #include "termhooks.h" #include "w32heap.h" @@ -54,9 +55,6 @@ static DWORD movement_time; /* from keyboard.c */ extern void reinvoke_input_signal (void); -/* from dispnew.c */ -extern int change_frame_size (FRAME_PTR, int, int, int, int); - /* from w32console.c */ extern int w32_use_full_screen_buffer; @@ -622,7 +620,7 @@ resize_event (WINDOW_BUFFER_SIZE_RECORD *event) { FRAME_PTR f = get_frame (); - change_frame_size (f, event->dwSize.Y, event->dwSize.X, 0, 1); + change_frame_size (f, event->dwSize.Y, event->dwSize.X, 0, 1, 0); SET_FRAME_GARBAGED (f); } @@ -639,7 +637,7 @@ maybe_generate_resize_event () change_frame_size (f, 1 + info.srWindow.Bottom - info.srWindow.Top, 1 + info.srWindow.Right - info.srWindow.Left, - 0, 0); + 0, 0, 0); } int -- cgit v1.2.3 From 1802dc0c331a23eafee370ed6d43a210704a7f1a Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Mon, 21 Jul 2008 04:20:37 +0000 Subject: (mac_create_cg_image_from_image, image_load_image_io) [USE_MAC_IMAGE_IO]: Remove conditionals for kCGBitmapByteOrder32Host. --- src/image.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/image.c b/src/image.c index f2dc1ae30c..befddefe99 100644 --- a/src/image.c +++ b/src/image.c @@ -354,12 +354,10 @@ mac_create_cg_image_from_image (f, img) ximg->data = NULL; result = CGImageCreate (ximg->width, ximg->height, 8, 32, ximg->bytes_per_line, mac_cg_color_space_rgb, - (img->mask ? kCGImageAlphaPremultipliedFirst - : kCGImageAlphaNoneSkipFirst) -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 - | kCGBitmapByteOrder32Host -#endif - , provider, NULL, 0, kCGRenderingIntentDefault); + ((img->mask ? kCGImageAlphaPremultipliedFirst + : kCGImageAlphaNoneSkipFirst) + | kCGBitmapByteOrder32Host), + provider, NULL, 0, kCGRenderingIntentDefault); CGDataProviderRelease (provider); UNBLOCK_INPUT; @@ -2682,10 +2680,7 @@ image_load_image_io (f, img, type) ximg->bytes_per_line, mac_cg_color_space_rgb, kCGImageAlphaNoneSkipFirst -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 - | kCGBitmapByteOrder32Host -#endif - ); + | kCGBitmapByteOrder32Host); if (has_alpha_p) { Lisp_Object specified_bg; -- cgit v1.2.3 From 91b953ac7f8b854010eef0b00bfc12b040abc4ed Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Mon, 21 Jul 2008 04:20:49 +0000 Subject: (XDrawLine, XCreatePixmapFromBitmapData) [USE_MAC_IMAGE_IO]: Remove conditionals for kCGBitmapByteOrder32Host. --- src/macterm.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/macterm.c b/src/macterm.c index 43fcfd514c..f73050788c 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -415,11 +415,7 @@ XDrawLine (display, p, gc, x1, y1, x2, y2) if (ximg->bits_per_pixel == 32) { color_space = mac_cg_color_space_rgb; - alpha_info = (kCGImageAlphaNoneSkipFirst -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 - | kCGBitmapByteOrder32Host -#endif - ); + alpha_info = kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host; } else { @@ -748,10 +744,7 @@ XCreatePixmapFromBitmapData (display, w, data, width, height, fg, bg, depth) pixmap->bytes_per_line, mac_cg_color_space_rgb, kCGImageAlphaNoneSkipFirst -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 - | kCGBitmapByteOrder32Host -#endif - ); + | kCGBitmapByteOrder32Host); CG_SET_FILL_COLOR (context, fg); CGContextFillRect (context, CGRectMake (0, 0, width, height)); -- cgit v1.2.3 From 83b968264acb13721f22e9b6a538eeb2fe1dfc90 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Mon, 21 Jul 2008 04:21:43 +0000 Subject: (kCGBitmapByteOrder32Host): New define for non-universal SDKs. --- src/ChangeLog | 11 +++++++++++ src/macterm.h | 6 ++++++ 2 files changed, 17 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 5604f8080d..1af98cf7dc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2008-07-21 YAMAMOTO Mitsuharu + + * macterm.h (kCGBitmapByteOrder32Host): New define for + non-universal SDKs. + + * image.c (mac_create_cg_image_from_image, image_load_image_io) + [USE_MAC_IMAGE_IO]: Remove conditionals for kCGBitmapByteOrder32Host. + + * macterm.c (XDrawLine, XCreatePixmapFromBitmapData) [USE_MAC_IMAGE_IO]: + Remove conditionals for kCGBitmapByteOrder32Host. + 2008-07-18 David Robinow (tiny change) * w32inevt.c: Include dispextern.h. Don't declare change_frame_size diff --git a/src/macterm.h b/src/macterm.h index f9e2655a7a..d728a377d0 100644 --- a/src/macterm.h +++ b/src/macterm.h @@ -611,7 +611,13 @@ enum { kEventParamWindowMouseLocation = 'wmou' }; #endif + +/* kCGBitmapByteOrder32Host is defined in Universal SDK for 10.4 but + not in PPC SDK for 10.4.0. */ +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1050 && !defined (kCGBitmapByteOrder32Host) +#define kCGBitmapByteOrder32Host 0 #endif +#endif /* MAC_OSX */ struct frame; struct face; -- cgit v1.2.3 From 97a5a9472f06f640adf50473908b606b5dc343c0 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 21 Jul 2008 05:04:14 +0000 Subject: * print.c (print_object): Check print_depth before searching for circularities. --- src/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 1af98cf7dc..3c9ac5a8ef 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-07-21 Ami Fischman (tiny change) + + * print.c (print_object): Check print_depth before searching for + circularities. + 2008-07-21 YAMAMOTO Mitsuharu * macterm.h (kCGBitmapByteOrder32Host): New define for -- cgit v1.2.3 From 40b2758ace2013f1e2914204a5c27b91eab37409 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 21 Jul 2008 05:05:56 +0000 Subject: (print_object): Check print_depth before searching for circularities. --- src/print.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/print.c b/src/print.c index 88abdacfe6..a474fa31e8 100644 --- a/src/print.c +++ b/src/print.c @@ -1487,6 +1487,10 @@ print_object (obj, printcharfun, escapeflag) QUIT; + /* See similar code in print_preprocess. */ + if (print_depth > PRINT_CIRCLE) + error ("Apparently circular structure being printed"); + /* Detect circularities and truncate them. */ if (STRINGP (obj) || CONSP (obj) || VECTORP (obj) || COMPILEDP (obj) || CHAR_TABLE_P (obj) @@ -1537,9 +1541,6 @@ print_object (obj, printcharfun, escapeflag) print_depth++; - /* See similar code in print_preprocess. */ - if (print_depth > PRINT_CIRCLE) - error ("Apparently circular structure being printed"); #ifdef MAX_PRINT_CHARS if (max_print && print_chars > max_print) { -- cgit v1.2.3 From 9d2bcff4842192869b7042c41dd16fb5a105d974 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Tue, 22 Jul 2008 03:01:23 +0000 Subject: (XDrawLine) [USE_MAC_IMAGE_IO]: Remove spurious return. --- src/ChangeLog | 4 ++++ src/macterm.c | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 3c9ac5a8ef..297dca6cbf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-07-22 YAMAMOTO Mitsuharu + + * macterm.c (XDrawLine) [USE_MAC_IMAGE_IO]: Remove spurious return. + 2008-07-21 Ami Fischman (tiny change) * print.c (print_object): Check print_depth before searching for diff --git a/src/macterm.c b/src/macterm.c index f73050788c..8a0b2d6184 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -422,10 +422,7 @@ XDrawLine (display, p, gc, x1, y1, x2, y2) color_space = NULL; alpha_info = kCGImageAlphaOnly; } - if (color_space == NULL) - return; - context = CGBitmapContextCreate (ximg->data, ximg->width, - ximg->height, 8, + context = CGBitmapContextCreate (ximg->data, ximg->width, ximg->height, 8, ximg->bytes_per_line, color_space, alpha_info); if (ximg->bits_per_pixel == 32) -- cgit v1.2.3 From 2ddbd89290d38c2fbd997eccf18583dc9ffc4582 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 25 Jul 2008 18:05:40 +0000 Subject: * getloadavg.c (nl): Rename to name_list to avoid ncurses.h clash (bug#86). (getloadavg): Callers changed. --- src/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 297dca6cbf..f7d0efd5b5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2008-07-25 Chong Yidong + + * getloadavg.c (nl): Rename to name_list to avoid ncurses.h + clash (bug#86). + (getloadavg): Callers changed. + 2008-07-22 YAMAMOTO Mitsuharu * macterm.c (XDrawLine) [USE_MAC_IMAGE_IO]: Remove spurious return. -- cgit v1.2.3 From 85de137cd7c70f989e2d185c945545dc94667f6f Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 25 Jul 2008 18:06:09 +0000 Subject: (nl): Rename to name_list to avoid ncurses.h clash (bug#86). (getloadavg): Callers changed. --- src/getloadavg.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/getloadavg.c b/src/getloadavg.c index 32d0f41a4a..a174fc07a0 100644 --- a/src/getloadavg.c +++ b/src/getloadavg.c @@ -490,7 +490,7 @@ static int getloadavg_initialized; static long offset; # if !defined(VMS) && !defined(sgi) && !defined(__linux__) -static struct nlist nl[2]; +static struct nlist name_list[2]; # endif /* Not VMS or sgi */ # ifdef SUNOS_5 @@ -880,32 +880,32 @@ getloadavg (loadavg, nelem) { # ifndef sgi # ifndef NLIST_STRUCT - strcpy (nl[0].n_name, LDAV_SYMBOL); - strcpy (nl[1].n_name, ""); + strcpy (name_list[0].n_name, LDAV_SYMBOL); + strcpy (name_list[1].n_name, ""); # else /* NLIST_STRUCT */ # ifdef HAVE_STRUCT_NLIST_N_UN_N_NAME - nl[0].n_un.n_name = LDAV_SYMBOL; - nl[1].n_un.n_name = 0; + name_list[0].n_un.n_name = LDAV_SYMBOL; + name_list[1].n_un.n_name = 0; # else /* not HAVE_STRUCT_NLIST_N_UN_N_NAME */ - nl[0].n_name = LDAV_SYMBOL; - nl[1].n_name = 0; + name_list[0].n_name = LDAV_SYMBOL; + name_list[1].n_name = 0; # endif /* not HAVE_STRUCT_NLIST_N_UN_N_NAME */ # endif /* NLIST_STRUCT */ # ifndef SUNOS_5 if ( # if !(defined (_AIX) && !defined (ps2)) - nlist (KERNEL_FILE, nl) + nlist (KERNEL_FILE, name_list) # else /* _AIX */ - knlist (nl, 1, sizeof (nl[0])) + knlist (name_list, 1, sizeof (name_list[0])) # endif >= 0) - /* Omit "&& nl[0].n_type != 0 " -- it breaks on Sun386i. */ + /* Omit "&& name_list[0].n_type != 0 " -- it breaks on Sun386i. */ { # ifdef FIXUP_KERNEL_SYMBOL_ADDR - FIXUP_KERNEL_SYMBOL_ADDR (nl); + FIXUP_KERNEL_SYMBOL_ADDR (name_list); # endif - offset = nl[0].n_value; + offset = name_list[0].n_value; } # endif /* !SUNOS_5 */ # else /* sgi */ @@ -941,8 +941,8 @@ getloadavg (loadavg, nelem) if (kd != 0) { /* nlist the currently running kernel. */ - kvm_nlist (kd, nl); - offset = nl[0].n_value; + kvm_nlist (kd, name_list); + offset = name_list[0].n_value; getloadavg_initialized = 1; } # endif /* SUNOS_5 */ -- cgit v1.2.3 From 736dc04ff0ee1dca6a12ccf43fcce718550e5b21 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 25 Jul 2008 18:12:23 +0000 Subject: * term.c (syms_of_term): Initialize default_orig_pair, default_set_foreground, and default_set_background. --- src/ChangeLog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index f7d0efd5b5..5b0c24df3f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2008-07-25 Chong Yidong + * term.c (syms_of_term): Initialize default_orig_pair, + default_set_foreground, and default_set_background. + * getloadavg.c (nl): Rename to name_list to avoid ncurses.h clash (bug#86). (getloadavg): Callers changed. -- cgit v1.2.3 From 4f6f680651ffd023adc5bd32713b7947521b3f9c Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 25 Jul 2008 18:12:41 +0000 Subject: (syms_of_term): Initialize default_orig_pair, default_set_foreground, and default_set_background. --- src/term.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/term.c b/src/term.c index 8f7724efb6..56ea065659 100644 --- a/src/term.c +++ b/src/term.c @@ -2782,6 +2782,9 @@ bigger, or it may make it blink, or it may do nothing at all. */); defsubr (&Stty_no_underline); fullscreen_hook = NULL; + default_orig_pair = NULL; + default_set_foreground = NULL; + default_set_background = NULL; } /* arch-tag: 498e7449-6f2e-45e2-91dd-b7d4ca488193 -- cgit v1.2.3 From 4874e0882eff39f280c9b2b907abe411833f79a8 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 26 Jul 2008 07:34:26 +0000 Subject: (syms_of_term): Fix last change. --- src/ChangeLog | 4 ++++ src/term.c | 2 ++ 2 files changed, 6 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 5b0c24df3f..1952f11557 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-07-26 Eli Zaretskii + + * term.c (syms_of_term): Fix last change. + 2008-07-25 Chong Yidong * term.c (syms_of_term): Initialize default_orig_pair, diff --git a/src/term.c b/src/term.c index 56ea065659..1f3a95338b 100644 --- a/src/term.c +++ b/src/term.c @@ -2782,9 +2782,11 @@ bigger, or it may make it blink, or it may do nothing at all. */); defsubr (&Stty_no_underline); fullscreen_hook = NULL; +#ifndef WINDOWSNT default_orig_pair = NULL; default_set_foreground = NULL; default_set_background = NULL; +#endif } /* arch-tag: 498e7449-6f2e-45e2-91dd-b7d4ca488193 -- cgit v1.2.3