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.225 by root, Wed Jul 5 22:46:14 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>
… …
198void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
199{ 199{
200 if (cmd_pid) 200 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
202 202
203 pty_ev.stop ();
203 delete pty; pty = 0; 204 delete pty; pty = 0;
204} 205}
205 206
206rxvt_term::~rxvt_term () 207rxvt_term::~rxvt_term ()
207{ 208{
… …
216#endif 217#endif
217 delete fontset[0]; 218 delete fontset[0];
218 219
219 if (display) 220 if (display)
220 { 221 {
221 dDisp;
222
223 selection_clear (); 222 selection_clear ();
224 223
225#ifdef USE_XIM 224#ifdef USE_XIM
226 im_destroy (); 225 im_destroy ();
227#endif 226#endif
228#ifdef XTERM_SCROLLBAR 227#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 228 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 229 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 230#endif
232#ifdef PLAIN_SCROLLBAR 231#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 232 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 233#endif
235#ifdef NEXT_SCROLLBAR 234#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 235 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 236 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 237 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 238 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 239 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 240 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 241 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 242 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 243 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 244 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 245#endif
247#ifdef RXVT_SCROLLBAR 246#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 247 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 248 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 249 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 250#endif
252 if (gc) XFreeGC (disp, gc); 251 if (gc) XFreeGC (dpy, gc);
253 252
254 delete drawable; 253 delete drawable;
255 // destroy all windows 254 // destroy all windows
256 if (parent[0]) 255 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 256 XDestroyWindow (dpy, parent[0]);
258 }
259 257
260 // TODO: free pixcolours, colours should become part of rxvt_display 258 for (int i = 0; i < TOTAL_COLORS; i++)
259 if (ISSET_PIXCOLOR (i))
260 {
261 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING
263 pix_colors_unfocused [i].free (this);
264#endif
265 }
266
267 clear ();
268 }
269
261 delete pix_colors_focused; 270 delete pix_colors_focused;
262#if OFF_FOCUS_FADING 271#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 272 delete pix_colors_unfocused;
264#endif 273#endif
265 274
… …
368{ 377{
369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 378 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370 (*t)->emergency_cleanup (); 379 (*t)->emergency_cleanup ();
371} 380}
372 381
373#if ENABLE_FRILLS 382#if !ENABLE_MINIMAL
374static void 383static void
375print_x_error (Display *dpy, XErrorEvent *event) 384print_x_error (Display *dpy, XErrorEvent *event)
376{ 385{
377 char buffer[BUFSIZ]; 386 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 387 char mesg[BUFSIZ];
… …
426 GET_R->allowedxerror = event->error_code; 435 GET_R->allowedxerror = event->error_code;
427 else 436 else
428 { 437 {
429 // GET_R is most likely not the terminal which caused the error, 438 // GET_R is most likely not the terminal which caused the error,
430 // so just output the error and continue 439 // so just output the error and continue
431#if ENABLE_FRILLS 440#if ENABLE_MINIMAL
441 old_xerror_handler (display, event);
442#else
432 print_x_error (display, event); 443 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 444#endif
436 } 445 }
437 446
438 return 0; 447 return 0;
439} 448}
… …
475 484
476 pty = ptytty::create (); 485 pty = ptytty::create ();
477 486
478 create_windows (argc, argv); 487 create_windows (argc, argv);
479 488
480 dDisp;
481
482 init_xlocale (); 489 init_xlocale ();
483 490
484 scr_reset (); // initialize screen 491 scr_reset (); // initialize screen
485 492
486#if 0 493#if 0
487 XSynchronize (disp, True); 494 XSynchronize (dpy, True);
488#endif 495#endif
489 496
490#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
491 if (OPTION (Opt_scrollBar)) 498 if (OPTION (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */ 499 resize_scrollbar (); /* create and map scrollbar */
493#endif 500#endif
494#ifdef TRANSPARENT 501#ifdef TRANSPARENT
495 if (OPTION (Opt_transparent)) 502 if (OPTION (Opt_transparent))
496 { 503 {
497 XSelectInput (disp, display->root, PropertyChangeMask); 504 XSelectInput (dpy, display->root, PropertyChangeMask);
498 check_our_parents (); 505 check_our_parents ();
499 rootwin_ev.start (display, display->root); 506 rootwin_ev.start (display, display->root);
500 } 507 }
501#endif 508#endif
502 509
… …
516#if ENABLE_XEMBED 523#if ENABLE_XEMBED
517 if (rs[Rs_embed]) 524 if (rs[Rs_embed])
518 { 525 {
519 long info[2] = { 0, XEMBED_MAPPED }; 526 long info[2] = { 0, XEMBED_MAPPED };
520 527
521 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 528 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
522 32, PropModeReplace, (unsigned char *)&info, 2); 529 32, PropModeReplace, (unsigned char *)&info, 2);
523 } 530 }
524#endif 531#endif
525 532
526 XMapWindow (disp, vt); 533 XMapWindow (dpy, vt);
527 XMapWindow (disp, parent[0]); 534 XMapWindow (dpy, parent[0]);
528 535
529 return true; 536 return true;
530} 537}
531 538
532static struct sig_handlers 539static struct sig_handlers
… …
622{ 629{
623 short recalc_x, recalc_y; 630 short recalc_x, recalc_y;
624 int x, y, sb_w, flags; 631 int x, y, sb_w, flags;
625 unsigned int w, h; 632 unsigned int w, h;
626 unsigned int max_width, max_height; 633 unsigned int max_width, max_height;
627 dDisp;
628 634
629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 635 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
630 szHint.win_gravity = NorthWestGravity; 636 szHint.win_gravity = NorthWestGravity;
631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 637 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
632 638
… …
694 700
695 if (scrollBar.state) 701 if (scrollBar.state)
696 { 702 {
697 sb_w = scrollbar_TotalWidth (); 703 sb_w = scrollbar_TotalWidth ();
698 szHint.base_width += sb_w; 704 szHint.base_width += sb_w;
705
699 if (!OPTION (Opt_scrollBar_right)) 706 if (!OPTION (Opt_scrollBar_right))
700 window_vt_x += sb_w; 707 window_vt_x += sb_w;
701 } 708 }
702 709
703 szHint.width_inc = fwidth; 710 szHint.width_inc = fwidth;
704 szHint.height_inc = fheight; 711 szHint.height_inc = fheight;
705 szHint.min_width = szHint.base_width + szHint.width_inc; 712 szHint.min_width = szHint.base_width + szHint.width_inc;
706 szHint.min_height = szHint.base_height + szHint.height_inc; 713 szHint.min_height = szHint.base_height + szHint.height_inc;
707 714
708 if (newwidth && newwidth - szHint.base_width < max_width) 715 if (newwidth && newwidth - szHint.base_width < max_width)
709 { 716 {
710 szHint.width = newwidth; 717 szHint.width = newwidth;
… …
729 736
730 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 737 if (scrollBar.state && OPTION (Opt_scrollBar_right))
731 window_sb_x = szHint.width - sb_w; 738 window_sb_x = szHint.width - sb_w;
732 739
733 if (recalc_x) 740 if (recalc_x)
734 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742
735 if (recalc_y) 743 if (recalc_y)
736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 744 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
737 745
738 ncol = width / fwidth; 746 ncol = width / fwidth;
739 nrow = height / fheight; 747 nrow = height / fheight;
740} 748}
741 749
… …
844 return true; 852 return true;
845} 853}
846 854
847void rxvt_term::set_string_property (Atom prop, const char *str, int len) 855void rxvt_term::set_string_property (Atom prop, const char *str, int len)
848{ 856{
849 XChangeProperty (display->display, parent[0], 857 XChangeProperty (dpy, parent[0],
850 prop, XA_STRING, 8, PropModeReplace, 858 prop, XA_STRING, 8, PropModeReplace,
851 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 859 (const unsigned char *)str, len >= 0 ? len : strlen (str));
852} 860}
853 861
854void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 862void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
855{ 863{
856 wchar_t *ws = rxvt_mbstowcs (str, len); 864 wchar_t *ws = rxvt_mbstowcs (str, len);
857 char *s = rxvt_wcstoutf8 (ws); 865 char *s = rxvt_wcstoutf8 (ws);
858 866
859 XChangeProperty (display->display, parent[0], 867 XChangeProperty (dpy, parent[0],
860 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 868 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
861 (const unsigned char *)s, strlen (s)); 869 (const unsigned char *)s, strlen (s));
862 870
863 free (s); 871 free (s);
864 free (ws); 872 free (ws);
… …
889void 897void
890rxvt_term::set_window_color (int idx, const char *color) 898rxvt_term::set_window_color (int idx, const char *color)
891{ 899{
892 rxvt_color xcol; 900 rxvt_color xcol;
893 int i; 901 int i;
894 902
895 if (color == NULL || *color == '\0') 903 if (color == NULL || *color == '\0')
896 return; 904 return;
905
906 color = strdup (color);
907 allocated.push_back ((void *)color);
908 rs[Rs_color + idx] = color;
897 909
898 /* handle color aliases */ 910 /* handle color aliases */
899 if (isdigit (*color)) 911 if (isdigit (*color))
900 { 912 {
901 i = atoi (color); 913 i = atoi (color);
902 914
903 if (i >= 8 && i <= 15) 915 if (i >= 8 && i <= 15)
904 { /* bright colors */ 916 { /* bright colors */
905 i -= 8; 917 i -= 8;
906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
907 SET_PIXCOLOR (idx);
908 goto done; 919 goto done;
909 } 920 }
910 921
911 if (i >= 0 && i <= 7) 922 if (i >= 0 && i <= 7)
912 { /* normal colors */ 923 { /* normal colors */
913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 924 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
914 SET_PIXCOLOR (idx);
915 goto done; 925 goto done;
916 } 926 }
917 } 927 }
918 928
919 if (!rXParseAllocColor (&xcol, color)) 929 set_color (xcol, color);
920 return;
921
922 /* XStoreColor (display->display, display->cmap, XColor*); */
923 930
924 /* 931 /*
925 * FIXME: should free colors here, but no idea how to do it so instead, 932 * FIXME: should free colors here, but no idea how to do it so instead,
926 * so just keep gobbling up the colormap 933 * so just keep gobbling up the colormap
927 */ 934 */
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 935
940 pix_colors_focused[idx] = xcol; 936 pix_colors_focused[idx] = xcol;
941 SET_PIXCOLOR (idx);
942 937
943 /* XSetWindowAttributes attr; */ 938 /* XSetWindowAttributes attr; */
944 /* Cursor cursor; */ 939 /* Cursor cursor; */
945done: 940done:
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. */ 941 /*TODO: handle Color_BD, scrollbar background, etc. */
953 942
943 update_fade_color (idx);
954 recolour_cursor (); 944 recolour_cursor ();
955 scr_recolour (); 945 scr_recolour ();
956} 946}
957 947
958#else 948#else
… …
960#endif /* XTERM_COLOR_CHANGE */ 950#endif /* XTERM_COLOR_CHANGE */
961 951
962void 952void
963rxvt_term::recolour_cursor () 953rxvt_term::recolour_cursor ()
964{ 954{
965 XColor xcol[2]; 955 XColor fg, bg;
966 956
967 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 957 (ISSET_PIXCOLOR (Color_pointer_fg)
968 ? pix_colors_focused[Color_pointer_fg] 958 ? pix_colors_focused[Color_pointer_fg]
969 : pix_colors_focused[Color_fg]; 959 : pix_colors_focused[Color_fg]).get (fg);
960
970 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 961 (ISSET_PIXCOLOR (Color_pointer_bg)
971 ? pix_colors_focused[Color_pointer_bg] 962 ? pix_colors_focused[Color_pointer_bg]
972 : pix_colors_focused[Color_bg]; 963 : pix_colors_focused[Color_bg]).get (bg);
973 964
974 XQueryColors (display->display, display->cmap, xcol, 2); 965 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
975 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
976} 966}
977 967
978/*----------------------------------------------------------------------*/ 968/*----------------------------------------------------------------------*/
979/* 969/*
980 * find if fg/bg matches any of the normal (low-intensity) colors 970 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1008 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 998 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1009} 999}
1010 1000
1011/*----------------------------------------------------------------------*/ 1001/*----------------------------------------------------------------------*/
1012 1002
1013int 1003bool
1014rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1004rxvt_term::set_color (rxvt_color &color, const char *name)
1015{ 1005{
1016 if (!screen_in_out->set (display, colour)) 1006 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; 1007 return true;
1008
1009 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1010 return false;
1011}
1012
1013void
1014rxvt_term::alias_color (int dst, int src)
1015{
1016 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1023} 1017}
1024 1018
1025/* -------------------------------------------------------------------- * 1019/* -------------------------------------------------------------------- *
1026 * - WINDOW RESIZING - * 1020 * - WINDOW RESIZING - *
1027 * -------------------------------------------------------------------- */ 1021 * -------------------------------------------------------------------- */
… …
1029rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1023rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1030{ 1024{
1031 int fix_screen; 1025 int fix_screen;
1032 int old_width = szHint.width; 1026 int old_width = szHint.width;
1033 int old_height = szHint.height; 1027 int old_height = szHint.height;
1034 dDisp;
1035 1028
1036 window_calc (newwidth, newheight); 1029 window_calc (newwidth, newheight);
1030
1031 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1037 XSetWMNormalHints (disp, parent[0], &szHint); 1032 XSetWMNormalHints (dpy, parent[0], &szHint);
1038 1033
1039 if (!ignoreparent) 1034 if (!ignoreparent)
1040 { 1035 {
1041#ifdef SMART_RESIZE 1036#ifdef SMART_RESIZE
1042 /* 1037 /*
… …
1046 int x, y, x1, y1; 1041 int x, y, x1, y1;
1047 int dx, dy; 1042 int dx, dy;
1048 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1043 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1049 Window unused_cr; 1044 Window unused_cr;
1050 1045
1051 XTranslateCoordinates (disp, parent[0], display->root, 1046 XTranslateCoordinates (dpy, parent[0], display->root,
1052 0, 0, &x, &y, &unused_cr); 1047 0, 0, &x, &y, &unused_cr);
1053 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1048 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1054 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1049 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1055 /* 1050 /*
1056 * if display->root isn't the parent window, a WM will probably have offset 1051 * if display->root isn't the parent window, a WM will probably have offset
1057 * our position for handles and decorations. Counter it 1052 * our position for handles and decorations. Counter it
1058 */ 1053 */
… …
1060 { 1055 {
1061 x -= x1; 1056 x -= x1;
1062 y -= y1; 1057 y -= y1;
1063 } 1058 }
1064 1059
1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1060 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1061 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1067 dx = old_width - szHint.width; 1062 dx = old_width - szHint.width;
1068 dy = old_height - szHint.height; 1063 dy = old_height - szHint.height;
1069 1064
1070 /* Check position of the center of the window */ 1065 /* Check position of the center of the window */
1071 if (x < x1) /* left half */ 1066 if (x < x1) /* left half */
… …
1075 if (y < y1) /* top half */ 1070 if (y < y1) /* top half */
1076 dy = 0; 1071 dy = 0;
1077 else if (y == y1) /* exact center */ 1072 else if (y == y1) /* exact center */
1078 dy /= 2; 1073 dy /= 2;
1079 1074
1080 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1075 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1081 szHint.width, szHint.height); 1076 szHint.width, szHint.height);
1082#else 1077#else
1083 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1078 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1084#endif 1079#endif
1085 } 1080 }
1086 1081
1087 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1082 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1088 1083
1089 if (fix_screen || newwidth != old_width || newheight != old_height) 1084 if (fix_screen || newwidth != old_width || newheight != old_height)
1090 { 1085 {
1091 if (scrollBar.state) 1086 if (scrollBar.state)
1092 { 1087 {
1093 XMoveResizeWindow (disp, scrollBar.win, 1088 XMoveResizeWindow (dpy, scrollBar.win,
1094 window_sb_x, 0, 1089 window_sb_x, 0,
1095 scrollbar_TotalWidth (), szHint.height); 1090 scrollbar_TotalWidth (), szHint.height);
1096 resize_scrollbar (); 1091 resize_scrollbar ();
1097 } 1092 }
1098 1093
1099 XMoveResizeWindow (disp, vt, 1094 XMoveResizeWindow (dpy, vt,
1100 window_vt_x, window_vt_y, 1095 window_vt_x, window_vt_y,
1101 width, height); 1096 width, height);
1102 1097
1103 scr_clear (); 1098 scr_clear ();
1104#ifdef XPM_BACKGROUND 1099#ifdef XPM_BACKGROUND
… …
1107 } 1102 }
1108 1103
1109 if (fix_screen || old_height == 0) 1104 if (fix_screen || old_height == 0)
1110 scr_reset (); 1105 scr_reset ();
1111 1106
1107 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1108 //scr_touch (false);
1109
1112#ifdef XPM_BACKGROUND 1110#ifdef XPM_BACKGROUND
1113 if (pixmap) 1111 if (pixmap)
1114 scr_touch (false); 1112 scr_touch (false);
1115#endif 1113#endif
1116 1114
1117#ifdef USE_XIM 1115#ifdef USE_XIM
1118 IMSetStatusPosition (); 1116 IMSetPosition ();
1119#endif 1117#endif
1120} 1118}
1121 1119
1122/* 1120/*
1123 * Set the width/height of the vt window in characters. Units are pixels. 1121 * Set the width/height of the vt window in characters. Units are pixels.
… …
1128{ 1126{
1129 XWindowAttributes wattr; 1127 XWindowAttributes wattr;
1130 1128
1131 if (newwidth == 0 || newheight == 0) 1129 if (newwidth == 0 || newheight == 0)
1132 { 1130 {
1133 XGetWindowAttributes (display->display, display->root, &wattr); 1131 XGetWindowAttributes (dpy, display->root, &wattr);
1134 1132
1135 if (newwidth == 0) 1133 if (newwidth == 0)
1136 newwidth = wattr.width - szHint.base_width; 1134 newwidth = wattr.width - szHint.base_width;
1137 if (newheight == 0) 1135 if (newheight == 0)
1138 newheight = wattr.height - szHint.base_height; 1136 newheight = wattr.height - szHint.base_height;
… …
1152#ifdef USE_XIM 1150#ifdef USE_XIM
1153 1151
1154void 1152void
1155rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1153rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1156{ 1154{
1157 fg = pix_colors[Color_fg]; 1155 fg = pix_colors [Color_fg];
1158 bg = pix_colors[Color_bg]; 1156 bg = pix_colors [Color_bg];
1159} 1157}
1160 1158
1161void 1159void
1162rxvt_term::im_set_size (XRectangle &size) 1160rxvt_term::im_set_size (XRectangle &size)
1163{ 1161{
… …
1200 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1198 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1201 1199
1202 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1200 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1203 *p = '\0'; 1201 *p = '\0';
1204 1202
1205 atom = XInternAtom (display->display, server, False); 1203 atom = XInternAtom (dpy, server, False);
1206 win = XGetSelectionOwner (display->display, atom); 1204 win = XGetSelectionOwner (dpy, atom);
1207 1205
1208 if (win != None) 1206 if (win != None)
1209 return True; 1207 return True;
1210 } 1208 }
1211 1209
… …
1435 "*", 1433 "*",
1436 fheight, 1434 fheight,
1437 fheight + 1, fheight - 1, 1435 fheight + 1, fheight - 1,
1438 fheight - 2, fheight + 2); 1436 fheight - 2, fheight + 2);
1439 1437
1440 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1438 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1441 &missing_charset_list, &missing_charset_count, &def_string); 1439 &missing_charset_list, &missing_charset_count, &def_string);
1442 1440
1443 if (missing_charset_list) 1441 if (missing_charset_list)
1444 XFreeStringList (missing_charset_list); 1442 XFreeStringList (missing_charset_list);
1445 1443
… …
1486 XNBackground, bg, 1484 XNBackground, bg,
1487 XNArea, &status_rect, 1485 XNArea, &status_rect,
1488 XNFontSet, fs, 1486 XNFontSet, fs,
1489 NULL); 1487 NULL);
1490 } 1488 }
1489#if ENABLE_XIM_ONTHESPOT
1491 else if (input_style & XIMPreeditCallbacks) 1490 else if (input_style & XIMPreeditCallbacks)
1492 { 1491 {
1493 im_set_position (spot); 1492 im_set_position (spot);
1494 1493
1495 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1494 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; 1495 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; 1496 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1498#if 0 1497# if 0
1499 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1498 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1500#endif 1499# endif
1501 1500
1502 preedit_attr = XVaCreateNestedList (0, 1501 preedit_attr = XVaCreateNestedList (0,
1503 XNSpotLocation, &spot, 1502 XNSpotLocation, &spot,
1504 XNPreeditStartCallback, &xcb[0], 1503 XNPreeditStartCallback, &xcb[0],
1505 XNPreeditDoneCallback , &xcb[1], 1504 XNPreeditDoneCallback , &xcb[1],
1506 XNPreeditDrawCallback , &xcb[2], 1505 XNPreeditDrawCallback , &xcb[2],
1507#if 0 1506# if 0
1508 XNPreeditCaretCallback, &xcb[3], 1507 XNPreeditCaretCallback, &xcb[3],
1509#endif 1508# endif
1510 NULL); 1509 NULL);
1511 } 1510 }
1511#endif
1512 1512
1513 Input_Context = XCreateIC (xim, 1513 Input_Context = XCreateIC (xim,
1514 XNInputStyle, input_style, 1514 XNInputStyle, input_style,
1515 XNClientWindow, vt, 1515 XNClientWindow, vt,
1516 XNFocusWindow, parent[0], 1516 XNFocusWindow, parent[0],
… …
1518 preedit_attr, 1518 preedit_attr,
1519 status_attr ? XNStatusAttributes : NULL, 1519 status_attr ? XNStatusAttributes : NULL,
1520 status_attr, NULL); 1520 status_attr, NULL);
1521 1521
1522 if (preedit_attr) XFree (preedit_attr); 1522 if (preedit_attr) XFree (preedit_attr);
1523 if (status_attr) XFree (status_attr); 1523 if (status_attr) XFree (status_attr);
1524 if (fs) XFreeFontSet (display->display, fs); 1524 if (fs) XFreeFontSet (dpy, fs);
1525 1525
1526 if (Input_Context == NULL) 1526 if (Input_Context == NULL)
1527 { 1527 {
1528 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1528 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1529 im_destroy (); 1529 im_destroy ();
… …
1534 // unfortunately, only the focus window is used by XIM, hard to fix 1534 // unfortunately, only the focus window is used by XIM, hard to fix
1535 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1535 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1536 vt_select_input (); 1536 vt_select_input ();
1537#endif 1537#endif
1538 1538
1539 if (input_style & XIMPreeditArea)
1540 IMSetStatusPosition (); 1539 IMSetPosition ();
1541 1540
1542 return true; 1541 return true;
1543} 1542}
1544 1543
1545void 1544void
… …
1603 SET_LOCALE (locale); 1602 SET_LOCALE (locale);
1604#endif 1603#endif
1605} 1604}
1606 1605
1607void 1606void
1608rxvt_term::IMSetStatusPosition () 1607rxvt_term::IMSetPosition ()
1609{ 1608{
1610 XRectangle preedit_rect, status_rect, *needed_rect; 1609 XRectangle preedit_rect, status_rect, *needed_rect;
1611 XVaNestedList preedit_attr, status_attr; 1610 XVaNestedList preedit_attr, status_attr;
1612 1611
1613 if (!Input_Context 1612 if (!Input_Context
1614 || !focus 1613 || !focus
1615 || !(input_style & XIMPreeditArea) 1614 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1616 || !IMisRunning ()) 1615 || !IMisRunning ())
1617 return; 1616 return;
1618 1617
1618 if (input_style & XIMPreeditPosition)
1619 {
1620 im_set_size (preedit_rect);
1621 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1622
1623 XSetICValues (Input_Context,
1624 XNPreeditAttributes, preedit_attr, NULL);
1625 }
1626 else
1627 {
1619 /* Getting the necessary width of preedit area */ 1628 /* Getting the necessary width of preedit area */
1620 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1629 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1621 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1630 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1622 XFree (status_attr); 1631 XFree (status_attr);
1623 1632
1624 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1633 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1625 XFree (needed_rect); 1634 XFree (needed_rect);
1626 1635
1627 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1636 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1628 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1637 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1629 1638
1630 XSetICValues (Input_Context, 1639 XSetICValues (Input_Context,
1631 XNPreeditAttributes, preedit_attr, 1640 XNPreeditAttributes, preedit_attr,
1632 XNStatusAttributes, status_attr, NULL); 1641 XNStatusAttributes, status_attr,
1642 NULL);
1633 1643
1644 XFree (status_attr);
1645 }
1646
1634 XFree (preedit_attr); 1647 XFree (preedit_attr);
1635 XFree (status_attr);
1636} 1648}
1637#endif /* USE_XIM */ 1649#endif /* USE_XIM */
1638 1650
1639/*----------------------- end-of-file (C source) -----------------------*/ 1651/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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