diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nsterm.m | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index 71040a756ad..8576ed1b484 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -198,16 +198,6 @@ int ns_tmp_flags; /* FIXME */ | |||
| 198 | struct nsfont_info *ns_tmp_font; /* FIXME */ | 198 | struct nsfont_info *ns_tmp_font; /* FIXME */ |
| 199 | /*static int debug_lock = 0; */ | 199 | /*static int debug_lock = 0; */ |
| 200 | 200 | ||
| 201 | #ifdef NS_IMPL_COCOA | ||
| 202 | /* This undocumented Quartz function controls how fonts are anti-aliased. | ||
| 203 | (Found from code in Mac wxWindows impl, discovered by running `nm' on | ||
| 204 | the "QD" framework.) | ||
| 205 | Mode 0 is normal anti-aliasing, mode 1 is no anti-aliasing, and mode 2 is | ||
| 206 | 4-bit pixel-aligned anti-aliasing (the old QuickDraw standard). */ | ||
| 207 | extern void CGContextSetFontRenderingMode (CGContextRef cg, int v); | ||
| 208 | #endif | ||
| 209 | |||
| 210 | |||
| 211 | /* event loop */ | 201 | /* event loop */ |
| 212 | static BOOL send_appdefined = YES; | 202 | static BOOL send_appdefined = YES; |
| 213 | static NSEvent *last_appdefined_event = 0; | 203 | static NSEvent *last_appdefined_event = 0; |
| @@ -358,7 +348,7 @@ ns_init_paths () | |||
| 358 | } | 348 | } |
| 359 | if ([resourcePaths length] > 0) | 349 | if ([resourcePaths length] > 0) |
| 360 | setenv ("EMACSLOADPATH", [resourcePaths UTF8String], 1); | 350 | setenv ("EMACSLOADPATH", [resourcePaths UTF8String], 1); |
| 361 | /*NSLog (@"loadPath: '%s'\n", resourcePaths); */ | 351 | /*NSLog (@"loadPath: '%@'\n", resourcePaths); */ |
| 362 | } | 352 | } |
| 363 | 353 | ||
| 364 | if (!getenv ("EMACSPATH")) | 354 | if (!getenv ("EMACSPATH")) |
| @@ -859,6 +849,7 @@ ns_reset_terminal_modes (struct terminal *terminal) | |||
| 859 | NSTRACE (ns_reset_terminal_modes); | 849 | NSTRACE (ns_reset_terminal_modes); |
| 860 | } | 850 | } |
| 861 | 851 | ||
| 852 | |||
| 862 | static void | 853 | static void |
| 863 | ns_set_terminal_modes (struct terminal *terminal) | 854 | ns_set_terminal_modes (struct terminal *terminal) |
| 864 | /* Externally called as hook */ | 855 | /* Externally called as hook */ |
| @@ -3133,7 +3124,7 @@ ns_read_socket (struct terminal *terminal, int expected, | |||
| 3133 | If we're being called outside of that, it's also OK to return quickly | 3124 | If we're being called outside of that, it's also OK to return quickly |
| 3134 | after one iteration through the event loop, since other terms do | 3125 | after one iteration through the event loop, since other terms do |
| 3135 | this and emacs expects it. */ | 3126 | this and emacs expects it. */ |
| 3136 | if (!(inNsSelect && expected)) // (!inNsSelect || !expected) | 3127 | if (!(inNsSelect && expected)) |
| 3137 | { | 3128 | { |
| 3138 | /* Post an application defined event on the event queue. When this is | 3129 | /* Post an application defined event on the event queue. When this is |
| 3139 | received the [NXApp run] will return, thus having processed all | 3130 | received the [NXApp run] will return, thus having processed all |