| … | |
… | |
| 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); |
| … | |
… | |
| 688 | delete fontset[0]; |
688 | delete fontset[0]; |
| 689 | fontset[0] = fs; |
689 | fontset[0] = fs; |
| 690 | |
690 | |
| 691 | prop = (*fs)[1]->properties (); |
691 | prop = (*fs)[1]->properties (); |
| 692 | prop.height += lineSpace; |
692 | prop.height += lineSpace; |
|
|
693 | prop.width += letterSpace; |
| 693 | |
694 | |
| 694 | fs->set_prop (prop, false); |
695 | fs->set_prop (prop, false); |
| 695 | |
696 | |
| 696 | fwidth = prop.width; |
697 | fwidth = prop.width; |
| 697 | fheight = prop.height; |
698 | fheight = prop.height; |
| … | |
… | |
| 990 | update_background (); |
991 | update_background (); |
| 991 | #endif |
992 | #endif |
| 992 | } |
993 | } |
| 993 | |
994 | |
| 994 | if (fix_screen || old_height == 0) |
995 | if (fix_screen || old_height == 0) |
| 995 | { |
|
|
| 996 | scr_reset (); |
996 | scr_reset (); |
| 997 | } |
|
|
| 998 | |
997 | |
| 999 | // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version |
998 | // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version |
| 1000 | //scr_touch (false); |
999 | //scr_touch (false); |
| 1001 | |
1000 | |
| 1002 | #ifdef HAVE_BG_PIXMAP |
1001 | #ifdef HAVE_BG_PIXMAP |
| … | |
… | |
| 1077 | |
1076 | |
| 1078 | /* Checking whether input method is running. */ |
1077 | /* Checking whether input method is running. */ |
| 1079 | bool |
1078 | bool |
| 1080 | rxvt_term::IMisRunning () |
1079 | rxvt_term::IMisRunning () |
| 1081 | { |
1080 | { |
| 1082 | char *p; |
|
|
| 1083 | Atom atom; |
1081 | Atom atom; |
| 1084 | Window win; |
1082 | Window win; |
| 1085 | char server[IMBUFSIZ]; |
1083 | char server[IMBUFSIZ]; |
| 1086 | |
1084 | |
| 1087 | /* get current locale modifier */ |
1085 | /* get current locale modifier */ |
| 1088 | if ((p = XSetLocaleModifiers (NULL)) != NULL) |
1086 | if (char *p = XSetLocaleModifiers (0)) |
| 1089 | { |
1087 | { |
| 1090 | strcpy (server, "@server="); |
1088 | strcpy (server, "@server="); |
| 1091 | strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ |
1089 | strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */ |
| 1092 | |
1090 | |
| 1093 | if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ |
1091 | if (p = strchr (server + 1, '@')) /* first one only */ |
| 1094 | *p = '\0'; |
1092 | *p = '\0'; |
| 1095 | |
1093 | |
| 1096 | atom = XInternAtom (dpy, server, False); |
1094 | atom = XInternAtom (dpy, server, False); |
| 1097 | win = XGetSelectionOwner (dpy, atom); |
1095 | win = XGetSelectionOwner (dpy, atom); |
| 1098 | |
1096 | |
