… | |
… | |
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 (xdisp, xscrollbarGC); |
230 | if (ShadowGC) XFreeGC (disp, ShadowGC); |
228 | if (ShadowGC) XFreeGC (xdisp, ShadowGC); |
231 | #endif |
229 | #endif |
232 | #ifdef PLAIN_SCROLLBAR |
230 | #ifdef PLAIN_SCROLLBAR |
233 | if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); |
231 | if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC); |
234 | #endif |
232 | #endif |
235 | #ifdef NEXT_SCROLLBAR |
233 | #ifdef NEXT_SCROLLBAR |
236 | if (blackGC) XFreeGC (disp, blackGC); |
234 | if (blackGC) XFreeGC (xdisp, blackGC); |
237 | if (whiteGC) XFreeGC (disp, whiteGC); |
235 | if (whiteGC) XFreeGC (xdisp, whiteGC); |
238 | if (grayGC) XFreeGC (disp, grayGC); |
236 | if (grayGC) XFreeGC (xdisp, grayGC); |
239 | if (darkGC) XFreeGC (disp, darkGC); |
237 | if (darkGC) XFreeGC (xdisp, darkGC); |
240 | if (stippleGC) XFreeGC (disp, stippleGC); |
238 | if (stippleGC) XFreeGC (xdisp, stippleGC); |
241 | if (dimple) XFreePixmap (disp, dimple); |
239 | if (dimple) XFreePixmap (xdisp, dimple); |
242 | if (upArrow) XFreePixmap (disp, upArrow); |
240 | if (upArrow) XFreePixmap (xdisp, upArrow); |
243 | if (downArrow) XFreePixmap (disp, downArrow); |
241 | if (downArrow) XFreePixmap (xdisp, downArrow); |
244 | if (upArrowHi) XFreePixmap (disp, upArrowHi); |
242 | if (upArrowHi) XFreePixmap (xdisp, upArrowHi); |
245 | if (downArrowHi) XFreePixmap (disp, downArrowHi); |
243 | if (downArrowHi) XFreePixmap (xdisp, downArrowHi); |
246 | #endif |
244 | #endif |
247 | #ifdef RXVT_SCROLLBAR |
245 | #ifdef RXVT_SCROLLBAR |
248 | if (topShadowGC) XFreeGC (disp, topShadowGC); |
246 | if (topShadowGC) XFreeGC (xdisp, topShadowGC); |
249 | if (botShadowGC) XFreeGC (disp, botShadowGC); |
247 | if (botShadowGC) XFreeGC (xdisp, botShadowGC); |
250 | if (scrollbarGC) XFreeGC (disp, scrollbarGC); |
248 | if (scrollbarGC) XFreeGC (xdisp, scrollbarGC); |
251 | #endif |
249 | #endif |
252 | if (gc) XFreeGC (disp, gc); |
250 | if (gc) XFreeGC (xdisp, 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 (xdisp, parent[0]); |
|
|
256 | |
|
|
257 | clear (); |
258 | } |
258 | } |
259 | |
259 | |
260 | // TODO: free pixcolours, colours should become part of rxvt_display |
260 | // TODO: free pixcolours, colours should become part of rxvt_display |
261 | delete pix_colors_focused; |
261 | delete pix_colors_focused; |
262 | #if OFF_FOCUS_FADING |
262 | #if OFF_FOCUS_FADING |
… | |
… | |
271 | for (int i = 0; i < allocated.size (); i++) |
271 | for (int i = 0; i < allocated.size (); i++) |
272 | free (allocated [i]); |
272 | free (allocated [i]); |
273 | |
273 | |
274 | free (selection.text); |
274 | free (selection.text); |
275 | // TODO: manage env vars in child only(!) |
275 | // TODO: manage env vars in child only(!) |
276 | free (env_windowid); |
|
|
277 | free (env_display); |
276 | free (env_display); |
278 | free (env_term); |
277 | free (env_term); |
279 | free (env_colorfgbg); |
|
|
280 | free (locale); |
278 | free (locale); |
281 | free (v_buffer); |
279 | free (v_buffer); |
282 | free (incr_buf); |
280 | free (incr_buf); |
283 | |
281 | |
284 | delete envv; |
282 | delete envv; |
… | |
… | |
477 | |
475 | |
478 | pty = ptytty::create (); |
476 | pty = ptytty::create (); |
479 | |
477 | |
480 | create_windows (argc, argv); |
478 | create_windows (argc, argv); |
481 | |
479 | |
482 | dDisp; |
|
|
483 | |
|
|
484 | init_xlocale (); |
480 | init_xlocale (); |
485 | |
481 | |
486 | scr_reset (); // initialize screen |
482 | scr_reset (); // initialize screen |
487 | |
483 | |
488 | #if 0 |
484 | #if 0 |
489 | XSynchronize (disp, True); |
485 | XSynchronize (xdisp, True); |
490 | #endif |
486 | #endif |
491 | |
487 | |
492 | #ifdef HAVE_SCROLLBARS |
488 | #ifdef HAVE_SCROLLBARS |
493 | if (OPTION (Opt_scrollBar)) |
489 | if (OPTION (Opt_scrollBar)) |
494 | resize_scrollbar (); /* create and map scrollbar */ |
490 | resize_scrollbar (); /* create and map scrollbar */ |
495 | #endif |
491 | #endif |
496 | #ifdef TRANSPARENT |
492 | #ifdef TRANSPARENT |
497 | if (OPTION (Opt_transparent)) |
493 | if (OPTION (Opt_transparent)) |
498 | { |
494 | { |
499 | XSelectInput (disp, display->root, PropertyChangeMask); |
495 | XSelectInput (xdisp, display->root, PropertyChangeMask); |
500 | check_our_parents (); |
496 | check_our_parents (); |
501 | rootwin_ev.start (display, display->root); |
497 | rootwin_ev.start (display, display->root); |
502 | } |
498 | } |
503 | #endif |
499 | #endif |
504 | |
500 | |
… | |
… | |
523 | XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
519 | XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
524 | 32, PropModeReplace, (unsigned char *)&info, 2); |
520 | 32, PropModeReplace, (unsigned char *)&info, 2); |
525 | } |
521 | } |
526 | #endif |
522 | #endif |
527 | |
523 | |
528 | XMapWindow (disp, vt); |
524 | XMapWindow (xdisp, vt); |
529 | XMapWindow (disp, parent[0]); |
525 | XMapWindow (xdisp, parent[0]); |
530 | |
526 | |
531 | return true; |
527 | return true; |
532 | } |
528 | } |
533 | |
529 | |
534 | static struct sig_handlers |
530 | static struct sig_handlers |
… | |
… | |
624 | { |
620 | { |
625 | short recalc_x, recalc_y; |
621 | short recalc_x, recalc_y; |
626 | int x, y, sb_w, flags; |
622 | int x, y, sb_w, flags; |
627 | unsigned int w, h; |
623 | unsigned int w, h; |
628 | unsigned int max_width, max_height; |
624 | unsigned int max_width, max_height; |
629 | dDisp; |
|
|
630 | |
625 | |
631 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
626 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
632 | szHint.win_gravity = NorthWestGravity; |
627 | szHint.win_gravity = NorthWestGravity; |
633 | /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ |
628 | /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ |
634 | |
629 | |
… | |
… | |
731 | |
726 | |
732 | if (scrollBar.state && OPTION (Opt_scrollBar_right)) |
727 | if (scrollBar.state && OPTION (Opt_scrollBar_right)) |
733 | window_sb_x = szHint.width - sb_w; |
728 | window_sb_x = szHint.width - sb_w; |
734 | |
729 | |
735 | if (recalc_x) |
730 | if (recalc_x) |
736 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
731 | szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; |
|
|
732 | |
737 | if (recalc_y) |
733 | if (recalc_y) |
738 | szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; |
734 | szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; |
739 | |
735 | |
740 | ncol = width / fwidth; |
736 | ncol = width / fwidth; |
741 | nrow = height / fheight; |
737 | nrow = height / fheight; |
742 | } |
738 | } |
743 | |
739 | |
… | |
… | |
946 | /* Cursor cursor; */ |
942 | /* Cursor cursor; */ |
947 | done: |
943 | done: |
948 | |
944 | |
949 | #if OFF_FOCUS_FADING |
945 | #if OFF_FOCUS_FADING |
950 | if (rs[Rs_fade]) |
946 | if (rs[Rs_fade]) |
951 | pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); |
947 | pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]); |
952 | #endif |
948 | #endif |
953 | |
949 | |
954 | /*TODO: handle Color_BD, scrollbar background, etc. */ |
950 | /*TODO: handle Color_BD, scrollbar background, etc. */ |
955 | |
951 | |
956 | recolour_cursor (); |
952 | recolour_cursor (); |
… | |
… | |
971 | : pix_colors_focused[Color_fg]; |
967 | : pix_colors_focused[Color_fg]; |
972 | xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) |
968 | xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) |
973 | ? pix_colors_focused[Color_pointer_bg] |
969 | ? pix_colors_focused[Color_pointer_bg] |
974 | : pix_colors_focused[Color_bg]; |
970 | : pix_colors_focused[Color_bg]; |
975 | |
971 | |
976 | XQueryColors (display->display, display->cmap, xcol, 2); |
972 | XQueryColors (display->display, cmap, xcol, 2); |
977 | XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); |
973 | XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); |
978 | } |
974 | } |
979 | |
975 | |
980 | /*----------------------------------------------------------------------*/ |
976 | /*----------------------------------------------------------------------*/ |
981 | /* |
977 | /* |
… | |
… | |
986 | { |
982 | { |
987 | unsigned int i; |
983 | unsigned int i; |
988 | const char *xpmb = "\0"; |
984 | const char *xpmb = "\0"; |
989 | char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; |
985 | char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; |
990 | |
986 | |
991 | env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); |
|
|
992 | strcpy (fstr, "default"); |
987 | strcpy (fstr, "default"); |
993 | strcpy (bstr, "default"); |
988 | strcpy (bstr, "default"); |
994 | for (i = Color_Black; i <= Color_White; i++) |
989 | for (i = Color_Black; i <= Color_White; i++) |
995 | if (pix_colors[Color_fg] == pix_colors[i]) |
990 | if (pix_colors[Color_fg] == pix_colors[i]) |
996 | { |
991 | { |
… | |
… | |
1014 | /*----------------------------------------------------------------------*/ |
1009 | /*----------------------------------------------------------------------*/ |
1015 | |
1010 | |
1016 | int |
1011 | int |
1017 | rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) |
1012 | rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) |
1018 | { |
1013 | { |
1019 | if (!screen_in_out->set (display, colour)) |
1014 | if (!screen_in_out->set (this, colour)) |
1020 | { |
1015 | { |
1021 | rxvt_warn ("can't get colour '%s', continuing without.\n", colour); |
1016 | rxvt_warn ("can't get colour '%s', continuing without.\n", colour); |
1022 | return false; |
1017 | return false; |
1023 | } |
1018 | } |
1024 | |
1019 | |
… | |
… | |
1032 | rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) |
1027 | rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) |
1033 | { |
1028 | { |
1034 | int fix_screen; |
1029 | int fix_screen; |
1035 | int old_width = szHint.width; |
1030 | int old_width = szHint.width; |
1036 | int old_height = szHint.height; |
1031 | int old_height = szHint.height; |
1037 | dDisp; |
|
|
1038 | |
1032 | |
1039 | window_calc (newwidth, newheight); |
1033 | window_calc (newwidth, newheight); |
1040 | XSetWMNormalHints (disp, parent[0], &szHint); |
1034 | XSetWMNormalHints (xdisp, parent[0], &szHint); |
1041 | |
1035 | |
1042 | if (!ignoreparent) |
1036 | if (!ignoreparent) |
1043 | { |
1037 | { |
1044 | #ifdef SMART_RESIZE |
1038 | #ifdef SMART_RESIZE |
1045 | /* |
1039 | /* |
… | |
… | |
1049 | int x, y, x1, y1; |
1043 | int x, y, x1, y1; |
1050 | int dx, dy; |
1044 | int dx, dy; |
1051 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
1045 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
1052 | Window unused_cr; |
1046 | Window unused_cr; |
1053 | |
1047 | |
1054 | XTranslateCoordinates (disp, parent[0], display->root, |
1048 | XTranslateCoordinates (xdisp, parent[0], display->root, |
1055 | 0, 0, &x, &y, &unused_cr); |
1049 | 0, 0, &x, &y, &unused_cr); |
1056 | XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, |
1050 | XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, |
1057 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
1051 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
1058 | /* |
1052 | /* |
1059 | * if display->root isn't the parent window, a WM will probably have offset |
1053 | * if display->root isn't the parent window, a WM will probably have offset |
1060 | * our position for handles and decorations. Counter it |
1054 | * our position for handles and decorations. Counter it |
1061 | */ |
1055 | */ |
… | |
… | |
1063 | { |
1057 | { |
1064 | x -= x1; |
1058 | x -= x1; |
1065 | y -= y1; |
1059 | y -= y1; |
1066 | } |
1060 | } |
1067 | |
1061 | |
1068 | x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; |
1062 | x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; |
1069 | y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; |
1063 | y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; |
1070 | dx = old_width - szHint.width; |
1064 | dx = old_width - szHint.width; |
1071 | dy = old_height - szHint.height; |
1065 | dy = old_height - szHint.height; |
1072 | |
1066 | |
1073 | /* Check position of the center of the window */ |
1067 | /* Check position of the center of the window */ |
1074 | if (x < x1) /* left half */ |
1068 | if (x < x1) /* left half */ |
… | |
… | |
1078 | if (y < y1) /* top half */ |
1072 | if (y < y1) /* top half */ |
1079 | dy = 0; |
1073 | dy = 0; |
1080 | else if (y == y1) /* exact center */ |
1074 | else if (y == y1) /* exact center */ |
1081 | dy /= 2; |
1075 | dy /= 2; |
1082 | |
1076 | |
1083 | XMoveResizeWindow (disp, parent[0], x + dx, y + dy, |
1077 | XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, |
1084 | szHint.width, szHint.height); |
1078 | szHint.width, szHint.height); |
1085 | #else |
1079 | #else |
1086 | XResizeWindow (disp, parent[0], szHint.width, szHint.height); |
1080 | XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); |
1087 | #endif |
1081 | #endif |
1088 | } |
1082 | } |
1089 | |
1083 | |
1090 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1084 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1091 | |
1085 | |
1092 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1086 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1093 | { |
1087 | { |
1094 | if (scrollBar.state) |
1088 | if (scrollBar.state) |
1095 | { |
1089 | { |
1096 | XMoveResizeWindow (disp, scrollBar.win, |
1090 | XMoveResizeWindow (xdisp, scrollBar.win, |
1097 | window_sb_x, 0, |
1091 | window_sb_x, 0, |
1098 | scrollbar_TotalWidth (), szHint.height); |
1092 | scrollbar_TotalWidth (), szHint.height); |
1099 | resize_scrollbar (); |
1093 | resize_scrollbar (); |
1100 | } |
1094 | } |
1101 | |
1095 | |
1102 | XMoveResizeWindow (disp, vt, |
1096 | XMoveResizeWindow (xdisp, vt, |
1103 | window_vt_x, window_vt_y, |
1097 | window_vt_x, window_vt_y, |
1104 | width, height); |
1098 | width, height); |
1105 | |
1099 | |
1106 | scr_clear (); |
1100 | scr_clear (); |
1107 | #ifdef XPM_BACKGROUND |
1101 | #ifdef XPM_BACKGROUND |
… | |
… | |
1489 | XNBackground, bg, |
1483 | XNBackground, bg, |
1490 | XNArea, &status_rect, |
1484 | XNArea, &status_rect, |
1491 | XNFontSet, fs, |
1485 | XNFontSet, fs, |
1492 | NULL); |
1486 | NULL); |
1493 | } |
1487 | } |
|
|
1488 | #if ENABLE_XIM_ONTHESPOT |
1494 | else if (input_style & XIMPreeditCallbacks) |
1489 | else if (input_style & XIMPreeditCallbacks) |
1495 | { |
1490 | { |
1496 | im_set_position (spot); |
1491 | im_set_position (spot); |
1497 | |
1492 | |
1498 | xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; |
1493 | xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; |
1499 | xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; |
1494 | xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; |
1500 | xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; |
1495 | xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; |
1501 | #if 0 |
1496 | # if 0 |
1502 | xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; |
1497 | xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; |
1503 | #endif |
1498 | # endif |
1504 | |
1499 | |
1505 | preedit_attr = XVaCreateNestedList (0, |
1500 | preedit_attr = XVaCreateNestedList (0, |
1506 | XNSpotLocation, &spot, |
1501 | XNSpotLocation, &spot, |
1507 | XNPreeditStartCallback, &xcb[0], |
1502 | XNPreeditStartCallback, &xcb[0], |
1508 | XNPreeditDoneCallback , &xcb[1], |
1503 | XNPreeditDoneCallback , &xcb[1], |
1509 | XNPreeditDrawCallback , &xcb[2], |
1504 | XNPreeditDrawCallback , &xcb[2], |
1510 | #if 0 |
1505 | # if 0 |
1511 | XNPreeditCaretCallback, &xcb[3], |
1506 | XNPreeditCaretCallback, &xcb[3], |
1512 | #endif |
1507 | # endif |
1513 | NULL); |
1508 | NULL); |
1514 | } |
1509 | } |
|
|
1510 | #endif |
1515 | |
1511 | |
1516 | Input_Context = XCreateIC (xim, |
1512 | Input_Context = XCreateIC (xim, |
1517 | XNInputStyle, input_style, |
1513 | XNInputStyle, input_style, |
1518 | XNClientWindow, vt, |
1514 | XNClientWindow, vt, |
1519 | XNFocusWindow, parent[0], |
1515 | XNFocusWindow, parent[0], |