[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xfns.c [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/xfns.c [lexbind] |
Date: |
Thu, 20 Nov 2003 19:37:04 -0500 |
Index: emacs/src/xfns.c
diff -c emacs/src/xfns.c:1.549.2.2 emacs/src/xfns.c:1.549.2.3
*** emacs/src/xfns.c:1.549.2.2 Tue Oct 14 19:22:51 2003
--- emacs/src/xfns.c Thu Nov 20 19:36:23 2003
***************
*** 308,314 ****
#ifdef USE_GTK
if (f->output_data.x->edit_widget)
{
! GtkWidget *gwdesc = xg_win_to_widget (wdesc);
struct x_output *x = f->output_data.x;
if (gwdesc != 0 && gwdesc == x->edit_widget)
return f;
--- 308,314 ----
#ifdef USE_GTK
if (f->output_data.x->edit_widget)
{
! GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
struct x_output *x = f->output_data.x;
if (gwdesc != 0 && gwdesc == x->edit_widget)
return f;
***************
*** 352,358 ****
else if (x->widget)
{
#ifdef USE_GTK
! GtkWidget *gwdesc = xg_win_to_widget (wdesc);
if (gwdesc != 0
&& (gwdesc == x->widget
|| gwdesc == x->edit_widget
--- 352,358 ----
else if (x->widget)
{
#ifdef USE_GTK
! GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
if (gwdesc != 0
&& (gwdesc == x->widget
|| gwdesc == x->edit_widget
***************
*** 404,410 ****
else if (x->widget)
{
#ifdef USE_GTK
! GtkWidget *gwdesc = xg_win_to_widget (wdesc);
if (gwdesc != 0
&& (gwdesc == x->widget
|| gwdesc == x->edit_widget
--- 404,410 ----
else if (x->widget)
{
#ifdef USE_GTK
! GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
if (gwdesc != 0
&& (gwdesc == x->widget
|| gwdesc == x->edit_widget
***************
*** 448,454 ****
#ifdef USE_GTK
if (x->menubar_widget)
{
! GtkWidget *gwdesc = xg_win_to_widget (wdesc);
int found = 0;
BLOCK_INPUT;
--- 448,454 ----
#ifdef USE_GTK
if (x->menubar_widget)
{
! GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
int found = 0;
BLOCK_INPUT;
***************
*** 494,500 ****
{
/* This frame matches if the window is its topmost widget. */
#ifdef USE_GTK
! GtkWidget *gwdesc = xg_win_to_widget (wdesc);
if (gwdesc == x->widget)
return f;
#else
--- 494,500 ----
{
/* This frame matches if the window is its topmost widget. */
#ifdef USE_GTK
! GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
if (gwdesc == x->widget)
return f;
#else
***************
*** 762,768 ****
It's nicer with some borders in this context */
int
! x_create_bitmap_mask(f, id)
struct frame *f;
int id;
{
--- 762,768 ----
It's nicer with some borders in this context */
int
! x_create_bitmap_mask (f, id)
struct frame *f;
int id;
{
***************
*** 780,788 ****
if (!(id > 0))
return -1;
! pixmap = x_bitmap_pixmap(f, id);
! width = x_bitmap_width(f, id);
! height = x_bitmap_height(f, id);
BLOCK_INPUT;
ximg = XGetImage (FRAME_X_DISPLAY (f), pixmap, 0, 0, width, height,
--- 780,788 ----
if (!(id > 0))
return -1;
! pixmap = x_bitmap_pixmap (f, id);
! width = x_bitmap_width (f, id);
! height = x_bitmap_height (f, id);
BLOCK_INPUT;
ximg = XGetImage (FRAME_X_DISPLAY (f), pixmap, 0, 0, width, height,
***************
*** 799,805 ****
UNBLOCK_INPUT;
if (!result)
{
! XDestroyImage(ximg);
return -1;
}
--- 799,805 ----
UNBLOCK_INPUT;
if (!result)
{
! XDestroyImage (ximg);
return -1;
}
***************
*** 838,844 ****
dpyinfo->bitmaps[id - 1].mask = mask;
XDestroyImage (ximg);
! x_destroy_x_image(mask_img);
return 0;
}
--- 838,844 ----
dpyinfo->bitmaps[id - 1].mask = mask;
XDestroyImage (ximg);
! x_destroy_x_image (mask_img);
return 0;
}
***************
*** 1106,1112 ****
may be any format that GdkPixbuf knows about, i.e. not just bitmaps. */
int
! xg_set_icon(f, file)
FRAME_PTR f;
Lisp_Object file;
{
--- 1106,1112 ----
may be any format that GdkPixbuf knows about, i.e. not just bitmaps. */
int
! xg_set_icon (f, file)
FRAME_PTR f;
Lisp_Object file;
{
***************
*** 2458,2465 ****
xic = XCreateIC (xim,
XNInputStyle, xic_style,
! XNClientWindow, FRAME_X_WINDOW(f),
! XNFocusWindow, FRAME_X_WINDOW(f),
XNStatusAttributes, status_attr,
XNPreeditAttributes, preedit_attr,
NULL);
--- 2458,2465 ----
xic = XCreateIC (xim,
XNInputStyle, xic_style,
! XNClientWindow, FRAME_X_WINDOW (f),
! XNFocusWindow, FRAME_X_WINDOW (f),
XNStatusAttributes, status_attr,
XNPreeditAttributes, preedit_attr,
NULL);
***************
*** 2550,2556 ****
XFree (needed);
attr = XVaCreateNestedList (0, XNArea, &area, NULL);
! XSetICValues(xic, XNStatusAttributes, attr, NULL);
XFree (attr);
}
--- 2550,2556 ----
XFree (needed);
attr = XVaCreateNestedList (0, XNArea, &area, NULL);
! XSetICValues (xic, XNStatusAttributes, attr, NULL);
XFree (attr);
}
***************
*** 2670,2676 ****
{
int len;
char *tem, shell_position[32];
! Arg al[2];
int ac = 0;
int extra_borders = 0;
int menubar_size
--- 2670,2676 ----
{
int len;
char *tem, shell_position[32];
! Arg al[10];
int ac = 0;
int extra_borders = 0;
int menubar_size
***************
*** 2722,2730 ****
(xneg ? '-' : '+'), left,
(yneg ? '-' : '+'), top);
else
! sprintf (shell_position, "=%dx%d",
! FRAME_PIXEL_WIDTH (f) + extra_borders,
! FRAME_PIXEL_HEIGHT (f) + menubar_size + extra_borders);
}
len = strlen (shell_position) + 1;
--- 2722,2740 ----
(xneg ? '-' : '+'), left,
(yneg ? '-' : '+'), top);
else
! {
! sprintf (shell_position, "=%dx%d",
! FRAME_PIXEL_WIDTH (f) + extra_borders,
! FRAME_PIXEL_HEIGHT (f) + menubar_size + extra_borders);
!
! /* Setting x and y when the position is not specified in
! the geometry string will set program position in the WM hints.
! If Emacs had just one program position, we could set it in
! fallback resources, but since each make-frame call can specify
! different program positions, this is easier. */
! XtSetArg (al[ac], XtNx, left); ac++;
! XtSetArg (al[ac], XtNy, top); ac++;
! }
}
len = strlen (shell_position) + 1;
***************
*** 2783,2789 ****
{
/* XIM server might require some X events. */
unsigned long fevent = NoEventMask;
! XGetICValues(FRAME_XIC (f), XNFilterEvents, &fevent, NULL);
attributes.event_mask |= fevent;
}
#endif /* HAVE_X_I18N */
--- 2793,2799 ----
{
/* XIM server might require some X events. */
unsigned long fevent = NoEventMask;
! XGetICValues (FRAME_XIC (f), XNFilterEvents, &fevent, NULL);
attributes.event_mask |= fevent;
}
#endif /* HAVE_X_I18N */
***************
*** 2837,2843 ****
{
/* XIM server might require some X events. */
unsigned long fevent = NoEventMask;
! XGetICValues(FRAME_XIC (f), XNFilterEvents, &fevent, NULL);
if (fevent != NoEventMask)
{
--- 2847,2853 ----
{
/* XIM server might require some X events. */
unsigned long fevent = NoEventMask;
! XGetICValues (FRAME_XIC (f), XNFilterEvents, &fevent, NULL);
if (fevent != NoEventMask)
{
***************
*** 2901,2907 ****
{
/* XIM server might require some X events. */
unsigned long fevent = NoEventMask;
! XGetICValues(FRAME_XIC (f), XNFilterEvents, &fevent, NULL);
attributes.event_mask |= fevent;
attribute_mask = CWEventMask;
XChangeWindowAttributes (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
--- 2911,2917 ----
{
/* XIM server might require some X events. */
unsigned long fevent = NoEventMask;
! XGetICValues (FRAME_XIC (f), XNFilterEvents, &fevent, NULL);
attributes.event_mask |= fevent;
attribute_mask = CWEventMask;
XChangeWindowAttributes (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
***************
*** 9156,9162 ****
memsrc.len = SBYTES (specified_data);
memsrc.index = 0;
! gif = DGifOpen(&memsrc, gif_read_from_memory);
if (!gif)
{
image_error ("Cannot open memory source `%s'", img->spec, Qnil);
--- 9166,9172 ----
memsrc.len = SBYTES (specified_data);
memsrc.index = 0;
! gif = DGifOpen (&memsrc, gif_read_from_memory);
if (!gif)
{
image_error ("Cannot open memory source `%s'", img->spec, Qnil);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/xfns.c [lexbind],
Miles Bader <=