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.354 by root, Mon Feb 21 07:41:02 2011 UTC vs.
Revision 1.403 by root, Thu Jun 17 00:49:20 2021 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-2010 Marc Lehmann <schmorp@schmorp.de> 16 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
17 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
17 * 18 *
18 * This program is free software; you can redistribute it and/or modify 19 * 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 20 * 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 21 * the Free Software Foundation; either version 3 of the License, or
21 * (at your option) any later version. 22 * (at your option) any later version.
22 * 23 *
23 * This program is distributed in the hope that it will be useful, 24 * This program is distributed in the hope that it will be useful,
24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 25 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
36#include "keyboard.h" 37#include "keyboard.h"
37#include "rxvtperl.h" 38#include "rxvtperl.h"
38 39
39#include <limits> 40#include <limits>
40 41
41#include <cassert> 42#include <assert.h>
42#include <csignal> 43#include <signal.h>
43#include <cstring> 44#include <string.h>
44 45
45#include <termios.h> 46#include <termios.h>
46 47
47#ifdef HAVE_XSETLOCALE 48#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 49# define X_LOCALE
49# include <X11/Xlocale.h> 50# include <X11/Xlocale.h>
50#else 51#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 52# include <locale.h>
53# endif
54#endif 53#endif
55 54
56struct termios rxvt_term::def_tio; 55struct termios rxvt_term::def_tio;
57vector<rxvt_term *> rxvt_term::termlist; 56vector<rxvt_term *> rxvt_term::termlist;
58 57
60rxvt_t rxvt_current_term; 59rxvt_t rxvt_current_term;
61 60
62static char curlocale[128], savelocale[128]; 61static char curlocale[128], savelocale[128];
63 62
64bool 63bool
65rxvt_set_locale (const char *locale) NOTHROW 64rxvt_set_locale (const char *locale) noexcept
66{ 65{
67 int size = strlen (locale) + 1; 66 int size = strlen (locale) + 1;
68 67
69 if (size > sizeof (curlocale)) 68 if (size > sizeof (curlocale))
70 rxvt_fatal ("locale string too long, aborting.\n"); 69 rxvt_fatal ("locale string too long, aborting.\n");
76 setlocale (LC_CTYPE, curlocale); 75 setlocale (LC_CTYPE, curlocale);
77 return true; 76 return true;
78} 77}
79 78
80void 79void
81rxvt_push_locale (const char *locale) NOTHROW 80rxvt_push_locale (const char *locale) noexcept
82{ 81{
83 strcpy (savelocale, curlocale); 82 strcpy (savelocale, curlocale);
84 rxvt_set_locale (locale); 83 rxvt_set_locale (locale);
85} 84}
86 85
87void 86void
88rxvt_pop_locale () NOTHROW 87rxvt_pop_locale () noexcept
89{ 88{
90 rxvt_set_locale (savelocale); 89 rxvt_set_locale (savelocale);
91} 90}
92 91
93#if ENABLE_COMBINING 92#if ENABLE_COMBINING
105 if (cc->c2 == c2) return c1; 104 if (cc->c2 == c2) return c1;
106 cc = (*this)[cc->c1]; 105 cc = (*this)[cc->c1];
107 } 106 }
108 107
109 // check to see whether this combination already exists otherwise 108 // check to see whether this combination already exists otherwise
110 for (cc = v.end (); cc-- > v.begin (); ) 109 for (cc = v.begin (); cc < v.end (); cc++)
111 if (cc->c1 == c1 && cc->c2 == c2) 110 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 111 return COMPOSE_LO + (cc - v.begin ());
113 112
114 // allocate a new combination 113 // allocate a new combination
115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
125 v.push_back (compose_char (c1, c2)); 124 v.push_back (compose_char (c1, c2));
126 125
127 return v.size () - 1 + COMPOSE_LO; 126 return v.size () - 1 + COMPOSE_LO;
128} 127}
129 128
129template<typename T>
130int rxvt_composite_vec::expand (unicode_t c, wchar_t *r) 130int rxvt_composite_vec::expand (unicode_t c, T *r)
131{ 131{
132 compose_char *cc = (*this)[c]; 132 compose_char *cc = (*this)[c];
133 133
134 if (!cc) 134 if (!cc)
135 { 135 {
146 len++; 146 len++;
147 if (r) *r++ = cc->c2; 147 if (r) *r++ = cc->c2;
148 } 148 }
149 149
150 return len; 150 return len;
151
152} 151}
152
153template int rxvt_composite_vec::expand<text_t> (unicode_t c, text_t *);
154template int rxvt_composite_vec::expand<wchar_t> (unicode_t c, wchar_t *);
153#endif 155#endif
154 156
155rxvt_term::rxvt_term () 157rxvt_term::rxvt_term ()
156{ 158{
157#if HAVE_BG_PIXMAP
158 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
159#endif
160#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
161 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL); 160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
162#endif 161#endif
163#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
164 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL); 163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171#endif 170#endif
172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173 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);
174#endif 173#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif 176#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM 178#if USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181#endif 180#endif
182#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif 183#endif
224 if (fontset[i] != fontset[0]) 223 if (fontset[i] != fontset[0])
225 delete fontset[i]; 224 delete fontset[i];
226#endif 225#endif
227 delete fontset[0]; 226 delete fontset[0];
228 227
229#ifdef HAVE_BG_PIXMAP 228#if HAVE_IMG
230 bg_destroy (); 229 delete bg_img;
231#endif 230#endif
232 231
233 if (display) 232 if (display)
234 { 233 {
235 selection_clear (); 234 selection_clear ();
236 selection_clear (true); 235 selection_clear (true);
237 236
238#ifdef USE_XIM 237#if USE_XIM
239 im_destroy (); 238 im_destroy ();
240#endif 239#endif
241 scrollBar.destroy (); 240 scrollBar.destroy ();
241
242 if (gc)
242 if (gc) XFreeGC (dpy, gc); 243 XFreeGC (dpy, gc);
243 244
244 delete drawable; 245 delete drawable;
246
245 // destroy all windows 247 // destroy all windows
246 if (parent[0]) 248 if (parent)
247 XDestroyWindow (dpy, parent[0]); 249 XDestroyWindow (dpy, parent);
248 250
249 for (int i = 0; i < TOTAL_COLORS; i++) 251 for (int i = 0; i < TOTAL_COLORS; i++)
250 if (ISSET_PIXCOLOR (i)) 252 if (ISSET_PIXCOLOR (i))
251 { 253 {
252 pix_colors_focused [i].free (this); 254 pix_colors_focused [i].free (this);
253#if OFF_FOCUS_FADING 255#if OFF_FOCUS_FADING
256 if (rs[Rs_fade])
254 pix_colors_unfocused [i].free (this); 257 pix_colors_unfocused [i].free (this);
255#endif 258#endif
256 } 259 }
257 260
258 clear (); 261 clear ();
259 262
267 for (int i = 0; i < allocated.size (); i++) 270 for (int i = 0; i < allocated.size (); i++)
268 free (allocated [i]); 271 free (allocated [i]);
269 272
270 free (selection.text); 273 free (selection.text);
271 free (selection.clip_text); 274 free (selection.clip_text);
272 // TODO: manage env vars in child only(!)
273 free (env_display);
274 free (env_term);
275 free (locale); 275 free (locale);
276 free (v_buffer); 276 free (v_buffer);
277 277
278 delete selection_req; 278 delete selection_req;
279 279
280 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
281 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
282
283 delete [] env;
284
280 delete envv; 285 delete envv;
281 delete argv; 286 delete argv;
282 287
283#ifdef KEYSYM_RESOURCE 288#ifdef KEYSYM_RESOURCE
284 delete keyboard; 289 delete keyboard;
285#endif 290#endif
286#ifndef NO_RESOURCES 291#ifndef NO_RESOURCES
287 XrmDestroyDatabase (option_db); 292 XrmDestroyDatabase (option_db);
288#endif 293#endif
294
295 SET_R ((rxvt_term *)0);
289} 296}
290 297
291// child has exited, usually destroys 298// child has exited, usually destroys
292void 299void
293rxvt_term::child_cb (ev::child &w, int status) 300rxvt_term::child_cb (ev::child &w, int status)
316 { 323 {
317#if USE_XIM 324#if USE_XIM
318 im_ev.stop (display); 325 im_ev.stop (display);
319#endif 326#endif
320 scrollbar_ev.stop (display); 327 scrollbar_ev.stop (display);
321#if ENABLE_TRANSPARENCY || ENABLE_PERL 328#if ENABLE_PERL
322 rootwin_ev.stop (display); 329 rootwin_ev.stop (display);
323#endif 330#endif
324 termwin_ev.stop (display); 331 termwin_ev.stop (display);
325 vt_ev.stop (display); 332 vt_ev.stop (display);
326 } 333 }
353 360
354 delete this; 361 delete this;
355} 362}
356 363
357void 364void
358rxvt_term::set_option (uint8_t opt, bool set) 365rxvt_term::set_option (uint8_t opt, bool set) noexcept
359{ 366{
360 if (!opt) 367 if (!opt)
361 return; 368 return;
362 369
363 uint8_t mask = 1 << (opt & 7); 370 uint8_t mask = 1 << (opt & 7);
367} 374}
368 375
369/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
370/* 377/*
371 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * 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 */ 379 */
374static XErrorHandler old_xerror_handler; 380static XErrorHandler old_xerror_handler;
375 381
376static void 382static void
377rxvt_emergency_cleanup () 383rxvt_emergency_cleanup ()
379 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 385 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
380 (*t)->emergency_cleanup (); 386 (*t)->emergency_cleanup ();
381} 387}
382 388
383#if !ENABLE_MINIMAL 389#if !ENABLE_MINIMAL
384static void 390static void ecb_cold
385print_x_error (Display *dpy, XErrorEvent *event) 391print_x_error (Display *dpy, XErrorEvent *event)
386{ 392{
387 char buffer[BUFSIZ]; 393 char buffer[BUFSIZ];
388 char mesg[BUFSIZ]; 394 char mesg[BUFSIZ];
389 char number[32]; 395 char number[32];
390 const char mtype[] = "XlibMessage"; 396
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"); 397 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
398
399 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
400 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
401
402 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
403 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
394 rxvt_warn ("%s: %s\n", mesg, buffer); 404 rxvt_warn ("+ %s: %s\n", mesg, buffer);
405
395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 406 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 407 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
408
409 if (event->request_code >= 128)
410 {
411#if 0
412 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
413 int nexts;
414 char **exts = XListExtensions (dpy, &nexts);
415
416 while (nexts)
417 {
418 char *extname = exts [nexts - 1];
419 int major, first_event, first_error;
420
421 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
422 {
423 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
424 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
425
426 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
427 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
428 rxvt_warn ("+ (which is %s)\n", buffer);
429
430 break;
431 }
432
433 printf ("nextss %d %s\n", nexts, extname);//D
434 --nexts;
435 ++exts;
436 }
437#else
438 int nexts = 0;
439 char **exts = 0;
440#endif
441
442 if (!nexts)
443 {
444 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
445
446 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
447 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
448
449#if 0
450 sprintf (number, "RENDER.%d", event->minor_code);
451 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
452 rxvt_warn ("+ (which is %s)\n", buffer);
453#endif
454 }
455
456 XFreeExtensionList (exts);
457 }
458 else
459 {
397 sprintf(number, "%d", event->request_code); 460 sprintf (number, "%d", event->request_code);
398 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 461 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
399 rxvt_warn ("(which is %s)\n", buffer); 462 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 } 463 }
464
405 if ((event->error_code == BadWindow) || 465 if (event->error_code == BadWindow
406 (event->error_code == BadPixmap) || 466 || event->error_code == BadPixmap
407 (event->error_code == BadCursor) || 467 || event->error_code == BadCursor
408 (event->error_code == BadFont) || 468 || event->error_code == BadFont
409 (event->error_code == BadDrawable) || 469 || event->error_code == BadDrawable
410 (event->error_code == BadColor) || 470 || event->error_code == BadColor
411 (event->error_code == BadGC) || 471 || event->error_code == BadGC
412 (event->error_code == BadIDChoice) || 472 || event->error_code == BadIDChoice
413 (event->error_code == BadValue) || 473 || event->error_code == BadValue
414 (event->error_code == BadAtom)) { 474 || event->error_code == BadAtom)
475 {
415 if (event->error_code == BadValue) 476 if (event->error_code == BadValue)
416 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 477 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
417 mesg, BUFSIZ);
418 else if (event->error_code == BadAtom) 478 else if (event->error_code == BadAtom)
419 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 479 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
420 mesg, BUFSIZ);
421 else 480 else
422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 481 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 482
432int 483 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
484 }
485}
486#endif
487
488int ecb_cold
433rxvt_xerror_handler (Display *display, XErrorEvent *event) 489rxvt_xerror_handler (Display *display, XErrorEvent *event)
434{ 490{
435 if (GET_R->allowedxerror == -1) 491 if (GET_R && GET_R->allowedxerror == -1)
436 GET_R->allowedxerror = event->error_code; 492 GET_R->allowedxerror = event->error_code;
437 else 493 else
438 { 494 {
439 // GET_R is most likely not the terminal which caused the error, 495 // GET_R is most likely not the terminal which caused the error,
440 // so just output the error and continue 496 // so just output the error and continue
446 } 502 }
447 503
448 return 0; 504 return 0;
449} 505}
450 506
451int 507int ecb_cold
452rxvt_xioerror_handler (Display *display) 508rxvt_xioerror_handler (Display *display)
453{ 509{
454 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 510 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
455 DisplayString (display)); 511 DisplayString (display));
456 rxvt_emergency_cleanup (); 512 rxvt_emergency_cleanup ();
576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 632 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
577 // TODO: handle this with exceptions and tolerate the memory loss 633 // TODO: handle this with exceptions and tolerate the memory loss
578 XSetIOErrorHandler (rxvt_xioerror_handler); 634 XSetIOErrorHandler (rxvt_xioerror_handler);
579 635
580 XrmInitialize (); 636 XrmInitialize ();
637
638#if HAVE_PIXBUF
639 g_type_init ();
640#endif
581} 641}
582 642
583/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
584/* 644/*
585 * window size/position calculations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
706 if (recalc_y) 766 if (recalc_y)
707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 767 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
708 768
709 ncol = width / fwidth; 769 ncol = width / fwidth;
710 nrow = height / fheight; 770 nrow = height / fheight;
771
772 // When the size of the vt window is not a multiple of the cell
773 // size, i.e., when the wm does not honour our size hints, there are
774 // extra areas not covered by the terminal screen. Such gaps, when a
775 // bg pixmap is set, would have to be cleared manually to properly
776 // refresh the background. We take the simpler route and shrink the
777 // vt window so as to avoid creating gaps.
778 vt_width = ncol * fwidth;
779 vt_height = nrow * fheight;
711} 780}
712 781
713/*----------------------------------------------------------------------*/ 782/*----------------------------------------------------------------------*/
714/* 783/*
715 * Tell the teletype handler what size the window is. 784 * Tell the teletype handler what size the window is.
723 792
724 struct winsize ws; 793 struct winsize ws;
725 794
726 ws.ws_col = ncol; 795 ws.ws_col = ncol;
727 ws.ws_row = nrow; 796 ws.ws_row = nrow;
728 ws.ws_xpixel = width; 797 ws.ws_xpixel = vt_width;
729 ws.ws_ypixel = height; 798 ws.ws_ypixel = vt_height;
730 ioctl (pty->pty, TIOCSWINSZ, &ws); 799 ioctl (pty->pty, TIOCSWINSZ, &ws);
731 800
732#if 0 801#if 0
733 // TIOCSWINSZ is supposed to do this automatically and correctly 802 // TIOCSWINSZ is supposed to do this automatically and correctly
734 if (cmd_pid) /* force through to the command */ 803 if (cmd_pid) /* force through to the command */
735 kill (-cmd_pid, SIGWINCH); 804 kill (-cmd_pid, SIGWINCH);
736#endif 805#endif
737} 806}
738 807
739/*----------------------------------------------------------------------*/ 808/*----------------------------------------------------------------------*/
740/* set_fonts () - load and set the various fonts 809/* 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 810bool
748rxvt_term::set_fonts () 811rxvt_term::set_fonts ()
749{ 812{
750 rxvt_fontset *fs = new rxvt_fontset (this); 813 rxvt_fontset *fs = new rxvt_fontset (this);
751 rxvt_fontprop prop; 814 rxvt_fontprop prop;
766 829
767 delete fontset[0]; 830 delete fontset[0];
768 fontset[0] = fs; 831 fontset[0] = fs;
769 832
770 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 833 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
771 prop.height += lineSpace; 834 prop.width = max (prop.width + letterSpace, 1);
772 prop.width += letterSpace;
773 835
774 fs->set_prop (prop, false); 836 fs->set_prop (prop, false);
775 837
776 fwidth = prop.width; 838 fwidth = prop.width;
777 fheight = prop.height; 839 fheight = prop.height + lineSpace;
778 fbase = prop.ascent; 840 fbase = prop.ascent;
779 841
780 for (int style = 1; style < 4; style++) 842 for (int style = 1; style < 4; style++)
781 { 843 {
782#if ENABLE_STYLES 844#if ENABLE_STYLES
808#else 870#else
809 fontset[style] = fontset[0]; 871 fontset[style] = fontset[0];
810#endif 872#endif
811 } 873 }
812 874
813 if (parent[0]) 875 if (parent)
814 { 876 {
815 resize_all_windows (0, 0, 0); 877 resize_all_windows (0, 0, 0);
816 scr_remap_chars (); 878 scr_remap_chars ();
817 scr_touch (true); 879 scr_touch (true);
818 } 880 }
821} 883}
822 884
823void 885void
824rxvt_term::set_string_property (Atom prop, const char *str, int len) 886rxvt_term::set_string_property (Atom prop, const char *str, int len)
825{ 887{
826 XChangeProperty (dpy, parent[0], 888 XChangeProperty (dpy, parent,
827 prop, XA_STRING, 8, PropModeReplace, 889 prop, XA_STRING, 8, PropModeReplace,
828 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 890 (const unsigned char *)str, len >= 0 ? len : strlen (str));
829} 891}
830 892
831void 893void
833{ 895{
834 XTextProperty ct; 896 XTextProperty ct;
835 897
836 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 898 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
837 { 899 {
838 XSetTextProperty (dpy, parent[0], &ct, prop); 900 XSetTextProperty (dpy, parent, &ct, prop);
839 XFree (ct.value); 901 XFree (ct.value);
840 } 902 }
841} 903}
842 904
843void 905void
844rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 906rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
845{ 907{
846 wchar_t *ws = rxvt_mbstowcs (str, len); 908 wchar_t *ws = rxvt_mbstowcs (str, len);
847 char *s = rxvt_wcstoutf8 (ws); 909 char *s = rxvt_wcstoutf8 (ws);
848 910
849 XChangeProperty (dpy, parent[0], 911 XChangeProperty (dpy, parent,
850 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 912 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
851 (const unsigned char *)s, strlen (s)); 913 (const unsigned char *)s, strlen (s));
852 914
853 free (s); 915 free (s);
854 free (ws); 916 free (ws);
877 939
878void 940void
879rxvt_term::set_window_color (int idx, const char *color) 941rxvt_term::set_window_color (int idx, const char *color)
880{ 942{
881#ifdef XTERM_COLOR_CHANGE 943#ifdef XTERM_COLOR_CHANGE
882 rxvt_color xcol;
883
884 if (color == NULL || *color == '\0') 944 if (color == NULL || *color == '\0')
885 return; 945 return;
886 946
887 color = strdup (color); 947 color = strdup (color);
888 allocated.push_back ((void *)color); 948 allocated.push_back ((void *)color);
894 int i = atoi (color); 954 int i = atoi (color);
895 955
896 if (i >= 8 && i <= 15) 956 if (i >= 8 && i <= 15)
897 { 957 {
898 /* bright colors */ 958 /* bright colors */
899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 959 alias_color (idx, minBrightCOLOR + i - 8);
900 goto done; 960 goto done;
901 } 961 }
902 962
903 if (i >= 0 && i <= 7) 963 if (i >= 0 && i <= 7)
904 { 964 {
905 /* normal colors */ 965 /* normal colors */
906 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 966 alias_color (idx, minCOLOR + i);
907 goto done; 967 goto done;
908 } 968 }
909 } 969 }
910 970
911 set_color (xcol, color); 971 pix_colors_focused[idx].free (this);
912 972 set_color (pix_colors_focused[idx], color);
913 /*
914 * FIXME: should free colors here, but no idea how to do it so instead,
915 * so just keep gobbling up the colormap
916 */
917
918 pix_colors_focused[idx] = xcol;
919 973
920done: 974done:
921 /*TODO: handle Color_BD, scrollbar background, etc. */ 975 /*TODO: handle Color_BD, scrollbar background, etc. */
922 976
923 update_fade_color (idx); 977 update_fade_color (idx);
924 recolour_cursor (); 978 recolor_cursor ();
925 scr_recolour (); 979 scr_recolor ();
926#endif /* XTERM_COLOR_CHANGE */ 980#endif /* XTERM_COLOR_CHANGE */
927} 981}
928 982
929void 983void
930rxvt_term::recolour_cursor () 984rxvt_term::recolor_cursor ()
931{ 985{
932 XColor fg, bg; 986 XColor fg, bg;
933 987
934 (ISSET_PIXCOLOR (Color_pointer_fg) 988 (ISSET_PIXCOLOR (Color_pointer_fg)
935 ? pix_colors_focused[Color_pointer_fg] 989 ? pix_colors_focused[Color_pointer_fg]
944 998
945/*----------------------------------------------------------------------*/ 999/*----------------------------------------------------------------------*/
946/* 1000/*
947 * find if fg/bg matches any of the normal (low-intensity) colors 1001 * find if fg/bg matches any of the normal (low-intensity) colors
948 */ 1002 */
949void 1003char *
950rxvt_term::set_colorfgbg () 1004rxvt_term::get_colorfgbg ()
951{ 1005{
952 unsigned int i; 1006 unsigned int i;
953 const char *xpmb = ""; 1007 const char *xpmb = "";
954 char fstr[] = "default"; 1008 char fstr[] = "default";
955 char bstr[] = "default"; 1009 char bstr[] = "default";
1010 char *env_colorfgbg;
956 1011
957 for (i = Color_Black; i <= Color_White; i++) 1012 for (i = Color_Black; i <= Color_White; i++)
958 if (pix_colors[Color_fg] == pix_colors[i]) 1013 if (pix_colors[Color_fg] == pix_colors[i])
959 { 1014 {
960 sprintf (fstr, "%d", i - Color_Black); 1015 sprintf (fstr, "%d", i - Color_Black);
963 1018
964 for (i = Color_Black; i <= Color_White; i++) 1019 for (i = Color_Black; i <= Color_White; i++)
965 if (pix_colors[Color_bg] == pix_colors[i]) 1020 if (pix_colors[Color_bg] == pix_colors[i])
966 { 1021 {
967 sprintf (bstr, "%d", i - Color_Black); 1022 sprintf (bstr, "%d", i - Color_Black);
968#ifdef BG_IMAGE_FROM_FILE 1023#if HAVE_IMG
969 xpmb = "default;"; 1024 xpmb = "default;";
970#endif 1025#endif
971 break; 1026 break;
972 } 1027 }
973 1028
1029 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
974 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1030 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1031 return env_colorfgbg;
975} 1032}
976 1033
977/*----------------------------------------------------------------------*/ 1034/*----------------------------------------------------------------------*/
978 1035
979bool 1036bool
987} 1044}
988 1045
989void 1046void
990rxvt_term::alias_color (int dst, int src) 1047rxvt_term::alias_color (int dst, int src)
991{ 1048{
1049 pix_colors[dst].free (this);
992 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); 1050 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
993} 1051}
1052
1053#ifdef SMART_RESIZE
1054static unsigned int
1055get_parent_bw (Display *dpy, Window w)
1056{
1057 int idummy;
1058 unsigned int udummy;
1059 Window wdummy, parent;
1060 Window *children;
1061 unsigned int nchildren, border_width;
1062
1063 XQueryTree (dpy, w, &wdummy, &parent, &children, &nchildren);
1064 XFree (children);
1065 XGetGeometry (dpy, parent, &wdummy, &idummy, &idummy,
1066 &udummy, &udummy, &border_width, &udummy);
1067
1068 return border_width;
1069}
1070#endif
994 1071
995/* -------------------------------------------------------------------- * 1072/* -------------------------------------------------------------------- *
996 * - WINDOW RESIZING - * 1073 * - WINDOW RESIZING - *
997 * -------------------------------------------------------------------- */ 1074 * -------------------------------------------------------------------- */
998void 1075void
1008 1085
1009 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1086 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1010 if (set_hint) 1087 if (set_hint)
1011 { 1088 {
1012 szHint.flags &= ~(PBaseSize | PResizeInc); 1089 szHint.flags &= ~(PBaseSize | PResizeInc);
1013 XSetWMNormalHints (dpy, parent[0], &szHint); 1090 XSetWMNormalHints (dpy, parent, &szHint);
1014 szHint.flags |= PBaseSize | PResizeInc; 1091 szHint.flags |= PBaseSize | PResizeInc;
1015 } 1092 }
1016 1093
1017 if (!ignoreparent) 1094 if (!ignoreparent)
1018 { 1095 {
1024 int x, y, x1, y1; 1101 int x, y, x1, y1;
1025 int dx, dy; 1102 int dx, dy;
1026 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1103 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1027 Window unused_cr; 1104 Window unused_cr;
1028 1105
1029 XTranslateCoordinates (dpy, parent[0], display->root, 1106 XTranslateCoordinates (dpy, parent, display->root,
1030 0, 0, &x, &y, &unused_cr); 1107 0, 0, &x, &y, &unused_cr);
1031 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1108 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1032 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1109 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1033 /* 1110 /*
1034 * if display->root isn't the parent window, a WM will probably have offset 1111 * if display->root isn't the parent window, a WM will probably have offset
1035 * our position for handles and decorations. Counter it 1112 * our position for handles and decorations. Counter it
1036 */ 1113 */
1037 if (x1 != x || y1 != y) 1114 if (x1 != x || y1 != y)
1038 { 1115 {
1039 x -= x1; 1116 unsigned int border_width = get_parent_bw (dpy, parent);
1040 y -= y1; 1117
1118 x -= x1 + border_width;
1119 y -= y1 + border_width;
1041 } 1120 }
1042 1121
1043 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2; 1122 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1044 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2; 1123 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1045 dx = old_width - szHint.width; 1124 dx = old_width - szHint.width;
1053 if (y < y1) /* top half */ 1132 if (y < y1) /* top half */
1054 dy = 0; 1133 dy = 0;
1055 else if (y == y1) /* exact center */ 1134 else if (y == y1) /* exact center */
1056 dy /= 2; 1135 dy /= 2;
1057 1136
1058 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1137 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1059 szHint.width, szHint.height); 1138 szHint.width, szHint.height);
1060#else 1139#else
1061 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1140 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1062#endif 1141#endif
1063 } 1142 }
1064 1143
1065 if (set_hint) 1144 if (set_hint)
1066 XSetWMNormalHints (dpy, parent[0], &szHint); 1145 XSetWMNormalHints (dpy, parent, &szHint);
1067 1146
1068 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1147 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1069 1148
1070 if (fix_screen || newwidth != old_width || newheight != old_height) 1149 if (fix_screen || newwidth != old_width || newheight != old_height)
1071 { 1150 {
1072 if (scrollBar.state) 1151 if (scrollBar.state)
1073 scrollBar.resize (); 1152 scrollBar.resize ();
1074 1153
1075 XMoveResizeWindow (dpy, vt, 1154 XMoveResizeWindow (dpy, vt,
1076 window_vt_x, window_vt_y, 1155 window_vt_x, window_vt_y,
1077 width, height); 1156 vt_width, vt_height);
1078 1157
1079#ifdef HAVE_BG_PIXMAP 1158 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1080 if (bg_window_size_sensitive ())
1081 update_background ();
1082#endif
1083 } 1159 }
1084 1160
1085 if (fix_screen || old_height == 0) 1161 if (fix_screen || old_height == 0)
1086 scr_reset (); 1162 scr_reset ();
1087 1163
1088#ifdef USE_XIM 1164#if USE_XIM
1089 IMSetPosition (); 1165 im_set_position ();
1090#endif 1166#endif
1091} 1167}
1092 1168
1093/* 1169/*
1094 * Set the width/height of the vt window in characters. Units are pixels. 1170 * Set the width/height of the vt window in characters. Units are pixels.
1107 newwidth = wattr.width - szHint.base_width; 1183 newwidth = wattr.width - szHint.base_width;
1108 if (newheight == 0) 1184 if (newheight == 0)
1109 newheight = wattr.height - szHint.base_height; 1185 newheight = wattr.height - szHint.base_height;
1110 } 1186 }
1111 1187
1112 if (newwidth != width || newheight != height) 1188 if (newwidth != vt_width || newheight != vt_height)
1113 { 1189 {
1114 newwidth += szHint.base_width; 1190 newwidth += szHint.base_width;
1115 newheight += szHint.base_height; 1191 newheight += szHint.base_height;
1116 resize_all_windows (newwidth, newheight, 0); 1192 resize_all_windows (newwidth, newheight, 0);
1117 } 1193 }
1118} 1194}
1119 1195
1120/* -------------------------------------------------------------------- * 1196/* -------------------------------------------------------------------- *
1121 * - X INPUT METHOD ROUTINES - * 1197 * - X INPUT METHOD ROUTINES - *
1122 * -------------------------------------------------------------------- */ 1198 * -------------------------------------------------------------------- */
1123#ifdef USE_XIM 1199#if USE_XIM
1124 1200
1125void 1201void
1126rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1202rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1127{ 1203{
1128 fg = pix_colors [Color_fg]; 1204 fg = pix_colors [Color_fg];
1155 status_rect.height = fheight; 1231 status_rect.height = fheight;
1156} 1232}
1157 1233
1158/* Checking whether input method is running. */ 1234/* Checking whether input method is running. */
1159bool 1235bool
1160rxvt_term::IMisRunning () 1236rxvt_term::im_is_running ()
1161{ 1237{
1162 Atom atom; 1238 Atom atom;
1163 Window win; 1239 Window win;
1164 char server[IMBUFSIZ]; 1240 char server[IMBUFSIZ];
1165 1241
1181 1257
1182 return false; 1258 return false;
1183} 1259}
1184 1260
1185void 1261void
1186rxvt_term::IMSendSpot () 1262rxvt_term::im_send_spot ()
1187{ 1263{
1188 XPoint nspot; 1264 XPoint nspot;
1189 XVaNestedList preedit_attr; 1265 XVaNestedList preedit_attr;
1190 1266
1191 if (!Input_Context 1267 if (!Input_Context
1297/* 1373/*
1298 * Try to open a XIM with the current modifiers, then see if we can 1374 * Try to open a XIM with the current modifiers, then see if we can
1299 * open a suitable preedit type 1375 * open a suitable preedit type
1300 */ 1376 */
1301bool 1377bool
1302rxvt_term::IM_get_IC (const char *modifiers) 1378rxvt_term::im_get_ic (const char *modifiers)
1303{ 1379{
1304 int i, j, found; 1380 int i, j, found;
1305 XIM xim; 1381 XIM xim;
1306 XPoint spot; 1382 XPoint spot;
1307 XRectangle rect, status_rect, needed_rect; 1383 XRectangle rect, status_rect, needed_rect;
1308 unsigned long fg, bg; 1384 unsigned long fg, bg;
1309 const char *p; 1385 const char *p;
1310 char **s; 1386 char **s;
1311 XIMStyles *xim_styles; 1387 XIMStyles *xim_styles;
1312#ifdef ENABLE_XIM_ONTHESPOT
1313 XIMCallback xcb[4];
1314#endif
1315 1388
1316 set_environ (envv); 1389 set_environ (env);
1317 1390
1318 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1391 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1319 return false; 1392 return false;
1320 1393
1321 input_method = display->get_xim (locale, modifiers); 1394 input_method = display->get_xim (locale, modifiers);
1322 if (input_method == NULL) 1395 if (input_method == NULL)
1323 return false; 1396 return false;
1459 NULL); 1532 NULL);
1460 } 1533 }
1461#if ENABLE_XIM_ONTHESPOT 1534#if ENABLE_XIM_ONTHESPOT
1462 else if (input_style & XIMPreeditCallbacks) 1535 else if (input_style & XIMPreeditCallbacks)
1463 { 1536 {
1537 XIMCallback xcb[4];
1538
1464 im_set_position (spot); 1539 im_set_position (spot);
1465 1540
1466 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1541 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; 1542 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; 1543 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1483#endif 1558#endif
1484 1559
1485 Input_Context = XCreateIC (xim, 1560 Input_Context = XCreateIC (xim,
1486 XNInputStyle, input_style, 1561 XNInputStyle, input_style,
1487 XNClientWindow, vt, 1562 XNClientWindow, vt,
1488 XNFocusWindow, parent[0], 1563 XNFocusWindow, parent,
1489 preedit_attr ? XNPreeditAttributes : NULL, 1564 preedit_attr ? XNPreeditAttributes : NULL,
1490 preedit_attr, 1565 preedit_attr,
1491 status_attr ? XNStatusAttributes : NULL, 1566 status_attr ? XNStatusAttributes : NULL,
1492 status_attr, NULL); 1567 status_attr, NULL);
1493 1568
1506 // unfortunately, only the focus window is used by XIM, hard to fix 1581 // unfortunately, only the focus window is used by XIM, hard to fix
1507 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1582 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1508 vt_select_input (); 1583 vt_select_input ();
1509#endif 1584#endif
1510 1585
1511 IMSetPosition (); 1586 im_set_position ();
1512 1587
1513 return true; 1588 return true;
1514} 1589}
1515 1590
1516void 1591void
1526 im_destroy (); 1601 im_destroy ();
1527 1602
1528 if (Input_Context) 1603 if (Input_Context)
1529 return; 1604 return;
1530 1605
1531#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1532 if (rs[Rs_imLocale]) 1606 if (rs[Rs_imLocale])
1533 SET_LOCALE (rs[Rs_imLocale]); 1607 SET_LOCALE (rs[Rs_imLocale]);
1534#endif
1535 1608
1536 p = rs[Rs_inputMethod]; 1609 p = rs[Rs_inputMethod];
1537 if (p && *p) 1610 if (p && *p)
1538 { 1611 {
1539 bool found = false; 1612 bool found = false;
1544 { 1617 {
1545 if (*s[i]) 1618 if (*s[i])
1546 { 1619 {
1547 strcpy (buf, "@im="); 1620 strcpy (buf, "@im=");
1548 strncat (buf, s[i], IMBUFSIZ - 5); 1621 strncat (buf, s[i], IMBUFSIZ - 5);
1549 if (IM_get_IC (buf)) 1622 if (im_get_ic (buf))
1550 { 1623 {
1551 found = true; 1624 found = true;
1552 break; 1625 break;
1553 } 1626 }
1554 } 1627 }
1559 if (found) 1632 if (found)
1560 goto done; 1633 goto done;
1561 } 1634 }
1562 1635
1563 /* try with XMODIFIERS env. var. */ 1636 /* try with XMODIFIERS env. var. */
1564 if (IM_get_IC ("")) 1637 if (im_get_ic (""))
1565 goto done; 1638 goto done;
1566 1639
1567 /* try with no modifiers base IF the user didn't specify an IM */ 1640 /* try with no modifiers base IF the user didn't specify an IM */
1568 if (IM_get_IC ("@im=none")) 1641 if (im_get_ic ("@im=none"))
1569 goto done; 1642 goto done;
1570 1643
1571done: 1644done:
1572#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1573 if (rs[Rs_imLocale]) 1645 if (rs[Rs_imLocale])
1574 SET_LOCALE (locale); 1646 SET_LOCALE (locale);
1575#endif
1576} 1647}
1577 1648
1578void 1649void
1579rxvt_term::IMSetPosition () 1650rxvt_term::im_set_position ()
1580{ 1651{
1581 XRectangle preedit_rect, status_rect, *needed_rect; 1652 XRectangle preedit_rect, status_rect, *needed_rect;
1582 XVaNestedList preedit_attr, status_attr; 1653 XVaNestedList preedit_attr, status_attr;
1583 1654
1584 if (!Input_Context 1655 if (!Input_Context
1585 || !focus 1656 || !focus
1586 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1657 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1587 || !IMisRunning ()) 1658 || !im_is_running ())
1588 return; 1659 return;
1589 1660
1590 if (input_style & XIMPreeditPosition) 1661 if (input_style & XIMPreeditPosition)
1591 { 1662 {
1592 im_set_size (preedit_rect); 1663 im_set_size (preedit_rect);
1622 1693
1623void 1694void
1624rxvt_term::get_window_origin (int &x, int &y) 1695rxvt_term::get_window_origin (int &x, int &y)
1625{ 1696{
1626 Window cr; 1697 Window cr;
1627 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1698 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1628} 1699}
1629
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
1653
1654void
1655rxvt_term::update_background ()
1656{
1657 if (update_background_ev.is_active ())
1658 return;
1659
1660 bg_invalidate ();
1661
1662 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1663
1664 if (to_wait <= 0.)
1665 bg_render ();
1666 else
1667 update_background_ev.start (to_wait);
1668}
1669
1670void
1671rxvt_term::update_background_cb (ev::timer &w, int revents)
1672{
1673 make_current ();
1674
1675 update_background_ev.stop ();
1676 bg_render ();
1677 refresh_check ();
1678}
1679
1680#endif /* HAVE_BG_PIXMAP */
1681 1700
1682/*----------------------- end-of-file (C source) -----------------------*/ 1701/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines