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.355 by sf-exg, Thu Apr 7 12:19:40 2011 UTC vs.
Revision 1.393 by root, Sat Dec 13 09:50:43 2014 UTC

… …
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
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 3 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
22 * 22 *
23 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
36#include "keyboard.h" 36#include "keyboard.h"
37#include "rxvtperl.h" 37#include "rxvtperl.h"
38 38
39#include <limits> 39#include <limits>
40 40
41#include <cassert> 41#include <assert.h>
42#include <csignal> 42#include <signal.h>
43#include <cstring> 43#include <string.h>
44 44
45#include <termios.h> 45#include <termios.h>
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 51# include <locale.h>
53# endif
54#endif 52#endif
55 53
56struct termios rxvt_term::def_tio; 54struct termios rxvt_term::def_tio;
57vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
58 56
… …
105 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
106 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
107 } 105 }
108 106
109 // check to see whether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
110 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
111 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
113 111
114 // allocate a new combination 112 // allocate a new combination
115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
… …
170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171#endif 169#endif
172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif 172#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif 175#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM 177#if USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181#endif 179#endif
182#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif 182#endif
… …
228 226
229#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
230 bg_destroy (); 228 bg_destroy ();
231#endif 229#endif
232 230
231#if HAVE_IMG
232 delete bg_img;
233#endif
234
233 if (display) 235 if (display)
234 { 236 {
235 selection_clear (); 237 selection_clear ();
236 selection_clear (true); 238 selection_clear (true);
237 239
238#ifdef USE_XIM 240#if USE_XIM
239 im_destroy (); 241 im_destroy ();
240#endif 242#endif
241 scrollBar.destroy (); 243 scrollBar.destroy ();
244
245 if (gc)
242 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
243 247
244 delete drawable; 248 delete drawable;
249
245 // destroy all windows 250 // destroy all windows
246 if (parent) 251 if (parent)
247 XDestroyWindow (dpy, parent); 252 XDestroyWindow (dpy, parent);
248 253
249 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
… …
267 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
268 free (allocated [i]); 273 free (allocated [i]);
269 274
270 free (selection.text); 275 free (selection.text);
271 free (selection.clip_text); 276 free (selection.clip_text);
272 // TODO: manage env vars in child only(!)
273 free (env_display);
274 free (env_term);
275 free (locale); 277 free (locale);
276 free (v_buffer); 278 free (v_buffer);
277 279
278 delete selection_req; 280 delete selection_req;
279 281
282 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
283 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
284
285 delete env;
286
280 delete envv; 287 delete envv;
281 delete argv; 288 delete argv;
282 289
283#ifdef KEYSYM_RESOURCE 290#ifdef KEYSYM_RESOURCE
284 delete keyboard; 291 delete keyboard;
285#endif 292#endif
286#ifndef NO_RESOURCES 293#ifndef NO_RESOURCES
287 XrmDestroyDatabase (option_db); 294 XrmDestroyDatabase (option_db);
288#endif 295#endif
296
297 SET_R ((rxvt_term *)0);
289} 298}
290 299
291// child has exited, usually destroys 300// child has exited, usually destroys
292void 301void
293rxvt_term::child_cb (ev::child &w, int status) 302rxvt_term::child_cb (ev::child &w, int status)
… …
316 { 325 {
317#if USE_XIM 326#if USE_XIM
318 im_ev.stop (display); 327 im_ev.stop (display);
319#endif 328#endif
320 scrollbar_ev.stop (display); 329 scrollbar_ev.stop (display);
321#if ENABLE_TRANSPARENCY || ENABLE_PERL 330#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
322 rootwin_ev.stop (display); 331 rootwin_ev.stop (display);
323#endif 332#endif
324 termwin_ev.stop (display); 333 termwin_ev.stop (display);
325 vt_ev.stop (display); 334 vt_ev.stop (display);
326 } 335 }
… …
353 362
354 delete this; 363 delete this;
355} 364}
356 365
357void 366void
358rxvt_term::set_option (uint8_t opt, bool set) 367rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
359{ 368{
360 if (!opt) 369 if (!opt)
361 return; 370 return;
362 371
363 uint8_t mask = 1 << (opt & 7); 372 uint8_t mask = 1 << (opt & 7);
… …
367} 376}
368 377
369/*----------------------------------------------------------------------*/ 378/*----------------------------------------------------------------------*/
370/* 379/*
371 * Exit gracefully, clearing the utmp entry and restoring tty attributes 380 * Exit gracefully, clearing the utmp entry and restoring tty attributes
372 * TODO: if debugging, this should free up any known resources if we can
373 */ 381 */
374static XErrorHandler old_xerror_handler; 382static XErrorHandler old_xerror_handler;
375 383
376static void 384static void
377rxvt_emergency_cleanup () 385rxvt_emergency_cleanup ()
… …
379 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 387 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
380 (*t)->emergency_cleanup (); 388 (*t)->emergency_cleanup ();
381} 389}
382 390
383#if !ENABLE_MINIMAL 391#if !ENABLE_MINIMAL
384static void 392static void ecb_cold
385print_x_error (Display *dpy, XErrorEvent *event) 393print_x_error (Display *dpy, XErrorEvent *event)
386{ 394{
387 char buffer[BUFSIZ]; 395 char buffer[BUFSIZ];
388 char mesg[BUFSIZ]; 396 char mesg[BUFSIZ];
389 char number[32]; 397 char number[32];
390 const char mtype[] = "XlibMessage"; 398
391 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
392 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
393 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 399 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
400
401 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
402 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
403
404 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
405 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
394 rxvt_warn ("%s: %s\n", mesg, buffer); 406 rxvt_warn ("+ %s: %s\n", mesg, buffer);
407
395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 408 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 409 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
410
411 if (event->request_code >= 128)
412 {
413#if 0
414 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
415 int nexts;
416 char **exts = XListExtensions (dpy, &nexts);
417
418 while (nexts)
419 {
420 char *extname = exts [nexts - 1];
421 int major, first_event, first_error;
422
423 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
424 {
425 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
426 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
427
428 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
429 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
430 rxvt_warn ("+ (which is %s)\n", buffer);
431
432 break;
433 }
434
435 printf ("nextss %d %s\n", nexts, extname);//D
436 --nexts;
437 ++exts;
438 }
439#else
440 int nexts = 0;
441 char **exts = 0;
442#endif
443
444 if (!nexts)
445 {
446 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
447
448 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
449 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
450
451#if 0
452 sprintf (number, "RENDER.%d", event->minor_code);
453 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
454 rxvt_warn ("+ (which is %s)\n", buffer);
455#endif
456 }
457
458 XFreeExtensionList (exts);
459 }
460 else
461 {
397 sprintf(number, "%d", event->request_code); 462 sprintf (number, "%d", event->request_code);
398 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 463 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
399 rxvt_warn ("(which is %s)\n", buffer); 464 rxvt_warn ("+ (which is %s)\n", buffer);
400 if (event->request_code >= 128) {
401 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
402 mesg, BUFSIZ);
403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
404 } 465 }
466
405 if ((event->error_code == BadWindow) || 467 if (event->error_code == BadWindow
406 (event->error_code == BadPixmap) || 468 || event->error_code == BadPixmap
407 (event->error_code == BadCursor) || 469 || event->error_code == BadCursor
408 (event->error_code == BadFont) || 470 || event->error_code == BadFont
409 (event->error_code == BadDrawable) || 471 || event->error_code == BadDrawable
410 (event->error_code == BadColor) || 472 || event->error_code == BadColor
411 (event->error_code == BadGC) || 473 || event->error_code == BadGC
412 (event->error_code == BadIDChoice) || 474 || event->error_code == BadIDChoice
413 (event->error_code == BadValue) || 475 || event->error_code == BadValue
414 (event->error_code == BadAtom)) { 476 || event->error_code == BadAtom)
477 {
415 if (event->error_code == BadValue) 478 if (event->error_code == BadValue)
416 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 479 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
417 mesg, BUFSIZ);
418 else if (event->error_code == BadAtom) 480 else if (event->error_code == BadAtom)
419 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
420 mesg, BUFSIZ);
421 else 482 else
422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 483 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
423 mesg, BUFSIZ);
424 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
425 }
426 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
427 mesg, BUFSIZ);
428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
429}
430#endif
431 484
432int 485 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
486 }
487}
488#endif
489
490int ecb_cold
433rxvt_xerror_handler (Display *display, XErrorEvent *event) 491rxvt_xerror_handler (Display *display, XErrorEvent *event)
434{ 492{
435 if (GET_R->allowedxerror == -1) 493 if (GET_R && GET_R->allowedxerror == -1)
436 GET_R->allowedxerror = event->error_code; 494 GET_R->allowedxerror = event->error_code;
437 else 495 else
438 { 496 {
439 // GET_R is most likely not the terminal which caused the error, 497 // GET_R is most likely not the terminal which caused the error,
440 // so just output the error and continue 498 // so just output the error and continue
… …
446 } 504 }
447 505
448 return 0; 506 return 0;
449} 507}
450 508
451int 509int ecb_cold
452rxvt_xioerror_handler (Display *display) 510rxvt_xioerror_handler (Display *display)
453{ 511{
454 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 512 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
455 DisplayString (display)); 513 DisplayString (display));
456 rxvt_emergency_cleanup (); 514 rxvt_emergency_cleanup ();
… …
576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 634 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
577 // TODO: handle this with exceptions and tolerate the memory loss 635 // TODO: handle this with exceptions and tolerate the memory loss
578 XSetIOErrorHandler (rxvt_xioerror_handler); 636 XSetIOErrorHandler (rxvt_xioerror_handler);
579 637
580 XrmInitialize (); 638 XrmInitialize ();
639
640#if HAVE_PIXBUF
641 g_type_init ();
642#endif
581} 643}
582 644
583/*----------------------------------------------------------------------*/ 645/*----------------------------------------------------------------------*/
584/* 646/*
585 * window size/position calculations for XSizeHint and other storage. 647 * window size/position calculations for XSizeHint and other storage.
… …
706 if (recalc_y) 768 if (recalc_y)
707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 769 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
708 770
709 ncol = width / fwidth; 771 ncol = width / fwidth;
710 nrow = height / fheight; 772 nrow = height / fheight;
773
774 // When the size of the vt window is not a multiple of the cell
775 // size, i.e., when the wm does not honour our size hints, there are
776 // extra areas not covered by the terminal screen. Such gaps, when a
777 // bg pixmap is set, would have to be cleared manually to properly
778 // refresh the background. We take the simpler route and shrink the
779 // vt window so as to avoid creating gaps.
780 vt_width = ncol * fwidth;
781 vt_height = nrow * fheight;
711} 782}
712 783
713/*----------------------------------------------------------------------*/ 784/*----------------------------------------------------------------------*/
714/* 785/*
715 * Tell the teletype handler what size the window is. 786 * Tell the teletype handler what size the window is.
… …
723 794
724 struct winsize ws; 795 struct winsize ws;
725 796
726 ws.ws_col = ncol; 797 ws.ws_col = ncol;
727 ws.ws_row = nrow; 798 ws.ws_row = nrow;
728 ws.ws_xpixel = width; 799 ws.ws_xpixel = vt_width;
729 ws.ws_ypixel = height; 800 ws.ws_ypixel = vt_height;
730 ioctl (pty->pty, TIOCSWINSZ, &ws); 801 ioctl (pty->pty, TIOCSWINSZ, &ws);
731 802
732#if 0 803#if 0
733 // TIOCSWINSZ is supposed to do this automatically and correctly 804 // TIOCSWINSZ is supposed to do this automatically and correctly
734 if (cmd_pid) /* force through to the command */ 805 if (cmd_pid) /* force through to the command */
735 kill (-cmd_pid, SIGWINCH); 806 kill (-cmd_pid, SIGWINCH);
736#endif 807#endif
737} 808}
738 809
739/*----------------------------------------------------------------------*/ 810/*----------------------------------------------------------------------*/
740/* set_fonts () - load and set the various fonts 811/* load and set the various fonts */
741 *
742 * init = 1 - initialize
743 *
744 * fontname == FONT_UP - switch to bigger font
745 * fontname == FONT_DN - switch to smaller font
746 */
747bool 812bool
748rxvt_term::set_fonts () 813rxvt_term::set_fonts ()
749{ 814{
750 rxvt_fontset *fs = new rxvt_fontset (this); 815 rxvt_fontset *fs = new rxvt_fontset (this);
751 rxvt_fontprop prop; 816 rxvt_fontprop prop;
… …
766 831
767 delete fontset[0]; 832 delete fontset[0];
768 fontset[0] = fs; 833 fontset[0] = fs;
769 834
770 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 835 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
771 prop.height += lineSpace; 836 prop.width = max (prop.width + letterSpace, 1);
772 prop.width += letterSpace;
773 837
774 fs->set_prop (prop, false); 838 fs->set_prop (prop, false);
775 839
776 fwidth = prop.width; 840 fwidth = prop.width;
777 fheight = prop.height; 841 fheight = prop.height + lineSpace;
778 fbase = prop.ascent; 842 fbase = prop.ascent;
779 843
780 for (int style = 1; style < 4; style++) 844 for (int style = 1; style < 4; style++)
781 { 845 {
782#if ENABLE_STYLES 846#if ENABLE_STYLES
… …
944 1008
945/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
946/* 1010/*
947 * find if fg/bg matches any of the normal (low-intensity) colors 1011 * find if fg/bg matches any of the normal (low-intensity) colors
948 */ 1012 */
949void 1013char *
950rxvt_term::set_colorfgbg () 1014rxvt_term::get_colorfgbg ()
951{ 1015{
952 unsigned int i; 1016 unsigned int i;
953 const char *xpmb = ""; 1017 const char *xpmb = "";
954 char fstr[] = "default"; 1018 char fstr[] = "default";
955 char bstr[] = "default"; 1019 char bstr[] = "default";
1020 char *env_colorfgbg;
956 1021
957 for (i = Color_Black; i <= Color_White; i++) 1022 for (i = Color_Black; i <= Color_White; i++)
958 if (pix_colors[Color_fg] == pix_colors[i]) 1023 if (pix_colors[Color_fg] == pix_colors[i])
959 { 1024 {
960 sprintf (fstr, "%d", i - Color_Black); 1025 sprintf (fstr, "%d", i - Color_Black);
… …
963 1028
964 for (i = Color_Black; i <= Color_White; i++) 1029 for (i = Color_Black; i <= Color_White; i++)
965 if (pix_colors[Color_bg] == pix_colors[i]) 1030 if (pix_colors[Color_bg] == pix_colors[i])
966 { 1031 {
967 sprintf (bstr, "%d", i - Color_Black); 1032 sprintf (bstr, "%d", i - Color_Black);
968#ifdef BG_IMAGE_FROM_FILE 1033#if BG_IMAGE_FROM_FILE
969 xpmb = "default;"; 1034 xpmb = "default;";
970#endif 1035#endif
971 break; 1036 break;
972 } 1037 }
973 1038
1039 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
974 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1040 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1041 return env_colorfgbg;
975} 1042}
976 1043
977/*----------------------------------------------------------------------*/ 1044/*----------------------------------------------------------------------*/
978 1045
979bool 1046bool
… …
1072 if (scrollBar.state) 1139 if (scrollBar.state)
1073 scrollBar.resize (); 1140 scrollBar.resize ();
1074 1141
1075 XMoveResizeWindow (dpy, vt, 1142 XMoveResizeWindow (dpy, vt,
1076 window_vt_x, window_vt_y, 1143 window_vt_x, window_vt_y,
1077 width, height); 1144 vt_width, vt_height);
1145
1146 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1078 1147
1079#ifdef HAVE_BG_PIXMAP 1148#ifdef HAVE_BG_PIXMAP
1080 if (bg_window_size_sensitive ()) 1149 if (bg_window_size_sensitive ())
1081 update_background (); 1150 update_background ();
1082#endif 1151#endif
1083 } 1152 }
1084 1153
1085 if (fix_screen || old_height == 0) 1154 if (fix_screen || old_height == 0)
1086 scr_reset (); 1155 scr_reset ();
1087 1156
1088#ifdef USE_XIM 1157#if USE_XIM
1089 IMSetPosition (); 1158 im_set_position ();
1090#endif 1159#endif
1091} 1160}
1092 1161
1093/* 1162/*
1094 * Set the width/height of the vt window in characters. Units are pixels. 1163 * Set the width/height of the vt window in characters. Units are pixels.
… …
1107 newwidth = wattr.width - szHint.base_width; 1176 newwidth = wattr.width - szHint.base_width;
1108 if (newheight == 0) 1177 if (newheight == 0)
1109 newheight = wattr.height - szHint.base_height; 1178 newheight = wattr.height - szHint.base_height;
1110 } 1179 }
1111 1180
1112 if (newwidth != width || newheight != height) 1181 if (newwidth != vt_width || newheight != vt_height)
1113 { 1182 {
1114 newwidth += szHint.base_width; 1183 newwidth += szHint.base_width;
1115 newheight += szHint.base_height; 1184 newheight += szHint.base_height;
1116 resize_all_windows (newwidth, newheight, 0); 1185 resize_all_windows (newwidth, newheight, 0);
1117 } 1186 }
1118} 1187}
1119 1188
1120/* -------------------------------------------------------------------- * 1189/* -------------------------------------------------------------------- *
1121 * - X INPUT METHOD ROUTINES - * 1190 * - X INPUT METHOD ROUTINES - *
1122 * -------------------------------------------------------------------- */ 1191 * -------------------------------------------------------------------- */
1123#ifdef USE_XIM 1192#if USE_XIM
1124 1193
1125void 1194void
1126rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1195rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1127{ 1196{
1128 fg = pix_colors [Color_fg]; 1197 fg = pix_colors [Color_fg];
… …
1155 status_rect.height = fheight; 1224 status_rect.height = fheight;
1156} 1225}
1157 1226
1158/* Checking whether input method is running. */ 1227/* Checking whether input method is running. */
1159bool 1228bool
1160rxvt_term::IMisRunning () 1229rxvt_term::im_is_running ()
1161{ 1230{
1162 Atom atom; 1231 Atom atom;
1163 Window win; 1232 Window win;
1164 char server[IMBUFSIZ]; 1233 char server[IMBUFSIZ];
1165 1234
… …
1181 1250
1182 return false; 1251 return false;
1183} 1252}
1184 1253
1185void 1254void
1186rxvt_term::IMSendSpot () 1255rxvt_term::im_send_spot ()
1187{ 1256{
1188 XPoint nspot; 1257 XPoint nspot;
1189 XVaNestedList preedit_attr; 1258 XVaNestedList preedit_attr;
1190 1259
1191 if (!Input_Context 1260 if (!Input_Context
… …
1297/* 1366/*
1298 * Try to open a XIM with the current modifiers, then see if we can 1367 * Try to open a XIM with the current modifiers, then see if we can
1299 * open a suitable preedit type 1368 * open a suitable preedit type
1300 */ 1369 */
1301bool 1370bool
1302rxvt_term::IM_get_IC (const char *modifiers) 1371rxvt_term::im_get_ic (const char *modifiers)
1303{ 1372{
1304 int i, j, found; 1373 int i, j, found;
1305 XIM xim; 1374 XIM xim;
1306 XPoint spot; 1375 XPoint spot;
1307 XRectangle rect, status_rect, needed_rect; 1376 XRectangle rect, status_rect, needed_rect;
1308 unsigned long fg, bg; 1377 unsigned long fg, bg;
1309 const char *p; 1378 const char *p;
1310 char **s; 1379 char **s;
1311 XIMStyles *xim_styles; 1380 XIMStyles *xim_styles;
1312#ifdef ENABLE_XIM_ONTHESPOT
1313 XIMCallback xcb[4];
1314#endif
1315 1381
1316 set_environ (envv); 1382 set_environ (env);
1317 1383
1318 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1384 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1319 return false; 1385 return false;
1320 1386
1321 input_method = display->get_xim (locale, modifiers); 1387 input_method = display->get_xim (locale, modifiers);
1322 if (input_method == NULL) 1388 if (input_method == NULL)
1323 return false; 1389 return false;
… …
1459 NULL); 1525 NULL);
1460 } 1526 }
1461#if ENABLE_XIM_ONTHESPOT 1527#if ENABLE_XIM_ONTHESPOT
1462 else if (input_style & XIMPreeditCallbacks) 1528 else if (input_style & XIMPreeditCallbacks)
1463 { 1529 {
1530 XIMCallback xcb[4];
1531
1464 im_set_position (spot); 1532 im_set_position (spot);
1465 1533
1466 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1534 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1467 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1535 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1468 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1536 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1506 // unfortunately, only the focus window is used by XIM, hard to fix 1574 // unfortunately, only the focus window is used by XIM, hard to fix
1507 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1575 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1508 vt_select_input (); 1576 vt_select_input ();
1509#endif 1577#endif
1510 1578
1511 IMSetPosition (); 1579 im_set_position ();
1512 1580
1513 return true; 1581 return true;
1514} 1582}
1515 1583
1516void 1584void
… …
1526 im_destroy (); 1594 im_destroy ();
1527 1595
1528 if (Input_Context) 1596 if (Input_Context)
1529 return; 1597 return;
1530 1598
1531#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1532 if (rs[Rs_imLocale]) 1599 if (rs[Rs_imLocale])
1533 SET_LOCALE (rs[Rs_imLocale]); 1600 SET_LOCALE (rs[Rs_imLocale]);
1534#endif
1535 1601
1536 p = rs[Rs_inputMethod]; 1602 p = rs[Rs_inputMethod];
1537 if (p && *p) 1603 if (p && *p)
1538 { 1604 {
1539 bool found = false; 1605 bool found = false;
… …
1544 { 1610 {
1545 if (*s[i]) 1611 if (*s[i])
1546 { 1612 {
1547 strcpy (buf, "@im="); 1613 strcpy (buf, "@im=");
1548 strncat (buf, s[i], IMBUFSIZ - 5); 1614 strncat (buf, s[i], IMBUFSIZ - 5);
1549 if (IM_get_IC (buf)) 1615 if (im_get_ic (buf))
1550 { 1616 {
1551 found = true; 1617 found = true;
1552 break; 1618 break;
1553 } 1619 }
1554 } 1620 }
… …
1559 if (found) 1625 if (found)
1560 goto done; 1626 goto done;
1561 } 1627 }
1562 1628
1563 /* try with XMODIFIERS env. var. */ 1629 /* try with XMODIFIERS env. var. */
1564 if (IM_get_IC ("")) 1630 if (im_get_ic (""))
1565 goto done; 1631 goto done;
1566 1632
1567 /* try with no modifiers base IF the user didn't specify an IM */ 1633 /* try with no modifiers base IF the user didn't specify an IM */
1568 if (IM_get_IC ("@im=none")) 1634 if (im_get_ic ("@im=none"))
1569 goto done; 1635 goto done;
1570 1636
1571done: 1637done:
1572#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1573 if (rs[Rs_imLocale]) 1638 if (rs[Rs_imLocale])
1574 SET_LOCALE (locale); 1639 SET_LOCALE (locale);
1575#endif
1576} 1640}
1577 1641
1578void 1642void
1579rxvt_term::IMSetPosition () 1643rxvt_term::im_set_position ()
1580{ 1644{
1581 XRectangle preedit_rect, status_rect, *needed_rect; 1645 XRectangle preedit_rect, status_rect, *needed_rect;
1582 XVaNestedList preedit_attr, status_attr; 1646 XVaNestedList preedit_attr, status_attr;
1583 1647
1584 if (!Input_Context 1648 if (!Input_Context
1585 || !focus 1649 || !focus
1586 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1650 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1587 || !IMisRunning ()) 1651 || !im_is_running ())
1588 return; 1652 return;
1589 1653
1590 if (input_style & XIMPreeditPosition) 1654 if (input_style & XIMPreeditPosition)
1591 { 1655 {
1592 im_set_size (preedit_rect); 1656 im_set_size (preedit_rect);
… …
1625{ 1689{
1626 Window cr; 1690 Window cr;
1627 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); 1691 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1628} 1692}
1629 1693
1630Pixmap
1631rxvt_term::get_pixmap_property (Atom property)
1632{
1633 Pixmap pixmap = None;
1634
1635 int aformat;
1636 unsigned long nitems, bytes_after;
1637 Atom atype;
1638 unsigned char *prop;
1639 int result = XGetWindowProperty (dpy, display->root, property,
1640 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1641 &nitems, &bytes_after, &prop);
1642 if (result == Success)
1643 {
1644 if (atype == XA_PIXMAP)
1645 pixmap = *(Pixmap *)prop;
1646 XFree (prop);
1647 }
1648
1649 return pixmap;
1650}
1651
1652#ifdef HAVE_BG_PIXMAP 1694#ifdef HAVE_BG_PIXMAP
1653 1695
1654void 1696void
1655rxvt_term::update_background () 1697rxvt_term::update_background ()
1656{ 1698{
1657 if (update_background_ev.is_active ()) 1699 if (update_background_ev.is_active ())
1658 return; 1700 return;
1659
1660 bg_invalidate ();
1661 1701
1662 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); 1702 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1663 1703
1664 if (to_wait <= 0.) 1704 if (to_wait <= 0.)
1665 bg_render (); 1705 bg_render ();

Diff Legend

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