[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src nsfns.m nsgui.h nsmenu.m nsselect.m n...
|
From: |
Adrian Robert |
|
Subject: |
[Emacs-diffs] emacs/src nsfns.m nsgui.h nsmenu.m nsselect.m n... |
|
Date: |
Thu, 22 Jan 2009 13:55:47 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Adrian Robert <arobert> 09/01/22 13:55:46
Modified files:
src : nsfns.m nsgui.h nsmenu.m nsselect.m nsterm.h
nsterm.m ChangeLog
Log message:
Remove '23' comments that indicated code added during update from
emacs-20 -> emacs-23.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsfns.m?cvsroot=emacs&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsgui.h?cvsroot=emacs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsmenu.m?cvsroot=emacs&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsselect.m?cvsroot=emacs&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsterm.h?cvsroot=emacs&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsterm.m?cvsroot=emacs&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7301&r2=1.7302
Patches:
Index: nsfns.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsfns.m,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- nsfns.m 22 Jan 2009 13:31:55 -0000 1.34
+++ nsfns.m 22 Jan 2009 13:55:44 -0000 1.35
@@ -739,7 +739,7 @@
}
-/* 23: toolbar support */
+/* toolbar support */
void
x_set_tool_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
{
@@ -883,7 +883,7 @@
}
-/* 23: added Xism; we stub out (we do implement this in ns-win.el) */
+/* Xism; we stub out (we do implement this in ns-win.el) */
int
XParseGeometry (char *string, int *x, int *y,
unsigned int *width, unsigned int *height)
@@ -939,7 +939,7 @@
}
-/* 23: called to set mouse pointer color, but all other terms use it to
+/* called to set mouse pointer color, but all other terms use it to
initialize pointer types (and don't set the color ;) */
static void
x_set_mouse_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
@@ -1012,9 +1012,7 @@
}
-/* 23 Note: commented out ns_... entries are no longer used in 23.
- commented out x_... entries have not been implemented yet.
- see frame.c for template, also where all generic OK functions are impl */
+/* Note: see frame.c for template, also where generic functions are impl */
frame_parm_handler ns_frame_parm_handlers[] =
{
x_set_autoraise, /* generic OK */
@@ -2145,14 +2143,15 @@
==========================================================================
*/
-/* 23: call in image.c */
+/* called from image.c */
FRAME_PTR
check_x_frame (Lisp_Object frame)
{
return check_ns_frame (frame);
}
-/* 23: added, due to call in frame.c */
+
+/* called from frame.c */
struct ns_display_info *
check_x_display_info (Lisp_Object frame)
{
@@ -2160,7 +2159,6 @@
}
-/* 23: new function; we don't have much in the way of flexibility though */
void
x_set_scroll_bar_default_width (f)
struct frame *f;
@@ -2172,7 +2170,7 @@
}
-/* 23: terms now impl this instead of x-get-resource directly */
+/* terms impl this instead of x-get-resource directly */
const char *
x_get_string_resource (XrmDatabase rdb, char *name, char *class)
{
Index: nsgui.h
===================================================================
RCS file: /sources/emacs/emacs/src/nsgui.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- nsgui.h 8 Jan 2009 03:15:52 -0000 1.7
+++ nsgui.h 22 Jan 2009 13:55:44 -0000 1.8
@@ -60,7 +60,7 @@
int descent;
} XCharStruct;
-/* 23: Fake tructure from Xlib.h to represent two-byte characters. */
+/* Fake tructure from Xlib.h to represent two-byte characters. */
#ifndef __OBJC__
typedef unsigned short unichar;
#endif
@@ -121,7 +121,7 @@
typedef Lisp_Object XrmDatabase;
-/* 23: some sort of attempt to normalize rectangle handling.. seems a bit much
+/* some sort of attempt to normalize rectangle handling.. seems a bit much
for what is accomplished */
typedef struct {
int x, y;
Index: nsmenu.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsmenu.m,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- nsmenu.m 22 Jan 2009 12:23:48 -0000 1.15
+++ nsmenu.m 22 Jan 2009 13:55:44 -0000 1.16
@@ -85,7 +85,7 @@
==========================================================================
*/
-/*23: FIXME: not currently used, but should normalize with other terms. */
+/* FIXME: not currently used, but should normalize with other terms. */
void
x_activate_menubar (struct frame *f)
{
Index: nsselect.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsselect.m,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- nsselect.m 8 Jan 2009 03:15:52 -0000 1.10
+++ nsselect.m 22 Jan 2009 13:55:44 -0000 1.11
@@ -42,7 +42,6 @@
static Lisp_Object Vselection_alist;
static Lisp_Object Vselection_converter_alist;
-/* 23: new */
static Lisp_Object Qforeign_selection;
NSString *NXSecondaryPboard;
@@ -606,11 +605,8 @@
\(a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD').");
Vns_lost_selection_hooks = Qnil;
-/* 23: { */
Qforeign_selection = intern ("foreign-selection");
staticpro (&Qforeign_selection);
-/* } */
-
}
// arch-tag: 39d1dde7-06a6-49ff-95a7-0e7af12d2218
Index: nsterm.h
===================================================================
RCS file: /sources/emacs/emacs/src/nsterm.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- nsterm.h 22 Jan 2009 00:00:13 -0000 1.19
+++ nsterm.h 22 Jan 2009 13:55:44 -0000 1.20
@@ -453,7 +453,7 @@
char bold, ital; /* convenience flags */
char synthItal;
float voffset; /* mean of ascender/descender offsets */
- XCharStruct max_bounds; /* 23 */
+ XCharStruct max_bounds;
/* we compute glyph codes and metrics on-demand in blocks of 256 indexed
by hibyte, lobyte */
unsigned short **glyphs; /* map unicode index to glyph */
@@ -483,38 +483,33 @@
/* Minimum font height over all fonts in font_table. */
int smallest_font_height;
- /*/23 */
struct ns_bitmap_record *bitmaps;
int bitmaps_size;
int bitmaps_last;
- /* 23 */
struct image_cache *image_cache;
struct ns_color_table *color_table;
- /* 23: DPI resolution of this screen */
+ /* DPI resolution of this screen */
double resx, resy;
- /* 23: Mask of things that cause the mouse to be grabbed */
+ /* Mask of things that cause the mouse to be grabbed */
int grabbed;
- /* 23 */
int n_planes;
- /* 23 */
int color_p;
- /* 23 */
Window root_window;
- /* 23: Xism */
+ /* Xism */
XrmDatabase xrdb;
- /* 23: The cursor to use for vertical scroll bars. */
+ /* The cursor to use for vertical scroll bars. */
Cursor vertical_scroll_bar_cursor;
- /* 23: most mouse face stuff moved in here (and reasonably so) */
+ /* most mouse face stuff moved in here as of 21+ (and reasonably so) */
int mouse_face_beg_row, mouse_face_beg_col;
int mouse_face_end_row, mouse_face_end_col;
int mouse_face_beg_x, mouse_face_beg_y;
@@ -540,8 +535,6 @@
extern Lisp_Object ns_display_name_list;
extern struct ns_display_info *ns_display_info_for_name ();
-/* 23: FIXME: these functions (we defined in nsfns) are used in various
- places, but no prototypes are provided */
struct ns_display_info *check_x_display_info (Lisp_Object frame);
FRAME_PTR check_x_frame (Lisp_Object frame);
@@ -564,7 +557,7 @@
void *toolbar;
#endif
- /* 23: NSCursors init'ed in initFrameFromEmacs */
+ /* NSCursors init'ed in initFrameFromEmacs */
Cursor text_cursor;
Cursor nontext_cursor;
Cursor modeline_cursor;
@@ -572,10 +565,10 @@
Cursor hourglass_cursor;
Cursor horizontal_drag_cursor;
- /* 23: NS-specific */
+ /* NS-specific */
Cursor current_pointer;
- /* 23: lord knows why Emacs needs to know about our Window ids.. */
+ /* lord knows why Emacs needs to know about our Window ids.. */
Window window_desc, parent_desc;
char explicit_parent;
@@ -603,7 +596,7 @@
struct ns_display_info *display_info;
};
-/* 23: this dummy decl now needed to support TTYs */
+/* this dummy decl needed to support TTYs */
struct x_output
{
unsigned long background_pixel;
@@ -680,7 +673,6 @@
#define FRAME_FONTSET(f) ((f)->output_data.ns->fontset)
-/* 23 */
#define FRAME_SMALLEST_CHAR_WIDTH(f) \
(FRAME_NS_DISPLAY_INFO (f)->smallest_char_width)
#define FRAME_SMALLEST_FONT_HEIGHT(f) \
@@ -813,7 +805,7 @@
? (min) : (((x)>(max)) ? (max) : (x)))
#define SCREENMAXBOUND(x) (IN_BOUND (-SCREENMAX, x, SCREENMAX))
-/* 23: needed somewhere... */
+/* needed somewhere... */
#define VERTICAL_SCROLL_BAR_WIDTH_TRIM (0)
Index: nsterm.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsterm.m,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- nsterm.m 22 Jan 2009 11:39:12 -0000 1.48
+++ nsterm.m 22 Jan 2009 13:55:44 -0000 1.49
@@ -552,7 +552,7 @@
ns_update_begin (struct frame *f)
/* --------------------------------------------------------------------------
Prepare for a grouped sequence of drawing calls
- 23: external (RIF) call; now split w/ and called before update_window_begin
+ external (RIF) call; whole frame, called before update_window_begin
--------------------------------------------------------------------------
*/
{
NSView *view = FRAME_NS_VIEW (f);
@@ -571,7 +571,7 @@
ns_update_window_begin (struct window *w)
/* --------------------------------------------------------------------------
Prepare for a grouped sequence of drawing calls
- 23: external (RIF) call; now split with and called after update_begin
+ external (RIF) call; for one window, called after update_begin
--------------------------------------------------------------------------
*/
{
struct frame *f = XFRAME (WINDOW_FRAME (w));
@@ -605,7 +605,7 @@
int mouse_face_overwritten_p)
/* --------------------------------------------------------------------------
Finished a grouped sequence of drawing calls
- 23: external (RIF) call; now split with and called before update_window_end
+ external (RIF) call; for one window called before update_end
--------------------------------------------------------------------------
*/
{
struct ns_display_info *dpyinfo = FRAME_NS_DISPLAY_INFO (XFRAME (w->frame));
@@ -644,7 +644,7 @@
ns_update_end (struct frame *f)
/* --------------------------------------------------------------------------
Finished a grouped sequence of drawing calls
- 23: external (RIF) call; now split with and called after update_window_end
+ external (RIF) call; for whole frame, called after update_window_end
--------------------------------------------------------------------------
*/
{
NSView *view = FRAME_NS_VIEW (f);
@@ -673,7 +673,7 @@
static void
ns_flush (struct frame *f)
/* --------------------------------------------------------------------------
- 23: external (RIF) call
+ external (RIF) call
NS impl is no-op since currently we flush in ns_update_end and elsewhere
--------------------------------------------------------------------------
*/
{
@@ -746,7 +746,7 @@
}
#endif
- /*23: clipping */
+ /* clipping */
if (r)
{
[[NSGraphicsContext currentContext] saveGraphicsState];
@@ -789,7 +789,7 @@
static void
ns_clip_to_row (struct window *w, struct glyph_row *row, int area, BOOL gc)
/* --------------------------------------------------------------------------
- 23: Internal (but parallels other terms): Focus drawing on given row
+ Internal (but parallels other terms): Focus drawing on given row
--------------------------------------------------------------------------
*/
{
struct frame *f = XFRAME (WINDOW_FRAME (w));
@@ -1376,7 +1376,7 @@
return 0;
}
- /* 23: FIXME: emacs seems to downcase everything before passing it here,
+ /* FIXME: emacs seems to downcase everything before passing it here,
which we can work around, except for GRAY, since gray##, where ## is
decimal between 0 and 99, is also an X11 colorname. */
if (name[0] == '#') /* X11 format */
@@ -1590,7 +1590,7 @@
ns_defined_color (struct frame *f, char *name, XColor *color_def, int alloc,
char makeIndex)
/* --------------------------------------------------------------------------
- 23: Return 1 if named color found, and set color_def rgb accordingly.
+ Return 1 if named color found, and set color_def rgb accordingly.
If makeIndex and alloc are nonzero put the color in the color_table,
and set color_def pixel to the resulting index.
If makeIndex is zero, set color_def pixel to ARGB.
@@ -1985,7 +1985,7 @@
void
ns_clear_frame_area (struct frame *f, int x, int y, int width, int height)
/* --------------------------------------------------------------------------
- 23: External (RIF): Clear section of frame
+ External (RIF): Clear section of frame
--------------------------------------------------------------------------
*/
{
NSRect r = NSMakeRect (x, y, width, height);
@@ -2038,7 +2038,7 @@
static void
ns_scroll_run (struct window *w, struct run *run)
/* --------------------------------------------------------------------------
- 23: External (RIF): Insert or delete n lines at line vpos
+ External (RIF): Insert or delete n lines at line vpos
--------------------------------------------------------------------------
*/
{
struct frame *f = XFRAME (w->frame);
@@ -2101,7 +2101,7 @@
static void
ns_after_update_window_line (struct glyph_row *desired_row)
/* --------------------------------------------------------------------------
- 23: External (RIF): preparatory to fringe update after text was updated
+ External (RIF): preparatory to fringe update after text was updated
--------------------------------------------------------------------------
*/
{
struct window *w = updated_window;
@@ -2156,7 +2156,7 @@
int x, int y, int width, int height,
int shift_by)
/* --------------------------------------------------------------------------
- 23: External (RIF): copy an area horizontally, don't worry about clearing
src
+ External (RIF): copy an area horizontally, don't worry about clearing src
--------------------------------------------------------------------------
*/
{
NSRect srcRect = NSMakeRect (x, y, width, height);
@@ -2182,7 +2182,7 @@
static inline void
ns_compute_glyph_string_overhangs (struct glyph_string *s)
/* --------------------------------------------------------------------------
- 23: External (RIF); compute left/right overhang of whole string and set in
s
+ External (RIF); compute left/right overhang of whole string and set in s
--------------------------------------------------------------------------
*/
{
struct face *face = FACE_FROM_ID (s->f, s->first_glyph->face_id);
@@ -2223,7 +2223,7 @@
ns_draw_fringe_bitmap (struct window *w, struct glyph_row *row,
struct draw_fringe_bitmap_params *p)
/* --------------------------------------------------------------------------
- 23: External (RIF); fringe-related
+ External (RIF); fringe-related
--------------------------------------------------------------------------
*/
{
struct frame *f = XFRAME (WINDOW_FRAME (w));
@@ -3094,7 +3094,7 @@
/* --------------------------------------------------------------------------
External (hook): Post an event to ourself and keep reading events until
we read it back again. In effect process all events which were waiting.
- 23: Now we have to manage the event buffer ourselves.
+ From 21+ we have to manage the event buffer ourselves.
--------------------------------------------------------------------------
*/
{
struct input_event ev;
@@ -3445,17 +3445,10 @@
}
-
-/* ==========================================================================
-
- Miscellaneous, mainly stubbed-out functions added in 23
-
- ==========================================================================
*/
-
-
void
x_wm_set_icon_position (struct frame *f, int icon_x, int icon_y)
{
+ /* XXX irrelevant under NS */
}
@@ -3614,8 +3607,7 @@
}
-/* 23: Needed as new part of display engine; this and next define public
- functions in this file (well, many of them, anyway). */
+/* This and next define (many of the) public functions in this file. */
/* x_... are generic versions in xdisp.c that we, and other terms, get away
with using despite presence in the "system dependent" redisplay
interface. In addition, many of the ns_ methods have code that is
@@ -3624,28 +3616,28 @@
static struct redisplay_interface ns_redisplay_interface =
{
ns_frame_parm_handlers,
- x_produce_glyphs, /*generic OK */
- x_write_glyphs, /*generic OK */
- x_insert_glyphs, /*generic OK */
- x_clear_end_of_line, /*generic OK */
- ns_scroll_run, /*23 */
- ns_after_update_window_line, /*23: added */
- ns_update_window_begin, /*23: split from update_begin */
- ns_update_window_end, /*23: split from update_end */
- x_cursor_to, /*generic OK */
+ x_produce_glyphs,
+ x_write_glyphs,
+ x_insert_glyphs,
+ x_clear_end_of_line,
+ ns_scroll_run,
+ ns_after_update_window_line,
+ ns_update_window_begin,
+ ns_update_window_end,
+ x_cursor_to,
ns_flush,
0, /* flush_display_optional */
- x_clear_window_mouse_face, /*generic OK */
- x_get_glyph_overhangs, /*23: generic OK */
- x_fix_overlapping_area, /*generic OK */
- ns_draw_fringe_bitmap, /*23 */
+ x_clear_window_mouse_face,
+ x_get_glyph_overhangs,
+ x_fix_overlapping_area,
+ ns_draw_fringe_bitmap,
0, /* define_fringe_bitmap */ /* FIXME: simplify ns_draw_fringe_bitmap */
0, /* destroy_fringe_bitmap */
- ns_compute_glyph_string_overhangs, /*23 */
- ns_draw_glyph_string, /*23: interface to nsfont.m */
- ns_define_frame_cursor, /*23 */
- ns_clear_frame_area, /*23 */
- ns_draw_window_cursor, /*23: revamped ns_dumpcursor */
+ ns_compute_glyph_string_overhangs,
+ ns_draw_glyph_string, /* interface to nsfont.m */
+ ns_define_frame_cursor,
+ ns_clear_frame_area,
+ ns_draw_window_cursor,
ns_draw_vertical_window_border,
ns_shift_glyphs_for_insert
};
@@ -3697,21 +3689,21 @@
terminal->rif = &ns_redisplay_interface;
terminal->clear_frame_hook = ns_clear_frame;
- terminal->ins_del_lines_hook = 0; /* 23: vestigial? */
- terminal->delete_glyphs_hook = 0; /* 23: vestigial? */
+ terminal->ins_del_lines_hook = 0; /* XXX vestigial? */
+ terminal->delete_glyphs_hook = 0; /* XXX vestigial? */
terminal->ring_bell_hook = ns_ring_bell;
terminal->reset_terminal_modes_hook = ns_reset_terminal_modes;
terminal->set_terminal_modes_hook = ns_set_terminal_modes;
terminal->update_begin_hook = ns_update_begin;
terminal->update_end_hook = ns_update_end;
- terminal->set_terminal_window_hook = NULL; /* 23: vestigial? */
+ terminal->set_terminal_window_hook = NULL; /* XXX vestigial? */
terminal->read_socket_hook = ns_read_socket;
terminal->frame_up_to_date_hook = ns_frame_up_to_date;
terminal->mouse_position_hook = ns_mouse_position;
terminal->frame_rehighlight_hook = ns_frame_rehighlight;
terminal->frame_raise_lower_hook = ns_frame_raise_lower;
- terminal->fullscreen_hook = 0; /*XTfullscreen_hook;//23.50 */
+ terminal->fullscreen_hook = 0; /* see XTfullscreen_hook */
terminal->set_vertical_scroll_bar_hook = ns_set_vertical_scroll_bar;
terminal->condemn_scroll_bars_hook = ns_condemn_scroll_bars;
@@ -6432,7 +6424,7 @@
staticpro (&last_mouse_motion_frame);
last_mouse_motion_frame = Qnil;
- /*23: now apparently we need to tell emacs what modifiers there are.. */
+ /* from 23+ we need to tell emacs what modifiers there are.. */
Qmodifier_value = intern ("modifier-value");
Qalt = intern ("alt");
Fput (Qalt, Qmodifier_value, make_number (alt_modifier));
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7301
retrieving revision 1.7302
diff -u -b -r1.7301 -r1.7302
--- ChangeLog 22 Jan 2009 13:31:54 -0000 1.7301
+++ ChangeLog 22 Jan 2009 13:55:45 -0000 1.7302
@@ -1,5 +1,15 @@
2009-01-22 Adrian Robert <address@hidden>
+ * nsfns.m:
+ * nsgui.h:
+ * nsmenu.m:
+ * nsselect.m:
+ * nsterm.h:
+ * nsterm.m: Remove '23' comments that indicated code added during
+ update from emacs-20 -> emacs-23.
+
+2009-01-22 Adrian Robert <address@hidden>
+
* nsterm.m (EmavsView-keyDown:): Treat nil as Qnone for
ns_alternate_modifier. (Bug#1217)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src nsfns.m nsgui.h nsmenu.m nsselect.m n...,
Adrian Robert <=