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.203 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.237 by root, Tue Jun 26 00:40:18 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 :
148#if TRANSPARENT 153#if ENABLE_TRANSPARENCY || ENABLE_PERL
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
155#endif
156#if ENABLE_TRANSPARENCY
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 ();
… …
271 for (int i = 0; i < allocated.size (); i++) 288 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 289 free (allocated [i]);
273 290
274 free (selection.text); 291 free (selection.text);
275 // TODO: manage env vars in child only(!) 292 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 293 free (env_display);
278 free (env_term); 294 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 295 free (locale);
281 free (v_buffer); 296 free (v_buffer);
282 free (incr_buf); 297 free (incr_buf);
283 298
284 delete envv; 299 delete envv;
… …
295{ 310{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297 312
298 cmd_pid = 0; 313 cmd_pid = 0;
299 314
300 if (!OPTION (Opt_hold)) 315 if (!option (Opt_hold))
301 destroy (); 316 destroy ();
302} 317}
303 318
304void 319void
305rxvt_term::destroy () 320rxvt_term::destroy ()
… …
319 im_ev.stop (display); 334 im_ev.stop (display);
320#endif 335#endif
321#if HAVE_SCROLLBARS 336#if HAVE_SCROLLBARS
322 scrollbar_ev.stop (display); 337 scrollbar_ev.stop (display);
323#endif 338#endif
324#if TRANSPARENT 339#if ENABLE_TRANSPARENCY || ENABLE_PERL
325 rootwin_ev.stop (display); 340 rootwin_ev.stop (display);
326#endif 341#endif
327 incr_ev.stop (); 342 incr_ev.stop ();
328 termwin_ev.stop (display); 343 termwin_ev.stop (display);
329 vt_ev.stop (display); 344 vt_ev.stop (display);
… …
370{ 385{
371 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++)
372 (*t)->emergency_cleanup (); 387 (*t)->emergency_cleanup ();
373} 388}
374 389
375#if ENABLE_FRILLS 390#if !ENABLE_MINIMAL
376static void 391static void
377print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
378{ 393{
379 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
… …
428 GET_R->allowedxerror = event->error_code; 443 GET_R->allowedxerror = event->error_code;
429 else 444 else
430 { 445 {
431 // 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,
432 // so just output the error and continue 447 // so just output the error and continue
433#if ENABLE_FRILLS 448#if ENABLE_MINIMAL
449 old_xerror_handler (display, event);
450#else
434 print_x_error (display, event); 451 print_x_error (display, event);
435#else
436 old_xerror_handler (display, event);
437#endif 452#endif
438 } 453 }
439 454
440 return 0; 455 return 0;
441} 456}
… …
469#ifdef KEYSYM_RESOURCE 484#ifdef KEYSYM_RESOURCE
470 keyboard->register_done (); 485 keyboard->register_done ();
471#endif 486#endif
472 487
473#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
474 if (OPTION (Opt_scrollBar)) 489 if (option (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */ 490 scrollBar.setIdle (); /* set existence for size calculations */
476#endif 491#endif
477 492
478 pty = ptytty::create (); 493 pty = ptytty::create ();
479 494
480 create_windows (argc, argv); 495 create_windows (argc, argv);
481 496
482 dDisp;
483
484 init_xlocale (); 497 init_xlocale ();
485 498
486 scr_reset (); // initialize screen 499 scr_reset (); // initialize screen
487 500
488#if 0 501#if 0
489 XSynchronize (disp, True); 502 XSynchronize (dpy, True);
490#endif 503#endif
491 504
492#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
493 if (OPTION (Opt_scrollBar)) 506 if (option (Opt_scrollBar))
494 resize_scrollbar (); /* create and map scrollbar */ 507 resize_scrollbar (); /* create and map scrollbar */
495#endif 508#endif
496#ifdef TRANSPARENT 509#ifdef ENABLE_TRANSPARENCY
497 if (OPTION (Opt_transparent)) 510 if (option (Opt_transparent))
498 { 511 {
499 XSelectInput (disp, display->root, PropertyChangeMask); 512 XSelectInput (dpy, display->root, PropertyChangeMask);
500 check_our_parents (); 513 check_our_parents ();
501 rootwin_ev.start (display, display->root); 514 rootwin_ev.start (display, display->root);
502 } 515 }
503#endif 516#endif
517#if ENABLE_PERL
518 rootwin_ev.start (display, display->root);
519#endif
504 520
505 set_colorfgbg (); 521 set_colorfgbg ();
506 522
507 init_command (cmd_argv); 523 init_command (cmd_argv);
508 524
… …
518#if ENABLE_XEMBED 534#if ENABLE_XEMBED
519 if (rs[Rs_embed]) 535 if (rs[Rs_embed])
520 { 536 {
521 long info[2] = { 0, XEMBED_MAPPED }; 537 long info[2] = { 0, XEMBED_MAPPED };
522 538
523 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],
524 32, PropModeReplace, (unsigned char *)&info, 2); 540 32, PropModeReplace, (unsigned char *)&info, 2);
525 } 541 }
526#endif 542#endif
527 543
528 XMapWindow (disp, vt); 544 XMapWindow (dpy, vt);
529 XMapWindow (disp, parent[0]); 545 XMapWindow (dpy, parent[0]);
530 546
531 return true; 547 return true;
532} 548}
533 549
534static struct sig_handlers 550static struct sig_handlers
… …
614 return p; 630 return p;
615} 631}
616 632
617/*----------------------------------------------------------------------*/ 633/*----------------------------------------------------------------------*/
618/* 634/*
619 * window size/position calculcations for XSizeHint and other storage. 635 * window size/position calculations for XSizeHint and other storage.
620 * if width/height are non-zero then override calculated width/height 636 * if width/height are non-zero then override calculated width/height
621 */ 637 */
622void 638void
623rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 639rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
624{ 640{
625 short recalc_x, recalc_y; 641 short recalc_x, recalc_y;
626 int x, y, sb_w, flags; 642 int x, y, sb_w, flags;
627 unsigned int w, h; 643 unsigned int w, h;
628 unsigned int max_width, max_height; 644 unsigned int max_width, max_height;
629 dDisp;
630 645
631 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 646 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
632 szHint.win_gravity = NorthWestGravity; 647 szHint.win_gravity = NorthWestGravity;
633 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 648 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
634 649
… …
696 711
697 if (scrollBar.state) 712 if (scrollBar.state)
698 { 713 {
699 sb_w = scrollbar_TotalWidth (); 714 sb_w = scrollbar_TotalWidth ();
700 szHint.base_width += sb_w; 715 szHint.base_width += sb_w;
716
701 if (!OPTION (Opt_scrollBar_right)) 717 if (!option (Opt_scrollBar_right))
702 window_vt_x += sb_w; 718 window_vt_x += sb_w;
703 } 719 }
704 720
705 szHint.width_inc = fwidth; 721 szHint.width_inc = fwidth;
706 szHint.height_inc = fheight; 722 szHint.height_inc = fheight;
707 szHint.min_width = szHint.base_width + szHint.width_inc; 723 szHint.min_width = szHint.base_width + szHint.width_inc;
708 szHint.min_height = szHint.base_height + szHint.height_inc; 724 szHint.min_height = szHint.base_height + szHint.height_inc;
709 725
710 if (newwidth && newwidth - szHint.base_width < max_width) 726 if (newwidth && newwidth - szHint.base_width < max_width)
711 { 727 {
712 szHint.width = newwidth; 728 szHint.width = newwidth;
… …
727 { 743 {
728 min_it (height, max_height); 744 min_it (height, max_height);
729 szHint.height = szHint.base_height + height; 745 szHint.height = szHint.base_height + height;
730 } 746 }
731 747
732 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 748 if (scrollBar.state && option (Opt_scrollBar_right))
733 window_sb_x = szHint.width - sb_w; 749 window_sb_x = szHint.width - sb_w;
734 750
735 if (recalc_x) 751 if (recalc_x)
736 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 752 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
753
737 if (recalc_y) 754 if (recalc_y)
738 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 755 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
739 756
740 ncol = width / fwidth; 757 ncol = width / fwidth;
741 nrow = height / fheight; 758 nrow = height / fheight;
742} 759}
743 760
… …
798 delete fontset[0]; 815 delete fontset[0];
799 fontset[0] = fs; 816 fontset[0] = fs;
800 817
801 prop = (*fs)[1]->properties (); 818 prop = (*fs)[1]->properties ();
802 prop.height += lineSpace; 819 prop.height += lineSpace;
820
803 fs->set_prop (prop); 821 fs->set_prop (prop, false);
804 822
805 fwidth = prop.width; 823 fwidth = prop.width;
806 fheight = prop.height; 824 fheight = prop.height;
807 fbase = prop.ascent; 825 fbase = prop.ascent;
808 826
… …
817 { 835 {
818 fontset[style] = fs = new rxvt_fontset (this); 836 fontset[style] = fs = new rxvt_fontset (this);
819 rxvt_fontprop prop2 = prop; 837 rxvt_fontprop prop2 = prop;
820 838
821 if (res) 839 if (res)
822 prop2.weight = prop2.slant = rxvt_fontprop::unset; 840 {
841 fs->populate (res);
842 fs->set_prop (prop2, false);
843 }
823 else 844 else
824 { 845 {
825 res = fontset[0]->fontdesc; 846 fs->populate (fontset[0]->fontdesc);
826 847
827 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;
828 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);
829 } 852 }
830 853
831 fs->populate (res);
832 fs->set_prop (prop2);
833 } 854 }
834#else 855#else
835 fontset[style] = fontset[0]; 856 fontset[style] = fontset[0];
836#endif 857#endif
837 } 858 }
… …
846 return true; 867 return true;
847} 868}
848 869
849void 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)
850{ 871{
851 XChangeProperty (display->display, parent[0], 872 XChangeProperty (dpy, parent[0],
852 prop, XA_STRING, 8, PropModeReplace, 873 prop, XA_STRING, 8, PropModeReplace,
853 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 874 (const unsigned char *)str, len >= 0 ? len : strlen (str));
854} 875}
855 876
856void 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)
857{ 878{
858 wchar_t *ws = rxvt_mbstowcs (str, len); 879 wchar_t *ws = rxvt_mbstowcs (str, len);
859 char *s = rxvt_wcstoutf8 (ws); 880 char *s = rxvt_wcstoutf8 (ws);
860 881
861 XChangeProperty (display->display, parent[0], 882 XChangeProperty (dpy, parent[0],
862 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 883 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
863 (const unsigned char *)s, strlen (s)); 884 (const unsigned char *)s, strlen (s));
864 885
865 free (s); 886 free (s);
866 free (ws); 887 free (ws);
… …
891void 912void
892rxvt_term::set_window_color (int idx, const char *color) 913rxvt_term::set_window_color (int idx, const char *color)
893{ 914{
894 rxvt_color xcol; 915 rxvt_color xcol;
895 int i; 916 int i;
896 917
897 if (color == NULL || *color == '\0') 918 if (color == NULL || *color == '\0')
898 return; 919 return;
920
921 color = strdup (color);
922 allocated.push_back ((void *)color);
923 rs[Rs_color + idx] = color;
899 924
900 /* handle color aliases */ 925 /* handle color aliases */
901 if (isdigit (*color)) 926 if (isdigit (*color))
902 { 927 {
903 i = atoi (color); 928 i = atoi (color);
904 929
905 if (i >= 8 && i <= 15) 930 if (i >= 8 && i <= 15)
906 { /* bright colors */ 931 { /* bright colors */
907 i -= 8; 932 i -= 8;
908 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 933 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
909 SET_PIXCOLOR (idx);
910 goto done; 934 goto done;
911 } 935 }
912 936
913 if (i >= 0 && i <= 7) 937 if (i >= 0 && i <= 7)
914 { /* normal colors */ 938 { /* normal colors */
915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 939 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
916 SET_PIXCOLOR (idx);
917 goto done; 940 goto done;
918 } 941 }
919 } 942 }
920 943
921 if (!rXParseAllocColor (&xcol, color)) 944 set_color (xcol, color);
922 return;
923
924 /* XStoreColor (display->display, display->cmap, XColor*); */
925 945
926 /* 946 /*
927 * 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,
928 * so just keep gobbling up the colormap 948 * so just keep gobbling up the colormap
929 */ 949 */
930# if 0
931 for (i = Color_Black; i <= Color_White; i++)
932 if (pix_colors[idx] == pix_colors[i])
933 break;
934 if (i > Color_White)
935 {
936 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
937 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
938 DisplayPlanes (display->display, display->screen));
939 }
940# endif
941 950
942 pix_colors_focused[idx] = xcol; 951 pix_colors_focused[idx] = xcol;
943 SET_PIXCOLOR (idx);
944 952
945 /* XSetWindowAttributes attr; */ 953 /* XSetWindowAttributes attr; */
946 /* Cursor cursor; */ 954 /* Cursor cursor; */
947done: 955done:
948
949#if OFF_FOCUS_FADING
950 if (rs[Rs_fade])
951 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
952#endif
953
954 /*TODO: handle Color_BD, scrollbar background, etc. */ 956 /*TODO: handle Color_BD, scrollbar background, etc. */
955 957
958 update_fade_color (idx);
956 recolour_cursor (); 959 recolour_cursor ();
957 scr_recolour (); 960 scr_recolour ();
958} 961}
959 962
960#else 963#else
… …
962#endif /* XTERM_COLOR_CHANGE */ 965#endif /* XTERM_COLOR_CHANGE */
963 966
964void 967void
965rxvt_term::recolour_cursor () 968rxvt_term::recolour_cursor ()
966{ 969{
967 XColor xcol[2]; 970 XColor fg, bg;
968 971
969 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 972 (ISSET_PIXCOLOR (Color_pointer_fg)
970 ? pix_colors_focused[Color_pointer_fg] 973 ? pix_colors_focused[Color_pointer_fg]
971 : pix_colors_focused[Color_fg]; 974 : pix_colors_focused[Color_fg]).get (fg);
975
972 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 976 (ISSET_PIXCOLOR (Color_pointer_bg)
973 ? pix_colors_focused[Color_pointer_bg] 977 ? pix_colors_focused[Color_pointer_bg]
974 : pix_colors_focused[Color_bg]; 978 : pix_colors_focused[Color_bg]).get (bg);
975 979
976 XQueryColors (display->display, display->cmap, xcol, 2); 980 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
977 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
978} 981}
979 982
980/*----------------------------------------------------------------------*/ 983/*----------------------------------------------------------------------*/
981/* 984/*
982 * 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
… …
986{ 989{
987 unsigned int i; 990 unsigned int i;
988 const char *xpmb = "\0"; 991 const char *xpmb = "\0";
989 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 992 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
990 993
991 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
992 strcpy (fstr, "default"); 994 strcpy (fstr, "default");
993 strcpy (bstr, "default"); 995 strcpy (bstr, "default");
994 for (i = Color_Black; i <= Color_White; i++) 996 for (i = Color_Black; i <= Color_White; i++)
995 if (pix_colors[Color_fg] == pix_colors[i]) 997 if (pix_colors[Color_fg] == pix_colors[i])
996 { 998 {
… …
1011 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1013 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1012} 1014}
1013 1015
1014/*----------------------------------------------------------------------*/ 1016/*----------------------------------------------------------------------*/
1015 1017
1016int 1018bool
1017rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1019rxvt_term::set_color (rxvt_color &color, const char *name)
1018{ 1020{
1019 if (!screen_in_out->set (display, colour)) 1021 if (color.set (this, name))
1020 {
1021 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1022 return false;
1023 }
1024
1025 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]);
1026} 1032}
1027 1033
1028/* -------------------------------------------------------------------- * 1034/* -------------------------------------------------------------------- *
1029 * - WINDOW RESIZING - * 1035 * - WINDOW RESIZING - *
1030 * -------------------------------------------------------------------- */ 1036 * -------------------------------------------------------------------- */
… …
1032rxvt_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)
1033{ 1039{
1034 int fix_screen; 1040 int fix_screen;
1035 int old_width = szHint.width; 1041 int old_width = szHint.width;
1036 int old_height = szHint.height; 1042 int old_height = szHint.height;
1037 dDisp;
1038 1043
1039 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)))
1040 XSetWMNormalHints (disp, parent[0], &szHint); 1047 XSetWMNormalHints (dpy, parent[0], &szHint);
1041 1048
1042 if (!ignoreparent) 1049 if (!ignoreparent)
1043 { 1050 {
1044#ifdef SMART_RESIZE 1051#ifdef SMART_RESIZE
1045 /* 1052 /*
… …
1049 int x, y, x1, y1; 1056 int x, y, x1, y1;
1050 int dx, dy; 1057 int dx, dy;
1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1058 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1052 Window unused_cr; 1059 Window unused_cr;
1053 1060
1054 XTranslateCoordinates (disp, parent[0], display->root, 1061 XTranslateCoordinates (dpy, parent[0], display->root,
1055 0, 0, &x, &y, &unused_cr); 1062 0, 0, &x, &y, &unused_cr);
1056 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1063 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1064 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1058 /* 1065 /*
1059 * 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
1060 * our position for handles and decorations. Counter it 1067 * our position for handles and decorations. Counter it
1061 */ 1068 */
… …
1063 { 1070 {
1064 x -= x1; 1071 x -= x1;
1065 y -= y1; 1072 y -= y1;
1066 } 1073 }
1067 1074
1068 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1075 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1069 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1076 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1070 dx = old_width - szHint.width; 1077 dx = old_width - szHint.width;
1071 dy = old_height - szHint.height; 1078 dy = old_height - szHint.height;
1072 1079
1073 /* Check position of the center of the window */ 1080 /* Check position of the center of the window */
1074 if (x < x1) /* left half */ 1081 if (x < x1) /* left half */
… …
1078 if (y < y1) /* top half */ 1085 if (y < y1) /* top half */
1079 dy = 0; 1086 dy = 0;
1080 else if (y == y1) /* exact center */ 1087 else if (y == y1) /* exact center */
1081 dy /= 2; 1088 dy /= 2;
1082 1089
1083 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1090 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1084 szHint.width, szHint.height); 1091 szHint.width, szHint.height);
1085#else 1092#else
1086 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1093 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1087#endif 1094#endif
1088 } 1095 }
1089 1096
1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1097 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1091 1098
1092 if (fix_screen || newwidth != old_width || newheight != old_height) 1099 if (fix_screen || newwidth != old_width || newheight != old_height)
1093 { 1100 {
1094 if (scrollBar.state) 1101 if (scrollBar.state)
1095 { 1102 {
1096 XMoveResizeWindow (disp, scrollBar.win, 1103 XMoveResizeWindow (dpy, scrollBar.win,
1097 window_sb_x, 0, 1104 window_sb_x, 0,
1098 scrollbar_TotalWidth (), szHint.height); 1105 scrollbar_TotalWidth (), szHint.height);
1099 resize_scrollbar (); 1106 resize_scrollbar ();
1100 } 1107 }
1101 1108
1102 XMoveResizeWindow (disp, vt, 1109 XMoveResizeWindow (dpy, vt,
1103 window_vt_x, window_vt_y, 1110 window_vt_x, window_vt_y,
1104 width, height); 1111 width, height);
1105 1112
1106 scr_clear (); 1113 scr_clear ();
1107#ifdef XPM_BACKGROUND 1114#ifdef XPM_BACKGROUND
… …
1110 } 1117 }
1111 1118
1112 if (fix_screen || old_height == 0) 1119 if (fix_screen || old_height == 0)
1113 scr_reset (); 1120 scr_reset ();
1114 1121
1122 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1123 //scr_touch (false);
1124
1115#ifdef XPM_BACKGROUND 1125#ifdef XPM_BACKGROUND
1116 if (pixmap) 1126 if (pixmap)
1117 scr_touch (false); 1127 scr_touch (false);
1118#endif 1128#endif
1119 1129
1120#ifdef USE_XIM 1130#ifdef USE_XIM
1121 IMSetStatusPosition (); 1131 IMSetPosition ();
1122#endif 1132#endif
1123} 1133}
1124 1134
1125/* 1135/*
1126 * 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.
… …
1131{ 1141{
1132 XWindowAttributes wattr; 1142 XWindowAttributes wattr;
1133 1143
1134 if (newwidth == 0 || newheight == 0) 1144 if (newwidth == 0 || newheight == 0)
1135 { 1145 {
1136 XGetWindowAttributes (display->display, display->root, &wattr); 1146 XGetWindowAttributes (dpy, display->root, &wattr);
1137 1147
1138 if (newwidth == 0) 1148 if (newwidth == 0)
1139 newwidth = wattr.width - szHint.base_width; 1149 newwidth = wattr.width - szHint.base_width;
1140 if (newheight == 0) 1150 if (newheight == 0)
1141 newheight = wattr.height - szHint.base_height; 1151 newheight = wattr.height - szHint.base_height;
… …
1155#ifdef USE_XIM 1165#ifdef USE_XIM
1156 1166
1157void 1167void
1158rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1168rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1159{ 1169{
1160 fg = pix_colors[Color_fg]; 1170 fg = pix_colors [Color_fg];
1161 bg = pix_colors[Color_bg]; 1171 bg = pix_colors [Color_bg];
1162} 1172}
1163 1173
1164void 1174void
1165rxvt_term::im_set_size (XRectangle &size) 1175rxvt_term::im_set_size (XRectangle &size)
1166{ 1176{
… …
1203 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1213 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1204 1214
1205 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1215 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1206 *p = '\0'; 1216 *p = '\0';
1207 1217
1208 atom = XInternAtom (display->display, server, False); 1218 atom = XInternAtom (dpy, server, False);
1209 win = XGetSelectionOwner (display->display, atom); 1219 win = XGetSelectionOwner (dpy, atom);
1210 1220
1211 if (win != None) 1221 if (win != None)
1212 return True; 1222 return True;
1213 } 1223 }
1214 1224
… …
1438 "*", 1448 "*",
1439 fheight, 1449 fheight,
1440 fheight + 1, fheight - 1, 1450 fheight + 1, fheight - 1,
1441 fheight - 2, fheight + 2); 1451 fheight - 2, fheight + 2);
1442 1452
1443 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1453 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1444 &missing_charset_list, &missing_charset_count, &def_string); 1454 &missing_charset_list, &missing_charset_count, &def_string);
1445 1455
1446 if (missing_charset_list) 1456 if (missing_charset_list)
1447 XFreeStringList (missing_charset_list); 1457 XFreeStringList (missing_charset_list);
1448 1458
… …
1489 XNBackground, bg, 1499 XNBackground, bg,
1490 XNArea, &status_rect, 1500 XNArea, &status_rect,
1491 XNFontSet, fs, 1501 XNFontSet, fs,
1492 NULL); 1502 NULL);
1493 } 1503 }
1504#if ENABLE_XIM_ONTHESPOT
1494 else if (input_style & XIMPreeditCallbacks) 1505 else if (input_style & XIMPreeditCallbacks)
1495 { 1506 {
1496 im_set_position (spot); 1507 im_set_position (spot);
1497 1508
1498 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1509 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1499 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1510 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1500 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1511 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1501#if 0 1512# if 0
1502 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1513 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1503#endif 1514# endif
1504 1515
1505 preedit_attr = XVaCreateNestedList (0, 1516 preedit_attr = XVaCreateNestedList (0,
1506 XNSpotLocation, &spot, 1517 XNSpotLocation, &spot,
1507 XNPreeditStartCallback, &xcb[0], 1518 XNPreeditStartCallback, &xcb[0],
1508 XNPreeditDoneCallback , &xcb[1], 1519 XNPreeditDoneCallback , &xcb[1],
1509 XNPreeditDrawCallback , &xcb[2], 1520 XNPreeditDrawCallback , &xcb[2],
1510#if 0 1521# if 0
1511 XNPreeditCaretCallback, &xcb[3], 1522 XNPreeditCaretCallback, &xcb[3],
1512#endif 1523# endif
1513 NULL); 1524 NULL);
1514 } 1525 }
1526#endif
1515 1527
1516 Input_Context = XCreateIC (xim, 1528 Input_Context = XCreateIC (xim,
1517 XNInputStyle, input_style, 1529 XNInputStyle, input_style,
1518 XNClientWindow, vt, 1530 XNClientWindow, vt,
1519 XNFocusWindow, parent[0], 1531 XNFocusWindow, parent[0],
… …
1521 preedit_attr, 1533 preedit_attr,
1522 status_attr ? XNStatusAttributes : NULL, 1534 status_attr ? XNStatusAttributes : NULL,
1523 status_attr, NULL); 1535 status_attr, NULL);
1524 1536
1525 if (preedit_attr) XFree (preedit_attr); 1537 if (preedit_attr) XFree (preedit_attr);
1526 if (status_attr) XFree (status_attr); 1538 if (status_attr) XFree (status_attr);
1527 if (fs) XFreeFontSet (display->display, fs); 1539 if (fs) XFreeFontSet (dpy, fs);
1528 1540
1529 if (Input_Context == NULL) 1541 if (Input_Context == NULL)
1530 { 1542 {
1531 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1543 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1532 im_destroy (); 1544 im_destroy ();
… …
1537 // 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
1538 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1550 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1539 vt_select_input (); 1551 vt_select_input ();
1540#endif 1552#endif
1541 1553
1542 if (input_style & XIMPreeditArea)
1543 IMSetStatusPosition (); 1554 IMSetPosition ();
1544 1555
1545 return true; 1556 return true;
1546} 1557}
1547 1558
1548void 1559void
… …
1606 SET_LOCALE (locale); 1617 SET_LOCALE (locale);
1607#endif 1618#endif
1608} 1619}
1609 1620
1610void 1621void
1611rxvt_term::IMSetStatusPosition () 1622rxvt_term::IMSetPosition ()
1612{ 1623{
1613 XRectangle preedit_rect, status_rect, *needed_rect; 1624 XRectangle preedit_rect, status_rect, *needed_rect;
1614 XVaNestedList preedit_attr, status_attr; 1625 XVaNestedList preedit_attr, status_attr;
1615 1626
1616 if (!Input_Context 1627 if (!Input_Context
1617 || !focus 1628 || !focus
1618 || !(input_style & XIMPreeditArea) 1629 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1619 || !IMisRunning ()) 1630 || !IMisRunning ())
1620 return; 1631 return;
1621 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 {
1622 /* Getting the necessary width of preedit area */ 1643 /* Getting the necessary width of preedit area */
1623 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1644 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1624 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1645 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1625 XFree (status_attr); 1646 XFree (status_attr);
1626 1647
1627 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1648 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1628 XFree (needed_rect); 1649 XFree (needed_rect);
1629 1650
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1651 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1652 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1632 1653
1633 XSetICValues (Input_Context, 1654 XSetICValues (Input_Context,
1634 XNPreeditAttributes, preedit_attr, 1655 XNPreeditAttributes, preedit_attr,
1635 XNStatusAttributes, status_attr, NULL); 1656 XNStatusAttributes, status_attr,
1657 NULL);
1636 1658
1659 XFree (status_attr);
1660 }
1661
1637 XFree (preedit_attr); 1662 XFree (preedit_attr);
1638 XFree (status_attr);
1639} 1663}
1640#endif /* USE_XIM */ 1664#endif /* USE_XIM */
1641 1665
1642/*----------------------- end-of-file (C source) -----------------------*/ 1666/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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