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.187 by root, Tue Jan 17 16:22:41 2006 UTC vs.
Revision 1.203 by root, Wed Jan 25 02:42:06 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
… …
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),
171#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
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),
180 child_ev (this, &rxvt_term::child_cb),
174 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
175 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
176 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
177 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
178 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
181 188
182 termlist.push_back (this); 189 termlist.push_back (this);
183 190
184#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
185 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
186
187 if (!keyboard)
188 rxvt_fatal ("out of memory, aborting.\n");
189#endif 193#endif
190} 194}
191 195
192// 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.
193// for use before an emergency exit 197// for use before an emergency exit
… …
199 delete pty; pty = 0; 203 delete pty; pty = 0;
200} 204}
201 205
202rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
203{ 207{
204 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
205
206 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
207 209
208 emergency_cleanup (); 210 emergency_cleanup ();
209 211
210#if ENABLE_STYLES 212#if ENABLE_STYLES
… …
285#ifdef KEYSYM_RESOURCE 287#ifdef KEYSYM_RESOURCE
286 delete keyboard; 288 delete keyboard;
287#endif 289#endif
288} 290}
289 291
292// child has exited, usually destroys
290void 293void
291rxvt_term::child_exit () 294rxvt_term::child_cb (child_watcher &w, int status)
292{ 295{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297
293 cmd_pid = 0; 298 cmd_pid = 0;
294 299
295 if (!OPTION (Opt_hold)) 300 if (!OPTION (Opt_hold))
296 destroy (); 301 destroy ();
297} 302}
… …
299void 304void
300rxvt_term::destroy () 305rxvt_term::destroy ()
301{ 306{
302 if (destroy_ev.active) 307 if (destroy_ev.active)
303 return; 308 return;
309
310 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
304 311
305#if ENABLE_OVERLAY 312#if ENABLE_OVERLAY
306 scr_overlay_off (); 313 scr_overlay_off ();
307#endif 314#endif
308 315
… …
442 _exit (EXIT_FAILURE); 449 _exit (EXIT_FAILURE);
443} 450}
444 451
445/*----------------------------------------------------------------------*/ 452/*----------------------------------------------------------------------*/
446bool 453bool
447rxvt_term::init (int argc, const char *const *argv) 454rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
448{ 455{
456 this->envv = envv;
457
449 SET_R (this); 458 SET_R (this);
450 set_locale (""); 459 set_locale ("");
451 set_environ (envv); // few things in X do not call setlocale :( 460 set_environ (envv); // few things in X do not call setlocale :(
452 461
453 if (!init_vars ()) 462 if (!init_vars ())
… …
464#ifdef HAVE_SCROLLBARS 473#ifdef HAVE_SCROLLBARS
465 if (OPTION (Opt_scrollBar)) 474 if (OPTION (Opt_scrollBar))
466 scrollBar.setIdle (); /* set existence for size calculations */ 475 scrollBar.setIdle (); /* set existence for size calculations */
467#endif 476#endif
468 477
469#if ENABLE_PERL 478 pty = ptytty::create ();
470 if (!rs[Rs_perl_ext_1])
471 rs[Rs_perl_ext_1] = "default";
472
473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
476 {
477 rxvt_perl.init (this);
478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
479 }
480#endif
481
482 pty = rxvt_new_ptytty ();
483 479
484 create_windows (argc, argv); 480 create_windows (argc, argv);
485 481
486 dDisp; 482 dDisp;
487 483
… …
504 check_our_parents (); 500 check_our_parents ();
505 rootwin_ev.start (display, display->root); 501 rootwin_ev.start (display, display->root);
506 } 502 }
507#endif 503#endif
508 504
505 set_colorfgbg ();
506
507 init_command (cmd_argv);
508
509 free (cmd_argv);
510
511 if (pty->pty >= 0)
512 pty_ev.start (pty->pty, EVENT_READ);
513
514 check_ev.start ();
515
516 HOOK_INVOKE ((this, HOOK_START, DT_END));
517
518#if ENABLE_XEMBED
519 if (rs[Rs_embed])
520 {
521 long info[2] = { 0, XEMBED_MAPPED };
522
523 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
524 32, PropModeReplace, (unsigned char *)&info, 2);
525 }
526#endif
527
509 XMapWindow (disp, vt); 528 XMapWindow (disp, vt);
510 XMapWindow (disp, parent[0]); 529 XMapWindow (disp, parent[0]);
511 530
512 set_colorfgbg ();
513
514 init_command (cmd_argv);
515
516 free (cmd_argv);
517
518 if (pty->pty >= 0)
519 pty_ev.start (pty->pty, EVENT_READ);
520
521 check_ev.start ();
522
523 HOOK_INVOKE ((this, HOOK_START, DT_END));
524
525 return true; 531 return true;
526} 532}
527 533
528static struct sig_handlers 534static struct sig_handlers
529{ 535{
530 sig_watcher sw_chld, sw_term, sw_int; 536 sig_watcher sw_term, sw_int;
531 537
532 void sig_chld (sig_watcher &w)
533 {
534 // we are being called for every SIGCHLD, find the corresponding term
535 int pid;
536
537 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
538 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
539 if (pid == (*t)->cmd_pid)
540 {
541 (*t)->child_exit ();
542 break;
543 }
544 }
545
546 /* 538 /*
547 * Catch a fatal signal and tidy up before quitting 539 * Catch a fatal signal and tidy up before quitting
548 */ 540 */
549 void 541 void
550 sig_term (sig_watcher &w) 542 sig_term (sig_watcher &w)
551 { 543 {
552#ifdef DEBUG_CMD
553 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
554#endif
555 rxvt_emergency_cleanup (); 544 rxvt_emergency_cleanup ();
556 signal (w.signum, SIG_DFL); 545 signal (w.signum, SIG_DFL);
557 kill (getpid (), w.signum); 546 kill (getpid (), w.signum);
558 } 547 }
559 548
560 sig_handlers () 549 sig_handlers ()
561 : sw_chld (this, &sig_handlers::sig_chld),
562 sw_term (this, &sig_handlers::sig_term), 550 : sw_term (this, &sig_handlers::sig_term),
563 sw_int (this, &sig_handlers::sig_term) 551 sw_int (this, &sig_handlers::sig_term)
564 { 552 {
565 } 553 }
566} sig_handlers; 554} sig_handlers;
567 555
568char **rxvt_environ; // startup environment 556char **rxvt_environ; // startup environment
569 557
570void 558void
571rxvt_init () 559rxvt_init ()
572{ 560{
573 uid_t uid = getuid (); 561 ptytty::init ();
574 gid_t gid = getgid ();
575
576 // before doing anything else, check for setuid/setgid operation,
577 // start the helper process and drop privileges
578 if (uid != geteuid ()
579 || 1 //D
580 || gid != getegid ())
581 {
582#if PTYTTY_HELPER
583 rxvt_ptytty_server ();
584#else
585 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
586#endif
587
588 // drop privileges
589#if HAVE_SETRESUID
590 setresgid (gid, gid, gid);
591 setresuid (uid, uid, uid);
592#elif HAVE_SETREUID
593 setregid (gid, gid);
594 setreuid (uid, uid);
595#elif HAVE_SETUID
596 setgid (gid);
597 setuid (uid);
598#endif
599
600 if (uid != geteuid ()
601 || gid != getegid ())
602 rxvt_fatal ("unable to drop privileges, aborting.\n");
603 }
604 562
605 rxvt_environ = environ; 563 rxvt_environ = environ;
606 564
607 signal (SIGHUP, SIG_IGN); 565 signal (SIGHUP, SIG_IGN);
608 signal (SIGPIPE, SIG_IGN); 566 signal (SIGPIPE, SIG_IGN);
609 567
610 sig_handlers.sw_chld.start (SIGCHLD);
611 sig_handlers.sw_term.start (SIGTERM); 568 sig_handlers.sw_term.start (SIGTERM);
612 sig_handlers.sw_int.start (SIGINT); 569 sig_handlers.sw_int.start (SIGINT);
613 570
614 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 571 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
615 /* signal (SIGURG, SIG_DFL); */ 572 /* signal (SIGURG, SIG_DFL); */
… …
644 rxvt_fatal ("memory allocation failure. aborting.\n"); 601 rxvt_fatal ("memory allocation failure. aborting.\n");
645 602
646 return p; 603 return p;
647} 604}
648 605
649void * 606void *
650rxvt_realloc (void *ptr, size_t size) 607rxvt_realloc (void *ptr, size_t size)
651{ 608{
652 void *p = realloc (ptr, size); 609 void *p = realloc (ptr, size);
653 610
654 if (!p) 611 if (!p)
… …
668 short recalc_x, recalc_y; 625 short recalc_x, recalc_y;
669 int x, y, sb_w, flags; 626 int x, y, sb_w, flags;
670 unsigned int w, h; 627 unsigned int w, h;
671 unsigned int max_width, max_height; 628 unsigned int max_width, max_height;
672 dDisp; 629 dDisp;
673
674 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
675 ncol, nrow, szHint.width, szHint.height));
676 630
677 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 631 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
678 szHint.win_gravity = NorthWestGravity; 632 szHint.win_gravity = NorthWestGravity;
679 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 633 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
680 634
… …
783 if (recalc_y) 737 if (recalc_y)
784 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 738 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
785 739
786 ncol = width / fwidth; 740 ncol = width / fwidth;
787 nrow = height / fheight; 741 nrow = height / fheight;
788 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
789 ncol, nrow, szHint.width,
790 szHint.height));
791 return;
792} 742}
793 743
794/*----------------------------------------------------------------------*/ 744/*----------------------------------------------------------------------*/
795/* 745/*
796 * Tell the teletype handler what size the window is. 746 * Tell the teletype handler what size the window is.
… …
1080 * -------------------------------------------------------------------- */ 1030 * -------------------------------------------------------------------- */
1081void 1031void
1082rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1032rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1083{ 1033{
1084 int fix_screen; 1034 int fix_screen;
1085 int old_width = szHint.width, old_height = szHint.height; 1035 int old_width = szHint.width;
1036 int old_height = szHint.height;
1086 dDisp; 1037 dDisp;
1087 1038
1088 window_calc (newwidth, newheight); 1039 window_calc (newwidth, newheight);
1089 XSetWMNormalHints (disp, parent[0], &szHint); 1040 XSetWMNormalHints (disp, parent[0], &szHint);
1090 1041
… …
1112 { 1063 {
1113 x -= x1; 1064 x -= x1;
1114 y -= y1; 1065 y -= y1;
1115 } 1066 }
1116 1067
1117 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1068 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1118 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1069 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1119 dx = old_width - szHint.width; 1070 dx = old_width - szHint.width;
1120 dy = old_height - szHint.height; 1071 dy = old_height - szHint.height;
1121 1072
1122 /* Check position of the center of the window */ 1073 /* Check position of the center of the window */
1123 if (x < x1) /* left half */ 1074 if (x < x1) /* left half */
1124 dx = 0; 1075 dx = 0;
… …
1157 resize_pixmap (); 1108 resize_pixmap ();
1158#endif 1109#endif
1159 } 1110 }
1160 1111
1161 if (fix_screen || old_height == 0) 1112 if (fix_screen || old_height == 0)
1162 {
1163 int curr_screen = -1;
1164 int old_ncol = prev_ncol;
1165
1166 /* scr_reset only works on the primary screen */
1167 if (old_height) /* this is not the first time through */
1168 {
1169 unsigned int ocol = ncol;
1170 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1171 curr_screen = scr_change_screen (PRIMARY);
1172 ncol = ocol;
1173 }
1174
1175 scr_reset (); 1113 scr_reset ();
1176
1177 if (curr_screen >= 0) /* this is not the first time through */
1178 {
1179 scr_change_screen (curr_screen);
1180 selection_check (old_ncol != ncol ? 4 : 0);
1181 }
1182 }
1183
1184 old_width = szHint.width;
1185 old_height = szHint.height;
1186 1114
1187#ifdef XPM_BACKGROUND 1115#ifdef XPM_BACKGROUND
1188 if (pixmap) 1116 if (pixmap)
1189 scr_touch (false); 1117 scr_touch (false);
1190#endif 1118#endif
… …
1293 XPoint nspot; 1221 XPoint nspot;
1294 XVaNestedList preedit_attr; 1222 XVaNestedList preedit_attr;
1295 1223
1296 if (!Input_Context 1224 if (!Input_Context
1297 || !focus 1225 || !focus
1298 || !(input_style & XIMPreeditPosition)) 1226 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1299 return; 1227 return;
1300 1228
1301 im_set_position (nspot); 1229 im_set_position (nspot);
1302 1230
1303 if (nspot.x == spot.x && nspot.y == spot.y) 1231 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1322 input_method = 0; 1250 input_method = 0;
1323 } 1251 }
1324 1252
1325 Input_Context = 0; 1253 Input_Context = 0;
1326} 1254}
1255
1256#ifdef ENABLE_XIM_ONTHESPOT
1257
1258static void
1259xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1260{
1261 ((rxvt_term *)client_data)->make_current ();
1262 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1263}
1264
1265static void
1266xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1267{
1268 ((rxvt_term *)client_data)->make_current ();
1269 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1270}
1271
1272static void
1273xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1274{
1275 rxvt_term *term = (rxvt_term *)client_data;
1276 XIMText *text = call_data->text;
1277
1278 term->make_current ();
1279
1280 if (text)
1281 {
1282 void *str;
1283
1284 if (!text->encoding_is_wchar && text->string.multi_byte)
1285 {
1286 // of course, X makes it ugly again
1287 if (term->rs[Rs_imLocale])
1288 SET_LOCALE (term->rs[Rs_imLocale]);
1289
1290 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1291 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1292
1293 if (term->rs[Rs_imLocale])
1294 SET_LOCALE (term->locale);
1295 }
1296 else
1297 str = (void *)text->string.wide_char;
1298
1299 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1300 DT_INT, call_data->caret,
1301 DT_INT, call_data->chg_first,
1302 DT_INT, call_data->chg_length,
1303 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1304 DT_WCS_LEN, str, str ? (int)text->length : 0,
1305 DT_END));
1306 }
1307 else
1308 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1309 DT_INT, call_data->caret,
1310 DT_INT, call_data->chg_first,
1311 DT_INT, call_data->chg_length,
1312 DT_END));
1313}
1314
1315#if 0
1316static void
1317xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1318{
1319 ((rxvt_term *)client_data)->make_current ();
1320 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1321 DT_INT, call_data->position,
1322 DT_INT, call_data->direction,
1323 DT_INT, call_data->style,
1324 DT_END));
1325}
1326#endif
1327
1328#endif
1327 1329
1328/* 1330/*
1329 * Try to open a XIM with the current modifiers, then see if we can 1331 * Try to open a XIM with the current modifiers, then see if we can
1330 * open a suitable preedit type 1332 * open a suitable preedit type
1331 */ 1333 */
… …
1338 XRectangle rect, status_rect, needed_rect; 1340 XRectangle rect, status_rect, needed_rect;
1339 unsigned long fg, bg; 1341 unsigned long fg, bg;
1340 const char *p; 1342 const char *p;
1341 char **s; 1343 char **s;
1342 XIMStyles *xim_styles; 1344 XIMStyles *xim_styles;
1345#ifdef ENABLE_XIM_ONTHESPOT
1346 XIMCallback xcb[4];
1347#endif
1343 1348
1344 set_environ (envv); 1349 set_environ (envv);
1345 1350
1346 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1351 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1347 return false; 1352 return false;
1348 1353
1349 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1350 input_method = display->get_xim (locale, modifiers); 1354 input_method = display->get_xim (locale, modifiers);
1351 if (input_method == NULL) 1355 if (input_method == NULL)
1352 return false; 1356 return false;
1353 1357
1354 xim = input_method->xim; 1358 xim = input_method->xim;
… …
1374 s = rxvt_splitcommastring (p); 1378 s = rxvt_splitcommastring (p);
1375 1379
1376 for (i = found = 0; !found && s[i]; i++) 1380 for (i = found = 0; !found && s[i]; i++)
1377 { 1381 {
1378 if (!strcmp (s[i], "OverTheSpot")) 1382 if (!strcmp (s[i], "OverTheSpot"))
1379 input_style = (XIMPreeditPosition | XIMStatusNothing); 1383 input_style = XIMPreeditPosition | XIMStatusNothing;
1380 else if (!strcmp (s[i], "OffTheSpot")) 1384 else if (!strcmp (s[i], "OffTheSpot"))
1381 input_style = (XIMPreeditArea | XIMStatusArea); 1385 input_style = XIMPreeditArea | XIMStatusArea;
1382 else if (!strcmp (s[i], "Root")) 1386 else if (!strcmp (s[i], "Root"))
1383 input_style = (XIMPreeditNothing | XIMStatusNothing); 1387 input_style = XIMPreeditNothing | XIMStatusNothing;
1384 else if (!strcmp (s[i], "None")) 1388 else if (!strcmp (s[i], "None"))
1385 input_style = (XIMPreeditNone | XIMStatusNone); 1389 input_style = XIMPreeditNone | XIMStatusNone;
1390#ifdef ENABLE_XIM_ONTHESPOT
1391 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1392 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1393#endif
1394 else
1395 input_style = XIMPreeditNothing | XIMStatusNothing;
1386 1396
1387 for (j = 0; j < xim_styles->count_styles; j++) 1397 for (j = 0; j < xim_styles->count_styles; j++)
1388 if (input_style == xim_styles->supported_styles[j]) 1398 if (input_style == xim_styles->supported_styles[j])
1389 { 1399 {
1390 rxvt_freecommastring (s); 1400 rxvt_freecommastring (s);
… …
1479 XNBackground, bg, 1489 XNBackground, bg,
1480 XNArea, &status_rect, 1490 XNArea, &status_rect,
1481 XNFontSet, fs, 1491 XNFontSet, fs,
1482 NULL); 1492 NULL);
1483 } 1493 }
1494 else if (input_style & XIMPreeditCallbacks)
1495 {
1496 im_set_position (spot);
1497
1498 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1499 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1500 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1501#if 0
1502 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1503#endif
1504
1505 preedit_attr = XVaCreateNestedList (0,
1506 XNSpotLocation, &spot,
1507 XNPreeditStartCallback, &xcb[0],
1508 XNPreeditDoneCallback , &xcb[1],
1509 XNPreeditDrawCallback , &xcb[2],
1510#if 0
1511 XNPreeditCaretCallback, &xcb[3],
1512#endif
1513 NULL);
1514 }
1484 1515
1485 Input_Context = XCreateIC (xim, 1516 Input_Context = XCreateIC (xim,
1486 XNInputStyle, input_style, 1517 XNInputStyle, input_style,
1487 XNClientWindow, vt, 1518 XNClientWindow, vt,
1488 XNFocusWindow, parent[0], 1519 XNFocusWindow, parent[0],
… …
1500 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1531 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1501 im_destroy (); 1532 im_destroy ();
1502 return false; 1533 return false;
1503 } 1534 }
1504 1535
1536#if 0
1537 // unfortunately, only the focus window is used by XIM, hard to fix
1538 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1539 vt_select_input ();
1540#endif
1541
1505 if (input_style & XIMPreeditArea) 1542 if (input_style & XIMPreeditArea)
1506 IMSetStatusPosition (); 1543 IMSetStatusPosition ();
1507 1544
1508 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1509 return true; 1545 return true;
1510} 1546}
1511 1547
1512void 1548void
1513rxvt_term::im_cb () 1549rxvt_term::im_cb ()
… …
1519 1555
1520 make_current (); 1556 make_current ();
1521 1557
1522 im_destroy (); 1558 im_destroy ();
1523 1559
1524 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1525 if (Input_Context) 1560 if (Input_Context)
1526 return; 1561 return;
1527 1562
1528#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1563#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1529 if (rs[Rs_imLocale]) 1564 if (rs[Rs_imLocale])
… …
1602 XFree (preedit_attr); 1637 XFree (preedit_attr);
1603 XFree (status_attr); 1638 XFree (status_attr);
1604} 1639}
1605#endif /* USE_XIM */ 1640#endif /* USE_XIM */
1606 1641
1607/*----------------------------------------------------------------------*/
1608rxvt_t rxvt_current_term;
1609
1610/*----------------------- end-of-file (C source) -----------------------*/ 1642/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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