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.191 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.206 by root, Wed Jan 25 21:03:04 2006 UTC

… …
170 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif 171#endif
172#ifdef USE_XIM 172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
174#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
175 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
176 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
177 child_ev (this, &rxvt_term::child_cb), 180 child_ev (this, &rxvt_term::child_cb),
178 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
179 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
… …
213#endif 216#endif
214 delete fontset[0]; 217 delete fontset[0];
215 218
216 if (display) 219 if (display)
217 { 220 {
218 dDisp;
219
220 selection_clear (); 221 selection_clear ();
221 222
222#ifdef USE_XIM 223#ifdef USE_XIM
223 im_destroy (); 224 im_destroy ();
224#endif 225#endif
225#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
227 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
228#endif 229#endif
229#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
230 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
231#endif 232#endif
232#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
233 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (xdisp, blackGC);
234 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (xdisp, whiteGC);
235 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (xdisp, grayGC);
236 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (xdisp, darkGC);
237 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (xdisp, stippleGC);
238 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (xdisp, dimple);
239 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (xdisp, upArrow);
240 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (xdisp, downArrow);
241 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
242 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
243#endif 244#endif
244#ifdef RXVT_SCROLLBAR 245#ifdef RXVT_SCROLLBAR
245 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
246 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
247 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
248#endif 249#endif
249 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (xdisp, gc);
250 251
251 delete drawable; 252 delete drawable;
252 // destroy all windows 253 // destroy all windows
253 if (parent[0]) 254 if (parent[0])
254 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (xdisp, parent[0]);
256
257 clear ();
255 } 258 }
256 259
257 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
258 delete pix_colors_focused; 261 delete pix_colors_focused;
259#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
… …
268 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
269 free (allocated [i]); 272 free (allocated [i]);
270 273
271 free (selection.text); 274 free (selection.text);
272 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
273 free (env_windowid);
274 free (env_display); 276 free (env_display);
275 free (env_term); 277 free (env_term);
276 free (env_colorfgbg);
277 free (locale); 278 free (locale);
278 free (v_buffer); 279 free (v_buffer);
279 free (incr_buf); 280 free (incr_buf);
280 281
281 delete envv; 282 delete envv;
… …
302rxvt_term::destroy () 303rxvt_term::destroy ()
303{ 304{
304 if (destroy_ev.active) 305 if (destroy_ev.active)
305 return; 306 return;
306 307
307 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
308 return;
309 309
310#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
311 scr_overlay_off (); 311 scr_overlay_off ();
312#endif 312#endif
313 313
… …
447 _exit (EXIT_FAILURE); 447 _exit (EXIT_FAILURE);
448} 448}
449 449
450/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
451bool 451bool
452rxvt_term::init (int argc, const char *const *argv) 452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
453{ 453{
454 this->envv = envv;
455
454 SET_R (this); 456 SET_R (this);
455 set_locale (""); 457 set_locale ("");
456 set_environ (envv); // few things in X do not call setlocale :( 458 set_environ (envv); // few things in X do not call setlocale :(
457 459
458 if (!init_vars ()) 460 if (!init_vars ())
… …
464 466
465#ifdef KEYSYM_RESOURCE 467#ifdef KEYSYM_RESOURCE
466 keyboard->register_done (); 468 keyboard->register_done ();
467#endif 469#endif
468 470
469#if ENABLE_PERL
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#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
483 if (OPTION (Opt_scrollBar)) 472 if (OPTION (Opt_scrollBar))
484 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
485#endif 474#endif
486 475
487 pty = rxvt_new_ptytty (); 476 pty = ptytty::create ();
488 477
489 create_windows (argc, argv); 478 create_windows (argc, argv);
490 479
491 dDisp;
492
493 init_xlocale (); 480 init_xlocale ();
494 481
495 scr_reset (); // initialize screen 482 scr_reset (); // initialize screen
496 483
497#if 0 484#if 0
498 XSynchronize (disp, True); 485 XSynchronize (xdisp, True);
499#endif 486#endif
500 487
501#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
502 if (OPTION (Opt_scrollBar)) 489 if (OPTION (Opt_scrollBar))
503 resize_scrollbar (); /* create and map scrollbar */ 490 resize_scrollbar (); /* create and map scrollbar */
504#endif 491#endif
505#ifdef TRANSPARENT 492#ifdef TRANSPARENT
506 if (OPTION (Opt_transparent)) 493 if (OPTION (Opt_transparent))
507 { 494 {
508 XSelectInput (disp, display->root, PropertyChangeMask); 495 XSelectInput (xdisp, display->root, PropertyChangeMask);
509 check_our_parents (); 496 check_our_parents ();
510 rootwin_ev.start (display, display->root); 497 rootwin_ev.start (display, display->root);
511 } 498 }
512#endif 499#endif
513 500
… …
522 509
523 check_ev.start (); 510 check_ev.start ();
524 511
525 HOOK_INVOKE ((this, HOOK_START, DT_END)); 512 HOOK_INVOKE ((this, HOOK_START, DT_END));
526 513
514#if ENABLE_XEMBED
515 if (rs[Rs_embed])
516 {
517 long info[2] = { 0, XEMBED_MAPPED };
518
519 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2);
521 }
522#endif
523
527 XMapWindow (disp, vt); 524 XMapWindow (xdisp, vt);
528 XMapWindow (disp, parent[0]); 525 XMapWindow (xdisp, parent[0]);
529 526
530 return true; 527 return true;
531} 528}
532 529
533static struct sig_handlers 530static struct sig_handlers
… …
538 * Catch a fatal signal and tidy up before quitting 535 * Catch a fatal signal and tidy up before quitting
539 */ 536 */
540 void 537 void
541 sig_term (sig_watcher &w) 538 sig_term (sig_watcher &w)
542 { 539 {
543#ifdef DEBUG_CMD
544 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
545#endif
546 rxvt_emergency_cleanup (); 540 rxvt_emergency_cleanup ();
547 signal (w.signum, SIG_DFL); 541 signal (w.signum, SIG_DFL);
548 kill (getpid (), w.signum); 542 kill (getpid (), w.signum);
549 } 543 }
550 544
… …
558char **rxvt_environ; // startup environment 552char **rxvt_environ; // startup environment
559 553
560void 554void
561rxvt_init () 555rxvt_init ()
562{ 556{
563 uid_t uid = getuid (); 557 ptytty::init ();
564 gid_t gid = getgid ();
565
566 // before doing anything else, check for setuid/setgid operation,
567 // start the helper process and drop privileges
568 if (uid != geteuid ()
569 || gid != getegid ())
570 {
571#if PTYTTY_HELPER
572 rxvt_ptytty_server ();
573#else
574 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
575#endif
576
577 // drop privileges
578#if HAVE_SETRESUID
579 setresgid (gid, gid, gid);
580 setresuid (uid, uid, uid);
581#elif HAVE_SETREUID
582 setregid (gid, gid);
583 setreuid (uid, uid);
584#elif HAVE_SETUID
585 setgid (gid);
586 setuid (uid);
587#endif
588
589 if (uid != geteuid ()
590 || gid != getegid ())
591 rxvt_fatal ("unable to drop privileges, aborting.\n");
592 }
593 558
594 rxvt_environ = environ; 559 rxvt_environ = environ;
595 560
596 signal (SIGHUP, SIG_IGN); 561 signal (SIGHUP, SIG_IGN);
597 signal (SIGPIPE, SIG_IGN); 562 signal (SIGPIPE, SIG_IGN);
… …
655{ 620{
656 short recalc_x, recalc_y; 621 short recalc_x, recalc_y;
657 int x, y, sb_w, flags; 622 int x, y, sb_w, flags;
658 unsigned int w, h; 623 unsigned int w, h;
659 unsigned int max_width, max_height; 624 unsigned int max_width, max_height;
660 dDisp;
661
662 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
663 ncol, nrow, szHint.width, szHint.height));
664 625
665 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
666 szHint.win_gravity = NorthWestGravity; 627 szHint.win_gravity = NorthWestGravity;
667 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 628 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
668 629
… …
765 726
766 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 727 if (scrollBar.state && OPTION (Opt_scrollBar_right))
767 window_sb_x = szHint.width - sb_w; 728 window_sb_x = szHint.width - sb_w;
768 729
769 if (recalc_x) 730 if (recalc_x)
770 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
732
771 if (recalc_y) 733 if (recalc_y)
772 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
773 735
774 ncol = width / fwidth; 736 ncol = width / fwidth;
775 nrow = height / fheight; 737 nrow = height / fheight;
776 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
777 ncol, nrow, szHint.width,
778 szHint.height));
779 return;
780} 738}
781 739
782/*----------------------------------------------------------------------*/ 740/*----------------------------------------------------------------------*/
783/* 741/*
784 * Tell the teletype handler what size the window is. 742 * Tell the teletype handler what size the window is.
… …
984 /* Cursor cursor; */ 942 /* Cursor cursor; */
985done: 943done:
986 944
987#if OFF_FOCUS_FADING 945#if OFF_FOCUS_FADING
988 if (rs[Rs_fade]) 946 if (rs[Rs_fade])
989 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 947 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
990#endif 948#endif
991 949
992 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
993 951
994 recolour_cursor (); 952 recolour_cursor ();
… …
1009 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg];
1010 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 968 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1011 ? pix_colors_focused[Color_pointer_bg] 969 ? pix_colors_focused[Color_pointer_bg]
1012 : pix_colors_focused[Color_bg]; 970 : pix_colors_focused[Color_bg];
1013 971
1014 XQueryColors (display->display, display->cmap, xcol, 2); 972 XQueryColors (display->display, cmap, xcol, 2);
1015 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 973 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1016} 974}
1017 975
1018/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1019/* 977/*
… …
1024{ 982{
1025 unsigned int i; 983 unsigned int i;
1026 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1027 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1028 986
1029 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1030 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1031 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1032 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1033 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1034 { 991 {
… …
1052/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1053 1010
1054int 1011int
1055rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1056{ 1013{
1057 if (!screen_in_out->set (display, colour)) 1014 if (!screen_in_out->set (this, colour))
1058 { 1015 {
1059 rxvt_warn ("can't get colour '%s', continuing without.\n", colour); 1016 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1060 return false; 1017 return false;
1061 } 1018 }
1062 1019
… …
1068 * -------------------------------------------------------------------- */ 1025 * -------------------------------------------------------------------- */
1069void 1026void
1070rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1027rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1071{ 1028{
1072 int fix_screen; 1029 int fix_screen;
1073 int old_width = szHint.width, old_height = szHint.height; 1030 int old_width = szHint.width;
1074 dDisp; 1031 int old_height = szHint.height;
1075 1032
1076 window_calc (newwidth, newheight); 1033 window_calc (newwidth, newheight);
1077 XSetWMNormalHints (disp, parent[0], &szHint); 1034 XSetWMNormalHints (xdisp, parent[0], &szHint);
1078 1035
1079 if (!ignoreparent) 1036 if (!ignoreparent)
1080 { 1037 {
1081#ifdef SMART_RESIZE 1038#ifdef SMART_RESIZE
1082 /* 1039 /*
… …
1086 int x, y, x1, y1; 1043 int x, y, x1, y1;
1087 int dx, dy; 1044 int dx, dy;
1088 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1045 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1089 Window unused_cr; 1046 Window unused_cr;
1090 1047
1091 XTranslateCoordinates (disp, parent[0], display->root, 1048 XTranslateCoordinates (xdisp, parent[0], display->root,
1092 0, 0, &x, &y, &unused_cr); 1049 0, 0, &x, &y, &unused_cr);
1093 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1050 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1094 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1051 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1095 /* 1052 /*
1096 * if display->root isn't the parent window, a WM will probably have offset 1053 * if display->root isn't the parent window, a WM will probably have offset
1097 * our position for handles and decorations. Counter it 1054 * our position for handles and decorations. Counter it
1098 */ 1055 */
… …
1100 { 1057 {
1101 x -= x1; 1058 x -= x1;
1102 y -= y1; 1059 y -= y1;
1103 } 1060 }
1104 1061
1105 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1062 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1106 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1063 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1107 dx = old_width - szHint.width; 1064 dx = old_width - szHint.width;
1108 dy = old_height - szHint.height; 1065 dy = old_height - szHint.height;
1109 1066
1110 /* Check position of the center of the window */ 1067 /* Check position of the center of the window */
1111 if (x < x1) /* left half */ 1068 if (x < x1) /* left half */
1112 dx = 0; 1069 dx = 0;
… …
1115 if (y < y1) /* top half */ 1072 if (y < y1) /* top half */
1116 dy = 0; 1073 dy = 0;
1117 else if (y == y1) /* exact center */ 1074 else if (y == y1) /* exact center */
1118 dy /= 2; 1075 dy /= 2;
1119 1076
1120 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1077 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1121 szHint.width, szHint.height); 1078 szHint.width, szHint.height);
1122#else 1079#else
1123 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1080 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1124#endif 1081#endif
1125 } 1082 }
1126 1083
1127 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1084 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1128 1085
1129 if (fix_screen || newwidth != old_width || newheight != old_height) 1086 if (fix_screen || newwidth != old_width || newheight != old_height)
1130 { 1087 {
1131 if (scrollBar.state) 1088 if (scrollBar.state)
1132 { 1089 {
1133 XMoveResizeWindow (disp, scrollBar.win, 1090 XMoveResizeWindow (xdisp, scrollBar.win,
1134 window_sb_x, 0, 1091 window_sb_x, 0,
1135 scrollbar_TotalWidth (), szHint.height); 1092 scrollbar_TotalWidth (), szHint.height);
1136 resize_scrollbar (); 1093 resize_scrollbar ();
1137 } 1094 }
1138 1095
1139 XMoveResizeWindow (disp, vt, 1096 XMoveResizeWindow (xdisp, vt,
1140 window_vt_x, window_vt_y, 1097 window_vt_x, window_vt_y,
1141 width, height); 1098 width, height);
1142 1099
1143 scr_clear (); 1100 scr_clear ();
1144#ifdef XPM_BACKGROUND 1101#ifdef XPM_BACKGROUND
1145 resize_pixmap (); 1102 resize_pixmap ();
1146#endif 1103#endif
1147 } 1104 }
1148 1105
1149 if (fix_screen || old_height == 0) 1106 if (fix_screen || old_height == 0)
1150 {
1151 int curr_screen = -1;
1152 int old_ncol = prev_ncol;
1153
1154 /* scr_reset only works on the primary screen */
1155 if (old_height) /* this is not the first time through */
1156 {
1157 unsigned int ocol = ncol;
1158 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1159 curr_screen = scr_change_screen (PRIMARY);
1160 ncol = ocol;
1161 }
1162
1163 scr_reset (); 1107 scr_reset ();
1164
1165 if (curr_screen >= 0) /* this is not the first time through */
1166 {
1167 scr_change_screen (curr_screen);
1168 selection_check (old_ncol != ncol ? 4 : 0);
1169 }
1170 }
1171
1172 old_width = szHint.width;
1173 old_height = szHint.height;
1174 1108
1175#ifdef XPM_BACKGROUND 1109#ifdef XPM_BACKGROUND
1176 if (pixmap) 1110 if (pixmap)
1177 scr_touch (false); 1111 scr_touch (false);
1178#endif 1112#endif
… …
1281 XPoint nspot; 1215 XPoint nspot;
1282 XVaNestedList preedit_attr; 1216 XVaNestedList preedit_attr;
1283 1217
1284 if (!Input_Context 1218 if (!Input_Context
1285 || !focus 1219 || !focus
1286 || !(input_style & XIMPreeditPosition)) 1220 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1287 return; 1221 return;
1288 1222
1289 im_set_position (nspot); 1223 im_set_position (nspot);
1290 1224
1291 if (nspot.x == spot.x && nspot.y == spot.y) 1225 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1310 input_method = 0; 1244 input_method = 0;
1311 } 1245 }
1312 1246
1313 Input_Context = 0; 1247 Input_Context = 0;
1314} 1248}
1249
1250#ifdef ENABLE_XIM_ONTHESPOT
1251
1252static void
1253xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1254{
1255 ((rxvt_term *)client_data)->make_current ();
1256 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1257}
1258
1259static void
1260xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1261{
1262 ((rxvt_term *)client_data)->make_current ();
1263 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1264}
1265
1266static void
1267xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1268{
1269 rxvt_term *term = (rxvt_term *)client_data;
1270 XIMText *text = call_data->text;
1271
1272 term->make_current ();
1273
1274 if (text)
1275 {
1276 void *str;
1277
1278 if (!text->encoding_is_wchar && text->string.multi_byte)
1279 {
1280 // of course, X makes it ugly again
1281 if (term->rs[Rs_imLocale])
1282 SET_LOCALE (term->rs[Rs_imLocale]);
1283
1284 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1285 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1286
1287 if (term->rs[Rs_imLocale])
1288 SET_LOCALE (term->locale);
1289 }
1290 else
1291 str = (void *)text->string.wide_char;
1292
1293 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1294 DT_INT, call_data->caret,
1295 DT_INT, call_data->chg_first,
1296 DT_INT, call_data->chg_length,
1297 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1298 DT_WCS_LEN, str, str ? (int)text->length : 0,
1299 DT_END));
1300 }
1301 else
1302 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1303 DT_INT, call_data->caret,
1304 DT_INT, call_data->chg_first,
1305 DT_INT, call_data->chg_length,
1306 DT_END));
1307}
1308
1309#if 0
1310static void
1311xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1312{
1313 ((rxvt_term *)client_data)->make_current ();
1314 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1315 DT_INT, call_data->position,
1316 DT_INT, call_data->direction,
1317 DT_INT, call_data->style,
1318 DT_END));
1319}
1320#endif
1321
1322#endif
1315 1323
1316/* 1324/*
1317 * Try to open a XIM with the current modifiers, then see if we can 1325 * Try to open a XIM with the current modifiers, then see if we can
1318 * open a suitable preedit type 1326 * open a suitable preedit type
1319 */ 1327 */
… …
1326 XRectangle rect, status_rect, needed_rect; 1334 XRectangle rect, status_rect, needed_rect;
1327 unsigned long fg, bg; 1335 unsigned long fg, bg;
1328 const char *p; 1336 const char *p;
1329 char **s; 1337 char **s;
1330 XIMStyles *xim_styles; 1338 XIMStyles *xim_styles;
1339#ifdef ENABLE_XIM_ONTHESPOT
1340 XIMCallback xcb[4];
1341#endif
1331 1342
1332 set_environ (envv); 1343 set_environ (envv);
1333 1344
1334 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1345 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1335 return false; 1346 return false;
1336 1347
1337 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1338 input_method = display->get_xim (locale, modifiers); 1348 input_method = display->get_xim (locale, modifiers);
1339 if (input_method == NULL) 1349 if (input_method == NULL)
1340 return false; 1350 return false;
1341 1351
1342 xim = input_method->xim; 1352 xim = input_method->xim;
… …
1362 s = rxvt_splitcommastring (p); 1372 s = rxvt_splitcommastring (p);
1363 1373
1364 for (i = found = 0; !found && s[i]; i++) 1374 for (i = found = 0; !found && s[i]; i++)
1365 { 1375 {
1366 if (!strcmp (s[i], "OverTheSpot")) 1376 if (!strcmp (s[i], "OverTheSpot"))
1367 input_style = (XIMPreeditPosition | XIMStatusNothing); 1377 input_style = XIMPreeditPosition | XIMStatusNothing;
1368 else if (!strcmp (s[i], "OffTheSpot")) 1378 else if (!strcmp (s[i], "OffTheSpot"))
1369 input_style = (XIMPreeditArea | XIMStatusArea); 1379 input_style = XIMPreeditArea | XIMStatusArea;
1370 else if (!strcmp (s[i], "Root")) 1380 else if (!strcmp (s[i], "Root"))
1371 input_style = (XIMPreeditNothing | XIMStatusNothing); 1381 input_style = XIMPreeditNothing | XIMStatusNothing;
1372 else if (!strcmp (s[i], "None")) 1382 else if (!strcmp (s[i], "None"))
1373 input_style = (XIMPreeditNone | XIMStatusNone); 1383 input_style = XIMPreeditNone | XIMStatusNone;
1384#ifdef ENABLE_XIM_ONTHESPOT
1385 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1386 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1387#endif
1388 else
1389 input_style = XIMPreeditNothing | XIMStatusNothing;
1374 1390
1375 for (j = 0; j < xim_styles->count_styles; j++) 1391 for (j = 0; j < xim_styles->count_styles; j++)
1376 if (input_style == xim_styles->supported_styles[j]) 1392 if (input_style == xim_styles->supported_styles[j])
1377 { 1393 {
1378 rxvt_freecommastring (s); 1394 rxvt_freecommastring (s);
… …
1467 XNBackground, bg, 1483 XNBackground, bg,
1468 XNArea, &status_rect, 1484 XNArea, &status_rect,
1469 XNFontSet, fs, 1485 XNFontSet, fs,
1470 NULL); 1486 NULL);
1471 } 1487 }
1488#if ENABLE_XIM_ONTHESPOT
1489 else if (input_style & XIMPreeditCallbacks)
1490 {
1491 im_set_position (spot);
1492
1493 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1494 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1495 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1496# if 0
1497 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1498# endif
1499
1500 preedit_attr = XVaCreateNestedList (0,
1501 XNSpotLocation, &spot,
1502 XNPreeditStartCallback, &xcb[0],
1503 XNPreeditDoneCallback , &xcb[1],
1504 XNPreeditDrawCallback , &xcb[2],
1505# if 0
1506 XNPreeditCaretCallback, &xcb[3],
1507# endif
1508 NULL);
1509 }
1510#endif
1472 1511
1473 Input_Context = XCreateIC (xim, 1512 Input_Context = XCreateIC (xim,
1474 XNInputStyle, input_style, 1513 XNInputStyle, input_style,
1475 XNClientWindow, vt, 1514 XNClientWindow, vt,
1476 XNFocusWindow, parent[0], 1515 XNFocusWindow, parent[0],
… …
1488 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1527 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1489 im_destroy (); 1528 im_destroy ();
1490 return false; 1529 return false;
1491 } 1530 }
1492 1531
1532#if 0
1533 // unfortunately, only the focus window is used by XIM, hard to fix
1534 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1535 vt_select_input ();
1536#endif
1537
1493 if (input_style & XIMPreeditArea) 1538 if (input_style & XIMPreeditArea)
1494 IMSetStatusPosition (); 1539 IMSetStatusPosition ();
1495 1540
1496 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1497 return true; 1541 return true;
1498} 1542}
1499 1543
1500void 1544void
1501rxvt_term::im_cb () 1545rxvt_term::im_cb ()
… …
1507 1551
1508 make_current (); 1552 make_current ();
1509 1553
1510 im_destroy (); 1554 im_destroy ();
1511 1555
1512 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1513 if (Input_Context) 1556 if (Input_Context)
1514 return; 1557 return;
1515 1558
1516#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1559#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1517 if (rs[Rs_imLocale]) 1560 if (rs[Rs_imLocale])

Diff Legend

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