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.333 by root, Fri Oct 22 05:57:59 2010 UTC vs.
Revision 1.396 by root, Sat Dec 13 12:06:38 2014 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-2008 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2014 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
… …
96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
97{ 95{
98 compose_char *cc; 96 compose_char *cc;
99 97
100 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
101 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
102 cc = (*this)[c1]; 100 cc = (*this)[c1];
103 while (cc) 101 while (cc)
104 { 102 {
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 {
112 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
113 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
114 }
115 111
116 // allocate a new combination 112 // allocate a new combination
117 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
118 { 114 {
119 static int seen; 115 static int seen;
120 116
121 if (!seen++) 117 if (!seen++)
122 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
123 119
124 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
125 } 121 }
126 122
127 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
172 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);
173#endif 169#endif
174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175 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);
176#endif 172#endif
177#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
178 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
179#endif 175#endif
180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
181#ifdef USE_XIM 177#if USE_XIM
182 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
183#endif 179#endif
184#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
185 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
186#endif 182#endif
… …
189#endif 185#endif
190 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 192
198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
199 194
… …
228 delete fontset[i]; 223 delete fontset[i];
229#endif 224#endif
230 delete fontset[0]; 225 delete fontset[0];
231 226
232#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
233 bgPixmap.destroy (); 228 bg_destroy ();
234#endif 229#endif
235#ifdef HAVE_AFTERIMAGE 230
236 if (asv) 231#if HAVE_IMG
237 destroy_asvisual (asv, 0); 232 delete bg_img;
238 if (asimman)
239 destroy_image_manager (asimman, 0);
240#endif 233#endif
241 234
242 if (display) 235 if (display)
243 { 236 {
244 selection_clear (); 237 selection_clear ();
245 selection_clear (true); 238 selection_clear (true);
246 239
247#ifdef USE_XIM 240#if USE_XIM
248 im_destroy (); 241 im_destroy ();
249#endif 242#endif
250 scrollBar.destroy (); 243 scrollBar.destroy ();
244
245 if (gc)
251 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
252 247
253 delete drawable; 248 delete drawable;
249
254 // destroy all windows 250 // destroy all windows
255 if (parent[0]) 251 if (parent)
256 XDestroyWindow (dpy, parent[0]); 252 XDestroyWindow (dpy, parent);
257 253
258 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
259 if (ISSET_PIXCOLOR (i)) 255 if (ISSET_PIXCOLOR (i))
260 { 256 {
261 pix_colors_focused [i].free (this); 257 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 258#if OFF_FOCUS_FADING
259 if (rs[Rs_fade])
263 pix_colors_unfocused [i].free (this); 260 pix_colors_unfocused [i].free (this);
264#endif 261#endif
265 } 262 }
266 263
267 clear (); 264 clear ();
268 265
… …
276 for (int i = 0; i < allocated.size (); i++) 273 for (int i = 0; i < allocated.size (); i++)
277 free (allocated [i]); 274 free (allocated [i]);
278 275
279 free (selection.text); 276 free (selection.text);
280 free (selection.clip_text); 277 free (selection.clip_text);
281 // TODO: manage env vars in child only(!)
282 free (env_display);
283 free (env_term);
284 free (locale); 278 free (locale);
285 free (v_buffer); 279 free (v_buffer);
286 free (incr_buf); 280
281 delete selection_req;
282
283 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
284 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
285
286 delete env;
287 287
288 delete envv; 288 delete envv;
289 delete argv; 289 delete argv;
290 290
291#ifdef KEYSYM_RESOURCE 291#ifdef KEYSYM_RESOURCE
292 delete keyboard; 292 delete keyboard;
293#endif 293#endif
294#ifndef NO_RESOURCES 294#ifndef NO_RESOURCES
295 XrmDestroyDatabase (option_db); 295 XrmDestroyDatabase (option_db);
296#endif 296#endif
297
298 SET_R ((rxvt_term *)0);
297} 299}
298 300
299// child has exited, usually destroys 301// child has exited, usually destroys
300void 302void
301rxvt_term::child_cb (ev::child &w, int status) 303rxvt_term::child_cb (ev::child &w, int status)
… …
324 { 326 {
325#if USE_XIM 327#if USE_XIM
326 im_ev.stop (display); 328 im_ev.stop (display);
327#endif 329#endif
328 scrollbar_ev.stop (display); 330 scrollbar_ev.stop (display);
329#if ENABLE_TRANSPARENCY || ENABLE_PERL 331#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
330 rootwin_ev.stop (display); 332 rootwin_ev.stop (display);
331#endif 333#endif
332 incr_ev.stop ();
333 termwin_ev.stop (display); 334 termwin_ev.stop (display);
334 vt_ev.stop (display); 335 vt_ev.stop (display);
335 } 336 }
336 337
337 flush_ev.stop (); 338 flush_ev.stop ();
… …
361 make_current (); 362 make_current ();
362 363
363 delete this; 364 delete this;
364} 365}
365 366
367void
368rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
369{
370 if (!opt)
371 return;
372
373 uint8_t mask = 1 << (opt & 7);
374 uint8_t &val = options [opt >> 3];
375
376 val = val & ~mask | (set ? mask : 0);
377}
378
366/*----------------------------------------------------------------------*/ 379/*----------------------------------------------------------------------*/
367/* 380/*
368 * Exit gracefully, clearing the utmp entry and restoring tty attributes 381 * Exit gracefully, clearing the utmp entry and restoring tty attributes
369 * TODO: if debugging, this should free up any known resources if we can
370 */ 382 */
371static XErrorHandler old_xerror_handler; 383static XErrorHandler old_xerror_handler;
372 384
373static void 385static void
374rxvt_emergency_cleanup () 386rxvt_emergency_cleanup ()
… …
376 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 388 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
377 (*t)->emergency_cleanup (); 389 (*t)->emergency_cleanup ();
378} 390}
379 391
380#if !ENABLE_MINIMAL 392#if !ENABLE_MINIMAL
381static void 393static void ecb_cold
382print_x_error (Display *dpy, XErrorEvent *event) 394print_x_error (Display *dpy, XErrorEvent *event)
383{ 395{
384 char buffer[BUFSIZ]; 396 char buffer[BUFSIZ];
385 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
386 char number[32]; 398 char number[32];
387 char *mtype = "XlibMessage"; 399
388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
390 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 400 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
401
402 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
403 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
404
405 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
406 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
391 rxvt_warn ("%s: %s\n", mesg, buffer); 407 rxvt_warn ("+ %s: %s\n", mesg, buffer);
408
392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 409 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 410 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
411
412 if (event->request_code >= 128)
413 {
414#if 0
415 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
416 int nexts;
417 char **exts = XListExtensions (dpy, &nexts);
418
419 while (nexts)
420 {
421 char *extname = exts [nexts - 1];
422 int major, first_event, first_error;
423
424 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
425 {
426 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
427 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
428
429 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
430 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
431 rxvt_warn ("+ (which is %s)\n", buffer);
432
433 break;
434 }
435
436 printf ("nextss %d %s\n", nexts, extname);//D
437 --nexts;
438 ++exts;
439 }
440#else
441 int nexts = 0;
442 char **exts = 0;
443#endif
444
445 if (!nexts)
446 {
447 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
448
449 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
450 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
451
452#if 0
453 sprintf (number, "RENDER.%d", event->minor_code);
454 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
455 rxvt_warn ("+ (which is %s)\n", buffer);
456#endif
457 }
458
459 XFreeExtensionList (exts);
460 }
461 else
462 {
394 sprintf(number, "%d", event->request_code); 463 sprintf (number, "%d", event->request_code);
395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 464 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
396 rxvt_warn ("(which is %s)\n", buffer); 465 rxvt_warn ("+ (which is %s)\n", buffer);
397 if (event->request_code >= 128) {
398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
399 mesg, BUFSIZ);
400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
401 } 466 }
467
402 if ((event->error_code == BadWindow) || 468 if (event->error_code == BadWindow
403 (event->error_code == BadPixmap) || 469 || event->error_code == BadPixmap
404 (event->error_code == BadCursor) || 470 || event->error_code == BadCursor
405 (event->error_code == BadFont) || 471 || event->error_code == BadFont
406 (event->error_code == BadDrawable) || 472 || event->error_code == BadDrawable
407 (event->error_code == BadColor) || 473 || event->error_code == BadColor
408 (event->error_code == BadGC) || 474 || event->error_code == BadGC
409 (event->error_code == BadIDChoice) || 475 || event->error_code == BadIDChoice
410 (event->error_code == BadValue) || 476 || event->error_code == BadValue
411 (event->error_code == BadAtom)) { 477 || event->error_code == BadAtom)
478 {
412 if (event->error_code == BadValue) 479 if (event->error_code == BadValue)
413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 480 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
414 mesg, BUFSIZ);
415 else if (event->error_code == BadAtom) 481 else if (event->error_code == BadAtom)
416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 482 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
417 mesg, BUFSIZ);
418 else 483 else
419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 484 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
420 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
422 }
423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
424 mesg, BUFSIZ);
425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
426}
427#endif
428 485
429int 486 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
487 }
488}
489#endif
490
491int ecb_cold
430rxvt_xerror_handler (Display *display, XErrorEvent *event) 492rxvt_xerror_handler (Display *display, XErrorEvent *event)
431{ 493{
432 if (GET_R->allowedxerror == -1) 494 if (GET_R && GET_R->allowedxerror == -1)
433 GET_R->allowedxerror = event->error_code; 495 GET_R->allowedxerror = event->error_code;
434 else 496 else
435 { 497 {
436 // GET_R is most likely not the terminal which caused the error, 498 // GET_R is most likely not the terminal which caused the error,
437 // so just output the error and continue 499 // so just output the error and continue
… …
443 } 505 }
444 506
445 return 0; 507 return 0;
446} 508}
447 509
448int 510int ecb_cold
449rxvt_xioerror_handler (Display *display) 511rxvt_xioerror_handler (Display *display)
450{ 512{
451 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 513 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
452 DisplayString (display)); 514 DisplayString (display));
453 rxvt_emergency_cleanup (); 515 rxvt_emergency_cleanup ();
… …
511 tio->c_cc[VWERSE] = CWERASE; 573 tio->c_cc[VWERSE] = CWERASE;
512# endif 574# endif
513# ifdef VLNEXT 575# ifdef VLNEXT
514 tio->c_cc[VLNEXT] = CLNEXT; 576 tio->c_cc[VLNEXT] = CLNEXT;
515# endif 577# endif
578# ifdef VSTATUS
579 tio->c_cc[VSTATUS] = CSTATUS;
580# endif
516 581
517# if VMIN != VEOF 582# if VMIN != VEOF
518 tio->c_cc[VMIN] = 1; 583 tio->c_cc[VMIN] = 1;
519# endif 584# endif
520# if VTIME != VEOL 585# if VTIME != VEOL
… …
554 619
555 // get rid of stdin/stdout as we don't need them, to free resources 620 // get rid of stdin/stdout as we don't need them, to free resources
556 dup2 (STDERR_FILENO, STDIN_FILENO); 621 dup2 (STDERR_FILENO, STDIN_FILENO);
557 dup2 (STDERR_FILENO, STDOUT_FILENO); 622 dup2 (STDERR_FILENO, STDOUT_FILENO);
558 623
559 ptytty::init ();
560
561 if (!ev_default_loop ()) 624 if (!ev_default_loop ())
562 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 625 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
563 626
564 rxvt_environ = environ; 627 rxvt_environ = environ;
565 628
… …
572 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
573 // TODO: handle this with exceptions and tolerate the memory loss 636 // TODO: handle this with exceptions and tolerate the memory loss
574 XSetIOErrorHandler (rxvt_xioerror_handler); 637 XSetIOErrorHandler (rxvt_xioerror_handler);
575 638
576 XrmInitialize (); 639 XrmInitialize ();
640
641#if HAVE_PIXBUF
642 g_type_init ();
643#endif
577} 644}
578 645
579/*----------------------------------------------------------------------*/ 646/*----------------------------------------------------------------------*/
580/* 647/*
581 * window size/position calculations for XSizeHint and other storage. 648 * window size/position calculations for XSizeHint and other storage.
… …
702 if (recalc_y) 769 if (recalc_y)
703 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 770 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
704 771
705 ncol = width / fwidth; 772 ncol = width / fwidth;
706 nrow = height / fheight; 773 nrow = height / fheight;
774
775 // When the size of the vt window is not a multiple of the cell
776 // size, i.e., when the wm does not honour our size hints, there are
777 // extra areas not covered by the terminal screen. Such gaps, when a
778 // bg pixmap is set, would have to be cleared manually to properly
779 // refresh the background. We take the simpler route and shrink the
780 // vt window so as to avoid creating gaps.
781 vt_width = ncol * fwidth;
782 vt_height = nrow * fheight;
707} 783}
708 784
709/*----------------------------------------------------------------------*/ 785/*----------------------------------------------------------------------*/
710/* 786/*
711 * Tell the teletype handler what size the window is. 787 * Tell the teletype handler what size the window is.
… …
719 795
720 struct winsize ws; 796 struct winsize ws;
721 797
722 ws.ws_col = ncol; 798 ws.ws_col = ncol;
723 ws.ws_row = nrow; 799 ws.ws_row = nrow;
724 ws.ws_xpixel = width; 800 ws.ws_xpixel = vt_width;
725 ws.ws_ypixel = height; 801 ws.ws_ypixel = vt_height;
726 ioctl (pty->pty, TIOCSWINSZ, &ws); 802 ioctl (pty->pty, TIOCSWINSZ, &ws);
727 803
728#if 0 804#if 0
729 // TIOCSWINSZ is supposed to do this automatically and correctly 805 // TIOCSWINSZ is supposed to do this automatically and correctly
730 if (cmd_pid) /* force through to the command */ 806 if (cmd_pid) /* force through to the command */
731 kill (-cmd_pid, SIGWINCH); 807 kill (-cmd_pid, SIGWINCH);
732#endif 808#endif
733} 809}
734 810
735/*----------------------------------------------------------------------*/ 811/*----------------------------------------------------------------------*/
736/* set_fonts () - load and set the various fonts 812/* load and set the various fonts */
737 *
738 * init = 1 - initialize
739 *
740 * fontname == FONT_UP - switch to bigger font
741 * fontname == FONT_DN - switch to smaller font
742 */
743bool 813bool
744rxvt_term::set_fonts () 814rxvt_term::set_fonts ()
745{ 815{
746 rxvt_fontset *fs = new rxvt_fontset (this); 816 rxvt_fontset *fs = new rxvt_fontset (this);
747 rxvt_fontprop prop; 817 rxvt_fontprop prop;
… …
762 832
763 delete fontset[0]; 833 delete fontset[0];
764 fontset[0] = fs; 834 fontset[0] = fs;
765 835
766 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 836 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
767 prop.height += lineSpace; 837 prop.width = max (prop.width + letterSpace, 1);
768 prop.width += letterSpace;
769 838
770 fs->set_prop (prop, false); 839 fs->set_prop (prop, false);
771 840
772 fwidth = prop.width; 841 fwidth = prop.width;
773 fheight = prop.height; 842 fheight = prop.height + lineSpace;
774 fbase = prop.ascent; 843 fbase = prop.ascent;
775 844
776 for (int style = 1; style < 4; style++) 845 for (int style = 1; style < 4; style++)
777 { 846 {
778#if ENABLE_STYLES 847#if ENABLE_STYLES
… …
804#else 873#else
805 fontset[style] = fontset[0]; 874 fontset[style] = fontset[0];
806#endif 875#endif
807 } 876 }
808 877
809 if (parent[0]) 878 if (parent)
810 { 879 {
811 resize_all_windows (0, 0, 0); 880 resize_all_windows (0, 0, 0);
812 scr_remap_chars (); 881 scr_remap_chars ();
813 scr_touch (true); 882 scr_touch (true);
814 } 883 }
… …
817} 886}
818 887
819void 888void
820rxvt_term::set_string_property (Atom prop, const char *str, int len) 889rxvt_term::set_string_property (Atom prop, const char *str, int len)
821{ 890{
822 XChangeProperty (dpy, parent[0], 891 XChangeProperty (dpy, parent,
823 prop, XA_STRING, 8, PropModeReplace, 892 prop, XA_STRING, 8, PropModeReplace,
824 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 893 (const unsigned char *)str, len >= 0 ? len : strlen (str));
825} 894}
826 895
827void 896void
… …
829{ 898{
830 XTextProperty ct; 899 XTextProperty ct;
831 900
832 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 901 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
833 { 902 {
834 XSetTextProperty (dpy, parent[0], &ct, prop); 903 XSetTextProperty (dpy, parent, &ct, prop);
835 XFree (ct.value); 904 XFree (ct.value);
836 } 905 }
837} 906}
838 907
839void 908void
840rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 909rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
841{ 910{
842 wchar_t *ws = rxvt_mbstowcs (str, len); 911 wchar_t *ws = rxvt_mbstowcs (str, len);
843 char *s = rxvt_wcstoutf8 (ws); 912 char *s = rxvt_wcstoutf8 (ws);
844 913
845 XChangeProperty (dpy, parent[0], 914 XChangeProperty (dpy, parent,
846 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 915 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
847 (const unsigned char *)s, strlen (s)); 916 (const unsigned char *)s, strlen (s));
848 917
849 free (s); 918 free (s);
850 free (ws); 919 free (ws);
… …
940 1009
941/*----------------------------------------------------------------------*/ 1010/*----------------------------------------------------------------------*/
942/* 1011/*
943 * find if fg/bg matches any of the normal (low-intensity) colors 1012 * find if fg/bg matches any of the normal (low-intensity) colors
944 */ 1013 */
945void 1014char *
946rxvt_term::set_colorfgbg () 1015rxvt_term::get_colorfgbg ()
947{ 1016{
948 unsigned int i; 1017 unsigned int i;
949 const char *xpmb = ""; 1018 const char *xpmb = "";
950 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1019 char fstr[] = "default";
1020 char bstr[] = "default";
1021 char *env_colorfgbg;
951 1022
952 strcpy (fstr, "default");
953 strcpy (bstr, "default");
954 for (i = Color_Black; i <= Color_White; i++) 1023 for (i = Color_Black; i <= Color_White; i++)
955 if (pix_colors[Color_fg] == pix_colors[i]) 1024 if (pix_colors[Color_fg] == pix_colors[i])
956 { 1025 {
957 sprintf (fstr, "%d", (i - Color_Black)); 1026 sprintf (fstr, "%d", i - Color_Black);
958 break; 1027 break;
959 } 1028 }
960 1029
961 for (i = Color_Black; i <= Color_White; i++) 1030 for (i = Color_Black; i <= Color_White; i++)
962 if (pix_colors[Color_bg] == pix_colors[i]) 1031 if (pix_colors[Color_bg] == pix_colors[i])
963 { 1032 {
964 sprintf (bstr, "%d", (i - Color_Black)); 1033 sprintf (bstr, "%d", i - Color_Black);
965#ifdef BG_IMAGE_FROM_FILE 1034#if BG_IMAGE_FROM_FILE
966 xpmb = "default;"; 1035 xpmb = "default;";
967#endif 1036#endif
968 break; 1037 break;
969 } 1038 }
970 1039
1040 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
971 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1041 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1042 return env_colorfgbg;
972} 1043}
973 1044
974/*----------------------------------------------------------------------*/ 1045/*----------------------------------------------------------------------*/
975 1046
976bool 1047bool
… …
984} 1055}
985 1056
986void 1057void
987rxvt_term::alias_color (int dst, int src) 1058rxvt_term::alias_color (int dst, int src)
988{ 1059{
1060 pix_colors[dst].free (this);
989 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); 1061 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
990} 1062}
991 1063
992/* -------------------------------------------------------------------- * 1064/* -------------------------------------------------------------------- *
993 * - WINDOW RESIZING - * 1065 * - WINDOW RESIZING - *
… …
1005 1077
1006 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1078 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1007 if (set_hint) 1079 if (set_hint)
1008 { 1080 {
1009 szHint.flags &= ~(PBaseSize | PResizeInc); 1081 szHint.flags &= ~(PBaseSize | PResizeInc);
1010 XSetWMNormalHints (dpy, parent[0], &szHint); 1082 XSetWMNormalHints (dpy, parent, &szHint);
1011 szHint.flags |= PBaseSize | PResizeInc; 1083 szHint.flags |= PBaseSize | PResizeInc;
1012 } 1084 }
1013 1085
1014 if (!ignoreparent) 1086 if (!ignoreparent)
1015 { 1087 {
… …
1021 int x, y, x1, y1; 1093 int x, y, x1, y1;
1022 int dx, dy; 1094 int dx, dy;
1023 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1095 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1024 Window unused_cr; 1096 Window unused_cr;
1025 1097
1026 XTranslateCoordinates (dpy, parent[0], display->root, 1098 XTranslateCoordinates (dpy, parent, display->root,
1027 0, 0, &x, &y, &unused_cr); 1099 0, 0, &x, &y, &unused_cr);
1028 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1100 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1029 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1101 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1030 /* 1102 /*
1031 * if display->root isn't the parent window, a WM will probably have offset 1103 * if display->root isn't the parent window, a WM will probably have offset
1032 * our position for handles and decorations. Counter it 1104 * our position for handles and decorations. Counter it
1033 */ 1105 */
… …
1050 if (y < y1) /* top half */ 1122 if (y < y1) /* top half */
1051 dy = 0; 1123 dy = 0;
1052 else if (y == y1) /* exact center */ 1124 else if (y == y1) /* exact center */
1053 dy /= 2; 1125 dy /= 2;
1054 1126
1055 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1127 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1056 szHint.width, szHint.height); 1128 szHint.width, szHint.height);
1057#else 1129#else
1058 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1130 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1059#endif 1131#endif
1060 } 1132 }
1061 1133
1062 if (set_hint) 1134 if (set_hint)
1063 XSetWMNormalHints (dpy, parent[0], &szHint); 1135 XSetWMNormalHints (dpy, parent, &szHint);
1064 1136
1065 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1137 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1066 1138
1067 if (fix_screen || newwidth != old_width || newheight != old_height) 1139 if (fix_screen || newwidth != old_width || newheight != old_height)
1068 { 1140 {
1069 if (scrollBar.state) 1141 if (scrollBar.state)
1070 scrollBar.resize (); 1142 scrollBar.resize ();
1071 1143
1072 XMoveResizeWindow (dpy, vt, 1144 XMoveResizeWindow (dpy, vt,
1073 window_vt_x, window_vt_y, 1145 window_vt_x, window_vt_y,
1074 width, height); 1146 vt_width, vt_height);
1147
1148 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1075 1149
1076#ifdef HAVE_BG_PIXMAP 1150#ifdef HAVE_BG_PIXMAP
1077 if (bgPixmap.window_size_sensitive ()) 1151 if (bg_window_size_sensitive ())
1078 update_background (); 1152 update_background ();
1079#endif 1153#endif
1080 } 1154 }
1081 1155
1082 if (fix_screen || old_height == 0) 1156 if (fix_screen || old_height == 0)
1083 scr_reset (); 1157 scr_reset ();
1084 1158
1085#ifdef HAVE_BG_PIXMAP
1086// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1087// if (bgPixmap.pixmap)
1088// scr_touch (false);
1089#endif
1090
1091#ifdef USE_XIM 1159#if USE_XIM
1092 IMSetPosition (); 1160 im_set_position ();
1093#endif 1161#endif
1094} 1162}
1095 1163
1096/* 1164/*
1097 * Set the width/height of the vt window in characters. Units are pixels. 1165 * Set the width/height of the vt window in characters. Units are pixels.
… …
1110 newwidth = wattr.width - szHint.base_width; 1178 newwidth = wattr.width - szHint.base_width;
1111 if (newheight == 0) 1179 if (newheight == 0)
1112 newheight = wattr.height - szHint.base_height; 1180 newheight = wattr.height - szHint.base_height;
1113 } 1181 }
1114 1182
1115 if (newwidth != width || newheight != height) 1183 if (newwidth != vt_width || newheight != vt_height)
1116 { 1184 {
1117 newwidth += szHint.base_width; 1185 newwidth += szHint.base_width;
1118 newheight += szHint.base_height; 1186 newheight += szHint.base_height;
1119 resize_all_windows (newwidth, newheight, 0); 1187 resize_all_windows (newwidth, newheight, 0);
1120 } 1188 }
1121} 1189}
1122 1190
1123/* -------------------------------------------------------------------- * 1191/* -------------------------------------------------------------------- *
1124 * - X INPUT METHOD ROUTINES - * 1192 * - X INPUT METHOD ROUTINES - *
1125 * -------------------------------------------------------------------- */ 1193 * -------------------------------------------------------------------- */
1126#ifdef USE_XIM 1194#if USE_XIM
1127 1195
1128void 1196void
1129rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1197rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1130{ 1198{
1131 fg = pix_colors [Color_fg]; 1199 fg = pix_colors [Color_fg];
… …
1158 status_rect.height = fheight; 1226 status_rect.height = fheight;
1159} 1227}
1160 1228
1161/* Checking whether input method is running. */ 1229/* Checking whether input method is running. */
1162bool 1230bool
1163rxvt_term::IMisRunning () 1231rxvt_term::im_is_running ()
1164{ 1232{
1165 Atom atom; 1233 Atom atom;
1166 Window win; 1234 Window win;
1167 char server[IMBUFSIZ]; 1235 char server[IMBUFSIZ];
1168 1236
… …
1177 1245
1178 atom = XInternAtom (dpy, server, False); 1246 atom = XInternAtom (dpy, server, False);
1179 win = XGetSelectionOwner (dpy, atom); 1247 win = XGetSelectionOwner (dpy, atom);
1180 1248
1181 if (win != None) 1249 if (win != None)
1182 return True; 1250 return true;
1183 } 1251 }
1184 1252
1185 return False; 1253 return false;
1186} 1254}
1187 1255
1188void 1256void
1189rxvt_term::IMSendSpot () 1257rxvt_term::im_send_spot ()
1190{ 1258{
1191 XPoint nspot; 1259 XPoint nspot;
1192 XVaNestedList preedit_attr; 1260 XVaNestedList preedit_attr;
1193 1261
1194 if (!Input_Context 1262 if (!Input_Context
… …
1300/* 1368/*
1301 * Try to open a XIM with the current modifiers, then see if we can 1369 * Try to open a XIM with the current modifiers, then see if we can
1302 * open a suitable preedit type 1370 * open a suitable preedit type
1303 */ 1371 */
1304bool 1372bool
1305rxvt_term::IM_get_IC (const char *modifiers) 1373rxvt_term::im_get_ic (const char *modifiers)
1306{ 1374{
1307 int i, j, found; 1375 int i, j, found;
1308 XIM xim; 1376 XIM xim;
1309 XPoint spot; 1377 XPoint spot;
1310 XRectangle rect, status_rect, needed_rect; 1378 XRectangle rect, status_rect, needed_rect;
1311 unsigned long fg, bg; 1379 unsigned long fg, bg;
1312 const char *p; 1380 const char *p;
1313 char **s; 1381 char **s;
1314 XIMStyles *xim_styles; 1382 XIMStyles *xim_styles;
1315#ifdef ENABLE_XIM_ONTHESPOT
1316 XIMCallback xcb[4];
1317#endif
1318 1383
1319 set_environ (envv); 1384 set_environ (env);
1320 1385
1321 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1386 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1322 return false; 1387 return false;
1323 1388
1324 input_method = display->get_xim (locale, modifiers); 1389 input_method = display->get_xim (locale, modifiers);
1325 if (input_method == NULL) 1390 if (input_method == NULL)
1326 return false; 1391 return false;
… …
1343 p = pet[pi]; 1408 p = pet[pi];
1344 1409
1345 if (!p) 1410 if (!p)
1346 continue; 1411 continue;
1347 1412
1348 s = rxvt_splitcommastring (p); 1413 s = rxvt_strsplit (',', p);
1349 1414
1350 for (i = found = 0; !found && s[i]; i++) 1415 for (i = found = 0; !found && s[i]; i++)
1351 { 1416 {
1352 if (!strcmp (s[i], "OverTheSpot")) 1417 if (!strcmp (s[i], "OverTheSpot"))
1353 input_style = XIMPreeditPosition | XIMStatusNothing; 1418 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1365 input_style = XIMPreeditNothing | XIMStatusNothing; 1430 input_style = XIMPreeditNothing | XIMStatusNothing;
1366 1431
1367 for (j = 0; j < xim_styles->count_styles; j++) 1432 for (j = 0; j < xim_styles->count_styles; j++)
1368 if (input_style == xim_styles->supported_styles[j]) 1433 if (input_style == xim_styles->supported_styles[j])
1369 { 1434 {
1370 rxvt_freecommastring (s); 1435 rxvt_free_strsplit (s);
1371 1436
1372 found = 1; 1437 found = 1;
1373 goto foundpet; 1438 goto foundpet;
1374 } 1439 }
1375 1440
1376 } 1441 }
1377 1442
1378 rxvt_freecommastring (s); 1443 rxvt_free_strsplit (s);
1379 } 1444 }
1380 1445
1381foundpet: 1446foundpet:
1382 1447
1383 XFree (xim_styles); 1448 XFree (xim_styles);
… …
1462 NULL); 1527 NULL);
1463 } 1528 }
1464#if ENABLE_XIM_ONTHESPOT 1529#if ENABLE_XIM_ONTHESPOT
1465 else if (input_style & XIMPreeditCallbacks) 1530 else if (input_style & XIMPreeditCallbacks)
1466 { 1531 {
1532 XIMCallback xcb[4];
1533
1467 im_set_position (spot); 1534 im_set_position (spot);
1468 1535
1469 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1536 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1470 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1537 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1471 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1538 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1486#endif 1553#endif
1487 1554
1488 Input_Context = XCreateIC (xim, 1555 Input_Context = XCreateIC (xim,
1489 XNInputStyle, input_style, 1556 XNInputStyle, input_style,
1490 XNClientWindow, vt, 1557 XNClientWindow, vt,
1491 XNFocusWindow, parent[0], 1558 XNFocusWindow, parent,
1492 preedit_attr ? XNPreeditAttributes : NULL, 1559 preedit_attr ? XNPreeditAttributes : NULL,
1493 preedit_attr, 1560 preedit_attr,
1494 status_attr ? XNStatusAttributes : NULL, 1561 status_attr ? XNStatusAttributes : NULL,
1495 status_attr, NULL); 1562 status_attr, NULL);
1496 1563
… …
1509 // unfortunately, only the focus window is used by XIM, hard to fix 1576 // unfortunately, only the focus window is used by XIM, hard to fix
1510 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1577 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1511 vt_select_input (); 1578 vt_select_input ();
1512#endif 1579#endif
1513 1580
1514 IMSetPosition (); 1581 im_set_position ();
1515 1582
1516 return true; 1583 return true;
1517} 1584}
1518 1585
1519void 1586void
… …
1529 im_destroy (); 1596 im_destroy ();
1530 1597
1531 if (Input_Context) 1598 if (Input_Context)
1532 return; 1599 return;
1533 1600
1534#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1535 if (rs[Rs_imLocale]) 1601 if (rs[Rs_imLocale])
1536 SET_LOCALE (rs[Rs_imLocale]); 1602 SET_LOCALE (rs[Rs_imLocale]);
1537#endif
1538 1603
1539 p = rs[Rs_inputMethod]; 1604 p = rs[Rs_inputMethod];
1540 if (p && *p) 1605 if (p && *p)
1541 { 1606 {
1542 bool found = false; 1607 bool found = false;
1543 1608
1544 s = rxvt_splitcommastring (p); 1609 s = rxvt_strsplit (',', p);
1545 1610
1546 for (i = 0; s[i]; i++) 1611 for (i = 0; s[i]; i++)
1547 { 1612 {
1548 if (*s[i]) 1613 if (*s[i])
1549 { 1614 {
1550 strcpy (buf, "@im="); 1615 strcpy (buf, "@im=");
1551 strncat (buf, s[i], IMBUFSIZ - 5); 1616 strncat (buf, s[i], IMBUFSIZ - 5);
1552 if (IM_get_IC (buf)) 1617 if (im_get_ic (buf))
1553 { 1618 {
1554 found = true; 1619 found = true;
1555 break; 1620 break;
1556 } 1621 }
1557 } 1622 }
1558 } 1623 }
1559 1624
1560 rxvt_freecommastring (s); 1625 rxvt_free_strsplit (s);
1561 1626
1562 if (found) 1627 if (found)
1563 goto done; 1628 goto done;
1564 } 1629 }
1565 1630
1566 /* try with XMODIFIERS env. var. */ 1631 /* try with XMODIFIERS env. var. */
1567 if (IM_get_IC ("")) 1632 if (im_get_ic (""))
1568 goto done; 1633 goto done;
1569 1634
1570 /* try with no modifiers base IF the user didn't specify an IM */ 1635 /* try with no modifiers base IF the user didn't specify an IM */
1571 if (IM_get_IC ("@im=none")) 1636 if (im_get_ic ("@im=none"))
1572 goto done; 1637 goto done;
1573 1638
1574done: 1639done:
1575#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1576 if (rs[Rs_imLocale]) 1640 if (rs[Rs_imLocale])
1577 SET_LOCALE (locale); 1641 SET_LOCALE (locale);
1578#endif
1579} 1642}
1580 1643
1581void 1644void
1582rxvt_term::IMSetPosition () 1645rxvt_term::im_set_position ()
1583{ 1646{
1584 XRectangle preedit_rect, status_rect, *needed_rect; 1647 XRectangle preedit_rect, status_rect, *needed_rect;
1585 XVaNestedList preedit_attr, status_attr; 1648 XVaNestedList preedit_attr, status_attr;
1586 1649
1587 if (!Input_Context 1650 if (!Input_Context
1588 || !focus 1651 || !focus
1589 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1652 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1590 || !IMisRunning ()) 1653 || !im_is_running ())
1591 return; 1654 return;
1592 1655
1593 if (input_style & XIMPreeditPosition) 1656 if (input_style & XIMPreeditPosition)
1594 { 1657 {
1595 im_set_size (preedit_rect); 1658 im_set_size (preedit_rect);
… …
1625 1688
1626void 1689void
1627rxvt_term::get_window_origin (int &x, int &y) 1690rxvt_term::get_window_origin (int &x, int &y)
1628{ 1691{
1629 Window cr; 1692 Window cr;
1630 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1693 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1631/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1632}
1633
1634Pixmap
1635rxvt_term::get_pixmap_property (int prop_id)
1636{
1637 if (prop_id > 0 && prop_id < NUM_XA)
1638 if (xa[prop_id])
1639 {
1640 int aformat;
1641 unsigned long nitems, bytes_after;
1642 Atom atype;
1643 unsigned char *prop = NULL;
1644 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1645 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1646 &nitems, &bytes_after, &prop);
1647 if (result == Success && prop && atype == XA_PIXMAP)
1648 return *(Pixmap *)prop;
1649 }
1650
1651 return None;
1652} 1694}
1653 1695
1654#ifdef HAVE_BG_PIXMAP 1696#ifdef HAVE_BG_PIXMAP
1655# if TRACE_PIXMAPS
1656# undef update_background
1657void
1658rxvt_term::trace_update_background (const char *file, int line)
1659{
1660 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1661 update_background ();
1662}
1663# endif
1664 1697
1665void 1698void
1666rxvt_term::update_background () 1699rxvt_term::update_background ()
1667{ 1700{
1668 if (update_background_ev.is_active ()) 1701 if (update_background_ev.is_active ())
1669 return; 1702 return;
1670 1703
1671 bgPixmap.invalidate ();
1672
1673 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1704 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1674 1705
1675 if (to_wait <= 0.) 1706 if (to_wait <= 0.)
1676 bgPixmap.render (); 1707 bg_render ();
1677 else 1708 else
1678 update_background_ev.start (to_wait); 1709 update_background_ev.start (to_wait);
1679} 1710}
1680 1711
1681void 1712void
1682rxvt_term::update_background_cb (ev::timer &w, int revents) 1713rxvt_term::update_background_cb (ev::timer &w, int revents)
1683{ 1714{
1684 make_current (); 1715 make_current ();
1685 1716
1686 update_background_ev.stop (); 1717 update_background_ev.stop ();
1687 bgPixmap.render (); 1718 bg_render ();
1688 refresh_check (); 1719 refresh_check ();
1689} 1720}
1690 1721
1691#endif /* HAVE_BG_PIXMAP */ 1722#endif /* HAVE_BG_PIXMAP */
1692 1723

Diff Legend

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