[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/macterm.c
From: |
YAMAMOTO Mitsuharu |
Subject: |
[Emacs-diffs] Changes to emacs/src/macterm.c |
Date: |
Fri, 10 Feb 2006 08:22:13 +0000 |
Index: emacs/src/macterm.c
diff -u emacs/src/macterm.c:1.152 emacs/src/macterm.c:1.153
--- emacs/src/macterm.c:1.152 Mon Feb 6 15:23:21 2006
+++ emacs/src/macterm.c Fri Feb 10 08:22:12 2006
@@ -1026,12 +1026,15 @@
static void
init_cg_text_anti_aliasing_threshold ()
{
- Lisp_Object val =
- Fmac_get_preference (build_string ("AppleAntiAliasingThreshold"),
- Qnil, Qnil, Qnil);
+ int threshold;
+ Boolean valid_p;
- if (INTEGERP (val))
- cg_text_anti_aliasing_threshold = XINT (val);
+ threshold =
+ CFPreferencesGetAppIntegerValue (CFSTR ("AppleAntiAliasingThreshold"),
+ kCFPreferencesCurrentApplication,
+ &valid_p);
+ if (valid_p)
+ cg_text_anti_aliasing_threshold = threshold;
}
static int
@@ -5299,7 +5302,10 @@
struct frame *f;
Cursor cursor;
{
- SetThemeCursor (cursor);
+ struct mac_display_info *dpyinfo = FRAME_MAC_DISPLAY_INFO (f);
+
+ if (dpyinfo->x_focus_frame == f)
+ SetThemeCursor (cursor);
}
@@ -5837,7 +5843,7 @@
if (f->async_visible)
{
BLOCK_INPUT;
- SelectWindow (FRAME_MAC_WINDOW (f));
+ BringToFront (FRAME_MAC_WINDOW (f));
UNBLOCK_INPUT;
}
}
@@ -5851,7 +5857,7 @@
if (f->async_visible)
{
BLOCK_INPUT;
- SendBehind (FRAME_MAC_WINDOW (f), nil);
+ SendBehind (FRAME_MAC_WINDOW (f), NULL);
UNBLOCK_INPUT;
}
}
@@ -5964,7 +5970,6 @@
f->output_data.mac->asked_for_visible = 1;
- SelectWindow (FRAME_MAC_WINDOW (f));
CollapseWindow (FRAME_MAC_WINDOW (f), false);
ShowWindow (FRAME_MAC_WINDOW (f));
}
@@ -9581,6 +9586,8 @@
/* So people can tell when we have read the available input. */
input_signal_count++;
+ ++handling_signal;
+
#if USE_CARBON_EVENTS
toolbox_dispatcher = GetEventDispatcherTarget ();
@@ -10221,6 +10228,7 @@
}
#endif
+ --handling_signal;
UNBLOCK_INPUT;
return count;
}