ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.355 by sf-exg, Thu Apr 7 12:19:40 2011 UTC vs.
Revision 1.357 by sf-exg, Sat Jul 9 13:14:47 2011 UTC

735 kill (-cmd_pid, SIGWINCH); 735 kill (-cmd_pid, SIGWINCH);
736#endif 736#endif
737} 737}
738 738
739/*----------------------------------------------------------------------*/ 739/*----------------------------------------------------------------------*/
740/* set_fonts () - load and set the various fonts 740/* load and set the various fonts */
741 *
742 * init = 1 - initialize
743 *
744 * fontname == FONT_UP - switch to bigger font
745 * fontname == FONT_DN - switch to smaller font
746 */
747bool 741bool
748rxvt_term::set_fonts () 742rxvt_term::set_fonts ()
749{ 743{
750 rxvt_fontset *fs = new rxvt_fontset (this); 744 rxvt_fontset *fs = new rxvt_fontset (this);
751 rxvt_fontprop prop; 745 rxvt_fontprop prop;
1307 XRectangle rect, status_rect, needed_rect; 1301 XRectangle rect, status_rect, needed_rect;
1308 unsigned long fg, bg; 1302 unsigned long fg, bg;
1309 const char *p; 1303 const char *p;
1310 char **s; 1304 char **s;
1311 XIMStyles *xim_styles; 1305 XIMStyles *xim_styles;
1312#ifdef ENABLE_XIM_ONTHESPOT
1313 XIMCallback xcb[4];
1314#endif
1315 1306
1316 set_environ (envv); 1307 set_environ (envv);
1317 1308
1318 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1309 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1319 return false; 1310 return false;
1459 NULL); 1450 NULL);
1460 } 1451 }
1461#if ENABLE_XIM_ONTHESPOT 1452#if ENABLE_XIM_ONTHESPOT
1462 else if (input_style & XIMPreeditCallbacks) 1453 else if (input_style & XIMPreeditCallbacks)
1463 { 1454 {
1455 XIMCallback xcb[4];
1456
1464 im_set_position (spot); 1457 im_set_position (spot);
1465 1458
1466 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1459 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1467 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1460 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1468 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1461 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines