| … | |
… | |
| 646 | |
646 | |
| 647 | ws.ws_col = ncol; |
647 | ws.ws_col = ncol; |
| 648 | ws.ws_row = nrow; |
648 | ws.ws_row = nrow; |
| 649 | ws.ws_xpixel = width; |
649 | ws.ws_xpixel = width; |
| 650 | ws.ws_ypixel = height; |
650 | ws.ws_ypixel = height; |
| 651 | (void)ioctl (pty->pty, TIOCSWINSZ, &ws); |
651 | ioctl (pty->pty, TIOCSWINSZ, &ws); |
| 652 | |
652 | |
| 653 | #if 0 |
653 | #if 0 |
| 654 | // TIOCSWINSZ is supposed to do this automatically and correctly |
654 | // TIOCSWINSZ is supposed to do this automatically and correctly |
| 655 | if (cmd_pid) /* force through to the command */ |
655 | if (cmd_pid) /* force through to the command */ |
| 656 | kill (-cmd_pid, SIGWINCH); |
656 | kill (-cmd_pid, SIGWINCH); |
| … | |
… | |
| 969 | #else |
969 | #else |
| 970 | XResizeWindow (dpy, parent[0], szHint.width, szHint.height); |
970 | XResizeWindow (dpy, parent[0], szHint.width, szHint.height); |
| 971 | #endif |
971 | #endif |
| 972 | } |
972 | } |
| 973 | |
973 | |
|
|
974 | if (set_hint) |
|
|
975 | XSetWMNormalHints (dpy, parent[0], &szHint); |
|
|
976 | |
| 974 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
977 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
| 975 | |
978 | |
| 976 | if (fix_screen || newwidth != old_width || newheight != old_height) |
979 | if (fix_screen || newwidth != old_width || newheight != old_height) |
| 977 | { |
980 | { |
| 978 | if (scrollBar.state) |
981 | if (scrollBar.state) |
| … | |
… | |
| 984 | |
987 | |
| 985 | #ifdef HAVE_BG_PIXMAP |
988 | #ifdef HAVE_BG_PIXMAP |
| 986 | if (bgPixmap.window_size_sensitive ()) |
989 | if (bgPixmap.window_size_sensitive ()) |
| 987 | update_background (); |
990 | update_background (); |
| 988 | #endif |
991 | #endif |
| 989 | |
|
|
| 990 | scr_clear (); |
|
|
| 991 | } |
992 | } |
| 992 | |
|
|
| 993 | if (set_hint) |
|
|
| 994 | XSetWMNormalHints (dpy, parent[0], &szHint); |
|
|
| 995 | |
993 | |
| 996 | if (fix_screen || old_height == 0) |
994 | if (fix_screen || old_height == 0) |
| 997 | scr_reset (); |
995 | scr_reset (); |
| 998 | |
996 | |
| 999 | // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version |
997 | // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version |
| … | |
… | |
| 1077 | |
1075 | |
| 1078 | /* Checking whether input method is running. */ |
1076 | /* Checking whether input method is running. */ |
| 1079 | bool |
1077 | bool |
| 1080 | rxvt_term::IMisRunning () |
1078 | rxvt_term::IMisRunning () |
| 1081 | { |
1079 | { |
| 1082 | char *p; |
|
|
| 1083 | Atom atom; |
1080 | Atom atom; |
| 1084 | Window win; |
1081 | Window win; |
| 1085 | char server[IMBUFSIZ]; |
1082 | char server[IMBUFSIZ]; |
| 1086 | |
1083 | |
| 1087 | /* get current locale modifier */ |
1084 | /* get current locale modifier */ |
| 1088 | if ((p = XSetLocaleModifiers (NULL)) != NULL) |
1085 | if (char *p = XSetLocaleModifiers (0)) |
| 1089 | { |
1086 | { |
| 1090 | strcpy (server, "@server="); |
1087 | strcpy (server, "@server="); |
| 1091 | strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ |
1088 | strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */ |
| 1092 | |
1089 | |
| 1093 | if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ |
1090 | if (p = strchr (server + 1, '@')) /* first one only */ |
| 1094 | *p = '\0'; |
1091 | *p = '\0'; |
| 1095 | |
1092 | |
| 1096 | atom = XInternAtom (dpy, server, False); |
1093 | atom = XInternAtom (dpy, server, False); |
| 1097 | win = XGetSelectionOwner (dpy, atom); |
1094 | win = XGetSelectionOwner (dpy, atom); |
| 1098 | |
1095 | |
