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.304 by ayin, Wed Feb 6 12:05:35 2008 UTC vs.
Revision 1.376 by root, Mon Jun 4 15:18:52 2012 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-2010 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <assert.h>
40#include <csignal> 42#include <signal.h>
41#include <cstring> 43#include <string.h>
42 44
43#include <termios.h> 45#include <termios.h>
44 46
45#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
46# define X_LOCALE 48# define X_LOCALE
47# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
48#else 50#else
49# ifdef HAVE_SETLOCALE
50# include <clocale> 51# include <locale.h>
51# endif 52#endif
52#endif
53 53
54struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
55 56
56// used to tell global functions which terminal instance is "active" 57// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 58rxvt_t rxvt_current_term;
58 59
… …
93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94{ 95{
95 compose_char *cc; 96 compose_char *cc;
96 97
97 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
98 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
99 cc = (*this)[c1]; 100 cc = (*this)[c1];
100 while (cc) 101 while (cc)
101 { 102 {
102 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
104 } 105 }
105 106
106 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
108 {
109 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
111 }
112 111
113 // allocate a new combination 112 // allocate a new combination
114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115 { 114 {
116 static int seen; 115 static int seen;
117 116
118 if (!seen++) 117 if (!seen++)
119 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120 119
121 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
122 } 121 }
123 122
124 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
173#endif 172#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 175#endif
177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
178#ifdef USE_XIM 177#if USE_XIM
179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
180#endif 179#endif
181#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
183#endif 182#endif
… …
186#endif 185#endif
187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 192
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 194
… …
225 delete fontset[i]; 223 delete fontset[i];
226#endif 224#endif
227 delete fontset[0]; 225 delete fontset[0];
228 226
229#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy (); 228 bg_destroy ();
231#endif 229#endif
232 230
233 if (display) 231 if (display)
234 { 232 {
235 selection_clear (); 233 selection_clear ();
234 selection_clear (true);
236 235
237#ifdef USE_XIM 236#if USE_XIM
238 im_destroy (); 237 im_destroy ();
239#endif 238#endif
240#ifdef XTERM_SCROLLBAR 239 scrollBar.destroy ();
241 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
242 if (ShadowGC) XFreeGC (dpy, ShadowGC);
243#endif
244#ifdef PLAIN_SCROLLBAR
245 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
246#endif
247#ifdef NEXT_SCROLLBAR
248 if (blackGC) XFreeGC (dpy, blackGC);
249 if (whiteGC) XFreeGC (dpy, whiteGC);
250 if (grayGC) XFreeGC (dpy, grayGC);
251 if (darkGC) XFreeGC (dpy, darkGC);
252 if (stippleGC) XFreeGC (dpy, stippleGC);
253 if (dimple) XFreePixmap (dpy, dimple);
254 if (upArrow) XFreePixmap (dpy, upArrow);
255 if (downArrow) XFreePixmap (dpy, downArrow);
256 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
257 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
258#endif
259#ifdef RXVT_SCROLLBAR
260 if (topShadowGC) XFreeGC (dpy, topShadowGC);
261 if (botShadowGC) XFreeGC (dpy, botShadowGC);
262 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
263#endif
264 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
265 241
266 delete drawable; 242 delete drawable;
267 // destroy all windows 243 // destroy all windows
268 if (parent[0]) 244 if (parent)
269 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
270 246
271 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
272 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
273 { 249 {
274 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
288 /* clear all resources */ 264 /* clear all resources */
289 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
290 free (allocated [i]); 266 free (allocated [i]);
291 267
292 free (selection.text); 268 free (selection.text);
293 // TODO: manage env vars in child only(!) 269 free (selection.clip_text);
294 free (env_display);
295 free (env_term);
296 free (locale); 270 free (locale);
297 free (v_buffer); 271 free (v_buffer);
298 free (incr_buf); 272
273 delete selection_req;
299 274
300 delete envv; 275 delete envv;
301 delete argv; 276 delete argv;
302 277
303#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
… …
339#endif 314#endif
340 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
341#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
342 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
343#endif 318#endif
344 incr_ev.stop ();
345 termwin_ev.stop (display); 319 termwin_ev.stop (display);
346 vt_ev.stop (display); 320 vt_ev.stop (display);
347 } 321 }
348 322
349 flush_ev.stop (); 323 flush_ev.stop ();
… …
371rxvt_term::destroy_cb (ev::idle &w, int revents) 345rxvt_term::destroy_cb (ev::idle &w, int revents)
372{ 346{
373 make_current (); 347 make_current ();
374 348
375 delete this; 349 delete this;
350}
351
352void
353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
354{
355 if (!opt)
356 return;
357
358 uint8_t mask = 1 << (opt & 7);
359 uint8_t &val = options [opt >> 3];
360
361 val = val & ~mask | (set ? mask : 0);
376} 362}
377 363
378/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
379/* 365/*
380 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
388 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 374 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
389 (*t)->emergency_cleanup (); 375 (*t)->emergency_cleanup ();
390} 376}
391 377
392#if !ENABLE_MINIMAL 378#if !ENABLE_MINIMAL
393static void 379static void ecb_cold
394print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
395{ 381{
396 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
397 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
398 char number[32]; 384 char number[32];
399 char *mtype = "XlibMessage"; 385 const char mtype[] = "XlibMessage";
400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
402 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 388 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
403 rxvt_warn ("%s: %s\n", mesg, buffer); 389 rxvt_warn ("%s: %s\n", mesg, buffer);
404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
405 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
406 sprintf(number, "%d", event->request_code); 392 sprintf(number, "%d", event->request_code);
407 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
408 rxvt_warn ("(which is %s)\n", buffer); 394 rxvt_warn ("(which is %s)\n", buffer);
409 if (event->request_code >= 128) { 395 if (event->request_code >= 128) {
410 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
411 mesg, BUFSIZ); 397 mesg, BUFSIZ);
412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
413 } 399 }
414 if ((event->error_code == BadWindow) || 400 if ((event->error_code == BadWindow) ||
415 (event->error_code == BadPixmap) || 401 (event->error_code == BadPixmap) ||
416 (event->error_code == BadCursor) || 402 (event->error_code == BadCursor) ||
417 (event->error_code == BadFont) || 403 (event->error_code == BadFont) ||
418 (event->error_code == BadDrawable) || 404 (event->error_code == BadDrawable) ||
419 (event->error_code == BadColor) || 405 (event->error_code == BadColor) ||
420 (event->error_code == BadGC) || 406 (event->error_code == BadGC) ||
421 (event->error_code == BadIDChoice) || 407 (event->error_code == BadIDChoice) ||
422 (event->error_code == BadValue) || 408 (event->error_code == BadValue) ||
423 (event->error_code == BadAtom)) { 409 (event->error_code == BadAtom)) {
424 if (event->error_code == BadValue) 410 if (event->error_code == BadValue)
425 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
426 mesg, BUFSIZ); 412 mesg, BUFSIZ);
427 else if (event->error_code == BadAtom) 413 else if (event->error_code == BadAtom)
428 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
429 mesg, BUFSIZ); 415 mesg, BUFSIZ);
430 else 416 else
431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
432 mesg, BUFSIZ); 418 mesg, BUFSIZ);
433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
434 } 420 }
435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
436 mesg, BUFSIZ); 422 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
438} 424}
439#endif 425#endif
440 426
441int 427int ecb_cold
442rxvt_xerror_handler (Display *display, XErrorEvent *event) 428rxvt_xerror_handler (Display *display, XErrorEvent *event)
443{ 429{
444 if (GET_R->allowedxerror == -1) 430 if (GET_R->allowedxerror == -1)
445 GET_R->allowedxerror = event->error_code; 431 GET_R->allowedxerror = event->error_code;
446 else 432 else
… …
455 } 441 }
456 442
457 return 0; 443 return 0;
458} 444}
459 445
460int 446int ecb_cold
461rxvt_xioerror_handler (Display *display) 447rxvt_xioerror_handler (Display *display)
462{ 448{
463 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 449 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
464 DisplayString (display)); 450 DisplayString (display));
465 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
… …
488 rxvt_emergency_cleanup (); 474 rxvt_emergency_cleanup ();
489 w.stop (); 475 w.stop ();
490 kill (getpid (), w.signum); 476 kill (getpid (), w.signum);
491} 477}
492 478
479static void
480rxvt_get_ttymode (struct termios *tio)
481{
482 if (tcgetattr (STDIN_FILENO, tio) < 0)
483 memset (tio, 0, sizeof (struct termios));
484
485 for (int i = 0; i < NCCS; i++)
486 tio->c_cc[i] = VDISABLE;
487
488 tio->c_cc[VINTR] = CINTR;
489 tio->c_cc[VQUIT] = CQUIT;
490 tio->c_cc[VERASE] = CERASE;
491#ifdef VERASE2
492 tio->c_cc[VERASE2] = CERASE2;
493#endif
494 tio->c_cc[VKILL] = CKILL;
495 tio->c_cc[VEOF] = CEOF;
496 tio->c_cc[VSTART] = CSTART;
497 tio->c_cc[VSTOP] = CSTOP;
498 tio->c_cc[VSUSP] = CSUSP;
499# ifdef VDSUSP
500 tio->c_cc[VDSUSP] = CDSUSP;
501# endif
502# ifdef VREPRINT
503 tio->c_cc[VREPRINT] = CRPRNT;
504# endif
505# ifdef VDISCRD
506 tio->c_cc[VDISCRD] = CFLUSH;
507# endif
508# ifdef VWERSE
509 tio->c_cc[VWERSE] = CWERASE;
510# endif
511# ifdef VLNEXT
512 tio->c_cc[VLNEXT] = CLNEXT;
513# endif
514# ifdef VSTATUS
515 tio->c_cc[VSTATUS] = CSTATUS;
516# endif
517
518# if VMIN != VEOF
519 tio->c_cc[VMIN] = 1;
520# endif
521# if VTIME != VEOL
522 tio->c_cc[VTIME] = 0;
523# endif
524
525 /* input modes */
526 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
527# ifdef IMAXBEL
528 | IMAXBEL
529# endif
530 | IXON);
531
532 /* output modes */
533 tio->c_oflag = (OPOST | ONLCR);
534
535 /* control modes */
536 tio->c_cflag = (CS8 | CREAD);
537
538 /* local modes */
539 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
540# if defined (ECHOCTL) && defined (ECHOKE)
541 | ECHOCTL | ECHOKE
542# endif
543 | ECHOE | ECHOK);
544}
545
493char **rxvt_environ; // startup environment 546char **rxvt_environ; // startup environment
494 547
495void 548void
496rxvt_init () 549rxvt_init ()
497{ 550{
498 ptytty::init (); 551 assert (("fontMask must not overlap other RS masks",
552 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
499 553
554 rxvt_get_ttymode (&rxvt_term::def_tio);
555
556 // get rid of stdin/stdout as we don't need them, to free resources
557 dup2 (STDERR_FILENO, STDIN_FILENO);
558 dup2 (STDERR_FILENO, STDOUT_FILENO);
559
500 if (!ev_default_loop (0)) 560 if (!ev_default_loop ())
501 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 561 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
502 562
503 rxvt_environ = environ; 563 rxvt_environ = environ;
504 564
505 signal (SIGHUP, SIG_IGN); 565 signal (SIGHUP, SIG_IGN);
506 signal (SIGPIPE, SIG_IGN); 566 signal (SIGPIPE, SIG_IGN);
507 567
508 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 568 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
509 sig_handlers.sw_int.start (SIGINT); ev_unref (); 569 sig_handlers.sw_int.start (SIGINT); ev_unref ();
510
511 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
512 /* signal (SIGURG, SIG_DFL); */
513 570
514 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 571 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
515 // TODO: handle this with exceptions and tolerate the memory loss 572 // TODO: handle this with exceptions and tolerate the memory loss
516 XSetIOErrorHandler (rxvt_xioerror_handler); 573 XSetIOErrorHandler (rxvt_xioerror_handler);
517 574
518 XrmInitialize (); 575 XrmInitialize ();
576
577#if HAVE_PIXBUF
578 g_type_init ();
579#endif
519} 580}
520 581
521/*----------------------------------------------------------------------*/ 582/*----------------------------------------------------------------------*/
522/* 583/*
523 * window size/position calculations for XSizeHint and other storage. 584 * window size/position calculations for XSizeHint and other storage.
… …
525 */ 586 */
526void 587void
527rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 588rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
528{ 589{
529 short recalc_x, recalc_y; 590 short recalc_x, recalc_y;
530 int x, y, sb_w, flags; 591 int x, y, flags;
531 unsigned int w, h; 592 unsigned int w, h;
532 unsigned int max_width, max_height; 593 unsigned int max_width, max_height;
533 594
534 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 595 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
535 szHint.win_gravity = NorthWestGravity; 596 szHint.win_gravity = NorthWestGravity;
… …
545 if (rs[Rs_geometry]) 606 if (rs[Rs_geometry])
546 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 607 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
547 608
548 if (flags & WidthValue) 609 if (flags & WidthValue)
549 { 610 {
611 if (!w)
612 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
613
550 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 614 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
551 szHint.flags |= USSize; 615 szHint.flags |= USSize;
552 } 616 }
553 617
554 if (flags & HeightValue) 618 if (flags & HeightValue)
555 { 619 {
620 if (!h)
621 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
622
556 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 623 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
557 szHint.flags |= USSize; 624 szHint.flags |= USSize;
558 } 625 }
559 626
560 if (flags & XValue) 627 if (flags & XValue)
561 { 628 {
… …
592 max_width = MAX_COLS * fwidth; 659 max_width = MAX_COLS * fwidth;
593 max_height = MAX_ROWS * fheight; 660 max_height = MAX_ROWS * fheight;
594 661
595 szHint.base_width = szHint.base_height = 2 * int_bwidth; 662 szHint.base_width = szHint.base_height = 2 * int_bwidth;
596 663
597 sb_w = 0;
598 window_vt_x = window_vt_y = int_bwidth; 664 window_vt_x = window_vt_y = int_bwidth;
599 665
600 if (scrollBar.state) 666 if (scrollBar.state)
601 { 667 {
602 sb_w = scrollbar_TotalWidth (); 668 int sb_w = scrollBar.total_width ();
603 szHint.base_width += sb_w; 669 szHint.base_width += sb_w;
604 670
605 if (!option (Opt_scrollBar_right)) 671 if (!option (Opt_scrollBar_right))
606 window_vt_x += sb_w; 672 window_vt_x += sb_w;
607 } 673 }
… …
631 { 697 {
632 min_it (height, max_height); 698 min_it (height, max_height);
633 szHint.height = szHint.base_height + height; 699 szHint.height = szHint.base_height + height;
634 } 700 }
635 701
636 if (scrollBar.state && option (Opt_scrollBar_right))
637 window_sb_x = szHint.width - sb_w;
638
639 if (recalc_x) 702 if (recalc_x)
640 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 703 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
641 704
642 if (recalc_y) 705 if (recalc_y)
643 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 706 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
644 707
645 ncol = width / fwidth; 708 ncol = width / fwidth;
646 nrow = height / fheight; 709 nrow = height / fheight;
710
711 // When the size of the vt window is not a multiple of the cell
712 // size, i.e., when the wm does not honour our size hints, there are
713 // extra areas not covered by the terminal screen. Such gaps, when a
714 // bg pixmap is set, would have to be cleared manually to properly
715 // refresh the background. We take the simpler route and shrink the
716 // vt window so as to avoid creating gaps.
717 vt_width = ncol * fwidth;
718 vt_height = nrow * fheight;
647} 719}
648 720
649/*----------------------------------------------------------------------*/ 721/*----------------------------------------------------------------------*/
650/* 722/*
651 * Tell the teletype handler what size the window is. 723 * Tell the teletype handler what size the window is.
… …
659 731
660 struct winsize ws; 732 struct winsize ws;
661 733
662 ws.ws_col = ncol; 734 ws.ws_col = ncol;
663 ws.ws_row = nrow; 735 ws.ws_row = nrow;
664 ws.ws_xpixel = width; 736 ws.ws_xpixel = vt_width;
665 ws.ws_ypixel = height; 737 ws.ws_ypixel = vt_height;
666 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 738 ioctl (pty->pty, TIOCSWINSZ, &ws);
667 739
668#if 0 740#if 0
669 // TIOCSWINSZ is supposed to do this automatically and correctly 741 // TIOCSWINSZ is supposed to do this automatically and correctly
670 if (cmd_pid) /* force through to the command */ 742 if (cmd_pid) /* force through to the command */
671 kill (-cmd_pid, SIGWINCH); 743 kill (-cmd_pid, SIGWINCH);
672#endif 744#endif
673} 745}
674 746
675/*----------------------------------------------------------------------*/ 747/*----------------------------------------------------------------------*/
676/* set_fonts () - load and set the various fonts 748/* load and set the various fonts */
677 *
678 * init = 1 - initialize
679 *
680 * fontname == FONT_UP - switch to bigger font
681 * fontname == FONT_DN - switch to smaller font
682 */
683bool 749bool
684rxvt_term::set_fonts () 750rxvt_term::set_fonts ()
685{ 751{
686 rxvt_fontset *fs = new rxvt_fontset (this); 752 rxvt_fontset *fs = new rxvt_fontset (this);
687 rxvt_fontprop prop; 753 rxvt_fontprop prop;
… …
701#endif 767#endif
702 768
703 delete fontset[0]; 769 delete fontset[0];
704 fontset[0] = fs; 770 fontset[0] = fs;
705 771
706 prop = (*fs)[1]->properties (); 772 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
707 prop.height += lineSpace; 773 prop.width += letterSpace;
708 774
709 fs->set_prop (prop, false); 775 fs->set_prop (prop, false);
710 776
711 fwidth = prop.width; 777 fwidth = prop.width;
712 fheight = prop.height; 778 fheight = prop.height + lineSpace;
713 fbase = prop.ascent; 779 fbase = prop.ascent;
714 780
715 for (int style = 1; style < 4; style++) 781 for (int style = 1; style < 4; style++)
716 { 782 {
717#if ENABLE_STYLES 783#if ENABLE_STYLES
… …
743#else 809#else
744 fontset[style] = fontset[0]; 810 fontset[style] = fontset[0];
745#endif 811#endif
746 } 812 }
747 813
748 if (parent[0]) 814 if (parent)
749 { 815 {
750 resize_all_windows (0, 0, 0); 816 resize_all_windows (0, 0, 0);
751 scr_remap_chars (); 817 scr_remap_chars ();
752 scr_touch (true); 818 scr_touch (true);
753 } 819 }
… …
756} 822}
757 823
758void 824void
759rxvt_term::set_string_property (Atom prop, const char *str, int len) 825rxvt_term::set_string_property (Atom prop, const char *str, int len)
760{ 826{
761 XChangeProperty (dpy, parent[0], 827 XChangeProperty (dpy, parent,
762 prop, XA_STRING, 8, PropModeReplace, 828 prop, XA_STRING, 8, PropModeReplace,
763 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 829 (const unsigned char *)str, len >= 0 ? len : strlen (str));
764} 830}
765 831
766void 832void
833rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
834{
835 XTextProperty ct;
836
837 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
838 {
839 XSetTextProperty (dpy, parent, &ct, prop);
840 XFree (ct.value);
841 }
842}
843
844void
767rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 845rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
768{ 846{
769 wchar_t *ws = rxvt_mbstowcs (str, len); 847 wchar_t *ws = rxvt_mbstowcs (str, len);
770 char *s = rxvt_wcstoutf8 (ws); 848 char *s = rxvt_wcstoutf8 (ws);
771 849
772 XChangeProperty (dpy, parent[0], 850 XChangeProperty (dpy, parent,
773 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 851 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
774 (const unsigned char *)s, strlen (s)); 852 (const unsigned char *)s, strlen (s));
775 853
776 free (s); 854 free (s);
777 free (ws); 855 free (ws);
… …
781/*----------------------------------------------------------------------*/ 859/*----------------------------------------------------------------------*/
782/* xterm sequences - title, iconName, color (exptl) */ 860/* xterm sequences - title, iconName, color (exptl) */
783void 861void
784rxvt_term::set_title (const char *str) 862rxvt_term::set_title (const char *str)
785{ 863{
786 set_string_property (XA_WM_NAME, str); 864 set_mbstring_property (XA_WM_NAME, str);
787#if ENABLE_EWMH 865#if ENABLE_EWMH
788 set_utf8_property (xa[XA_NET_WM_NAME], str); 866 set_utf8_property (xa[XA_NET_WM_NAME], str);
789#endif 867#endif
790} 868}
791 869
792void 870void
793rxvt_term::set_icon_name (const char *str) 871rxvt_term::set_icon_name (const char *str)
794{ 872{
795 set_string_property (XA_WM_ICON_NAME, str); 873 set_mbstring_property (XA_WM_ICON_NAME, str);
796#if ENABLE_EWMH 874#if ENABLE_EWMH
797 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 875 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
798#endif 876#endif
799} 877}
800 878
… …
867 945
868/*----------------------------------------------------------------------*/ 946/*----------------------------------------------------------------------*/
869/* 947/*
870 * find if fg/bg matches any of the normal (low-intensity) colors 948 * find if fg/bg matches any of the normal (low-intensity) colors
871 */ 949 */
872void 950char *
873rxvt_term::set_colorfgbg () 951rxvt_term::get_colorfgbg ()
874{ 952{
875 unsigned int i; 953 unsigned int i;
876 const char *xpmb = ""; 954 const char *xpmb = "";
877 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 955 char fstr[] = "default";
956 char bstr[] = "default";
957 char *env_colorfgbg;
878 958
879 strcpy (fstr, "default");
880 strcpy (bstr, "default");
881 for (i = Color_Black; i <= Color_White; i++) 959 for (i = Color_Black; i <= Color_White; i++)
882 if (pix_colors[Color_fg] == pix_colors[i]) 960 if (pix_colors[Color_fg] == pix_colors[i])
883 { 961 {
884 sprintf (fstr, "%d", (i - Color_Black)); 962 sprintf (fstr, "%d", i - Color_Black);
885 break; 963 break;
886 } 964 }
887 965
888 for (i = Color_Black; i <= Color_White; i++) 966 for (i = Color_Black; i <= Color_White; i++)
889 if (pix_colors[Color_bg] == pix_colors[i]) 967 if (pix_colors[Color_bg] == pix_colors[i])
890 { 968 {
891 sprintf (bstr, "%d", (i - Color_Black)); 969 sprintf (bstr, "%d", i - Color_Black);
892#ifdef BG_IMAGE_FROM_FILE 970#if BG_IMAGE_FROM_FILE
893 xpmb = "default;"; 971 xpmb = "default;";
894#endif 972#endif
895 break; 973 break;
896 } 974 }
897 975
976 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
898 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 977 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
978 return env_colorfgbg;
899} 979}
900 980
901/*----------------------------------------------------------------------*/ 981/*----------------------------------------------------------------------*/
902 982
903bool 983bool
… …
926 int old_width = szHint.width; 1006 int old_width = szHint.width;
927 int old_height = szHint.height; 1007 int old_height = szHint.height;
928 1008
929 window_calc (newwidth, newheight); 1009 window_calc (newwidth, newheight);
930 1010
931 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1011 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1012
1013 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1014 if (set_hint)
1015 {
1016 szHint.flags &= ~(PBaseSize | PResizeInc);
932 XSetWMNormalHints (dpy, parent[0], &szHint); 1017 XSetWMNormalHints (dpy, parent, &szHint);
1018 szHint.flags |= PBaseSize | PResizeInc;
1019 }
933 1020
934 if (!ignoreparent) 1021 if (!ignoreparent)
935 { 1022 {
936#ifdef SMART_RESIZE 1023#ifdef SMART_RESIZE
937 /* 1024 /*
… …
941 int x, y, x1, y1; 1028 int x, y, x1, y1;
942 int dx, dy; 1029 int dx, dy;
943 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1030 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
944 Window unused_cr; 1031 Window unused_cr;
945 1032
946 XTranslateCoordinates (dpy, parent[0], display->root, 1033 XTranslateCoordinates (dpy, parent, display->root,
947 0, 0, &x, &y, &unused_cr); 1034 0, 0, &x, &y, &unused_cr);
948 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1035 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
949 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1036 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
950 /* 1037 /*
951 * if display->root isn't the parent window, a WM will probably have offset 1038 * if display->root isn't the parent window, a WM will probably have offset
952 * our position for handles and decorations. Counter it 1039 * our position for handles and decorations. Counter it
953 */ 1040 */
… …
970 if (y < y1) /* top half */ 1057 if (y < y1) /* top half */
971 dy = 0; 1058 dy = 0;
972 else if (y == y1) /* exact center */ 1059 else if (y == y1) /* exact center */
973 dy /= 2; 1060 dy /= 2;
974 1061
975 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1062 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
976 szHint.width, szHint.height); 1063 szHint.width, szHint.height);
977#else 1064#else
978 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1065 XResizeWindow (dpy, parent, szHint.width, szHint.height);
979#endif 1066#endif
980 } 1067 }
1068
1069 if (set_hint)
1070 XSetWMNormalHints (dpy, parent, &szHint);
981 1071
982 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1072 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
983 1073
984 if (fix_screen || newwidth != old_width || newheight != old_height) 1074 if (fix_screen || newwidth != old_width || newheight != old_height)
985 { 1075 {
986 if (scrollBar.state) 1076 if (scrollBar.state)
987 { 1077 scrollBar.resize ();
988 XMoveResizeWindow (dpy, scrollBar.win,
989 window_sb_x, 0,
990 scrollbar_TotalWidth (), szHint.height);
991 resize_scrollbar ();
992 }
993 1078
994 XMoveResizeWindow (dpy, vt, 1079 XMoveResizeWindow (dpy, vt,
995 window_vt_x, window_vt_y, 1080 window_vt_x, window_vt_y,
996 width, height); 1081 vt_width, vt_height);
997 1082
998#ifdef HAVE_BG_PIXMAP 1083#ifdef HAVE_BG_PIXMAP
999 if (bgPixmap.window_size_sensitive ()) 1084 if (bg_window_size_sensitive ())
1000 update_background (); 1085 update_background ();
1001#endif 1086#endif
1002
1003 scr_clear ();
1004 } 1087 }
1005 1088
1006 if (fix_screen || old_height == 0) 1089 if (fix_screen || old_height == 0)
1007 scr_reset (); 1090 scr_reset ();
1008 1091
1009 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1010 //scr_touch (false);
1011
1012#ifdef HAVE_BG_PIXMAP
1013// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1014// if (bgPixmap.pixmap)
1015// scr_touch (false);
1016#endif
1017
1018#ifdef USE_XIM 1092#if USE_XIM
1019 IMSetPosition (); 1093 im_set_position ();
1020#endif 1094#endif
1021} 1095}
1022 1096
1023/* 1097/*
1024 * Set the width/height of the vt window in characters. Units are pixels. 1098 * Set the width/height of the vt window in characters. Units are pixels.
… …
1037 newwidth = wattr.width - szHint.base_width; 1111 newwidth = wattr.width - szHint.base_width;
1038 if (newheight == 0) 1112 if (newheight == 0)
1039 newheight = wattr.height - szHint.base_height; 1113 newheight = wattr.height - szHint.base_height;
1040 } 1114 }
1041 1115
1042 if (newwidth != width || newheight != height) 1116 if (newwidth != vt_width || newheight != vt_height)
1043 { 1117 {
1044 newwidth += szHint.base_width; 1118 newwidth += szHint.base_width;
1045 newheight += szHint.base_height; 1119 newheight += szHint.base_height;
1046 resize_all_windows (newwidth, newheight, 0); 1120 resize_all_windows (newwidth, newheight, 0);
1047 } 1121 }
1048} 1122}
1049 1123
1050/* -------------------------------------------------------------------- * 1124/* -------------------------------------------------------------------- *
1051 * - X INPUT METHOD ROUTINES - * 1125 * - X INPUT METHOD ROUTINES - *
1052 * -------------------------------------------------------------------- */ 1126 * -------------------------------------------------------------------- */
1053#ifdef USE_XIM 1127#if USE_XIM
1054 1128
1055void 1129void
1056rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1130rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1057{ 1131{
1058 fg = pix_colors [Color_fg]; 1132 fg = pix_colors [Color_fg];
… …
1085 status_rect.height = fheight; 1159 status_rect.height = fheight;
1086} 1160}
1087 1161
1088/* Checking whether input method is running. */ 1162/* Checking whether input method is running. */
1089bool 1163bool
1090rxvt_term::IMisRunning () 1164rxvt_term::im_is_running ()
1091{ 1165{
1092 char *p;
1093 Atom atom; 1166 Atom atom;
1094 Window win; 1167 Window win;
1095 char server[IMBUFSIZ]; 1168 char server[IMBUFSIZ];
1096 1169
1097 /* get current locale modifier */ 1170 /* get current locale modifier */
1098 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1171 if (char *p = XSetLocaleModifiers (0))
1099 { 1172 {
1100 strcpy (server, "@server="); 1173 strcpy (server, "@server=");
1101 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1174 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1102 1175
1103 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1176 if (p = strchr (server + 1, '@')) /* first one only */
1104 *p = '\0'; 1177 *p = '\0';
1105 1178
1106 atom = XInternAtom (dpy, server, False); 1179 atom = XInternAtom (dpy, server, False);
1107 win = XGetSelectionOwner (dpy, atom); 1180 win = XGetSelectionOwner (dpy, atom);
1108 1181
1109 if (win != None) 1182 if (win != None)
1110 return True; 1183 return true;
1111 } 1184 }
1112 1185
1113 return False; 1186 return false;
1114} 1187}
1115 1188
1116void 1189void
1117rxvt_term::IMSendSpot () 1190rxvt_term::im_send_spot ()
1118{ 1191{
1119 XPoint nspot; 1192 XPoint nspot;
1120 XVaNestedList preedit_attr; 1193 XVaNestedList preedit_attr;
1121 1194
1122 if (!Input_Context 1195 if (!Input_Context
… …
1175 1248
1176 term->make_current (); 1249 term->make_current ();
1177 1250
1178 if (text) 1251 if (text)
1179 { 1252 {
1180 void *str; 1253 wchar_t *str;
1181 1254
1182 if (!text->encoding_is_wchar && text->string.multi_byte) 1255 if (!text->encoding_is_wchar && text->string.multi_byte)
1183 { 1256 {
1184 // of course, X makes it ugly again 1257 // of course, X makes it ugly again
1185 if (term->rs[Rs_imLocale]) 1258 if (term->rs[Rs_imLocale])
1186 SET_LOCALE (term->rs[Rs_imLocale]); 1259 SET_LOCALE (term->rs[Rs_imLocale]);
1187 1260
1188 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1261 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1189 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1262 mbstowcs (str, text->string.multi_byte, text->length + 1);
1190 1263
1191 if (term->rs[Rs_imLocale]) 1264 if (term->rs[Rs_imLocale])
1192 SET_LOCALE (term->locale); 1265 SET_LOCALE (term->locale);
1193 } 1266 }
1194 else 1267 else
1195 str = (void *)text->string.wide_char; 1268 str = text->string.wide_char;
1196 1269
1197 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1270 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1198 DT_INT, call_data->caret, 1271 DT_INT, call_data->caret,
1199 DT_INT, call_data->chg_first, 1272 DT_INT, call_data->chg_first,
1200 DT_INT, call_data->chg_length, 1273 DT_INT, call_data->chg_length,
… …
1228/* 1301/*
1229 * Try to open a XIM with the current modifiers, then see if we can 1302 * Try to open a XIM with the current modifiers, then see if we can
1230 * open a suitable preedit type 1303 * open a suitable preedit type
1231 */ 1304 */
1232bool 1305bool
1233rxvt_term::IM_get_IC (const char *modifiers) 1306rxvt_term::im_get_ic (const char *modifiers)
1234{ 1307{
1235 int i, j, found; 1308 int i, j, found;
1236 XIM xim; 1309 XIM xim;
1237 XPoint spot; 1310 XPoint spot;
1238 XRectangle rect, status_rect, needed_rect; 1311 XRectangle rect, status_rect, needed_rect;
1239 unsigned long fg, bg; 1312 unsigned long fg, bg;
1240 const char *p; 1313 const char *p;
1241 char **s; 1314 char **s;
1242 XIMStyles *xim_styles; 1315 XIMStyles *xim_styles;
1243#ifdef ENABLE_XIM_ONTHESPOT
1244 XIMCallback xcb[4];
1245#endif
1246 1316
1247 set_environ (envv); 1317 set_environ (envv);
1248 1318
1249 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1250 return false; 1320 return false;
… …
1271 p = pet[pi]; 1341 p = pet[pi];
1272 1342
1273 if (!p) 1343 if (!p)
1274 continue; 1344 continue;
1275 1345
1276 s = rxvt_splitcommastring (p); 1346 s = rxvt_strsplit (',', p);
1277 1347
1278 for (i = found = 0; !found && s[i]; i++) 1348 for (i = found = 0; !found && s[i]; i++)
1279 { 1349 {
1280 if (!strcmp (s[i], "OverTheSpot")) 1350 if (!strcmp (s[i], "OverTheSpot"))
1281 input_style = XIMPreeditPosition | XIMStatusNothing; 1351 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1293 input_style = XIMPreeditNothing | XIMStatusNothing; 1363 input_style = XIMPreeditNothing | XIMStatusNothing;
1294 1364
1295 for (j = 0; j < xim_styles->count_styles; j++) 1365 for (j = 0; j < xim_styles->count_styles; j++)
1296 if (input_style == xim_styles->supported_styles[j]) 1366 if (input_style == xim_styles->supported_styles[j])
1297 { 1367 {
1298 rxvt_freecommastring (s); 1368 rxvt_free_strsplit (s);
1299 1369
1300 found = 1; 1370 found = 1;
1301 goto foundpet; 1371 goto foundpet;
1302 } 1372 }
1303 1373
1304 } 1374 }
1305 1375
1306 rxvt_freecommastring (s); 1376 rxvt_free_strsplit (s);
1307 } 1377 }
1308 1378
1309foundpet: 1379foundpet:
1310 1380
1311 XFree (xim_styles); 1381 XFree (xim_styles);
… …
1390 NULL); 1460 NULL);
1391 } 1461 }
1392#if ENABLE_XIM_ONTHESPOT 1462#if ENABLE_XIM_ONTHESPOT
1393 else if (input_style & XIMPreeditCallbacks) 1463 else if (input_style & XIMPreeditCallbacks)
1394 { 1464 {
1465 XIMCallback xcb[4];
1466
1395 im_set_position (spot); 1467 im_set_position (spot);
1396 1468
1397 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1469 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1398 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1470 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1399 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1471 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1414#endif 1486#endif
1415 1487
1416 Input_Context = XCreateIC (xim, 1488 Input_Context = XCreateIC (xim,
1417 XNInputStyle, input_style, 1489 XNInputStyle, input_style,
1418 XNClientWindow, vt, 1490 XNClientWindow, vt,
1419 XNFocusWindow, parent[0], 1491 XNFocusWindow, parent,
1420 preedit_attr ? XNPreeditAttributes : NULL, 1492 preedit_attr ? XNPreeditAttributes : NULL,
1421 preedit_attr, 1493 preedit_attr,
1422 status_attr ? XNStatusAttributes : NULL, 1494 status_attr ? XNStatusAttributes : NULL,
1423 status_attr, NULL); 1495 status_attr, NULL);
1424 1496
… …
1437 // unfortunately, only the focus window is used by XIM, hard to fix 1509 // unfortunately, only the focus window is used by XIM, hard to fix
1438 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1510 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1439 vt_select_input (); 1511 vt_select_input ();
1440#endif 1512#endif
1441 1513
1442 IMSetPosition (); 1514 im_set_position ();
1443 1515
1444 return true; 1516 return true;
1445} 1517}
1446 1518
1447void 1519void
… …
1457 im_destroy (); 1529 im_destroy ();
1458 1530
1459 if (Input_Context) 1531 if (Input_Context)
1460 return; 1532 return;
1461 1533
1462#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1463 if (rs[Rs_imLocale]) 1534 if (rs[Rs_imLocale])
1464 SET_LOCALE (rs[Rs_imLocale]); 1535 SET_LOCALE (rs[Rs_imLocale]);
1465#endif
1466 1536
1467 p = rs[Rs_inputMethod]; 1537 p = rs[Rs_inputMethod];
1468 if (p && *p) 1538 if (p && *p)
1469 { 1539 {
1470 bool found = false; 1540 bool found = false;
1471 1541
1472 s = rxvt_splitcommastring (p); 1542 s = rxvt_strsplit (',', p);
1473 1543
1474 for (i = 0; s[i]; i++) 1544 for (i = 0; s[i]; i++)
1475 { 1545 {
1476 if (*s[i]) 1546 if (*s[i])
1477 { 1547 {
1478 strcpy (buf, "@im="); 1548 strcpy (buf, "@im=");
1479 strncat (buf, s[i], IMBUFSIZ - 5); 1549 strncat (buf, s[i], IMBUFSIZ - 5);
1480 if (IM_get_IC (buf)) 1550 if (im_get_ic (buf))
1481 { 1551 {
1482 found = true; 1552 found = true;
1483 break; 1553 break;
1484 } 1554 }
1485 } 1555 }
1486 } 1556 }
1487 1557
1488 rxvt_freecommastring (s); 1558 rxvt_free_strsplit (s);
1489 1559
1490 if (found) 1560 if (found)
1491 goto done; 1561 goto done;
1492 } 1562 }
1493 1563
1494 /* try with XMODIFIERS env. var. */ 1564 /* try with XMODIFIERS env. var. */
1495 if (IM_get_IC ("")) 1565 if (im_get_ic (""))
1496 goto done; 1566 goto done;
1497 1567
1498 /* try with no modifiers base IF the user didn't specify an IM */ 1568 /* try with no modifiers base IF the user didn't specify an IM */
1499 if (IM_get_IC ("@im=none")) 1569 if (im_get_ic ("@im=none"))
1500 goto done; 1570 goto done;
1501 1571
1502done: 1572done:
1503#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1504 if (rs[Rs_imLocale]) 1573 if (rs[Rs_imLocale])
1505 SET_LOCALE (locale); 1574 SET_LOCALE (locale);
1506#endif
1507} 1575}
1508 1576
1509void 1577void
1510rxvt_term::IMSetPosition () 1578rxvt_term::im_set_position ()
1511{ 1579{
1512 XRectangle preedit_rect, status_rect, *needed_rect; 1580 XRectangle preedit_rect, status_rect, *needed_rect;
1513 XVaNestedList preedit_attr, status_attr; 1581 XVaNestedList preedit_attr, status_attr;
1514 1582
1515 if (!Input_Context 1583 if (!Input_Context
1516 || !focus 1584 || !focus
1517 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1585 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1518 || !IMisRunning ()) 1586 || !im_is_running ())
1519 return; 1587 return;
1520 1588
1521 if (input_style & XIMPreeditPosition) 1589 if (input_style & XIMPreeditPosition)
1522 { 1590 {
1523 im_set_size (preedit_rect); 1591 im_set_size (preedit_rect);
… …
1553 1621
1554void 1622void
1555rxvt_term::get_window_origin (int &x, int &y) 1623rxvt_term::get_window_origin (int &x, int &y)
1556{ 1624{
1557 Window cr; 1625 Window cr;
1558 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1626 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1559/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1560}
1561
1562Pixmap
1563rxvt_term::get_pixmap_property (int prop_id)
1564{
1565 if (prop_id > 0 && prop_id < NUM_XA)
1566 if (xa[prop_id])
1567 {
1568 int aformat;
1569 unsigned long nitems, bytes_after;
1570 Atom atype;
1571 unsigned char *prop = NULL;
1572 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1573 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1574 &nitems, &bytes_after, &prop);
1575 if (result == Success && prop && atype == XA_PIXMAP)
1576 return *(Pixmap *)prop;
1577 }
1578
1579 return None;
1580} 1627}
1581 1628
1582#ifdef HAVE_BG_PIXMAP 1629#ifdef HAVE_BG_PIXMAP
1583# if TRACE_PIXMAPS
1584# undef update_background
1585void
1586rxvt_term::trace_update_background (const char *file, int line)
1587{
1588 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1589 update_background ();
1590}
1591# endif
1592 1630
1593void 1631void
1594rxvt_term::update_background () 1632rxvt_term::update_background ()
1595{ 1633{
1596 if (update_background_ev.is_active ()) 1634 if (update_background_ev.is_active ())
1597 return; 1635 return;
1598 1636
1599 bgPixmap.invalidate (); 1637 bg_invalidate ();
1600 1638
1639 if (!mapped)
1640 return;
1641
1601 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1642 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1602 1643
1603 if (to_wait <= 0.) 1644 if (to_wait <= 0.)
1604 bgPixmap.render (); 1645 bg_render ();
1605 else 1646 else
1606 update_background_ev.start (to_wait); 1647 update_background_ev.start (to_wait);
1607} 1648}
1608 1649
1609void 1650void
1610rxvt_term::update_background_cb (ev::timer &w, int revents) 1651rxvt_term::update_background_cb (ev::timer &w, int revents)
1611{ 1652{
1612 make_current (); 1653 make_current ();
1613 1654
1614 update_background_ev.stop (); 1655 update_background_ev.stop ();
1615 bgPixmap.render (); 1656 bg_render ();
1616 refresh_check (); 1657 refresh_check ();
1617} 1658}
1618 1659
1619#endif /* HAVE_BG_PIXMAP */ 1660#endif /* HAVE_BG_PIXMAP */
1620 1661

Diff Legend

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