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.189 by root, Thu Jan 19 09:47:15 2006 UTC vs.
Revision 1.204 by root, Wed Jan 25 02:53:13 2006 UTC

… …
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
53static char curlocale[128], savelocale[128]; 56static char curlocale[128], savelocale[128];
54 57
55bool 58bool
56rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
57{ 60{
58 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 62 return false;
60 63
61 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
63 return true; 66 return true;
64} 67}
65 68
66void 69void
67rxvt_push_locale (const char *locale) 70rxvt_push_locale (const char *locale) NOTHROW
68{ 71{
69 strcpy (savelocale, curlocale); 72 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 73 rxvt_set_locale (locale);
71} 74}
72 75
73void 76void
74rxvt_pop_locale () 77rxvt_pop_locale () NOTHROW
75{ 78{
76 rxvt_set_locale (savelocale); 79 rxvt_set_locale (savelocale);
77} 80}
78 81
79#if ENABLE_COMBINING 82#if ENABLE_COMBINING
… …
166#ifdef POINTER_BLANK 169#ifdef POINTER_BLANK
167 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
168#endif 171#endif
169#ifdef USE_XIM 172#ifdef USE_XIM
170 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
171#endif 177#endif
172 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
173 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
174 child_ev (this, &rxvt_term::child_cb), 180 child_ev (this, &rxvt_term::child_cb),
175 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
… …
182 188
183 termlist.push_back (this); 189 termlist.push_back (this);
184 190
185#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
186 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
187
188 if (!keyboard)
189 rxvt_fatal ("out of memory, aborting.\n");
190#endif 193#endif
191} 194}
192 195
193// clean up the most important stuff, do *not* call x or free mem etc. 196// clean up the most important stuff, do *not* call x or free mem etc.
194// for use before an emergency exit 197// for use before an emergency exit
… …
200 delete pty; pty = 0; 203 delete pty; pty = 0;
201} 204}
202 205
203rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
204{ 207{
205 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
206
207 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
208 209
209 emergency_cleanup (); 210 emergency_cleanup ();
210 211
211#if ENABLE_STYLES 212#if ENABLE_STYLES
… …
270 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
271 free (allocated [i]); 272 free (allocated [i]);
272 273
273 free (selection.text); 274 free (selection.text);
274 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
275 free (env_windowid);
276 free (env_display); 276 free (env_display);
277 free (env_term); 277 free (env_term);
278 free (env_colorfgbg);
279 free (locale); 278 free (locale);
280 free (v_buffer); 279 free (v_buffer);
281 free (incr_buf); 280 free (incr_buf);
282 281
283 delete envv; 282 delete envv;
… …
303void 302void
304rxvt_term::destroy () 303rxvt_term::destroy ()
305{ 304{
306 if (destroy_ev.active) 305 if (destroy_ev.active)
307 return; 306 return;
307
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
308 309
309#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
310 scr_overlay_off (); 311 scr_overlay_off ();
311#endif 312#endif
312 313
… …
446 _exit (EXIT_FAILURE); 447 _exit (EXIT_FAILURE);
447} 448}
448 449
449/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
450bool 451bool
451rxvt_term::init (int argc, const char *const *argv) 452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
452{ 453{
454 this->envv = envv;
455
453 SET_R (this); 456 SET_R (this);
454 set_locale (""); 457 set_locale ("");
455 set_environ (envv); // few things in X do not call setlocale :( 458 set_environ (envv); // few things in X do not call setlocale :(
456 459
457 if (!init_vars ()) 460 if (!init_vars ())
… …
468#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
469 if (OPTION (Opt_scrollBar)) 472 if (OPTION (Opt_scrollBar))
470 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
471#endif 474#endif
472 475
473#if ENABLE_PERL 476 pty = ptytty::create ();
474 if (!rs[Rs_perl_ext_1])
475 rs[Rs_perl_ext_1] = "default";
476
477 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
478 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
479 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
480 {
481 rxvt_perl.init (this);
482 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
483 }
484#endif
485
486 pty = rxvt_new_ptytty ();
487 477
488 create_windows (argc, argv); 478 create_windows (argc, argv);
489 479
490 dDisp; 480 dDisp;
491 481
… …
508 check_our_parents (); 498 check_our_parents ();
509 rootwin_ev.start (display, display->root); 499 rootwin_ev.start (display, display->root);
510 } 500 }
511#endif 501#endif
512 502
503 set_colorfgbg ();
504
505 init_command (cmd_argv);
506
507 free (cmd_argv);
508
509 if (pty->pty >= 0)
510 pty_ev.start (pty->pty, EVENT_READ);
511
512 check_ev.start ();
513
514 HOOK_INVOKE ((this, HOOK_START, DT_END));
515
516#if ENABLE_XEMBED
517 if (rs[Rs_embed])
518 {
519 long info[2] = { 0, XEMBED_MAPPED };
520
521 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
522 32, PropModeReplace, (unsigned char *)&info, 2);
523 }
524#endif
525
513 XMapWindow (disp, vt); 526 XMapWindow (disp, vt);
514 XMapWindow (disp, parent[0]); 527 XMapWindow (disp, parent[0]);
515
516 set_colorfgbg ();
517
518 init_command (cmd_argv);
519
520 free (cmd_argv);
521
522 if (pty->pty >= 0)
523 pty_ev.start (pty->pty, EVENT_READ);
524
525 check_ev.start ();
526
527 HOOK_INVOKE ((this, HOOK_START, DT_END));
528 528
529 return true; 529 return true;
530} 530}
531 531
532static struct sig_handlers 532static struct sig_handlers
… …
537 * Catch a fatal signal and tidy up before quitting 537 * Catch a fatal signal and tidy up before quitting
538 */ 538 */
539 void 539 void
540 sig_term (sig_watcher &w) 540 sig_term (sig_watcher &w)
541 { 541 {
542#ifdef DEBUG_CMD
543 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
544#endif
545 rxvt_emergency_cleanup (); 542 rxvt_emergency_cleanup ();
546 signal (w.signum, SIG_DFL); 543 signal (w.signum, SIG_DFL);
547 kill (getpid (), w.signum); 544 kill (getpid (), w.signum);
548 } 545 }
549 546
… …
557char **rxvt_environ; // startup environment 554char **rxvt_environ; // startup environment
558 555
559void 556void
560rxvt_init () 557rxvt_init ()
561{ 558{
562 uid_t uid = getuid (); 559 ptytty::init ();
563 gid_t gid = getgid ();
564
565 // before doing anything else, check for setuid/setgid operation,
566 // start the helper process and drop privileges
567 if (uid != geteuid ()
568 || gid != getegid ())
569 {
570#if PTYTTY_HELPER
571 rxvt_ptytty_server ();
572#else
573 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
574#endif
575
576 // drop privileges
577#if HAVE_SETRESUID
578 setresgid (gid, gid, gid);
579 setresuid (uid, uid, uid);
580#elif HAVE_SETREUID
581 setregid (gid, gid);
582 setreuid (uid, uid);
583#elif HAVE_SETUID
584 setgid (gid);
585 setuid (uid);
586#endif
587
588 if (uid != geteuid ()
589 || gid != getegid ())
590 rxvt_fatal ("unable to drop privileges, aborting.\n");
591 }
592 560
593 rxvt_environ = environ; 561 rxvt_environ = environ;
594 562
595 signal (SIGHUP, SIG_IGN); 563 signal (SIGHUP, SIG_IGN);
596 signal (SIGPIPE, SIG_IGN); 564 signal (SIGPIPE, SIG_IGN);
… …
631 rxvt_fatal ("memory allocation failure. aborting.\n"); 599 rxvt_fatal ("memory allocation failure. aborting.\n");
632 600
633 return p; 601 return p;
634} 602}
635 603
636void * 604void *
637rxvt_realloc (void *ptr, size_t size) 605rxvt_realloc (void *ptr, size_t size)
638{ 606{
639 void *p = realloc (ptr, size); 607 void *p = realloc (ptr, size);
640 608
641 if (!p) 609 if (!p)
… …
655 short recalc_x, recalc_y; 623 short recalc_x, recalc_y;
656 int x, y, sb_w, flags; 624 int x, y, sb_w, flags;
657 unsigned int w, h; 625 unsigned int w, h;
658 unsigned int max_width, max_height; 626 unsigned int max_width, max_height;
659 dDisp; 627 dDisp;
660
661 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
662 ncol, nrow, szHint.width, szHint.height));
663 628
664 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
665 szHint.win_gravity = NorthWestGravity; 630 szHint.win_gravity = NorthWestGravity;
666 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
667 632
… …
770 if (recalc_y) 735 if (recalc_y)
771 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
772 737
773 ncol = width / fwidth; 738 ncol = width / fwidth;
774 nrow = height / fheight; 739 nrow = height / fheight;
775 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
776 ncol, nrow, szHint.width,
777 szHint.height));
778 return;
779} 740}
780 741
781/*----------------------------------------------------------------------*/ 742/*----------------------------------------------------------------------*/
782/* 743/*
783 * Tell the teletype handler what size the window is. 744 * Tell the teletype handler what size the window is.
… …
1023{ 984{
1024 unsigned int i; 985 unsigned int i;
1025 const char *xpmb = "\0"; 986 const char *xpmb = "\0";
1026 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 987 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1027 988
1028 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1029 strcpy (fstr, "default"); 989 strcpy (fstr, "default");
1030 strcpy (bstr, "default"); 990 strcpy (bstr, "default");
1031 for (i = Color_Black; i <= Color_White; i++) 991 for (i = Color_Black; i <= Color_White; i++)
1032 if (pix_colors[Color_fg] == pix_colors[i]) 992 if (pix_colors[Color_fg] == pix_colors[i])
1033 { 993 {
… …
1067 * -------------------------------------------------------------------- */ 1027 * -------------------------------------------------------------------- */
1068void 1028void
1069rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1029rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1070{ 1030{
1071 int fix_screen; 1031 int fix_screen;
1072 int old_width = szHint.width, old_height = szHint.height; 1032 int old_width = szHint.width;
1033 int old_height = szHint.height;
1073 dDisp; 1034 dDisp;
1074 1035
1075 window_calc (newwidth, newheight); 1036 window_calc (newwidth, newheight);
1076 XSetWMNormalHints (disp, parent[0], &szHint); 1037 XSetWMNormalHints (disp, parent[0], &szHint);
1077 1038
… …
1099 { 1060 {
1100 x -= x1; 1061 x -= x1;
1101 y -= y1; 1062 y -= y1;
1102 } 1063 }
1103 1064
1104 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1105 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1106 dx = old_width - szHint.width; 1067 dx = old_width - szHint.width;
1107 dy = old_height - szHint.height; 1068 dy = old_height - szHint.height;
1108 1069
1109 /* Check position of the center of the window */ 1070 /* Check position of the center of the window */
1110 if (x < x1) /* left half */ 1071 if (x < x1) /* left half */
1111 dx = 0; 1072 dx = 0;
… …
1144 resize_pixmap (); 1105 resize_pixmap ();
1145#endif 1106#endif
1146 } 1107 }
1147 1108
1148 if (fix_screen || old_height == 0) 1109 if (fix_screen || old_height == 0)
1149 {
1150 int curr_screen = -1;
1151 int old_ncol = prev_ncol;
1152
1153 /* scr_reset only works on the primary screen */
1154 if (old_height) /* this is not the first time through */
1155 {
1156 unsigned int ocol = ncol;
1157 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1158 curr_screen = scr_change_screen (PRIMARY);
1159 ncol = ocol;
1160 }
1161
1162 scr_reset (); 1110 scr_reset ();
1163
1164 if (curr_screen >= 0) /* this is not the first time through */
1165 {
1166 scr_change_screen (curr_screen);
1167 selection_check (old_ncol != ncol ? 4 : 0);
1168 }
1169 }
1170
1171 old_width = szHint.width;
1172 old_height = szHint.height;
1173 1111
1174#ifdef XPM_BACKGROUND 1112#ifdef XPM_BACKGROUND
1175 if (pixmap) 1113 if (pixmap)
1176 scr_touch (false); 1114 scr_touch (false);
1177#endif 1115#endif
… …
1280 XPoint nspot; 1218 XPoint nspot;
1281 XVaNestedList preedit_attr; 1219 XVaNestedList preedit_attr;
1282 1220
1283 if (!Input_Context 1221 if (!Input_Context
1284 || !focus 1222 || !focus
1285 || !(input_style & XIMPreeditPosition)) 1223 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1286 return; 1224 return;
1287 1225
1288 im_set_position (nspot); 1226 im_set_position (nspot);
1289 1227
1290 if (nspot.x == spot.x && nspot.y == spot.y) 1228 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1309 input_method = 0; 1247 input_method = 0;
1310 } 1248 }
1311 1249
1312 Input_Context = 0; 1250 Input_Context = 0;
1313} 1251}
1252
1253#ifdef ENABLE_XIM_ONTHESPOT
1254
1255static void
1256xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1257{
1258 ((rxvt_term *)client_data)->make_current ();
1259 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1260}
1261
1262static void
1263xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1264{
1265 ((rxvt_term *)client_data)->make_current ();
1266 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1267}
1268
1269static void
1270xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1271{
1272 rxvt_term *term = (rxvt_term *)client_data;
1273 XIMText *text = call_data->text;
1274
1275 term->make_current ();
1276
1277 if (text)
1278 {
1279 void *str;
1280
1281 if (!text->encoding_is_wchar && text->string.multi_byte)
1282 {
1283 // of course, X makes it ugly again
1284 if (term->rs[Rs_imLocale])
1285 SET_LOCALE (term->rs[Rs_imLocale]);
1286
1287 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1288 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1289
1290 if (term->rs[Rs_imLocale])
1291 SET_LOCALE (term->locale);
1292 }
1293 else
1294 str = (void *)text->string.wide_char;
1295
1296 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1297 DT_INT, call_data->caret,
1298 DT_INT, call_data->chg_first,
1299 DT_INT, call_data->chg_length,
1300 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1301 DT_WCS_LEN, str, str ? (int)text->length : 0,
1302 DT_END));
1303 }
1304 else
1305 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1306 DT_INT, call_data->caret,
1307 DT_INT, call_data->chg_first,
1308 DT_INT, call_data->chg_length,
1309 DT_END));
1310}
1311
1312#if 0
1313static void
1314xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1315{
1316 ((rxvt_term *)client_data)->make_current ();
1317 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1318 DT_INT, call_data->position,
1319 DT_INT, call_data->direction,
1320 DT_INT, call_data->style,
1321 DT_END));
1322}
1323#endif
1324
1325#endif
1314 1326
1315/* 1327/*
1316 * Try to open a XIM with the current modifiers, then see if we can 1328 * Try to open a XIM with the current modifiers, then see if we can
1317 * open a suitable preedit type 1329 * open a suitable preedit type
1318 */ 1330 */
… …
1325 XRectangle rect, status_rect, needed_rect; 1337 XRectangle rect, status_rect, needed_rect;
1326 unsigned long fg, bg; 1338 unsigned long fg, bg;
1327 const char *p; 1339 const char *p;
1328 char **s; 1340 char **s;
1329 XIMStyles *xim_styles; 1341 XIMStyles *xim_styles;
1342#ifdef ENABLE_XIM_ONTHESPOT
1343 XIMCallback xcb[4];
1344#endif
1330 1345
1331 set_environ (envv); 1346 set_environ (envv);
1332 1347
1333 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1348 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1334 return false; 1349 return false;
1335 1350
1336 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1337 input_method = display->get_xim (locale, modifiers); 1351 input_method = display->get_xim (locale, modifiers);
1338 if (input_method == NULL) 1352 if (input_method == NULL)
1339 return false; 1353 return false;
1340 1354
1341 xim = input_method->xim; 1355 xim = input_method->xim;
… …
1361 s = rxvt_splitcommastring (p); 1375 s = rxvt_splitcommastring (p);
1362 1376
1363 for (i = found = 0; !found && s[i]; i++) 1377 for (i = found = 0; !found && s[i]; i++)
1364 { 1378 {
1365 if (!strcmp (s[i], "OverTheSpot")) 1379 if (!strcmp (s[i], "OverTheSpot"))
1366 input_style = (XIMPreeditPosition | XIMStatusNothing); 1380 input_style = XIMPreeditPosition | XIMStatusNothing;
1367 else if (!strcmp (s[i], "OffTheSpot")) 1381 else if (!strcmp (s[i], "OffTheSpot"))
1368 input_style = (XIMPreeditArea | XIMStatusArea); 1382 input_style = XIMPreeditArea | XIMStatusArea;
1369 else if (!strcmp (s[i], "Root")) 1383 else if (!strcmp (s[i], "Root"))
1370 input_style = (XIMPreeditNothing | XIMStatusNothing); 1384 input_style = XIMPreeditNothing | XIMStatusNothing;
1371 else if (!strcmp (s[i], "None")) 1385 else if (!strcmp (s[i], "None"))
1372 input_style = (XIMPreeditNone | XIMStatusNone); 1386 input_style = XIMPreeditNone | XIMStatusNone;
1387#ifdef ENABLE_XIM_ONTHESPOT
1388 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1389 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1390#endif
1391 else
1392 input_style = XIMPreeditNothing | XIMStatusNothing;
1373 1393
1374 for (j = 0; j < xim_styles->count_styles; j++) 1394 for (j = 0; j < xim_styles->count_styles; j++)
1375 if (input_style == xim_styles->supported_styles[j]) 1395 if (input_style == xim_styles->supported_styles[j])
1376 { 1396 {
1377 rxvt_freecommastring (s); 1397 rxvt_freecommastring (s);
… …
1466 XNBackground, bg, 1486 XNBackground, bg,
1467 XNArea, &status_rect, 1487 XNArea, &status_rect,
1468 XNFontSet, fs, 1488 XNFontSet, fs,
1469 NULL); 1489 NULL);
1470 } 1490 }
1491 else if (input_style & XIMPreeditCallbacks)
1492 {
1493 im_set_position (spot);
1494
1495 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1496 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1497 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1498#if 0
1499 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1500#endif
1501
1502 preedit_attr = XVaCreateNestedList (0,
1503 XNSpotLocation, &spot,
1504 XNPreeditStartCallback, &xcb[0],
1505 XNPreeditDoneCallback , &xcb[1],
1506 XNPreeditDrawCallback , &xcb[2],
1507#if 0
1508 XNPreeditCaretCallback, &xcb[3],
1509#endif
1510 NULL);
1511 }
1471 1512
1472 Input_Context = XCreateIC (xim, 1513 Input_Context = XCreateIC (xim,
1473 XNInputStyle, input_style, 1514 XNInputStyle, input_style,
1474 XNClientWindow, vt, 1515 XNClientWindow, vt,
1475 XNFocusWindow, parent[0], 1516 XNFocusWindow, parent[0],
… …
1487 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1528 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1488 im_destroy (); 1529 im_destroy ();
1489 return false; 1530 return false;
1490 } 1531 }
1491 1532
1533#if 0
1534 // unfortunately, only the focus window is used by XIM, hard to fix
1535 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1536 vt_select_input ();
1537#endif
1538
1492 if (input_style & XIMPreeditArea) 1539 if (input_style & XIMPreeditArea)
1493 IMSetStatusPosition (); 1540 IMSetStatusPosition ();
1494 1541
1495 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1496 return true; 1542 return true;
1497} 1543}
1498 1544
1499void 1545void
1500rxvt_term::im_cb () 1546rxvt_term::im_cb ()
… …
1506 1552
1507 make_current (); 1553 make_current ();
1508 1554
1509 im_destroy (); 1555 im_destroy ();
1510 1556
1511 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1512 if (Input_Context) 1557 if (Input_Context)
1513 return; 1558 return;
1514 1559
1515#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1560#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1516 if (rs[Rs_imLocale]) 1561 if (rs[Rs_imLocale])
… …
1589 XFree (preedit_attr); 1634 XFree (preedit_attr);
1590 XFree (status_attr); 1635 XFree (status_attr);
1591} 1636}
1592#endif /* USE_XIM */ 1637#endif /* USE_XIM */
1593 1638
1594/*----------------------------------------------------------------------*/
1595rxvt_t rxvt_current_term;
1596
1597/*----------------------- end-of-file (C source) -----------------------*/ 1639/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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