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.189 by root, Thu Jan 19 09:47:15 2006 UTC vs.
Revision 1.215 by root, Wed Feb 1 18:36:48 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
… …
367{ 368{
368 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
369 (*t)->emergency_cleanup (); 370 (*t)->emergency_cleanup ();
370} 371}
371 372
372#if ENABLE_FRILLS 373#if !ENABLE_MINIMAL
373static void 374static void
374print_x_error (Display *dpy, XErrorEvent *event) 375print_x_error (Display *dpy, XErrorEvent *event)
375{ 376{
376 char buffer[BUFSIZ]; 377 char buffer[BUFSIZ];
377 char mesg[BUFSIZ]; 378 char mesg[BUFSIZ];
… …
425 GET_R->allowedxerror = event->error_code; 426 GET_R->allowedxerror = event->error_code;
426 else 427 else
427 { 428 {
428 // GET_R is most likely not the terminal which caused the error, 429 // GET_R is most likely not the terminal which caused the error,
429 // so just output the error and continue 430 // so just output the error and continue
430#if ENABLE_FRILLS 431#if ENABLE_MINIMAL
432 old_xerror_handler (display, event);
433#else
431 print_x_error (display, event); 434 print_x_error (display, event);
432#else
433 old_xerror_handler (display, event);
434#endif 435#endif
435 } 436 }
436 437
437 return 0; 438 return 0;
438} 439}
… …
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 ())
… …
468#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
469 if (OPTION (Opt_scrollBar)) 472 if (OPTION (Opt_scrollBar))
470 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
471#endif 474#endif
472 475
473#if ENABLE_PERL 476 pty = ptytty::create ();
474 if (!rs[Rs_perl_ext_1])
475 rs[Rs_perl_ext_1] = "default";
476
477 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
478 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
479 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
480 {
481 rxvt_perl.init (this);
482 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
483 }
484#endif
485
486 pty = rxvt_new_ptytty ();
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 (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]);
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
… …
729 691
730 if (scrollBar.state) 692 if (scrollBar.state)
731 { 693 {
732 sb_w = scrollbar_TotalWidth (); 694 sb_w = scrollbar_TotalWidth ();
733 szHint.base_width += sb_w; 695 szHint.base_width += sb_w;
696
734 if (!OPTION (Opt_scrollBar_right)) 697 if (!OPTION (Opt_scrollBar_right))
735 window_vt_x += sb_w; 698 window_vt_x += sb_w;
736 } 699 }
737 700
738 szHint.width_inc = fwidth; 701 szHint.width_inc = fwidth;
… …
764 727
765 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 728 if (scrollBar.state && OPTION (Opt_scrollBar_right))
766 window_sb_x = szHint.width - sb_w; 729 window_sb_x = szHint.width - sb_w;
767 730
768 if (recalc_x) 731 if (recalc_x)
769 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 732 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
733
770 if (recalc_y) 734 if (recalc_y)
771 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 735 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
772 736
773 ncol = width / fwidth; 737 ncol = width / fwidth;
774 nrow = height / fheight; 738 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} 739}
780 740
781/*----------------------------------------------------------------------*/ 741/*----------------------------------------------------------------------*/
782/* 742/*
783 * Tell the teletype handler what size the window is. 743 * Tell the teletype handler what size the window is.
… …
883 return true; 843 return true;
884} 844}
885 845
886void rxvt_term::set_string_property (Atom prop, const char *str, int len) 846void rxvt_term::set_string_property (Atom prop, const char *str, int len)
887{ 847{
888 XChangeProperty (display->display, parent[0], 848 XChangeProperty (xdisp, parent[0],
889 prop, XA_STRING, 8, PropModeReplace, 849 prop, XA_STRING, 8, PropModeReplace,
890 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 850 (const unsigned char *)str, len >= 0 ? len : strlen (str));
891} 851}
892 852
893void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 853void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
894{ 854{
895 wchar_t *ws = rxvt_mbstowcs (str, len); 855 wchar_t *ws = rxvt_mbstowcs (str, len);
896 char *s = rxvt_wcstoutf8 (ws); 856 char *s = rxvt_wcstoutf8 (ws);
897 857
898 XChangeProperty (display->display, parent[0], 858 XChangeProperty (xdisp, parent[0],
899 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 859 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
900 (const unsigned char *)s, strlen (s)); 860 (const unsigned char *)s, strlen (s));
901 861
902 free (s); 862 free (s);
903 free (ws); 863 free (ws);
… …
928void 888void
929rxvt_term::set_window_color (int idx, const char *color) 889rxvt_term::set_window_color (int idx, const char *color)
930{ 890{
931 rxvt_color xcol; 891 rxvt_color xcol;
932 int i; 892 int i;
933 893
934 if (color == NULL || *color == '\0') 894 if (color == NULL || *color == '\0')
935 return; 895 return;
896
897 color = strdup (color);
898 allocated.push_back ((void *)color);
899 rs[Rs_color + idx] = color;
936 900
937 /* handle color aliases */ 901 /* handle color aliases */
938 if (isdigit (*color)) 902 if (isdigit (*color))
939 { 903 {
940 i = atoi (color); 904 i = atoi (color);
941 905
942 if (i >= 8 && i <= 15) 906 if (i >= 8 && i <= 15)
943 { /* bright colors */ 907 { /* bright colors */
944 i -= 8; 908 i -= 8;
945 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 909 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
946 SET_PIXCOLOR (idx);
947 goto done; 910 goto done;
948 } 911 }
949 912
950 if (i >= 0 && i <= 7) 913 if (i >= 0 && i <= 7)
951 { /* normal colors */ 914 { /* normal colors */
952 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
953 SET_PIXCOLOR (idx);
954 goto done; 916 goto done;
955 } 917 }
956 } 918 }
957 919
958 if (!rXParseAllocColor (&xcol, color)) 920 set_color (xcol, color);
959 return;
960
961 /* XStoreColor (display->display, display->cmap, XColor*); */
962 921
963 /* 922 /*
964 * 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,
965 * so just keep gobbling up the colormap 924 * so just keep gobbling up the colormap
966 */ 925 */
967# if 0
968 for (i = Color_Black; i <= Color_White; i++)
969 if (pix_colors[idx] == pix_colors[i])
970 break;
971 if (i > Color_White)
972 {
973 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
974 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
975 DisplayPlanes (display->display, display->screen));
976 }
977# endif
978 926
979 pix_colors_focused[idx] = xcol; 927 pix_colors_focused[idx] = xcol;
980 SET_PIXCOLOR (idx);
981 928
982 /* XSetWindowAttributes attr; */ 929 /* XSetWindowAttributes attr; */
983 /* Cursor cursor; */ 930 /* Cursor cursor; */
984done: 931done:
985 932
986#if OFF_FOCUS_FADING 933#if OFF_FOCUS_FADING
987 if (rs[Rs_fade]) 934 if (rs[Rs_fade])
988 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 935 {
936 rgba c;
937 pix_colors [Color_fade].get (c);
938 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
939 }
989#endif 940#endif
990 941
991 /*TODO: handle Color_BD, scrollbar background, etc. */ 942 /*TODO: handle Color_BD, scrollbar background, etc. */
992 943
993 recolour_cursor (); 944 recolour_cursor ();
… …
999#endif /* XTERM_COLOR_CHANGE */ 950#endif /* XTERM_COLOR_CHANGE */
1000 951
1001void 952void
1002rxvt_term::recolour_cursor () 953rxvt_term::recolour_cursor ()
1003{ 954{
1004 XColor xcol[2]; 955 XColor fg, bg;
1005 956
1006 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 957 (ISSET_PIXCOLOR (Color_pointer_fg)
1007 ? pix_colors_focused[Color_pointer_fg] 958 ? pix_colors_focused[Color_pointer_fg]
1008 : pix_colors_focused[Color_fg]; 959 : pix_colors_focused[Color_fg]).get (fg);
960
1009 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 961 (ISSET_PIXCOLOR (Color_pointer_bg)
1010 ? pix_colors_focused[Color_pointer_bg] 962 ? pix_colors_focused[Color_pointer_bg]
1011 : pix_colors_focused[Color_bg]; 963 : pix_colors_focused[Color_bg]).get (bg);
1012 964
1013 XQueryColors (display->display, display->cmap, xcol, 2); 965 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg);
1014 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1015} 966}
1016 967
1017/*----------------------------------------------------------------------*/ 968/*----------------------------------------------------------------------*/
1018/* 969/*
1019 * find if fg/bg matches any of the normal (low-intensity) colors 970 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1023{ 974{
1024 unsigned int i; 975 unsigned int i;
1025 const char *xpmb = "\0"; 976 const char *xpmb = "\0";
1026 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 977 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1027 978
1028 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1029 strcpy (fstr, "default"); 979 strcpy (fstr, "default");
1030 strcpy (bstr, "default"); 980 strcpy (bstr, "default");
1031 for (i = Color_Black; i <= Color_White; i++) 981 for (i = Color_Black; i <= Color_White; i++)
1032 if (pix_colors[Color_fg] == pix_colors[i]) 982 if (pix_colors[Color_fg] == pix_colors[i])
1033 { 983 {
… …
1048 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 998 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1049} 999}
1050 1000
1051/*----------------------------------------------------------------------*/ 1001/*----------------------------------------------------------------------*/
1052 1002
1053int 1003bool
1054rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1004rxvt_term::set_color (rxvt_color &color, const char *name)
1055{ 1005{
1056 if (!screen_in_out->set (display, colour)) 1006 if (color.set (this, name))
1057 {
1058 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1059 return false;
1060 }
1061
1062 return true; 1007 return true;
1008
1009 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1010 return false;
1063} 1011}
1064 1012
1065/* -------------------------------------------------------------------- * 1013/* -------------------------------------------------------------------- *
1066 * - WINDOW RESIZING - * 1014 * - WINDOW RESIZING - *
1067 * -------------------------------------------------------------------- */ 1015 * -------------------------------------------------------------------- */
1068void 1016void
1069rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1017rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1070{ 1018{
1071 int fix_screen; 1019 int fix_screen;
1072 int old_width = szHint.width, old_height = szHint.height; 1020 int old_width = szHint.width;
1073 dDisp; 1021 int old_height = szHint.height;
1074 1022
1075 window_calc (newwidth, newheight); 1023 window_calc (newwidth, newheight);
1076 XSetWMNormalHints (disp, parent[0], &szHint); 1024 XSetWMNormalHints (xdisp, parent[0], &szHint);
1077 1025
1078 if (!ignoreparent) 1026 if (!ignoreparent)
1079 { 1027 {
1080#ifdef SMART_RESIZE 1028#ifdef SMART_RESIZE
1081 /* 1029 /*
… …
1085 int x, y, x1, y1; 1033 int x, y, x1, y1;
1086 int dx, dy; 1034 int dx, dy;
1087 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1035 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1088 Window unused_cr; 1036 Window unused_cr;
1089 1037
1090 XTranslateCoordinates (disp, parent[0], display->root, 1038 XTranslateCoordinates (xdisp, parent[0], display->root,
1091 0, 0, &x, &y, &unused_cr); 1039 0, 0, &x, &y, &unused_cr);
1092 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1040 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1093 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1041 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1094 /* 1042 /*
1095 * if display->root isn't the parent window, a WM will probably have offset 1043 * if display->root isn't the parent window, a WM will probably have offset
1096 * our position for handles and decorations. Counter it 1044 * our position for handles and decorations. Counter it
1097 */ 1045 */
… …
1099 { 1047 {
1100 x -= x1; 1048 x -= x1;
1101 y -= y1; 1049 y -= y1;
1102 } 1050 }
1103 1051
1104 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1052 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1105 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1053 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1106 dx = old_width - szHint.width; 1054 dx = old_width - szHint.width;
1107 dy = old_height - szHint.height; 1055 dy = old_height - szHint.height;
1108 1056
1109 /* Check position of the center of the window */ 1057 /* Check position of the center of the window */
1110 if (x < x1) /* left half */ 1058 if (x < x1) /* left half */
1111 dx = 0; 1059 dx = 0;
… …
1114 if (y < y1) /* top half */ 1062 if (y < y1) /* top half */
1115 dy = 0; 1063 dy = 0;
1116 else if (y == y1) /* exact center */ 1064 else if (y == y1) /* exact center */
1117 dy /= 2; 1065 dy /= 2;
1118 1066
1119 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1067 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1120 szHint.width, szHint.height); 1068 szHint.width, szHint.height);
1121#else 1069#else
1122 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1070 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1123#endif 1071#endif
1124 } 1072 }
1125 1073
1126 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1074 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1127 1075
1128 if (fix_screen || newwidth != old_width || newheight != old_height) 1076 if (fix_screen || newwidth != old_width || newheight != old_height)
1129 { 1077 {
1130 if (scrollBar.state) 1078 if (scrollBar.state)
1131 { 1079 {
1132 XMoveResizeWindow (disp, scrollBar.win, 1080 XMoveResizeWindow (xdisp, scrollBar.win,
1133 window_sb_x, 0, 1081 window_sb_x, 0,
1134 scrollbar_TotalWidth (), szHint.height); 1082 scrollbar_TotalWidth (), szHint.height);
1135 resize_scrollbar (); 1083 resize_scrollbar ();
1136 } 1084 }
1137 1085
1138 XMoveResizeWindow (disp, vt, 1086 XMoveResizeWindow (xdisp, vt,
1139 window_vt_x, window_vt_y, 1087 window_vt_x, window_vt_y,
1140 width, height); 1088 width, height);
1141 1089
1142 scr_clear (); 1090 scr_clear ();
1143#ifdef XPM_BACKGROUND 1091#ifdef XPM_BACKGROUND
1144 resize_pixmap (); 1092 resize_pixmap ();
1145#endif 1093#endif
1146 } 1094 }
1147 1095
1148 if (fix_screen || old_height == 0) 1096 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 (); 1097 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 1098
1174#ifdef XPM_BACKGROUND 1099#ifdef XPM_BACKGROUND
1175 if (pixmap) 1100 if (pixmap)
1176 scr_touch (false); 1101 scr_touch (false);
1177#endif 1102#endif
… …
1190{ 1115{
1191 XWindowAttributes wattr; 1116 XWindowAttributes wattr;
1192 1117
1193 if (newwidth == 0 || newheight == 0) 1118 if (newwidth == 0 || newheight == 0)
1194 { 1119 {
1195 XGetWindowAttributes (display->display, display->root, &wattr); 1120 XGetWindowAttributes (xdisp, display->root, &wattr);
1196 1121
1197 if (newwidth == 0) 1122 if (newwidth == 0)
1198 newwidth = wattr.width - szHint.base_width; 1123 newwidth = wattr.width - szHint.base_width;
1199 if (newheight == 0) 1124 if (newheight == 0)
1200 newheight = wattr.height - szHint.base_height; 1125 newheight = wattr.height - szHint.base_height;
… …
1262 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1187 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1263 1188
1264 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1189 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1265 *p = '\0'; 1190 *p = '\0';
1266 1191
1267 atom = XInternAtom (display->display, server, False); 1192 atom = XInternAtom (xdisp, server, False);
1268 win = XGetSelectionOwner (display->display, atom); 1193 win = XGetSelectionOwner (xdisp, atom);
1269 1194
1270 if (win != None) 1195 if (win != None)
1271 return True; 1196 return True;
1272 } 1197 }
1273 1198
… …
1280 XPoint nspot; 1205 XPoint nspot;
1281 XVaNestedList preedit_attr; 1206 XVaNestedList preedit_attr;
1282 1207
1283 if (!Input_Context 1208 if (!Input_Context
1284 || !focus 1209 || !focus
1285 || !(input_style & XIMPreeditPosition)) 1210 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1286 return; 1211 return;
1287 1212
1288 im_set_position (nspot); 1213 im_set_position (nspot);
1289 1214
1290 if (nspot.x == spot.x && nspot.y == spot.y) 1215 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1309 input_method = 0; 1234 input_method = 0;
1310 } 1235 }
1311 1236
1312 Input_Context = 0; 1237 Input_Context = 0;
1313} 1238}
1239
1240#ifdef ENABLE_XIM_ONTHESPOT
1241
1242static void
1243xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1244{
1245 ((rxvt_term *)client_data)->make_current ();
1246 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1247}
1248
1249static void
1250xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1251{
1252 ((rxvt_term *)client_data)->make_current ();
1253 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1254}
1255
1256static void
1257xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1258{
1259 rxvt_term *term = (rxvt_term *)client_data;
1260 XIMText *text = call_data->text;
1261
1262 term->make_current ();
1263
1264 if (text)
1265 {
1266 void *str;
1267
1268 if (!text->encoding_is_wchar && text->string.multi_byte)
1269 {
1270 // of course, X makes it ugly again
1271 if (term->rs[Rs_imLocale])
1272 SET_LOCALE (term->rs[Rs_imLocale]);
1273
1274 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1275 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1276
1277 if (term->rs[Rs_imLocale])
1278 SET_LOCALE (term->locale);
1279 }
1280 else
1281 str = (void *)text->string.wide_char;
1282
1283 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1284 DT_INT, call_data->caret,
1285 DT_INT, call_data->chg_first,
1286 DT_INT, call_data->chg_length,
1287 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1288 DT_WCS_LEN, str, str ? (int)text->length : 0,
1289 DT_END));
1290 }
1291 else
1292 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1293 DT_INT, call_data->caret,
1294 DT_INT, call_data->chg_first,
1295 DT_INT, call_data->chg_length,
1296 DT_END));
1297}
1298
1299#if 0
1300static void
1301xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1302{
1303 ((rxvt_term *)client_data)->make_current ();
1304 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1305 DT_INT, call_data->position,
1306 DT_INT, call_data->direction,
1307 DT_INT, call_data->style,
1308 DT_END));
1309}
1310#endif
1311
1312#endif
1314 1313
1315/* 1314/*
1316 * Try to open a XIM with the current modifiers, then see if we can 1315 * Try to open a XIM with the current modifiers, then see if we can
1317 * open a suitable preedit type 1316 * open a suitable preedit type
1318 */ 1317 */
… …
1325 XRectangle rect, status_rect, needed_rect; 1324 XRectangle rect, status_rect, needed_rect;
1326 unsigned long fg, bg; 1325 unsigned long fg, bg;
1327 const char *p; 1326 const char *p;
1328 char **s; 1327 char **s;
1329 XIMStyles *xim_styles; 1328 XIMStyles *xim_styles;
1329#ifdef ENABLE_XIM_ONTHESPOT
1330 XIMCallback xcb[4];
1331#endif
1330 1332
1331 set_environ (envv); 1333 set_environ (envv);
1332 1334
1333 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1335 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1334 return false; 1336 return false;
1335 1337
1336 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1337 input_method = display->get_xim (locale, modifiers); 1338 input_method = display->get_xim (locale, modifiers);
1338 if (input_method == NULL) 1339 if (input_method == NULL)
1339 return false; 1340 return false;
1340 1341
1341 xim = input_method->xim; 1342 xim = input_method->xim;
… …
1361 s = rxvt_splitcommastring (p); 1362 s = rxvt_splitcommastring (p);
1362 1363
1363 for (i = found = 0; !found && s[i]; i++) 1364 for (i = found = 0; !found && s[i]; i++)
1364 { 1365 {
1365 if (!strcmp (s[i], "OverTheSpot")) 1366 if (!strcmp (s[i], "OverTheSpot"))
1366 input_style = (XIMPreeditPosition | XIMStatusNothing); 1367 input_style = XIMPreeditPosition | XIMStatusNothing;
1367 else if (!strcmp (s[i], "OffTheSpot")) 1368 else if (!strcmp (s[i], "OffTheSpot"))
1368 input_style = (XIMPreeditArea | XIMStatusArea); 1369 input_style = XIMPreeditArea | XIMStatusArea;
1369 else if (!strcmp (s[i], "Root")) 1370 else if (!strcmp (s[i], "Root"))
1370 input_style = (XIMPreeditNothing | XIMStatusNothing); 1371 input_style = XIMPreeditNothing | XIMStatusNothing;
1371 else if (!strcmp (s[i], "None")) 1372 else if (!strcmp (s[i], "None"))
1372 input_style = (XIMPreeditNone | XIMStatusNone); 1373 input_style = XIMPreeditNone | XIMStatusNone;
1374#ifdef ENABLE_XIM_ONTHESPOT
1375 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1376 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1377#endif
1378 else
1379 input_style = XIMPreeditNothing | XIMStatusNothing;
1373 1380
1374 for (j = 0; j < xim_styles->count_styles; j++) 1381 for (j = 0; j < xim_styles->count_styles; j++)
1375 if (input_style == xim_styles->supported_styles[j]) 1382 if (input_style == xim_styles->supported_styles[j])
1376 { 1383 {
1377 rxvt_freecommastring (s); 1384 rxvt_freecommastring (s);
… …
1415 "*", 1422 "*",
1416 fheight, 1423 fheight,
1417 fheight + 1, fheight - 1, 1424 fheight + 1, fheight - 1,
1418 fheight - 2, fheight + 2); 1425 fheight - 2, fheight + 2);
1419 1426
1420 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1427 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1421 &missing_charset_list, &missing_charset_count, &def_string); 1428 &missing_charset_list, &missing_charset_count, &def_string);
1422 1429
1423 if (missing_charset_list) 1430 if (missing_charset_list)
1424 XFreeStringList (missing_charset_list); 1431 XFreeStringList (missing_charset_list);
1425 1432
… …
1466 XNBackground, bg, 1473 XNBackground, bg,
1467 XNArea, &status_rect, 1474 XNArea, &status_rect,
1468 XNFontSet, fs, 1475 XNFontSet, fs,
1469 NULL); 1476 NULL);
1470 } 1477 }
1478#if ENABLE_XIM_ONTHESPOT
1479 else if (input_style & XIMPreeditCallbacks)
1480 {
1481 im_set_position (spot);
1482
1483 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1484 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1485 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1486# if 0
1487 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1488# endif
1489
1490 preedit_attr = XVaCreateNestedList (0,
1491 XNSpotLocation, &spot,
1492 XNPreeditStartCallback, &xcb[0],
1493 XNPreeditDoneCallback , &xcb[1],
1494 XNPreeditDrawCallback , &xcb[2],
1495# if 0
1496 XNPreeditCaretCallback, &xcb[3],
1497# endif
1498 NULL);
1499 }
1500#endif
1471 1501
1472 Input_Context = XCreateIC (xim, 1502 Input_Context = XCreateIC (xim,
1473 XNInputStyle, input_style, 1503 XNInputStyle, input_style,
1474 XNClientWindow, vt, 1504 XNClientWindow, vt,
1475 XNFocusWindow, parent[0], 1505 XNFocusWindow, parent[0],
… …
1478 status_attr ? XNStatusAttributes : NULL, 1508 status_attr ? XNStatusAttributes : NULL,
1479 status_attr, NULL); 1509 status_attr, NULL);
1480 1510
1481 if (preedit_attr) XFree (preedit_attr); 1511 if (preedit_attr) XFree (preedit_attr);
1482 if (status_attr) XFree (status_attr); 1512 if (status_attr) XFree (status_attr);
1483 if (fs) XFreeFontSet (display->display, fs); 1513 if (fs) XFreeFontSet (xdisp, fs);
1484 1514
1485 if (Input_Context == NULL) 1515 if (Input_Context == NULL)
1486 { 1516 {
1487 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1517 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1488 im_destroy (); 1518 im_destroy ();
1489 return false; 1519 return false;
1490 } 1520 }
1491 1521
1522#if 0
1523 // unfortunately, only the focus window is used by XIM, hard to fix
1524 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1525 vt_select_input ();
1526#endif
1527
1492 if (input_style & XIMPreeditArea) 1528 if (input_style & XIMPreeditArea)
1493 IMSetStatusPosition (); 1529 IMSetStatusPosition ();
1494 1530
1495 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1496 return true; 1531 return true;
1497} 1532}
1498 1533
1499void 1534void
1500rxvt_term::im_cb () 1535rxvt_term::im_cb ()
… …
1506 1541
1507 make_current (); 1542 make_current ();
1508 1543
1509 im_destroy (); 1544 im_destroy ();
1510 1545
1511 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1512 if (Input_Context) 1546 if (Input_Context)
1513 return; 1547 return;
1514 1548
1515#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1549#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1516 if (rs[Rs_imLocale]) 1550 if (rs[Rs_imLocale])
… …
1589 XFree (preedit_attr); 1623 XFree (preedit_attr);
1590 XFree (status_attr); 1624 XFree (status_attr);
1591} 1625}
1592#endif /* USE_XIM */ 1626#endif /* USE_XIM */
1593 1627
1594/*----------------------------------------------------------------------*/
1595rxvt_t rxvt_current_term;
1596
1597/*----------------------- end-of-file (C source) -----------------------*/ 1628/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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