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.359 by sf-exg, Fri Jul 29 09:41:22 2011 UTC

… …
105 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
106 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
107 } 107 }
108 108
109 // check to see whether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
110 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.begin (); cc < v.end (); cc++)
111 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
113 113
114 // allocate a new combination 114 // allocate a new combination
115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
… …
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;
… …
1084 1078
1085 if (fix_screen || old_height == 0) 1079 if (fix_screen || old_height == 0)
1086 scr_reset (); 1080 scr_reset ();
1087 1081
1088#ifdef USE_XIM 1082#ifdef USE_XIM
1089 IMSetPosition (); 1083 im_set_position ();
1090#endif 1084#endif
1091} 1085}
1092 1086
1093/* 1087/*
1094 * Set the width/height of the vt window in characters. Units are pixels. 1088 * Set the width/height of the vt window in characters. Units are pixels.
… …
1155 status_rect.height = fheight; 1149 status_rect.height = fheight;
1156} 1150}
1157 1151
1158/* Checking whether input method is running. */ 1152/* Checking whether input method is running. */
1159bool 1153bool
1160rxvt_term::IMisRunning () 1154rxvt_term::im_is_running ()
1161{ 1155{
1162 Atom atom; 1156 Atom atom;
1163 Window win; 1157 Window win;
1164 char server[IMBUFSIZ]; 1158 char server[IMBUFSIZ];
1165 1159
… …
1181 1175
1182 return false; 1176 return false;
1183} 1177}
1184 1178
1185void 1179void
1186rxvt_term::IMSendSpot () 1180rxvt_term::im_send_spot ()
1187{ 1181{
1188 XPoint nspot; 1182 XPoint nspot;
1189 XVaNestedList preedit_attr; 1183 XVaNestedList preedit_attr;
1190 1184
1191 if (!Input_Context 1185 if (!Input_Context
… …
1297/* 1291/*
1298 * Try to open a XIM with the current modifiers, then see if we can 1292 * Try to open a XIM with the current modifiers, then see if we can
1299 * open a suitable preedit type 1293 * open a suitable preedit type
1300 */ 1294 */
1301bool 1295bool
1302rxvt_term::IM_get_IC (const char *modifiers) 1296rxvt_term::im_get_ic (const char *modifiers)
1303{ 1297{
1304 int i, j, found; 1298 int i, j, found;
1305 XIM xim; 1299 XIM xim;
1306 XPoint spot; 1300 XPoint spot;
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;
… …
1506 // unfortunately, only the focus window is used by XIM, hard to fix 1499 // unfortunately, only the focus window is used by XIM, hard to fix
1507 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1500 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1508 vt_select_input (); 1501 vt_select_input ();
1509#endif 1502#endif
1510 1503
1511 IMSetPosition (); 1504 im_set_position ();
1512 1505
1513 return true; 1506 return true;
1514} 1507}
1515 1508
1516void 1509void
… …
1544 { 1537 {
1545 if (*s[i]) 1538 if (*s[i])
1546 { 1539 {
1547 strcpy (buf, "@im="); 1540 strcpy (buf, "@im=");
1548 strncat (buf, s[i], IMBUFSIZ - 5); 1541 strncat (buf, s[i], IMBUFSIZ - 5);
1549 if (IM_get_IC (buf)) 1542 if (im_get_ic (buf))
1550 { 1543 {
1551 found = true; 1544 found = true;
1552 break; 1545 break;
1553 } 1546 }
1554 } 1547 }
… …
1559 if (found) 1552 if (found)
1560 goto done; 1553 goto done;
1561 } 1554 }
1562 1555
1563 /* try with XMODIFIERS env. var. */ 1556 /* try with XMODIFIERS env. var. */
1564 if (IM_get_IC ("")) 1557 if (im_get_ic (""))
1565 goto done; 1558 goto done;
1566 1559
1567 /* try with no modifiers base IF the user didn't specify an IM */ 1560 /* try with no modifiers base IF the user didn't specify an IM */
1568 if (IM_get_IC ("@im=none")) 1561 if (im_get_ic ("@im=none"))
1569 goto done; 1562 goto done;
1570 1563
1571done: 1564done:
1572#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1565#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1573 if (rs[Rs_imLocale]) 1566 if (rs[Rs_imLocale])
1574 SET_LOCALE (locale); 1567 SET_LOCALE (locale);
1575#endif 1568#endif
1576} 1569}
1577 1570
1578void 1571void
1579rxvt_term::IMSetPosition () 1572rxvt_term::im_set_position ()
1580{ 1573{
1581 XRectangle preedit_rect, status_rect, *needed_rect; 1574 XRectangle preedit_rect, status_rect, *needed_rect;
1582 XVaNestedList preedit_attr, status_attr; 1575 XVaNestedList preedit_attr, status_attr;
1583 1576
1584 if (!Input_Context 1577 if (!Input_Context
1585 || !focus 1578 || !focus
1586 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1579 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1587 || !IMisRunning ()) 1580 || !im_is_running ())
1588 return; 1581 return;
1589 1582
1590 if (input_style & XIMPreeditPosition) 1583 if (input_style & XIMPreeditPosition)
1591 { 1584 {
1592 im_set_size (preedit_rect); 1585 im_set_size (preedit_rect);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines