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.223 by root, Sat Feb 18 14:14:43 2006 UTC

… …
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
… …
271 for (int i = 0; i < allocated.size (); i++) 280 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 281 free (allocated [i]);
273 282
274 free (selection.text); 283 free (selection.text);
275 // TODO: manage env vars in child only(!) 284 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 285 free (env_display);
278 free (env_term); 286 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 287 free (locale);
281 free (v_buffer); 288 free (v_buffer);
282 free (incr_buf); 289 free (incr_buf);
283 290
284 delete envv; 291 delete envv;
… …
370{ 377{
371 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++)
372 (*t)->emergency_cleanup (); 379 (*t)->emergency_cleanup ();
373} 380}
374 381
375#if ENABLE_FRILLS 382#if !ENABLE_MINIMAL
376static void 383static void
377print_x_error (Display *dpy, XErrorEvent *event) 384print_x_error (Display *dpy, XErrorEvent *event)
378{ 385{
379 char buffer[BUFSIZ]; 386 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 387 char mesg[BUFSIZ];
… …
428 GET_R->allowedxerror = event->error_code; 435 GET_R->allowedxerror = event->error_code;
429 else 436 else
430 { 437 {
431 // 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,
432 // so just output the error and continue 439 // so just output the error and continue
433#if ENABLE_FRILLS 440#if ENABLE_MINIMAL
441 old_xerror_handler (display, event);
442#else
434 print_x_error (display, event); 443 print_x_error (display, event);
435#else
436 old_xerror_handler (display, event);
437#endif 444#endif
438 } 445 }
439 446
440 return 0; 447 return 0;
441} 448}
… …
477 484
478 pty = ptytty::create (); 485 pty = ptytty::create ();
479 486
480 create_windows (argc, argv); 487 create_windows (argc, argv);
481 488
482 dDisp;
483
484 init_xlocale (); 489 init_xlocale ();
485 490
486 scr_reset (); // initialize screen 491 scr_reset (); // initialize screen
487 492
488#if 0 493#if 0
489 XSynchronize (disp, True); 494 XSynchronize (dpy, True);
490#endif 495#endif
491 496
492#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
493 if (OPTION (Opt_scrollBar)) 498 if (OPTION (Opt_scrollBar))
494 resize_scrollbar (); /* create and map scrollbar */ 499 resize_scrollbar (); /* create and map scrollbar */
495#endif 500#endif
496#ifdef TRANSPARENT 501#ifdef TRANSPARENT
497 if (OPTION (Opt_transparent)) 502 if (OPTION (Opt_transparent))
498 { 503 {
499 XSelectInput (disp, display->root, PropertyChangeMask); 504 XSelectInput (dpy, display->root, PropertyChangeMask);
500 check_our_parents (); 505 check_our_parents ();
501 rootwin_ev.start (display, display->root); 506 rootwin_ev.start (display, display->root);
502 } 507 }
503#endif 508#endif
504 509
… …
513 518
514 check_ev.start (); 519 check_ev.start ();
515 520
516 HOOK_INVOKE ((this, HOOK_START, DT_END)); 521 HOOK_INVOKE ((this, HOOK_START, DT_END));
517 522
523#if ENABLE_XEMBED
524 if (rs[Rs_embed])
525 {
526 long info[2] = { 0, XEMBED_MAPPED };
527
528 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
529 32, PropModeReplace, (unsigned char *)&info, 2);
530 }
531#endif
532
518 XMapWindow (disp, vt); 533 XMapWindow (dpy, vt);
519 XMapWindow (disp, parent[0]); 534 XMapWindow (dpy, parent[0]);
520 535
521 return true; 536 return true;
522} 537}
523 538
524static struct sig_handlers 539static struct sig_handlers
… …
614{ 629{
615 short recalc_x, recalc_y; 630 short recalc_x, recalc_y;
616 int x, y, sb_w, flags; 631 int x, y, sb_w, flags;
617 unsigned int w, h; 632 unsigned int w, h;
618 unsigned int max_width, max_height; 633 unsigned int max_width, max_height;
619 dDisp;
620 634
621 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 635 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
622 szHint.win_gravity = NorthWestGravity; 636 szHint.win_gravity = NorthWestGravity;
623 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 637 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
624 638
… …
686 700
687 if (scrollBar.state) 701 if (scrollBar.state)
688 { 702 {
689 sb_w = scrollbar_TotalWidth (); 703 sb_w = scrollbar_TotalWidth ();
690 szHint.base_width += sb_w; 704 szHint.base_width += sb_w;
705
691 if (!OPTION (Opt_scrollBar_right)) 706 if (!OPTION (Opt_scrollBar_right))
692 window_vt_x += sb_w; 707 window_vt_x += sb_w;
693 } 708 }
694 709
695 szHint.width_inc = fwidth; 710 szHint.width_inc = fwidth;
696 szHint.height_inc = fheight; 711 szHint.height_inc = fheight;
697 szHint.min_width = szHint.base_width + szHint.width_inc; 712 szHint.min_width = szHint.base_width + szHint.width_inc;
698 szHint.min_height = szHint.base_height + szHint.height_inc; 713 szHint.min_height = szHint.base_height + szHint.height_inc;
699 714
700 if (newwidth && newwidth - szHint.base_width < max_width) 715 if (newwidth && newwidth - szHint.base_width < max_width)
701 { 716 {
702 szHint.width = newwidth; 717 szHint.width = newwidth;
… …
721 736
722 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 737 if (scrollBar.state && OPTION (Opt_scrollBar_right))
723 window_sb_x = szHint.width - sb_w; 738 window_sb_x = szHint.width - sb_w;
724 739
725 if (recalc_x) 740 if (recalc_x)
726 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742
727 if (recalc_y) 743 if (recalc_y)
728 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 744 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
729 745
730 ncol = width / fwidth; 746 ncol = width / fwidth;
731 nrow = height / fheight; 747 nrow = height / fheight;
732} 748}
733 749
… …
836 return true; 852 return true;
837} 853}
838 854
839void 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)
840{ 856{
841 XChangeProperty (display->display, parent[0], 857 XChangeProperty (dpy, parent[0],
842 prop, XA_STRING, 8, PropModeReplace, 858 prop, XA_STRING, 8, PropModeReplace,
843 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 859 (const unsigned char *)str, len >= 0 ? len : strlen (str));
844} 860}
845 861
846void 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)
847{ 863{
848 wchar_t *ws = rxvt_mbstowcs (str, len); 864 wchar_t *ws = rxvt_mbstowcs (str, len);
849 char *s = rxvt_wcstoutf8 (ws); 865 char *s = rxvt_wcstoutf8 (ws);
850 866
851 XChangeProperty (display->display, parent[0], 867 XChangeProperty (dpy, parent[0],
852 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 868 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
853 (const unsigned char *)s, strlen (s)); 869 (const unsigned char *)s, strlen (s));
854 870
855 free (s); 871 free (s);
856 free (ws); 872 free (ws);
… …
881void 897void
882rxvt_term::set_window_color (int idx, const char *color) 898rxvt_term::set_window_color (int idx, const char *color)
883{ 899{
884 rxvt_color xcol; 900 rxvt_color xcol;
885 int i; 901 int i;
886 902
887 if (color == NULL || *color == '\0') 903 if (color == NULL || *color == '\0')
888 return; 904 return;
905
906 color = strdup (color);
907 allocated.push_back ((void *)color);
908 rs[Rs_color + idx] = color;
889 909
890 /* handle color aliases */ 910 /* handle color aliases */
891 if (isdigit (*color)) 911 if (isdigit (*color))
892 { 912 {
893 i = atoi (color); 913 i = atoi (color);
894 914
895 if (i >= 8 && i <= 15) 915 if (i >= 8 && i <= 15)
896 { /* bright colors */ 916 { /* bright colors */
897 i -= 8; 917 i -= 8;
898 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
899 SET_PIXCOLOR (idx);
900 goto done; 919 goto done;
901 } 920 }
902 921
903 if (i >= 0 && i <= 7) 922 if (i >= 0 && i <= 7)
904 { /* normal colors */ 923 { /* normal colors */
905 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 924 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
906 SET_PIXCOLOR (idx);
907 goto done; 925 goto done;
908 } 926 }
909 } 927 }
910 928
911 if (!rXParseAllocColor (&xcol, color)) 929 set_color (xcol, color);
912 return;
913
914 /* XStoreColor (display->display, display->cmap, XColor*); */
915 930
916 /* 931 /*
917 * 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,
918 * so just keep gobbling up the colormap 933 * so just keep gobbling up the colormap
919 */ 934 */
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 935
932 pix_colors_focused[idx] = xcol; 936 pix_colors_focused[idx] = xcol;
933 SET_PIXCOLOR (idx);
934 937
935 /* XSetWindowAttributes attr; */ 938 /* XSetWindowAttributes attr; */
936 /* Cursor cursor; */ 939 /* Cursor cursor; */
937done: 940done:
938 941
939#if OFF_FOCUS_FADING 942#if OFF_FOCUS_FADING
940 if (rs[Rs_fade]) 943 if (rs[Rs_fade])
941 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 944 {
945 rgba c;
946 pix_colors [Color_fade].get (c);
947 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
948 }
942#endif 949#endif
943 950
944 /*TODO: handle Color_BD, scrollbar background, etc. */ 951 /*TODO: handle Color_BD, scrollbar background, etc. */
945 952
946 recolour_cursor (); 953 recolour_cursor ();
… …
952#endif /* XTERM_COLOR_CHANGE */ 959#endif /* XTERM_COLOR_CHANGE */
953 960
954void 961void
955rxvt_term::recolour_cursor () 962rxvt_term::recolour_cursor ()
956{ 963{
957 XColor xcol[2]; 964 XColor fg, bg;
958 965
959 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 966 (ISSET_PIXCOLOR (Color_pointer_fg)
960 ? pix_colors_focused[Color_pointer_fg] 967 ? pix_colors_focused[Color_pointer_fg]
961 : pix_colors_focused[Color_fg]; 968 : pix_colors_focused[Color_fg]).get (fg);
969
962 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 970 (ISSET_PIXCOLOR (Color_pointer_bg)
963 ? pix_colors_focused[Color_pointer_bg] 971 ? pix_colors_focused[Color_pointer_bg]
964 : pix_colors_focused[Color_bg]; 972 : pix_colors_focused[Color_bg]).get (bg);
965 973
966 XQueryColors (display->display, display->cmap, xcol, 2); 974 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
967 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
968} 975}
969 976
970/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
971/* 978/*
972 * find if fg/bg matches any of the normal (low-intensity) colors 979 * find if fg/bg matches any of the normal (low-intensity) colors
… …
976{ 983{
977 unsigned int i; 984 unsigned int i;
978 const char *xpmb = "\0"; 985 const char *xpmb = "\0";
979 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 986 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
980 987
981 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
982 strcpy (fstr, "default"); 988 strcpy (fstr, "default");
983 strcpy (bstr, "default"); 989 strcpy (bstr, "default");
984 for (i = Color_Black; i <= Color_White; i++) 990 for (i = Color_Black; i <= Color_White; i++)
985 if (pix_colors[Color_fg] == pix_colors[i]) 991 if (pix_colors[Color_fg] == pix_colors[i])
986 { 992 {
… …
1001 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1007 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1002} 1008}
1003 1009
1004/*----------------------------------------------------------------------*/ 1010/*----------------------------------------------------------------------*/
1005 1011
1006int 1012bool
1007rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1013rxvt_term::set_color (rxvt_color &color, const char *name)
1008{ 1014{
1009 if (!screen_in_out->set (display, colour)) 1015 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; 1016 return true;
1017
1018 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1019 return false;
1020}
1021
1022void
1023rxvt_term::alias_color (int dst, int src)
1024{
1025 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1016} 1026}
1017 1027
1018/* -------------------------------------------------------------------- * 1028/* -------------------------------------------------------------------- *
1019 * - WINDOW RESIZING - * 1029 * - WINDOW RESIZING - *
1020 * -------------------------------------------------------------------- */ 1030 * -------------------------------------------------------------------- */
… …
1022rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1032rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1023{ 1033{
1024 int fix_screen; 1034 int fix_screen;
1025 int old_width = szHint.width; 1035 int old_width = szHint.width;
1026 int old_height = szHint.height; 1036 int old_height = szHint.height;
1027 dDisp;
1028 1037
1029 window_calc (newwidth, newheight); 1038 window_calc (newwidth, newheight);
1039
1040 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1030 XSetWMNormalHints (disp, parent[0], &szHint); 1041 XSetWMNormalHints (dpy, parent[0], &szHint);
1031 1042
1032 if (!ignoreparent) 1043 if (!ignoreparent)
1033 { 1044 {
1034#ifdef SMART_RESIZE 1045#ifdef SMART_RESIZE
1035 /* 1046 /*
… …
1039 int x, y, x1, y1; 1050 int x, y, x1, y1;
1040 int dx, dy; 1051 int dx, dy;
1041 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1052 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1042 Window unused_cr; 1053 Window unused_cr;
1043 1054
1044 XTranslateCoordinates (disp, parent[0], display->root, 1055 XTranslateCoordinates (dpy, parent[0], display->root,
1045 0, 0, &x, &y, &unused_cr); 1056 0, 0, &x, &y, &unused_cr);
1046 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1057 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1047 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1058 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1048 /* 1059 /*
1049 * if display->root isn't the parent window, a WM will probably have offset 1060 * if display->root isn't the parent window, a WM will probably have offset
1050 * our position for handles and decorations. Counter it 1061 * our position for handles and decorations. Counter it
1051 */ 1062 */
… …
1053 { 1064 {
1054 x -= x1; 1065 x -= x1;
1055 y -= y1; 1066 y -= y1;
1056 } 1067 }
1057 1068
1058 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1069 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1059 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1070 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1060 dx = old_width - szHint.width; 1071 dx = old_width - szHint.width;
1061 dy = old_height - szHint.height; 1072 dy = old_height - szHint.height;
1062 1073
1063 /* Check position of the center of the window */ 1074 /* Check position of the center of the window */
1064 if (x < x1) /* left half */ 1075 if (x < x1) /* left half */
… …
1068 if (y < y1) /* top half */ 1079 if (y < y1) /* top half */
1069 dy = 0; 1080 dy = 0;
1070 else if (y == y1) /* exact center */ 1081 else if (y == y1) /* exact center */
1071 dy /= 2; 1082 dy /= 2;
1072 1083
1073 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1084 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1074 szHint.width, szHint.height); 1085 szHint.width, szHint.height);
1075#else 1086#else
1076 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1087 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1077#endif 1088#endif
1078 } 1089 }
1079 1090
1080 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1091 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1081 1092
1082 if (fix_screen || newwidth != old_width || newheight != old_height) 1093 if (fix_screen || newwidth != old_width || newheight != old_height)
1083 { 1094 {
1084 if (scrollBar.state) 1095 if (scrollBar.state)
1085 { 1096 {
1086 XMoveResizeWindow (disp, scrollBar.win, 1097 XMoveResizeWindow (dpy, scrollBar.win,
1087 window_sb_x, 0, 1098 window_sb_x, 0,
1088 scrollbar_TotalWidth (), szHint.height); 1099 scrollbar_TotalWidth (), szHint.height);
1089 resize_scrollbar (); 1100 resize_scrollbar ();
1090 } 1101 }
1091 1102
1092 XMoveResizeWindow (disp, vt, 1103 XMoveResizeWindow (dpy, vt,
1093 window_vt_x, window_vt_y, 1104 window_vt_x, window_vt_y,
1094 width, height); 1105 width, height);
1095 1106
1096 scr_clear (); 1107 scr_clear ();
1097#ifdef XPM_BACKGROUND 1108#ifdef XPM_BACKGROUND
… …
1100 } 1111 }
1101 1112
1102 if (fix_screen || old_height == 0) 1113 if (fix_screen || old_height == 0)
1103 scr_reset (); 1114 scr_reset ();
1104 1115
1116 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1117 //scr_touch (false);
1118
1105#ifdef XPM_BACKGROUND 1119#ifdef XPM_BACKGROUND
1106 if (pixmap) 1120 if (pixmap)
1107 scr_touch (false); 1121 scr_touch (false);
1108#endif 1122#endif
1109 1123
1110#ifdef USE_XIM 1124#ifdef USE_XIM
1111 IMSetStatusPosition (); 1125 IMSetPosition ();
1112#endif 1126#endif
1113} 1127}
1114 1128
1115/* 1129/*
1116 * Set the width/height of the vt window in characters. Units are pixels. 1130 * Set the width/height of the vt window in characters. Units are pixels.
… …
1121{ 1135{
1122 XWindowAttributes wattr; 1136 XWindowAttributes wattr;
1123 1137
1124 if (newwidth == 0 || newheight == 0) 1138 if (newwidth == 0 || newheight == 0)
1125 { 1139 {
1126 XGetWindowAttributes (display->display, display->root, &wattr); 1140 XGetWindowAttributes (dpy, display->root, &wattr);
1127 1141
1128 if (newwidth == 0) 1142 if (newwidth == 0)
1129 newwidth = wattr.width - szHint.base_width; 1143 newwidth = wattr.width - szHint.base_width;
1130 if (newheight == 0) 1144 if (newheight == 0)
1131 newheight = wattr.height - szHint.base_height; 1145 newheight = wattr.height - szHint.base_height;
… …
1145#ifdef USE_XIM 1159#ifdef USE_XIM
1146 1160
1147void 1161void
1148rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1162rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1149{ 1163{
1150 fg = pix_colors[Color_fg]; 1164 fg = pix_colors [Color_fg];
1151 bg = pix_colors[Color_bg]; 1165 bg = pix_colors [Color_bg];
1152} 1166}
1153 1167
1154void 1168void
1155rxvt_term::im_set_size (XRectangle &size) 1169rxvt_term::im_set_size (XRectangle &size)
1156{ 1170{
… …
1193 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1207 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1194 1208
1195 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1209 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1196 *p = '\0'; 1210 *p = '\0';
1197 1211
1198 atom = XInternAtom (display->display, server, False); 1212 atom = XInternAtom (dpy, server, False);
1199 win = XGetSelectionOwner (display->display, atom); 1213 win = XGetSelectionOwner (dpy, atom);
1200 1214
1201 if (win != None) 1215 if (win != None)
1202 return True; 1216 return True;
1203 } 1217 }
1204 1218
… …
1211 XPoint nspot; 1225 XPoint nspot;
1212 XVaNestedList preedit_attr; 1226 XVaNestedList preedit_attr;
1213 1227
1214 if (!Input_Context 1228 if (!Input_Context
1215 || !focus 1229 || !focus
1216 || !(input_style & XIMPreeditPosition)) 1230 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1217 return; 1231 return;
1218 1232
1219 im_set_position (nspot); 1233 im_set_position (nspot);
1220 1234
1221 if (nspot.x == spot.x && nspot.y == spot.y) 1235 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1300 DT_INT, call_data->chg_first, 1314 DT_INT, call_data->chg_first,
1301 DT_INT, call_data->chg_length, 1315 DT_INT, call_data->chg_length,
1302 DT_END)); 1316 DT_END));
1303} 1317}
1304 1318
1319#if 0
1305static void 1320static void
1306xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data) 1321xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1307{ 1322{
1308 ((rxvt_term *)client_data)->make_current (); 1323 ((rxvt_term *)client_data)->make_current ();
1309 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET, 1324 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1310 DT_INT, call_data->position, 1325 DT_INT, call_data->position,
1311 DT_INT, call_data->direction, 1326 DT_INT, call_data->direction,
1312 DT_INT, call_data->style, 1327 DT_INT, call_data->style,
1313 DT_END)); 1328 DT_END));
1314} 1329}
1330#endif
1315 1331
1316#endif 1332#endif
1317 1333
1318/* 1334/*
1319 * Try to open a XIM with the current modifiers, then see if we can 1335 * Try to open a XIM with the current modifiers, then see if we can
… …
1426 "*", 1442 "*",
1427 fheight, 1443 fheight,
1428 fheight + 1, fheight - 1, 1444 fheight + 1, fheight - 1,
1429 fheight - 2, fheight + 2); 1445 fheight - 2, fheight + 2);
1430 1446
1431 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1447 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1432 &missing_charset_list, &missing_charset_count, &def_string); 1448 &missing_charset_list, &missing_charset_count, &def_string);
1433 1449
1434 if (missing_charset_list) 1450 if (missing_charset_list)
1435 XFreeStringList (missing_charset_list); 1451 XFreeStringList (missing_charset_list);
1436 1452
… …
1477 XNBackground, bg, 1493 XNBackground, bg,
1478 XNArea, &status_rect, 1494 XNArea, &status_rect,
1479 XNFontSet, fs, 1495 XNFontSet, fs,
1480 NULL); 1496 NULL);
1481 } 1497 }
1498#if ENABLE_XIM_ONTHESPOT
1482 else if (input_style & XIMPreeditCallbacks) 1499 else if (input_style & XIMPreeditCallbacks)
1483 { 1500 {
1501 im_set_position (spot);
1502
1484 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1503 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; 1504 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; 1505 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1506# if 0
1487 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1507 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1508# endif
1488 1509
1489 preedit_attr = XVaCreateNestedList (0, 1510 preedit_attr = XVaCreateNestedList (0,
1511 XNSpotLocation, &spot,
1490 XNPreeditStartCallback, &xcb[0], 1512 XNPreeditStartCallback, &xcb[0],
1491 XNPreeditDoneCallback , &xcb[1], 1513 XNPreeditDoneCallback , &xcb[1],
1492 XNPreeditDrawCallback , &xcb[2], 1514 XNPreeditDrawCallback , &xcb[2],
1515# if 0
1493 XNPreeditCaretCallback, &xcb[3], 1516 XNPreeditCaretCallback, &xcb[3],
1517# endif
1494 NULL); 1518 NULL);
1495 } 1519 }
1520#endif
1496 1521
1497 Input_Context = XCreateIC (xim, 1522 Input_Context = XCreateIC (xim,
1498 XNInputStyle, input_style, 1523 XNInputStyle, input_style,
1499 XNClientWindow, vt, 1524 XNClientWindow, vt,
1500 XNFocusWindow, parent[0], 1525 XNFocusWindow, parent[0],
… …
1502 preedit_attr, 1527 preedit_attr,
1503 status_attr ? XNStatusAttributes : NULL, 1528 status_attr ? XNStatusAttributes : NULL,
1504 status_attr, NULL); 1529 status_attr, NULL);
1505 1530
1506 if (preedit_attr) XFree (preedit_attr); 1531 if (preedit_attr) XFree (preedit_attr);
1507 if (status_attr) XFree (status_attr); 1532 if (status_attr) XFree (status_attr);
1508 if (fs) XFreeFontSet (display->display, fs); 1533 if (fs) XFreeFontSet (dpy, fs);
1509 1534
1510 if (Input_Context == NULL) 1535 if (Input_Context == NULL)
1511 { 1536 {
1512 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1537 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1513 im_destroy (); 1538 im_destroy ();
… …
1518 // unfortunately, only the focus window is used by XIM, hard to fix 1543 // unfortunately, only the focus window is used by XIM, hard to fix
1519 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1544 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1520 vt_select_input (); 1545 vt_select_input ();
1521#endif 1546#endif
1522 1547
1523 if (input_style & XIMPreeditArea)
1524 IMSetStatusPosition (); 1548 IMSetPosition ();
1525 1549
1526 return true; 1550 return true;
1527} 1551}
1528 1552
1529void 1553void
… …
1587 SET_LOCALE (locale); 1611 SET_LOCALE (locale);
1588#endif 1612#endif
1589} 1613}
1590 1614
1591void 1615void
1592rxvt_term::IMSetStatusPosition () 1616rxvt_term::IMSetPosition ()
1593{ 1617{
1594 XRectangle preedit_rect, status_rect, *needed_rect; 1618 XRectangle preedit_rect, status_rect, *needed_rect;
1595 XVaNestedList preedit_attr, status_attr; 1619 XVaNestedList preedit_attr, status_attr;
1596 1620
1597 if (!Input_Context 1621 if (!Input_Context
1598 || !focus 1622 || !focus
1599 || !(input_style & XIMPreeditArea) 1623 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1600 || !IMisRunning ()) 1624 || !IMisRunning ())
1601 return; 1625 return;
1602 1626
1627 if (input_style & XIMPreeditPosition)
1628 {
1629 im_set_size (preedit_rect);
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631
1632 XSetICValues (Input_Context,
1633 XNPreeditAttributes, preedit_attr, NULL);
1634 }
1635 else
1636 {
1603 /* Getting the necessary width of preedit area */ 1637 /* Getting the necessary width of preedit area */
1604 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1638 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1605 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1639 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1606 XFree (status_attr); 1640 XFree (status_attr);
1607 1641
1608 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1642 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1609 XFree (needed_rect); 1643 XFree (needed_rect);
1610 1644
1611 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1645 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1612 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1646 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1613 1647
1614 XSetICValues (Input_Context, 1648 XSetICValues (Input_Context,
1615 XNPreeditAttributes, preedit_attr, 1649 XNPreeditAttributes, preedit_attr,
1616 XNStatusAttributes, status_attr, NULL); 1650 XNStatusAttributes, status_attr,
1651 NULL);
1617 1652
1653 XFree (status_attr);
1654 }
1655
1618 XFree (preedit_attr); 1656 XFree (preedit_attr);
1619 XFree (status_attr);
1620} 1657}
1621#endif /* USE_XIM */ 1658#endif /* USE_XIM */
1622 1659
1623/*----------------------- end-of-file (C source) -----------------------*/ 1660/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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