aboutsummaryrefslogtreecommitdiffstats
path: root/nextstep
diff options
context:
space:
mode:
authorJan Djärv2013-06-02 21:14:25 +0200
committerJan Djärv2013-06-02 21:14:25 +0200
commitc0342369acfbad2f0ea86b949a2f116304186353 (patch)
treeee60679ec6f2c20b201ef8a71be515582e27c268 /nextstep
parenta2d98946738ffd42f90b3f54d2a32be9d7b6429e (diff)
downloademacs-c0342369acfbad2f0ea86b949a2f116304186353.tar.gz
emacs-c0342369acfbad2f0ea86b949a2f116304186353.zip
Update the GNUStep port so it works OK. Redraw and sizing bugs remain.
* nextstep/templates/Info-gnustep.plist.in: Add NSDocumentClass EmacsDocument. * src/nsfns.m (x_set_foreground_color, x_set_background_color): Use EmacsCGFloat. (ns_implicitly_set_icon_type, Fx_create_frame): Make static, remove unused variables. (Fns_read_file_name): Keep track if panel is for save. Use ns_filename_from_panel/ns_directory_from_panel. (Fns_list_services): delegate only used for COCOA. (Fns_convert_utf8_nfd_to_nfc): Remove warning for GNUStep. Just return the input if GNUStep. (x_screen_planes): Remove. (Fxw_color_values): Use EmacsCGFloat (Fns_display_monitor_attributes_list): Only get screen number for Cocoa. (getDirectory, getFilename): Removed from EmacsOpenPanel and EmacsSavePanel. (EmacsOpenPanel:ok:): Use ns_filename_from_panel and ns_directory_from_panel. * src/nsfont.m (ns_attribute_fvalue, ns_spec_to_descriptor) (ns_charset_covers, ns_get_covering_families, nsfont_open): Use F suffix on floats. (ns_char_width): Returns CGFloat. (ns_ascii_average_width): w is CGFloat instead of float. (nsfont_draw): cbuf and c are unsigned. Cast to char* in call to DPSxshow. (ns_glyph_metrics): CGFloat instead of float. * src/nsimage.m (setXBMColor:, getPixelAtX:Y:): Use EmacsCGFloat. * src/nsmenu.m (ns_update_menubar): Make static. (x_activate_menubar): Surround with ifdef NS_IMPL_COCOA (fillWithWidgetValue:): Add cast to SEL for setAction. (addSubmenuWithTitle:forFrame:): Add cast to SEL for action. (update_frame_tool_bar): Update code for GNUStep. (clearAll): New method. (addDisplayItemWithImage:idx:tag:helpText:enabled:): Handle new tag argument. Call insertItemWithItemIdentifier when NS_IMPL_GNUSTEP. Move identifierToItem setObject and activeIdentifiers addObject before call to insertItemWithItemIdentifier. (validateVisibleItems): Fix indentation. (toolbarAllowedItemIdentifiers:): Return activeIdentifiers. (initWithContentRect:styleMask:backing:defer:): Add ClosableWindow and UtilityWindow to aStyle, remove call to setStyleMask. * src/nsselect.m (ns_get_local_selection): Remove unused variable type. * src/nsterm.h (EmacsCGFloat): Typedef for OSX and GNUStep when the size of CGFloat differs. (EmacsApp): New variable nextappdefined. Declare sendFromMainThread when NS_IMPL_GNUSTEP. (EmacsDocument): Declare when NS_IMPL_GNUSTEP. (EmacsView): Remove unlockFocusNeedsFlush, add windowDidMove. (EmacsToolbar): Add clearAll. Add tag argument to addDisplayItemWithImage. (EmacsSavePanel, EmacsOpenPanel): Remove getFilename and getDirectory. * src/nsterm.m: Include src/process.h if NS_IMPL_GNUSTEP. (ns_menu_bar_is_hidden, menu_will_open_state): Define only if NS_IMPL_COCOA. (x_set_cursor_type): Remove declaration. (ns_update_begin): Only use r and bp if NS_IMPL_COCOA. (ns_update_end, ns_focus, ns_unfocus): Remove GNUStep specific code. (x_set_window_size): Remove 3 pixels from toolbar if NS_IMPL_GNUSTEP. (ns_get_color): Use F suffix on float. (ns_color_to_lisp, ns_query_color): Use EmacsCGFloat. (ns_get_rgb_color): Remove. (x_set_frame_alpha): Move view inside NS_IMPL_COCOA. (note_mouse_movement): x and y are CGFloat. (ns_draw_fringe_bitmap): Remove unused rowY. Change #if to COCOA && >= 10_6. (ns_draw_window_cursor): Remove unused overspill. (ns_draw_underwave): width and x are EamcsCGFloat. (ns_draw_box): thickness is CGFloat. (ns_dumpglyphs_image): Change #if to COCOA && >= 10_6. (ns_send_appdefined): When NS_IMPL_GNUSTEP, redirect to main thread if not in main thread. (ns_get_pending_menu_title, ns_check_menu_open) (ns_check_pending_open_menu): Put inside #if COCOA && >= 10_5. (ns_term_init): Call catch_child_signal if NS_IMPL_GNUSTEP && SIGCHLD. (sendFromMainThread:): New method. (changeFont:): size is CGFloat. (keyDown:): Check for Delete when NS_IMPL_GNUSTEP. Disable warning about permanent text. (characterIndexForPoint:): Adjust return type depending on GNUStep version. (mouseDown:): delta is CGFloat. (updateFrameSize): Remove unised variable f. (initFrameFromEmacs): Move toggleButton inside NS_IMPL_COCOA. Cast float to EmacsCGFloat. (windowWillUseStandardFrame:defaultFrame:): Set maximized_height also to -1 when restoring. (windowDidExitFullScreen:): Put call to updateCollectionBehaviour inside NS_IMPL_COCOA. (toggleFullScreen:): Put call to toggleFullScreen inside NS_IMPL_COCOA. Cast float to EmacsCGFloat. (setPosition:portion:whole:): por is CGFloat. (getMouseMotionPart:window:x:y:): Add F suffix to float. (mouseDown:): Use CGFloat. (mouseDragged:): Remove unised variable edge. (EmacsDocument): Implement for NS_IMPL_GNUSTEP. * src/process.c (catch_child_signal): New function. (init_process_emacs): Call it. * src/process.h (catch_child_signal): Declare.
Diffstat (limited to 'nextstep')
-rw-r--r--nextstep/ChangeLog4
-rw-r--r--nextstep/templates/Info-gnustep.plist.in14
2 files changed, 11 insertions, 7 deletions
diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index 909580296e1..d76d832555c 100644
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,3 +1,7 @@
12013-06-02 Jan Djärv <jan.h.d@swipnet.se>
2
3 * templates/Info-gnustep.plist.in: Add NSDocumentClass EmacsDocument.
4
12013-03-16 Jan Djärv <jan.h.d@swipnet.se> 52013-03-16 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * Makefile.in (${ns_appdir}): Add touch. 7 * Makefile.in (${ns_appdir}): Add touch.
diff --git a/nextstep/templates/Info-gnustep.plist.in b/nextstep/templates/Info-gnustep.plist.in
index 4ac97e5cde6..42abc235761 100644
--- a/nextstep/templates/Info-gnustep.plist.in
+++ b/nextstep/templates/Info-gnustep.plist.in
@@ -20,7 +20,7 @@
20 NSRole = Application; 20 NSRole = Application;
21 NSTypes = ( 21 NSTypes = (
22 { 22 {
23 NSDocumentClass = ""; 23 NSDocumentClass = "EmacsDocument";
24 NSHumanReadableName = ""; 24 NSHumanReadableName = "";
25 NSIcon = ""; 25 NSIcon = "";
26 NSName = ""; 26 NSName = "";
@@ -30,7 +30,7 @@
30 ); 30 );
31 }, 31 },
32 { 32 {
33 NSDocumentClass = ""; 33 NSDocumentClass = "EmacsDocument";
34 NSHumanReadableName = ""; 34 NSHumanReadableName = "";
35 NSIcon = ""; 35 NSIcon = "";
36 NSName = ""; 36 NSName = "";
@@ -41,7 +41,7 @@
41 ); 41 );
42 }, 42 },
43 { 43 {
44 NSDocumentClass = ""; 44 NSDocumentClass = "EmacsDocument";
45 NSHumanReadableName = ""; 45 NSHumanReadableName = "";
46 NSIcon = ""; 46 NSIcon = "";
47 NSName = ""; 47 NSName = "";
@@ -51,7 +51,7 @@
51 ); 51 );
52 }, 52 },
53 { 53 {
54 NSDocumentClass = ""; 54 NSDocumentClass = "EmacsDocument";
55 NSHumanReadableName = ""; 55 NSHumanReadableName = "";
56 NSIcon = ""; 56 NSIcon = "";
57 NSName = ""; 57 NSName = "";
@@ -64,7 +64,7 @@
64 ); 64 );
65 }, 65 },
66 { 66 {
67 NSDocumentClass = ""; 67 NSDocumentClass = "EmacsDocument";
68 NSHumanReadableName = ""; 68 NSHumanReadableName = "";
69 NSIcon = ""; 69 NSIcon = "";
70 NSName = ""; 70 NSName = "";
@@ -74,7 +74,7 @@
74 ); 74 );
75 }, 75 },
76 { 76 {
77 NSDocumentClass = ""; 77 NSDocumentClass = "EmacsDocument";
78 NSHumanReadableName = ""; 78 NSHumanReadableName = "";
79 NSIcon = ""; 79 NSIcon = "";
80 NSName = ""; 80 NSName = "";
@@ -84,7 +84,7 @@
84 ); 84 );
85 }, 85 },
86 { 86 {
87 NSDocumentClass = ""; 87 NSDocumentClass = "EmacsDocument";
88 NSHumanReadableName = ""; 88 NSHumanReadableName = "";
89 NSIcon = ""; 89 NSIcon = "";
90 NSName = ""; 90 NSName = "";