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.200 by root, Wed Jan 25 00:42:20 2006 UTC vs.
Revision 1.231 by root, Sun Aug 27 10:14:47 2006 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 TRANSPARENT || ENABLE_PERL
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
150#endif 155#endif
151#ifdef HAVE_SCROLLBARS 156#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 157 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 158#endif
… …
198void rxvt_term::emergency_cleanup () 203void rxvt_term::emergency_cleanup ()
199{ 204{
200 if (cmd_pid) 205 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 206 kill (-cmd_pid, SIGHUP);
202 207
208 pty_ev.stop ();
203 delete pty; pty = 0; 209 delete pty; pty = 0;
204} 210}
205 211
206rxvt_term::~rxvt_term () 212rxvt_term::~rxvt_term ()
207{ 213{
… …
216#endif 222#endif
217 delete fontset[0]; 223 delete fontset[0];
218 224
219 if (display) 225 if (display)
220 { 226 {
221 dDisp;
222
223 selection_clear (); 227 selection_clear ();
224 228
225#ifdef USE_XIM 229#ifdef USE_XIM
226 im_destroy (); 230 im_destroy ();
227#endif 231#endif
228#ifdef XTERM_SCROLLBAR 232#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 233 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 234 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 235#endif
232#ifdef PLAIN_SCROLLBAR 236#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 237 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 238#endif
235#ifdef NEXT_SCROLLBAR 239#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 240 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 241 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 242 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 243 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 244 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 245 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 246 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 247 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 248 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 249 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 250#endif
247#ifdef RXVT_SCROLLBAR 251#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 252 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 253 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 254 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 255#endif
252 if (gc) XFreeGC (disp, gc); 256 if (gc) XFreeGC (dpy, gc);
253 257
254 delete drawable; 258 delete drawable;
255 // destroy all windows 259 // destroy all windows
256 if (parent[0]) 260 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 261 XDestroyWindow (dpy, parent[0]);
258 }
259 262
260 // TODO: free pixcolours, colours should become part of rxvt_display 263 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 264 if (ISSET_PIXCOLOR (i))
265 {
266 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 267#if OFF_FOCUS_FADING
268 pix_colors_unfocused [i].free (this);
269#endif
270 }
271
272 clear ();
273 }
274
275 delete [] pix_colors_focused;
276#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 277 delete [] pix_colors_unfocused;
264#endif 278#endif
265 279
266 displays.put (display); 280 displays.put (display);
267 281
268 scr_release (); 282 scr_release ();
… …
271 for (int i = 0; i < allocated.size (); i++) 285 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 286 free (allocated [i]);
273 287
274 free (selection.text); 288 free (selection.text);
275 // TODO: manage env vars in child only(!) 289 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 290 free (env_display);
278 free (env_term); 291 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 292 free (locale);
281 free (v_buffer); 293 free (v_buffer);
282 free (incr_buf); 294 free (incr_buf);
283 295
284 delete envv; 296 delete envv;
… …
319 im_ev.stop (display); 331 im_ev.stop (display);
320#endif 332#endif
321#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
322 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
323#endif 335#endif
324#if TRANSPARENT 336#if TRANSPARENT || ENABLE_PERL
325 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
326#endif 338#endif
327 incr_ev.stop (); 339 incr_ev.stop ();
328 termwin_ev.stop (display); 340 termwin_ev.stop (display);
329 vt_ev.stop (display); 341 vt_ev.stop (display);
… …
370{ 382{
371 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 383 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
372 (*t)->emergency_cleanup (); 384 (*t)->emergency_cleanup ();
373} 385}
374 386
375#if ENABLE_FRILLS 387#if !ENABLE_MINIMAL
376static void 388static void
377print_x_error (Display *dpy, XErrorEvent *event) 389print_x_error (Display *dpy, XErrorEvent *event)
378{ 390{
379 char buffer[BUFSIZ]; 391 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 392 char mesg[BUFSIZ];
… …
428 GET_R->allowedxerror = event->error_code; 440 GET_R->allowedxerror = event->error_code;
429 else 441 else
430 { 442 {
431 // GET_R is most likely not the terminal which caused the error, 443 // GET_R is most likely not the terminal which caused the error,
432 // so just output the error and continue 444 // so just output the error and continue
433#if ENABLE_FRILLS 445#if ENABLE_MINIMAL
446 old_xerror_handler (display, event);
447#else
434 print_x_error (display, event); 448 print_x_error (display, event);
435#else
436 old_xerror_handler (display, event);
437#endif 449#endif
438 } 450 }
439 451
440 return 0; 452 return 0;
441} 453}
… …
477 489
478 pty = ptytty::create (); 490 pty = ptytty::create ();
479 491
480 create_windows (argc, argv); 492 create_windows (argc, argv);
481 493
482 dDisp;
483
484 init_xlocale (); 494 init_xlocale ();
485 495
486 scr_reset (); // initialize screen 496 scr_reset (); // initialize screen
487 497
488#if 0 498#if 0
489 XSynchronize (disp, True); 499 XSynchronize (dpy, True);
490#endif 500#endif
491 501
492#ifdef HAVE_SCROLLBARS 502#ifdef HAVE_SCROLLBARS
493 if (OPTION (Opt_scrollBar)) 503 if (OPTION (Opt_scrollBar))
494 resize_scrollbar (); /* create and map scrollbar */ 504 resize_scrollbar (); /* create and map scrollbar */
495#endif 505#endif
496#ifdef TRANSPARENT 506#ifdef TRANSPARENT
497 if (OPTION (Opt_transparent)) 507 if (OPTION (Opt_transparent))
498 { 508 {
499 XSelectInput (disp, display->root, PropertyChangeMask); 509 XSelectInput (dpy, display->root, PropertyChangeMask);
500 check_our_parents (); 510 check_our_parents ();
501 rootwin_ev.start (display, display->root); 511 rootwin_ev.start (display, display->root);
502 } 512 }
503#endif 513#endif
514#if ENABLE_PERL
515 rootwin_ev.start (display, display->root);
516#endif
504 517
505 set_colorfgbg (); 518 set_colorfgbg ();
506 519
507 init_command (cmd_argv); 520 init_command (cmd_argv);
508 521
… …
513 526
514 check_ev.start (); 527 check_ev.start ();
515 528
516 HOOK_INVOKE ((this, HOOK_START, DT_END)); 529 HOOK_INVOKE ((this, HOOK_START, DT_END));
517 530
531#if ENABLE_XEMBED
532 if (rs[Rs_embed])
533 {
534 long info[2] = { 0, XEMBED_MAPPED };
535
536 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
537 32, PropModeReplace, (unsigned char *)&info, 2);
538 }
539#endif
540
518 XMapWindow (disp, vt); 541 XMapWindow (dpy, vt);
519 XMapWindow (disp, parent[0]); 542 XMapWindow (dpy, parent[0]);
520 543
521 return true; 544 return true;
522} 545}
523 546
524static struct sig_handlers 547static struct sig_handlers
… …
614{ 637{
615 short recalc_x, recalc_y; 638 short recalc_x, recalc_y;
616 int x, y, sb_w, flags; 639 int x, y, sb_w, flags;
617 unsigned int w, h; 640 unsigned int w, h;
618 unsigned int max_width, max_height; 641 unsigned int max_width, max_height;
619 dDisp;
620 642
621 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 643 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
622 szHint.win_gravity = NorthWestGravity; 644 szHint.win_gravity = NorthWestGravity;
623 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 645 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
624 646
… …
686 708
687 if (scrollBar.state) 709 if (scrollBar.state)
688 { 710 {
689 sb_w = scrollbar_TotalWidth (); 711 sb_w = scrollbar_TotalWidth ();
690 szHint.base_width += sb_w; 712 szHint.base_width += sb_w;
713
691 if (!OPTION (Opt_scrollBar_right)) 714 if (!OPTION (Opt_scrollBar_right))
692 window_vt_x += sb_w; 715 window_vt_x += sb_w;
693 } 716 }
694 717
695 szHint.width_inc = fwidth; 718 szHint.width_inc = fwidth;
696 szHint.height_inc = fheight; 719 szHint.height_inc = fheight;
697 szHint.min_width = szHint.base_width + szHint.width_inc; 720 szHint.min_width = szHint.base_width + szHint.width_inc;
698 szHint.min_height = szHint.base_height + szHint.height_inc; 721 szHint.min_height = szHint.base_height + szHint.height_inc;
699 722
700 if (newwidth && newwidth - szHint.base_width < max_width) 723 if (newwidth && newwidth - szHint.base_width < max_width)
701 { 724 {
702 szHint.width = newwidth; 725 szHint.width = newwidth;
… …
721 744
722 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 745 if (scrollBar.state && OPTION (Opt_scrollBar_right))
723 window_sb_x = szHint.width - sb_w; 746 window_sb_x = szHint.width - sb_w;
724 747
725 if (recalc_x) 748 if (recalc_x)
726 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750
727 if (recalc_y) 751 if (recalc_y)
728 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 752 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
729 753
730 ncol = width / fwidth; 754 ncol = width / fwidth;
731 nrow = height / fheight; 755 nrow = height / fheight;
732} 756}
733 757
… …
788 delete fontset[0]; 812 delete fontset[0];
789 fontset[0] = fs; 813 fontset[0] = fs;
790 814
791 prop = (*fs)[1]->properties (); 815 prop = (*fs)[1]->properties ();
792 prop.height += lineSpace; 816 prop.height += lineSpace;
817
793 fs->set_prop (prop); 818 fs->set_prop (prop, false);
794 819
795 fwidth = prop.width; 820 fwidth = prop.width;
796 fheight = prop.height; 821 fheight = prop.height;
797 fbase = prop.ascent; 822 fbase = prop.ascent;
798 823
… …
807 { 832 {
808 fontset[style] = fs = new rxvt_fontset (this); 833 fontset[style] = fs = new rxvt_fontset (this);
809 rxvt_fontprop prop2 = prop; 834 rxvt_fontprop prop2 = prop;
810 835
811 if (res) 836 if (res)
812 prop2.weight = prop2.slant = rxvt_fontprop::unset; 837 {
838 fs->populate (res);
839 fs->set_prop (prop2, false);
840 }
813 else 841 else
814 { 842 {
815 res = fontset[0]->fontdesc; 843 fs->populate (fontset[0]->fontdesc);
816 844
817 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 845 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
818 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 846 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
847
848 fs->set_prop (prop2, true);
819 } 849 }
820 850
821 fs->populate (res);
822 fs->set_prop (prop2);
823 } 851 }
824#else 852#else
825 fontset[style] = fontset[0]; 853 fontset[style] = fontset[0];
826#endif 854#endif
827 } 855 }
… …
836 return true; 864 return true;
837} 865}
838 866
839void rxvt_term::set_string_property (Atom prop, const char *str, int len) 867void rxvt_term::set_string_property (Atom prop, const char *str, int len)
840{ 868{
841 XChangeProperty (display->display, parent[0], 869 XChangeProperty (dpy, parent[0],
842 prop, XA_STRING, 8, PropModeReplace, 870 prop, XA_STRING, 8, PropModeReplace,
843 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 871 (const unsigned char *)str, len >= 0 ? len : strlen (str));
844} 872}
845 873
846void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 874void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
847{ 875{
848 wchar_t *ws = rxvt_mbstowcs (str, len); 876 wchar_t *ws = rxvt_mbstowcs (str, len);
849 char *s = rxvt_wcstoutf8 (ws); 877 char *s = rxvt_wcstoutf8 (ws);
850 878
851 XChangeProperty (display->display, parent[0], 879 XChangeProperty (dpy, parent[0],
852 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 880 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
853 (const unsigned char *)s, strlen (s)); 881 (const unsigned char *)s, strlen (s));
854 882
855 free (s); 883 free (s);
856 free (ws); 884 free (ws);
… …
881void 909void
882rxvt_term::set_window_color (int idx, const char *color) 910rxvt_term::set_window_color (int idx, const char *color)
883{ 911{
884 rxvt_color xcol; 912 rxvt_color xcol;
885 int i; 913 int i;
886 914
887 if (color == NULL || *color == '\0') 915 if (color == NULL || *color == '\0')
888 return; 916 return;
917
918 color = strdup (color);
919 allocated.push_back ((void *)color);
920 rs[Rs_color + idx] = color;
889 921
890 /* handle color aliases */ 922 /* handle color aliases */
891 if (isdigit (*color)) 923 if (isdigit (*color))
892 { 924 {
893 i = atoi (color); 925 i = atoi (color);
894 926
895 if (i >= 8 && i <= 15) 927 if (i >= 8 && i <= 15)
896 { /* bright colors */ 928 { /* bright colors */
897 i -= 8; 929 i -= 8;
898 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 930 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
899 SET_PIXCOLOR (idx);
900 goto done; 931 goto done;
901 } 932 }
902 933
903 if (i >= 0 && i <= 7) 934 if (i >= 0 && i <= 7)
904 { /* normal colors */ 935 { /* normal colors */
905 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 936 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
906 SET_PIXCOLOR (idx);
907 goto done; 937 goto done;
908 } 938 }
909 } 939 }
910 940
911 if (!rXParseAllocColor (&xcol, color)) 941 set_color (xcol, color);
912 return;
913
914 /* XStoreColor (display->display, display->cmap, XColor*); */
915 942
916 /* 943 /*
917 * FIXME: should free colors here, but no idea how to do it so instead, 944 * FIXME: should free colors here, but no idea how to do it so instead,
918 * so just keep gobbling up the colormap 945 * so just keep gobbling up the colormap
919 */ 946 */
920# if 0
921 for (i = Color_Black; i <= Color_White; i++)
922 if (pix_colors[idx] == pix_colors[i])
923 break;
924 if (i > Color_White)
925 {
926 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
927 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
928 DisplayPlanes (display->display, display->screen));
929 }
930# endif
931 947
932 pix_colors_focused[idx] = xcol; 948 pix_colors_focused[idx] = xcol;
933 SET_PIXCOLOR (idx);
934 949
935 /* XSetWindowAttributes attr; */ 950 /* XSetWindowAttributes attr; */
936 /* Cursor cursor; */ 951 /* Cursor cursor; */
937done: 952done:
938
939#if OFF_FOCUS_FADING
940 if (rs[Rs_fade])
941 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
942#endif
943
944 /*TODO: handle Color_BD, scrollbar background, etc. */ 953 /*TODO: handle Color_BD, scrollbar background, etc. */
945 954
955 update_fade_color (idx);
946 recolour_cursor (); 956 recolour_cursor ();
947 scr_recolour (); 957 scr_recolour ();
948} 958}
949 959
950#else 960#else
… …
952#endif /* XTERM_COLOR_CHANGE */ 962#endif /* XTERM_COLOR_CHANGE */
953 963
954void 964void
955rxvt_term::recolour_cursor () 965rxvt_term::recolour_cursor ()
956{ 966{
957 XColor xcol[2]; 967 XColor fg, bg;
958 968
959 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 969 (ISSET_PIXCOLOR (Color_pointer_fg)
960 ? pix_colors_focused[Color_pointer_fg] 970 ? pix_colors_focused[Color_pointer_fg]
961 : pix_colors_focused[Color_fg]; 971 : pix_colors_focused[Color_fg]).get (fg);
972
962 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 973 (ISSET_PIXCOLOR (Color_pointer_bg)
963 ? pix_colors_focused[Color_pointer_bg] 974 ? pix_colors_focused[Color_pointer_bg]
964 : pix_colors_focused[Color_bg]; 975 : pix_colors_focused[Color_bg]).get (bg);
965 976
966 XQueryColors (display->display, display->cmap, xcol, 2); 977 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
967 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
968} 978}
969 979
970/*----------------------------------------------------------------------*/ 980/*----------------------------------------------------------------------*/
971/* 981/*
972 * find if fg/bg matches any of the normal (low-intensity) colors 982 * find if fg/bg matches any of the normal (low-intensity) colors
… …
976{ 986{
977 unsigned int i; 987 unsigned int i;
978 const char *xpmb = "\0"; 988 const char *xpmb = "\0";
979 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 989 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
980 990
981 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
982 strcpy (fstr, "default"); 991 strcpy (fstr, "default");
983 strcpy (bstr, "default"); 992 strcpy (bstr, "default");
984 for (i = Color_Black; i <= Color_White; i++) 993 for (i = Color_Black; i <= Color_White; i++)
985 if (pix_colors[Color_fg] == pix_colors[i]) 994 if (pix_colors[Color_fg] == pix_colors[i])
986 { 995 {
… …
1001 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1010 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1002} 1011}
1003 1012
1004/*----------------------------------------------------------------------*/ 1013/*----------------------------------------------------------------------*/
1005 1014
1006int 1015bool
1007rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1016rxvt_term::set_color (rxvt_color &color, const char *name)
1008{ 1017{
1009 if (!screen_in_out->set (display, colour)) 1018 if (color.set (this, name))
1010 {
1011 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1012 return false;
1013 }
1014
1015 return true; 1019 return true;
1020
1021 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1022 return false;
1023}
1024
1025void
1026rxvt_term::alias_color (int dst, int src)
1027{
1028 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1016} 1029}
1017 1030
1018/* -------------------------------------------------------------------- * 1031/* -------------------------------------------------------------------- *
1019 * - WINDOW RESIZING - * 1032 * - WINDOW RESIZING - *
1020 * -------------------------------------------------------------------- */ 1033 * -------------------------------------------------------------------- */
… …
1022rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1035rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1023{ 1036{
1024 int fix_screen; 1037 int fix_screen;
1025 int old_width = szHint.width; 1038 int old_width = szHint.width;
1026 int old_height = szHint.height; 1039 int old_height = szHint.height;
1027 dDisp;
1028 1040
1029 window_calc (newwidth, newheight); 1041 window_calc (newwidth, newheight);
1042
1043 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1030 XSetWMNormalHints (disp, parent[0], &szHint); 1044 XSetWMNormalHints (dpy, parent[0], &szHint);
1031 1045
1032 if (!ignoreparent) 1046 if (!ignoreparent)
1033 { 1047 {
1034#ifdef SMART_RESIZE 1048#ifdef SMART_RESIZE
1035 /* 1049 /*
… …
1039 int x, y, x1, y1; 1053 int x, y, x1, y1;
1040 int dx, dy; 1054 int dx, dy;
1041 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1055 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1042 Window unused_cr; 1056 Window unused_cr;
1043 1057
1044 XTranslateCoordinates (disp, parent[0], display->root, 1058 XTranslateCoordinates (dpy, parent[0], display->root,
1045 0, 0, &x, &y, &unused_cr); 1059 0, 0, &x, &y, &unused_cr);
1046 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1060 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1047 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1061 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1048 /* 1062 /*
1049 * if display->root isn't the parent window, a WM will probably have offset 1063 * if display->root isn't the parent window, a WM will probably have offset
1050 * our position for handles and decorations. Counter it 1064 * our position for handles and decorations. Counter it
1051 */ 1065 */
… …
1053 { 1067 {
1054 x -= x1; 1068 x -= x1;
1055 y -= y1; 1069 y -= y1;
1056 } 1070 }
1057 1071
1058 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1072 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1059 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1073 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1060 dx = old_width - szHint.width; 1074 dx = old_width - szHint.width;
1061 dy = old_height - szHint.height; 1075 dy = old_height - szHint.height;
1062 1076
1063 /* Check position of the center of the window */ 1077 /* Check position of the center of the window */
1064 if (x < x1) /* left half */ 1078 if (x < x1) /* left half */
… …
1068 if (y < y1) /* top half */ 1082 if (y < y1) /* top half */
1069 dy = 0; 1083 dy = 0;
1070 else if (y == y1) /* exact center */ 1084 else if (y == y1) /* exact center */
1071 dy /= 2; 1085 dy /= 2;
1072 1086
1073 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1087 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1074 szHint.width, szHint.height); 1088 szHint.width, szHint.height);
1075#else 1089#else
1076 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1090 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1077#endif 1091#endif
1078 } 1092 }
1079 1093
1080 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1094 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1081 1095
1082 if (fix_screen || newwidth != old_width || newheight != old_height) 1096 if (fix_screen || newwidth != old_width || newheight != old_height)
1083 { 1097 {
1084 if (scrollBar.state) 1098 if (scrollBar.state)
1085 { 1099 {
1086 XMoveResizeWindow (disp, scrollBar.win, 1100 XMoveResizeWindow (dpy, scrollBar.win,
1087 window_sb_x, 0, 1101 window_sb_x, 0,
1088 scrollbar_TotalWidth (), szHint.height); 1102 scrollbar_TotalWidth (), szHint.height);
1089 resize_scrollbar (); 1103 resize_scrollbar ();
1090 } 1104 }
1091 1105
1092 XMoveResizeWindow (disp, vt, 1106 XMoveResizeWindow (dpy, vt,
1093 window_vt_x, window_vt_y, 1107 window_vt_x, window_vt_y,
1094 width, height); 1108 width, height);
1095 1109
1096 scr_clear (); 1110 scr_clear ();
1097#ifdef XPM_BACKGROUND 1111#ifdef XPM_BACKGROUND
… …
1100 } 1114 }
1101 1115
1102 if (fix_screen || old_height == 0) 1116 if (fix_screen || old_height == 0)
1103 scr_reset (); 1117 scr_reset ();
1104 1118
1119 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1120 //scr_touch (false);
1121
1105#ifdef XPM_BACKGROUND 1122#ifdef XPM_BACKGROUND
1106 if (pixmap) 1123 if (pixmap)
1107 scr_touch (false); 1124 scr_touch (false);
1108#endif 1125#endif
1109 1126
1110#ifdef USE_XIM 1127#ifdef USE_XIM
1111 IMSetStatusPosition (); 1128 IMSetPosition ();
1112#endif 1129#endif
1113} 1130}
1114 1131
1115/* 1132/*
1116 * Set the width/height of the vt window in characters. Units are pixels. 1133 * Set the width/height of the vt window in characters. Units are pixels.
… …
1121{ 1138{
1122 XWindowAttributes wattr; 1139 XWindowAttributes wattr;
1123 1140
1124 if (newwidth == 0 || newheight == 0) 1141 if (newwidth == 0 || newheight == 0)
1125 { 1142 {
1126 XGetWindowAttributes (display->display, display->root, &wattr); 1143 XGetWindowAttributes (dpy, display->root, &wattr);
1127 1144
1128 if (newwidth == 0) 1145 if (newwidth == 0)
1129 newwidth = wattr.width - szHint.base_width; 1146 newwidth = wattr.width - szHint.base_width;
1130 if (newheight == 0) 1147 if (newheight == 0)
1131 newheight = wattr.height - szHint.base_height; 1148 newheight = wattr.height - szHint.base_height;
… …
1145#ifdef USE_XIM 1162#ifdef USE_XIM
1146 1163
1147void 1164void
1148rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1165rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1149{ 1166{
1150 fg = pix_colors[Color_fg]; 1167 fg = pix_colors [Color_fg];
1151 bg = pix_colors[Color_bg]; 1168 bg = pix_colors [Color_bg];
1152} 1169}
1153 1170
1154void 1171void
1155rxvt_term::im_set_size (XRectangle &size) 1172rxvt_term::im_set_size (XRectangle &size)
1156{ 1173{
… …
1193 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1210 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1194 1211
1195 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1212 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1196 *p = '\0'; 1213 *p = '\0';
1197 1214
1198 atom = XInternAtom (display->display, server, False); 1215 atom = XInternAtom (dpy, server, False);
1199 win = XGetSelectionOwner (display->display, atom); 1216 win = XGetSelectionOwner (dpy, atom);
1200 1217
1201 if (win != None) 1218 if (win != None)
1202 return True; 1219 return True;
1203 } 1220 }
1204 1221
… …
1211 XPoint nspot; 1228 XPoint nspot;
1212 XVaNestedList preedit_attr; 1229 XVaNestedList preedit_attr;
1213 1230
1214 if (!Input_Context 1231 if (!Input_Context
1215 || !focus 1232 || !focus
1216 || !(input_style & XIMPreeditPosition)) 1233 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1217 return; 1234 return;
1218 1235
1219 im_set_position (nspot); 1236 im_set_position (nspot);
1220 1237
1221 if (nspot.x == spot.x && nspot.y == spot.y) 1238 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1300 DT_INT, call_data->chg_first, 1317 DT_INT, call_data->chg_first,
1301 DT_INT, call_data->chg_length, 1318 DT_INT, call_data->chg_length,
1302 DT_END)); 1319 DT_END));
1303} 1320}
1304 1321
1322#if 0
1305static void 1323static void
1306xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data) 1324xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1307{ 1325{
1308 ((rxvt_term *)client_data)->make_current (); 1326 ((rxvt_term *)client_data)->make_current ();
1309 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET, 1327 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1310 DT_INT, call_data->position, 1328 DT_INT, call_data->position,
1311 DT_INT, call_data->direction, 1329 DT_INT, call_data->direction,
1312 DT_INT, call_data->style, 1330 DT_INT, call_data->style,
1313 DT_END)); 1331 DT_END));
1314} 1332}
1333#endif
1315 1334
1316#endif 1335#endif
1317 1336
1318/* 1337/*
1319 * Try to open a XIM with the current modifiers, then see if we can 1338 * Try to open a XIM with the current modifiers, then see if we can
… …
1426 "*", 1445 "*",
1427 fheight, 1446 fheight,
1428 fheight + 1, fheight - 1, 1447 fheight + 1, fheight - 1,
1429 fheight - 2, fheight + 2); 1448 fheight - 2, fheight + 2);
1430 1449
1431 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1450 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1432 &missing_charset_list, &missing_charset_count, &def_string); 1451 &missing_charset_list, &missing_charset_count, &def_string);
1433 1452
1434 if (missing_charset_list) 1453 if (missing_charset_list)
1435 XFreeStringList (missing_charset_list); 1454 XFreeStringList (missing_charset_list);
1436 1455
… …
1477 XNBackground, bg, 1496 XNBackground, bg,
1478 XNArea, &status_rect, 1497 XNArea, &status_rect,
1479 XNFontSet, fs, 1498 XNFontSet, fs,
1480 NULL); 1499 NULL);
1481 } 1500 }
1501#if ENABLE_XIM_ONTHESPOT
1482 else if (input_style & XIMPreeditCallbacks) 1502 else if (input_style & XIMPreeditCallbacks)
1483 { 1503 {
1504 im_set_position (spot);
1505
1484 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1506 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1485 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1507 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1486 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1508 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1509# if 0
1487 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1510 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1511# endif
1488 1512
1489 preedit_attr = XVaCreateNestedList (0, 1513 preedit_attr = XVaCreateNestedList (0,
1514 XNSpotLocation, &spot,
1490 XNPreeditStartCallback, &xcb[0], 1515 XNPreeditStartCallback, &xcb[0],
1491 XNPreeditDoneCallback , &xcb[1], 1516 XNPreeditDoneCallback , &xcb[1],
1492 XNPreeditDrawCallback , &xcb[2], 1517 XNPreeditDrawCallback , &xcb[2],
1518# if 0
1493 XNPreeditCaretCallback, &xcb[3], 1519 XNPreeditCaretCallback, &xcb[3],
1520# endif
1494 NULL); 1521 NULL);
1495 } 1522 }
1523#endif
1496 1524
1497 Input_Context = XCreateIC (xim, 1525 Input_Context = XCreateIC (xim,
1498 XNInputStyle, input_style, 1526 XNInputStyle, input_style,
1499 XNClientWindow, vt, 1527 XNClientWindow, vt,
1500 XNFocusWindow, parent[0], 1528 XNFocusWindow, parent[0],
… …
1502 preedit_attr, 1530 preedit_attr,
1503 status_attr ? XNStatusAttributes : NULL, 1531 status_attr ? XNStatusAttributes : NULL,
1504 status_attr, NULL); 1532 status_attr, NULL);
1505 1533
1506 if (preedit_attr) XFree (preedit_attr); 1534 if (preedit_attr) XFree (preedit_attr);
1507 if (status_attr) XFree (status_attr); 1535 if (status_attr) XFree (status_attr);
1508 if (fs) XFreeFontSet (display->display, fs); 1536 if (fs) XFreeFontSet (dpy, fs);
1509 1537
1510 if (Input_Context == NULL) 1538 if (Input_Context == NULL)
1511 { 1539 {
1512 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1540 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1513 im_destroy (); 1541 im_destroy ();
… …
1518 // unfortunately, only the focus window is used by XIM, hard to fix 1546 // unfortunately, only the focus window is used by XIM, hard to fix
1519 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1547 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1520 vt_select_input (); 1548 vt_select_input ();
1521#endif 1549#endif
1522 1550
1523 if (input_style & XIMPreeditArea)
1524 IMSetStatusPosition (); 1551 IMSetPosition ();
1525 1552
1526 return true; 1553 return true;
1527} 1554}
1528 1555
1529void 1556void
… …
1587 SET_LOCALE (locale); 1614 SET_LOCALE (locale);
1588#endif 1615#endif
1589} 1616}
1590 1617
1591void 1618void
1592rxvt_term::IMSetStatusPosition () 1619rxvt_term::IMSetPosition ()
1593{ 1620{
1594 XRectangle preedit_rect, status_rect, *needed_rect; 1621 XRectangle preedit_rect, status_rect, *needed_rect;
1595 XVaNestedList preedit_attr, status_attr; 1622 XVaNestedList preedit_attr, status_attr;
1596 1623
1597 if (!Input_Context 1624 if (!Input_Context
1598 || !focus 1625 || !focus
1599 || !(input_style & XIMPreeditArea) 1626 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1600 || !IMisRunning ()) 1627 || !IMisRunning ())
1601 return; 1628 return;
1602 1629
1630 if (input_style & XIMPreeditPosition)
1631 {
1632 im_set_size (preedit_rect);
1633 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1634
1635 XSetICValues (Input_Context,
1636 XNPreeditAttributes, preedit_attr, NULL);
1637 }
1638 else
1639 {
1603 /* Getting the necessary width of preedit area */ 1640 /* Getting the necessary width of preedit area */
1604 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1641 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1605 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1642 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1606 XFree (status_attr); 1643 XFree (status_attr);
1607 1644
1608 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1645 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1609 XFree (needed_rect); 1646 XFree (needed_rect);
1610 1647
1611 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1648 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1612 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1649 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1613 1650
1614 XSetICValues (Input_Context, 1651 XSetICValues (Input_Context,
1615 XNPreeditAttributes, preedit_attr, 1652 XNPreeditAttributes, preedit_attr,
1616 XNStatusAttributes, status_attr, NULL); 1653 XNStatusAttributes, status_attr,
1654 NULL);
1617 1655
1656 XFree (status_attr);
1657 }
1658
1618 XFree (preedit_attr); 1659 XFree (preedit_attr);
1619 XFree (status_attr);
1620} 1660}
1621#endif /* USE_XIM */ 1661#endif /* USE_XIM */
1622 1662
1623/*----------------------- end-of-file (C source) -----------------------*/ 1663/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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