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.186 by root, Tue Jan 17 15:41:33 2006 UTC vs.
Revision 1.204 by root, Wed Jan 25 02:53:13 2006 UTC

… …
46 46
47#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) 51vector<rxvt_term *> rxvt_term::termlist;
52static uid_t saved_euid; 52
53static gid_t saved_egid; 53// used to tell global functions which terminal instance is "active"
54#endif 54rxvt_t rxvt_current_term;
55
56static char curlocale[128], savelocale[128];
55 57
56bool 58bool
57rxvt_tainted ()
58{
59#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60 return getuid () != saved_euid || getgid () != saved_egid;
61#else
62 return false;
63#endif
64}
65
66vector<rxvt_term *> rxvt_term::termlist;
67
68static char curlocale[128], savelocale[128];
69
70bool
71rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
72{ 60{
73 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
74 return false; 62 return false;
75 63
76 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
77 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
78 return true; 66 return true;
79} 67}
80 68
81void 69void
82rxvt_push_locale (const char *locale) 70rxvt_push_locale (const char *locale) NOTHROW
83{ 71{
84 strcpy (savelocale, curlocale); 72 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale); 73 rxvt_set_locale (locale);
86} 74}
87 75
88void 76void
89rxvt_pop_locale () 77rxvt_pop_locale () NOTHROW
90{ 78{
91 rxvt_set_locale (savelocale); 79 rxvt_set_locale (savelocale);
92} 80}
93 81
94#if ENABLE_COMBINING 82#if ENABLE_COMBINING
… …
182 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
183#endif 171#endif
184#ifdef USE_XIM 172#ifdef USE_XIM
185 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
186#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
187 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
188 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
189 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
190 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
191 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
192 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
193 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
196 188
197 termlist.push_back (this); 189 termlist.push_back (this);
198 190
199#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
200 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
201
202 if (!keyboard)
203 rxvt_fatal ("out of memory, aborting.\n");
204#endif 193#endif
205} 194}
206 195
207// 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.
208// for use before an emergency exit 197// for use before an emergency exit
… …
214 delete pty; pty = 0; 203 delete pty; pty = 0;
215} 204}
216 205
217rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
218{ 207{
219 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
220
221 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
222 209
223 emergency_cleanup (); 210 emergency_cleanup ();
224 211
225#if ENABLE_STYLES 212#if ENABLE_STYLES
… …
284 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
285 free (allocated [i]); 272 free (allocated [i]);
286 273
287 free (selection.text); 274 free (selection.text);
288 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
289 free (env_windowid);
290 free (env_display); 276 free (env_display);
291 free (env_term); 277 free (env_term);
292 free (env_colorfgbg);
293 free (locale); 278 free (locale);
294 free (v_buffer); 279 free (v_buffer);
295 free (incr_buf); 280 free (incr_buf);
296 281
297 delete envv; 282 delete envv;
… …
300#ifdef KEYSYM_RESOURCE 285#ifdef KEYSYM_RESOURCE
301 delete keyboard; 286 delete keyboard;
302#endif 287#endif
303} 288}
304 289
290// child has exited, usually destroys
305void 291void
306rxvt_term::child_exit () 292rxvt_term::child_cb (child_watcher &w, int status)
307{ 293{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295
308 cmd_pid = 0; 296 cmd_pid = 0;
309 297
310 if (!OPTION (Opt_hold)) 298 if (!OPTION (Opt_hold))
311 destroy (); 299 destroy ();
312} 300}
… …
314void 302void
315rxvt_term::destroy () 303rxvt_term::destroy ()
316{ 304{
317 if (destroy_ev.active) 305 if (destroy_ev.active)
318 return; 306 return;
307
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
319 309
320#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
321 scr_overlay_off (); 311 scr_overlay_off ();
322#endif 312#endif
323 313
… …
457 _exit (EXIT_FAILURE); 447 _exit (EXIT_FAILURE);
458} 448}
459 449
460/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
461bool 451bool
462rxvt_term::init (int argc, const char *const *argv) 452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
463{ 453{
454 this->envv = envv;
455
464 SET_R (this); 456 SET_R (this);
465 set_locale (""); 457 set_locale ("");
466 set_environ (envv); // few things in X do not call setlocale :( 458 set_environ (envv); // few things in X do not call setlocale :(
467 459
468 if (!init_vars ()) 460 if (!init_vars ())
… …
479#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
480 if (OPTION (Opt_scrollBar)) 472 if (OPTION (Opt_scrollBar))
481 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
482#endif 474#endif
483 475
484#if ENABLE_PERL 476 pty = ptytty::create ();
485 if (!rs[Rs_perl_ext_1])
486 rs[Rs_perl_ext_1] = "default";
487
488 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
489 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
490 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
491 {
492#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
493 // ignore some perl-related arguments if some bozo installed us set[ug]id
494 if (rxvt_tainted ())
495 {
496 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
497 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
498 {
499 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
500 rs[Rs_perl_lib] = 0;
501 rs[Rs_perl_eval] = 0;
502 }
503 }
504#endif
505 rxvt_perl.init (this);
506 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
507 }
508#endif
509
510 pty = rxvt_new_ptytty ();
511 477
512 create_windows (argc, argv); 478 create_windows (argc, argv);
513 479
514 dDisp; 480 dDisp;
515 481
… …
532 check_our_parents (); 498 check_our_parents ();
533 rootwin_ev.start (display, display->root); 499 rootwin_ev.start (display, display->root);
534 } 500 }
535#endif 501#endif
536 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
537 XMapWindow (disp, vt); 526 XMapWindow (disp, vt);
538 XMapWindow (disp, parent[0]); 527 XMapWindow (disp, parent[0]);
539 528
540 set_colorfgbg ();
541
542 init_command (cmd_argv);
543
544 free (cmd_argv);
545
546 if (pty->pty >= 0)
547 pty_ev.start (pty->pty, EVENT_READ);
548
549 check_ev.start ();
550
551 HOOK_INVOKE ((this, HOOK_START, DT_END));
552
553 return true; 529 return true;
554} 530}
555 531
556static struct sig_handlers 532static struct sig_handlers
557{ 533{
558 sig_watcher sw_chld, sw_term, sw_int; 534 sig_watcher sw_term, sw_int;
559 535
560 void sig_chld (sig_watcher &w)
561 {
562 // we are being called for every SIGCHLD, find the corresponding term
563 int pid;
564
565 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
566 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
567 if (pid == (*t)->cmd_pid)
568 {
569 (*t)->child_exit ();
570 break;
571 }
572 }
573
574 /* 536 /*
575 * Catch a fatal signal and tidy up before quitting 537 * Catch a fatal signal and tidy up before quitting
576 */ 538 */
577 void 539 void
578 sig_term (sig_watcher &w) 540 sig_term (sig_watcher &w)
579 { 541 {
580#ifdef DEBUG_CMD
581 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
582#endif
583 rxvt_emergency_cleanup (); 542 rxvt_emergency_cleanup ();
584 signal (w.signum, SIG_DFL); 543 signal (w.signum, SIG_DFL);
585 kill (getpid (), w.signum); 544 kill (getpid (), w.signum);
586 } 545 }
587 546
588 sig_handlers () 547 sig_handlers ()
589 : sw_chld (this, &sig_handlers::sig_chld),
590 sw_term (this, &sig_handlers::sig_term), 548 : sw_term (this, &sig_handlers::sig_term),
591 sw_int (this, &sig_handlers::sig_term) 549 sw_int (this, &sig_handlers::sig_term)
592 { 550 {
593 } 551 }
594} sig_handlers; 552} sig_handlers;
595 553
596char **rxvt_environ; // startup environment 554char **rxvt_environ; // startup environment
597 555
598void 556void
599rxvt_init () 557rxvt_init ()
600{ 558{
601 uid_t uid = getuid (); 559 ptytty::init ();
602 gid_t gid = getgid ();
603
604 // before doing anything else, check for setuid/setgid operation,
605 // start the helper process and drop privileges
606 if (uid != geteuid ()
607 || 1 //D
608 || gid != getegid ())
609 {
610#if PTYTTY_HELPER
611 rxvt_ptytty_server ();
612#else
613 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
614#endif
615
616 // drop privileges
617#if HAVE_SETRESUID
618 setresgid (gid, gid, gid);
619 setresuid (uid, uid, uid);
620#elif HAVE_SETREUID
621 setregid (gid, gid);
622 setreuid (uid, uid);
623#elif HAVE_SETUID
624 setgid (gid);
625 setuid (uid);
626#endif
627
628 if (uid != geteuid ()
629 || gid != getegid ())
630 rxvt_fatal ("unable to drop privileges, aborting.\n");
631 }
632 560
633 rxvt_environ = environ; 561 rxvt_environ = environ;
634
635 /*
636 * Save and then give up any super-user privileges
637 * If we need privileges in any area then we must specifically request it.
638 * We should only need to be root in these cases:
639 * 1. write utmp entries on some systems
640 * 2. chown tty on some systems
641 */
642 rxvt_privileges (SAVE);
643 rxvt_privileges (IGNORE);
644 562
645 signal (SIGHUP, SIG_IGN); 563 signal (SIGHUP, SIG_IGN);
646 signal (SIGPIPE, SIG_IGN); 564 signal (SIGPIPE, SIG_IGN);
647 565
648 sig_handlers.sw_chld.start (SIGCHLD);
649 sig_handlers.sw_term.start (SIGTERM); 566 sig_handlers.sw_term.start (SIGTERM);
650 sig_handlers.sw_int.start (SIGINT); 567 sig_handlers.sw_int.start (SIGINT);
651 568
652 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 569 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
653 /* signal (SIGURG, SIG_DFL); */ 570 /* signal (SIGURG, SIG_DFL); */
… …
682 rxvt_fatal ("memory allocation failure. aborting.\n"); 599 rxvt_fatal ("memory allocation failure. aborting.\n");
683 600
684 return p; 601 return p;
685} 602}
686 603
687void * 604void *
688rxvt_realloc (void *ptr, size_t size) 605rxvt_realloc (void *ptr, size_t size)
689{ 606{
690 void *p = realloc (ptr, size); 607 void *p = realloc (ptr, size);
691 608
692 if (!p) 609 if (!p)
693 rxvt_fatal ("memory allocation failure. aborting.\n"); 610 rxvt_fatal ("memory allocation failure. aborting.\n");
694 611
695 return p; 612 return p;
696}
697
698/* ------------------------------------------------------------------------- *
699 * PRIVILEGED OPERATIONS *
700 * ------------------------------------------------------------------------- */
701/* take care of suid/sgid super-user (root) privileges */
702void
703rxvt_privileges (rxvt_privaction action)
704{
705#if ! defined(__CYGWIN32__)
706# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
707 /* setreuid () is the poor man's setuid (), seteuid () */
708# define seteuid(a) setreuid(-1, (a))
709# define setegid(a) setregid(-1, (a))
710# define HAVE_SETEUID
711# endif
712# ifdef HAVE_SETEUID
713 switch (action)
714 {
715 case IGNORE:
716 /*
717 * change effective uid/gid - not real uid/gid - so we can switch
718 * back to root later, as required
719 */
720 setegid (getgid ());
721 seteuid (getuid ());
722 break;
723 case SAVE:
724 saved_egid = getegid ();
725 saved_euid = geteuid ();
726 break;
727 case RESTORE:
728 setegid (saved_egid);
729 seteuid (saved_euid);
730 break;
731 }
732# else
733 switch (action)
734 {
735 case IGNORE:
736 setgid (getgid ());
737 setuid (getuid ());
738 /* FALLTHROUGH */
739 case SAVE:
740 /* FALLTHROUGH */
741 case RESTORE:
742 break;
743 }
744# endif
745#endif
746} 613}
747 614
748/*----------------------------------------------------------------------*/ 615/*----------------------------------------------------------------------*/
749/* 616/*
750 * window size/position calculcations for XSizeHint and other storage. 617 * window size/position calculcations for XSizeHint and other storage.
… …
756 short recalc_x, recalc_y; 623 short recalc_x, recalc_y;
757 int x, y, sb_w, flags; 624 int x, y, sb_w, flags;
758 unsigned int w, h; 625 unsigned int w, h;
759 unsigned int max_width, max_height; 626 unsigned int max_width, max_height;
760 dDisp; 627 dDisp;
761
762 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
763 ncol, nrow, szHint.width, szHint.height));
764 628
765 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
766 szHint.win_gravity = NorthWestGravity; 630 szHint.win_gravity = NorthWestGravity;
767 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
768 632
… …
871 if (recalc_y) 735 if (recalc_y)
872 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
873 737
874 ncol = width / fwidth; 738 ncol = width / fwidth;
875 nrow = height / fheight; 739 nrow = height / fheight;
876 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
877 ncol, nrow, szHint.width,
878 szHint.height));
879 return;
880} 740}
881 741
882/*----------------------------------------------------------------------*/ 742/*----------------------------------------------------------------------*/
883/* 743/*
884 * Tell the teletype handler what size the window is. 744 * Tell the teletype handler what size the window is.
… …
1124{ 984{
1125 unsigned int i; 985 unsigned int i;
1126 const char *xpmb = "\0"; 986 const char *xpmb = "\0";
1127 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 987 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1128 988
1129 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1130 strcpy (fstr, "default"); 989 strcpy (fstr, "default");
1131 strcpy (bstr, "default"); 990 strcpy (bstr, "default");
1132 for (i = Color_Black; i <= Color_White; i++) 991 for (i = Color_Black; i <= Color_White; i++)
1133 if (pix_colors[Color_fg] == pix_colors[i]) 992 if (pix_colors[Color_fg] == pix_colors[i])
1134 { 993 {
… …
1168 * -------------------------------------------------------------------- */ 1027 * -------------------------------------------------------------------- */
1169void 1028void
1170rxvt_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)
1171{ 1030{
1172 int fix_screen; 1031 int fix_screen;
1173 int old_width = szHint.width, old_height = szHint.height; 1032 int old_width = szHint.width;
1033 int old_height = szHint.height;
1174 dDisp; 1034 dDisp;
1175 1035
1176 window_calc (newwidth, newheight); 1036 window_calc (newwidth, newheight);
1177 XSetWMNormalHints (disp, parent[0], &szHint); 1037 XSetWMNormalHints (disp, parent[0], &szHint);
1178 1038
… …
1200 { 1060 {
1201 x -= x1; 1061 x -= x1;
1202 y -= y1; 1062 y -= y1;
1203 } 1063 }
1204 1064
1205 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1206 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1207 dx = old_width - szHint.width; 1067 dx = old_width - szHint.width;
1208 dy = old_height - szHint.height; 1068 dy = old_height - szHint.height;
1209 1069
1210 /* Check position of the center of the window */ 1070 /* Check position of the center of the window */
1211 if (x < x1) /* left half */ 1071 if (x < x1) /* left half */
1212 dx = 0; 1072 dx = 0;
… …
1245 resize_pixmap (); 1105 resize_pixmap ();
1246#endif 1106#endif
1247 } 1107 }
1248 1108
1249 if (fix_screen || old_height == 0) 1109 if (fix_screen || old_height == 0)
1250 {
1251 int curr_screen = -1;
1252 int old_ncol = prev_ncol;
1253
1254 /* scr_reset only works on the primary screen */
1255 if (old_height) /* this is not the first time through */
1256 {
1257 unsigned int ocol = ncol;
1258 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1259 curr_screen = scr_change_screen (PRIMARY);
1260 ncol = ocol;
1261 }
1262
1263 scr_reset (); 1110 scr_reset ();
1264
1265 if (curr_screen >= 0) /* this is not the first time through */
1266 {
1267 scr_change_screen (curr_screen);
1268 selection_check (old_ncol != ncol ? 4 : 0);
1269 }
1270 }
1271
1272 old_width = szHint.width;
1273 old_height = szHint.height;
1274 1111
1275#ifdef XPM_BACKGROUND 1112#ifdef XPM_BACKGROUND
1276 if (pixmap) 1113 if (pixmap)
1277 scr_touch (false); 1114 scr_touch (false);
1278#endif 1115#endif
… …
1381 XPoint nspot; 1218 XPoint nspot;
1382 XVaNestedList preedit_attr; 1219 XVaNestedList preedit_attr;
1383 1220
1384 if (!Input_Context 1221 if (!Input_Context
1385 || !focus 1222 || !focus
1386 || !(input_style & XIMPreeditPosition)) 1223 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1387 return; 1224 return;
1388 1225
1389 im_set_position (nspot); 1226 im_set_position (nspot);
1390 1227
1391 if (nspot.x == spot.x && nspot.y == spot.y) 1228 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1410 input_method = 0; 1247 input_method = 0;
1411 } 1248 }
1412 1249
1413 Input_Context = 0; 1250 Input_Context = 0;
1414} 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
1415 1326
1416/* 1327/*
1417 * 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
1418 * open a suitable preedit type 1329 * open a suitable preedit type
1419 */ 1330 */
… …
1426 XRectangle rect, status_rect, needed_rect; 1337 XRectangle rect, status_rect, needed_rect;
1427 unsigned long fg, bg; 1338 unsigned long fg, bg;
1428 const char *p; 1339 const char *p;
1429 char **s; 1340 char **s;
1430 XIMStyles *xim_styles; 1341 XIMStyles *xim_styles;
1342#ifdef ENABLE_XIM_ONTHESPOT
1343 XIMCallback xcb[4];
1344#endif
1431 1345
1432 set_environ (envv); 1346 set_environ (envv);
1433 1347
1434 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1348 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1435 return false; 1349 return false;
1436 1350
1437 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1438 input_method = display->get_xim (locale, modifiers); 1351 input_method = display->get_xim (locale, modifiers);
1439 if (input_method == NULL) 1352 if (input_method == NULL)
1440 return false; 1353 return false;
1441 1354
1442 xim = input_method->xim; 1355 xim = input_method->xim;
… …
1462 s = rxvt_splitcommastring (p); 1375 s = rxvt_splitcommastring (p);
1463 1376
1464 for (i = found = 0; !found && s[i]; i++) 1377 for (i = found = 0; !found && s[i]; i++)
1465 { 1378 {
1466 if (!strcmp (s[i], "OverTheSpot")) 1379 if (!strcmp (s[i], "OverTheSpot"))
1467 input_style = (XIMPreeditPosition | XIMStatusNothing); 1380 input_style = XIMPreeditPosition | XIMStatusNothing;
1468 else if (!strcmp (s[i], "OffTheSpot")) 1381 else if (!strcmp (s[i], "OffTheSpot"))
1469 input_style = (XIMPreeditArea | XIMStatusArea); 1382 input_style = XIMPreeditArea | XIMStatusArea;
1470 else if (!strcmp (s[i], "Root")) 1383 else if (!strcmp (s[i], "Root"))
1471 input_style = (XIMPreeditNothing | XIMStatusNothing); 1384 input_style = XIMPreeditNothing | XIMStatusNothing;
1472 else if (!strcmp (s[i], "None")) 1385 else if (!strcmp (s[i], "None"))
1473 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;
1474 1393
1475 for (j = 0; j < xim_styles->count_styles; j++) 1394 for (j = 0; j < xim_styles->count_styles; j++)
1476 if (input_style == xim_styles->supported_styles[j]) 1395 if (input_style == xim_styles->supported_styles[j])
1477 { 1396 {
1478 rxvt_freecommastring (s); 1397 rxvt_freecommastring (s);
… …
1567 XNBackground, bg, 1486 XNBackground, bg,
1568 XNArea, &status_rect, 1487 XNArea, &status_rect,
1569 XNFontSet, fs, 1488 XNFontSet, fs,
1570 NULL); 1489 NULL);
1571 } 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 }
1572 1512
1573 Input_Context = XCreateIC (xim, 1513 Input_Context = XCreateIC (xim,
1574 XNInputStyle, input_style, 1514 XNInputStyle, input_style,
1575 XNClientWindow, vt, 1515 XNClientWindow, vt,
1576 XNFocusWindow, parent[0], 1516 XNFocusWindow, parent[0],
… …
1588 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1528 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1589 im_destroy (); 1529 im_destroy ();
1590 return false; 1530 return false;
1591 } 1531 }
1592 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
1593 if (input_style & XIMPreeditArea) 1539 if (input_style & XIMPreeditArea)
1594 IMSetStatusPosition (); 1540 IMSetStatusPosition ();
1595 1541
1596 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1597 return true; 1542 return true;
1598} 1543}
1599 1544
1600void 1545void
1601rxvt_term::im_cb () 1546rxvt_term::im_cb ()
… …
1607 1552
1608 make_current (); 1553 make_current ();
1609 1554
1610 im_destroy (); 1555 im_destroy ();
1611 1556
1612 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1613 if (Input_Context) 1557 if (Input_Context)
1614 return; 1558 return;
1615 1559
1616#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1560#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1617 if (rs[Rs_imLocale]) 1561 if (rs[Rs_imLocale])
… …
1690 XFree (preedit_attr); 1634 XFree (preedit_attr);
1691 XFree (status_attr); 1635 XFree (status_attr);
1692} 1636}
1693#endif /* USE_XIM */ 1637#endif /* USE_XIM */
1694 1638
1695/*----------------------------------------------------------------------*/
1696rxvt_t rxvt_current_term;
1697
1698/*----------------------- end-of-file (C source) -----------------------*/ 1639/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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