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.195 by root, Sun Jan 22 00:48:13 2006 UTC vs.
Revision 1.222 by root, Sun Feb 12 09:44:04 2006 UTC

… …
216#endif 216#endif
217 delete fontset[0]; 217 delete fontset[0];
218 218
219 if (display) 219 if (display)
220 { 220 {
221 dDisp;
222
223 selection_clear (); 221 selection_clear ();
224 222
225#ifdef USE_XIM 223#ifdef USE_XIM
226 im_destroy (); 224 im_destroy ();
227#endif 225#endif
228#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 229#endif
232#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 232#endif
235#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 244#endif
247#ifdef RXVT_SCROLLBAR 245#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 249#endif
252 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (dpy, gc);
253 251
254 delete drawable; 252 delete drawable;
255 // destroy all windows 253 // destroy all windows
256 if (parent[0]) 254 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (dpy, parent[0]);
258 }
259 256
260 // TODO: free pixcolours, colours should become part of rxvt_display 257 for (int i = 0; i < TOTAL_COLORS; i++)
258 if (ISSET_PIXCOLOR (i))
259 {
260 pix_colors_focused [i].free (this);
261#if OFF_FOCUS_FADING
262 pix_colors_unfocused [i].free (this);
263#endif
264 }
265
266 clear ();
267 }
268
261 delete pix_colors_focused; 269 delete pix_colors_focused;
262#if OFF_FOCUS_FADING 270#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 271 delete pix_colors_unfocused;
264#endif 272#endif
265 273
… …
271 for (int i = 0; i < allocated.size (); i++) 279 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 280 free (allocated [i]);
273 281
274 free (selection.text); 282 free (selection.text);
275 // TODO: manage env vars in child only(!) 283 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 284 free (env_display);
278 free (env_term); 285 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 286 free (locale);
281 free (v_buffer); 287 free (v_buffer);
282 free (incr_buf); 288 free (incr_buf);
283 289
284 delete envv; 290 delete envv;
… …
305rxvt_term::destroy () 311rxvt_term::destroy ()
306{ 312{
307 if (destroy_ev.active) 313 if (destroy_ev.active)
308 return; 314 return;
309 315
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 316 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 317
313#if ENABLE_OVERLAY 318#if ENABLE_OVERLAY
314 scr_overlay_off (); 319 scr_overlay_off ();
315#endif 320#endif
316 321
… …
371{ 376{
372 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 377 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
373 (*t)->emergency_cleanup (); 378 (*t)->emergency_cleanup ();
374} 379}
375 380
376#if ENABLE_FRILLS 381#if !ENABLE_MINIMAL
377static void 382static void
378print_x_error (Display *dpy, XErrorEvent *event) 383print_x_error (Display *dpy, XErrorEvent *event)
379{ 384{
380 char buffer[BUFSIZ]; 385 char buffer[BUFSIZ];
381 char mesg[BUFSIZ]; 386 char mesg[BUFSIZ];
… …
429 GET_R->allowedxerror = event->error_code; 434 GET_R->allowedxerror = event->error_code;
430 else 435 else
431 { 436 {
432 // GET_R is most likely not the terminal which caused the error, 437 // GET_R is most likely not the terminal which caused the error,
433 // so just output the error and continue 438 // so just output the error and continue
434#if ENABLE_FRILLS 439#if ENABLE_MINIMAL
440 old_xerror_handler (display, event);
441#else
435 print_x_error (display, event); 442 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 443#endif
439 } 444 }
440 445
441 return 0; 446 return 0;
442} 447}
… …
474#ifdef HAVE_SCROLLBARS 479#ifdef HAVE_SCROLLBARS
475 if (OPTION (Opt_scrollBar)) 480 if (OPTION (Opt_scrollBar))
476 scrollBar.setIdle (); /* set existence for size calculations */ 481 scrollBar.setIdle (); /* set existence for size calculations */
477#endif 482#endif
478 483
479 pty = ptytty_new (); 484 pty = ptytty::create ();
480 485
481 create_windows (argc, argv); 486 create_windows (argc, argv);
482 487
483 dDisp;
484
485 init_xlocale (); 488 init_xlocale ();
486 489
487 scr_reset (); // initialize screen 490 scr_reset (); // initialize screen
488 491
489#if 0 492#if 0
490 XSynchronize (disp, True); 493 XSynchronize (dpy, True);
491#endif 494#endif
492 495
493#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
494 if (OPTION (Opt_scrollBar)) 497 if (OPTION (Opt_scrollBar))
495 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
496#endif 499#endif
497#ifdef TRANSPARENT 500#ifdef TRANSPARENT
498 if (OPTION (Opt_transparent)) 501 if (OPTION (Opt_transparent))
499 { 502 {
500 XSelectInput (disp, display->root, PropertyChangeMask); 503 XSelectInput (dpy, display->root, PropertyChangeMask);
501 check_our_parents (); 504 check_our_parents ();
502 rootwin_ev.start (display, display->root); 505 rootwin_ev.start (display, display->root);
503 } 506 }
504#endif 507#endif
505 508
… …
514 517
515 check_ev.start (); 518 check_ev.start ();
516 519
517 HOOK_INVOKE ((this, HOOK_START, DT_END)); 520 HOOK_INVOKE ((this, HOOK_START, DT_END));
518 521
522#if ENABLE_XEMBED
523 if (rs[Rs_embed])
524 {
525 long info[2] = { 0, XEMBED_MAPPED };
526
527 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
528 32, PropModeReplace, (unsigned char *)&info, 2);
529 }
530#endif
531
519 XMapWindow (disp, vt); 532 XMapWindow (dpy, vt);
520 XMapWindow (disp, parent[0]); 533 XMapWindow (dpy, parent[0]);
521 534
522 return true; 535 return true;
523} 536}
524 537
525static struct sig_handlers 538static struct sig_handlers
… …
530 * Catch a fatal signal and tidy up before quitting 543 * Catch a fatal signal and tidy up before quitting
531 */ 544 */
532 void 545 void
533 sig_term (sig_watcher &w) 546 sig_term (sig_watcher &w)
534 { 547 {
535#ifdef DEBUG_CMD
536 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
537#endif
538 rxvt_emergency_cleanup (); 548 rxvt_emergency_cleanup ();
539 signal (w.signum, SIG_DFL); 549 signal (w.signum, SIG_DFL);
540 kill (getpid (), w.signum); 550 kill (getpid (), w.signum);
541 } 551 }
542 552
… …
550char **rxvt_environ; // startup environment 560char **rxvt_environ; // startup environment
551 561
552void 562void
553rxvt_init () 563rxvt_init ()
554{ 564{
555 uid_t uid = getuid (); 565 ptytty::init ();
556 gid_t gid = getgid ();
557
558 // before doing anything else, check for setuid/setgid operation,
559 // start the helper process and drop privileges
560 if (uid != geteuid ()
561 || gid != getegid ())
562 {
563#if PTYTTY_HELPER
564 ptytty_server ();
565#else
566 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
567#endif
568
569 // drop privileges
570#if HAVE_SETRESUID
571 setresgid (gid, gid, gid);
572 setresuid (uid, uid, uid);
573#elif HAVE_SETREUID
574 setregid (gid, gid);
575 setreuid (uid, uid);
576#elif HAVE_SETUID
577 setgid (gid);
578 setuid (uid);
579#endif
580
581 if (uid != geteuid ()
582 || gid != getegid ())
583 rxvt_fatal ("unable to drop privileges, aborting.\n");
584 }
585 566
586 rxvt_environ = environ; 567 rxvt_environ = environ;
587 568
588 signal (SIGHUP, SIG_IGN); 569 signal (SIGHUP, SIG_IGN);
589 signal (SIGPIPE, SIG_IGN); 570 signal (SIGPIPE, SIG_IGN);
… …
647{ 628{
648 short recalc_x, recalc_y; 629 short recalc_x, recalc_y;
649 int x, y, sb_w, flags; 630 int x, y, sb_w, flags;
650 unsigned int w, h; 631 unsigned int w, h;
651 unsigned int max_width, max_height; 632 unsigned int max_width, max_height;
652 dDisp;
653
654 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
655 ncol, nrow, szHint.width, szHint.height));
656 633
657 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 634 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
658 szHint.win_gravity = NorthWestGravity; 635 szHint.win_gravity = NorthWestGravity;
659 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 636 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
660 637
… …
722 699
723 if (scrollBar.state) 700 if (scrollBar.state)
724 { 701 {
725 sb_w = scrollbar_TotalWidth (); 702 sb_w = scrollbar_TotalWidth ();
726 szHint.base_width += sb_w; 703 szHint.base_width += sb_w;
704
727 if (!OPTION (Opt_scrollBar_right)) 705 if (!OPTION (Opt_scrollBar_right))
728 window_vt_x += sb_w; 706 window_vt_x += sb_w;
729 } 707 }
730 708
731 szHint.width_inc = fwidth; 709 szHint.width_inc = fwidth;
732 szHint.height_inc = fheight; 710 szHint.height_inc = fheight;
733 szHint.min_width = szHint.base_width + szHint.width_inc; 711 szHint.min_width = szHint.base_width + szHint.width_inc;
734 szHint.min_height = szHint.base_height + szHint.height_inc; 712 szHint.min_height = szHint.base_height + szHint.height_inc;
735 713
736 if (newwidth && newwidth - szHint.base_width < max_width) 714 if (newwidth && newwidth - szHint.base_width < max_width)
737 { 715 {
738 szHint.width = newwidth; 716 szHint.width = newwidth;
… …
757 735
758 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
759 window_sb_x = szHint.width - sb_w; 737 window_sb_x = szHint.width - sb_w;
760 738
761 if (recalc_x) 739 if (recalc_x)
762 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 740 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741
763 if (recalc_y) 742 if (recalc_y)
764 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 743 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
765 744
766 ncol = width / fwidth; 745 ncol = width / fwidth;
767 nrow = height / fheight; 746 nrow = height / fheight;
768 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
769 ncol, nrow, szHint.width,
770 szHint.height));
771 return;
772} 747}
773 748
774/*----------------------------------------------------------------------*/ 749/*----------------------------------------------------------------------*/
775/* 750/*
776 * Tell the teletype handler what size the window is. 751 * Tell the teletype handler what size the window is.
… …
876 return true; 851 return true;
877} 852}
878 853
879void rxvt_term::set_string_property (Atom prop, const char *str, int len) 854void rxvt_term::set_string_property (Atom prop, const char *str, int len)
880{ 855{
881 XChangeProperty (display->display, parent[0], 856 XChangeProperty (dpy, parent[0],
882 prop, XA_STRING, 8, PropModeReplace, 857 prop, XA_STRING, 8, PropModeReplace,
883 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 858 (const unsigned char *)str, len >= 0 ? len : strlen (str));
884} 859}
885 860
886void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 861void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
887{ 862{
888 wchar_t *ws = rxvt_mbstowcs (str, len); 863 wchar_t *ws = rxvt_mbstowcs (str, len);
889 char *s = rxvt_wcstoutf8 (ws); 864 char *s = rxvt_wcstoutf8 (ws);
890 865
891 XChangeProperty (display->display, parent[0], 866 XChangeProperty (dpy, parent[0],
892 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
893 (const unsigned char *)s, strlen (s)); 868 (const unsigned char *)s, strlen (s));
894 869
895 free (s); 870 free (s);
896 free (ws); 871 free (ws);
… …
921void 896void
922rxvt_term::set_window_color (int idx, const char *color) 897rxvt_term::set_window_color (int idx, const char *color)
923{ 898{
924 rxvt_color xcol; 899 rxvt_color xcol;
925 int i; 900 int i;
926 901
927 if (color == NULL || *color == '\0') 902 if (color == NULL || *color == '\0')
928 return; 903 return;
904
905 color = strdup (color);
906 allocated.push_back ((void *)color);
907 rs[Rs_color + idx] = color;
929 908
930 /* handle color aliases */ 909 /* handle color aliases */
931 if (isdigit (*color)) 910 if (isdigit (*color))
932 { 911 {
933 i = atoi (color); 912 i = atoi (color);
934 913
935 if (i >= 8 && i <= 15) 914 if (i >= 8 && i <= 15)
936 { /* bright colors */ 915 { /* bright colors */
937 i -= 8; 916 i -= 8;
938 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
939 SET_PIXCOLOR (idx);
940 goto done; 918 goto done;
941 } 919 }
942 920
943 if (i >= 0 && i <= 7) 921 if (i >= 0 && i <= 7)
944 { /* normal colors */ 922 { /* normal colors */
945 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 923 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
946 SET_PIXCOLOR (idx);
947 goto done; 924 goto done;
948 } 925 }
949 } 926 }
950 927
951 if (!rXParseAllocColor (&xcol, color)) 928 set_color (xcol, color);
952 return;
953
954 /* XStoreColor (display->display, display->cmap, XColor*); */
955 929
956 /* 930 /*
957 * FIXME: should free colors here, but no idea how to do it so instead, 931 * FIXME: should free colors here, but no idea how to do it so instead,
958 * so just keep gobbling up the colormap 932 * so just keep gobbling up the colormap
959 */ 933 */
960# if 0
961 for (i = Color_Black; i <= Color_White; i++)
962 if (pix_colors[idx] == pix_colors[i])
963 break;
964 if (i > Color_White)
965 {
966 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
967 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
968 DisplayPlanes (display->display, display->screen));
969 }
970# endif
971 934
972 pix_colors_focused[idx] = xcol; 935 pix_colors_focused[idx] = xcol;
973 SET_PIXCOLOR (idx);
974 936
975 /* XSetWindowAttributes attr; */ 937 /* XSetWindowAttributes attr; */
976 /* Cursor cursor; */ 938 /* Cursor cursor; */
977done: 939done:
978 940
979#if OFF_FOCUS_FADING 941#if OFF_FOCUS_FADING
980 if (rs[Rs_fade]) 942 if (rs[Rs_fade])
981 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 943 {
944 rgba c;
945 pix_colors [Color_fade].get (c);
946 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
947 }
982#endif 948#endif
983 949
984 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
985 951
986 recolour_cursor (); 952 recolour_cursor ();
… …
992#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
993 959
994void 960void
995rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
996{ 962{
997 XColor xcol[2]; 963 XColor fg, bg;
998 964
999 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
1000 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
1001 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
1002 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
1003 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
1004 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
1005 972
1006 XQueryColors (display->display, display->cmap, xcol, 2); 973 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1007 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1008} 974}
1009 975
1010/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1011/* 977/*
1012 * find if fg/bg matches any of the normal (low-intensity) colors 978 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1016{ 982{
1017 unsigned int i; 983 unsigned int i;
1018 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1019 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1020 986
1021 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1022 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1023 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1024 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1025 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1026 { 991 {
… …
1041 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1042} 1007}
1043 1008
1044/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1045 1010
1046int 1011bool
1047rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1048{ 1013{
1049 if (!screen_in_out->set (display, colour)) 1014 if (color.set (this, name))
1050 {
1051 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1052 return false;
1053 }
1054
1055 return true; 1015 return true;
1016
1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1018 return false;
1019}
1020
1021void
1022rxvt_term::alias_color (int dst, int src)
1023{
1024 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1056} 1025}
1057 1026
1058/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1059 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1060 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
1061void 1030void
1062rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1031rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1063{ 1032{
1064 int fix_screen; 1033 int fix_screen;
1065 int old_width = szHint.width, old_height = szHint.height; 1034 int old_width = szHint.width;
1066 dDisp; 1035 int old_height = szHint.height;
1067 1036
1068 window_calc (newwidth, newheight); 1037 window_calc (newwidth, newheight);
1038
1039 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1069 XSetWMNormalHints (disp, parent[0], &szHint); 1040 XSetWMNormalHints (dpy, parent[0], &szHint);
1070 1041
1071 if (!ignoreparent) 1042 if (!ignoreparent)
1072 { 1043 {
1073#ifdef SMART_RESIZE 1044#ifdef SMART_RESIZE
1074 /* 1045 /*
… …
1078 int x, y, x1, y1; 1049 int x, y, x1, y1;
1079 int dx, dy; 1050 int dx, dy;
1080 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1081 Window unused_cr; 1052 Window unused_cr;
1082 1053
1083 XTranslateCoordinates (disp, parent[0], display->root, 1054 XTranslateCoordinates (dpy, parent[0], display->root,
1084 0, 0, &x, &y, &unused_cr); 1055 0, 0, &x, &y, &unused_cr);
1085 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1056 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1086 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1087 /* 1058 /*
1088 * if display->root isn't the parent window, a WM will probably have offset 1059 * if display->root isn't the parent window, a WM will probably have offset
1089 * our position for handles and decorations. Counter it 1060 * our position for handles and decorations. Counter it
1090 */ 1061 */
… …
1092 { 1063 {
1093 x -= x1; 1064 x -= x1;
1094 y -= y1; 1065 y -= y1;
1095 } 1066 }
1096 1067
1097 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1068 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1098 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1069 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1099 dx = old_width - szHint.width; 1070 dx = old_width - szHint.width;
1100 dy = old_height - szHint.height; 1071 dy = old_height - szHint.height;
1101 1072
1102 /* Check position of the center of the window */ 1073 /* Check position of the center of the window */
1103 if (x < x1) /* left half */ 1074 if (x < x1) /* left half */
1104 dx = 0; 1075 dx = 0;
… …
1107 if (y < y1) /* top half */ 1078 if (y < y1) /* top half */
1108 dy = 0; 1079 dy = 0;
1109 else if (y == y1) /* exact center */ 1080 else if (y == y1) /* exact center */
1110 dy /= 2; 1081 dy /= 2;
1111 1082
1112 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1083 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1113 szHint.width, szHint.height); 1084 szHint.width, szHint.height);
1114#else 1085#else
1115 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1086 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1116#endif 1087#endif
1117 } 1088 }
1118 1089
1119 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1120 1091
1121 if (fix_screen || newwidth != old_width || newheight != old_height) 1092 if (fix_screen || newwidth != old_width || newheight != old_height)
1122 { 1093 {
1123 if (scrollBar.state) 1094 if (scrollBar.state)
1124 { 1095 {
1125 XMoveResizeWindow (disp, scrollBar.win, 1096 XMoveResizeWindow (dpy, scrollBar.win,
1126 window_sb_x, 0, 1097 window_sb_x, 0,
1127 scrollbar_TotalWidth (), szHint.height); 1098 scrollbar_TotalWidth (), szHint.height);
1128 resize_scrollbar (); 1099 resize_scrollbar ();
1129 } 1100 }
1130 1101
1131 XMoveResizeWindow (disp, vt, 1102 XMoveResizeWindow (dpy, vt,
1132 window_vt_x, window_vt_y, 1103 window_vt_x, window_vt_y,
1133 width, height); 1104 width, height);
1134 1105
1135 scr_clear (); 1106 scr_clear ();
1136#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
1137 resize_pixmap (); 1108 resize_pixmap ();
1138#endif 1109#endif
1139 } 1110 }
1140 1111
1141 if (fix_screen || old_height == 0) 1112 if (fix_screen || old_height == 0)
1142 {
1143 int curr_screen = -1;
1144 int old_ncol = prev_ncol;
1145
1146 /* scr_reset only works on the primary screen */
1147 if (old_height) /* this is not the first time through */
1148 {
1149 unsigned int ocol = ncol;
1150 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1151 curr_screen = scr_change_screen (PRIMARY);
1152 ncol = ocol;
1153 }
1154
1155 scr_reset (); 1113 scr_reset ();
1156 1114
1157 if (curr_screen >= 0) /* this is not the first time through */ 1115 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1158 { 1116 //scr_touch (false);
1159 scr_change_screen (curr_screen);
1160 selection_check (old_ncol != ncol ? 4 : 0);
1161 }
1162 }
1163
1164 old_width = szHint.width;
1165 old_height = szHint.height;
1166 1117
1167#ifdef XPM_BACKGROUND 1118#ifdef XPM_BACKGROUND
1168 if (pixmap) 1119 if (pixmap)
1169 scr_touch (false); 1120 scr_touch (false);
1170#endif 1121#endif
1171 1122
1172#ifdef USE_XIM 1123#ifdef USE_XIM
1173 IMSetStatusPosition (); 1124 IMSetPosition ();
1174#endif 1125#endif
1175} 1126}
1176 1127
1177/* 1128/*
1178 * Set the width/height of the vt window in characters. Units are pixels. 1129 * Set the width/height of the vt window in characters. Units are pixels.
… …
1183{ 1134{
1184 XWindowAttributes wattr; 1135 XWindowAttributes wattr;
1185 1136
1186 if (newwidth == 0 || newheight == 0) 1137 if (newwidth == 0 || newheight == 0)
1187 { 1138 {
1188 XGetWindowAttributes (display->display, display->root, &wattr); 1139 XGetWindowAttributes (dpy, display->root, &wattr);
1189 1140
1190 if (newwidth == 0) 1141 if (newwidth == 0)
1191 newwidth = wattr.width - szHint.base_width; 1142 newwidth = wattr.width - szHint.base_width;
1192 if (newheight == 0) 1143 if (newheight == 0)
1193 newheight = wattr.height - szHint.base_height; 1144 newheight = wattr.height - szHint.base_height;
… …
1207#ifdef USE_XIM 1158#ifdef USE_XIM
1208 1159
1209void 1160void
1210rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1161rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1211{ 1162{
1212 fg = pix_colors[Color_fg]; 1163 fg = pix_colors [Color_fg];
1213 bg = pix_colors[Color_bg]; 1164 bg = pix_colors [Color_bg];
1214} 1165}
1215 1166
1216void 1167void
1217rxvt_term::im_set_size (XRectangle &size) 1168rxvt_term::im_set_size (XRectangle &size)
1218{ 1169{
… …
1255 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1206 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1256 1207
1257 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1208 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1258 *p = '\0'; 1209 *p = '\0';
1259 1210
1260 atom = XInternAtom (display->display, server, False); 1211 atom = XInternAtom (dpy, server, False);
1261 win = XGetSelectionOwner (display->display, atom); 1212 win = XGetSelectionOwner (dpy, atom);
1262 1213
1263 if (win != None) 1214 if (win != None)
1264 return True; 1215 return True;
1265 } 1216 }
1266 1217
… …
1273 XPoint nspot; 1224 XPoint nspot;
1274 XVaNestedList preedit_attr; 1225 XVaNestedList preedit_attr;
1275 1226
1276 if (!Input_Context 1227 if (!Input_Context
1277 || !focus 1228 || !focus
1278 || !(input_style & XIMPreeditPosition)) 1229 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1279 return; 1230 return;
1280 1231
1281 im_set_position (nspot); 1232 im_set_position (nspot);
1282 1233
1283 if (nspot.x == spot.x && nspot.y == spot.y) 1234 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1302 input_method = 0; 1253 input_method = 0;
1303 } 1254 }
1304 1255
1305 Input_Context = 0; 1256 Input_Context = 0;
1306} 1257}
1258
1259#ifdef ENABLE_XIM_ONTHESPOT
1260
1261static void
1262xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1263{
1264 ((rxvt_term *)client_data)->make_current ();
1265 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1266}
1267
1268static void
1269xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1270{
1271 ((rxvt_term *)client_data)->make_current ();
1272 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1273}
1274
1275static void
1276xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1277{
1278 rxvt_term *term = (rxvt_term *)client_data;
1279 XIMText *text = call_data->text;
1280
1281 term->make_current ();
1282
1283 if (text)
1284 {
1285 void *str;
1286
1287 if (!text->encoding_is_wchar && text->string.multi_byte)
1288 {
1289 // of course, X makes it ugly again
1290 if (term->rs[Rs_imLocale])
1291 SET_LOCALE (term->rs[Rs_imLocale]);
1292
1293 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1294 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1295
1296 if (term->rs[Rs_imLocale])
1297 SET_LOCALE (term->locale);
1298 }
1299 else
1300 str = (void *)text->string.wide_char;
1301
1302 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1303 DT_INT, call_data->caret,
1304 DT_INT, call_data->chg_first,
1305 DT_INT, call_data->chg_length,
1306 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1307 DT_WCS_LEN, str, str ? (int)text->length : 0,
1308 DT_END));
1309 }
1310 else
1311 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1312 DT_INT, call_data->caret,
1313 DT_INT, call_data->chg_first,
1314 DT_INT, call_data->chg_length,
1315 DT_END));
1316}
1317
1318#if 0
1319static void
1320xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1321{
1322 ((rxvt_term *)client_data)->make_current ();
1323 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1324 DT_INT, call_data->position,
1325 DT_INT, call_data->direction,
1326 DT_INT, call_data->style,
1327 DT_END));
1328}
1329#endif
1330
1331#endif
1307 1332
1308/* 1333/*
1309 * Try to open a XIM with the current modifiers, then see if we can 1334 * Try to open a XIM with the current modifiers, then see if we can
1310 * open a suitable preedit type 1335 * open a suitable preedit type
1311 */ 1336 */
… …
1318 XRectangle rect, status_rect, needed_rect; 1343 XRectangle rect, status_rect, needed_rect;
1319 unsigned long fg, bg; 1344 unsigned long fg, bg;
1320 const char *p; 1345 const char *p;
1321 char **s; 1346 char **s;
1322 XIMStyles *xim_styles; 1347 XIMStyles *xim_styles;
1348#ifdef ENABLE_XIM_ONTHESPOT
1349 XIMCallback xcb[4];
1350#endif
1323 1351
1324 set_environ (envv); 1352 set_environ (envv);
1325 1353
1326 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1354 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1327 return false; 1355 return false;
1328 1356
1329 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1330 input_method = display->get_xim (locale, modifiers); 1357 input_method = display->get_xim (locale, modifiers);
1331 if (input_method == NULL) 1358 if (input_method == NULL)
1332 return false; 1359 return false;
1333 1360
1334 xim = input_method->xim; 1361 xim = input_method->xim;
… …
1354 s = rxvt_splitcommastring (p); 1381 s = rxvt_splitcommastring (p);
1355 1382
1356 for (i = found = 0; !found && s[i]; i++) 1383 for (i = found = 0; !found && s[i]; i++)
1357 { 1384 {
1358 if (!strcmp (s[i], "OverTheSpot")) 1385 if (!strcmp (s[i], "OverTheSpot"))
1359 input_style = (XIMPreeditPosition | XIMStatusNothing); 1386 input_style = XIMPreeditPosition | XIMStatusNothing;
1360 else if (!strcmp (s[i], "OffTheSpot")) 1387 else if (!strcmp (s[i], "OffTheSpot"))
1361 input_style = (XIMPreeditArea | XIMStatusArea); 1388 input_style = XIMPreeditArea | XIMStatusArea;
1362 else if (!strcmp (s[i], "Root")) 1389 else if (!strcmp (s[i], "Root"))
1363 input_style = (XIMPreeditNothing | XIMStatusNothing); 1390 input_style = XIMPreeditNothing | XIMStatusNothing;
1364 else if (!strcmp (s[i], "None")) 1391 else if (!strcmp (s[i], "None"))
1365 input_style = (XIMPreeditNone | XIMStatusNone); 1392 input_style = XIMPreeditNone | XIMStatusNone;
1393#ifdef ENABLE_XIM_ONTHESPOT
1394 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1395 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1396#endif
1397 else
1398 input_style = XIMPreeditNothing | XIMStatusNothing;
1366 1399
1367 for (j = 0; j < xim_styles->count_styles; j++) 1400 for (j = 0; j < xim_styles->count_styles; j++)
1368 if (input_style == xim_styles->supported_styles[j]) 1401 if (input_style == xim_styles->supported_styles[j])
1369 { 1402 {
1370 rxvt_freecommastring (s); 1403 rxvt_freecommastring (s);
… …
1408 "*", 1441 "*",
1409 fheight, 1442 fheight,
1410 fheight + 1, fheight - 1, 1443 fheight + 1, fheight - 1,
1411 fheight - 2, fheight + 2); 1444 fheight - 2, fheight + 2);
1412 1445
1413 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1446 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1414 &missing_charset_list, &missing_charset_count, &def_string); 1447 &missing_charset_list, &missing_charset_count, &def_string);
1415 1448
1416 if (missing_charset_list) 1449 if (missing_charset_list)
1417 XFreeStringList (missing_charset_list); 1450 XFreeStringList (missing_charset_list);
1418 1451
… …
1459 XNBackground, bg, 1492 XNBackground, bg,
1460 XNArea, &status_rect, 1493 XNArea, &status_rect,
1461 XNFontSet, fs, 1494 XNFontSet, fs,
1462 NULL); 1495 NULL);
1463 } 1496 }
1497#if ENABLE_XIM_ONTHESPOT
1498 else if (input_style & XIMPreeditCallbacks)
1499 {
1500 im_set_position (spot);
1501
1502 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1503 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1504 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1505# if 0
1506 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1507# endif
1508
1509 preedit_attr = XVaCreateNestedList (0,
1510 XNSpotLocation, &spot,
1511 XNPreeditStartCallback, &xcb[0],
1512 XNPreeditDoneCallback , &xcb[1],
1513 XNPreeditDrawCallback , &xcb[2],
1514# if 0
1515 XNPreeditCaretCallback, &xcb[3],
1516# endif
1517 NULL);
1518 }
1519#endif
1464 1520
1465 Input_Context = XCreateIC (xim, 1521 Input_Context = XCreateIC (xim,
1466 XNInputStyle, input_style, 1522 XNInputStyle, input_style,
1467 XNClientWindow, vt, 1523 XNClientWindow, vt,
1468 XNFocusWindow, parent[0], 1524 XNFocusWindow, parent[0],
… …
1470 preedit_attr, 1526 preedit_attr,
1471 status_attr ? XNStatusAttributes : NULL, 1527 status_attr ? XNStatusAttributes : NULL,
1472 status_attr, NULL); 1528 status_attr, NULL);
1473 1529
1474 if (preedit_attr) XFree (preedit_attr); 1530 if (preedit_attr) XFree (preedit_attr);
1475 if (status_attr) XFree (status_attr); 1531 if (status_attr) XFree (status_attr);
1476 if (fs) XFreeFontSet (display->display, fs); 1532 if (fs) XFreeFontSet (dpy, fs);
1477 1533
1478 if (Input_Context == NULL) 1534 if (Input_Context == NULL)
1479 { 1535 {
1480 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1536 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1481 im_destroy (); 1537 im_destroy ();
1482 return false; 1538 return false;
1483 } 1539 }
1484 1540
1485 if (input_style & XIMPreeditArea) 1541#if 0
1542 // unfortunately, only the focus window is used by XIM, hard to fix
1543 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1544 vt_select_input ();
1545#endif
1546
1486 IMSetStatusPosition (); 1547 IMSetPosition ();
1487 1548
1488 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1489 return true; 1549 return true;
1490} 1550}
1491 1551
1492void 1552void
1493rxvt_term::im_cb () 1553rxvt_term::im_cb ()
… …
1499 1559
1500 make_current (); 1560 make_current ();
1501 1561
1502 im_destroy (); 1562 im_destroy ();
1503 1563
1504 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1505 if (Input_Context) 1564 if (Input_Context)
1506 return; 1565 return;
1507 1566
1508#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1567#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1509 if (rs[Rs_imLocale]) 1568 if (rs[Rs_imLocale])
… …
1551 SET_LOCALE (locale); 1610 SET_LOCALE (locale);
1552#endif 1611#endif
1553} 1612}
1554 1613
1555void 1614void
1556rxvt_term::IMSetStatusPosition () 1615rxvt_term::IMSetPosition ()
1557{ 1616{
1558 XRectangle preedit_rect, status_rect, *needed_rect; 1617 XRectangle preedit_rect, status_rect, *needed_rect;
1559 XVaNestedList preedit_attr, status_attr; 1618 XVaNestedList preedit_attr, status_attr;
1560 1619
1561 if (!Input_Context 1620 if (!Input_Context
1562 || !focus 1621 || !focus
1563 || !(input_style & XIMPreeditArea) 1622 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1564 || !IMisRunning ()) 1623 || !IMisRunning ())
1565 return; 1624 return;
1566 1625
1626 if (input_style & XIMPreeditPosition)
1627 {
1628 im_set_size (preedit_rect);
1629 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630
1631 XSetICValues (Input_Context,
1632 XNPreeditAttributes, preedit_attr, NULL);
1633 }
1634 else
1635 {
1567 /* Getting the necessary width of preedit area */ 1636 /* Getting the necessary width of preedit area */
1568 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1637 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1569 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1638 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1570 XFree (status_attr); 1639 XFree (status_attr);
1571 1640
1572 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1641 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1573 XFree (needed_rect); 1642 XFree (needed_rect);
1574 1643
1575 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1644 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1576 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1645 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1577 1646
1578 XSetICValues (Input_Context, 1647 XSetICValues (Input_Context,
1579 XNPreeditAttributes, preedit_attr, 1648 XNPreeditAttributes, preedit_attr,
1580 XNStatusAttributes, status_attr, NULL); 1649 XNStatusAttributes, status_attr,
1650 NULL);
1581 1651
1652 XFree (status_attr);
1653 }
1654
1582 XFree (preedit_attr); 1655 XFree (preedit_attr);
1583 XFree (status_attr);
1584} 1656}
1585#endif /* USE_XIM */ 1657#endif /* USE_XIM */
1586 1658
1587/*----------------------- end-of-file (C source) -----------------------*/ 1659/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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