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.207 by root, Wed Jan 25 21:09:21 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
… …
214#endif 216#endif
215 delete fontset[0]; 217 delete fontset[0];
216 218
217 if (display) 219 if (display)
218 { 220 {
219 dDisp;
220
221 selection_clear (); 221 selection_clear ();
222 222
223#ifdef USE_XIM 223#ifdef USE_XIM
224 im_destroy (); 224 im_destroy ();
225#endif 225#endif
226#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
227 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
228 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
229#endif 229#endif
230#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
232#endif 232#endif
233#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (xdisp, blackGC);
235 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (xdisp, whiteGC);
236 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (xdisp, grayGC);
237 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (xdisp, darkGC);
238 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (xdisp, stippleGC);
239 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (xdisp, dimple);
240 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (xdisp, upArrow);
241 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (xdisp, downArrow);
242 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
243 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
244#endif 244#endif
245#ifdef RXVT_SCROLLBAR 245#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
247 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
248 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
249#endif 249#endif
250 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (xdisp, gc);
251 251
252 delete drawable; 252 delete drawable;
253 // destroy all windows 253 // destroy all windows
254 if (parent[0]) 254 if (parent[0])
255 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (xdisp, parent[0]);
256
257 clear ();
256 } 258 }
257 259
258 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
259 delete pix_colors_focused; 261 delete pix_colors_focused;
260#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
… …
269 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
270 free (allocated [i]); 272 free (allocated [i]);
271 273
272 free (selection.text); 274 free (selection.text);
273 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
274 free (env_windowid);
275 free (env_display); 276 free (env_display);
276 free (env_term); 277 free (env_term);
277 free (env_colorfgbg);
278 free (locale); 278 free (locale);
279 free (v_buffer); 279 free (v_buffer);
280 free (incr_buf); 280 free (incr_buf);
281 281
282 delete envv; 282 delete envv;
… …
285#ifdef KEYSYM_RESOURCE 285#ifdef KEYSYM_RESOURCE
286 delete keyboard; 286 delete keyboard;
287#endif 287#endif
288} 288}
289 289
290// child has exited, usually destroys
290void 291void
291rxvt_term::child_exit () 292rxvt_term::child_cb (child_watcher &w, int status)
292{ 293{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295
293 cmd_pid = 0; 296 cmd_pid = 0;
294 297
295 if (!OPTION (Opt_hold)) 298 if (!OPTION (Opt_hold))
296 destroy (); 299 destroy ();
297} 300}
… …
299void 302void
300rxvt_term::destroy () 303rxvt_term::destroy ()
301{ 304{
302 if (destroy_ev.active) 305 if (destroy_ev.active)
303 return; 306 return;
307
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
304 309
305#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
306 scr_overlay_off (); 311 scr_overlay_off ();
307#endif 312#endif
308 313
… …
442 _exit (EXIT_FAILURE); 447 _exit (EXIT_FAILURE);
443} 448}
444 449
445/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
446bool 451bool
447rxvt_term::init (int argc, const char *const *argv) 452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
448{ 453{
454 this->envv = envv;
455
449 SET_R (this); 456 SET_R (this);
450 set_locale (""); 457 set_locale ("");
451 set_environ (envv); // few things in X do not call setlocale :( 458 set_environ (envv); // few things in X do not call setlocale :(
452 459
453 if (!init_vars ()) 460 if (!init_vars ())
… …
464#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
465 if (OPTION (Opt_scrollBar)) 472 if (OPTION (Opt_scrollBar))
466 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
467#endif 474#endif
468 475
469#if ENABLE_PERL 476 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 477
484 create_windows (argc, argv); 478 create_windows (argc, argv);
485 479
486 dDisp;
487
488 init_xlocale (); 480 init_xlocale ();
489 481
490 scr_reset (); // initialize screen 482 scr_reset (); // initialize screen
491 483
492#if 0 484#if 0
493 XSynchronize (disp, True); 485 XSynchronize (xdisp, True);
494#endif 486#endif
495 487
496#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar)) 489 if (OPTION (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */ 490 resize_scrollbar (); /* create and map scrollbar */
499#endif 491#endif
500#ifdef TRANSPARENT 492#ifdef TRANSPARENT
501 if (OPTION (Opt_transparent)) 493 if (OPTION (Opt_transparent))
502 { 494 {
503 XSelectInput (disp, display->root, PropertyChangeMask); 495 XSelectInput (xdisp, display->root, PropertyChangeMask);
504 check_our_parents (); 496 check_our_parents ();
505 rootwin_ev.start (display, display->root); 497 rootwin_ev.start (display, display->root);
506 } 498 }
507#endif 499#endif
508 500
509 XMapWindow (disp, vt);
510 XMapWindow (disp, parent[0]);
511
512 set_colorfgbg (); 501 set_colorfgbg ();
513 502
514 init_command (cmd_argv); 503 init_command (cmd_argv);
515 504
516 free (cmd_argv); 505 free (cmd_argv);
… …
520 509
521 check_ev.start (); 510 check_ev.start ();
522 511
523 HOOK_INVOKE ((this, HOOK_START, DT_END)); 512 HOOK_INVOKE ((this, HOOK_START, DT_END));
524 513
514#if ENABLE_XEMBED
515 if (rs[Rs_embed])
516 {
517 long info[2] = { 0, XEMBED_MAPPED };
518
519 XChangeProperty (xdisp, 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]);
526
525 return true; 527 return true;
526} 528}
527 529
528static struct sig_handlers 530static struct sig_handlers
529{ 531{
530 sig_watcher sw_chld, sw_term, sw_int; 532 sig_watcher sw_term, sw_int;
531 533
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 /* 534 /*
547 * Catch a fatal signal and tidy up before quitting 535 * Catch a fatal signal and tidy up before quitting
548 */ 536 */
549 void 537 void
550 sig_term (sig_watcher &w) 538 sig_term (sig_watcher &w)
551 { 539 {
552#ifdef DEBUG_CMD
553 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
554#endif
555 rxvt_emergency_cleanup (); 540 rxvt_emergency_cleanup ();
556 signal (w.signum, SIG_DFL); 541 signal (w.signum, SIG_DFL);
557 kill (getpid (), w.signum); 542 kill (getpid (), w.signum);
558 } 543 }
559 544
560 sig_handlers () 545 sig_handlers ()
561 : sw_chld (this, &sig_handlers::sig_chld),
562 sw_term (this, &sig_handlers::sig_term), 546 : sw_term (this, &sig_handlers::sig_term),
563 sw_int (this, &sig_handlers::sig_term) 547 sw_int (this, &sig_handlers::sig_term)
564 { 548 {
565 } 549 }
566} sig_handlers; 550} sig_handlers;
567 551
568char **rxvt_environ; // startup environment 552char **rxvt_environ; // startup environment
569 553
570void 554void
571rxvt_init () 555rxvt_init ()
572{ 556{
573 uid_t uid = getuid (); 557 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 558
605 rxvt_environ = environ; 559 rxvt_environ = environ;
606 560
607 signal (SIGHUP, SIG_IGN); 561 signal (SIGHUP, SIG_IGN);
608 signal (SIGPIPE, SIG_IGN); 562 signal (SIGPIPE, SIG_IGN);
609 563
610 sig_handlers.sw_chld.start (SIGCHLD);
611 sig_handlers.sw_term.start (SIGTERM); 564 sig_handlers.sw_term.start (SIGTERM);
612 sig_handlers.sw_int.start (SIGINT); 565 sig_handlers.sw_int.start (SIGINT);
613 566
614 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 567 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
615 /* signal (SIGURG, SIG_DFL); */ 568 /* signal (SIGURG, SIG_DFL); */
… …
644 rxvt_fatal ("memory allocation failure. aborting.\n"); 597 rxvt_fatal ("memory allocation failure. aborting.\n");
645 598
646 return p; 599 return p;
647} 600}
648 601
649void * 602void *
650rxvt_realloc (void *ptr, size_t size) 603rxvt_realloc (void *ptr, size_t size)
651{ 604{
652 void *p = realloc (ptr, size); 605 void *p = realloc (ptr, size);
653 606
654 if (!p) 607 if (!p)
… …
667{ 620{
668 short recalc_x, recalc_y; 621 short recalc_x, recalc_y;
669 int x, y, sb_w, flags; 622 int x, y, sb_w, flags;
670 unsigned int w, h; 623 unsigned int w, h;
671 unsigned int max_width, max_height; 624 unsigned int max_width, max_height;
672 dDisp;
673
674 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
675 ncol, nrow, szHint.width, szHint.height));
676 625
677 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
678 szHint.win_gravity = NorthWestGravity; 627 szHint.win_gravity = NorthWestGravity;
679 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 628 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
680 629
… …
777 726
778 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 727 if (scrollBar.state && OPTION (Opt_scrollBar_right))
779 window_sb_x = szHint.width - sb_w; 728 window_sb_x = szHint.width - sb_w;
780 729
781 if (recalc_x) 730 if (recalc_x)
782 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
732
783 if (recalc_y) 733 if (recalc_y)
784 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
785 735
786 ncol = width / fwidth; 736 ncol = width / fwidth;
787 nrow = height / fheight; 737 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} 738}
793 739
794/*----------------------------------------------------------------------*/ 740/*----------------------------------------------------------------------*/
795/* 741/*
796 * Tell the teletype handler what size the window is. 742 * Tell the teletype handler what size the window is.
… …
896 return true; 842 return true;
897} 843}
898 844
899void rxvt_term::set_string_property (Atom prop, const char *str, int len) 845void rxvt_term::set_string_property (Atom prop, const char *str, int len)
900{ 846{
901 XChangeProperty (display->display, parent[0], 847 XChangeProperty (xdisp, parent[0],
902 prop, XA_STRING, 8, PropModeReplace, 848 prop, XA_STRING, 8, PropModeReplace,
903 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 849 (const unsigned char *)str, len >= 0 ? len : strlen (str));
904} 850}
905 851
906void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 852void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
907{ 853{
908 wchar_t *ws = rxvt_mbstowcs (str, len); 854 wchar_t *ws = rxvt_mbstowcs (str, len);
909 char *s = rxvt_wcstoutf8 (ws); 855 char *s = rxvt_wcstoutf8 (ws);
910 856
911 XChangeProperty (display->display, parent[0], 857 XChangeProperty (xdisp, parent[0],
912 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
913 (const unsigned char *)s, strlen (s)); 859 (const unsigned char *)s, strlen (s));
914 860
915 free (s); 861 free (s);
916 free (ws); 862 free (ws);
… …
969 } 915 }
970 916
971 if (!rXParseAllocColor (&xcol, color)) 917 if (!rXParseAllocColor (&xcol, color))
972 return; 918 return;
973 919
974 /* XStoreColor (display->display, display->cmap, XColor*); */ 920 /* XStoreColor (xdisp, display->cmap, XColor*); */
975 921
976 /* 922 /*
977 * FIXME: should free colors here, but no idea how to do it so instead, 923 * FIXME: should free colors here, but no idea how to do it so instead,
978 * so just keep gobbling up the colormap 924 * so just keep gobbling up the colormap
979 */ 925 */
… …
982 if (pix_colors[idx] == pix_colors[i]) 928 if (pix_colors[idx] == pix_colors[i])
983 break; 929 break;
984 if (i > Color_White) 930 if (i > Color_White)
985 { 931 {
986 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */ 932 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
987 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1, 933 XFreeColors (xdisp, display->cmap, (pix_colors + idx), 1,
988 DisplayPlanes (display->display, display->screen)); 934 DisplayPlanes (xdisp, display->screen));
989 } 935 }
990# endif 936# endif
991 937
992 pix_colors_focused[idx] = xcol; 938 pix_colors_focused[idx] = xcol;
993 SET_PIXCOLOR (idx); 939 SET_PIXCOLOR (idx);
… …
996 /* Cursor cursor; */ 942 /* Cursor cursor; */
997done: 943done:
998 944
999#if OFF_FOCUS_FADING 945#if OFF_FOCUS_FADING
1000 if (rs[Rs_fade]) 946 if (rs[Rs_fade])
1001 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]);
1002#endif 948#endif
1003 949
1004 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
1005 951
1006 recolour_cursor (); 952 recolour_cursor ();
… …
1021 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg];
1022 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 968 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1023 ? pix_colors_focused[Color_pointer_bg] 969 ? pix_colors_focused[Color_pointer_bg]
1024 : pix_colors_focused[Color_bg]; 970 : pix_colors_focused[Color_bg];
1025 971
1026 XQueryColors (display->display, display->cmap, xcol, 2); 972 XQueryColors (xdisp, cmap, xcol, 2);
1027 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 973 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1);
1028} 974}
1029 975
1030/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1031/* 977/*
1032 * find if fg/bg matches any of the normal (low-intensity) colors 978 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1036{ 982{
1037 unsigned int i; 983 unsigned int i;
1038 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1039 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1040 986
1041 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1042 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1043 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1044 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1045 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1046 { 991 {
… …
1064/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1065 1010
1066int 1011int
1067rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1068{ 1013{
1069 if (!screen_in_out->set (display, colour)) 1014 if (!screen_in_out->set (this, colour))
1070 { 1015 {
1071 rxvt_warn ("can't get colour '%s', continuing without.\n", colour); 1016 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1072 return false; 1017 return false;
1073 } 1018 }
1074 1019
… …
1080 * -------------------------------------------------------------------- */ 1025 * -------------------------------------------------------------------- */
1081void 1026void
1082rxvt_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)
1083{ 1028{
1084 int fix_screen; 1029 int fix_screen;
1085 int old_width = szHint.width, old_height = szHint.height; 1030 int old_width = szHint.width;
1086 dDisp; 1031 int old_height = szHint.height;
1087 1032
1088 window_calc (newwidth, newheight); 1033 window_calc (newwidth, newheight);
1089 XSetWMNormalHints (disp, parent[0], &szHint); 1034 XSetWMNormalHints (xdisp, parent[0], &szHint);
1090 1035
1091 if (!ignoreparent) 1036 if (!ignoreparent)
1092 { 1037 {
1093#ifdef SMART_RESIZE 1038#ifdef SMART_RESIZE
1094 /* 1039 /*
… …
1098 int x, y, x1, y1; 1043 int x, y, x1, y1;
1099 int dx, dy; 1044 int dx, dy;
1100 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1045 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1101 Window unused_cr; 1046 Window unused_cr;
1102 1047
1103 XTranslateCoordinates (disp, parent[0], display->root, 1048 XTranslateCoordinates (xdisp, parent[0], display->root,
1104 0, 0, &x, &y, &unused_cr); 1049 0, 0, &x, &y, &unused_cr);
1105 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1050 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1106 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1051 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1107 /* 1052 /*
1108 * 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
1109 * our position for handles and decorations. Counter it 1054 * our position for handles and decorations. Counter it
1110 */ 1055 */
… …
1112 { 1057 {
1113 x -= x1; 1058 x -= x1;
1114 y -= y1; 1059 y -= y1;
1115 } 1060 }
1116 1061
1117 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1062 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1118 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1063 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1119 dx = old_width - szHint.width; 1064 dx = old_width - szHint.width;
1120 dy = old_height - szHint.height; 1065 dy = old_height - szHint.height;
1121 1066
1122 /* Check position of the center of the window */ 1067 /* Check position of the center of the window */
1123 if (x < x1) /* left half */ 1068 if (x < x1) /* left half */
1124 dx = 0; 1069 dx = 0;
… …
1127 if (y < y1) /* top half */ 1072 if (y < y1) /* top half */
1128 dy = 0; 1073 dy = 0;
1129 else if (y == y1) /* exact center */ 1074 else if (y == y1) /* exact center */
1130 dy /= 2; 1075 dy /= 2;
1131 1076
1132 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1077 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1133 szHint.width, szHint.height); 1078 szHint.width, szHint.height);
1134#else 1079#else
1135 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1080 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1136#endif 1081#endif
1137 } 1082 }
1138 1083
1139 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1084 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1140 1085
1141 if (fix_screen || newwidth != old_width || newheight != old_height) 1086 if (fix_screen || newwidth != old_width || newheight != old_height)
1142 { 1087 {
1143 if (scrollBar.state) 1088 if (scrollBar.state)
1144 { 1089 {
1145 XMoveResizeWindow (disp, scrollBar.win, 1090 XMoveResizeWindow (xdisp, scrollBar.win,
1146 window_sb_x, 0, 1091 window_sb_x, 0,
1147 scrollbar_TotalWidth (), szHint.height); 1092 scrollbar_TotalWidth (), szHint.height);
1148 resize_scrollbar (); 1093 resize_scrollbar ();
1149 } 1094 }
1150 1095
1151 XMoveResizeWindow (disp, vt, 1096 XMoveResizeWindow (xdisp, vt,
1152 window_vt_x, window_vt_y, 1097 window_vt_x, window_vt_y,
1153 width, height); 1098 width, height);
1154 1099
1155 scr_clear (); 1100 scr_clear ();
1156#ifdef XPM_BACKGROUND 1101#ifdef XPM_BACKGROUND
1157 resize_pixmap (); 1102 resize_pixmap ();
1158#endif 1103#endif
1159 } 1104 }
1160 1105
1161 if (fix_screen || old_height == 0) 1106 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 (); 1107 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 1108
1187#ifdef XPM_BACKGROUND 1109#ifdef XPM_BACKGROUND
1188 if (pixmap) 1110 if (pixmap)
1189 scr_touch (false); 1111 scr_touch (false);
1190#endif 1112#endif
… …
1203{ 1125{
1204 XWindowAttributes wattr; 1126 XWindowAttributes wattr;
1205 1127
1206 if (newwidth == 0 || newheight == 0) 1128 if (newwidth == 0 || newheight == 0)
1207 { 1129 {
1208 XGetWindowAttributes (display->display, display->root, &wattr); 1130 XGetWindowAttributes (xdisp, display->root, &wattr);
1209 1131
1210 if (newwidth == 0) 1132 if (newwidth == 0)
1211 newwidth = wattr.width - szHint.base_width; 1133 newwidth = wattr.width - szHint.base_width;
1212 if (newheight == 0) 1134 if (newheight == 0)
1213 newheight = wattr.height - szHint.base_height; 1135 newheight = wattr.height - szHint.base_height;
… …
1275 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1197 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1276 1198
1277 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1199 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1278 *p = '\0'; 1200 *p = '\0';
1279 1201
1280 atom = XInternAtom (display->display, server, False); 1202 atom = XInternAtom (xdisp, server, False);
1281 win = XGetSelectionOwner (display->display, atom); 1203 win = XGetSelectionOwner (xdisp, atom);
1282 1204
1283 if (win != None) 1205 if (win != None)
1284 return True; 1206 return True;
1285 } 1207 }
1286 1208
… …
1293 XPoint nspot; 1215 XPoint nspot;
1294 XVaNestedList preedit_attr; 1216 XVaNestedList preedit_attr;
1295 1217
1296 if (!Input_Context 1218 if (!Input_Context
1297 || !focus 1219 || !focus
1298 || !(input_style & XIMPreeditPosition)) 1220 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1299 return; 1221 return;
1300 1222
1301 im_set_position (nspot); 1223 im_set_position (nspot);
1302 1224
1303 if (nspot.x == spot.x && nspot.y == spot.y) 1225 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1322 input_method = 0; 1244 input_method = 0;
1323 } 1245 }
1324 1246
1325 Input_Context = 0; 1247 Input_Context = 0;
1326} 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
1327 1323
1328/* 1324/*
1329 * 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
1330 * open a suitable preedit type 1326 * open a suitable preedit type
1331 */ 1327 */
… …
1338 XRectangle rect, status_rect, needed_rect; 1334 XRectangle rect, status_rect, needed_rect;
1339 unsigned long fg, bg; 1335 unsigned long fg, bg;
1340 const char *p; 1336 const char *p;
1341 char **s; 1337 char **s;
1342 XIMStyles *xim_styles; 1338 XIMStyles *xim_styles;
1339#ifdef ENABLE_XIM_ONTHESPOT
1340 XIMCallback xcb[4];
1341#endif
1343 1342
1344 set_environ (envv); 1343 set_environ (envv);
1345 1344
1346 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1345 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1347 return false; 1346 return false;
1348 1347
1349 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1350 input_method = display->get_xim (locale, modifiers); 1348 input_method = display->get_xim (locale, modifiers);
1351 if (input_method == NULL) 1349 if (input_method == NULL)
1352 return false; 1350 return false;
1353 1351
1354 xim = input_method->xim; 1352 xim = input_method->xim;
… …
1374 s = rxvt_splitcommastring (p); 1372 s = rxvt_splitcommastring (p);
1375 1373
1376 for (i = found = 0; !found && s[i]; i++) 1374 for (i = found = 0; !found && s[i]; i++)
1377 { 1375 {
1378 if (!strcmp (s[i], "OverTheSpot")) 1376 if (!strcmp (s[i], "OverTheSpot"))
1379 input_style = (XIMPreeditPosition | XIMStatusNothing); 1377 input_style = XIMPreeditPosition | XIMStatusNothing;
1380 else if (!strcmp (s[i], "OffTheSpot")) 1378 else if (!strcmp (s[i], "OffTheSpot"))
1381 input_style = (XIMPreeditArea | XIMStatusArea); 1379 input_style = XIMPreeditArea | XIMStatusArea;
1382 else if (!strcmp (s[i], "Root")) 1380 else if (!strcmp (s[i], "Root"))
1383 input_style = (XIMPreeditNothing | XIMStatusNothing); 1381 input_style = XIMPreeditNothing | XIMStatusNothing;
1384 else if (!strcmp (s[i], "None")) 1382 else if (!strcmp (s[i], "None"))
1385 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;
1386 1390
1387 for (j = 0; j < xim_styles->count_styles; j++) 1391 for (j = 0; j < xim_styles->count_styles; j++)
1388 if (input_style == xim_styles->supported_styles[j]) 1392 if (input_style == xim_styles->supported_styles[j])
1389 { 1393 {
1390 rxvt_freecommastring (s); 1394 rxvt_freecommastring (s);
… …
1428 "*", 1432 "*",
1429 fheight, 1433 fheight,
1430 fheight + 1, fheight - 1, 1434 fheight + 1, fheight - 1,
1431 fheight - 2, fheight + 2); 1435 fheight - 2, fheight + 2);
1432 1436
1433 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1437 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1434 &missing_charset_list, &missing_charset_count, &def_string); 1438 &missing_charset_list, &missing_charset_count, &def_string);
1435 1439
1436 if (missing_charset_list) 1440 if (missing_charset_list)
1437 XFreeStringList (missing_charset_list); 1441 XFreeStringList (missing_charset_list);
1438 1442
… …
1479 XNBackground, bg, 1483 XNBackground, bg,
1480 XNArea, &status_rect, 1484 XNArea, &status_rect,
1481 XNFontSet, fs, 1485 XNFontSet, fs,
1482 NULL); 1486 NULL);
1483 } 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
1484 1511
1485 Input_Context = XCreateIC (xim, 1512 Input_Context = XCreateIC (xim,
1486 XNInputStyle, input_style, 1513 XNInputStyle, input_style,
1487 XNClientWindow, vt, 1514 XNClientWindow, vt,
1488 XNFocusWindow, parent[0], 1515 XNFocusWindow, parent[0],
… …
1491 status_attr ? XNStatusAttributes : NULL, 1518 status_attr ? XNStatusAttributes : NULL,
1492 status_attr, NULL); 1519 status_attr, NULL);
1493 1520
1494 if (preedit_attr) XFree (preedit_attr); 1521 if (preedit_attr) XFree (preedit_attr);
1495 if (status_attr) XFree (status_attr); 1522 if (status_attr) XFree (status_attr);
1496 if (fs) XFreeFontSet (display->display, fs); 1523 if (fs) XFreeFontSet (xdisp, fs);
1497 1524
1498 if (Input_Context == NULL) 1525 if (Input_Context == NULL)
1499 { 1526 {
1500 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1527 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1501 im_destroy (); 1528 im_destroy ();
1502 return false; 1529 return false;
1503 } 1530 }
1504 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
1505 if (input_style & XIMPreeditArea) 1538 if (input_style & XIMPreeditArea)
1506 IMSetStatusPosition (); 1539 IMSetStatusPosition ();
1507 1540
1508 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1509 return true; 1541 return true;
1510} 1542}
1511 1543
1512void 1544void
1513rxvt_term::im_cb () 1545rxvt_term::im_cb ()
… …
1519 1551
1520 make_current (); 1552 make_current ();
1521 1553
1522 im_destroy (); 1554 im_destroy ();
1523 1555
1524 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1525 if (Input_Context) 1556 if (Input_Context)
1526 return; 1557 return;
1527 1558
1528#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1559#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1529 if (rs[Rs_imLocale]) 1560 if (rs[Rs_imLocale])
… …
1602 XFree (preedit_attr); 1633 XFree (preedit_attr);
1603 XFree (status_attr); 1634 XFree (status_attr);
1604} 1635}
1605#endif /* USE_XIM */ 1636#endif /* USE_XIM */
1606 1637
1607/*----------------------------------------------------------------------*/
1608rxvt_t rxvt_current_term;
1609
1610/*----------------------- end-of-file (C source) -----------------------*/ 1638/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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