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.337 by root, Tue Dec 7 19:10:00 2010 UTC vs.
Revision 1.399 by sf-exg, Tue Oct 13 08:10:43 2015 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 * 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
… …
96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
97{ 96{
98 compose_char *cc; 97 compose_char *cc;
99 98
100 // break compose chains, as stupid readline really likes to duplicate 99 // break compose chains, as stupid readline really likes to duplicate
101 // composing characters for some reason near the end of a line. 100 // composing characters for some reason, near the end of a line.
102 cc = (*this)[c1]; 101 cc = (*this)[c1];
103 while (cc) 102 while (cc)
104 { 103 {
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 {
112 if (cc->c1 == c1 && cc->c2 == c2) 110 if (cc->c1 == c1 && cc->c2 == c2)
113 return COMPOSE_LO + (cc - v.begin ()); 111 return COMPOSE_LO + (cc - v.begin ());
114 }
115 112
116 // allocate a new combination 113 // allocate a new combination
117 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
118 { 115 {
119 static int seen; 116 static int seen;
120 117
121 if (!seen++) 118 if (!seen++)
122 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 119 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
123 120
124 return REPLACEMENT_CHAR; 121 return REPLACEMENT_CHAR;
125 } 122 }
126 123
127 v.push_back (compose_char (c1, c2)); 124 v.push_back (compose_char (c1, c2));
… …
172 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);
173#endif 170#endif
174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175 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);
176#endif 173#endif
177#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
178 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
179#endif 176#endif
180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
181#ifdef USE_XIM 178#if USE_XIM
182 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
183#endif 180#endif
184#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
185 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
186#endif 183#endif
… …
189#endif 186#endif
190 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 190 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); 191 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 193
198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 194 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
199 195
… …
228 delete fontset[i]; 224 delete fontset[i];
229#endif 225#endif
230 delete fontset[0]; 226 delete fontset[0];
231 227
232#ifdef HAVE_BG_PIXMAP 228#ifdef HAVE_BG_PIXMAP
233 bgPixmap.destroy (); 229 bg_destroy ();
234#endif 230#endif
235#ifdef HAVE_AFTERIMAGE 231
236 if (asv) 232#if HAVE_IMG
237 destroy_asvisual (asv, 0); 233 delete bg_img;
238 if (asimman)
239 destroy_image_manager (asimman, 0);
240#endif 234#endif
241 235
242 if (display) 236 if (display)
243 { 237 {
244 selection_clear (); 238 selection_clear ();
245 selection_clear (true); 239 selection_clear (true);
246 240
247#ifdef USE_XIM 241#if USE_XIM
248 im_destroy (); 242 im_destroy ();
249#endif 243#endif
250 scrollBar.destroy (); 244 scrollBar.destroy ();
245
246 if (gc)
251 if (gc) XFreeGC (dpy, gc); 247 XFreeGC (dpy, gc);
252 248
253 delete drawable; 249 delete drawable;
250
254 // destroy all windows 251 // destroy all windows
255 if (parent[0]) 252 if (parent)
256 XDestroyWindow (dpy, parent[0]); 253 XDestroyWindow (dpy, parent);
257 254
258 for (int i = 0; i < TOTAL_COLORS; i++) 255 for (int i = 0; i < TOTAL_COLORS; i++)
259 if (ISSET_PIXCOLOR (i)) 256 if (ISSET_PIXCOLOR (i))
260 { 257 {
261 pix_colors_focused [i].free (this); 258 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 259#if OFF_FOCUS_FADING
260 if (rs[Rs_fade])
263 pix_colors_unfocused [i].free (this); 261 pix_colors_unfocused [i].free (this);
264#endif 262#endif
265 } 263 }
266 264
267 clear (); 265 clear ();
268 266
… …
276 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
277 free (allocated [i]); 275 free (allocated [i]);
278 276
279 free (selection.text); 277 free (selection.text);
280 free (selection.clip_text); 278 free (selection.clip_text);
281 // TODO: manage env vars in child only(!)
282 free (env_display);
283 free (env_term);
284 free (locale); 279 free (locale);
285 free (v_buffer); 280 free (v_buffer);
286 free (incr_buf); 281
282 delete selection_req;
283
284 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
285 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
286
287 delete [] env;
287 288
288 delete envv; 289 delete envv;
289 delete argv; 290 delete argv;
290 291
291#ifdef KEYSYM_RESOURCE 292#ifdef KEYSYM_RESOURCE
292 delete keyboard; 293 delete keyboard;
293#endif 294#endif
294#ifndef NO_RESOURCES 295#ifndef NO_RESOURCES
295 XrmDestroyDatabase (option_db); 296 XrmDestroyDatabase (option_db);
296#endif 297#endif
298
299 SET_R ((rxvt_term *)0);
297} 300}
298 301
299// child has exited, usually destroys 302// child has exited, usually destroys
300void 303void
301rxvt_term::child_cb (ev::child &w, int status) 304rxvt_term::child_cb (ev::child &w, int status)
… …
324 { 327 {
325#if USE_XIM 328#if USE_XIM
326 im_ev.stop (display); 329 im_ev.stop (display);
327#endif 330#endif
328 scrollbar_ev.stop (display); 331 scrollbar_ev.stop (display);
329#if ENABLE_TRANSPARENCY || ENABLE_PERL 332#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
330 rootwin_ev.stop (display); 333 rootwin_ev.stop (display);
331#endif 334#endif
332 incr_ev.stop ();
333 termwin_ev.stop (display); 335 termwin_ev.stop (display);
334 vt_ev.stop (display); 336 vt_ev.stop (display);
335 } 337 }
336 338
337 flush_ev.stop (); 339 flush_ev.stop ();
… …
362 364
363 delete this; 365 delete this;
364} 366}
365 367
366void 368void
367rxvt_term::set_option (uint8_t opt, bool set) 369rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
368{ 370{
369 if (!opt) 371 if (!opt)
370 return; 372 return;
371 373
372 uint8_t mask = 1 << (opt & 7); 374 uint8_t mask = 1 << (opt & 7);
373 uint8_t &val = options [opt >> 3]; 375 uint8_t &val = options [opt >> 3];
374 376
375 val = val & ~mask | (set ? 0 : mask); 377 val = val & ~mask | (set ? mask : 0);
376} 378}
377 379
378/*----------------------------------------------------------------------*/ 380/*----------------------------------------------------------------------*/
379/* 381/*
380 * Exit gracefully, clearing the utmp entry and restoring tty attributes 382 * Exit gracefully, clearing the utmp entry and restoring tty attributes
381 * TODO: if debugging, this should free up any known resources if we can
382 */ 383 */
383static XErrorHandler old_xerror_handler; 384static XErrorHandler old_xerror_handler;
384 385
385static void 386static void
386rxvt_emergency_cleanup () 387rxvt_emergency_cleanup ()
… …
388 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 389 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
389 (*t)->emergency_cleanup (); 390 (*t)->emergency_cleanup ();
390} 391}
391 392
392#if !ENABLE_MINIMAL 393#if !ENABLE_MINIMAL
393static void 394static void ecb_cold
394print_x_error (Display *dpy, XErrorEvent *event) 395print_x_error (Display *dpy, XErrorEvent *event)
395{ 396{
396 char buffer[BUFSIZ]; 397 char buffer[BUFSIZ];
397 char mesg[BUFSIZ]; 398 char mesg[BUFSIZ];
398 char number[32]; 399 char number[32];
399 char *mtype = "XlibMessage"; 400
400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
402 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 401 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
402
403 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
404 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
405
406 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
407 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
403 rxvt_warn ("%s: %s\n", mesg, buffer); 408 rxvt_warn ("+ %s: %s\n", mesg, buffer);
409
404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 410 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
405 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 411 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
412
413 if (event->request_code >= 128)
414 {
415#if 0
416 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
417 int nexts;
418 char **exts = XListExtensions (dpy, &nexts);
419
420 while (nexts)
421 {
422 char *extname = exts [nexts - 1];
423 int major, first_event, first_error;
424
425 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
426 {
427 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
428 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
429
430 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
431 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
432 rxvt_warn ("+ (which is %s)\n", buffer);
433
434 break;
435 }
436
437 printf ("nextss %d %s\n", nexts, extname);//D
438 --nexts;
439 ++exts;
440 }
441#else
442 int nexts = 0;
443 char **exts = 0;
444#endif
445
446 if (!nexts)
447 {
448 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
449
450 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
451 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
452
453#if 0
454 sprintf (number, "RENDER.%d", event->minor_code);
455 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
456 rxvt_warn ("+ (which is %s)\n", buffer);
457#endif
458 }
459
460 XFreeExtensionList (exts);
461 }
462 else
463 {
406 sprintf(number, "%d", event->request_code); 464 sprintf (number, "%d", event->request_code);
407 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 465 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
408 rxvt_warn ("(which is %s)\n", buffer); 466 rxvt_warn ("+ (which is %s)\n", buffer);
409 if (event->request_code >= 128) {
410 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
411 mesg, BUFSIZ);
412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
413 } 467 }
468
414 if ((event->error_code == BadWindow) || 469 if (event->error_code == BadWindow
415 (event->error_code == BadPixmap) || 470 || event->error_code == BadPixmap
416 (event->error_code == BadCursor) || 471 || event->error_code == BadCursor
417 (event->error_code == BadFont) || 472 || event->error_code == BadFont
418 (event->error_code == BadDrawable) || 473 || event->error_code == BadDrawable
419 (event->error_code == BadColor) || 474 || event->error_code == BadColor
420 (event->error_code == BadGC) || 475 || event->error_code == BadGC
421 (event->error_code == BadIDChoice) || 476 || event->error_code == BadIDChoice
422 (event->error_code == BadValue) || 477 || event->error_code == BadValue
423 (event->error_code == BadAtom)) { 478 || event->error_code == BadAtom)
479 {
424 if (event->error_code == BadValue) 480 if (event->error_code == BadValue)
425 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
426 mesg, BUFSIZ);
427 else if (event->error_code == BadAtom) 482 else if (event->error_code == BadAtom)
428 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 483 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
429 mesg, BUFSIZ);
430 else 484 else
431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 485 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
432 mesg, BUFSIZ);
433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
434 }
435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
436 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
438}
439#endif
440 486
441int 487 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
488 }
489}
490#endif
491
492int ecb_cold
442rxvt_xerror_handler (Display *display, XErrorEvent *event) 493rxvt_xerror_handler (Display *display, XErrorEvent *event)
443{ 494{
444 if (GET_R->allowedxerror == -1) 495 if (GET_R && GET_R->allowedxerror == -1)
445 GET_R->allowedxerror = event->error_code; 496 GET_R->allowedxerror = event->error_code;
446 else 497 else
447 { 498 {
448 // GET_R is most likely not the terminal which caused the error, 499 // GET_R is most likely not the terminal which caused the error,
449 // so just output the error and continue 500 // so just output the error and continue
… …
455 } 506 }
456 507
457 return 0; 508 return 0;
458} 509}
459 510
460int 511int ecb_cold
461rxvt_xioerror_handler (Display *display) 512rxvt_xioerror_handler (Display *display)
462{ 513{
463 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 514 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
464 DisplayString (display)); 515 DisplayString (display));
465 rxvt_emergency_cleanup (); 516 rxvt_emergency_cleanup ();
… …
585 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
586 // TODO: handle this with exceptions and tolerate the memory loss 637 // TODO: handle this with exceptions and tolerate the memory loss
587 XSetIOErrorHandler (rxvt_xioerror_handler); 638 XSetIOErrorHandler (rxvt_xioerror_handler);
588 639
589 XrmInitialize (); 640 XrmInitialize ();
641
642#if HAVE_PIXBUF
643 g_type_init ();
644#endif
590} 645}
591 646
592/*----------------------------------------------------------------------*/ 647/*----------------------------------------------------------------------*/
593/* 648/*
594 * window size/position calculations for XSizeHint and other storage. 649 * window size/position calculations for XSizeHint and other storage.
… …
715 if (recalc_y) 770 if (recalc_y)
716 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 771 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
717 772
718 ncol = width / fwidth; 773 ncol = width / fwidth;
719 nrow = height / fheight; 774 nrow = height / fheight;
775
776 // When the size of the vt window is not a multiple of the cell
777 // size, i.e., when the wm does not honour our size hints, there are
778 // extra areas not covered by the terminal screen. Such gaps, when a
779 // bg pixmap is set, would have to be cleared manually to properly
780 // refresh the background. We take the simpler route and shrink the
781 // vt window so as to avoid creating gaps.
782 vt_width = ncol * fwidth;
783 vt_height = nrow * fheight;
720} 784}
721 785
722/*----------------------------------------------------------------------*/ 786/*----------------------------------------------------------------------*/
723/* 787/*
724 * Tell the teletype handler what size the window is. 788 * Tell the teletype handler what size the window is.
… …
732 796
733 struct winsize ws; 797 struct winsize ws;
734 798
735 ws.ws_col = ncol; 799 ws.ws_col = ncol;
736 ws.ws_row = nrow; 800 ws.ws_row = nrow;
737 ws.ws_xpixel = width; 801 ws.ws_xpixel = vt_width;
738 ws.ws_ypixel = height; 802 ws.ws_ypixel = vt_height;
739 ioctl (pty->pty, TIOCSWINSZ, &ws); 803 ioctl (pty->pty, TIOCSWINSZ, &ws);
740 804
741#if 0 805#if 0
742 // TIOCSWINSZ is supposed to do this automatically and correctly 806 // TIOCSWINSZ is supposed to do this automatically and correctly
743 if (cmd_pid) /* force through to the command */ 807 if (cmd_pid) /* force through to the command */
744 kill (-cmd_pid, SIGWINCH); 808 kill (-cmd_pid, SIGWINCH);
745#endif 809#endif
746} 810}
747 811
748/*----------------------------------------------------------------------*/ 812/*----------------------------------------------------------------------*/
749/* set_fonts () - load and set the various fonts 813/* load and set the various fonts */
750 *
751 * init = 1 - initialize
752 *
753 * fontname == FONT_UP - switch to bigger font
754 * fontname == FONT_DN - switch to smaller font
755 */
756bool 814bool
757rxvt_term::set_fonts () 815rxvt_term::set_fonts ()
758{ 816{
759 rxvt_fontset *fs = new rxvt_fontset (this); 817 rxvt_fontset *fs = new rxvt_fontset (this);
760 rxvt_fontprop prop; 818 rxvt_fontprop prop;
… …
775 833
776 delete fontset[0]; 834 delete fontset[0];
777 fontset[0] = fs; 835 fontset[0] = fs;
778 836
779 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 837 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
780 prop.height += lineSpace; 838 prop.width = max (prop.width + letterSpace, 1);
781 prop.width += letterSpace;
782 839
783 fs->set_prop (prop, false); 840 fs->set_prop (prop, false);
784 841
785 fwidth = prop.width; 842 fwidth = prop.width;
786 fheight = prop.height; 843 fheight = prop.height + lineSpace;
787 fbase = prop.ascent; 844 fbase = prop.ascent;
788 845
789 for (int style = 1; style < 4; style++) 846 for (int style = 1; style < 4; style++)
790 { 847 {
791#if ENABLE_STYLES 848#if ENABLE_STYLES
… …
817#else 874#else
818 fontset[style] = fontset[0]; 875 fontset[style] = fontset[0];
819#endif 876#endif
820 } 877 }
821 878
822 if (parent[0]) 879 if (parent)
823 { 880 {
824 resize_all_windows (0, 0, 0); 881 resize_all_windows (0, 0, 0);
825 scr_remap_chars (); 882 scr_remap_chars ();
826 scr_touch (true); 883 scr_touch (true);
827 } 884 }
… …
830} 887}
831 888
832void 889void
833rxvt_term::set_string_property (Atom prop, const char *str, int len) 890rxvt_term::set_string_property (Atom prop, const char *str, int len)
834{ 891{
835 XChangeProperty (dpy, parent[0], 892 XChangeProperty (dpy, parent,
836 prop, XA_STRING, 8, PropModeReplace, 893 prop, XA_STRING, 8, PropModeReplace,
837 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 894 (const unsigned char *)str, len >= 0 ? len : strlen (str));
838} 895}
839 896
840void 897void
… …
842{ 899{
843 XTextProperty ct; 900 XTextProperty ct;
844 901
845 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 902 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
846 { 903 {
847 XSetTextProperty (dpy, parent[0], &ct, prop); 904 XSetTextProperty (dpy, parent, &ct, prop);
848 XFree (ct.value); 905 XFree (ct.value);
849 } 906 }
850} 907}
851 908
852void 909void
853rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 910rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
854{ 911{
855 wchar_t *ws = rxvt_mbstowcs (str, len); 912 wchar_t *ws = rxvt_mbstowcs (str, len);
856 char *s = rxvt_wcstoutf8 (ws); 913 char *s = rxvt_wcstoutf8 (ws);
857 914
858 XChangeProperty (dpy, parent[0], 915 XChangeProperty (dpy, parent,
859 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 916 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
860 (const unsigned char *)s, strlen (s)); 917 (const unsigned char *)s, strlen (s));
861 918
862 free (s); 919 free (s);
863 free (ws); 920 free (ws);
… …
886 943
887void 944void
888rxvt_term::set_window_color (int idx, const char *color) 945rxvt_term::set_window_color (int idx, const char *color)
889{ 946{
890#ifdef XTERM_COLOR_CHANGE 947#ifdef XTERM_COLOR_CHANGE
891 rxvt_color xcol;
892
893 if (color == NULL || *color == '\0') 948 if (color == NULL || *color == '\0')
894 return; 949 return;
895 950
896 color = strdup (color); 951 color = strdup (color);
897 allocated.push_back ((void *)color); 952 allocated.push_back ((void *)color);
… …
903 int i = atoi (color); 958 int i = atoi (color);
904 959
905 if (i >= 8 && i <= 15) 960 if (i >= 8 && i <= 15)
906 { 961 {
907 /* bright colors */ 962 /* bright colors */
908 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 963 alias_color (idx, minBrightCOLOR + i - 8);
909 goto done; 964 goto done;
910 } 965 }
911 966
912 if (i >= 0 && i <= 7) 967 if (i >= 0 && i <= 7)
913 { 968 {
914 /* normal colors */ 969 /* normal colors */
915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 970 alias_color (idx, minCOLOR + i);
916 goto done; 971 goto done;
917 } 972 }
918 } 973 }
919 974
920 set_color (xcol, color); 975 pix_colors_focused[idx].free (this);
921 976 set_color (pix_colors_focused[idx], color);
922 /*
923 * FIXME: should free colors here, but no idea how to do it so instead,
924 * so just keep gobbling up the colormap
925 */
926
927 pix_colors_focused[idx] = xcol;
928 977
929done: 978done:
930 /*TODO: handle Color_BD, scrollbar background, etc. */ 979 /*TODO: handle Color_BD, scrollbar background, etc. */
931 980
932 update_fade_color (idx); 981 update_fade_color (idx);
933 recolour_cursor (); 982 recolor_cursor ();
934 scr_recolour (); 983 scr_recolor ();
935#endif /* XTERM_COLOR_CHANGE */ 984#endif /* XTERM_COLOR_CHANGE */
936} 985}
937 986
938void 987void
939rxvt_term::recolour_cursor () 988rxvt_term::recolor_cursor ()
940{ 989{
941 XColor fg, bg; 990 XColor fg, bg;
942 991
943 (ISSET_PIXCOLOR (Color_pointer_fg) 992 (ISSET_PIXCOLOR (Color_pointer_fg)
944 ? pix_colors_focused[Color_pointer_fg] 993 ? pix_colors_focused[Color_pointer_fg]
… …
953 1002
954/*----------------------------------------------------------------------*/ 1003/*----------------------------------------------------------------------*/
955/* 1004/*
956 * find if fg/bg matches any of the normal (low-intensity) colors 1005 * find if fg/bg matches any of the normal (low-intensity) colors
957 */ 1006 */
958void 1007char *
959rxvt_term::set_colorfgbg () 1008rxvt_term::get_colorfgbg ()
960{ 1009{
961 unsigned int i; 1010 unsigned int i;
962 const char *xpmb = ""; 1011 const char *xpmb = "";
963 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1012 char fstr[] = "default";
1013 char bstr[] = "default";
1014 char *env_colorfgbg;
964 1015
965 strcpy (fstr, "default");
966 strcpy (bstr, "default");
967 for (i = Color_Black; i <= Color_White; i++) 1016 for (i = Color_Black; i <= Color_White; i++)
968 if (pix_colors[Color_fg] == pix_colors[i]) 1017 if (pix_colors[Color_fg] == pix_colors[i])
969 { 1018 {
970 sprintf (fstr, "%d", (i - Color_Black)); 1019 sprintf (fstr, "%d", i - Color_Black);
971 break; 1020 break;
972 } 1021 }
973 1022
974 for (i = Color_Black; i <= Color_White; i++) 1023 for (i = Color_Black; i <= Color_White; i++)
975 if (pix_colors[Color_bg] == pix_colors[i]) 1024 if (pix_colors[Color_bg] == pix_colors[i])
976 { 1025 {
977 sprintf (bstr, "%d", (i - Color_Black)); 1026 sprintf (bstr, "%d", i - Color_Black);
978#ifdef BG_IMAGE_FROM_FILE 1027#if BG_IMAGE_FROM_FILE
979 xpmb = "default;"; 1028 xpmb = "default;";
980#endif 1029#endif
981 break; 1030 break;
982 } 1031 }
983 1032
1033 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
984 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1034 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1035 return env_colorfgbg;
985} 1036}
986 1037
987/*----------------------------------------------------------------------*/ 1038/*----------------------------------------------------------------------*/
988 1039
989bool 1040bool
… …
997} 1048}
998 1049
999void 1050void
1000rxvt_term::alias_color (int dst, int src) 1051rxvt_term::alias_color (int dst, int src)
1001{ 1052{
1053 pix_colors[dst].free (this);
1002 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); 1054 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1003} 1055}
1004 1056
1005/* -------------------------------------------------------------------- * 1057/* -------------------------------------------------------------------- *
1006 * - WINDOW RESIZING - * 1058 * - WINDOW RESIZING - *
… …
1018 1070
1019 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1071 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1020 if (set_hint) 1072 if (set_hint)
1021 { 1073 {
1022 szHint.flags &= ~(PBaseSize | PResizeInc); 1074 szHint.flags &= ~(PBaseSize | PResizeInc);
1023 XSetWMNormalHints (dpy, parent[0], &szHint); 1075 XSetWMNormalHints (dpy, parent, &szHint);
1024 szHint.flags |= PBaseSize | PResizeInc; 1076 szHint.flags |= PBaseSize | PResizeInc;
1025 } 1077 }
1026 1078
1027 if (!ignoreparent) 1079 if (!ignoreparent)
1028 { 1080 {
… …
1034 int x, y, x1, y1; 1086 int x, y, x1, y1;
1035 int dx, dy; 1087 int dx, dy;
1036 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1088 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1037 Window unused_cr; 1089 Window unused_cr;
1038 1090
1039 XTranslateCoordinates (dpy, parent[0], display->root, 1091 XTranslateCoordinates (dpy, parent, display->root,
1040 0, 0, &x, &y, &unused_cr); 1092 0, 0, &x, &y, &unused_cr);
1041 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1093 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1042 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1094 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1043 /* 1095 /*
1044 * if display->root isn't the parent window, a WM will probably have offset 1096 * if display->root isn't the parent window, a WM will probably have offset
1045 * our position for handles and decorations. Counter it 1097 * our position for handles and decorations. Counter it
1046 */ 1098 */
… …
1063 if (y < y1) /* top half */ 1115 if (y < y1) /* top half */
1064 dy = 0; 1116 dy = 0;
1065 else if (y == y1) /* exact center */ 1117 else if (y == y1) /* exact center */
1066 dy /= 2; 1118 dy /= 2;
1067 1119
1068 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1120 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1069 szHint.width, szHint.height); 1121 szHint.width, szHint.height);
1070#else 1122#else
1071 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1123 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1072#endif 1124#endif
1073 } 1125 }
1074 1126
1075 if (set_hint) 1127 if (set_hint)
1076 XSetWMNormalHints (dpy, parent[0], &szHint); 1128 XSetWMNormalHints (dpy, parent, &szHint);
1077 1129
1078 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1130 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1079 1131
1080 if (fix_screen || newwidth != old_width || newheight != old_height) 1132 if (fix_screen || newwidth != old_width || newheight != old_height)
1081 { 1133 {
1082 if (scrollBar.state) 1134 if (scrollBar.state)
1083 scrollBar.resize (); 1135 scrollBar.resize ();
1084 1136
1085 XMoveResizeWindow (dpy, vt, 1137 XMoveResizeWindow (dpy, vt,
1086 window_vt_x, window_vt_y, 1138 window_vt_x, window_vt_y,
1087 width, height); 1139 vt_width, vt_height);
1140
1141 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1088 1142
1089#ifdef HAVE_BG_PIXMAP 1143#ifdef HAVE_BG_PIXMAP
1090 if (bgPixmap.window_size_sensitive ()) 1144 if (bg_window_size_sensitive ())
1091 update_background (); 1145 update_background ();
1092#endif 1146#endif
1093 } 1147 }
1094 1148
1095 if (fix_screen || old_height == 0) 1149 if (fix_screen || old_height == 0)
1096 scr_reset (); 1150 scr_reset ();
1097 1151
1098#ifdef HAVE_BG_PIXMAP
1099// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1100// if (bgPixmap.pixmap)
1101// scr_touch (false);
1102#endif
1103
1104#ifdef USE_XIM 1152#if USE_XIM
1105 IMSetPosition (); 1153 im_set_position ();
1106#endif 1154#endif
1107} 1155}
1108 1156
1109/* 1157/*
1110 * Set the width/height of the vt window in characters. Units are pixels. 1158 * Set the width/height of the vt window in characters. Units are pixels.
… …
1123 newwidth = wattr.width - szHint.base_width; 1171 newwidth = wattr.width - szHint.base_width;
1124 if (newheight == 0) 1172 if (newheight == 0)
1125 newheight = wattr.height - szHint.base_height; 1173 newheight = wattr.height - szHint.base_height;
1126 } 1174 }
1127 1175
1128 if (newwidth != width || newheight != height) 1176 if (newwidth != vt_width || newheight != vt_height)
1129 { 1177 {
1130 newwidth += szHint.base_width; 1178 newwidth += szHint.base_width;
1131 newheight += szHint.base_height; 1179 newheight += szHint.base_height;
1132 resize_all_windows (newwidth, newheight, 0); 1180 resize_all_windows (newwidth, newheight, 0);
1133 } 1181 }
1134} 1182}
1135 1183
1136/* -------------------------------------------------------------------- * 1184/* -------------------------------------------------------------------- *
1137 * - X INPUT METHOD ROUTINES - * 1185 * - X INPUT METHOD ROUTINES - *
1138 * -------------------------------------------------------------------- */ 1186 * -------------------------------------------------------------------- */
1139#ifdef USE_XIM 1187#if USE_XIM
1140 1188
1141void 1189void
1142rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1190rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1143{ 1191{
1144 fg = pix_colors [Color_fg]; 1192 fg = pix_colors [Color_fg];
… …
1171 status_rect.height = fheight; 1219 status_rect.height = fheight;
1172} 1220}
1173 1221
1174/* Checking whether input method is running. */ 1222/* Checking whether input method is running. */
1175bool 1223bool
1176rxvt_term::IMisRunning () 1224rxvt_term::im_is_running ()
1177{ 1225{
1178 Atom atom; 1226 Atom atom;
1179 Window win; 1227 Window win;
1180 char server[IMBUFSIZ]; 1228 char server[IMBUFSIZ];
1181 1229
… …
1190 1238
1191 atom = XInternAtom (dpy, server, False); 1239 atom = XInternAtom (dpy, server, False);
1192 win = XGetSelectionOwner (dpy, atom); 1240 win = XGetSelectionOwner (dpy, atom);
1193 1241
1194 if (win != None) 1242 if (win != None)
1195 return True; 1243 return true;
1196 } 1244 }
1197 1245
1198 return False; 1246 return false;
1199} 1247}
1200 1248
1201void 1249void
1202rxvt_term::IMSendSpot () 1250rxvt_term::im_send_spot ()
1203{ 1251{
1204 XPoint nspot; 1252 XPoint nspot;
1205 XVaNestedList preedit_attr; 1253 XVaNestedList preedit_attr;
1206 1254
1207 if (!Input_Context 1255 if (!Input_Context
… …
1313/* 1361/*
1314 * Try to open a XIM with the current modifiers, then see if we can 1362 * Try to open a XIM with the current modifiers, then see if we can
1315 * open a suitable preedit type 1363 * open a suitable preedit type
1316 */ 1364 */
1317bool 1365bool
1318rxvt_term::IM_get_IC (const char *modifiers) 1366rxvt_term::im_get_ic (const char *modifiers)
1319{ 1367{
1320 int i, j, found; 1368 int i, j, found;
1321 XIM xim; 1369 XIM xim;
1322 XPoint spot; 1370 XPoint spot;
1323 XRectangle rect, status_rect, needed_rect; 1371 XRectangle rect, status_rect, needed_rect;
1324 unsigned long fg, bg; 1372 unsigned long fg, bg;
1325 const char *p; 1373 const char *p;
1326 char **s; 1374 char **s;
1327 XIMStyles *xim_styles; 1375 XIMStyles *xim_styles;
1328#ifdef ENABLE_XIM_ONTHESPOT
1329 XIMCallback xcb[4];
1330#endif
1331 1376
1332 set_environ (envv); 1377 set_environ (env);
1333 1378
1334 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1379 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1335 return false; 1380 return false;
1336 1381
1337 input_method = display->get_xim (locale, modifiers); 1382 input_method = display->get_xim (locale, modifiers);
1338 if (input_method == NULL) 1383 if (input_method == NULL)
1339 return false; 1384 return false;
… …
1356 p = pet[pi]; 1401 p = pet[pi];
1357 1402
1358 if (!p) 1403 if (!p)
1359 continue; 1404 continue;
1360 1405
1361 s = rxvt_splitcommastring (p); 1406 s = rxvt_strsplit (',', p);
1362 1407
1363 for (i = found = 0; !found && s[i]; i++) 1408 for (i = found = 0; !found && s[i]; i++)
1364 { 1409 {
1365 if (!strcmp (s[i], "OverTheSpot")) 1410 if (!strcmp (s[i], "OverTheSpot"))
1366 input_style = XIMPreeditPosition | XIMStatusNothing; 1411 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1378 input_style = XIMPreeditNothing | XIMStatusNothing; 1423 input_style = XIMPreeditNothing | XIMStatusNothing;
1379 1424
1380 for (j = 0; j < xim_styles->count_styles; j++) 1425 for (j = 0; j < xim_styles->count_styles; j++)
1381 if (input_style == xim_styles->supported_styles[j]) 1426 if (input_style == xim_styles->supported_styles[j])
1382 { 1427 {
1383 rxvt_freecommastring (s); 1428 rxvt_free_strsplit (s);
1384 1429
1385 found = 1; 1430 found = 1;
1386 goto foundpet; 1431 goto foundpet;
1387 } 1432 }
1388 1433
1389 } 1434 }
1390 1435
1391 rxvt_freecommastring (s); 1436 rxvt_free_strsplit (s);
1392 } 1437 }
1393 1438
1394foundpet: 1439foundpet:
1395 1440
1396 XFree (xim_styles); 1441 XFree (xim_styles);
… …
1475 NULL); 1520 NULL);
1476 } 1521 }
1477#if ENABLE_XIM_ONTHESPOT 1522#if ENABLE_XIM_ONTHESPOT
1478 else if (input_style & XIMPreeditCallbacks) 1523 else if (input_style & XIMPreeditCallbacks)
1479 { 1524 {
1525 XIMCallback xcb[4];
1526
1480 im_set_position (spot); 1527 im_set_position (spot);
1481 1528
1482 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1529 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1483 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1530 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1484 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1531 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1499#endif 1546#endif
1500 1547
1501 Input_Context = XCreateIC (xim, 1548 Input_Context = XCreateIC (xim,
1502 XNInputStyle, input_style, 1549 XNInputStyle, input_style,
1503 XNClientWindow, vt, 1550 XNClientWindow, vt,
1504 XNFocusWindow, parent[0], 1551 XNFocusWindow, parent,
1505 preedit_attr ? XNPreeditAttributes : NULL, 1552 preedit_attr ? XNPreeditAttributes : NULL,
1506 preedit_attr, 1553 preedit_attr,
1507 status_attr ? XNStatusAttributes : NULL, 1554 status_attr ? XNStatusAttributes : NULL,
1508 status_attr, NULL); 1555 status_attr, NULL);
1509 1556
… …
1522 // unfortunately, only the focus window is used by XIM, hard to fix 1569 // unfortunately, only the focus window is used by XIM, hard to fix
1523 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1570 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1524 vt_select_input (); 1571 vt_select_input ();
1525#endif 1572#endif
1526 1573
1527 IMSetPosition (); 1574 im_set_position ();
1528 1575
1529 return true; 1576 return true;
1530} 1577}
1531 1578
1532void 1579void
… …
1542 im_destroy (); 1589 im_destroy ();
1543 1590
1544 if (Input_Context) 1591 if (Input_Context)
1545 return; 1592 return;
1546 1593
1547#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1548 if (rs[Rs_imLocale]) 1594 if (rs[Rs_imLocale])
1549 SET_LOCALE (rs[Rs_imLocale]); 1595 SET_LOCALE (rs[Rs_imLocale]);
1550#endif
1551 1596
1552 p = rs[Rs_inputMethod]; 1597 p = rs[Rs_inputMethod];
1553 if (p && *p) 1598 if (p && *p)
1554 { 1599 {
1555 bool found = false; 1600 bool found = false;
1556 1601
1557 s = rxvt_splitcommastring (p); 1602 s = rxvt_strsplit (',', p);
1558 1603
1559 for (i = 0; s[i]; i++) 1604 for (i = 0; s[i]; i++)
1560 { 1605 {
1561 if (*s[i]) 1606 if (*s[i])
1562 { 1607 {
1563 strcpy (buf, "@im="); 1608 strcpy (buf, "@im=");
1564 strncat (buf, s[i], IMBUFSIZ - 5); 1609 strncat (buf, s[i], IMBUFSIZ - 5);
1565 if (IM_get_IC (buf)) 1610 if (im_get_ic (buf))
1566 { 1611 {
1567 found = true; 1612 found = true;
1568 break; 1613 break;
1569 } 1614 }
1570 } 1615 }
1571 } 1616 }
1572 1617
1573 rxvt_freecommastring (s); 1618 rxvt_free_strsplit (s);
1574 1619
1575 if (found) 1620 if (found)
1576 goto done; 1621 goto done;
1577 } 1622 }
1578 1623
1579 /* try with XMODIFIERS env. var. */ 1624 /* try with XMODIFIERS env. var. */
1580 if (IM_get_IC ("")) 1625 if (im_get_ic (""))
1581 goto done; 1626 goto done;
1582 1627
1583 /* try with no modifiers base IF the user didn't specify an IM */ 1628 /* try with no modifiers base IF the user didn't specify an IM */
1584 if (IM_get_IC ("@im=none")) 1629 if (im_get_ic ("@im=none"))
1585 goto done; 1630 goto done;
1586 1631
1587done: 1632done:
1588#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1589 if (rs[Rs_imLocale]) 1633 if (rs[Rs_imLocale])
1590 SET_LOCALE (locale); 1634 SET_LOCALE (locale);
1591#endif
1592} 1635}
1593 1636
1594void 1637void
1595rxvt_term::IMSetPosition () 1638rxvt_term::im_set_position ()
1596{ 1639{
1597 XRectangle preedit_rect, status_rect, *needed_rect; 1640 XRectangle preedit_rect, status_rect, *needed_rect;
1598 XVaNestedList preedit_attr, status_attr; 1641 XVaNestedList preedit_attr, status_attr;
1599 1642
1600 if (!Input_Context 1643 if (!Input_Context
1601 || !focus 1644 || !focus
1602 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1645 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1603 || !IMisRunning ()) 1646 || !im_is_running ())
1604 return; 1647 return;
1605 1648
1606 if (input_style & XIMPreeditPosition) 1649 if (input_style & XIMPreeditPosition)
1607 { 1650 {
1608 im_set_size (preedit_rect); 1651 im_set_size (preedit_rect);
… …
1638 1681
1639void 1682void
1640rxvt_term::get_window_origin (int &x, int &y) 1683rxvt_term::get_window_origin (int &x, int &y)
1641{ 1684{
1642 Window cr; 1685 Window cr;
1643 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1686 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1644}
1645
1646Pixmap
1647rxvt_term::get_pixmap_property (int prop_id)
1648{
1649 if (prop_id > 0 && prop_id < NUM_XA)
1650 if (xa[prop_id])
1651 {
1652 int aformat;
1653 unsigned long nitems, bytes_after;
1654 Atom atype;
1655 unsigned char *prop = NULL;
1656 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1657 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1658 &nitems, &bytes_after, &prop);
1659 if (result == Success && prop && atype == XA_PIXMAP)
1660 return *(Pixmap *)prop;
1661 }
1662
1663 return None;
1664} 1687}
1665 1688
1666#ifdef HAVE_BG_PIXMAP 1689#ifdef HAVE_BG_PIXMAP
1667 1690
1668void 1691void
1669rxvt_term::update_background () 1692rxvt_term::update_background ()
1670{ 1693{
1671 if (update_background_ev.is_active ()) 1694 if (update_background_ev.is_active ())
1672 return; 1695 return;
1673 1696
1674 bgPixmap.invalidate ();
1675
1676 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1697 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1677 1698
1678 if (to_wait <= 0.) 1699 if (to_wait <= 0.)
1679 bgPixmap.render (); 1700 bg_render ();
1680 else 1701 else
1681 update_background_ev.start (to_wait); 1702 update_background_ev.start (to_wait);
1682} 1703}
1683 1704
1684void 1705void
1685rxvt_term::update_background_cb (ev::timer &w, int revents) 1706rxvt_term::update_background_cb (ev::timer &w, int revents)
1686{ 1707{
1687 make_current (); 1708 make_current ();
1688 1709
1689 update_background_ev.stop (); 1710 update_background_ev.stop ();
1690 bgPixmap.render (); 1711 bg_render ();
1691 refresh_check (); 1712 refresh_check ();
1692} 1713}
1693 1714
1694#endif /* HAVE_BG_PIXMAP */ 1715#endif /* HAVE_BG_PIXMAP */
1695 1716

Diff Legend

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