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.300 by root, Sat Jan 19 00:24:53 2008 UTC vs.
Revision 1.326 by sf-exg, Sat Apr 3 16:30:39 2010 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
101 { 101 {
102 if (cc->c2 == c2) return c1; 102 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 103 cc = (*this)[cc->c1];
104 } 104 }
105 105
106 // check to see wether this combination already exists otherwise 106 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 107 for (cc = v.end (); cc-- > v.begin (); )
108 { 108 {
109 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
111 } 111 }
… …
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 176#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM 178#ifdef USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182#endif 180#endif
183#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
… …
229 delete fontset[0]; 227 delete fontset[0];
230 228
231#ifdef HAVE_BG_PIXMAP 229#ifdef HAVE_BG_PIXMAP
232 bgPixmap.destroy (); 230 bgPixmap.destroy ();
233#endif 231#endif
232#ifdef HAVE_AFTERIMAGE
233 if (asv)
234 destroy_asvisual (asv, 0);
235 if (asimman)
236 destroy_image_manager (asimman, 0);
237#endif
234 238
235 if (display) 239 if (display)
236 { 240 {
237 selection_clear (); 241 selection_clear ();
242 selection_clear (true);
238 243
239#ifdef USE_XIM 244#ifdef USE_XIM
240 im_destroy (); 245 im_destroy ();
241#endif 246#endif
242#ifdef XTERM_SCROLLBAR 247 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); 248 if (gc) XFreeGC (dpy, gc);
267 249
268 delete drawable; 250 delete drawable;
269 // destroy all windows 251 // destroy all windows
270 if (parent[0]) 252 if (parent[0])
… …
290 /* clear all resources */ 272 /* clear all resources */
291 for (int i = 0; i < allocated.size (); i++) 273 for (int i = 0; i < allocated.size (); i++)
292 free (allocated [i]); 274 free (allocated [i]);
293 275
294 free (selection.text); 276 free (selection.text);
277 free (selection.clip_text);
295 // TODO: manage env vars in child only(!) 278 // TODO: manage env vars in child only(!)
296 free (env_display); 279 free (env_display);
297 free (env_term); 280 free (env_term);
298 free (locale); 281 free (locale);
299 free (v_buffer); 282 free (v_buffer);
… …
337 if (display) 320 if (display)
338 { 321 {
339#if USE_XIM 322#if USE_XIM
340 im_ev.stop (display); 323 im_ev.stop (display);
341#endif 324#endif
342#if HAVE_SCROLLBARS
343 scrollbar_ev.stop (display); 325 scrollbar_ev.stop (display);
344#endif
345#if ENABLE_TRANSPARENCY || ENABLE_PERL 326#if ENABLE_TRANSPARENCY || ENABLE_PERL
346 rootwin_ev.stop (display); 327 rootwin_ev.stop (display);
347#endif 328#endif
348 incr_ev.stop (); 329 incr_ev.stop ();
349 termwin_ev.stop (display); 330 termwin_ev.stop (display);
… …
409 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 390 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
410 sprintf(number, "%d", event->request_code); 391 sprintf(number, "%d", event->request_code);
411 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 392 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
412 rxvt_warn ("(which is %s)\n", buffer); 393 rxvt_warn ("(which is %s)\n", buffer);
413 if (event->request_code >= 128) { 394 if (event->request_code >= 128) {
414 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 395 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
415 mesg, BUFSIZ); 396 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 397 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
417 } 398 }
418 if ((event->error_code == BadWindow) || 399 if ((event->error_code == BadWindow) ||
419 (event->error_code == BadPixmap) || 400 (event->error_code == BadPixmap) ||
420 (event->error_code == BadCursor) || 401 (event->error_code == BadCursor) ||
421 (event->error_code == BadFont) || 402 (event->error_code == BadFont) ||
422 (event->error_code == BadDrawable) || 403 (event->error_code == BadDrawable) ||
423 (event->error_code == BadColor) || 404 (event->error_code == BadColor) ||
424 (event->error_code == BadGC) || 405 (event->error_code == BadGC) ||
425 (event->error_code == BadIDChoice) || 406 (event->error_code == BadIDChoice) ||
426 (event->error_code == BadValue) || 407 (event->error_code == BadValue) ||
427 (event->error_code == BadAtom)) { 408 (event->error_code == BadAtom)) {
428 if (event->error_code == BadValue) 409 if (event->error_code == BadValue)
429 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 410 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
430 mesg, BUFSIZ); 411 mesg, BUFSIZ);
431 else if (event->error_code == BadAtom) 412 else if (event->error_code == BadAtom)
432 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 413 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
433 mesg, BUFSIZ); 414 mesg, BUFSIZ);
434 else 415 else
435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
436 mesg, BUFSIZ); 417 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438 } 419 }
439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 420 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440 mesg, BUFSIZ); 421 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442} 423}
443#endif 424#endif
444 425
445int 426int
… …
468 DisplayString (display)); 449 DisplayString (display));
469 rxvt_emergency_cleanup (); 450 rxvt_emergency_cleanup ();
470 _exit (EXIT_FAILURE); 451 _exit (EXIT_FAILURE);
471} 452}
472 453
473/*----------------------------------------------------------------------*/
474void
475rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
476{
477 this->envv = envv;
478
479 SET_R (this);
480 set_locale ("");
481 set_environ (envv); // few things in X do not call setlocale :(
482
483 init_vars ();
484
485 init_secondary ();
486
487 const char **cmd_argv = init_resources (argc, argv);
488
489#ifdef KEYSYM_RESOURCE
490 keyboard->register_done ();
491#endif
492
493#ifdef HAVE_SCROLLBARS
494 if (option (Opt_scrollBar))
495 scrollBar.setIdle (); /* set existence for size calculations */
496#endif
497
498 pty = ptytty::create ();
499
500 create_windows (argc, argv);
501
502 init_xlocale ();
503
504 scr_reset (); // initialize screen
505
506#if 0
507 XSynchronize (dpy, True);
508#endif
509
510#ifdef HAVE_SCROLLBARS
511 if (option (Opt_scrollBar))
512 resize_scrollbar (); /* create and map scrollbar */
513#endif
514#ifdef HAVE_BG_PIXMAP
515 {
516 bgPixmap.set_target (this);
517 bgPixmap.invalidate ();
518
519#ifdef ENABLE_TRANSPARENCY
520 if (option (Opt_transparent))
521 {
522 bgPixmap.set_transparent ();
523
524#ifdef HAVE_AFTERIMAGE
525 if (rs [Rs_blurradius])
526 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
527#endif
528 if (ISSET_PIXCOLOR (Color_tint))
529 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
530
531 if (rs [Rs_shade])
532 bgPixmap.set_shade (rs [Rs_shade]);
533
534 bgPixmap.set_root_pixmap ();
535 XSelectInput (dpy, display->root, PropertyChangeMask);
536 rootwin_ev.start (display, display->root);
537 }
538#endif
539
540#ifdef BG_IMAGE_FROM_FILE
541 if (rs[Rs_backgroundPixmap])
542 {
543 const char *p = rs[Rs_backgroundPixmap];
544
545 if ((p = strchr (p, ';')) != 0)
546 {
547 p++;
548 bgPixmap.set_geometry (p);
549 }
550 else
551 bgPixmap.set_defaultGeometry ();
552
553 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
554 if (!bgPixmap.window_position_sensitive ())
555 update_background ();
556 }
557#endif
558 }
559#endif
560
561#if ENABLE_PERL
562 rootwin_ev.start (display, display->root);
563#endif
564
565 set_colorfgbg ();
566
567 init_command (cmd_argv);
568
569 free (cmd_argv);
570
571 if (pty->pty >= 0)
572 pty_ev.start (pty->pty, ev::READ);
573
574 HOOK_INVOKE ((this, HOOK_START, DT_END));
575
576#if ENABLE_XEMBED
577 if (rs[Rs_embed])
578 {
579 long info[2] = { 0, XEMBED_MAPPED };
580
581 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
582 32, PropModeReplace, (unsigned char *)&info, 2);
583 }
584#endif
585
586 XMapWindow (dpy, vt);
587 XMapWindow (dpy, parent[0]);
588
589 refresh_check ();
590}
591
592static struct sig_handlers 454static struct sig_handlers
593{ 455{
594 ev::sig sw_term, sw_int; 456 ev::sig sw_term, sw_int;
595 457
596 /* 458 /*
… …
648 */ 510 */
649void 511void
650rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 512rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
651{ 513{
652 short recalc_x, recalc_y; 514 short recalc_x, recalc_y;
653 int x, y, sb_w, flags; 515 int x, y, flags;
654 unsigned int w, h; 516 unsigned int w, h;
655 unsigned int max_width, max_height; 517 unsigned int max_width, max_height;
656 518
657 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 519 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
658 szHint.win_gravity = NorthWestGravity; 520 szHint.win_gravity = NorthWestGravity;
… …
668 if (rs[Rs_geometry]) 530 if (rs[Rs_geometry])
669 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 531 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
670 532
671 if (flags & WidthValue) 533 if (flags & WidthValue)
672 { 534 {
535 if (!w)
536 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
537
673 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 538 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
674 szHint.flags |= USSize; 539 szHint.flags |= USSize;
675 } 540 }
676 541
677 if (flags & HeightValue) 542 if (flags & HeightValue)
678 { 543 {
544 if (!h)
545 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
546
679 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 547 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
680 szHint.flags |= USSize; 548 szHint.flags |= USSize;
681 } 549 }
682 550
683 if (flags & XValue) 551 if (flags & XValue)
684 { 552 {
… …
715 max_width = MAX_COLS * fwidth; 583 max_width = MAX_COLS * fwidth;
716 max_height = MAX_ROWS * fheight; 584 max_height = MAX_ROWS * fheight;
717 585
718 szHint.base_width = szHint.base_height = 2 * int_bwidth; 586 szHint.base_width = szHint.base_height = 2 * int_bwidth;
719 587
720 sb_w = 0;
721 window_vt_x = window_vt_y = int_bwidth; 588 window_vt_x = window_vt_y = int_bwidth;
722 589
723 if (scrollBar.state) 590 if (scrollBar.state)
724 { 591 {
725 sb_w = scrollbar_TotalWidth (); 592 int sb_w = scrollBar.total_width ();
726 szHint.base_width += sb_w; 593 szHint.base_width += sb_w;
727 594
728 if (!option (Opt_scrollBar_right)) 595 if (!option (Opt_scrollBar_right))
729 window_vt_x += sb_w; 596 window_vt_x += sb_w;
730 } 597 }
… …
754 { 621 {
755 min_it (height, max_height); 622 min_it (height, max_height);
756 szHint.height = szHint.base_height + height; 623 szHint.height = szHint.base_height + height;
757 } 624 }
758 625
759 if (scrollBar.state && option (Opt_scrollBar_right))
760 window_sb_x = szHint.width - sb_w;
761
762 if (recalc_x) 626 if (recalc_x)
763 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 627 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
764 628
765 if (recalc_y) 629 if (recalc_y)
766 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 630 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
767 631
768 ncol = width / fwidth; 632 ncol = width / fwidth;
769 nrow = height / fheight; 633 nrow = height / fheight;
770} 634}
771 635
772/*----------------------------------------------------------------------*/ 636/*----------------------------------------------------------------------*/
773/* 637/*
… …
784 648
785 ws.ws_col = ncol; 649 ws.ws_col = ncol;
786 ws.ws_row = nrow; 650 ws.ws_row = nrow;
787 ws.ws_xpixel = width; 651 ws.ws_xpixel = width;
788 ws.ws_ypixel = height; 652 ws.ws_ypixel = height;
789 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 653 ioctl (pty->pty, TIOCSWINSZ, &ws);
790 654
791#if 0 655#if 0
792 // TIOCSWINSZ is supposed to do this automatically and correctly 656 // TIOCSWINSZ is supposed to do this automatically and correctly
793 if (cmd_pid) /* force through to the command */ 657 if (cmd_pid) /* force through to the command */
794 kill (-cmd_pid, SIGWINCH); 658 kill (-cmd_pid, SIGWINCH);
… …
824#endif 688#endif
825 689
826 delete fontset[0]; 690 delete fontset[0];
827 fontset[0] = fs; 691 fontset[0] = fs;
828 692
829 prop = (*fs)[1]->properties (); 693 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
830 prop.height += lineSpace; 694 prop.height += lineSpace;
695 prop.width += letterSpace;
831 696
832 fs->set_prop (prop, false); 697 fs->set_prop (prop, false);
833 698
834 fwidth = prop.width; 699 fwidth = prop.width;
835 fheight = prop.height; 700 fheight = prop.height;
… …
924void 789void
925rxvt_term::set_window_color (int idx, const char *color) 790rxvt_term::set_window_color (int idx, const char *color)
926{ 791{
927#ifdef XTERM_COLOR_CHANGE 792#ifdef XTERM_COLOR_CHANGE
928 rxvt_color xcol; 793 rxvt_color xcol;
929 int i;
930 794
931 if (color == NULL || *color == '\0') 795 if (color == NULL || *color == '\0')
932 return; 796 return;
933 797
934 color = strdup (color); 798 color = strdup (color);
… …
936 rs[Rs_color + idx] = color; 800 rs[Rs_color + idx] = color;
937 801
938 /* handle color aliases */ 802 /* handle color aliases */
939 if (isdigit (*color)) 803 if (isdigit (*color))
940 { 804 {
941 i = atoi (color); 805 int i = atoi (color);
942 806
943 if (i >= 8 && i <= 15) 807 if (i >= 8 && i <= 15)
944 { 808 {
945 /* bright colors */ 809 /* bright colors */
946 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 810 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1050 int old_width = szHint.width; 914 int old_width = szHint.width;
1051 int old_height = szHint.height; 915 int old_height = szHint.height;
1052 916
1053 window_calc (newwidth, newheight); 917 window_calc (newwidth, newheight);
1054 918
1055 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 919 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
920
921 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
922 if (set_hint)
923 {
924 szHint.flags &= ~(PBaseSize | PResizeInc);
1056 XSetWMNormalHints (dpy, parent[0], &szHint); 925 XSetWMNormalHints (dpy, parent[0], &szHint);
926 szHint.flags |= PBaseSize | PResizeInc;
927 }
1057 928
1058 if (!ignoreparent) 929 if (!ignoreparent)
1059 { 930 {
1060#ifdef SMART_RESIZE 931#ifdef SMART_RESIZE
1061 /* 932 /*
… …
1101#else 972#else
1102 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 973 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1103#endif 974#endif
1104 } 975 }
1105 976
977 if (set_hint)
978 XSetWMNormalHints (dpy, parent[0], &szHint);
979
1106 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 980 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1107 981
1108 if (fix_screen || newwidth != old_width || newheight != old_height) 982 if (fix_screen || newwidth != old_width || newheight != old_height)
1109 { 983 {
1110 if (scrollBar.state) 984 if (scrollBar.state)
1111 { 985 scrollBar.resize ();
1112 XMoveResizeWindow (dpy, scrollBar.win,
1113 window_sb_x, 0,
1114 scrollbar_TotalWidth (), szHint.height);
1115 resize_scrollbar ();
1116 }
1117 986
1118 XMoveResizeWindow (dpy, vt, 987 XMoveResizeWindow (dpy, vt,
1119 window_vt_x, window_vt_y, 988 window_vt_x, window_vt_y,
1120 width, height); 989 width, height);
1121 990
1122#ifdef HAVE_BG_PIXMAP 991#ifdef HAVE_BG_PIXMAP
1123 if (bgPixmap.window_size_sensitive ()) 992 if (bgPixmap.window_size_sensitive ())
1124 update_background (); 993 update_background ();
1125#endif 994#endif
1126
1127 scr_clear ();
1128 } 995 }
1129 996
1130 if (fix_screen || old_height == 0) 997 if (fix_screen || old_height == 0)
1131 scr_reset (); 998 scr_reset ();
1132
1133 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1134 //scr_touch (false);
1135 999
1136#ifdef HAVE_BG_PIXMAP 1000#ifdef HAVE_BG_PIXMAP
1137// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1001// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1138// if (bgPixmap.pixmap) 1002// if (bgPixmap.pixmap)
1139// scr_touch (false); 1003// scr_touch (false);
… …
1211 1075
1212/* Checking whether input method is running. */ 1076/* Checking whether input method is running. */
1213bool 1077bool
1214rxvt_term::IMisRunning () 1078rxvt_term::IMisRunning ()
1215{ 1079{
1216 char *p;
1217 Atom atom; 1080 Atom atom;
1218 Window win; 1081 Window win;
1219 char server[IMBUFSIZ]; 1082 char server[IMBUFSIZ];
1220 1083
1221 /* get current locale modifier */ 1084 /* get current locale modifier */
1222 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1085 if (char *p = XSetLocaleModifiers (0))
1223 { 1086 {
1224 strcpy (server, "@server="); 1087 strcpy (server, "@server=");
1225 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1088 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1226 1089
1227 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1090 if (p = strchr (server + 1, '@')) /* first one only */
1228 *p = '\0'; 1091 *p = '\0';
1229 1092
1230 atom = XInternAtom (dpy, server, False); 1093 atom = XInternAtom (dpy, server, False);
1231 win = XGetSelectionOwner (dpy, atom); 1094 win = XGetSelectionOwner (dpy, atom);
1232 1095
… …
1299 1162
1300 term->make_current (); 1163 term->make_current ();
1301 1164
1302 if (text) 1165 if (text)
1303 { 1166 {
1304 void *str; 1167 wchar_t *str;
1305 1168
1306 if (!text->encoding_is_wchar && text->string.multi_byte) 1169 if (!text->encoding_is_wchar && text->string.multi_byte)
1307 { 1170 {
1308 // of course, X makes it ugly again 1171 // of course, X makes it ugly again
1309 if (term->rs[Rs_imLocale]) 1172 if (term->rs[Rs_imLocale])
1310 SET_LOCALE (term->rs[Rs_imLocale]); 1173 SET_LOCALE (term->rs[Rs_imLocale]);
1311 1174
1312 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1175 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1313 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1176 mbstowcs (str, text->string.multi_byte, text->length + 1);
1314 1177
1315 if (term->rs[Rs_imLocale]) 1178 if (term->rs[Rs_imLocale])
1316 SET_LOCALE (term->locale); 1179 SET_LOCALE (term->locale);
1317 } 1180 }
1318 else 1181 else
1319 str = (void *)text->string.wide_char; 1182 str = text->string.wide_char;
1320 1183
1321 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1184 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1322 DT_INT, call_data->caret, 1185 DT_INT, call_data->caret,
1323 DT_INT, call_data->chg_first, 1186 DT_INT, call_data->chg_first,
1324 DT_INT, call_data->chg_length, 1187 DT_INT, call_data->chg_length,

Diff Legend

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