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.204 by root, Wed Jan 25 02:53:13 2006 UTC vs.
Revision 1.240 by sasha, Fri Aug 10 22:10:36 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 ();
… …
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 ENABLE_TRANSPARENCY || 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
509#ifdef HAVE_BG_PIXMAP
510 {
511 bool changed = false;
512 bgPixmap.set_target (this);
513
494#ifdef TRANSPARENT 514#ifdef ENABLE_TRANSPARENCY
495 if (OPTION (Opt_transparent)) 515 if (option (Opt_transparent))
496 { 516 {
517 bgPixmap.set_transparent ();
518#ifdef HAVE_AFTERIMAGE
519 if (rs [Rs_blurradius])
520 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521#endif
522 if (ISSET_PIXCOLOR (Color_tint))
523 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524 if (rs [Rs_shade])
525 bgPixmap.set_shade (rs [Rs_shade]);
526 changed = true;
527
528 bgPixmap.set_root_pixmap ();
497 XSelectInput (disp, display->root, PropertyChangeMask); 529 XSelectInput (dpy, display->root, PropertyChangeMask);
498 check_our_parents ();
499 rootwin_ev.start (display, display->root); 530 rootwin_ev.start (display, display->root);
500 } 531 }
532#endif
533
534#ifdef XPM_BACKGROUND
535 if (rs[Rs_backgroundPixmap] != NULL)
536 {
537 const char *p = rs[Rs_backgroundPixmap];
538
539 if ((p = strchr (p, ';')) != NULL)
540 {
541 p++;
542 bgPixmap.set_geometry (p);
543 }
544 else
545 bgPixmap.set_defaultGeometry ();
546
547 changed = bgPixmap.set_file (rs[Rs_backgroundPixmap]);
548 }
549#endif
550 if (changed)
551 {
552 bgPixmap.render_background ();
553 scr_touch (true);
554 }
555 }
556#endif
557
558#if ENABLE_PERL
559 rootwin_ev.start (display, display->root);
501#endif 560#endif
502 561
503 set_colorfgbg (); 562 set_colorfgbg ();
504 563
505 init_command (cmd_argv); 564 init_command (cmd_argv);
… …
516#if ENABLE_XEMBED 575#if ENABLE_XEMBED
517 if (rs[Rs_embed]) 576 if (rs[Rs_embed])
518 { 577 {
519 long info[2] = { 0, XEMBED_MAPPED }; 578 long info[2] = { 0, XEMBED_MAPPED };
520 579
521 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 580 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
522 32, PropModeReplace, (unsigned char *)&info, 2); 581 32, PropModeReplace, (unsigned char *)&info, 2);
523 } 582 }
524#endif 583#endif
525 584
526 XMapWindow (disp, vt); 585 XMapWindow (dpy, vt);
527 XMapWindow (disp, parent[0]); 586 XMapWindow (dpy, parent[0]);
528 587
529 return true; 588 return true;
530} 589}
531 590
532static struct sig_handlers 591static struct sig_handlers
… …
612 return p; 671 return p;
613} 672}
614 673
615/*----------------------------------------------------------------------*/ 674/*----------------------------------------------------------------------*/
616/* 675/*
617 * window size/position calculcations for XSizeHint and other storage. 676 * window size/position calculations for XSizeHint and other storage.
618 * if width/height are non-zero then override calculated width/height 677 * if width/height are non-zero then override calculated width/height
619 */ 678 */
620void 679void
621rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 680rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
622{ 681{
623 short recalc_x, recalc_y; 682 short recalc_x, recalc_y;
624 int x, y, sb_w, flags; 683 int x, y, sb_w, flags;
625 unsigned int w, h; 684 unsigned int w, h;
626 unsigned int max_width, max_height; 685 unsigned int max_width, max_height;
627 dDisp;
628 686
629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 687 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
630 szHint.win_gravity = NorthWestGravity; 688 szHint.win_gravity = NorthWestGravity;
631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 689 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
632 690
… …
694 752
695 if (scrollBar.state) 753 if (scrollBar.state)
696 { 754 {
697 sb_w = scrollbar_TotalWidth (); 755 sb_w = scrollbar_TotalWidth ();
698 szHint.base_width += sb_w; 756 szHint.base_width += sb_w;
757
699 if (!OPTION (Opt_scrollBar_right)) 758 if (!option (Opt_scrollBar_right))
700 window_vt_x += sb_w; 759 window_vt_x += sb_w;
701 } 760 }
702 761
703 szHint.width_inc = fwidth; 762 szHint.width_inc = fwidth;
704 szHint.height_inc = fheight; 763 szHint.height_inc = fheight;
705 szHint.min_width = szHint.base_width + szHint.width_inc; 764 szHint.min_width = szHint.base_width + szHint.width_inc;
706 szHint.min_height = szHint.base_height + szHint.height_inc; 765 szHint.min_height = szHint.base_height + szHint.height_inc;
707 766
708 if (newwidth && newwidth - szHint.base_width < max_width) 767 if (newwidth && newwidth - szHint.base_width < max_width)
709 { 768 {
710 szHint.width = newwidth; 769 szHint.width = newwidth;
… …
725 { 784 {
726 min_it (height, max_height); 785 min_it (height, max_height);
727 szHint.height = szHint.base_height + height; 786 szHint.height = szHint.base_height + height;
728 } 787 }
729 788
730 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 789 if (scrollBar.state && option (Opt_scrollBar_right))
731 window_sb_x = szHint.width - sb_w; 790 window_sb_x = szHint.width - sb_w;
732 791
733 if (recalc_x) 792 if (recalc_x)
734 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 793 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
794
735 if (recalc_y) 795 if (recalc_y)
736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 796 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
737 797
738 ncol = width / fwidth; 798 ncol = width / fwidth;
739 nrow = height / fheight; 799 nrow = height / fheight;
740} 800}
741 801
… …
796 delete fontset[0]; 856 delete fontset[0];
797 fontset[0] = fs; 857 fontset[0] = fs;
798 858
799 prop = (*fs)[1]->properties (); 859 prop = (*fs)[1]->properties ();
800 prop.height += lineSpace; 860 prop.height += lineSpace;
861
801 fs->set_prop (prop); 862 fs->set_prop (prop, false);
802 863
803 fwidth = prop.width; 864 fwidth = prop.width;
804 fheight = prop.height; 865 fheight = prop.height;
805 fbase = prop.ascent; 866 fbase = prop.ascent;
806 867
… …
815 { 876 {
816 fontset[style] = fs = new rxvt_fontset (this); 877 fontset[style] = fs = new rxvt_fontset (this);
817 rxvt_fontprop prop2 = prop; 878 rxvt_fontprop prop2 = prop;
818 879
819 if (res) 880 if (res)
820 prop2.weight = prop2.slant = rxvt_fontprop::unset; 881 {
882 fs->populate (res);
883 fs->set_prop (prop2, false);
884 }
821 else 885 else
822 { 886 {
823 res = fontset[0]->fontdesc; 887 fs->populate (fontset[0]->fontdesc);
824 888
825 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 889 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; 890 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
891
892 fs->set_prop (prop2, true);
827 } 893 }
828 894
829 fs->populate (res);
830 fs->set_prop (prop2);
831 } 895 }
832#else 896#else
833 fontset[style] = fontset[0]; 897 fontset[style] = fontset[0];
834#endif 898#endif
835 } 899 }
… …
844 return true; 908 return true;
845} 909}
846 910
847void rxvt_term::set_string_property (Atom prop, const char *str, int len) 911void rxvt_term::set_string_property (Atom prop, const char *str, int len)
848{ 912{
849 XChangeProperty (display->display, parent[0], 913 XChangeProperty (dpy, parent[0],
850 prop, XA_STRING, 8, PropModeReplace, 914 prop, XA_STRING, 8, PropModeReplace,
851 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 915 (const unsigned char *)str, len >= 0 ? len : strlen (str));
852} 916}
853 917
854void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 918void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
855{ 919{
856 wchar_t *ws = rxvt_mbstowcs (str, len); 920 wchar_t *ws = rxvt_mbstowcs (str, len);
857 char *s = rxvt_wcstoutf8 (ws); 921 char *s = rxvt_wcstoutf8 (ws);
858 922
859 XChangeProperty (display->display, parent[0], 923 XChangeProperty (dpy, parent[0],
860 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 924 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
861 (const unsigned char *)s, strlen (s)); 925 (const unsigned char *)s, strlen (s));
862 926
863 free (s); 927 free (s);
864 free (ws); 928 free (ws);
… …
889void 953void
890rxvt_term::set_window_color (int idx, const char *color) 954rxvt_term::set_window_color (int idx, const char *color)
891{ 955{
892 rxvt_color xcol; 956 rxvt_color xcol;
893 int i; 957 int i;
894 958
895 if (color == NULL || *color == '\0') 959 if (color == NULL || *color == '\0')
896 return; 960 return;
961
962 color = strdup (color);
963 allocated.push_back ((void *)color);
964 rs[Rs_color + idx] = color;
897 965
898 /* handle color aliases */ 966 /* handle color aliases */
899 if (isdigit (*color)) 967 if (isdigit (*color))
900 { 968 {
901 i = atoi (color); 969 i = atoi (color);
902 970
903 if (i >= 8 && i <= 15) 971 if (i >= 8 && i <= 15)
904 { /* bright colors */ 972 { /* bright colors */
905 i -= 8; 973 i -= 8;
906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 974 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
907 SET_PIXCOLOR (idx);
908 goto done; 975 goto done;
909 } 976 }
910 977
911 if (i >= 0 && i <= 7) 978 if (i >= 0 && i <= 7)
912 { /* normal colors */ 979 { /* normal colors */
913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 980 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
914 SET_PIXCOLOR (idx);
915 goto done; 981 goto done;
916 } 982 }
917 } 983 }
918 984
919 if (!rXParseAllocColor (&xcol, color)) 985 set_color (xcol, color);
920 return;
921
922 /* XStoreColor (display->display, display->cmap, XColor*); */
923 986
924 /* 987 /*
925 * FIXME: should free colors here, but no idea how to do it so instead, 988 * FIXME: should free colors here, but no idea how to do it so instead,
926 * so just keep gobbling up the colormap 989 * so just keep gobbling up the colormap
927 */ 990 */
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 991
940 pix_colors_focused[idx] = xcol; 992 pix_colors_focused[idx] = xcol;
941 SET_PIXCOLOR (idx);
942 993
943 /* XSetWindowAttributes attr; */ 994 /* XSetWindowAttributes attr; */
944 /* Cursor cursor; */ 995 /* Cursor cursor; */
945done: 996done:
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. */ 997 /*TODO: handle Color_BD, scrollbar background, etc. */
953 998
999 update_fade_color (idx);
954 recolour_cursor (); 1000 recolour_cursor ();
955 scr_recolour (); 1001 scr_recolour ();
956} 1002}
957 1003
958#else 1004#else
… …
960#endif /* XTERM_COLOR_CHANGE */ 1006#endif /* XTERM_COLOR_CHANGE */
961 1007
962void 1008void
963rxvt_term::recolour_cursor () 1009rxvt_term::recolour_cursor ()
964{ 1010{
965 XColor xcol[2]; 1011 XColor fg, bg;
966 1012
967 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1013 (ISSET_PIXCOLOR (Color_pointer_fg)
968 ? pix_colors_focused[Color_pointer_fg] 1014 ? pix_colors_focused[Color_pointer_fg]
969 : pix_colors_focused[Color_fg]; 1015 : pix_colors_focused[Color_fg]).get (fg);
1016
970 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1017 (ISSET_PIXCOLOR (Color_pointer_bg)
971 ? pix_colors_focused[Color_pointer_bg] 1018 ? pix_colors_focused[Color_pointer_bg]
972 : pix_colors_focused[Color_bg]; 1019 : pix_colors_focused[Color_bg]).get (bg);
973 1020
974 XQueryColors (display->display, display->cmap, xcol, 2); 1021 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
975 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
976} 1022}
977 1023
978/*----------------------------------------------------------------------*/ 1024/*----------------------------------------------------------------------*/
979/* 1025/*
980 * find if fg/bg matches any of the normal (low-intensity) colors 1026 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1008 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1054 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1009} 1055}
1010 1056
1011/*----------------------------------------------------------------------*/ 1057/*----------------------------------------------------------------------*/
1012 1058
1013int 1059bool
1014rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1060rxvt_term::set_color (rxvt_color &color, const char *name)
1015{ 1061{
1016 if (!screen_in_out->set (display, colour)) 1062 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; 1063 return true;
1064
1065 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1066 return false;
1067}
1068
1069void
1070rxvt_term::alias_color (int dst, int src)
1071{
1072 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1023} 1073}
1024 1074
1025/* -------------------------------------------------------------------- * 1075/* -------------------------------------------------------------------- *
1026 * - WINDOW RESIZING - * 1076 * - WINDOW RESIZING - *
1027 * -------------------------------------------------------------------- */ 1077 * -------------------------------------------------------------------- */
… …
1029rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1079rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1030{ 1080{
1031 int fix_screen; 1081 int fix_screen;
1032 int old_width = szHint.width; 1082 int old_width = szHint.width;
1033 int old_height = szHint.height; 1083 int old_height = szHint.height;
1034 dDisp;
1035 1084
1036 window_calc (newwidth, newheight); 1085 window_calc (newwidth, newheight);
1086
1087 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1037 XSetWMNormalHints (disp, parent[0], &szHint); 1088 XSetWMNormalHints (dpy, parent[0], &szHint);
1038 1089
1039 if (!ignoreparent) 1090 if (!ignoreparent)
1040 { 1091 {
1041#ifdef SMART_RESIZE 1092#ifdef SMART_RESIZE
1042 /* 1093 /*
… …
1046 int x, y, x1, y1; 1097 int x, y, x1, y1;
1047 int dx, dy; 1098 int dx, dy;
1048 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1099 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1049 Window unused_cr; 1100 Window unused_cr;
1050 1101
1051 XTranslateCoordinates (disp, parent[0], display->root, 1102 XTranslateCoordinates (dpy, parent[0], display->root,
1052 0, 0, &x, &y, &unused_cr); 1103 0, 0, &x, &y, &unused_cr);
1053 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1104 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1054 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1105 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1055 /* 1106 /*
1056 * if display->root isn't the parent window, a WM will probably have offset 1107 * if display->root isn't the parent window, a WM will probably have offset
1057 * our position for handles and decorations. Counter it 1108 * our position for handles and decorations. Counter it
1058 */ 1109 */
… …
1060 { 1111 {
1061 x -= x1; 1112 x -= x1;
1062 y -= y1; 1113 y -= y1;
1063 } 1114 }
1064 1115
1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1116 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1117 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1067 dx = old_width - szHint.width; 1118 dx = old_width - szHint.width;
1068 dy = old_height - szHint.height; 1119 dy = old_height - szHint.height;
1069 1120
1070 /* Check position of the center of the window */ 1121 /* Check position of the center of the window */
1071 if (x < x1) /* left half */ 1122 if (x < x1) /* left half */
… …
1075 if (y < y1) /* top half */ 1126 if (y < y1) /* top half */
1076 dy = 0; 1127 dy = 0;
1077 else if (y == y1) /* exact center */ 1128 else if (y == y1) /* exact center */
1078 dy /= 2; 1129 dy /= 2;
1079 1130
1080 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1131 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1081 szHint.width, szHint.height); 1132 szHint.width, szHint.height);
1082#else 1133#else
1083 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1134 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1084#endif 1135#endif
1085 } 1136 }
1086 1137
1087 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1138 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1088 1139
1089 if (fix_screen || newwidth != old_width || newheight != old_height) 1140 if (fix_screen || newwidth != old_width || newheight != old_height)
1090 { 1141 {
1091 if (scrollBar.state) 1142 if (scrollBar.state)
1092 { 1143 {
1093 XMoveResizeWindow (disp, scrollBar.win, 1144 XMoveResizeWindow (dpy, scrollBar.win,
1094 window_sb_x, 0, 1145 window_sb_x, 0,
1095 scrollbar_TotalWidth (), szHint.height); 1146 scrollbar_TotalWidth (), szHint.height);
1096 resize_scrollbar (); 1147 resize_scrollbar ();
1097 } 1148 }
1098 1149
1099 XMoveResizeWindow (disp, vt, 1150 XMoveResizeWindow (dpy, vt,
1100 window_vt_x, window_vt_y, 1151 window_vt_x, window_vt_y,
1101 width, height); 1152 width, height);
1102 1153
1103 scr_clear (); 1154 scr_clear ();
1104#ifdef XPM_BACKGROUND 1155#ifdef XPM_BACKGROUND
1105 resize_pixmap (); 1156 /* TODO: should that really be here ? */
1157 bgPixmap.render_background ();
1106#endif 1158#endif
1107 } 1159 }
1108 1160
1109 if (fix_screen || old_height == 0) 1161 if (fix_screen || old_height == 0)
1110 scr_reset (); 1162 scr_reset ();
1111 1163
1112#ifdef XPM_BACKGROUND 1164 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1113 if (pixmap) 1165 //scr_touch (false);
1166
1167#ifdef HAVE_BG_PIXMAP
1168 if (bgPixmap.pixmap)
1114 scr_touch (false); 1169 scr_touch (false);
1115#endif 1170#endif
1116 1171
1117#ifdef USE_XIM 1172#ifdef USE_XIM
1118 IMSetStatusPosition (); 1173 IMSetPosition ();
1119#endif 1174#endif
1120} 1175}
1121 1176
1122/* 1177/*
1123 * Set the width/height of the vt window in characters. Units are pixels. 1178 * Set the width/height of the vt window in characters. Units are pixels.
… …
1128{ 1183{
1129 XWindowAttributes wattr; 1184 XWindowAttributes wattr;
1130 1185
1131 if (newwidth == 0 || newheight == 0) 1186 if (newwidth == 0 || newheight == 0)
1132 { 1187 {
1133 XGetWindowAttributes (display->display, display->root, &wattr); 1188 XGetWindowAttributes (dpy, display->root, &wattr);
1134 1189
1135 if (newwidth == 0) 1190 if (newwidth == 0)
1136 newwidth = wattr.width - szHint.base_width; 1191 newwidth = wattr.width - szHint.base_width;
1137 if (newheight == 0) 1192 if (newheight == 0)
1138 newheight = wattr.height - szHint.base_height; 1193 newheight = wattr.height - szHint.base_height;
… …
1152#ifdef USE_XIM 1207#ifdef USE_XIM
1153 1208
1154void 1209void
1155rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1210rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1156{ 1211{
1157 fg = pix_colors[Color_fg]; 1212 fg = pix_colors [Color_fg];
1158 bg = pix_colors[Color_bg]; 1213 bg = pix_colors [Color_bg];
1159} 1214}
1160 1215
1161void 1216void
1162rxvt_term::im_set_size (XRectangle &size) 1217rxvt_term::im_set_size (XRectangle &size)
1163{ 1218{
… …
1200 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1255 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1201 1256
1202 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1257 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1203 *p = '\0'; 1258 *p = '\0';
1204 1259
1205 atom = XInternAtom (display->display, server, False); 1260 atom = XInternAtom (dpy, server, False);
1206 win = XGetSelectionOwner (display->display, atom); 1261 win = XGetSelectionOwner (dpy, atom);
1207 1262
1208 if (win != None) 1263 if (win != None)
1209 return True; 1264 return True;
1210 } 1265 }
1211 1266
… …
1435 "*", 1490 "*",
1436 fheight, 1491 fheight,
1437 fheight + 1, fheight - 1, 1492 fheight + 1, fheight - 1,
1438 fheight - 2, fheight + 2); 1493 fheight - 2, fheight + 2);
1439 1494
1440 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1495 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1441 &missing_charset_list, &missing_charset_count, &def_string); 1496 &missing_charset_list, &missing_charset_count, &def_string);
1442 1497
1443 if (missing_charset_list) 1498 if (missing_charset_list)
1444 XFreeStringList (missing_charset_list); 1499 XFreeStringList (missing_charset_list);
1445 1500
… …
1486 XNBackground, bg, 1541 XNBackground, bg,
1487 XNArea, &status_rect, 1542 XNArea, &status_rect,
1488 XNFontSet, fs, 1543 XNFontSet, fs,
1489 NULL); 1544 NULL);
1490 } 1545 }
1546#if ENABLE_XIM_ONTHESPOT
1491 else if (input_style & XIMPreeditCallbacks) 1547 else if (input_style & XIMPreeditCallbacks)
1492 { 1548 {
1493 im_set_position (spot); 1549 im_set_position (spot);
1494 1550
1495 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1551 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1496 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1552 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1497 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1553 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1498#if 0 1554# if 0
1499 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1555 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1500#endif 1556# endif
1501 1557
1502 preedit_attr = XVaCreateNestedList (0, 1558 preedit_attr = XVaCreateNestedList (0,
1503 XNSpotLocation, &spot, 1559 XNSpotLocation, &spot,
1504 XNPreeditStartCallback, &xcb[0], 1560 XNPreeditStartCallback, &xcb[0],
1505 XNPreeditDoneCallback , &xcb[1], 1561 XNPreeditDoneCallback , &xcb[1],
1506 XNPreeditDrawCallback , &xcb[2], 1562 XNPreeditDrawCallback , &xcb[2],
1507#if 0 1563# if 0
1508 XNPreeditCaretCallback, &xcb[3], 1564 XNPreeditCaretCallback, &xcb[3],
1509#endif 1565# endif
1510 NULL); 1566 NULL);
1511 } 1567 }
1568#endif
1512 1569
1513 Input_Context = XCreateIC (xim, 1570 Input_Context = XCreateIC (xim,
1514 XNInputStyle, input_style, 1571 XNInputStyle, input_style,
1515 XNClientWindow, vt, 1572 XNClientWindow, vt,
1516 XNFocusWindow, parent[0], 1573 XNFocusWindow, parent[0],
… …
1518 preedit_attr, 1575 preedit_attr,
1519 status_attr ? XNStatusAttributes : NULL, 1576 status_attr ? XNStatusAttributes : NULL,
1520 status_attr, NULL); 1577 status_attr, NULL);
1521 1578
1522 if (preedit_attr) XFree (preedit_attr); 1579 if (preedit_attr) XFree (preedit_attr);
1523 if (status_attr) XFree (status_attr); 1580 if (status_attr) XFree (status_attr);
1524 if (fs) XFreeFontSet (display->display, fs); 1581 if (fs) XFreeFontSet (dpy, fs);
1525 1582
1526 if (Input_Context == NULL) 1583 if (Input_Context == NULL)
1527 { 1584 {
1528 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1585 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1529 im_destroy (); 1586 im_destroy ();
… …
1534 // unfortunately, only the focus window is used by XIM, hard to fix 1591 // unfortunately, only the focus window is used by XIM, hard to fix
1535 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1592 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1536 vt_select_input (); 1593 vt_select_input ();
1537#endif 1594#endif
1538 1595
1539 if (input_style & XIMPreeditArea)
1540 IMSetStatusPosition (); 1596 IMSetPosition ();
1541 1597
1542 return true; 1598 return true;
1543} 1599}
1544 1600
1545void 1601void
… …
1603 SET_LOCALE (locale); 1659 SET_LOCALE (locale);
1604#endif 1660#endif
1605} 1661}
1606 1662
1607void 1663void
1608rxvt_term::IMSetStatusPosition () 1664rxvt_term::IMSetPosition ()
1609{ 1665{
1610 XRectangle preedit_rect, status_rect, *needed_rect; 1666 XRectangle preedit_rect, status_rect, *needed_rect;
1611 XVaNestedList preedit_attr, status_attr; 1667 XVaNestedList preedit_attr, status_attr;
1612 1668
1613 if (!Input_Context 1669 if (!Input_Context
1614 || !focus 1670 || !focus
1615 || !(input_style & XIMPreeditArea) 1671 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1616 || !IMisRunning ()) 1672 || !IMisRunning ())
1617 return; 1673 return;
1618 1674
1675 if (input_style & XIMPreeditPosition)
1676 {
1677 im_set_size (preedit_rect);
1678 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1679
1680 XSetICValues (Input_Context,
1681 XNPreeditAttributes, preedit_attr, NULL);
1682 }
1683 else
1684 {
1619 /* Getting the necessary width of preedit area */ 1685 /* Getting the necessary width of preedit area */
1620 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1686 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1621 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1687 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1622 XFree (status_attr); 1688 XFree (status_attr);
1623 1689
1624 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1690 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1625 XFree (needed_rect); 1691 XFree (needed_rect);
1626 1692
1627 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1693 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1628 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1694 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1629 1695
1630 XSetICValues (Input_Context, 1696 XSetICValues (Input_Context,
1631 XNPreeditAttributes, preedit_attr, 1697 XNPreeditAttributes, preedit_attr,
1632 XNStatusAttributes, status_attr, NULL); 1698 XNStatusAttributes, status_attr,
1699 NULL);
1633 1700
1701 XFree (status_attr);
1702 }
1703
1634 XFree (preedit_attr); 1704 XFree (preedit_attr);
1635 XFree (status_attr);
1636} 1705}
1637#endif /* USE_XIM */ 1706#endif /* USE_XIM */
1638 1707
1639/*----------------------- end-of-file (C source) -----------------------*/ 1708/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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