void
mouse_get_pos (FRAME_PTR *f, int insist, Lisp_Object *bar_window,
enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y,
- unsigned long *time)
+ Time *time)
{
int ix, iy;
Lisp_Object frame, tail;
FOR_EACH_FRAME (tail, frame)
XFRAME (frame)->mouse_moved = 0;
- *f = SELECTED_FRAME();
+ *f = SELECTED_FRAME ();
*bar_window = Qnil;
mouse_get_xy (&ix, &iy);
*time = event_timestamp ();
int x, y;
mouse_get_xy (&x, &y);
- SELECTED_FRAME()->mouse_moved |= (x != mouse_last_x || y != mouse_last_y);
+ SELECTED_FRAME ()->mouse_moved |= (x != mouse_last_x || y != mouse_last_y);
mouse_last_x = x;
mouse_last_y = y;
}
/* If the dimensions changed, the mouse highlight info is invalid. */
if (current_rows != *rows || current_cols != *cols)
{
- struct frame *f = SELECTED_FRAME();
+ struct frame *f = SELECTED_FRAME ();
Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f);
Lisp_Object window = hlinfo->mouse_face_window;
/* Avoid the costly BIOS call if F isn't the currently selected
frame. Allow for NULL as unconditionally meaning the selected
frame. */
- if (f && f != SELECTED_FRAME())
+ if (f && f != SELECTED_FRAME ())
return;
if (tty->termscript)
static void
IT_set_face (int face)
{
- struct frame *sf = SELECTED_FRAME();
+ struct frame *sf = SELECTED_FRAME ();
struct face *fp = FACE_FROM_ID (sf, face);
struct face *dfp = FACE_FROM_ID (sf, DEFAULT_FACE_ID);
unsigned long fg, bg, dflt_fg, dflt_bg;
/* According to RBIL (INTERRUP.A, V-1000), 160 is the maximum possible
width of a DOS display in any known text mode. We multiply by 2 to
- accomodate the screen attribute byte. */
+ accommodate the screen attribute byte. */
#define MAX_SCREEN_BUF 160*2
extern unsigned char *encode_terminal_code (struct glyph *, int,
if (str_len <= 0) return;
- sf = SELECTED_FRAME();
+ sf = SELECTED_FRAME ();
/* Since faces get cached and uncached behind our back, we can't
rely on their indices in the cache being consistent across
IT_copy_glyphs (int xfrom, int xto, size_t len, int ypos)
{
/* The offsets of source and destination relative to the
- conventional memorty selector. */
+ conventional memory selector. */
int from = 2 * (xfrom + screen_size_X * ypos) + ScreenPrimary;
int to = 2 * (xto + screen_size_X * ypos) + ScreenPrimary;
if (redraw)
{
face_change_count++; /* forces xdisp.c to recompute basic faces */
- if (f == SELECTED_FRAME())
+ if (f == SELECTED_FRAME ())
redraw_frame (f);
}
}
{
static int init_needed = 1;
char *term = getenv ("TERM"), *colors;
- struct frame *sf = SELECTED_FRAME();
+ struct frame *sf = SELECTED_FRAME ();
struct tty_display_info *tty;
#ifdef HAVE_X_WINDOWS
void
check_x (void)
{
- if (! FRAME_MSDOS_P (SELECTED_FRAME()))
+ if (! FRAME_MSDOS_P (SELECTED_FRAME ()))
error ("Not running under a window system");
}
{
struct input_event event;
union REGS regs;
- Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (SELECTED_FRAME());
+ Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (SELECTED_FRAME ());
EVENT_INIT (event);
#ifndef HAVE_X_WINDOWS
/* Maybe put the cursor where it should be. */
- IT_cmgoto (SELECTED_FRAME());
+ IT_cmgoto (SELECTED_FRAME ());
#endif
/* The following condition is equivalent to `kbhit ()', except that
/* Generate SELECT_WINDOW_EVENTs when needed. */
if (!NILP (Vmouse_autoselect_window))
{
- mouse_window = window_from_coordinates (SELECTED_FRAME(),
+ mouse_window = window_from_coordinates (SELECTED_FRAME (),
mouse_last_x,
mouse_last_y,
0, 0);
previous_help_echo_string = help_echo_string;
help_echo_string = help_echo_object = help_echo_window = Qnil;
help_echo_pos = -1;
- note_mouse_highlight (SELECTED_FRAME(), mouse_last_x, mouse_last_y);
+ note_mouse_highlight (SELECTED_FRAME (), mouse_last_x, mouse_last_y);
/* If the contents of the global variable help_echo has
changed, generate a HELP_EVENT. */
if (!NILP (help_echo_string) || !NILP (previous_help_echo_string))
left), but I don't think it's worth the effort. */
/* These hold text of the current and the previous menu help messages. */
-static char *menu_help_message, *prev_menu_help_message;
+static const char *menu_help_message, *prev_menu_help_message;
/* Pane number and item number of the menu item which generated the
last menu help message. */
static int menu_help_paneno, menu_help_itemno;
menu->text = (char **) xmalloc (count * sizeof (char *));
menu->submenu = (XMenu **) xmalloc (count * sizeof (XMenu *));
menu->panenumber = (int *) xmalloc (count * sizeof (int));
- menu->help_text = (char **) xmalloc (count * sizeof (char *));
+ menu->help_text = (const char **) xmalloc (count * sizeof (char *));
}
else if (menu->allocated == menu->count)
{
menu->panenumber
= (int *) xrealloc (menu->panenumber, count * sizeof (int));
menu->help_text
- = (char **) xrealloc (menu->help_text, count * sizeof (char *));
+ = (const char **) xrealloc (menu->help_text, count * sizeof (char *));
}
}
int i, j, face, width, mx, my, enabled, mousehere, row, col;
struct glyph *text, *p;
const unsigned char *q;
- struct frame *sf = SELECTED_FRAME();
+ struct frame *sf = SELECTED_FRAME ();
menu_help_message = NULL;
int
XMenuAddSelection (Display *bar, XMenu *menu, int pane,
- int foo, char *txt, int enable, char *help_text)
+ int foo, char *txt, int enable, char const *help_text)
{
int len;
char *p;
int
XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx,
int x0, int y0, unsigned ButtonMask, char **txt,
- void (*help_callback)(char *, int, int))
+ void (*help_callback)(char const *, int, int))
{
struct IT_menu_state *state;
int statecount, x, y, i, b, screensize, leave, result, onepane;
int title_faces[4]; /* face to display the menu title */
int faces[4], buffers_num_deleted = 0;
- struct frame *sf = SELECTED_FRAME();
+ struct frame *sf = SELECTED_FRAME ();
Lisp_Object saved_echo_area_message, selectface;
/* Just in case we got here without a mouse present... */
/* Some lusers set TMPDIR=e:, probably because some losing
programs cannot handle multiple slashes if they use e:/.
e: fails in `access' below, so we interpret e: as e:/. */
- tmp_len = strlen(tmp);
+ tmp_len = strlen (tmp);
if (tmp[tmp_len - 1] != '/' && tmp[tmp_len - 1] != '\\')
{
- strcpy(buf, tmp);
+ strcpy (buf, tmp);
buf[tmp_len++] = '/', buf[tmp_len] = 0;
tmp = buf;
}
#ifndef HAVE_X_WINDOWS
/* The following two are from xfns.c: */
- Qreverse = intern_c_string ("reverse");
- staticpro (&Qreverse);
+ DEFSYM (Qreverse, "reverse");
DEFVAR_LISP ("dos-unsupported-char-glyph", Vdos_unsupported_char_glyph,
doc: /* *Glyph to display instead of chars not supported by current codepage.
HCoop / bpt / emacs.git / blobdiff