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.198 by root, Tue Jan 24 16:57:42 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
… …
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;
… …
305rxvt_term::destroy () 312rxvt_term::destroy ()
306{ 313{
307 if (destroy_ev.active) 314 if (destroy_ev.active)
308 return; 315 return;
309 316
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 318
313#if ENABLE_OVERLAY 319#if ENABLE_OVERLAY
314 scr_overlay_off (); 320 scr_overlay_off ();
315#endif 321#endif
316 322
… …
371{ 377{
372 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++)
373 (*t)->emergency_cleanup (); 379 (*t)->emergency_cleanup ();
374} 380}
375 381
376#if ENABLE_FRILLS 382#if !ENABLE_MINIMAL
377static void 383static void
378print_x_error (Display *dpy, XErrorEvent *event) 384print_x_error (Display *dpy, XErrorEvent *event)
379{ 385{
380 char buffer[BUFSIZ]; 386 char buffer[BUFSIZ];
381 char mesg[BUFSIZ]; 387 char mesg[BUFSIZ];
… …
429 GET_R->allowedxerror = event->error_code; 435 GET_R->allowedxerror = event->error_code;
430 else 436 else
431 { 437 {
432 // 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,
433 // so just output the error and continue 439 // so just output the error and continue
434#if ENABLE_FRILLS 440#if ENABLE_MINIMAL
441 old_xerror_handler (display, event);
442#else
435 print_x_error (display, event); 443 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 444#endif
439 } 445 }
440 446
441 return 0; 447 return 0;
442} 448}
… …
478 484
479 pty = ptytty::create (); 485 pty = ptytty::create ();
480 486
481 create_windows (argc, argv); 487 create_windows (argc, argv);
482 488
483 dDisp;
484
485 init_xlocale (); 489 init_xlocale ();
486 490
487 scr_reset (); // initialize screen 491 scr_reset (); // initialize screen
488 492
489#if 0 493#if 0
490 XSynchronize (disp, True); 494 XSynchronize (dpy, True);
491#endif 495#endif
492 496
493#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
494 if (OPTION (Opt_scrollBar)) 498 if (OPTION (Opt_scrollBar))
495 resize_scrollbar (); /* create and map scrollbar */ 499 resize_scrollbar (); /* create and map scrollbar */
496#endif 500#endif
497#ifdef TRANSPARENT 501#ifdef TRANSPARENT
498 if (OPTION (Opt_transparent)) 502 if (OPTION (Opt_transparent))
499 { 503 {
500 XSelectInput (disp, display->root, PropertyChangeMask); 504 XSelectInput (dpy, display->root, PropertyChangeMask);
501 check_our_parents (); 505 check_our_parents ();
502 rootwin_ev.start (display, display->root); 506 rootwin_ev.start (display, display->root);
503 } 507 }
504#endif 508#endif
505 509
… …
514 518
515 check_ev.start (); 519 check_ev.start ();
516 520
517 HOOK_INVOKE ((this, HOOK_START, DT_END)); 521 HOOK_INVOKE ((this, HOOK_START, DT_END));
518 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
519 XMapWindow (disp, vt); 533 XMapWindow (dpy, vt);
520 XMapWindow (disp, parent[0]); 534 XMapWindow (dpy, parent[0]);
521 535
522 return true; 536 return true;
523} 537}
524 538
525static struct sig_handlers 539static struct sig_handlers
… …
530 * Catch a fatal signal and tidy up before quitting 544 * Catch a fatal signal and tidy up before quitting
531 */ 545 */
532 void 546 void
533 sig_term (sig_watcher &w) 547 sig_term (sig_watcher &w)
534 { 548 {
535#ifdef DEBUG_CMD
536 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
537#endif
538 rxvt_emergency_cleanup (); 549 rxvt_emergency_cleanup ();
539 signal (w.signum, SIG_DFL); 550 signal (w.signum, SIG_DFL);
540 kill (getpid (), w.signum); 551 kill (getpid (), w.signum);
541 } 552 }
542 553
… …
618{ 629{
619 short recalc_x, recalc_y; 630 short recalc_x, recalc_y;
620 int x, y, sb_w, flags; 631 int x, y, sb_w, flags;
621 unsigned int w, h; 632 unsigned int w, h;
622 unsigned int max_width, max_height; 633 unsigned int max_width, max_height;
623 dDisp;
624
625 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
626 ncol, nrow, szHint.width, szHint.height));
627 634
628 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 635 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
629 szHint.win_gravity = NorthWestGravity; 636 szHint.win_gravity = NorthWestGravity;
630 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 637 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
631 638
… …
693 700
694 if (scrollBar.state) 701 if (scrollBar.state)
695 { 702 {
696 sb_w = scrollbar_TotalWidth (); 703 sb_w = scrollbar_TotalWidth ();
697 szHint.base_width += sb_w; 704 szHint.base_width += sb_w;
705
698 if (!OPTION (Opt_scrollBar_right)) 706 if (!OPTION (Opt_scrollBar_right))
699 window_vt_x += sb_w; 707 window_vt_x += sb_w;
700 } 708 }
701 709
702 szHint.width_inc = fwidth; 710 szHint.width_inc = fwidth;
703 szHint.height_inc = fheight; 711 szHint.height_inc = fheight;
704 szHint.min_width = szHint.base_width + szHint.width_inc; 712 szHint.min_width = szHint.base_width + szHint.width_inc;
705 szHint.min_height = szHint.base_height + szHint.height_inc; 713 szHint.min_height = szHint.base_height + szHint.height_inc;
706 714
707 if (newwidth && newwidth - szHint.base_width < max_width) 715 if (newwidth && newwidth - szHint.base_width < max_width)
708 { 716 {
709 szHint.width = newwidth; 717 szHint.width = newwidth;
… …
728 736
729 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 737 if (scrollBar.state && OPTION (Opt_scrollBar_right))
730 window_sb_x = szHint.width - sb_w; 738 window_sb_x = szHint.width - sb_w;
731 739
732 if (recalc_x) 740 if (recalc_x)
733 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742
734 if (recalc_y) 743 if (recalc_y)
735 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 744 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
736 745
737 ncol = width / fwidth; 746 ncol = width / fwidth;
738 nrow = height / fheight; 747 nrow = height / fheight;
739 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
740 ncol, nrow, szHint.width,
741 szHint.height));
742 return;
743} 748}
744 749
745/*----------------------------------------------------------------------*/ 750/*----------------------------------------------------------------------*/
746/* 751/*
747 * Tell the teletype handler what size the window is. 752 * Tell the teletype handler what size the window is.
… …
847 return true; 852 return true;
848} 853}
849 854
850void 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)
851{ 856{
852 XChangeProperty (display->display, parent[0], 857 XChangeProperty (dpy, parent[0],
853 prop, XA_STRING, 8, PropModeReplace, 858 prop, XA_STRING, 8, PropModeReplace,
854 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 859 (const unsigned char *)str, len >= 0 ? len : strlen (str));
855} 860}
856 861
857void 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)
858{ 863{
859 wchar_t *ws = rxvt_mbstowcs (str, len); 864 wchar_t *ws = rxvt_mbstowcs (str, len);
860 char *s = rxvt_wcstoutf8 (ws); 865 char *s = rxvt_wcstoutf8 (ws);
861 866
862 XChangeProperty (display->display, parent[0], 867 XChangeProperty (dpy, parent[0],
863 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 868 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
864 (const unsigned char *)s, strlen (s)); 869 (const unsigned char *)s, strlen (s));
865 870
866 free (s); 871 free (s);
867 free (ws); 872 free (ws);
… …
892void 897void
893rxvt_term::set_window_color (int idx, const char *color) 898rxvt_term::set_window_color (int idx, const char *color)
894{ 899{
895 rxvt_color xcol; 900 rxvt_color xcol;
896 int i; 901 int i;
897 902
898 if (color == NULL || *color == '\0') 903 if (color == NULL || *color == '\0')
899 return; 904 return;
905
906 color = strdup (color);
907 allocated.push_back ((void *)color);
908 rs[Rs_color + idx] = color;
900 909
901 /* handle color aliases */ 910 /* handle color aliases */
902 if (isdigit (*color)) 911 if (isdigit (*color))
903 { 912 {
904 i = atoi (color); 913 i = atoi (color);
905 914
906 if (i >= 8 && i <= 15) 915 if (i >= 8 && i <= 15)
907 { /* bright colors */ 916 { /* bright colors */
908 i -= 8; 917 i -= 8;
909 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
910 SET_PIXCOLOR (idx);
911 goto done; 919 goto done;
912 } 920 }
913 921
914 if (i >= 0 && i <= 7) 922 if (i >= 0 && i <= 7)
915 { /* normal colors */ 923 { /* normal colors */
916 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 924 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
917 SET_PIXCOLOR (idx);
918 goto done; 925 goto done;
919 } 926 }
920 } 927 }
921 928
922 if (!rXParseAllocColor (&xcol, color)) 929 set_color (xcol, color);
923 return;
924
925 /* XStoreColor (display->display, display->cmap, XColor*); */
926 930
927 /* 931 /*
928 * 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,
929 * so just keep gobbling up the colormap 933 * so just keep gobbling up the colormap
930 */ 934 */
931# if 0
932 for (i = Color_Black; i <= Color_White; i++)
933 if (pix_colors[idx] == pix_colors[i])
934 break;
935 if (i > Color_White)
936 {
937 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
938 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
939 DisplayPlanes (display->display, display->screen));
940 }
941# endif
942 935
943 pix_colors_focused[idx] = xcol; 936 pix_colors_focused[idx] = xcol;
944 SET_PIXCOLOR (idx);
945 937
946 /* XSetWindowAttributes attr; */ 938 /* XSetWindowAttributes attr; */
947 /* Cursor cursor; */ 939 /* Cursor cursor; */
948done: 940done:
949
950#if OFF_FOCUS_FADING
951 if (rs[Rs_fade])
952 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
953#endif
954
955 /*TODO: handle Color_BD, scrollbar background, etc. */ 941 /*TODO: handle Color_BD, scrollbar background, etc. */
956 942
943 update_fade_color (idx);
957 recolour_cursor (); 944 recolour_cursor ();
958 scr_recolour (); 945 scr_recolour ();
959} 946}
960 947
961#else 948#else
… …
963#endif /* XTERM_COLOR_CHANGE */ 950#endif /* XTERM_COLOR_CHANGE */
964 951
965void 952void
966rxvt_term::recolour_cursor () 953rxvt_term::recolour_cursor ()
967{ 954{
968 XColor xcol[2]; 955 XColor fg, bg;
969 956
970 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 957 (ISSET_PIXCOLOR (Color_pointer_fg)
971 ? pix_colors_focused[Color_pointer_fg] 958 ? pix_colors_focused[Color_pointer_fg]
972 : pix_colors_focused[Color_fg]; 959 : pix_colors_focused[Color_fg]).get (fg);
960
973 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 961 (ISSET_PIXCOLOR (Color_pointer_bg)
974 ? pix_colors_focused[Color_pointer_bg] 962 ? pix_colors_focused[Color_pointer_bg]
975 : pix_colors_focused[Color_bg]; 963 : pix_colors_focused[Color_bg]).get (bg);
976 964
977 XQueryColors (display->display, display->cmap, xcol, 2); 965 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
978 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
979} 966}
980 967
981/*----------------------------------------------------------------------*/ 968/*----------------------------------------------------------------------*/
982/* 969/*
983 * 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
… …
987{ 974{
988 unsigned int i; 975 unsigned int i;
989 const char *xpmb = "\0"; 976 const char *xpmb = "\0";
990 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 977 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
991 978
992 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
993 strcpy (fstr, "default"); 979 strcpy (fstr, "default");
994 strcpy (bstr, "default"); 980 strcpy (bstr, "default");
995 for (i = Color_Black; i <= Color_White; i++) 981 for (i = Color_Black; i <= Color_White; i++)
996 if (pix_colors[Color_fg] == pix_colors[i]) 982 if (pix_colors[Color_fg] == pix_colors[i])
997 { 983 {
… …
1012 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 998 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1013} 999}
1014 1000
1015/*----------------------------------------------------------------------*/ 1001/*----------------------------------------------------------------------*/
1016 1002
1017int 1003bool
1018rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1004rxvt_term::set_color (rxvt_color &color, const char *name)
1019{ 1005{
1020 if (!screen_in_out->set (display, colour)) 1006 if (color.set (this, name))
1021 {
1022 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1023 return false;
1024 }
1025
1026 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]);
1027} 1017}
1028 1018
1029/* -------------------------------------------------------------------- * 1019/* -------------------------------------------------------------------- *
1030 * - WINDOW RESIZING - * 1020 * - WINDOW RESIZING - *
1031 * -------------------------------------------------------------------- */ 1021 * -------------------------------------------------------------------- */
… …
1033rxvt_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)
1034{ 1024{
1035 int fix_screen; 1025 int fix_screen;
1036 int old_width = szHint.width; 1026 int old_width = szHint.width;
1037 int old_height = szHint.height; 1027 int old_height = szHint.height;
1038 dDisp;
1039 1028
1040 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)))
1041 XSetWMNormalHints (disp, parent[0], &szHint); 1032 XSetWMNormalHints (dpy, parent[0], &szHint);
1042 1033
1043 if (!ignoreparent) 1034 if (!ignoreparent)
1044 { 1035 {
1045#ifdef SMART_RESIZE 1036#ifdef SMART_RESIZE
1046 /* 1037 /*
… …
1050 int x, y, x1, y1; 1041 int x, y, x1, y1;
1051 int dx, dy; 1042 int dx, dy;
1052 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1043 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1053 Window unused_cr; 1044 Window unused_cr;
1054 1045
1055 XTranslateCoordinates (disp, parent[0], display->root, 1046 XTranslateCoordinates (dpy, parent[0], display->root,
1056 0, 0, &x, &y, &unused_cr); 1047 0, 0, &x, &y, &unused_cr);
1057 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1048 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1058 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1049 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1059 /* 1050 /*
1060 * 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
1061 * our position for handles and decorations. Counter it 1052 * our position for handles and decorations. Counter it
1062 */ 1053 */
… …
1064 { 1055 {
1065 x -= x1; 1056 x -= x1;
1066 y -= y1; 1057 y -= y1;
1067 } 1058 }
1068 1059
1069 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1060 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1070 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1061 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1071 dx = old_width - szHint.width; 1062 dx = old_width - szHint.width;
1072 dy = old_height - szHint.height; 1063 dy = old_height - szHint.height;
1073 1064
1074 /* Check position of the center of the window */ 1065 /* Check position of the center of the window */
1075 if (x < x1) /* left half */ 1066 if (x < x1) /* left half */
… …
1079 if (y < y1) /* top half */ 1070 if (y < y1) /* top half */
1080 dy = 0; 1071 dy = 0;
1081 else if (y == y1) /* exact center */ 1072 else if (y == y1) /* exact center */
1082 dy /= 2; 1073 dy /= 2;
1083 1074
1084 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1075 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1085 szHint.width, szHint.height); 1076 szHint.width, szHint.height);
1086#else 1077#else
1087 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1078 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1088#endif 1079#endif
1089 } 1080 }
1090 1081
1091 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1082 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1092 1083
1093 if (fix_screen || newwidth != old_width || newheight != old_height) 1084 if (fix_screen || newwidth != old_width || newheight != old_height)
1094 { 1085 {
1095 if (scrollBar.state) 1086 if (scrollBar.state)
1096 { 1087 {
1097 XMoveResizeWindow (disp, scrollBar.win, 1088 XMoveResizeWindow (dpy, scrollBar.win,
1098 window_sb_x, 0, 1089 window_sb_x, 0,
1099 scrollbar_TotalWidth (), szHint.height); 1090 scrollbar_TotalWidth (), szHint.height);
1100 resize_scrollbar (); 1091 resize_scrollbar ();
1101 } 1092 }
1102 1093
1103 XMoveResizeWindow (disp, vt, 1094 XMoveResizeWindow (dpy, vt,
1104 window_vt_x, window_vt_y, 1095 window_vt_x, window_vt_y,
1105 width, height); 1096 width, height);
1106 1097
1107 scr_clear (); 1098 scr_clear ();
1108#ifdef XPM_BACKGROUND 1099#ifdef XPM_BACKGROUND
… …
1111 } 1102 }
1112 1103
1113 if (fix_screen || old_height == 0) 1104 if (fix_screen || old_height == 0)
1114 scr_reset (); 1105 scr_reset ();
1115 1106
1107 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1108 //scr_touch (false);
1109
1116#ifdef XPM_BACKGROUND 1110#ifdef XPM_BACKGROUND
1117 if (pixmap) 1111 if (pixmap)
1118 scr_touch (false); 1112 scr_touch (false);
1119#endif 1113#endif
1120 1114
1121#ifdef USE_XIM 1115#ifdef USE_XIM
1122 IMSetStatusPosition (); 1116 IMSetPosition ();
1123#endif 1117#endif
1124} 1118}
1125 1119
1126/* 1120/*
1127 * 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.
… …
1132{ 1126{
1133 XWindowAttributes wattr; 1127 XWindowAttributes wattr;
1134 1128
1135 if (newwidth == 0 || newheight == 0) 1129 if (newwidth == 0 || newheight == 0)
1136 { 1130 {
1137 XGetWindowAttributes (display->display, display->root, &wattr); 1131 XGetWindowAttributes (dpy, display->root, &wattr);
1138 1132
1139 if (newwidth == 0) 1133 if (newwidth == 0)
1140 newwidth = wattr.width - szHint.base_width; 1134 newwidth = wattr.width - szHint.base_width;
1141 if (newheight == 0) 1135 if (newheight == 0)
1142 newheight = wattr.height - szHint.base_height; 1136 newheight = wattr.height - szHint.base_height;
… …
1156#ifdef USE_XIM 1150#ifdef USE_XIM
1157 1151
1158void 1152void
1159rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1153rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1160{ 1154{
1161 fg = pix_colors[Color_fg]; 1155 fg = pix_colors [Color_fg];
1162 bg = pix_colors[Color_bg]; 1156 bg = pix_colors [Color_bg];
1163} 1157}
1164 1158
1165void 1159void
1166rxvt_term::im_set_size (XRectangle &size) 1160rxvt_term::im_set_size (XRectangle &size)
1167{ 1161{
… …
1204 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1198 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1205 1199
1206 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1200 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1207 *p = '\0'; 1201 *p = '\0';
1208 1202
1209 atom = XInternAtom (display->display, server, False); 1203 atom = XInternAtom (dpy, server, False);
1210 win = XGetSelectionOwner (display->display, atom); 1204 win = XGetSelectionOwner (dpy, atom);
1211 1205
1212 if (win != None) 1206 if (win != None)
1213 return True; 1207 return True;
1214 } 1208 }
1215 1209
… …
1222 XPoint nspot; 1216 XPoint nspot;
1223 XVaNestedList preedit_attr; 1217 XVaNestedList preedit_attr;
1224 1218
1225 if (!Input_Context 1219 if (!Input_Context
1226 || !focus 1220 || !focus
1227 || !(input_style & XIMPreeditPosition)) 1221 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1228 return; 1222 return;
1229 1223
1230 im_set_position (nspot); 1224 im_set_position (nspot);
1231 1225
1232 if (nspot.x == spot.x && nspot.y == spot.y) 1226 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1251 input_method = 0; 1245 input_method = 0;
1252 } 1246 }
1253 1247
1254 Input_Context = 0; 1248 Input_Context = 0;
1255} 1249}
1250
1251#ifdef ENABLE_XIM_ONTHESPOT
1252
1253static void
1254xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1255{
1256 ((rxvt_term *)client_data)->make_current ();
1257 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1258}
1259
1260static void
1261xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1262{
1263 ((rxvt_term *)client_data)->make_current ();
1264 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1265}
1266
1267static void
1268xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1269{
1270 rxvt_term *term = (rxvt_term *)client_data;
1271 XIMText *text = call_data->text;
1272
1273 term->make_current ();
1274
1275 if (text)
1276 {
1277 void *str;
1278
1279 if (!text->encoding_is_wchar && text->string.multi_byte)
1280 {
1281 // of course, X makes it ugly again
1282 if (term->rs[Rs_imLocale])
1283 SET_LOCALE (term->rs[Rs_imLocale]);
1284
1285 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1286 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1287
1288 if (term->rs[Rs_imLocale])
1289 SET_LOCALE (term->locale);
1290 }
1291 else
1292 str = (void *)text->string.wide_char;
1293
1294 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1295 DT_INT, call_data->caret,
1296 DT_INT, call_data->chg_first,
1297 DT_INT, call_data->chg_length,
1298 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1299 DT_WCS_LEN, str, str ? (int)text->length : 0,
1300 DT_END));
1301 }
1302 else
1303 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1304 DT_INT, call_data->caret,
1305 DT_INT, call_data->chg_first,
1306 DT_INT, call_data->chg_length,
1307 DT_END));
1308}
1309
1310#if 0
1311static void
1312xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1313{
1314 ((rxvt_term *)client_data)->make_current ();
1315 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1316 DT_INT, call_data->position,
1317 DT_INT, call_data->direction,
1318 DT_INT, call_data->style,
1319 DT_END));
1320}
1321#endif
1322
1323#endif
1256 1324
1257/* 1325/*
1258 * Try to open a XIM with the current modifiers, then see if we can 1326 * Try to open a XIM with the current modifiers, then see if we can
1259 * open a suitable preedit type 1327 * open a suitable preedit type
1260 */ 1328 */
… …
1267 XRectangle rect, status_rect, needed_rect; 1335 XRectangle rect, status_rect, needed_rect;
1268 unsigned long fg, bg; 1336 unsigned long fg, bg;
1269 const char *p; 1337 const char *p;
1270 char **s; 1338 char **s;
1271 XIMStyles *xim_styles; 1339 XIMStyles *xim_styles;
1340#ifdef ENABLE_XIM_ONTHESPOT
1341 XIMCallback xcb[4];
1342#endif
1272 1343
1273 set_environ (envv); 1344 set_environ (envv);
1274 1345
1275 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1346 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1276 return false; 1347 return false;
1277 1348
1278 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1279 input_method = display->get_xim (locale, modifiers); 1349 input_method = display->get_xim (locale, modifiers);
1280 if (input_method == NULL) 1350 if (input_method == NULL)
1281 return false; 1351 return false;
1282 1352
1283 xim = input_method->xim; 1353 xim = input_method->xim;
… …
1303 s = rxvt_splitcommastring (p); 1373 s = rxvt_splitcommastring (p);
1304 1374
1305 for (i = found = 0; !found && s[i]; i++) 1375 for (i = found = 0; !found && s[i]; i++)
1306 { 1376 {
1307 if (!strcmp (s[i], "OverTheSpot")) 1377 if (!strcmp (s[i], "OverTheSpot"))
1308 input_style = (XIMPreeditPosition | XIMStatusNothing); 1378 input_style = XIMPreeditPosition | XIMStatusNothing;
1309 else if (!strcmp (s[i], "OffTheSpot")) 1379 else if (!strcmp (s[i], "OffTheSpot"))
1310 input_style = (XIMPreeditArea | XIMStatusArea); 1380 input_style = XIMPreeditArea | XIMStatusArea;
1311 else if (!strcmp (s[i], "Root")) 1381 else if (!strcmp (s[i], "Root"))
1312 input_style = (XIMPreeditNothing | XIMStatusNothing); 1382 input_style = XIMPreeditNothing | XIMStatusNothing;
1313 else if (!strcmp (s[i], "None")) 1383 else if (!strcmp (s[i], "None"))
1314 input_style = (XIMPreeditNone | XIMStatusNone); 1384 input_style = XIMPreeditNone | XIMStatusNone;
1385#ifdef ENABLE_XIM_ONTHESPOT
1386 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1387 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1388#endif
1389 else
1390 input_style = XIMPreeditNothing | XIMStatusNothing;
1315 1391
1316 for (j = 0; j < xim_styles->count_styles; j++) 1392 for (j = 0; j < xim_styles->count_styles; j++)
1317 if (input_style == xim_styles->supported_styles[j]) 1393 if (input_style == xim_styles->supported_styles[j])
1318 { 1394 {
1319 rxvt_freecommastring (s); 1395 rxvt_freecommastring (s);
… …
1357 "*", 1433 "*",
1358 fheight, 1434 fheight,
1359 fheight + 1, fheight - 1, 1435 fheight + 1, fheight - 1,
1360 fheight - 2, fheight + 2); 1436 fheight - 2, fheight + 2);
1361 1437
1362 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1438 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1363 &missing_charset_list, &missing_charset_count, &def_string); 1439 &missing_charset_list, &missing_charset_count, &def_string);
1364 1440
1365 if (missing_charset_list) 1441 if (missing_charset_list)
1366 XFreeStringList (missing_charset_list); 1442 XFreeStringList (missing_charset_list);
1367 1443
… …
1408 XNBackground, bg, 1484 XNBackground, bg,
1409 XNArea, &status_rect, 1485 XNArea, &status_rect,
1410 XNFontSet, fs, 1486 XNFontSet, fs,
1411 NULL); 1487 NULL);
1412 } 1488 }
1489#if ENABLE_XIM_ONTHESPOT
1490 else if (input_style & XIMPreeditCallbacks)
1491 {
1492 im_set_position (spot);
1493
1494 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1495 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1496 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1497# if 0
1498 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1499# endif
1500
1501 preedit_attr = XVaCreateNestedList (0,
1502 XNSpotLocation, &spot,
1503 XNPreeditStartCallback, &xcb[0],
1504 XNPreeditDoneCallback , &xcb[1],
1505 XNPreeditDrawCallback , &xcb[2],
1506# if 0
1507 XNPreeditCaretCallback, &xcb[3],
1508# endif
1509 NULL);
1510 }
1511#endif
1413 1512
1414 Input_Context = XCreateIC (xim, 1513 Input_Context = XCreateIC (xim,
1415 XNInputStyle, input_style, 1514 XNInputStyle, input_style,
1416 XNClientWindow, vt, 1515 XNClientWindow, vt,
1417 XNFocusWindow, parent[0], 1516 XNFocusWindow, parent[0],
… …
1419 preedit_attr, 1518 preedit_attr,
1420 status_attr ? XNStatusAttributes : NULL, 1519 status_attr ? XNStatusAttributes : NULL,
1421 status_attr, NULL); 1520 status_attr, NULL);
1422 1521
1423 if (preedit_attr) XFree (preedit_attr); 1522 if (preedit_attr) XFree (preedit_attr);
1424 if (status_attr) XFree (status_attr); 1523 if (status_attr) XFree (status_attr);
1425 if (fs) XFreeFontSet (display->display, fs); 1524 if (fs) XFreeFontSet (dpy, fs);
1426 1525
1427 if (Input_Context == NULL) 1526 if (Input_Context == NULL)
1428 { 1527 {
1429 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1528 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1430 im_destroy (); 1529 im_destroy ();
1431 return false; 1530 return false;
1432 } 1531 }
1433 1532
1533#if 0
1534 // unfortunately, only the focus window is used by XIM, hard to fix
1434 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1535 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1435 vt_select_input (); 1536 vt_select_input ();
1537#endif
1436 1538
1437 if (input_style & XIMPreeditArea)
1438 IMSetStatusPosition (); 1539 IMSetPosition ();
1439 1540
1440 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1441 return true; 1541 return true;
1442} 1542}
1443 1543
1444void 1544void
1445rxvt_term::im_cb () 1545rxvt_term::im_cb ()
… …
1451 1551
1452 make_current (); 1552 make_current ();
1453 1553
1454 im_destroy (); 1554 im_destroy ();
1455 1555
1456 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1457 if (Input_Context) 1556 if (Input_Context)
1458 return; 1557 return;
1459 1558
1460#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1559#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1461 if (rs[Rs_imLocale]) 1560 if (rs[Rs_imLocale])
… …
1503 SET_LOCALE (locale); 1602 SET_LOCALE (locale);
1504#endif 1603#endif
1505} 1604}
1506 1605
1507void 1606void
1508rxvt_term::IMSetStatusPosition () 1607rxvt_term::IMSetPosition ()
1509{ 1608{
1510 XRectangle preedit_rect, status_rect, *needed_rect; 1609 XRectangle preedit_rect, status_rect, *needed_rect;
1511 XVaNestedList preedit_attr, status_attr; 1610 XVaNestedList preedit_attr, status_attr;
1512 1611
1513 if (!Input_Context 1612 if (!Input_Context
1514 || !focus 1613 || !focus
1515 || !(input_style & XIMPreeditArea) 1614 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1516 || !IMisRunning ()) 1615 || !IMisRunning ())
1517 return; 1616 return;
1518 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 {
1519 /* Getting the necessary width of preedit area */ 1628 /* Getting the necessary width of preedit area */
1520 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1629 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1521 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1630 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1522 XFree (status_attr); 1631 XFree (status_attr);
1523 1632
1524 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1633 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1525 XFree (needed_rect); 1634 XFree (needed_rect);
1526 1635
1527 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1636 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1528 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1637 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1529 1638
1530 XSetICValues (Input_Context, 1639 XSetICValues (Input_Context,
1531 XNPreeditAttributes, preedit_attr, 1640 XNPreeditAttributes, preedit_attr,
1532 XNStatusAttributes, status_attr, NULL); 1641 XNStatusAttributes, status_attr,
1642 NULL);
1533 1643
1644 XFree (status_attr);
1645 }
1646
1534 XFree (preedit_attr); 1647 XFree (preedit_attr);
1535 XFree (status_attr);
1536} 1648}
1537#endif /* USE_XIM */ 1649#endif /* USE_XIM */
1538 1650
1539/*----------------------- end-of-file (C source) -----------------------*/ 1651/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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