ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.191 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.215 by root, Wed Feb 1 18:36:48 2006 UTC

… …
170 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif 171#endif
172#ifdef USE_XIM 172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
174#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
175 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
176 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
177 child_ev (this, &rxvt_term::child_cb), 180 child_ev (this, &rxvt_term::child_cb),
178 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
179 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
… …
213#endif 216#endif
214 delete fontset[0]; 217 delete fontset[0];
215 218
216 if (display) 219 if (display)
217 { 220 {
218 dDisp;
219
220 selection_clear (); 221 selection_clear ();
221 222
222#ifdef USE_XIM 223#ifdef USE_XIM
223 im_destroy (); 224 im_destroy ();
224#endif 225#endif
225#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
227 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
228#endif 229#endif
229#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
230 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
231#endif 232#endif
232#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
233 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (xdisp, blackGC);
234 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (xdisp, whiteGC);
235 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (xdisp, grayGC);
236 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (xdisp, darkGC);
237 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (xdisp, stippleGC);
238 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (xdisp, dimple);
239 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (xdisp, upArrow);
240 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (xdisp, downArrow);
241 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
242 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
243#endif 244#endif
244#ifdef RXVT_SCROLLBAR 245#ifdef RXVT_SCROLLBAR
245 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
246 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
247 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
248#endif 249#endif
249 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (xdisp, gc);
250 251
251 delete drawable; 252 delete drawable;
252 // destroy all windows 253 // destroy all windows
253 if (parent[0]) 254 if (parent[0])
254 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (xdisp, parent[0]);
256
257 clear ();
255 } 258 }
256 259
257 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
258 delete pix_colors_focused; 261 delete pix_colors_focused;
259#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
… …
268 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
269 free (allocated [i]); 272 free (allocated [i]);
270 273
271 free (selection.text); 274 free (selection.text);
272 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
273 free (env_windowid);
274 free (env_display); 276 free (env_display);
275 free (env_term); 277 free (env_term);
276 free (env_colorfgbg);
277 free (locale); 278 free (locale);
278 free (v_buffer); 279 free (v_buffer);
279 free (incr_buf); 280 free (incr_buf);
280 281
281 delete envv; 282 delete envv;
… …
302rxvt_term::destroy () 303rxvt_term::destroy ()
303{ 304{
304 if (destroy_ev.active) 305 if (destroy_ev.active)
305 return; 306 return;
306 307
307 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
308 return;
309 309
310#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
311 scr_overlay_off (); 311 scr_overlay_off ();
312#endif 312#endif
313 313
… …
368{ 368{
369 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++)
370 (*t)->emergency_cleanup (); 370 (*t)->emergency_cleanup ();
371} 371}
372 372
373#if ENABLE_FRILLS 373#if !ENABLE_MINIMAL
374static void 374static void
375print_x_error (Display *dpy, XErrorEvent *event) 375print_x_error (Display *dpy, XErrorEvent *event)
376{ 376{
377 char buffer[BUFSIZ]; 377 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 378 char mesg[BUFSIZ];
… …
426 GET_R->allowedxerror = event->error_code; 426 GET_R->allowedxerror = event->error_code;
427 else 427 else
428 { 428 {
429 // 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,
430 // so just output the error and continue 430 // so just output the error and continue
431#if ENABLE_FRILLS 431#if ENABLE_MINIMAL
432 old_xerror_handler (display, event);
433#else
432 print_x_error (display, event); 434 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 435#endif
436 } 436 }
437 437
438 return 0; 438 return 0;
439} 439}
… …
447 _exit (EXIT_FAILURE); 447 _exit (EXIT_FAILURE);
448} 448}
449 449
450/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
451bool 451bool
452rxvt_term::init (int argc, const char *const *argv) 452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
453{ 453{
454 this->envv = envv;
455
454 SET_R (this); 456 SET_R (this);
455 set_locale (""); 457 set_locale ("");
456 set_environ (envv); // few things in X do not call setlocale :( 458 set_environ (envv); // few things in X do not call setlocale :(
457 459
458 if (!init_vars ()) 460 if (!init_vars ())
… …
464 466
465#ifdef KEYSYM_RESOURCE 467#ifdef KEYSYM_RESOURCE
466 keyboard->register_done (); 468 keyboard->register_done ();
467#endif 469#endif
468 470
469#if ENABLE_PERL
470 if (!rs[Rs_perl_ext_1])
471 rs[Rs_perl_ext_1] = "default";
472
473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
476 {
477 rxvt_perl.init (this);
478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
479 }
480#endif
481
482#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
483 if (OPTION (Opt_scrollBar)) 472 if (OPTION (Opt_scrollBar))
484 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
485#endif 474#endif
486 475
487 pty = rxvt_new_ptytty (); 476 pty = ptytty::create ();
488 477
489 create_windows (argc, argv); 478 create_windows (argc, argv);
490 479
491 dDisp;
492
493 init_xlocale (); 480 init_xlocale ();
494 481
495 scr_reset (); // initialize screen 482 scr_reset (); // initialize screen
496 483
497#if 0 484#if 0
498 XSynchronize (disp, True); 485 XSynchronize (xdisp, True);
499#endif 486#endif
500 487
501#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
502 if (OPTION (Opt_scrollBar)) 489 if (OPTION (Opt_scrollBar))
503 resize_scrollbar (); /* create and map scrollbar */ 490 resize_scrollbar (); /* create and map scrollbar */
504#endif 491#endif
505#ifdef TRANSPARENT 492#ifdef TRANSPARENT
506 if (OPTION (Opt_transparent)) 493 if (OPTION (Opt_transparent))
507 { 494 {
508 XSelectInput (disp, display->root, PropertyChangeMask); 495 XSelectInput (xdisp, display->root, PropertyChangeMask);
509 check_our_parents (); 496 check_our_parents ();
510 rootwin_ev.start (display, display->root); 497 rootwin_ev.start (display, display->root);
511 } 498 }
512#endif 499#endif
513 500
… …
522 509
523 check_ev.start (); 510 check_ev.start ();
524 511
525 HOOK_INVOKE ((this, HOOK_START, DT_END)); 512 HOOK_INVOKE ((this, HOOK_START, DT_END));
526 513
514#if ENABLE_XEMBED
515 if (rs[Rs_embed])
516 {
517 long info[2] = { 0, XEMBED_MAPPED };
518
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2);
521 }
522#endif
523
527 XMapWindow (disp, vt); 524 XMapWindow (xdisp, vt);
528 XMapWindow (disp, parent[0]); 525 XMapWindow (xdisp, parent[0]);
529 526
530 return true; 527 return true;
531} 528}
532 529
533static struct sig_handlers 530static struct sig_handlers
… …
538 * Catch a fatal signal and tidy up before quitting 535 * Catch a fatal signal and tidy up before quitting
539 */ 536 */
540 void 537 void
541 sig_term (sig_watcher &w) 538 sig_term (sig_watcher &w)
542 { 539 {
543#ifdef DEBUG_CMD
544 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
545#endif
546 rxvt_emergency_cleanup (); 540 rxvt_emergency_cleanup ();
547 signal (w.signum, SIG_DFL); 541 signal (w.signum, SIG_DFL);
548 kill (getpid (), w.signum); 542 kill (getpid (), w.signum);
549 } 543 }
550 544
… …
558char **rxvt_environ; // startup environment 552char **rxvt_environ; // startup environment
559 553
560void 554void
561rxvt_init () 555rxvt_init ()
562{ 556{
563 uid_t uid = getuid (); 557 ptytty::init ();
564 gid_t gid = getgid ();
565
566 // before doing anything else, check for setuid/setgid operation,
567 // start the helper process and drop privileges
568 if (uid != geteuid ()
569 || gid != getegid ())
570 {
571#if PTYTTY_HELPER
572 rxvt_ptytty_server ();
573#else
574 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
575#endif
576
577 // drop privileges
578#if HAVE_SETRESUID
579 setresgid (gid, gid, gid);
580 setresuid (uid, uid, uid);
581#elif HAVE_SETREUID
582 setregid (gid, gid);
583 setreuid (uid, uid);
584#elif HAVE_SETUID
585 setgid (gid);
586 setuid (uid);
587#endif
588
589 if (uid != geteuid ()
590 || gid != getegid ())
591 rxvt_fatal ("unable to drop privileges, aborting.\n");
592 }
593 558
594 rxvt_environ = environ; 559 rxvt_environ = environ;
595 560
596 signal (SIGHUP, SIG_IGN); 561 signal (SIGHUP, SIG_IGN);
597 signal (SIGPIPE, SIG_IGN); 562 signal (SIGPIPE, SIG_IGN);
… …
655{ 620{
656 short recalc_x, recalc_y; 621 short recalc_x, recalc_y;
657 int x, y, sb_w, flags; 622 int x, y, sb_w, flags;
658 unsigned int w, h; 623 unsigned int w, h;
659 unsigned int max_width, max_height; 624 unsigned int max_width, max_height;
660 dDisp;
661
662 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
663 ncol, nrow, szHint.width, szHint.height));
664 625
665 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
666 szHint.win_gravity = NorthWestGravity; 627 szHint.win_gravity = NorthWestGravity;
667 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 628 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
668 629
… …
730 691
731 if (scrollBar.state) 692 if (scrollBar.state)
732 { 693 {
733 sb_w = scrollbar_TotalWidth (); 694 sb_w = scrollbar_TotalWidth ();
734 szHint.base_width += sb_w; 695 szHint.base_width += sb_w;
696
735 if (!OPTION (Opt_scrollBar_right)) 697 if (!OPTION (Opt_scrollBar_right))
736 window_vt_x += sb_w; 698 window_vt_x += sb_w;
737 } 699 }
738 700
739 szHint.width_inc = fwidth; 701 szHint.width_inc = fwidth;
… …
765 727
766 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 728 if (scrollBar.state && OPTION (Opt_scrollBar_right))
767 window_sb_x = szHint.width - sb_w; 729 window_sb_x = szHint.width - sb_w;
768 730
769 if (recalc_x) 731 if (recalc_x)
770 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 732 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
733
771 if (recalc_y) 734 if (recalc_y)
772 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 735 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
773 736
774 ncol = width / fwidth; 737 ncol = width / fwidth;
775 nrow = height / fheight; 738 nrow = height / fheight;
776 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
777 ncol, nrow, szHint.width,
778 szHint.height));
779 return;
780} 739}
781 740
782/*----------------------------------------------------------------------*/ 741/*----------------------------------------------------------------------*/
783/* 742/*
784 * Tell the teletype handler what size the window is. 743 * Tell the teletype handler what size the window is.
… …
884 return true; 843 return true;
885} 844}
886 845
887void 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)
888{ 847{
889 XChangeProperty (display->display, parent[0], 848 XChangeProperty (xdisp, parent[0],
890 prop, XA_STRING, 8, PropModeReplace, 849 prop, XA_STRING, 8, PropModeReplace,
891 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 850 (const unsigned char *)str, len >= 0 ? len : strlen (str));
892} 851}
893 852
894void 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)
895{ 854{
896 wchar_t *ws = rxvt_mbstowcs (str, len); 855 wchar_t *ws = rxvt_mbstowcs (str, len);
897 char *s = rxvt_wcstoutf8 (ws); 856 char *s = rxvt_wcstoutf8 (ws);
898 857
899 XChangeProperty (display->display, parent[0], 858 XChangeProperty (xdisp, parent[0],
900 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 859 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
901 (const unsigned char *)s, strlen (s)); 860 (const unsigned char *)s, strlen (s));
902 861
903 free (s); 862 free (s);
904 free (ws); 863 free (ws);
… …
929void 888void
930rxvt_term::set_window_color (int idx, const char *color) 889rxvt_term::set_window_color (int idx, const char *color)
931{ 890{
932 rxvt_color xcol; 891 rxvt_color xcol;
933 int i; 892 int i;
934 893
935 if (color == NULL || *color == '\0') 894 if (color == NULL || *color == '\0')
936 return; 895 return;
896
897 color = strdup (color);
898 allocated.push_back ((void *)color);
899 rs[Rs_color + idx] = color;
937 900
938 /* handle color aliases */ 901 /* handle color aliases */
939 if (isdigit (*color)) 902 if (isdigit (*color))
940 { 903 {
941 i = atoi (color); 904 i = atoi (color);
942 905
943 if (i >= 8 && i <= 15) 906 if (i >= 8 && i <= 15)
944 { /* bright colors */ 907 { /* bright colors */
945 i -= 8; 908 i -= 8;
946 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 909 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
947 SET_PIXCOLOR (idx);
948 goto done; 910 goto done;
949 } 911 }
950 912
951 if (i >= 0 && i <= 7) 913 if (i >= 0 && i <= 7)
952 { /* normal colors */ 914 { /* normal colors */
953 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
954 SET_PIXCOLOR (idx);
955 goto done; 916 goto done;
956 } 917 }
957 } 918 }
958 919
959 if (!rXParseAllocColor (&xcol, color)) 920 set_color (xcol, color);
960 return;
961
962 /* XStoreColor (display->display, display->cmap, XColor*); */
963 921
964 /* 922 /*
965 * 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,
966 * so just keep gobbling up the colormap 924 * so just keep gobbling up the colormap
967 */ 925 */
968# if 0
969 for (i = Color_Black; i <= Color_White; i++)
970 if (pix_colors[idx] == pix_colors[i])
971 break;
972 if (i > Color_White)
973 {
974 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
975 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
976 DisplayPlanes (display->display, display->screen));
977 }
978# endif
979 926
980 pix_colors_focused[idx] = xcol; 927 pix_colors_focused[idx] = xcol;
981 SET_PIXCOLOR (idx);
982 928
983 /* XSetWindowAttributes attr; */ 929 /* XSetWindowAttributes attr; */
984 /* Cursor cursor; */ 930 /* Cursor cursor; */
985done: 931done:
986 932
987#if OFF_FOCUS_FADING 933#if OFF_FOCUS_FADING
988 if (rs[Rs_fade]) 934 if (rs[Rs_fade])
989 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 }
990#endif 940#endif
991 941
992 /*TODO: handle Color_BD, scrollbar background, etc. */ 942 /*TODO: handle Color_BD, scrollbar background, etc. */
993 943
994 recolour_cursor (); 944 recolour_cursor ();
… …
1000#endif /* XTERM_COLOR_CHANGE */ 950#endif /* XTERM_COLOR_CHANGE */
1001 951
1002void 952void
1003rxvt_term::recolour_cursor () 953rxvt_term::recolour_cursor ()
1004{ 954{
1005 XColor xcol[2]; 955 XColor fg, bg;
1006 956
1007 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 957 (ISSET_PIXCOLOR (Color_pointer_fg)
1008 ? pix_colors_focused[Color_pointer_fg] 958 ? pix_colors_focused[Color_pointer_fg]
1009 : pix_colors_focused[Color_fg]; 959 : pix_colors_focused[Color_fg]).get (fg);
960
1010 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 961 (ISSET_PIXCOLOR (Color_pointer_bg)
1011 ? pix_colors_focused[Color_pointer_bg] 962 ? pix_colors_focused[Color_pointer_bg]
1012 : pix_colors_focused[Color_bg]; 963 : pix_colors_focused[Color_bg]).get (bg);
1013 964
1014 XQueryColors (display->display, display->cmap, xcol, 2); 965 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg);
1015 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1016} 966}
1017 967
1018/*----------------------------------------------------------------------*/ 968/*----------------------------------------------------------------------*/
1019/* 969/*
1020 * 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
… …
1024{ 974{
1025 unsigned int i; 975 unsigned int i;
1026 const char *xpmb = "\0"; 976 const char *xpmb = "\0";
1027 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 977 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1028 978
1029 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1030 strcpy (fstr, "default"); 979 strcpy (fstr, "default");
1031 strcpy (bstr, "default"); 980 strcpy (bstr, "default");
1032 for (i = Color_Black; i <= Color_White; i++) 981 for (i = Color_Black; i <= Color_White; i++)
1033 if (pix_colors[Color_fg] == pix_colors[i]) 982 if (pix_colors[Color_fg] == pix_colors[i])
1034 { 983 {
… …
1049 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 998 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1050} 999}
1051 1000
1052/*----------------------------------------------------------------------*/ 1001/*----------------------------------------------------------------------*/
1053 1002
1054int 1003bool
1055rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1004rxvt_term::set_color (rxvt_color &color, const char *name)
1056{ 1005{
1057 if (!screen_in_out->set (display, colour)) 1006 if (color.set (this, name))
1058 {
1059 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1060 return false;
1061 }
1062
1063 return true; 1007 return true;
1008
1009 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1010 return false;
1064} 1011}
1065 1012
1066/* -------------------------------------------------------------------- * 1013/* -------------------------------------------------------------------- *
1067 * - WINDOW RESIZING - * 1014 * - WINDOW RESIZING - *
1068 * -------------------------------------------------------------------- */ 1015 * -------------------------------------------------------------------- */
1069void 1016void
1070rxvt_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)
1071{ 1018{
1072 int fix_screen; 1019 int fix_screen;
1073 int old_width = szHint.width, old_height = szHint.height; 1020 int old_width = szHint.width;
1074 dDisp; 1021 int old_height = szHint.height;
1075 1022
1076 window_calc (newwidth, newheight); 1023 window_calc (newwidth, newheight);
1077 XSetWMNormalHints (disp, parent[0], &szHint); 1024 XSetWMNormalHints (xdisp, parent[0], &szHint);
1078 1025
1079 if (!ignoreparent) 1026 if (!ignoreparent)
1080 { 1027 {
1081#ifdef SMART_RESIZE 1028#ifdef SMART_RESIZE
1082 /* 1029 /*
… …
1086 int x, y, x1, y1; 1033 int x, y, x1, y1;
1087 int dx, dy; 1034 int dx, dy;
1088 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1035 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1089 Window unused_cr; 1036 Window unused_cr;
1090 1037
1091 XTranslateCoordinates (disp, parent[0], display->root, 1038 XTranslateCoordinates (xdisp, parent[0], display->root,
1092 0, 0, &x, &y, &unused_cr); 1039 0, 0, &x, &y, &unused_cr);
1093 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1040 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1094 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1041 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1095 /* 1042 /*
1096 * 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
1097 * our position for handles and decorations. Counter it 1044 * our position for handles and decorations. Counter it
1098 */ 1045 */
… …
1100 { 1047 {
1101 x -= x1; 1048 x -= x1;
1102 y -= y1; 1049 y -= y1;
1103 } 1050 }
1104 1051
1105 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1052 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1106 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1053 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1107 dx = old_width - szHint.width; 1054 dx = old_width - szHint.width;
1108 dy = old_height - szHint.height; 1055 dy = old_height - szHint.height;
1109 1056
1110 /* Check position of the center of the window */ 1057 /* Check position of the center of the window */
1111 if (x < x1) /* left half */ 1058 if (x < x1) /* left half */
1112 dx = 0; 1059 dx = 0;
… …
1115 if (y < y1) /* top half */ 1062 if (y < y1) /* top half */
1116 dy = 0; 1063 dy = 0;
1117 else if (y == y1) /* exact center */ 1064 else if (y == y1) /* exact center */
1118 dy /= 2; 1065 dy /= 2;
1119 1066
1120 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1067 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1121 szHint.width, szHint.height); 1068 szHint.width, szHint.height);
1122#else 1069#else
1123 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1070 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1124#endif 1071#endif
1125 } 1072 }
1126 1073
1127 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1074 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1128 1075
1129 if (fix_screen || newwidth != old_width || newheight != old_height) 1076 if (fix_screen || newwidth != old_width || newheight != old_height)
1130 { 1077 {
1131 if (scrollBar.state) 1078 if (scrollBar.state)
1132 { 1079 {
1133 XMoveResizeWindow (disp, scrollBar.win, 1080 XMoveResizeWindow (xdisp, scrollBar.win,
1134 window_sb_x, 0, 1081 window_sb_x, 0,
1135 scrollbar_TotalWidth (), szHint.height); 1082 scrollbar_TotalWidth (), szHint.height);
1136 resize_scrollbar (); 1083 resize_scrollbar ();
1137 } 1084 }
1138 1085
1139 XMoveResizeWindow (disp, vt, 1086 XMoveResizeWindow (xdisp, vt,
1140 window_vt_x, window_vt_y, 1087 window_vt_x, window_vt_y,
1141 width, height); 1088 width, height);
1142 1089
1143 scr_clear (); 1090 scr_clear ();
1144#ifdef XPM_BACKGROUND 1091#ifdef XPM_BACKGROUND
1145 resize_pixmap (); 1092 resize_pixmap ();
1146#endif 1093#endif
1147 } 1094 }
1148 1095
1149 if (fix_screen || old_height == 0) 1096 if (fix_screen || old_height == 0)
1150 {
1151 int curr_screen = -1;
1152 int old_ncol = prev_ncol;
1153
1154 /* scr_reset only works on the primary screen */
1155 if (old_height) /* this is not the first time through */
1156 {
1157 unsigned int ocol = ncol;
1158 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1159 curr_screen = scr_change_screen (PRIMARY);
1160 ncol = ocol;
1161 }
1162
1163 scr_reset (); 1097 scr_reset ();
1164
1165 if (curr_screen >= 0) /* this is not the first time through */
1166 {
1167 scr_change_screen (curr_screen);
1168 selection_check (old_ncol != ncol ? 4 : 0);
1169 }
1170 }
1171
1172 old_width = szHint.width;
1173 old_height = szHint.height;
1174 1098
1175#ifdef XPM_BACKGROUND 1099#ifdef XPM_BACKGROUND
1176 if (pixmap) 1100 if (pixmap)
1177 scr_touch (false); 1101 scr_touch (false);
1178#endif 1102#endif
… …
1191{ 1115{
1192 XWindowAttributes wattr; 1116 XWindowAttributes wattr;
1193 1117
1194 if (newwidth == 0 || newheight == 0) 1118 if (newwidth == 0 || newheight == 0)
1195 { 1119 {
1196 XGetWindowAttributes (display->display, display->root, &wattr); 1120 XGetWindowAttributes (xdisp, display->root, &wattr);
1197 1121
1198 if (newwidth == 0) 1122 if (newwidth == 0)
1199 newwidth = wattr.width - szHint.base_width; 1123 newwidth = wattr.width - szHint.base_width;
1200 if (newheight == 0) 1124 if (newheight == 0)
1201 newheight = wattr.height - szHint.base_height; 1125 newheight = wattr.height - szHint.base_height;
… …
1263 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1187 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1264 1188
1265 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1189 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1266 *p = '\0'; 1190 *p = '\0';
1267 1191
1268 atom = XInternAtom (display->display, server, False); 1192 atom = XInternAtom (xdisp, server, False);
1269 win = XGetSelectionOwner (display->display, atom); 1193 win = XGetSelectionOwner (xdisp, atom);
1270 1194
1271 if (win != None) 1195 if (win != None)
1272 return True; 1196 return True;
1273 } 1197 }
1274 1198
… …
1281 XPoint nspot; 1205 XPoint nspot;
1282 XVaNestedList preedit_attr; 1206 XVaNestedList preedit_attr;
1283 1207
1284 if (!Input_Context 1208 if (!Input_Context
1285 || !focus 1209 || !focus
1286 || !(input_style & XIMPreeditPosition)) 1210 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1287 return; 1211 return;
1288 1212
1289 im_set_position (nspot); 1213 im_set_position (nspot);
1290 1214
1291 if (nspot.x == spot.x && nspot.y == spot.y) 1215 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1310 input_method = 0; 1234 input_method = 0;
1311 } 1235 }
1312 1236
1313 Input_Context = 0; 1237 Input_Context = 0;
1314} 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
1315 1313
1316/* 1314/*
1317 * 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
1318 * open a suitable preedit type 1316 * open a suitable preedit type
1319 */ 1317 */
… …
1326 XRectangle rect, status_rect, needed_rect; 1324 XRectangle rect, status_rect, needed_rect;
1327 unsigned long fg, bg; 1325 unsigned long fg, bg;
1328 const char *p; 1326 const char *p;
1329 char **s; 1327 char **s;
1330 XIMStyles *xim_styles; 1328 XIMStyles *xim_styles;
1329#ifdef ENABLE_XIM_ONTHESPOT
1330 XIMCallback xcb[4];
1331#endif
1331 1332
1332 set_environ (envv); 1333 set_environ (envv);
1333 1334
1334 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1335 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1335 return false; 1336 return false;
1336 1337
1337 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1338 input_method = display->get_xim (locale, modifiers); 1338 input_method = display->get_xim (locale, modifiers);
1339 if (input_method == NULL) 1339 if (input_method == NULL)
1340 return false; 1340 return false;
1341 1341
1342 xim = input_method->xim; 1342 xim = input_method->xim;
… …
1362 s = rxvt_splitcommastring (p); 1362 s = rxvt_splitcommastring (p);
1363 1363
1364 for (i = found = 0; !found && s[i]; i++) 1364 for (i = found = 0; !found && s[i]; i++)
1365 { 1365 {
1366 if (!strcmp (s[i], "OverTheSpot")) 1366 if (!strcmp (s[i], "OverTheSpot"))
1367 input_style = (XIMPreeditPosition | XIMStatusNothing); 1367 input_style = XIMPreeditPosition | XIMStatusNothing;
1368 else if (!strcmp (s[i], "OffTheSpot")) 1368 else if (!strcmp (s[i], "OffTheSpot"))
1369 input_style = (XIMPreeditArea | XIMStatusArea); 1369 input_style = XIMPreeditArea | XIMStatusArea;
1370 else if (!strcmp (s[i], "Root")) 1370 else if (!strcmp (s[i], "Root"))
1371 input_style = (XIMPreeditNothing | XIMStatusNothing); 1371 input_style = XIMPreeditNothing | XIMStatusNothing;
1372 else if (!strcmp (s[i], "None")) 1372 else if (!strcmp (s[i], "None"))
1373 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;
1374 1380
1375 for (j = 0; j < xim_styles->count_styles; j++) 1381 for (j = 0; j < xim_styles->count_styles; j++)
1376 if (input_style == xim_styles->supported_styles[j]) 1382 if (input_style == xim_styles->supported_styles[j])
1377 { 1383 {
1378 rxvt_freecommastring (s); 1384 rxvt_freecommastring (s);
… …
1416 "*", 1422 "*",
1417 fheight, 1423 fheight,
1418 fheight + 1, fheight - 1, 1424 fheight + 1, fheight - 1,
1419 fheight - 2, fheight + 2); 1425 fheight - 2, fheight + 2);
1420 1426
1421 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1427 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1422 &missing_charset_list, &missing_charset_count, &def_string); 1428 &missing_charset_list, &missing_charset_count, &def_string);
1423 1429
1424 if (missing_charset_list) 1430 if (missing_charset_list)
1425 XFreeStringList (missing_charset_list); 1431 XFreeStringList (missing_charset_list);
1426 1432
… …
1467 XNBackground, bg, 1473 XNBackground, bg,
1468 XNArea, &status_rect, 1474 XNArea, &status_rect,
1469 XNFontSet, fs, 1475 XNFontSet, fs,
1470 NULL); 1476 NULL);
1471 } 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
1472 1501
1473 Input_Context = XCreateIC (xim, 1502 Input_Context = XCreateIC (xim,
1474 XNInputStyle, input_style, 1503 XNInputStyle, input_style,
1475 XNClientWindow, vt, 1504 XNClientWindow, vt,
1476 XNFocusWindow, parent[0], 1505 XNFocusWindow, parent[0],
… …
1479 status_attr ? XNStatusAttributes : NULL, 1508 status_attr ? XNStatusAttributes : NULL,
1480 status_attr, NULL); 1509 status_attr, NULL);
1481 1510
1482 if (preedit_attr) XFree (preedit_attr); 1511 if (preedit_attr) XFree (preedit_attr);
1483 if (status_attr) XFree (status_attr); 1512 if (status_attr) XFree (status_attr);
1484 if (fs) XFreeFontSet (display->display, fs); 1513 if (fs) XFreeFontSet (xdisp, fs);
1485 1514
1486 if (Input_Context == NULL) 1515 if (Input_Context == NULL)
1487 { 1516 {
1488 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1517 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1489 im_destroy (); 1518 im_destroy ();
1490 return false; 1519 return false;
1491 } 1520 }
1492 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
1493 if (input_style & XIMPreeditArea) 1528 if (input_style & XIMPreeditArea)
1494 IMSetStatusPosition (); 1529 IMSetStatusPosition ();
1495 1530
1496 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1497 return true; 1531 return true;
1498} 1532}
1499 1533
1500void 1534void
1501rxvt_term::im_cb () 1535rxvt_term::im_cb ()
… …
1507 1541
1508 make_current (); 1542 make_current ();
1509 1543
1510 im_destroy (); 1544 im_destroy ();
1511 1545
1512 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1513 if (Input_Context) 1546 if (Input_Context)
1514 return; 1547 return;
1515 1548
1516#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1549#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1517 if (rs[Rs_imLocale]) 1550 if (rs[Rs_imLocale])

Diff Legend

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