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.205 by root, Wed Jan 25 13:24:45 2006 UTC vs.
Revision 1.236 by ayin, Sat Jun 23 18:29:08 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
56static char curlocale[128], savelocale[128]; 56static char curlocale[128], savelocale[128];
57 57
58bool 58bool
59rxvt_set_locale (const char *locale) NOTHROW 59rxvt_set_locale (const char *locale) NOTHROW
60{ 60{
61 int size = strlen (locale) + 1;
62
63 if (size > sizeof (curlocale))
64 rxvt_fatal ("locale string too long, aborting.\n");
65
61 if (!locale || !strncmp (locale, curlocale, 128)) 66 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 67 return false;
63 68
64 strncpy (curlocale, locale, 128); 69 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 70 setlocale (LC_CTYPE, curlocale);
66 return true; 71 return true;
67} 72}
68 73
69void 74void
… …
143} 148}
144#endif 149#endif
145 150
146rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
147 : 152 :
153#if TRANSPARENT || ENABLE_PERL
154 rootwin_ev (this, &rxvt_term::rootwin_cb),
155#endif
148#if TRANSPARENT 156#if TRANSPARENT
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 check_our_parents_ev(this, &rxvt_term::check_our_parents_cb),
150#endif 158#endif
151#ifdef HAVE_SCROLLBARS 159#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 160 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 161#endif
154#ifdef CURSOR_BLINK 162#ifdef CURSOR_BLINK
… …
198void rxvt_term::emergency_cleanup () 206void rxvt_term::emergency_cleanup ()
199{ 207{
200 if (cmd_pid) 208 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 209 kill (-cmd_pid, SIGHUP);
202 210
211 pty_ev.stop ();
203 delete pty; pty = 0; 212 delete pty; pty = 0;
204} 213}
205 214
206rxvt_term::~rxvt_term () 215rxvt_term::~rxvt_term ()
207{ 216{
… …
216#endif 225#endif
217 delete fontset[0]; 226 delete fontset[0];
218 227
219 if (display) 228 if (display)
220 { 229 {
221 dDisp;
222
223 selection_clear (); 230 selection_clear ();
224 231
225#ifdef USE_XIM 232#ifdef USE_XIM
226 im_destroy (); 233 im_destroy ();
227#endif 234#endif
228#ifdef XTERM_SCROLLBAR 235#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 236 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 237 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 238#endif
232#ifdef PLAIN_SCROLLBAR 239#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 240 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 241#endif
235#ifdef NEXT_SCROLLBAR 242#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 243 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 244 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 245 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 246 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 247 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 248 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 249 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 250 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 251 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 252 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 253#endif
247#ifdef RXVT_SCROLLBAR 254#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 255 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 256 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 257 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 258#endif
252 if (gc) XFreeGC (disp, gc); 259 if (gc) XFreeGC (dpy, gc);
253 260
254 delete drawable; 261 delete drawable;
255 // destroy all windows 262 // destroy all windows
256 if (parent[0]) 263 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 264 XDestroyWindow (dpy, parent[0]);
258 }
259 265
260 // TODO: free pixcolours, colours should become part of rxvt_display 266 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 267 if (ISSET_PIXCOLOR (i))
268 {
269 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 270#if OFF_FOCUS_FADING
271 pix_colors_unfocused [i].free (this);
272#endif
273 }
274
275 clear ();
276 }
277
278 delete [] pix_colors_focused;
279#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 280 delete [] pix_colors_unfocused;
264#endif 281#endif
265 282
266 displays.put (display); 283 displays.put (display);
267 284
268 scr_release (); 285 scr_release ();
… …
293{ 310{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295 312
296 cmd_pid = 0; 313 cmd_pid = 0;
297 314
298 if (!OPTION (Opt_hold)) 315 if (!option (Opt_hold))
299 destroy (); 316 destroy ();
300} 317}
301 318
302void 319void
303rxvt_term::destroy () 320rxvt_term::destroy ()
… …
317 im_ev.stop (display); 334 im_ev.stop (display);
318#endif 335#endif
319#if HAVE_SCROLLBARS 336#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 337 scrollbar_ev.stop (display);
321#endif 338#endif
322#if TRANSPARENT 339#if TRANSPARENT || ENABLE_PERL
323 rootwin_ev.stop (display); 340 rootwin_ev.stop (display);
324#endif 341#endif
325 incr_ev.stop (); 342 incr_ev.stop ();
326 termwin_ev.stop (display); 343 termwin_ev.stop (display);
327 vt_ev.stop (display); 344 vt_ev.stop (display);
… …
368{ 385{
369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 386 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370 (*t)->emergency_cleanup (); 387 (*t)->emergency_cleanup ();
371} 388}
372 389
373#if ENABLE_FRILLS 390#if !ENABLE_MINIMAL
374static void 391static void
375print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
376{ 393{
377 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
… …
426 GET_R->allowedxerror = event->error_code; 443 GET_R->allowedxerror = event->error_code;
427 else 444 else
428 { 445 {
429 // GET_R is most likely not the terminal which caused the error, 446 // GET_R is most likely not the terminal which caused the error,
430 // so just output the error and continue 447 // so just output the error and continue
431#if ENABLE_FRILLS 448#if ENABLE_MINIMAL
449 old_xerror_handler (display, event);
450#else
432 print_x_error (display, event); 451 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 452#endif
436 } 453 }
437 454
438 return 0; 455 return 0;
439} 456}
… …
467#ifdef KEYSYM_RESOURCE 484#ifdef KEYSYM_RESOURCE
468 keyboard->register_done (); 485 keyboard->register_done ();
469#endif 486#endif
470 487
471#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
472 if (OPTION (Opt_scrollBar)) 489 if (option (Opt_scrollBar))
473 scrollBar.setIdle (); /* set existence for size calculations */ 490 scrollBar.setIdle (); /* set existence for size calculations */
474#endif 491#endif
475 492
476 pty = ptytty::create (); 493 pty = ptytty::create ();
477 494
478 create_windows (argc, argv); 495 create_windows (argc, argv);
479 496
480 dDisp;
481
482 init_xlocale (); 497 init_xlocale ();
483 498
484 scr_reset (); // initialize screen 499 scr_reset (); // initialize screen
485 500
486#if 0 501#if 0
487 XSynchronize (disp, True); 502 XSynchronize (dpy, True);
488#endif 503#endif
489 504
490#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
491 if (OPTION (Opt_scrollBar)) 506 if (option (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */ 507 resize_scrollbar (); /* create and map scrollbar */
493#endif 508#endif
494#ifdef TRANSPARENT 509#ifdef TRANSPARENT
495 if (OPTION (Opt_transparent)) 510 if (option (Opt_transparent))
496 { 511 {
497 XSelectInput (disp, display->root, PropertyChangeMask); 512 XSelectInput (dpy, display->root, PropertyChangeMask);
498 check_our_parents (); 513 check_our_parents ();
499 rootwin_ev.start (display, display->root); 514 rootwin_ev.start (display, display->root);
500 } 515 }
501#endif 516#endif
517#if ENABLE_PERL
518 rootwin_ev.start (display, display->root);
519#endif
502 520
503 set_colorfgbg (); 521 set_colorfgbg ();
504 522
505 init_command (cmd_argv); 523 init_command (cmd_argv);
506 524
… …
516#if ENABLE_XEMBED 534#if ENABLE_XEMBED
517 if (rs[Rs_embed]) 535 if (rs[Rs_embed])
518 { 536 {
519 long info[2] = { 0, XEMBED_MAPPED }; 537 long info[2] = { 0, XEMBED_MAPPED };
520 538
521 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 539 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
522 32, PropModeReplace, (unsigned char *)&info, 2); 540 32, PropModeReplace, (unsigned char *)&info, 2);
523 } 541 }
524#endif 542#endif
525 543
526 XMapWindow (disp, vt); 544 XMapWindow (dpy, vt);
527 XMapWindow (disp, parent[0]); 545 XMapWindow (dpy, parent[0]);
528 546
529 return true; 547 return true;
530} 548}
531 549
532static struct sig_handlers 550static struct sig_handlers
… …
612 return p; 630 return p;
613} 631}
614 632
615/*----------------------------------------------------------------------*/ 633/*----------------------------------------------------------------------*/
616/* 634/*
617 * window size/position calculcations for XSizeHint and other storage. 635 * window size/position calculations for XSizeHint and other storage.
618 * if width/height are non-zero then override calculated width/height 636 * if width/height are non-zero then override calculated width/height
619 */ 637 */
620void 638void
621rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 639rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
622{ 640{
623 short recalc_x, recalc_y; 641 short recalc_x, recalc_y;
624 int x, y, sb_w, flags; 642 int x, y, sb_w, flags;
625 unsigned int w, h; 643 unsigned int w, h;
626 unsigned int max_width, max_height; 644 unsigned int max_width, max_height;
627 dDisp;
628 645
629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 646 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
630 szHint.win_gravity = NorthWestGravity; 647 szHint.win_gravity = NorthWestGravity;
631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 648 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
632 649
… …
694 711
695 if (scrollBar.state) 712 if (scrollBar.state)
696 { 713 {
697 sb_w = scrollbar_TotalWidth (); 714 sb_w = scrollbar_TotalWidth ();
698 szHint.base_width += sb_w; 715 szHint.base_width += sb_w;
716
699 if (!OPTION (Opt_scrollBar_right)) 717 if (!option (Opt_scrollBar_right))
700 window_vt_x += sb_w; 718 window_vt_x += sb_w;
701 } 719 }
702 720
703 szHint.width_inc = fwidth; 721 szHint.width_inc = fwidth;
704 szHint.height_inc = fheight; 722 szHint.height_inc = fheight;
705 szHint.min_width = szHint.base_width + szHint.width_inc; 723 szHint.min_width = szHint.base_width + szHint.width_inc;
706 szHint.min_height = szHint.base_height + szHint.height_inc; 724 szHint.min_height = szHint.base_height + szHint.height_inc;
707 725
708 if (newwidth && newwidth - szHint.base_width < max_width) 726 if (newwidth && newwidth - szHint.base_width < max_width)
709 { 727 {
710 szHint.width = newwidth; 728 szHint.width = newwidth;
… …
725 { 743 {
726 min_it (height, max_height); 744 min_it (height, max_height);
727 szHint.height = szHint.base_height + height; 745 szHint.height = szHint.base_height + height;
728 } 746 }
729 747
730 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 748 if (scrollBar.state && option (Opt_scrollBar_right))
731 window_sb_x = szHint.width - sb_w; 749 window_sb_x = szHint.width - sb_w;
732 750
733 if (recalc_x) 751 if (recalc_x)
734 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 752 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
753
735 if (recalc_y) 754 if (recalc_y)
736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 755 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
737 756
738 ncol = width / fwidth; 757 ncol = width / fwidth;
739 nrow = height / fheight; 758 nrow = height / fheight;
740} 759}
741 760
… …
796 delete fontset[0]; 815 delete fontset[0];
797 fontset[0] = fs; 816 fontset[0] = fs;
798 817
799 prop = (*fs)[1]->properties (); 818 prop = (*fs)[1]->properties ();
800 prop.height += lineSpace; 819 prop.height += lineSpace;
820
801 fs->set_prop (prop); 821 fs->set_prop (prop, false);
802 822
803 fwidth = prop.width; 823 fwidth = prop.width;
804 fheight = prop.height; 824 fheight = prop.height;
805 fbase = prop.ascent; 825 fbase = prop.ascent;
806 826
… …
815 { 835 {
816 fontset[style] = fs = new rxvt_fontset (this); 836 fontset[style] = fs = new rxvt_fontset (this);
817 rxvt_fontprop prop2 = prop; 837 rxvt_fontprop prop2 = prop;
818 838
819 if (res) 839 if (res)
820 prop2.weight = prop2.slant = rxvt_fontprop::unset; 840 {
841 fs->populate (res);
842 fs->set_prop (prop2, false);
843 }
821 else 844 else
822 { 845 {
823 res = fontset[0]->fontdesc; 846 fs->populate (fontset[0]->fontdesc);
824 847
825 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 848 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
826 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 849 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
850
851 fs->set_prop (prop2, true);
827 } 852 }
828 853
829 fs->populate (res);
830 fs->set_prop (prop2);
831 } 854 }
832#else 855#else
833 fontset[style] = fontset[0]; 856 fontset[style] = fontset[0];
834#endif 857#endif
835 } 858 }
… …
844 return true; 867 return true;
845} 868}
846 869
847void rxvt_term::set_string_property (Atom prop, const char *str, int len) 870void rxvt_term::set_string_property (Atom prop, const char *str, int len)
848{ 871{
849 XChangeProperty (display->display, parent[0], 872 XChangeProperty (dpy, parent[0],
850 prop, XA_STRING, 8, PropModeReplace, 873 prop, XA_STRING, 8, PropModeReplace,
851 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 874 (const unsigned char *)str, len >= 0 ? len : strlen (str));
852} 875}
853 876
854void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 877void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
855{ 878{
856 wchar_t *ws = rxvt_mbstowcs (str, len); 879 wchar_t *ws = rxvt_mbstowcs (str, len);
857 char *s = rxvt_wcstoutf8 (ws); 880 char *s = rxvt_wcstoutf8 (ws);
858 881
859 XChangeProperty (display->display, parent[0], 882 XChangeProperty (dpy, parent[0],
860 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 883 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
861 (const unsigned char *)s, strlen (s)); 884 (const unsigned char *)s, strlen (s));
862 885
863 free (s); 886 free (s);
864 free (ws); 887 free (ws);
… …
889void 912void
890rxvt_term::set_window_color (int idx, const char *color) 913rxvt_term::set_window_color (int idx, const char *color)
891{ 914{
892 rxvt_color xcol; 915 rxvt_color xcol;
893 int i; 916 int i;
894 917
895 if (color == NULL || *color == '\0') 918 if (color == NULL || *color == '\0')
896 return; 919 return;
920
921 color = strdup (color);
922 allocated.push_back ((void *)color);
923 rs[Rs_color + idx] = color;
897 924
898 /* handle color aliases */ 925 /* handle color aliases */
899 if (isdigit (*color)) 926 if (isdigit (*color))
900 { 927 {
901 i = atoi (color); 928 i = atoi (color);
902 929
903 if (i >= 8 && i <= 15) 930 if (i >= 8 && i <= 15)
904 { /* bright colors */ 931 { /* bright colors */
905 i -= 8; 932 i -= 8;
906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 933 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
907 SET_PIXCOLOR (idx);
908 goto done; 934 goto done;
909 } 935 }
910 936
911 if (i >= 0 && i <= 7) 937 if (i >= 0 && i <= 7)
912 { /* normal colors */ 938 { /* normal colors */
913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 939 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
914 SET_PIXCOLOR (idx);
915 goto done; 940 goto done;
916 } 941 }
917 } 942 }
918 943
919 if (!rXParseAllocColor (&xcol, color)) 944 set_color (xcol, color);
920 return;
921
922 /* XStoreColor (display->display, display->cmap, XColor*); */
923 945
924 /* 946 /*
925 * FIXME: should free colors here, but no idea how to do it so instead, 947 * FIXME: should free colors here, but no idea how to do it so instead,
926 * so just keep gobbling up the colormap 948 * so just keep gobbling up the colormap
927 */ 949 */
928# if 0
929 for (i = Color_Black; i <= Color_White; i++)
930 if (pix_colors[idx] == pix_colors[i])
931 break;
932 if (i > Color_White)
933 {
934 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
935 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
936 DisplayPlanes (display->display, display->screen));
937 }
938# endif
939 950
940 pix_colors_focused[idx] = xcol; 951 pix_colors_focused[idx] = xcol;
941 SET_PIXCOLOR (idx);
942 952
943 /* XSetWindowAttributes attr; */ 953 /* XSetWindowAttributes attr; */
944 /* Cursor cursor; */ 954 /* Cursor cursor; */
945done: 955done:
946
947#if OFF_FOCUS_FADING
948 if (rs[Rs_fade])
949 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
950#endif
951
952 /*TODO: handle Color_BD, scrollbar background, etc. */ 956 /*TODO: handle Color_BD, scrollbar background, etc. */
953 957
958 update_fade_color (idx);
954 recolour_cursor (); 959 recolour_cursor ();
955 scr_recolour (); 960 scr_recolour ();
956} 961}
957 962
958#else 963#else
… …
960#endif /* XTERM_COLOR_CHANGE */ 965#endif /* XTERM_COLOR_CHANGE */
961 966
962void 967void
963rxvt_term::recolour_cursor () 968rxvt_term::recolour_cursor ()
964{ 969{
965 XColor xcol[2]; 970 XColor fg, bg;
966 971
967 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 972 (ISSET_PIXCOLOR (Color_pointer_fg)
968 ? pix_colors_focused[Color_pointer_fg] 973 ? pix_colors_focused[Color_pointer_fg]
969 : pix_colors_focused[Color_fg]; 974 : pix_colors_focused[Color_fg]).get (fg);
975
970 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 976 (ISSET_PIXCOLOR (Color_pointer_bg)
971 ? pix_colors_focused[Color_pointer_bg] 977 ? pix_colors_focused[Color_pointer_bg]
972 : pix_colors_focused[Color_bg]; 978 : pix_colors_focused[Color_bg]).get (bg);
973 979
974 XQueryColors (display->display, display->cmap, xcol, 2); 980 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
975 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
976} 981}
977 982
978/*----------------------------------------------------------------------*/ 983/*----------------------------------------------------------------------*/
979/* 984/*
980 * find if fg/bg matches any of the normal (low-intensity) colors 985 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1008 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1013 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1009} 1014}
1010 1015
1011/*----------------------------------------------------------------------*/ 1016/*----------------------------------------------------------------------*/
1012 1017
1013int 1018bool
1014rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1019rxvt_term::set_color (rxvt_color &color, const char *name)
1015{ 1020{
1016 if (!screen_in_out->set (display, colour)) 1021 if (color.set (this, name))
1017 {
1018 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1019 return false;
1020 }
1021
1022 return true; 1022 return true;
1023
1024 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1025 return false;
1026}
1027
1028void
1029rxvt_term::alias_color (int dst, int src)
1030{
1031 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1023} 1032}
1024 1033
1025/* -------------------------------------------------------------------- * 1034/* -------------------------------------------------------------------- *
1026 * - WINDOW RESIZING - * 1035 * - WINDOW RESIZING - *
1027 * -------------------------------------------------------------------- */ 1036 * -------------------------------------------------------------------- */
… …
1029rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1038rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1030{ 1039{
1031 int fix_screen; 1040 int fix_screen;
1032 int old_width = szHint.width; 1041 int old_width = szHint.width;
1033 int old_height = szHint.height; 1042 int old_height = szHint.height;
1034 dDisp;
1035 1043
1036 window_calc (newwidth, newheight); 1044 window_calc (newwidth, newheight);
1045
1046 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1037 XSetWMNormalHints (disp, parent[0], &szHint); 1047 XSetWMNormalHints (dpy, parent[0], &szHint);
1038 1048
1039 if (!ignoreparent) 1049 if (!ignoreparent)
1040 { 1050 {
1041#ifdef SMART_RESIZE 1051#ifdef SMART_RESIZE
1042 /* 1052 /*
… …
1046 int x, y, x1, y1; 1056 int x, y, x1, y1;
1047 int dx, dy; 1057 int dx, dy;
1048 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1058 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1049 Window unused_cr; 1059 Window unused_cr;
1050 1060
1051 XTranslateCoordinates (disp, parent[0], display->root, 1061 XTranslateCoordinates (dpy, parent[0], display->root,
1052 0, 0, &x, &y, &unused_cr); 1062 0, 0, &x, &y, &unused_cr);
1053 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1063 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1054 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1064 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1055 /* 1065 /*
1056 * if display->root isn't the parent window, a WM will probably have offset 1066 * if display->root isn't the parent window, a WM will probably have offset
1057 * our position for handles and decorations. Counter it 1067 * our position for handles and decorations. Counter it
1058 */ 1068 */
… …
1060 { 1070 {
1061 x -= x1; 1071 x -= x1;
1062 y -= y1; 1072 y -= y1;
1063 } 1073 }
1064 1074
1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1075 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1076 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1067 dx = old_width - szHint.width; 1077 dx = old_width - szHint.width;
1068 dy = old_height - szHint.height; 1078 dy = old_height - szHint.height;
1069 1079
1070 /* Check position of the center of the window */ 1080 /* Check position of the center of the window */
1071 if (x < x1) /* left half */ 1081 if (x < x1) /* left half */
… …
1075 if (y < y1) /* top half */ 1085 if (y < y1) /* top half */
1076 dy = 0; 1086 dy = 0;
1077 else if (y == y1) /* exact center */ 1087 else if (y == y1) /* exact center */
1078 dy /= 2; 1088 dy /= 2;
1079 1089
1080 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1090 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1081 szHint.width, szHint.height); 1091 szHint.width, szHint.height);
1082#else 1092#else
1083 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1093 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1084#endif 1094#endif
1085 } 1095 }
1086 1096
1087 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1097 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1088 1098
1089 if (fix_screen || newwidth != old_width || newheight != old_height) 1099 if (fix_screen || newwidth != old_width || newheight != old_height)
1090 { 1100 {
1091 if (scrollBar.state) 1101 if (scrollBar.state)
1092 { 1102 {
1093 XMoveResizeWindow (disp, scrollBar.win, 1103 XMoveResizeWindow (dpy, scrollBar.win,
1094 window_sb_x, 0, 1104 window_sb_x, 0,
1095 scrollbar_TotalWidth (), szHint.height); 1105 scrollbar_TotalWidth (), szHint.height);
1096 resize_scrollbar (); 1106 resize_scrollbar ();
1097 } 1107 }
1098 1108
1099 XMoveResizeWindow (disp, vt, 1109 XMoveResizeWindow (dpy, vt,
1100 window_vt_x, window_vt_y, 1110 window_vt_x, window_vt_y,
1101 width, height); 1111 width, height);
1102 1112
1103 scr_clear (); 1113 scr_clear ();
1104#ifdef XPM_BACKGROUND 1114#ifdef XPM_BACKGROUND
… …
1107 } 1117 }
1108 1118
1109 if (fix_screen || old_height == 0) 1119 if (fix_screen || old_height == 0)
1110 scr_reset (); 1120 scr_reset ();
1111 1121
1122 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1123 //scr_touch (false);
1124
1112#ifdef XPM_BACKGROUND 1125#ifdef XPM_BACKGROUND
1113 if (pixmap) 1126 if (pixmap)
1114 scr_touch (false); 1127 scr_touch (false);
1115#endif 1128#endif
1116 1129
1117#ifdef USE_XIM 1130#ifdef USE_XIM
1118 IMSetStatusPosition (); 1131 IMSetPosition ();
1119#endif 1132#endif
1120} 1133}
1121 1134
1122/* 1135/*
1123 * Set the width/height of the vt window in characters. Units are pixels. 1136 * Set the width/height of the vt window in characters. Units are pixels.
… …
1128{ 1141{
1129 XWindowAttributes wattr; 1142 XWindowAttributes wattr;
1130 1143
1131 if (newwidth == 0 || newheight == 0) 1144 if (newwidth == 0 || newheight == 0)
1132 { 1145 {
1133 XGetWindowAttributes (display->display, display->root, &wattr); 1146 XGetWindowAttributes (dpy, display->root, &wattr);
1134 1147
1135 if (newwidth == 0) 1148 if (newwidth == 0)
1136 newwidth = wattr.width - szHint.base_width; 1149 newwidth = wattr.width - szHint.base_width;
1137 if (newheight == 0) 1150 if (newheight == 0)
1138 newheight = wattr.height - szHint.base_height; 1151 newheight = wattr.height - szHint.base_height;
… …
1152#ifdef USE_XIM 1165#ifdef USE_XIM
1153 1166
1154void 1167void
1155rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1168rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1156{ 1169{
1157 fg = pix_colors[Color_fg]; 1170 fg = pix_colors [Color_fg];
1158 bg = pix_colors[Color_bg]; 1171 bg = pix_colors [Color_bg];
1159} 1172}
1160 1173
1161void 1174void
1162rxvt_term::im_set_size (XRectangle &size) 1175rxvt_term::im_set_size (XRectangle &size)
1163{ 1176{
… …
1200 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1213 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1201 1214
1202 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1215 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1203 *p = '\0'; 1216 *p = '\0';
1204 1217
1205 atom = XInternAtom (display->display, server, False); 1218 atom = XInternAtom (dpy, server, False);
1206 win = XGetSelectionOwner (display->display, atom); 1219 win = XGetSelectionOwner (dpy, atom);
1207 1220
1208 if (win != None) 1221 if (win != None)
1209 return True; 1222 return True;
1210 } 1223 }
1211 1224
… …
1435 "*", 1448 "*",
1436 fheight, 1449 fheight,
1437 fheight + 1, fheight - 1, 1450 fheight + 1, fheight - 1,
1438 fheight - 2, fheight + 2); 1451 fheight - 2, fheight + 2);
1439 1452
1440 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1453 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1441 &missing_charset_list, &missing_charset_count, &def_string); 1454 &missing_charset_list, &missing_charset_count, &def_string);
1442 1455
1443 if (missing_charset_list) 1456 if (missing_charset_list)
1444 XFreeStringList (missing_charset_list); 1457 XFreeStringList (missing_charset_list);
1445 1458
… …
1520 preedit_attr, 1533 preedit_attr,
1521 status_attr ? XNStatusAttributes : NULL, 1534 status_attr ? XNStatusAttributes : NULL,
1522 status_attr, NULL); 1535 status_attr, NULL);
1523 1536
1524 if (preedit_attr) XFree (preedit_attr); 1537 if (preedit_attr) XFree (preedit_attr);
1525 if (status_attr) XFree (status_attr); 1538 if (status_attr) XFree (status_attr);
1526 if (fs) XFreeFontSet (display->display, fs); 1539 if (fs) XFreeFontSet (dpy, fs);
1527 1540
1528 if (Input_Context == NULL) 1541 if (Input_Context == NULL)
1529 { 1542 {
1530 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1543 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1531 im_destroy (); 1544 im_destroy ();
… …
1536 // unfortunately, only the focus window is used by XIM, hard to fix 1549 // unfortunately, only the focus window is used by XIM, hard to fix
1537 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1550 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1538 vt_select_input (); 1551 vt_select_input ();
1539#endif 1552#endif
1540 1553
1541 if (input_style & XIMPreeditArea)
1542 IMSetStatusPosition (); 1554 IMSetPosition ();
1543 1555
1544 return true; 1556 return true;
1545} 1557}
1546 1558
1547void 1559void
… …
1605 SET_LOCALE (locale); 1617 SET_LOCALE (locale);
1606#endif 1618#endif
1607} 1619}
1608 1620
1609void 1621void
1610rxvt_term::IMSetStatusPosition () 1622rxvt_term::IMSetPosition ()
1611{ 1623{
1612 XRectangle preedit_rect, status_rect, *needed_rect; 1624 XRectangle preedit_rect, status_rect, *needed_rect;
1613 XVaNestedList preedit_attr, status_attr; 1625 XVaNestedList preedit_attr, status_attr;
1614 1626
1615 if (!Input_Context 1627 if (!Input_Context
1616 || !focus 1628 || !focus
1617 || !(input_style & XIMPreeditArea) 1629 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1618 || !IMisRunning ()) 1630 || !IMisRunning ())
1619 return; 1631 return;
1620 1632
1633 if (input_style & XIMPreeditPosition)
1634 {
1635 im_set_size (preedit_rect);
1636 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1637
1638 XSetICValues (Input_Context,
1639 XNPreeditAttributes, preedit_attr, NULL);
1640 }
1641 else
1642 {
1621 /* Getting the necessary width of preedit area */ 1643 /* Getting the necessary width of preedit area */
1622 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1644 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1623 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1645 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1624 XFree (status_attr); 1646 XFree (status_attr);
1625 1647
1626 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1648 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1627 XFree (needed_rect); 1649 XFree (needed_rect);
1628 1650
1629 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1651 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1652 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1631 1653
1632 XSetICValues (Input_Context, 1654 XSetICValues (Input_Context,
1633 XNPreeditAttributes, preedit_attr, 1655 XNPreeditAttributes, preedit_attr,
1634 XNStatusAttributes, status_attr, NULL); 1656 XNStatusAttributes, status_attr,
1657 NULL);
1635 1658
1659 XFree (status_attr);
1660 }
1661
1636 XFree (preedit_attr); 1662 XFree (preedit_attr);
1637 XFree (status_attr);
1638} 1663}
1639#endif /* USE_XIM */ 1664#endif /* USE_XIM */
1640 1665
1641/*----------------------- end-of-file (C source) -----------------------*/ 1666/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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