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.217 by root, Thu Feb 2 18:00:23 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]);
255 }
256 256
257 // TODO: free pixcolours, colours should become part of rxvt_display 257 for (int i = 0; i < TOTAL_COLORS; i++)
258 if (ISSET_PIXCOLOR (i))
259 {
260 pix_colors_focused [i].free (this);
261#if OFF_FOCUS_FADING
262 pix_colors_unfocused [i].free (this);
263#endif
264 }
265
266 clear ();
267 }
268
258 delete pix_colors_focused; 269 delete pix_colors_focused;
259#if OFF_FOCUS_FADING 270#if OFF_FOCUS_FADING
260 delete pix_colors_unfocused; 271 delete pix_colors_unfocused;
261#endif 272#endif
262 273
… …
268 for (int i = 0; i < allocated.size (); i++) 279 for (int i = 0; i < allocated.size (); i++)
269 free (allocated [i]); 280 free (allocated [i]);
270 281
271 free (selection.text); 282 free (selection.text);
272 // TODO: manage env vars in child only(!) 283 // TODO: manage env vars in child only(!)
273 free (env_windowid);
274 free (env_display); 284 free (env_display);
275 free (env_term); 285 free (env_term);
276 free (env_colorfgbg);
277 free (locale); 286 free (locale);
278 free (v_buffer); 287 free (v_buffer);
279 free (incr_buf); 288 free (incr_buf);
280 289
281 delete envv; 290 delete envv;
… …
302rxvt_term::destroy () 311rxvt_term::destroy ()
303{ 312{
304 if (destroy_ev.active) 313 if (destroy_ev.active)
305 return; 314 return;
306 315
307 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 316 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
308 return;
309 317
310#if ENABLE_OVERLAY 318#if ENABLE_OVERLAY
311 scr_overlay_off (); 319 scr_overlay_off ();
312#endif 320#endif
313 321
… …
368{ 376{
369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 377 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370 (*t)->emergency_cleanup (); 378 (*t)->emergency_cleanup ();
371} 379}
372 380
373#if ENABLE_FRILLS 381#if !ENABLE_MINIMAL
374static void 382static void
375print_x_error (Display *dpy, XErrorEvent *event) 383print_x_error (Display *dpy, XErrorEvent *event)
376{ 384{
377 char buffer[BUFSIZ]; 385 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 386 char mesg[BUFSIZ];
… …
426 GET_R->allowedxerror = event->error_code; 434 GET_R->allowedxerror = event->error_code;
427 else 435 else
428 { 436 {
429 // GET_R is most likely not the terminal which caused the error, 437 // GET_R is most likely not the terminal which caused the error,
430 // so just output the error and continue 438 // so just output the error and continue
431#if ENABLE_FRILLS 439#if ENABLE_MINIMAL
440 old_xerror_handler (display, event);
441#else
432 print_x_error (display, event); 442 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 443#endif
436 } 444 }
437 445
438 return 0; 446 return 0;
439} 447}
… …
447 _exit (EXIT_FAILURE); 455 _exit (EXIT_FAILURE);
448} 456}
449 457
450/*----------------------------------------------------------------------*/ 458/*----------------------------------------------------------------------*/
451bool 459bool
452rxvt_term::init (int argc, const char *const *argv) 460rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
453{ 461{
462 this->envv = envv;
463
454 SET_R (this); 464 SET_R (this);
455 set_locale (""); 465 set_locale ("");
456 set_environ (envv); // few things in X do not call setlocale :( 466 set_environ (envv); // few things in X do not call setlocale :(
457 467
458 if (!init_vars ()) 468 if (!init_vars ())
… …
464 474
465#ifdef KEYSYM_RESOURCE 475#ifdef KEYSYM_RESOURCE
466 keyboard->register_done (); 476 keyboard->register_done ();
467#endif 477#endif
468 478
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 479#ifdef HAVE_SCROLLBARS
483 if (OPTION (Opt_scrollBar)) 480 if (OPTION (Opt_scrollBar))
484 scrollBar.setIdle (); /* set existence for size calculations */ 481 scrollBar.setIdle (); /* set existence for size calculations */
485#endif 482#endif
486 483
487 pty = rxvt_new_ptytty (); 484 pty = ptytty::create ();
488 485
489 create_windows (argc, argv); 486 create_windows (argc, argv);
490 487
491 dDisp;
492
493 init_xlocale (); 488 init_xlocale ();
494 489
495 scr_reset (); // initialize screen 490 scr_reset (); // initialize screen
496 491
497#if 0 492#if 0
498 XSynchronize (disp, True); 493 XSynchronize (xdisp, True);
499#endif 494#endif
500 495
501#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
502 if (OPTION (Opt_scrollBar)) 497 if (OPTION (Opt_scrollBar))
503 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
504#endif 499#endif
505#ifdef TRANSPARENT 500#ifdef TRANSPARENT
506 if (OPTION (Opt_transparent)) 501 if (OPTION (Opt_transparent))
507 { 502 {
508 XSelectInput (disp, display->root, PropertyChangeMask); 503 XSelectInput (xdisp, display->root, PropertyChangeMask);
509 check_our_parents (); 504 check_our_parents ();
510 rootwin_ev.start (display, display->root); 505 rootwin_ev.start (display, display->root);
511 } 506 }
512#endif 507#endif
513 508
… …
522 517
523 check_ev.start (); 518 check_ev.start ();
524 519
525 HOOK_INVOKE ((this, HOOK_START, DT_END)); 520 HOOK_INVOKE ((this, HOOK_START, DT_END));
526 521
522#if ENABLE_XEMBED
523 if (rs[Rs_embed])
524 {
525 long info[2] = { 0, XEMBED_MAPPED };
526
527 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
528 32, PropModeReplace, (unsigned char *)&info, 2);
529 }
530#endif
531
527 XMapWindow (disp, vt); 532 XMapWindow (xdisp, vt);
528 XMapWindow (disp, parent[0]); 533 XMapWindow (xdisp, parent[0]);
529 534
530 return true; 535 return true;
531} 536}
532 537
533static struct sig_handlers 538static struct sig_handlers
… …
538 * Catch a fatal signal and tidy up before quitting 543 * Catch a fatal signal and tidy up before quitting
539 */ 544 */
540 void 545 void
541 sig_term (sig_watcher &w) 546 sig_term (sig_watcher &w)
542 { 547 {
543#ifdef DEBUG_CMD
544 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
545#endif
546 rxvt_emergency_cleanup (); 548 rxvt_emergency_cleanup ();
547 signal (w.signum, SIG_DFL); 549 signal (w.signum, SIG_DFL);
548 kill (getpid (), w.signum); 550 kill (getpid (), w.signum);
549 } 551 }
550 552
… …
558char **rxvt_environ; // startup environment 560char **rxvt_environ; // startup environment
559 561
560void 562void
561rxvt_init () 563rxvt_init ()
562{ 564{
563 uid_t uid = getuid (); 565 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 566
594 rxvt_environ = environ; 567 rxvt_environ = environ;
595 568
596 signal (SIGHUP, SIG_IGN); 569 signal (SIGHUP, SIG_IGN);
597 signal (SIGPIPE, SIG_IGN); 570 signal (SIGPIPE, SIG_IGN);
… …
655{ 628{
656 short recalc_x, recalc_y; 629 short recalc_x, recalc_y;
657 int x, y, sb_w, flags; 630 int x, y, sb_w, flags;
658 unsigned int w, h; 631 unsigned int w, h;
659 unsigned int max_width, max_height; 632 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 633
665 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 634 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
666 szHint.win_gravity = NorthWestGravity; 635 szHint.win_gravity = NorthWestGravity;
667 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 636 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
668 637
… …
730 699
731 if (scrollBar.state) 700 if (scrollBar.state)
732 { 701 {
733 sb_w = scrollbar_TotalWidth (); 702 sb_w = scrollbar_TotalWidth ();
734 szHint.base_width += sb_w; 703 szHint.base_width += sb_w;
704
735 if (!OPTION (Opt_scrollBar_right)) 705 if (!OPTION (Opt_scrollBar_right))
736 window_vt_x += sb_w; 706 window_vt_x += sb_w;
737 } 707 }
738 708
739 szHint.width_inc = fwidth; 709 szHint.width_inc = fwidth;
… …
765 735
766 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
767 window_sb_x = szHint.width - sb_w; 737 window_sb_x = szHint.width - sb_w;
768 738
769 if (recalc_x) 739 if (recalc_x)
770 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 740 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
741
771 if (recalc_y) 742 if (recalc_y)
772 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 743 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
773 744
774 ncol = width / fwidth; 745 ncol = width / fwidth;
775 nrow = height / fheight; 746 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} 747}
781 748
782/*----------------------------------------------------------------------*/ 749/*----------------------------------------------------------------------*/
783/* 750/*
784 * Tell the teletype handler what size the window is. 751 * Tell the teletype handler what size the window is.
… …
884 return true; 851 return true;
885} 852}
886 853
887void rxvt_term::set_string_property (Atom prop, const char *str, int len) 854void rxvt_term::set_string_property (Atom prop, const char *str, int len)
888{ 855{
889 XChangeProperty (display->display, parent[0], 856 XChangeProperty (xdisp, parent[0],
890 prop, XA_STRING, 8, PropModeReplace, 857 prop, XA_STRING, 8, PropModeReplace,
891 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 858 (const unsigned char *)str, len >= 0 ? len : strlen (str));
892} 859}
893 860
894void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 861void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
895{ 862{
896 wchar_t *ws = rxvt_mbstowcs (str, len); 863 wchar_t *ws = rxvt_mbstowcs (str, len);
897 char *s = rxvt_wcstoutf8 (ws); 864 char *s = rxvt_wcstoutf8 (ws);
898 865
899 XChangeProperty (display->display, parent[0], 866 XChangeProperty (xdisp, parent[0],
900 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
901 (const unsigned char *)s, strlen (s)); 868 (const unsigned char *)s, strlen (s));
902 869
903 free (s); 870 free (s);
904 free (ws); 871 free (ws);
… …
929void 896void
930rxvt_term::set_window_color (int idx, const char *color) 897rxvt_term::set_window_color (int idx, const char *color)
931{ 898{
932 rxvt_color xcol; 899 rxvt_color xcol;
933 int i; 900 int i;
934 901
935 if (color == NULL || *color == '\0') 902 if (color == NULL || *color == '\0')
936 return; 903 return;
904
905 color = strdup (color);
906 allocated.push_back ((void *)color);
907 rs[Rs_color + idx] = color;
937 908
938 /* handle color aliases */ 909 /* handle color aliases */
939 if (isdigit (*color)) 910 if (isdigit (*color))
940 { 911 {
941 i = atoi (color); 912 i = atoi (color);
942 913
943 if (i >= 8 && i <= 15) 914 if (i >= 8 && i <= 15)
944 { /* bright colors */ 915 { /* bright colors */
945 i -= 8; 916 i -= 8;
946 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
947 SET_PIXCOLOR (idx);
948 goto done; 918 goto done;
949 } 919 }
950 920
951 if (i >= 0 && i <= 7) 921 if (i >= 0 && i <= 7)
952 { /* normal colors */ 922 { /* normal colors */
953 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 923 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
954 SET_PIXCOLOR (idx);
955 goto done; 924 goto done;
956 } 925 }
957 } 926 }
958 927
959 if (!rXParseAllocColor (&xcol, color)) 928 set_color (xcol, color);
960 return;
961
962 /* XStoreColor (display->display, display->cmap, XColor*); */
963 929
964 /* 930 /*
965 * FIXME: should free colors here, but no idea how to do it so instead, 931 * FIXME: should free colors here, but no idea how to do it so instead,
966 * so just keep gobbling up the colormap 932 * so just keep gobbling up the colormap
967 */ 933 */
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 934
980 pix_colors_focused[idx] = xcol; 935 pix_colors_focused[idx] = xcol;
981 SET_PIXCOLOR (idx);
982 936
983 /* XSetWindowAttributes attr; */ 937 /* XSetWindowAttributes attr; */
984 /* Cursor cursor; */ 938 /* Cursor cursor; */
985done: 939done:
986 940
987#if OFF_FOCUS_FADING 941#if OFF_FOCUS_FADING
988 if (rs[Rs_fade]) 942 if (rs[Rs_fade])
989 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 943 {
944 rgba c;
945 pix_colors [Color_fade].get (c);
946 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
947 }
990#endif 948#endif
991 949
992 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
993 951
994 recolour_cursor (); 952 recolour_cursor ();
… …
1000#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
1001 959
1002void 960void
1003rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
1004{ 962{
1005 XColor xcol[2]; 963 XColor fg, bg;
1006 964
1007 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
1008 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
1009 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
1010 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
1011 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
1012 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
1013 972
1014 XQueryColors (display->display, display->cmap, xcol, 2); 973 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg);
1015 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1016} 974}
1017 975
1018/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1019/* 977/*
1020 * 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
… …
1024{ 982{
1025 unsigned int i; 983 unsigned int i;
1026 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1027 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1028 986
1029 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1030 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1031 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1032 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1033 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1034 { 991 {
… …
1049 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1050} 1007}
1051 1008
1052/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1053 1010
1054int 1011bool
1055rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1056{ 1013{
1057 if (!screen_in_out->set (display, colour)) 1014 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; 1015 return true;
1016
1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1018 return false;
1019}
1020
1021void
1022rxvt_term::alias_color (int dst, int src)
1023{
1024 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1064} 1025}
1065 1026
1066/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1067 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1068 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
1069void 1030void
1070rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1031rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1071{ 1032{
1072 int fix_screen; 1033 int fix_screen;
1073 int old_width = szHint.width, old_height = szHint.height; 1034 int old_width = szHint.width;
1074 dDisp; 1035 int old_height = szHint.height;
1075 1036
1076 window_calc (newwidth, newheight); 1037 window_calc (newwidth, newheight);
1077 XSetWMNormalHints (disp, parent[0], &szHint); 1038 XSetWMNormalHints (xdisp, parent[0], &szHint);
1078 1039
1079 if (!ignoreparent) 1040 if (!ignoreparent)
1080 { 1041 {
1081#ifdef SMART_RESIZE 1042#ifdef SMART_RESIZE
1082 /* 1043 /*
… …
1086 int x, y, x1, y1; 1047 int x, y, x1, y1;
1087 int dx, dy; 1048 int dx, dy;
1088 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1049 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1089 Window unused_cr; 1050 Window unused_cr;
1090 1051
1091 XTranslateCoordinates (disp, parent[0], display->root, 1052 XTranslateCoordinates (xdisp, parent[0], display->root,
1092 0, 0, &x, &y, &unused_cr); 1053 0, 0, &x, &y, &unused_cr);
1093 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1054 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1094 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1055 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1095 /* 1056 /*
1096 * if display->root isn't the parent window, a WM will probably have offset 1057 * if display->root isn't the parent window, a WM will probably have offset
1097 * our position for handles and decorations. Counter it 1058 * our position for handles and decorations. Counter it
1098 */ 1059 */
… …
1100 { 1061 {
1101 x -= x1; 1062 x -= x1;
1102 y -= y1; 1063 y -= y1;
1103 } 1064 }
1104 1065
1105 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1066 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1106 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1067 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1107 dx = old_width - szHint.width; 1068 dx = old_width - szHint.width;
1108 dy = old_height - szHint.height; 1069 dy = old_height - szHint.height;
1109 1070
1110 /* Check position of the center of the window */ 1071 /* Check position of the center of the window */
1111 if (x < x1) /* left half */ 1072 if (x < x1) /* left half */
1112 dx = 0; 1073 dx = 0;
… …
1115 if (y < y1) /* top half */ 1076 if (y < y1) /* top half */
1116 dy = 0; 1077 dy = 0;
1117 else if (y == y1) /* exact center */ 1078 else if (y == y1) /* exact center */
1118 dy /= 2; 1079 dy /= 2;
1119 1080
1120 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1081 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1121 szHint.width, szHint.height); 1082 szHint.width, szHint.height);
1122#else 1083#else
1123 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1084 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1124#endif 1085#endif
1125 } 1086 }
1126 1087
1127 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1088 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1128 1089
1129 if (fix_screen || newwidth != old_width || newheight != old_height) 1090 if (fix_screen || newwidth != old_width || newheight != old_height)
1130 { 1091 {
1131 if (scrollBar.state) 1092 if (scrollBar.state)
1132 { 1093 {
1133 XMoveResizeWindow (disp, scrollBar.win, 1094 XMoveResizeWindow (xdisp, scrollBar.win,
1134 window_sb_x, 0, 1095 window_sb_x, 0,
1135 scrollbar_TotalWidth (), szHint.height); 1096 scrollbar_TotalWidth (), szHint.height);
1136 resize_scrollbar (); 1097 resize_scrollbar ();
1137 } 1098 }
1138 1099
1139 XMoveResizeWindow (disp, vt, 1100 XMoveResizeWindow (xdisp, vt,
1140 window_vt_x, window_vt_y, 1101 window_vt_x, window_vt_y,
1141 width, height); 1102 width, height);
1142 1103
1143 scr_clear (); 1104 scr_clear ();
1144#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
1145 resize_pixmap (); 1106 resize_pixmap ();
1146#endif 1107#endif
1147 } 1108 }
1148 1109
1149 if (fix_screen || old_height == 0) 1110 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 (); 1111 scr_reset ();
1164 1112
1165 if (curr_screen >= 0) /* this is not the first time through */ 1113 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1166 { 1114 //scr_touch (false);
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 1115
1175#ifdef XPM_BACKGROUND 1116#ifdef XPM_BACKGROUND
1176 if (pixmap) 1117 if (pixmap)
1177 scr_touch (false); 1118 scr_touch (false);
1178#endif 1119#endif
… …
1191{ 1132{
1192 XWindowAttributes wattr; 1133 XWindowAttributes wattr;
1193 1134
1194 if (newwidth == 0 || newheight == 0) 1135 if (newwidth == 0 || newheight == 0)
1195 { 1136 {
1196 XGetWindowAttributes (display->display, display->root, &wattr); 1137 XGetWindowAttributes (xdisp, display->root, &wattr);
1197 1138
1198 if (newwidth == 0) 1139 if (newwidth == 0)
1199 newwidth = wattr.width - szHint.base_width; 1140 newwidth = wattr.width - szHint.base_width;
1200 if (newheight == 0) 1141 if (newheight == 0)
1201 newheight = wattr.height - szHint.base_height; 1142 newheight = wattr.height - szHint.base_height;
… …
1215#ifdef USE_XIM 1156#ifdef USE_XIM
1216 1157
1217void 1158void
1218rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1159rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1219{ 1160{
1220 fg = pix_colors[Color_fg]; 1161 fg = pix_colors [Color_fg];
1221 bg = pix_colors[Color_bg]; 1162 bg = pix_colors [Color_bg];
1222} 1163}
1223 1164
1224void 1165void
1225rxvt_term::im_set_size (XRectangle &size) 1166rxvt_term::im_set_size (XRectangle &size)
1226{ 1167{
… …
1263 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1204 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1264 1205
1265 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1206 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1266 *p = '\0'; 1207 *p = '\0';
1267 1208
1268 atom = XInternAtom (display->display, server, False); 1209 atom = XInternAtom (xdisp, server, False);
1269 win = XGetSelectionOwner (display->display, atom); 1210 win = XGetSelectionOwner (xdisp, atom);
1270 1211
1271 if (win != None) 1212 if (win != None)
1272 return True; 1213 return True;
1273 } 1214 }
1274 1215
… …
1281 XPoint nspot; 1222 XPoint nspot;
1282 XVaNestedList preedit_attr; 1223 XVaNestedList preedit_attr;
1283 1224
1284 if (!Input_Context 1225 if (!Input_Context
1285 || !focus 1226 || !focus
1286 || !(input_style & XIMPreeditPosition)) 1227 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1287 return; 1228 return;
1288 1229
1289 im_set_position (nspot); 1230 im_set_position (nspot);
1290 1231
1291 if (nspot.x == spot.x && nspot.y == spot.y) 1232 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1310 input_method = 0; 1251 input_method = 0;
1311 } 1252 }
1312 1253
1313 Input_Context = 0; 1254 Input_Context = 0;
1314} 1255}
1256
1257#ifdef ENABLE_XIM_ONTHESPOT
1258
1259static void
1260xim_preedit_start (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_START, DT_END));
1264}
1265
1266static void
1267xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1268{
1269 ((rxvt_term *)client_data)->make_current ();
1270 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1271}
1272
1273static void
1274xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1275{
1276 rxvt_term *term = (rxvt_term *)client_data;
1277 XIMText *text = call_data->text;
1278
1279 term->make_current ();
1280
1281 if (text)
1282 {
1283 void *str;
1284
1285 if (!text->encoding_is_wchar && text->string.multi_byte)
1286 {
1287 // of course, X makes it ugly again
1288 if (term->rs[Rs_imLocale])
1289 SET_LOCALE (term->rs[Rs_imLocale]);
1290
1291 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1292 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1293
1294 if (term->rs[Rs_imLocale])
1295 SET_LOCALE (term->locale);
1296 }
1297 else
1298 str = (void *)text->string.wide_char;
1299
1300 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1301 DT_INT, call_data->caret,
1302 DT_INT, call_data->chg_first,
1303 DT_INT, call_data->chg_length,
1304 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1305 DT_WCS_LEN, str, str ? (int)text->length : 0,
1306 DT_END));
1307 }
1308 else
1309 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1310 DT_INT, call_data->caret,
1311 DT_INT, call_data->chg_first,
1312 DT_INT, call_data->chg_length,
1313 DT_END));
1314}
1315
1316#if 0
1317static void
1318xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1319{
1320 ((rxvt_term *)client_data)->make_current ();
1321 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1322 DT_INT, call_data->position,
1323 DT_INT, call_data->direction,
1324 DT_INT, call_data->style,
1325 DT_END));
1326}
1327#endif
1328
1329#endif
1315 1330
1316/* 1331/*
1317 * Try to open a XIM with the current modifiers, then see if we can 1332 * Try to open a XIM with the current modifiers, then see if we can
1318 * open a suitable preedit type 1333 * open a suitable preedit type
1319 */ 1334 */
… …
1326 XRectangle rect, status_rect, needed_rect; 1341 XRectangle rect, status_rect, needed_rect;
1327 unsigned long fg, bg; 1342 unsigned long fg, bg;
1328 const char *p; 1343 const char *p;
1329 char **s; 1344 char **s;
1330 XIMStyles *xim_styles; 1345 XIMStyles *xim_styles;
1346#ifdef ENABLE_XIM_ONTHESPOT
1347 XIMCallback xcb[4];
1348#endif
1331 1349
1332 set_environ (envv); 1350 set_environ (envv);
1333 1351
1334 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1352 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1335 return false; 1353 return false;
1336 1354
1337 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1338 input_method = display->get_xim (locale, modifiers); 1355 input_method = display->get_xim (locale, modifiers);
1339 if (input_method == NULL) 1356 if (input_method == NULL)
1340 return false; 1357 return false;
1341 1358
1342 xim = input_method->xim; 1359 xim = input_method->xim;
… …
1362 s = rxvt_splitcommastring (p); 1379 s = rxvt_splitcommastring (p);
1363 1380
1364 for (i = found = 0; !found && s[i]; i++) 1381 for (i = found = 0; !found && s[i]; i++)
1365 { 1382 {
1366 if (!strcmp (s[i], "OverTheSpot")) 1383 if (!strcmp (s[i], "OverTheSpot"))
1367 input_style = (XIMPreeditPosition | XIMStatusNothing); 1384 input_style = XIMPreeditPosition | XIMStatusNothing;
1368 else if (!strcmp (s[i], "OffTheSpot")) 1385 else if (!strcmp (s[i], "OffTheSpot"))
1369 input_style = (XIMPreeditArea | XIMStatusArea); 1386 input_style = XIMPreeditArea | XIMStatusArea;
1370 else if (!strcmp (s[i], "Root")) 1387 else if (!strcmp (s[i], "Root"))
1371 input_style = (XIMPreeditNothing | XIMStatusNothing); 1388 input_style = XIMPreeditNothing | XIMStatusNothing;
1372 else if (!strcmp (s[i], "None")) 1389 else if (!strcmp (s[i], "None"))
1373 input_style = (XIMPreeditNone | XIMStatusNone); 1390 input_style = XIMPreeditNone | XIMStatusNone;
1391#ifdef ENABLE_XIM_ONTHESPOT
1392 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1393 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1394#endif
1395 else
1396 input_style = XIMPreeditNothing | XIMStatusNothing;
1374 1397
1375 for (j = 0; j < xim_styles->count_styles; j++) 1398 for (j = 0; j < xim_styles->count_styles; j++)
1376 if (input_style == xim_styles->supported_styles[j]) 1399 if (input_style == xim_styles->supported_styles[j])
1377 { 1400 {
1378 rxvt_freecommastring (s); 1401 rxvt_freecommastring (s);
… …
1416 "*", 1439 "*",
1417 fheight, 1440 fheight,
1418 fheight + 1, fheight - 1, 1441 fheight + 1, fheight - 1,
1419 fheight - 2, fheight + 2); 1442 fheight - 2, fheight + 2);
1420 1443
1421 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1444 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1422 &missing_charset_list, &missing_charset_count, &def_string); 1445 &missing_charset_list, &missing_charset_count, &def_string);
1423 1446
1424 if (missing_charset_list) 1447 if (missing_charset_list)
1425 XFreeStringList (missing_charset_list); 1448 XFreeStringList (missing_charset_list);
1426 1449
… …
1467 XNBackground, bg, 1490 XNBackground, bg,
1468 XNArea, &status_rect, 1491 XNArea, &status_rect,
1469 XNFontSet, fs, 1492 XNFontSet, fs,
1470 NULL); 1493 NULL);
1471 } 1494 }
1495#if ENABLE_XIM_ONTHESPOT
1496 else if (input_style & XIMPreeditCallbacks)
1497 {
1498 im_set_position (spot);
1499
1500 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1501 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1502 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1503# if 0
1504 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1505# endif
1506
1507 preedit_attr = XVaCreateNestedList (0,
1508 XNSpotLocation, &spot,
1509 XNPreeditStartCallback, &xcb[0],
1510 XNPreeditDoneCallback , &xcb[1],
1511 XNPreeditDrawCallback , &xcb[2],
1512# if 0
1513 XNPreeditCaretCallback, &xcb[3],
1514# endif
1515 NULL);
1516 }
1517#endif
1472 1518
1473 Input_Context = XCreateIC (xim, 1519 Input_Context = XCreateIC (xim,
1474 XNInputStyle, input_style, 1520 XNInputStyle, input_style,
1475 XNClientWindow, vt, 1521 XNClientWindow, vt,
1476 XNFocusWindow, parent[0], 1522 XNFocusWindow, parent[0],
… …
1479 status_attr ? XNStatusAttributes : NULL, 1525 status_attr ? XNStatusAttributes : NULL,
1480 status_attr, NULL); 1526 status_attr, NULL);
1481 1527
1482 if (preedit_attr) XFree (preedit_attr); 1528 if (preedit_attr) XFree (preedit_attr);
1483 if (status_attr) XFree (status_attr); 1529 if (status_attr) XFree (status_attr);
1484 if (fs) XFreeFontSet (display->display, fs); 1530 if (fs) XFreeFontSet (xdisp, fs);
1485 1531
1486 if (Input_Context == NULL) 1532 if (Input_Context == NULL)
1487 { 1533 {
1488 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1534 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1489 im_destroy (); 1535 im_destroy ();
1490 return false; 1536 return false;
1491 } 1537 }
1492 1538
1539#if 0
1540 // unfortunately, only the focus window is used by XIM, hard to fix
1541 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1542 vt_select_input ();
1543#endif
1544
1493 if (input_style & XIMPreeditArea) 1545 if (input_style & XIMPreeditArea)
1494 IMSetStatusPosition (); 1546 IMSetStatusPosition ();
1495 1547
1496 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1497 return true; 1548 return true;
1498} 1549}
1499 1550
1500void 1551void
1501rxvt_term::im_cb () 1552rxvt_term::im_cb ()
… …
1507 1558
1508 make_current (); 1559 make_current ();
1509 1560
1510 im_destroy (); 1561 im_destroy ();
1511 1562
1512 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1513 if (Input_Context) 1563 if (Input_Context)
1514 return; 1564 return;
1515 1565
1516#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1566#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1517 if (rs[Rs_imLocale]) 1567 if (rs[Rs_imLocale])

Diff Legend

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