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

Diff Legend

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