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

Diff Legend

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