… | |
… | |
35 | #include "keyboard.h" |
35 | #include "keyboard.h" |
36 | #include "rxvtperl.h" |
36 | #include "rxvtperl.h" |
37 | |
37 | |
38 | #include <limits> |
38 | #include <limits> |
39 | |
39 | |
|
|
40 | #include <cassert> |
40 | #include <csignal> |
41 | #include <csignal> |
41 | #include <cstring> |
42 | #include <cstring> |
42 | |
43 | |
43 | #include <termios.h> |
44 | #include <termios.h> |
44 | |
45 | |
… | |
… | |
101 | { |
102 | { |
102 | if (cc->c2 == c2) return c1; |
103 | if (cc->c2 == c2) return c1; |
103 | cc = (*this)[cc->c1]; |
104 | cc = (*this)[cc->c1]; |
104 | } |
105 | } |
105 | |
106 | |
106 | // check to see wether this combination already exists otherwise |
107 | // check to see whether this combination already exists otherwise |
107 | for (cc = v.end (); cc-- > v.begin (); ) |
108 | for (cc = v.end (); cc-- > v.begin (); ) |
108 | { |
109 | { |
109 | if (cc->c1 == c1 && cc->c2 == c2) |
110 | if (cc->c1 == c1 && cc->c2 == c2) |
110 | return COMPOSE_LO + (cc - v.begin ()); |
111 | return COMPOSE_LO + (cc - v.begin ()); |
111 | } |
112 | } |
… | |
… | |
172 | slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); |
173 | slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); |
173 | #endif |
174 | #endif |
174 | #if ENABLE_TRANSPARENCY || ENABLE_PERL |
175 | #if ENABLE_TRANSPARENCY || ENABLE_PERL |
175 | rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), |
176 | rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), |
176 | #endif |
177 | #endif |
177 | #ifdef HAVE_SCROLLBARS |
|
|
178 | scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), |
178 | scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), |
179 | #endif |
|
|
180 | #ifdef USE_XIM |
179 | #ifdef USE_XIM |
181 | im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), |
180 | im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), |
182 | #endif |
181 | #endif |
183 | #ifdef POINTER_BLANK |
182 | #ifdef POINTER_BLANK |
184 | pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); |
183 | pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); |
… | |
… | |
229 | delete fontset[0]; |
228 | delete fontset[0]; |
230 | |
229 | |
231 | #ifdef HAVE_BG_PIXMAP |
230 | #ifdef HAVE_BG_PIXMAP |
232 | bgPixmap.destroy (); |
231 | bgPixmap.destroy (); |
233 | #endif |
232 | #endif |
|
|
233 | #ifdef HAVE_AFTERIMAGE |
|
|
234 | if (asv) |
|
|
235 | destroy_asvisual (asv, 0); |
|
|
236 | if (asimman) |
|
|
237 | destroy_image_manager (asimman, 0); |
|
|
238 | #endif |
234 | |
239 | |
235 | if (display) |
240 | if (display) |
236 | { |
241 | { |
237 | selection_clear (); |
242 | selection_clear (); |
|
|
243 | selection_clear (true); |
238 | |
244 | |
239 | #ifdef USE_XIM |
245 | #ifdef USE_XIM |
240 | im_destroy (); |
246 | im_destroy (); |
241 | #endif |
247 | #endif |
242 | #ifdef XTERM_SCROLLBAR |
248 | scrollBar.destroy (); |
243 | if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC); |
|
|
244 | if (ShadowGC) XFreeGC (dpy, ShadowGC); |
|
|
245 | #endif |
|
|
246 | #ifdef PLAIN_SCROLLBAR |
|
|
247 | if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC); |
|
|
248 | #endif |
|
|
249 | #ifdef NEXT_SCROLLBAR |
|
|
250 | if (blackGC) XFreeGC (dpy, blackGC); |
|
|
251 | if (whiteGC) XFreeGC (dpy, whiteGC); |
|
|
252 | if (grayGC) XFreeGC (dpy, grayGC); |
|
|
253 | if (darkGC) XFreeGC (dpy, darkGC); |
|
|
254 | if (stippleGC) XFreeGC (dpy, stippleGC); |
|
|
255 | if (dimple) XFreePixmap (dpy, dimple); |
|
|
256 | if (upArrow) XFreePixmap (dpy, upArrow); |
|
|
257 | if (downArrow) XFreePixmap (dpy, downArrow); |
|
|
258 | if (upArrowHi) XFreePixmap (dpy, upArrowHi); |
|
|
259 | if (downArrowHi) XFreePixmap (dpy, downArrowHi); |
|
|
260 | #endif |
|
|
261 | #ifdef RXVT_SCROLLBAR |
|
|
262 | if (topShadowGC) XFreeGC (dpy, topShadowGC); |
|
|
263 | if (botShadowGC) XFreeGC (dpy, botShadowGC); |
|
|
264 | if (scrollbarGC) XFreeGC (dpy, scrollbarGC); |
|
|
265 | #endif |
|
|
266 | if (gc) XFreeGC (dpy, gc); |
249 | if (gc) XFreeGC (dpy, gc); |
267 | |
250 | |
268 | delete drawable; |
251 | delete drawable; |
269 | // destroy all windows |
252 | // destroy all windows |
270 | if (parent[0]) |
253 | if (parent[0]) |
… | |
… | |
290 | /* clear all resources */ |
273 | /* clear all resources */ |
291 | for (int i = 0; i < allocated.size (); i++) |
274 | for (int i = 0; i < allocated.size (); i++) |
292 | free (allocated [i]); |
275 | free (allocated [i]); |
293 | |
276 | |
294 | free (selection.text); |
277 | free (selection.text); |
|
|
278 | free (selection.clip_text); |
295 | // TODO: manage env vars in child only(!) |
279 | // TODO: manage env vars in child only(!) |
296 | free (env_display); |
280 | free (env_display); |
297 | free (env_term); |
281 | free (env_term); |
298 | free (locale); |
282 | free (locale); |
299 | free (v_buffer); |
283 | free (v_buffer); |
… | |
… | |
337 | if (display) |
321 | if (display) |
338 | { |
322 | { |
339 | #if USE_XIM |
323 | #if USE_XIM |
340 | im_ev.stop (display); |
324 | im_ev.stop (display); |
341 | #endif |
325 | #endif |
342 | #if HAVE_SCROLLBARS |
|
|
343 | scrollbar_ev.stop (display); |
326 | scrollbar_ev.stop (display); |
344 | #endif |
|
|
345 | #if ENABLE_TRANSPARENCY || ENABLE_PERL |
327 | #if ENABLE_TRANSPARENCY || ENABLE_PERL |
346 | rootwin_ev.stop (display); |
328 | rootwin_ev.stop (display); |
347 | #endif |
329 | #endif |
348 | incr_ev.stop (); |
330 | incr_ev.stop (); |
349 | termwin_ev.stop (display); |
331 | termwin_ev.stop (display); |
… | |
… | |
409 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); |
391 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); |
410 | sprintf(number, "%d", event->request_code); |
392 | sprintf(number, "%d", event->request_code); |
411 | XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); |
393 | XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); |
412 | rxvt_warn ("(which is %s)\n", buffer); |
394 | rxvt_warn ("(which is %s)\n", buffer); |
413 | if (event->request_code >= 128) { |
395 | if (event->request_code >= 128) { |
414 | XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", |
396 | XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", |
415 | mesg, BUFSIZ); |
397 | mesg, BUFSIZ); |
416 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); |
398 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); |
417 | } |
399 | } |
418 | if ((event->error_code == BadWindow) || |
400 | if ((event->error_code == BadWindow) || |
419 | (event->error_code == BadPixmap) || |
401 | (event->error_code == BadPixmap) || |
420 | (event->error_code == BadCursor) || |
402 | (event->error_code == BadCursor) || |
421 | (event->error_code == BadFont) || |
403 | (event->error_code == BadFont) || |
422 | (event->error_code == BadDrawable) || |
404 | (event->error_code == BadDrawable) || |
423 | (event->error_code == BadColor) || |
405 | (event->error_code == BadColor) || |
424 | (event->error_code == BadGC) || |
406 | (event->error_code == BadGC) || |
425 | (event->error_code == BadIDChoice) || |
407 | (event->error_code == BadIDChoice) || |
426 | (event->error_code == BadValue) || |
408 | (event->error_code == BadValue) || |
427 | (event->error_code == BadAtom)) { |
409 | (event->error_code == BadAtom)) { |
428 | if (event->error_code == BadValue) |
410 | if (event->error_code == BadValue) |
429 | XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", |
411 | XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", |
430 | mesg, BUFSIZ); |
412 | mesg, BUFSIZ); |
431 | else if (event->error_code == BadAtom) |
413 | else if (event->error_code == BadAtom) |
432 | XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", |
414 | XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", |
433 | mesg, BUFSIZ); |
415 | mesg, BUFSIZ); |
434 | else |
416 | else |
435 | XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", |
417 | XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", |
436 | mesg, BUFSIZ); |
418 | mesg, BUFSIZ); |
437 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); |
419 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); |
438 | } |
420 | } |
439 | XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", |
421 | XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", |
440 | mesg, BUFSIZ); |
422 | mesg, BUFSIZ); |
441 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); |
423 | rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); |
442 | } |
424 | } |
443 | #endif |
425 | #endif |
444 | |
426 | |
445 | int |
427 | int |
… | |
… | |
497 | char **rxvt_environ; // startup environment |
479 | char **rxvt_environ; // startup environment |
498 | |
480 | |
499 | void |
481 | void |
500 | rxvt_init () |
482 | rxvt_init () |
501 | { |
483 | { |
|
|
484 | assert (("fontMask must not overlap other RS masks", |
|
|
485 | 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask)))); |
|
|
486 | |
502 | ptytty::init (); |
487 | ptytty::init (); |
503 | |
488 | |
504 | if (!ev_default_loop (0)) |
489 | if (!ev_default_loop (0)) |
505 | rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); |
490 | rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); |
506 | |
491 | |
… | |
… | |
529 | */ |
514 | */ |
530 | void |
515 | void |
531 | rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) |
516 | rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) |
532 | { |
517 | { |
533 | short recalc_x, recalc_y; |
518 | short recalc_x, recalc_y; |
534 | int x, y, sb_w, flags; |
519 | int x, y, flags; |
535 | unsigned int w, h; |
520 | unsigned int w, h; |
536 | unsigned int max_width, max_height; |
521 | unsigned int max_width, max_height; |
537 | |
522 | |
538 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
523 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
539 | szHint.win_gravity = NorthWestGravity; |
524 | szHint.win_gravity = NorthWestGravity; |
… | |
… | |
549 | if (rs[Rs_geometry]) |
534 | if (rs[Rs_geometry]) |
550 | flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); |
535 | flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); |
551 | |
536 | |
552 | if (flags & WidthValue) |
537 | if (flags & WidthValue) |
553 | { |
538 | { |
|
|
539 | if (!w) |
|
|
540 | rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n"); |
|
|
541 | |
554 | ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); |
542 | ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ()); |
555 | szHint.flags |= USSize; |
543 | szHint.flags |= USSize; |
556 | } |
544 | } |
557 | |
545 | |
558 | if (flags & HeightValue) |
546 | if (flags & HeightValue) |
559 | { |
547 | { |
|
|
548 | if (!h) |
|
|
549 | rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n"); |
|
|
550 | |
560 | nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); |
551 | nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ()); |
561 | szHint.flags |= USSize; |
552 | szHint.flags |= USSize; |
562 | } |
553 | } |
563 | |
554 | |
564 | if (flags & XValue) |
555 | if (flags & XValue) |
565 | { |
556 | { |
… | |
… | |
596 | max_width = MAX_COLS * fwidth; |
587 | max_width = MAX_COLS * fwidth; |
597 | max_height = MAX_ROWS * fheight; |
588 | max_height = MAX_ROWS * fheight; |
598 | |
589 | |
599 | szHint.base_width = szHint.base_height = 2 * int_bwidth; |
590 | szHint.base_width = szHint.base_height = 2 * int_bwidth; |
600 | |
591 | |
601 | sb_w = 0; |
|
|
602 | window_vt_x = window_vt_y = int_bwidth; |
592 | window_vt_x = window_vt_y = int_bwidth; |
603 | |
593 | |
604 | if (scrollBar.state) |
594 | if (scrollBar.state) |
605 | { |
595 | { |
606 | sb_w = scrollbar_TotalWidth (); |
596 | int sb_w = scrollBar.total_width (); |
607 | szHint.base_width += sb_w; |
597 | szHint.base_width += sb_w; |
608 | |
598 | |
609 | if (!option (Opt_scrollBar_right)) |
599 | if (!option (Opt_scrollBar_right)) |
610 | window_vt_x += sb_w; |
600 | window_vt_x += sb_w; |
611 | } |
601 | } |
… | |
… | |
635 | { |
625 | { |
636 | min_it (height, max_height); |
626 | min_it (height, max_height); |
637 | szHint.height = szHint.base_height + height; |
627 | szHint.height = szHint.base_height + height; |
638 | } |
628 | } |
639 | |
629 | |
640 | if (scrollBar.state && option (Opt_scrollBar_right)) |
|
|
641 | window_sb_x = szHint.width - sb_w; |
|
|
642 | |
|
|
643 | if (recalc_x) |
630 | if (recalc_x) |
644 | szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; |
631 | szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; |
645 | |
632 | |
646 | if (recalc_y) |
633 | if (recalc_y) |
647 | szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; |
634 | szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; |
648 | |
635 | |
649 | ncol = width / fwidth; |
636 | ncol = width / fwidth; |
650 | nrow = height / fheight; |
637 | nrow = height / fheight; |
651 | } |
638 | } |
652 | |
639 | |
653 | /*----------------------------------------------------------------------*/ |
640 | /*----------------------------------------------------------------------*/ |
654 | /* |
641 | /* |
… | |
… | |
665 | |
652 | |
666 | ws.ws_col = ncol; |
653 | ws.ws_col = ncol; |
667 | ws.ws_row = nrow; |
654 | ws.ws_row = nrow; |
668 | ws.ws_xpixel = width; |
655 | ws.ws_xpixel = width; |
669 | ws.ws_ypixel = height; |
656 | ws.ws_ypixel = height; |
670 | (void)ioctl (pty->pty, TIOCSWINSZ, &ws); |
657 | ioctl (pty->pty, TIOCSWINSZ, &ws); |
671 | |
658 | |
672 | #if 0 |
659 | #if 0 |
673 | // TIOCSWINSZ is supposed to do this automatically and correctly |
660 | // TIOCSWINSZ is supposed to do this automatically and correctly |
674 | if (cmd_pid) /* force through to the command */ |
661 | if (cmd_pid) /* force through to the command */ |
675 | kill (-cmd_pid, SIGWINCH); |
662 | kill (-cmd_pid, SIGWINCH); |
… | |
… | |
705 | #endif |
692 | #endif |
706 | |
693 | |
707 | delete fontset[0]; |
694 | delete fontset[0]; |
708 | fontset[0] = fs; |
695 | fontset[0] = fs; |
709 | |
696 | |
710 | prop = (*fs)[1]->properties (); |
697 | prop = (*fs)[rxvt_fontset::firstFont]->properties (); |
711 | prop.height += lineSpace; |
698 | prop.height += lineSpace; |
|
|
699 | prop.width += letterSpace; |
712 | |
700 | |
713 | fs->set_prop (prop, false); |
701 | fs->set_prop (prop, false); |
714 | |
702 | |
715 | fwidth = prop.width; |
703 | fwidth = prop.width; |
716 | fheight = prop.height; |
704 | fheight = prop.height; |
… | |
… | |
805 | void |
793 | void |
806 | rxvt_term::set_window_color (int idx, const char *color) |
794 | rxvt_term::set_window_color (int idx, const char *color) |
807 | { |
795 | { |
808 | #ifdef XTERM_COLOR_CHANGE |
796 | #ifdef XTERM_COLOR_CHANGE |
809 | rxvt_color xcol; |
797 | rxvt_color xcol; |
810 | int i; |
|
|
811 | |
798 | |
812 | if (color == NULL || *color == '\0') |
799 | if (color == NULL || *color == '\0') |
813 | return; |
800 | return; |
814 | |
801 | |
815 | color = strdup (color); |
802 | color = strdup (color); |
… | |
… | |
817 | rs[Rs_color + idx] = color; |
804 | rs[Rs_color + idx] = color; |
818 | |
805 | |
819 | /* handle color aliases */ |
806 | /* handle color aliases */ |
820 | if (isdigit (*color)) |
807 | if (isdigit (*color)) |
821 | { |
808 | { |
822 | i = atoi (color); |
809 | int i = atoi (color); |
823 | |
810 | |
824 | if (i >= 8 && i <= 15) |
811 | if (i >= 8 && i <= 15) |
825 | { |
812 | { |
826 | /* bright colors */ |
813 | /* bright colors */ |
827 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; |
814 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; |
… | |
… | |
931 | int old_width = szHint.width; |
918 | int old_width = szHint.width; |
932 | int old_height = szHint.height; |
919 | int old_height = szHint.height; |
933 | |
920 | |
934 | window_calc (newwidth, newheight); |
921 | window_calc (newwidth, newheight); |
935 | |
922 | |
936 | if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) |
923 | bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)); |
|
|
924 | |
|
|
925 | // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow |
|
|
926 | if (set_hint) |
|
|
927 | { |
|
|
928 | szHint.flags &= ~(PBaseSize | PResizeInc); |
937 | XSetWMNormalHints (dpy, parent[0], &szHint); |
929 | XSetWMNormalHints (dpy, parent[0], &szHint); |
|
|
930 | szHint.flags |= PBaseSize | PResizeInc; |
|
|
931 | } |
938 | |
932 | |
939 | if (!ignoreparent) |
933 | if (!ignoreparent) |
940 | { |
934 | { |
941 | #ifdef SMART_RESIZE |
935 | #ifdef SMART_RESIZE |
942 | /* |
936 | /* |
… | |
… | |
982 | #else |
976 | #else |
983 | XResizeWindow (dpy, parent[0], szHint.width, szHint.height); |
977 | XResizeWindow (dpy, parent[0], szHint.width, szHint.height); |
984 | #endif |
978 | #endif |
985 | } |
979 | } |
986 | |
980 | |
|
|
981 | if (set_hint) |
|
|
982 | XSetWMNormalHints (dpy, parent[0], &szHint); |
|
|
983 | |
987 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
984 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
988 | |
985 | |
989 | if (fix_screen || newwidth != old_width || newheight != old_height) |
986 | if (fix_screen || newwidth != old_width || newheight != old_height) |
990 | { |
987 | { |
991 | if (scrollBar.state) |
988 | if (scrollBar.state) |
992 | { |
989 | scrollBar.resize (); |
993 | XMoveResizeWindow (dpy, scrollBar.win, |
|
|
994 | window_sb_x, 0, |
|
|
995 | scrollbar_TotalWidth (), szHint.height); |
|
|
996 | resize_scrollbar (); |
|
|
997 | } |
|
|
998 | |
990 | |
999 | XMoveResizeWindow (dpy, vt, |
991 | XMoveResizeWindow (dpy, vt, |
1000 | window_vt_x, window_vt_y, |
992 | window_vt_x, window_vt_y, |
1001 | width, height); |
993 | width, height); |
1002 | |
994 | |
1003 | #ifdef HAVE_BG_PIXMAP |
995 | #ifdef HAVE_BG_PIXMAP |
1004 | if (bgPixmap.window_size_sensitive ()) |
996 | if (bgPixmap.window_size_sensitive ()) |
1005 | update_background (); |
997 | update_background (); |
1006 | #endif |
998 | #endif |
1007 | |
|
|
1008 | scr_clear (); |
|
|
1009 | } |
999 | } |
1010 | |
1000 | |
1011 | if (fix_screen || old_height == 0) |
1001 | if (fix_screen || old_height == 0) |
1012 | scr_reset (); |
1002 | scr_reset (); |
1013 | |
|
|
1014 | // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version |
|
|
1015 | //scr_touch (false); |
|
|
1016 | |
1003 | |
1017 | #ifdef HAVE_BG_PIXMAP |
1004 | #ifdef HAVE_BG_PIXMAP |
1018 | // TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? |
1005 | // TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? |
1019 | // if (bgPixmap.pixmap) |
1006 | // if (bgPixmap.pixmap) |
1020 | // scr_touch (false); |
1007 | // scr_touch (false); |
… | |
… | |
1092 | |
1079 | |
1093 | /* Checking whether input method is running. */ |
1080 | /* Checking whether input method is running. */ |
1094 | bool |
1081 | bool |
1095 | rxvt_term::IMisRunning () |
1082 | rxvt_term::IMisRunning () |
1096 | { |
1083 | { |
1097 | char *p; |
|
|
1098 | Atom atom; |
1084 | Atom atom; |
1099 | Window win; |
1085 | Window win; |
1100 | char server[IMBUFSIZ]; |
1086 | char server[IMBUFSIZ]; |
1101 | |
1087 | |
1102 | /* get current locale modifier */ |
1088 | /* get current locale modifier */ |
1103 | if ((p = XSetLocaleModifiers (NULL)) != NULL) |
1089 | if (char *p = XSetLocaleModifiers (0)) |
1104 | { |
1090 | { |
1105 | strcpy (server, "@server="); |
1091 | strcpy (server, "@server="); |
1106 | strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ |
1092 | strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */ |
1107 | |
1093 | |
1108 | if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ |
1094 | if (p = strchr (server + 1, '@')) /* first one only */ |
1109 | *p = '\0'; |
1095 | *p = '\0'; |
1110 | |
1096 | |
1111 | atom = XInternAtom (dpy, server, False); |
1097 | atom = XInternAtom (dpy, server, False); |
1112 | win = XGetSelectionOwner (dpy, atom); |
1098 | win = XGetSelectionOwner (dpy, atom); |
1113 | |
1099 | |
… | |
… | |
1180 | |
1166 | |
1181 | term->make_current (); |
1167 | term->make_current (); |
1182 | |
1168 | |
1183 | if (text) |
1169 | if (text) |
1184 | { |
1170 | { |
1185 | void *str; |
1171 | wchar_t *str; |
1186 | |
1172 | |
1187 | if (!text->encoding_is_wchar && text->string.multi_byte) |
1173 | if (!text->encoding_is_wchar && text->string.multi_byte) |
1188 | { |
1174 | { |
1189 | // of course, X makes it ugly again |
1175 | // of course, X makes it ugly again |
1190 | if (term->rs[Rs_imLocale]) |
1176 | if (term->rs[Rs_imLocale]) |
1191 | SET_LOCALE (term->rs[Rs_imLocale]); |
1177 | SET_LOCALE (term->rs[Rs_imLocale]); |
1192 | |
1178 | |
1193 | str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); |
1179 | str = rxvt_temp_buf<wchar_t> (text->length + 1); |
1194 | mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); |
1180 | mbstowcs (str, text->string.multi_byte, text->length + 1); |
1195 | |
1181 | |
1196 | if (term->rs[Rs_imLocale]) |
1182 | if (term->rs[Rs_imLocale]) |
1197 | SET_LOCALE (term->locale); |
1183 | SET_LOCALE (term->locale); |
1198 | } |
1184 | } |
1199 | else |
1185 | else |
1200 | str = (void *)text->string.wide_char; |
1186 | str = text->string.wide_char; |
1201 | |
1187 | |
1202 | HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, |
1188 | HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, |
1203 | DT_INT, call_data->caret, |
1189 | DT_INT, call_data->caret, |
1204 | DT_INT, call_data->chg_first, |
1190 | DT_INT, call_data->chg_first, |
1205 | DT_INT, call_data->chg_length, |
1191 | DT_INT, call_data->chg_length, |