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.190 by root, Thu Jan 19 20:30:36 2006 UTC vs.
Revision 1.206 by root, Wed Jan 25 21:03:04 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
… …
215#endif 216#endif
216 delete fontset[0]; 217 delete fontset[0];
217 218
218 if (display) 219 if (display)
219 { 220 {
220 dDisp;
221
222 selection_clear (); 221 selection_clear ();
223 222
224#ifdef USE_XIM 223#ifdef USE_XIM
225 im_destroy (); 224 im_destroy ();
226#endif 225#endif
227#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
228 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
229 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
230#endif 229#endif
231#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
232 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
233#endif 232#endif
234#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
235 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (xdisp, blackGC);
236 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (xdisp, whiteGC);
237 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (xdisp, grayGC);
238 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (xdisp, darkGC);
239 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (xdisp, stippleGC);
240 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (xdisp, dimple);
241 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (xdisp, upArrow);
242 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (xdisp, downArrow);
243 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
244 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
245#endif 244#endif
246#ifdef RXVT_SCROLLBAR 245#ifdef RXVT_SCROLLBAR
247 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
248 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
249 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
250#endif 249#endif
251 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (xdisp, gc);
252 251
253 delete drawable; 252 delete drawable;
254 // destroy all windows 253 // destroy all windows
255 if (parent[0]) 254 if (parent[0])
256 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (xdisp, parent[0]);
256
257 clear ();
257 } 258 }
258 259
259 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
260 delete pix_colors_focused; 261 delete pix_colors_focused;
261#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
… …
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 ())
… …
463 466
464#ifdef KEYSYM_RESOURCE 467#ifdef KEYSYM_RESOURCE
465 keyboard->register_done (); 468 keyboard->register_done ();
466#endif 469#endif
467 470
468#if ENABLE_PERL
469 if (!rs[Rs_perl_ext_1])
470 rs[Rs_perl_ext_1] = "default";
471
472 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
473 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
474 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
475 {
476 rxvt_perl.init (this);
477 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
478 }
479#endif
480
481#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
482 if (OPTION (Opt_scrollBar)) 472 if (OPTION (Opt_scrollBar))
483 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
484#endif 474#endif
485 475
486 pty = rxvt_new_ptytty (); 476 pty = ptytty::create ();
487 477
488 create_windows (argc, argv); 478 create_windows (argc, argv);
489 479
490 dDisp;
491
492 init_xlocale (); 480 init_xlocale ();
493 481
494 scr_reset (); // initialize screen 482 scr_reset (); // initialize screen
495 483
496#if 0 484#if 0
497 XSynchronize (disp, True); 485 XSynchronize (xdisp, True);
498#endif 486#endif
499 487
500#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
501 if (OPTION (Opt_scrollBar)) 489 if (OPTION (Opt_scrollBar))
502 resize_scrollbar (); /* create and map scrollbar */ 490 resize_scrollbar (); /* create and map scrollbar */
503#endif 491#endif
504#ifdef TRANSPARENT 492#ifdef TRANSPARENT
505 if (OPTION (Opt_transparent)) 493 if (OPTION (Opt_transparent))
506 { 494 {
507 XSelectInput (disp, display->root, PropertyChangeMask); 495 XSelectInput (xdisp, display->root, PropertyChangeMask);
508 check_our_parents (); 496 check_our_parents ();
509 rootwin_ev.start (display, display->root); 497 rootwin_ev.start (display, display->root);
510 } 498 }
511#endif 499#endif
512 500
513 XMapWindow (disp, vt);
514 XMapWindow (disp, parent[0]);
515
516 set_colorfgbg (); 501 set_colorfgbg ();
517 502
518 init_command (cmd_argv); 503 init_command (cmd_argv);
519 504
520 free (cmd_argv); 505 free (cmd_argv);
… …
523 pty_ev.start (pty->pty, EVENT_READ); 508 pty_ev.start (pty->pty, EVENT_READ);
524 509
525 check_ev.start (); 510 check_ev.start ();
526 511
527 HOOK_INVOKE ((this, HOOK_START, DT_END)); 512 HOOK_INVOKE ((this, HOOK_START, DT_END));
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
524 XMapWindow (xdisp, vt);
525 XMapWindow (xdisp, parent[0]);
528 526
529 return true; 527 return true;
530} 528}
531 529
532static struct sig_handlers 530static struct sig_handlers
… …
537 * Catch a fatal signal and tidy up before quitting 535 * Catch a fatal signal and tidy up before quitting
538 */ 536 */
539 void 537 void
540 sig_term (sig_watcher &w) 538 sig_term (sig_watcher &w)
541 { 539 {
542#ifdef DEBUG_CMD
543 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
544#endif
545 rxvt_emergency_cleanup (); 540 rxvt_emergency_cleanup ();
546 signal (w.signum, SIG_DFL); 541 signal (w.signum, SIG_DFL);
547 kill (getpid (), w.signum); 542 kill (getpid (), w.signum);
548 } 543 }
549 544
… …
557char **rxvt_environ; // startup environment 552char **rxvt_environ; // startup environment
558 553
559void 554void
560rxvt_init () 555rxvt_init ()
561{ 556{
562 uid_t uid = getuid (); 557 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 558
593 rxvt_environ = environ; 559 rxvt_environ = environ;
594 560
595 signal (SIGHUP, SIG_IGN); 561 signal (SIGHUP, SIG_IGN);
596 signal (SIGPIPE, SIG_IGN); 562 signal (SIGPIPE, SIG_IGN);
… …
631 rxvt_fatal ("memory allocation failure. aborting.\n"); 597 rxvt_fatal ("memory allocation failure. aborting.\n");
632 598
633 return p; 599 return p;
634} 600}
635 601
636void * 602void *
637rxvt_realloc (void *ptr, size_t size) 603rxvt_realloc (void *ptr, size_t size)
638{ 604{
639 void *p = realloc (ptr, size); 605 void *p = realloc (ptr, size);
640 606
641 if (!p) 607 if (!p)
… …
654{ 620{
655 short recalc_x, recalc_y; 621 short recalc_x, recalc_y;
656 int x, y, sb_w, flags; 622 int x, y, sb_w, flags;
657 unsigned int w, h; 623 unsigned int w, h;
658 unsigned int max_width, max_height; 624 unsigned int max_width, max_height;
659 dDisp;
660
661 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
662 ncol, nrow, szHint.width, szHint.height));
663 625
664 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
665 szHint.win_gravity = NorthWestGravity; 627 szHint.win_gravity = NorthWestGravity;
666 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 628 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
667 629
… …
764 726
765 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 727 if (scrollBar.state && OPTION (Opt_scrollBar_right))
766 window_sb_x = szHint.width - sb_w; 728 window_sb_x = szHint.width - sb_w;
767 729
768 if (recalc_x) 730 if (recalc_x)
769 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
732
770 if (recalc_y) 733 if (recalc_y)
771 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
772 735
773 ncol = width / fwidth; 736 ncol = width / fwidth;
774 nrow = height / fheight; 737 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} 738}
780 739
781/*----------------------------------------------------------------------*/ 740/*----------------------------------------------------------------------*/
782/* 741/*
783 * Tell the teletype handler what size the window is. 742 * Tell the teletype handler what size the window is.
… …
983 /* Cursor cursor; */ 942 /* Cursor cursor; */
984done: 943done:
985 944
986#if OFF_FOCUS_FADING 945#if OFF_FOCUS_FADING
987 if (rs[Rs_fade]) 946 if (rs[Rs_fade])
988 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]);
989#endif 948#endif
990 949
991 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
992 951
993 recolour_cursor (); 952 recolour_cursor ();
… …
1008 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg];
1009 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 968 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1010 ? pix_colors_focused[Color_pointer_bg] 969 ? pix_colors_focused[Color_pointer_bg]
1011 : pix_colors_focused[Color_bg]; 970 : pix_colors_focused[Color_bg];
1012 971
1013 XQueryColors (display->display, display->cmap, xcol, 2); 972 XQueryColors (display->display, cmap, xcol, 2);
1014 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 973 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1015} 974}
1016 975
1017/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1018/* 977/*
… …
1023{ 982{
1024 unsigned int i; 983 unsigned int i;
1025 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1026 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1027 986
1028 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1029 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1030 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1031 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1032 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1033 { 991 {
… …
1051/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1052 1010
1053int 1011int
1054rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1055{ 1013{
1056 if (!screen_in_out->set (display, colour)) 1014 if (!screen_in_out->set (this, colour))
1057 { 1015 {
1058 rxvt_warn ("can't get colour '%s', continuing without.\n", colour); 1016 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1059 return false; 1017 return false;
1060 } 1018 }
1061 1019
… …
1067 * -------------------------------------------------------------------- */ 1025 * -------------------------------------------------------------------- */
1068void 1026void
1069rxvt_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)
1070{ 1028{
1071 int fix_screen; 1029 int fix_screen;
1072 int old_width = szHint.width, old_height = szHint.height; 1030 int old_width = szHint.width;
1073 dDisp; 1031 int old_height = szHint.height;
1074 1032
1075 window_calc (newwidth, newheight); 1033 window_calc (newwidth, newheight);
1076 XSetWMNormalHints (disp, parent[0], &szHint); 1034 XSetWMNormalHints (xdisp, parent[0], &szHint);
1077 1035
1078 if (!ignoreparent) 1036 if (!ignoreparent)
1079 { 1037 {
1080#ifdef SMART_RESIZE 1038#ifdef SMART_RESIZE
1081 /* 1039 /*
… …
1085 int x, y, x1, y1; 1043 int x, y, x1, y1;
1086 int dx, dy; 1044 int dx, dy;
1087 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1045 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1088 Window unused_cr; 1046 Window unused_cr;
1089 1047
1090 XTranslateCoordinates (disp, parent[0], display->root, 1048 XTranslateCoordinates (xdisp, parent[0], display->root,
1091 0, 0, &x, &y, &unused_cr); 1049 0, 0, &x, &y, &unused_cr);
1092 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1050 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1093 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1051 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1094 /* 1052 /*
1095 * 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
1096 * our position for handles and decorations. Counter it 1054 * our position for handles and decorations. Counter it
1097 */ 1055 */
… …
1099 { 1057 {
1100 x -= x1; 1058 x -= x1;
1101 y -= y1; 1059 y -= y1;
1102 } 1060 }
1103 1061
1104 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1062 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1105 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1063 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1106 dx = old_width - szHint.width; 1064 dx = old_width - szHint.width;
1107 dy = old_height - szHint.height; 1065 dy = old_height - szHint.height;
1108 1066
1109 /* Check position of the center of the window */ 1067 /* Check position of the center of the window */
1110 if (x < x1) /* left half */ 1068 if (x < x1) /* left half */
1111 dx = 0; 1069 dx = 0;
… …
1114 if (y < y1) /* top half */ 1072 if (y < y1) /* top half */
1115 dy = 0; 1073 dy = 0;
1116 else if (y == y1) /* exact center */ 1074 else if (y == y1) /* exact center */
1117 dy /= 2; 1075 dy /= 2;
1118 1076
1119 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1077 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1120 szHint.width, szHint.height); 1078 szHint.width, szHint.height);
1121#else 1079#else
1122 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1080 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1123#endif 1081#endif
1124 } 1082 }
1125 1083
1126 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1084 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1127 1085
1128 if (fix_screen || newwidth != old_width || newheight != old_height) 1086 if (fix_screen || newwidth != old_width || newheight != old_height)
1129 { 1087 {
1130 if (scrollBar.state) 1088 if (scrollBar.state)
1131 { 1089 {
1132 XMoveResizeWindow (disp, scrollBar.win, 1090 XMoveResizeWindow (xdisp, scrollBar.win,
1133 window_sb_x, 0, 1091 window_sb_x, 0,
1134 scrollbar_TotalWidth (), szHint.height); 1092 scrollbar_TotalWidth (), szHint.height);
1135 resize_scrollbar (); 1093 resize_scrollbar ();
1136 } 1094 }
1137 1095
1138 XMoveResizeWindow (disp, vt, 1096 XMoveResizeWindow (xdisp, vt,
1139 window_vt_x, window_vt_y, 1097 window_vt_x, window_vt_y,
1140 width, height); 1098 width, height);
1141 1099
1142 scr_clear (); 1100 scr_clear ();
1143#ifdef XPM_BACKGROUND 1101#ifdef XPM_BACKGROUND
1144 resize_pixmap (); 1102 resize_pixmap ();
1145#endif 1103#endif
1146 } 1104 }
1147 1105
1148 if (fix_screen || old_height == 0) 1106 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 (); 1107 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 1108
1174#ifdef XPM_BACKGROUND 1109#ifdef XPM_BACKGROUND
1175 if (pixmap) 1110 if (pixmap)
1176 scr_touch (false); 1111 scr_touch (false);
1177#endif 1112#endif
… …
1280 XPoint nspot; 1215 XPoint nspot;
1281 XVaNestedList preedit_attr; 1216 XVaNestedList preedit_attr;
1282 1217
1283 if (!Input_Context 1218 if (!Input_Context
1284 || !focus 1219 || !focus
1285 || !(input_style & XIMPreeditPosition)) 1220 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1286 return; 1221 return;
1287 1222
1288 im_set_position (nspot); 1223 im_set_position (nspot);
1289 1224
1290 if (nspot.x == spot.x && nspot.y == spot.y) 1225 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1309 input_method = 0; 1244 input_method = 0;
1310 } 1245 }
1311 1246
1312 Input_Context = 0; 1247 Input_Context = 0;
1313} 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
1314 1323
1315/* 1324/*
1316 * 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
1317 * open a suitable preedit type 1326 * open a suitable preedit type
1318 */ 1327 */
… …
1325 XRectangle rect, status_rect, needed_rect; 1334 XRectangle rect, status_rect, needed_rect;
1326 unsigned long fg, bg; 1335 unsigned long fg, bg;
1327 const char *p; 1336 const char *p;
1328 char **s; 1337 char **s;
1329 XIMStyles *xim_styles; 1338 XIMStyles *xim_styles;
1339#ifdef ENABLE_XIM_ONTHESPOT
1340 XIMCallback xcb[4];
1341#endif
1330 1342
1331 set_environ (envv); 1343 set_environ (envv);
1332 1344
1333 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1345 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1334 return false; 1346 return false;
1335 1347
1336 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1337 input_method = display->get_xim (locale, modifiers); 1348 input_method = display->get_xim (locale, modifiers);
1338 if (input_method == NULL) 1349 if (input_method == NULL)
1339 return false; 1350 return false;
1340 1351
1341 xim = input_method->xim; 1352 xim = input_method->xim;
… …
1361 s = rxvt_splitcommastring (p); 1372 s = rxvt_splitcommastring (p);
1362 1373
1363 for (i = found = 0; !found && s[i]; i++) 1374 for (i = found = 0; !found && s[i]; i++)
1364 { 1375 {
1365 if (!strcmp (s[i], "OverTheSpot")) 1376 if (!strcmp (s[i], "OverTheSpot"))
1366 input_style = (XIMPreeditPosition | XIMStatusNothing); 1377 input_style = XIMPreeditPosition | XIMStatusNothing;
1367 else if (!strcmp (s[i], "OffTheSpot")) 1378 else if (!strcmp (s[i], "OffTheSpot"))
1368 input_style = (XIMPreeditArea | XIMStatusArea); 1379 input_style = XIMPreeditArea | XIMStatusArea;
1369 else if (!strcmp (s[i], "Root")) 1380 else if (!strcmp (s[i], "Root"))
1370 input_style = (XIMPreeditNothing | XIMStatusNothing); 1381 input_style = XIMPreeditNothing | XIMStatusNothing;
1371 else if (!strcmp (s[i], "None")) 1382 else if (!strcmp (s[i], "None"))
1372 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;
1373 1390
1374 for (j = 0; j < xim_styles->count_styles; j++) 1391 for (j = 0; j < xim_styles->count_styles; j++)
1375 if (input_style == xim_styles->supported_styles[j]) 1392 if (input_style == xim_styles->supported_styles[j])
1376 { 1393 {
1377 rxvt_freecommastring (s); 1394 rxvt_freecommastring (s);
… …
1466 XNBackground, bg, 1483 XNBackground, bg,
1467 XNArea, &status_rect, 1484 XNArea, &status_rect,
1468 XNFontSet, fs, 1485 XNFontSet, fs,
1469 NULL); 1486 NULL);
1470 } 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
1471 1511
1472 Input_Context = XCreateIC (xim, 1512 Input_Context = XCreateIC (xim,
1473 XNInputStyle, input_style, 1513 XNInputStyle, input_style,
1474 XNClientWindow, vt, 1514 XNClientWindow, vt,
1475 XNFocusWindow, parent[0], 1515 XNFocusWindow, parent[0],
… …
1487 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1527 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1488 im_destroy (); 1528 im_destroy ();
1489 return false; 1529 return false;
1490 } 1530 }
1491 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
1492 if (input_style & XIMPreeditArea) 1538 if (input_style & XIMPreeditArea)
1493 IMSetStatusPosition (); 1539 IMSetStatusPosition ();
1494 1540
1495 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1496 return true; 1541 return true;
1497} 1542}
1498 1543
1499void 1544void
1500rxvt_term::im_cb () 1545rxvt_term::im_cb ()
… …
1506 1551
1507 make_current (); 1552 make_current ();
1508 1553
1509 im_destroy (); 1554 im_destroy ();
1510 1555
1511 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1512 if (Input_Context) 1556 if (Input_Context)
1513 return; 1557 return;
1514 1558
1515#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1559#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1516 if (rs[Rs_imLocale]) 1560 if (rs[Rs_imLocale])
… …
1589 XFree (preedit_attr); 1633 XFree (preedit_attr);
1590 XFree (status_attr); 1634 XFree (status_attr);
1591} 1635}
1592#endif /* USE_XIM */ 1636#endif /* USE_XIM */
1593 1637
1594/*----------------------------------------------------------------------*/
1595rxvt_t rxvt_current_term;
1596
1597/*----------------------- end-of-file (C source) -----------------------*/ 1638/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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