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.306 by ayin, Mon Feb 18 09:58:04 2008 UTC vs.
Revision 1.378 by root, Tue Jun 5 11:10:50 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";
386
400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 387 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 388 XGetErrorDatabaseText (dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
402 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 389 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
403 rxvt_warn ("%s: %s\n", mesg, buffer); 390 rxvt_warn ("%s: %s\n", mesg, buffer);
404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 391 XGetErrorDatabaseText (dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
405 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 392 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
406 sprintf(number, "%d", event->request_code); 393 sprintf (number, "%d", event->request_code);
407 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
408 rxvt_warn ("(which is %s)\n", buffer); 395 rxvt_warn ("(which is %s)\n", buffer);
396
409 if (event->request_code >= 128) { 397 if (event->request_code >= 128)
398 {
410 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 399 XGetErrorDatabaseText (dpy, mtype, "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
411 mesg, BUFSIZ);
412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
413 } 401 }
402
414 if ((event->error_code == BadWindow) || 403 if (event->error_code == BadWindow
415 (event->error_code == BadPixmap) || 404 || event->error_code == BadPixmap
416 (event->error_code == BadCursor) || 405 || event->error_code == BadCursor
417 (event->error_code == BadFont) || 406 || event->error_code == BadFont
418 (event->error_code == BadDrawable) || 407 || event->error_code == BadDrawable
419 (event->error_code == BadColor) || 408 || event->error_code == BadColor
420 (event->error_code == BadGC) || 409 || event->error_code == BadGC
421 (event->error_code == BadIDChoice) || 410 || event->error_code == BadIDChoice
422 (event->error_code == BadValue) || 411 || event->error_code == BadValue
423 (event->error_code == BadAtom)) { 412 || event->error_code == BadAtom)
413 {
424 if (event->error_code == BadValue) 414 if (event->error_code == BadValue)
425 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 415 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", mesg, BUFSIZ);
426 mesg, BUFSIZ);
427 else if (event->error_code == BadAtom) 416 else if (event->error_code == BadAtom)
428 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
429 mesg, BUFSIZ); 418 else
430 else
431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
432 mesg, BUFSIZ); 420
433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
434 } 422 }
423
435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 424 XGetErrorDatabaseText (dpy, mtype, "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
436 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
438} 426}
439#endif 427#endif
440 428
441int 429int ecb_cold
442rxvt_xerror_handler (Display *display, XErrorEvent *event) 430rxvt_xerror_handler (Display *display, XErrorEvent *event)
443{ 431{
444 if (GET_R->allowedxerror == -1) 432 if (GET_R->allowedxerror == -1)
445 GET_R->allowedxerror = event->error_code; 433 GET_R->allowedxerror = event->error_code;
446 else 434 else
… …
455 } 443 }
456 444
457 return 0; 445 return 0;
458} 446}
459 447
460int 448int ecb_cold
461rxvt_xioerror_handler (Display *display) 449rxvt_xioerror_handler (Display *display)
462{ 450{
463 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 451 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
464 DisplayString (display)); 452 DisplayString (display));
465 rxvt_emergency_cleanup (); 453 rxvt_emergency_cleanup ();
… …
488 rxvt_emergency_cleanup (); 476 rxvt_emergency_cleanup ();
489 w.stop (); 477 w.stop ();
490 kill (getpid (), w.signum); 478 kill (getpid (), w.signum);
491} 479}
492 480
481static void
482rxvt_get_ttymode (struct termios *tio)
483{
484 if (tcgetattr (STDIN_FILENO, tio) < 0)
485 memset (tio, 0, sizeof (struct termios));
486
487 for (int i = 0; i < NCCS; i++)
488 tio->c_cc[i] = VDISABLE;
489
490 tio->c_cc[VINTR] = CINTR;
491 tio->c_cc[VQUIT] = CQUIT;
492 tio->c_cc[VERASE] = CERASE;
493#ifdef VERASE2
494 tio->c_cc[VERASE2] = CERASE2;
495#endif
496 tio->c_cc[VKILL] = CKILL;
497 tio->c_cc[VEOF] = CEOF;
498 tio->c_cc[VSTART] = CSTART;
499 tio->c_cc[VSTOP] = CSTOP;
500 tio->c_cc[VSUSP] = CSUSP;
501# ifdef VDSUSP
502 tio->c_cc[VDSUSP] = CDSUSP;
503# endif
504# ifdef VREPRINT
505 tio->c_cc[VREPRINT] = CRPRNT;
506# endif
507# ifdef VDISCRD
508 tio->c_cc[VDISCRD] = CFLUSH;
509# endif
510# ifdef VWERSE
511 tio->c_cc[VWERSE] = CWERASE;
512# endif
513# ifdef VLNEXT
514 tio->c_cc[VLNEXT] = CLNEXT;
515# endif
516# ifdef VSTATUS
517 tio->c_cc[VSTATUS] = CSTATUS;
518# endif
519
520# if VMIN != VEOF
521 tio->c_cc[VMIN] = 1;
522# endif
523# if VTIME != VEOL
524 tio->c_cc[VTIME] = 0;
525# endif
526
527 /* input modes */
528 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
529# ifdef IMAXBEL
530 | IMAXBEL
531# endif
532 | IXON);
533
534 /* output modes */
535 tio->c_oflag = (OPOST | ONLCR);
536
537 /* control modes */
538 tio->c_cflag = (CS8 | CREAD);
539
540 /* local modes */
541 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
542# if defined (ECHOCTL) && defined (ECHOKE)
543 | ECHOCTL | ECHOKE
544# endif
545 | ECHOE | ECHOK);
546}
547
493char **rxvt_environ; // startup environment 548char **rxvt_environ; // startup environment
494 549
495void 550void
496rxvt_init () 551rxvt_init ()
497{ 552{
498 ptytty::init (); 553 assert (("fontMask must not overlap other RS masks",
554 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
499 555
556 rxvt_get_ttymode (&rxvt_term::def_tio);
557
558 // get rid of stdin/stdout as we don't need them, to free resources
559 dup2 (STDERR_FILENO, STDIN_FILENO);
560 dup2 (STDERR_FILENO, STDOUT_FILENO);
561
500 if (!ev_default_loop (0)) 562 if (!ev_default_loop ())
501 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 563 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
502 564
503 rxvt_environ = environ; 565 rxvt_environ = environ;
504 566
505 signal (SIGHUP, SIG_IGN); 567 signal (SIGHUP, SIG_IGN);
506 signal (SIGPIPE, SIG_IGN); 568 signal (SIGPIPE, SIG_IGN);
507 569
508 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 570 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
509 sig_handlers.sw_int.start (SIGINT); ev_unref (); 571 sig_handlers.sw_int.start (SIGINT); ev_unref ();
510
511 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
512 /* signal (SIGURG, SIG_DFL); */
513 572
514 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
515 // TODO: handle this with exceptions and tolerate the memory loss 574 // TODO: handle this with exceptions and tolerate the memory loss
516 XSetIOErrorHandler (rxvt_xioerror_handler); 575 XSetIOErrorHandler (rxvt_xioerror_handler);
517 576
518 XrmInitialize (); 577 XrmInitialize ();
578
579#if HAVE_PIXBUF
580 g_type_init ();
581#endif
519} 582}
520 583
521/*----------------------------------------------------------------------*/ 584/*----------------------------------------------------------------------*/
522/* 585/*
523 * window size/position calculations for XSizeHint and other storage. 586 * window size/position calculations for XSizeHint and other storage.
… …
545 if (rs[Rs_geometry]) 608 if (rs[Rs_geometry])
546 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 609 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
547 610
548 if (flags & WidthValue) 611 if (flags & WidthValue)
549 { 612 {
613 if (!w)
614 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
615
550 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 616 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
551 szHint.flags |= USSize; 617 szHint.flags |= USSize;
552 } 618 }
553 619
554 if (flags & HeightValue) 620 if (flags & HeightValue)
555 { 621 {
622 if (!h)
623 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
624
556 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 625 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
557 szHint.flags |= USSize; 626 szHint.flags |= USSize;
558 } 627 }
559 628
560 if (flags & XValue) 629 if (flags & XValue)
561 { 630 {
… …
636 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 705 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
637 706
638 if (recalc_y) 707 if (recalc_y)
639 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 708 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
640 709
641 ncol = width / fwidth; 710 ncol = width / fwidth;
642 nrow = height / fheight; 711 nrow = height / fheight;
712
713 // When the size of the vt window is not a multiple of the cell
714 // size, i.e., when the wm does not honour our size hints, there are
715 // extra areas not covered by the terminal screen. Such gaps, when a
716 // bg pixmap is set, would have to be cleared manually to properly
717 // refresh the background. We take the simpler route and shrink the
718 // vt window so as to avoid creating gaps.
719 vt_width = ncol * fwidth;
720 vt_height = nrow * fheight;
643} 721}
644 722
645/*----------------------------------------------------------------------*/ 723/*----------------------------------------------------------------------*/
646/* 724/*
647 * Tell the teletype handler what size the window is. 725 * Tell the teletype handler what size the window is.
… …
655 733
656 struct winsize ws; 734 struct winsize ws;
657 735
658 ws.ws_col = ncol; 736 ws.ws_col = ncol;
659 ws.ws_row = nrow; 737 ws.ws_row = nrow;
660 ws.ws_xpixel = width; 738 ws.ws_xpixel = vt_width;
661 ws.ws_ypixel = height; 739 ws.ws_ypixel = vt_height;
662 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 740 ioctl (pty->pty, TIOCSWINSZ, &ws);
663 741
664#if 0 742#if 0
665 // TIOCSWINSZ is supposed to do this automatically and correctly 743 // TIOCSWINSZ is supposed to do this automatically and correctly
666 if (cmd_pid) /* force through to the command */ 744 if (cmd_pid) /* force through to the command */
667 kill (-cmd_pid, SIGWINCH); 745 kill (-cmd_pid, SIGWINCH);
668#endif 746#endif
669} 747}
670 748
671/*----------------------------------------------------------------------*/ 749/*----------------------------------------------------------------------*/
672/* set_fonts () - load and set the various fonts 750/* load and set the various fonts */
673 *
674 * init = 1 - initialize
675 *
676 * fontname == FONT_UP - switch to bigger font
677 * fontname == FONT_DN - switch to smaller font
678 */
679bool 751bool
680rxvt_term::set_fonts () 752rxvt_term::set_fonts ()
681{ 753{
682 rxvt_fontset *fs = new rxvt_fontset (this); 754 rxvt_fontset *fs = new rxvt_fontset (this);
683 rxvt_fontprop prop; 755 rxvt_fontprop prop;
… …
697#endif 769#endif
698 770
699 delete fontset[0]; 771 delete fontset[0];
700 fontset[0] = fs; 772 fontset[0] = fs;
701 773
702 prop = (*fs)[1]->properties (); 774 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
703 prop.height += lineSpace; 775 prop.width += letterSpace;
704 776
705 fs->set_prop (prop, false); 777 fs->set_prop (prop, false);
706 778
707 fwidth = prop.width; 779 fwidth = prop.width;
708 fheight = prop.height; 780 fheight = prop.height + lineSpace;
709 fbase = prop.ascent; 781 fbase = prop.ascent;
710 782
711 for (int style = 1; style < 4; style++) 783 for (int style = 1; style < 4; style++)
712 { 784 {
713#if ENABLE_STYLES 785#if ENABLE_STYLES
… …
739#else 811#else
740 fontset[style] = fontset[0]; 812 fontset[style] = fontset[0];
741#endif 813#endif
742 } 814 }
743 815
744 if (parent[0]) 816 if (parent)
745 { 817 {
746 resize_all_windows (0, 0, 0); 818 resize_all_windows (0, 0, 0);
747 scr_remap_chars (); 819 scr_remap_chars ();
748 scr_touch (true); 820 scr_touch (true);
749 } 821 }
… …
752} 824}
753 825
754void 826void
755rxvt_term::set_string_property (Atom prop, const char *str, int len) 827rxvt_term::set_string_property (Atom prop, const char *str, int len)
756{ 828{
757 XChangeProperty (dpy, parent[0], 829 XChangeProperty (dpy, parent,
758 prop, XA_STRING, 8, PropModeReplace, 830 prop, XA_STRING, 8, PropModeReplace,
759 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 831 (const unsigned char *)str, len >= 0 ? len : strlen (str));
760} 832}
761 833
762void 834void
835rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
836{
837 XTextProperty ct;
838
839 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
840 {
841 XSetTextProperty (dpy, parent, &ct, prop);
842 XFree (ct.value);
843 }
844}
845
846void
763rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 847rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
764{ 848{
765 wchar_t *ws = rxvt_mbstowcs (str, len); 849 wchar_t *ws = rxvt_mbstowcs (str, len);
766 char *s = rxvt_wcstoutf8 (ws); 850 char *s = rxvt_wcstoutf8 (ws);
767 851
768 XChangeProperty (dpy, parent[0], 852 XChangeProperty (dpy, parent,
769 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 853 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
770 (const unsigned char *)s, strlen (s)); 854 (const unsigned char *)s, strlen (s));
771 855
772 free (s); 856 free (s);
773 free (ws); 857 free (ws);
… …
777/*----------------------------------------------------------------------*/ 861/*----------------------------------------------------------------------*/
778/* xterm sequences - title, iconName, color (exptl) */ 862/* xterm sequences - title, iconName, color (exptl) */
779void 863void
780rxvt_term::set_title (const char *str) 864rxvt_term::set_title (const char *str)
781{ 865{
782 set_string_property (XA_WM_NAME, str); 866 set_mbstring_property (XA_WM_NAME, str);
783#if ENABLE_EWMH 867#if ENABLE_EWMH
784 set_utf8_property (xa[XA_NET_WM_NAME], str); 868 set_utf8_property (xa[XA_NET_WM_NAME], str);
785#endif 869#endif
786} 870}
787 871
788void 872void
789rxvt_term::set_icon_name (const char *str) 873rxvt_term::set_icon_name (const char *str)
790{ 874{
791 set_string_property (XA_WM_ICON_NAME, str); 875 set_mbstring_property (XA_WM_ICON_NAME, str);
792#if ENABLE_EWMH 876#if ENABLE_EWMH
793 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 877 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
794#endif 878#endif
795} 879}
796 880
… …
863 947
864/*----------------------------------------------------------------------*/ 948/*----------------------------------------------------------------------*/
865/* 949/*
866 * find if fg/bg matches any of the normal (low-intensity) colors 950 * find if fg/bg matches any of the normal (low-intensity) colors
867 */ 951 */
868void 952char *
869rxvt_term::set_colorfgbg () 953rxvt_term::get_colorfgbg ()
870{ 954{
871 unsigned int i; 955 unsigned int i;
872 const char *xpmb = ""; 956 const char *xpmb = "";
873 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 957 char fstr[] = "default";
958 char bstr[] = "default";
959 char *env_colorfgbg;
874 960
875 strcpy (fstr, "default");
876 strcpy (bstr, "default");
877 for (i = Color_Black; i <= Color_White; i++) 961 for (i = Color_Black; i <= Color_White; i++)
878 if (pix_colors[Color_fg] == pix_colors[i]) 962 if (pix_colors[Color_fg] == pix_colors[i])
879 { 963 {
880 sprintf (fstr, "%d", (i - Color_Black)); 964 sprintf (fstr, "%d", i - Color_Black);
881 break; 965 break;
882 } 966 }
883 967
884 for (i = Color_Black; i <= Color_White; i++) 968 for (i = Color_Black; i <= Color_White; i++)
885 if (pix_colors[Color_bg] == pix_colors[i]) 969 if (pix_colors[Color_bg] == pix_colors[i])
886 { 970 {
887 sprintf (bstr, "%d", (i - Color_Black)); 971 sprintf (bstr, "%d", i - Color_Black);
888#ifdef BG_IMAGE_FROM_FILE 972#if BG_IMAGE_FROM_FILE
889 xpmb = "default;"; 973 xpmb = "default;";
890#endif 974#endif
891 break; 975 break;
892 } 976 }
893 977
978 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
894 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 979 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
980 return env_colorfgbg;
895} 981}
896 982
897/*----------------------------------------------------------------------*/ 983/*----------------------------------------------------------------------*/
898 984
899bool 985bool
… …
922 int old_width = szHint.width; 1008 int old_width = szHint.width;
923 int old_height = szHint.height; 1009 int old_height = szHint.height;
924 1010
925 window_calc (newwidth, newheight); 1011 window_calc (newwidth, newheight);
926 1012
927 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1013 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1014
1015 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1016 if (set_hint)
1017 {
1018 szHint.flags &= ~(PBaseSize | PResizeInc);
928 XSetWMNormalHints (dpy, parent[0], &szHint); 1019 XSetWMNormalHints (dpy, parent, &szHint);
1020 szHint.flags |= PBaseSize | PResizeInc;
1021 }
929 1022
930 if (!ignoreparent) 1023 if (!ignoreparent)
931 { 1024 {
932#ifdef SMART_RESIZE 1025#ifdef SMART_RESIZE
933 /* 1026 /*
… …
937 int x, y, x1, y1; 1030 int x, y, x1, y1;
938 int dx, dy; 1031 int dx, dy;
939 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1032 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
940 Window unused_cr; 1033 Window unused_cr;
941 1034
942 XTranslateCoordinates (dpy, parent[0], display->root, 1035 XTranslateCoordinates (dpy, parent, display->root,
943 0, 0, &x, &y, &unused_cr); 1036 0, 0, &x, &y, &unused_cr);
944 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1037 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
945 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1038 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
946 /* 1039 /*
947 * if display->root isn't the parent window, a WM will probably have offset 1040 * if display->root isn't the parent window, a WM will probably have offset
948 * our position for handles and decorations. Counter it 1041 * our position for handles and decorations. Counter it
949 */ 1042 */
… …
966 if (y < y1) /* top half */ 1059 if (y < y1) /* top half */
967 dy = 0; 1060 dy = 0;
968 else if (y == y1) /* exact center */ 1061 else if (y == y1) /* exact center */
969 dy /= 2; 1062 dy /= 2;
970 1063
971 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1064 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
972 szHint.width, szHint.height); 1065 szHint.width, szHint.height);
973#else 1066#else
974 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1067 XResizeWindow (dpy, parent, szHint.width, szHint.height);
975#endif 1068#endif
976 } 1069 }
1070
1071 if (set_hint)
1072 XSetWMNormalHints (dpy, parent, &szHint);
977 1073
978 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1074 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
979 1075
980 if (fix_screen || newwidth != old_width || newheight != old_height) 1076 if (fix_screen || newwidth != old_width || newheight != old_height)
981 { 1077 {
982 if (scrollBar.state) 1078 if (scrollBar.state)
983 resize_scrollbar (); 1079 scrollBar.resize ();
984 1080
985 XMoveResizeWindow (dpy, vt, 1081 XMoveResizeWindow (dpy, vt,
986 window_vt_x, window_vt_y, 1082 window_vt_x, window_vt_y,
987 width, height); 1083 vt_width, vt_height);
1084
1085 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
988 1086
989#ifdef HAVE_BG_PIXMAP 1087#ifdef HAVE_BG_PIXMAP
990 if (bgPixmap.window_size_sensitive ()) 1088 if (bg_window_size_sensitive ())
991 update_background (); 1089 update_background ();
992#endif 1090#endif
993
994 scr_clear ();
995 } 1091 }
996 1092
997 if (fix_screen || old_height == 0) 1093 if (fix_screen || old_height == 0)
998 scr_reset (); 1094 scr_reset ();
999 1095
1000 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1001 //scr_touch (false);
1002
1003#ifdef HAVE_BG_PIXMAP
1004// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1005// if (bgPixmap.pixmap)
1006// scr_touch (false);
1007#endif
1008
1009#ifdef USE_XIM 1096#if USE_XIM
1010 IMSetPosition (); 1097 im_set_position ();
1011#endif 1098#endif
1012} 1099}
1013 1100
1014/* 1101/*
1015 * Set the width/height of the vt window in characters. Units are pixels. 1102 * Set the width/height of the vt window in characters. Units are pixels.
… …
1028 newwidth = wattr.width - szHint.base_width; 1115 newwidth = wattr.width - szHint.base_width;
1029 if (newheight == 0) 1116 if (newheight == 0)
1030 newheight = wattr.height - szHint.base_height; 1117 newheight = wattr.height - szHint.base_height;
1031 } 1118 }
1032 1119
1033 if (newwidth != width || newheight != height) 1120 if (newwidth != vt_width || newheight != vt_height)
1034 { 1121 {
1035 newwidth += szHint.base_width; 1122 newwidth += szHint.base_width;
1036 newheight += szHint.base_height; 1123 newheight += szHint.base_height;
1037 resize_all_windows (newwidth, newheight, 0); 1124 resize_all_windows (newwidth, newheight, 0);
1038 } 1125 }
1039} 1126}
1040 1127
1041/* -------------------------------------------------------------------- * 1128/* -------------------------------------------------------------------- *
1042 * - X INPUT METHOD ROUTINES - * 1129 * - X INPUT METHOD ROUTINES - *
1043 * -------------------------------------------------------------------- */ 1130 * -------------------------------------------------------------------- */
1044#ifdef USE_XIM 1131#if USE_XIM
1045 1132
1046void 1133void
1047rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1134rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1048{ 1135{
1049 fg = pix_colors [Color_fg]; 1136 fg = pix_colors [Color_fg];
… …
1076 status_rect.height = fheight; 1163 status_rect.height = fheight;
1077} 1164}
1078 1165
1079/* Checking whether input method is running. */ 1166/* Checking whether input method is running. */
1080bool 1167bool
1081rxvt_term::IMisRunning () 1168rxvt_term::im_is_running ()
1082{ 1169{
1083 char *p;
1084 Atom atom; 1170 Atom atom;
1085 Window win; 1171 Window win;
1086 char server[IMBUFSIZ]; 1172 char server[IMBUFSIZ];
1087 1173
1088 /* get current locale modifier */ 1174 /* get current locale modifier */
1089 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1175 if (char *p = XSetLocaleModifiers (0))
1090 { 1176 {
1091 strcpy (server, "@server="); 1177 strcpy (server, "@server=");
1092 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1178 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1093 1179
1094 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1180 if (p = strchr (server + 1, '@')) /* first one only */
1095 *p = '\0'; 1181 *p = '\0';
1096 1182
1097 atom = XInternAtom (dpy, server, False); 1183 atom = XInternAtom (dpy, server, False);
1098 win = XGetSelectionOwner (dpy, atom); 1184 win = XGetSelectionOwner (dpy, atom);
1099 1185
1100 if (win != None) 1186 if (win != None)
1101 return True; 1187 return true;
1102 } 1188 }
1103 1189
1104 return False; 1190 return false;
1105} 1191}
1106 1192
1107void 1193void
1108rxvt_term::IMSendSpot () 1194rxvt_term::im_send_spot ()
1109{ 1195{
1110 XPoint nspot; 1196 XPoint nspot;
1111 XVaNestedList preedit_attr; 1197 XVaNestedList preedit_attr;
1112 1198
1113 if (!Input_Context 1199 if (!Input_Context
… …
1166 1252
1167 term->make_current (); 1253 term->make_current ();
1168 1254
1169 if (text) 1255 if (text)
1170 { 1256 {
1171 void *str; 1257 wchar_t *str;
1172 1258
1173 if (!text->encoding_is_wchar && text->string.multi_byte) 1259 if (!text->encoding_is_wchar && text->string.multi_byte)
1174 { 1260 {
1175 // of course, X makes it ugly again 1261 // of course, X makes it ugly again
1176 if (term->rs[Rs_imLocale]) 1262 if (term->rs[Rs_imLocale])
1177 SET_LOCALE (term->rs[Rs_imLocale]); 1263 SET_LOCALE (term->rs[Rs_imLocale]);
1178 1264
1179 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1265 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1180 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1266 mbstowcs (str, text->string.multi_byte, text->length + 1);
1181 1267
1182 if (term->rs[Rs_imLocale]) 1268 if (term->rs[Rs_imLocale])
1183 SET_LOCALE (term->locale); 1269 SET_LOCALE (term->locale);
1184 } 1270 }
1185 else 1271 else
1186 str = (void *)text->string.wide_char; 1272 str = text->string.wide_char;
1187 1273
1188 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1274 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1189 DT_INT, call_data->caret, 1275 DT_INT, call_data->caret,
1190 DT_INT, call_data->chg_first, 1276 DT_INT, call_data->chg_first,
1191 DT_INT, call_data->chg_length, 1277 DT_INT, call_data->chg_length,
… …
1219/* 1305/*
1220 * Try to open a XIM with the current modifiers, then see if we can 1306 * Try to open a XIM with the current modifiers, then see if we can
1221 * open a suitable preedit type 1307 * open a suitable preedit type
1222 */ 1308 */
1223bool 1309bool
1224rxvt_term::IM_get_IC (const char *modifiers) 1310rxvt_term::im_get_ic (const char *modifiers)
1225{ 1311{
1226 int i, j, found; 1312 int i, j, found;
1227 XIM xim; 1313 XIM xim;
1228 XPoint spot; 1314 XPoint spot;
1229 XRectangle rect, status_rect, needed_rect; 1315 XRectangle rect, status_rect, needed_rect;
1230 unsigned long fg, bg; 1316 unsigned long fg, bg;
1231 const char *p; 1317 const char *p;
1232 char **s; 1318 char **s;
1233 XIMStyles *xim_styles; 1319 XIMStyles *xim_styles;
1234#ifdef ENABLE_XIM_ONTHESPOT
1235 XIMCallback xcb[4];
1236#endif
1237 1320
1238 set_environ (envv); 1321 set_environ (envv);
1239 1322
1240 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1323 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1241 return false; 1324 return false;
… …
1262 p = pet[pi]; 1345 p = pet[pi];
1263 1346
1264 if (!p) 1347 if (!p)
1265 continue; 1348 continue;
1266 1349
1267 s = rxvt_splitcommastring (p); 1350 s = rxvt_strsplit (',', p);
1268 1351
1269 for (i = found = 0; !found && s[i]; i++) 1352 for (i = found = 0; !found && s[i]; i++)
1270 { 1353 {
1271 if (!strcmp (s[i], "OverTheSpot")) 1354 if (!strcmp (s[i], "OverTheSpot"))
1272 input_style = XIMPreeditPosition | XIMStatusNothing; 1355 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1284 input_style = XIMPreeditNothing | XIMStatusNothing; 1367 input_style = XIMPreeditNothing | XIMStatusNothing;
1285 1368
1286 for (j = 0; j < xim_styles->count_styles; j++) 1369 for (j = 0; j < xim_styles->count_styles; j++)
1287 if (input_style == xim_styles->supported_styles[j]) 1370 if (input_style == xim_styles->supported_styles[j])
1288 { 1371 {
1289 rxvt_freecommastring (s); 1372 rxvt_free_strsplit (s);
1290 1373
1291 found = 1; 1374 found = 1;
1292 goto foundpet; 1375 goto foundpet;
1293 } 1376 }
1294 1377
1295 } 1378 }
1296 1379
1297 rxvt_freecommastring (s); 1380 rxvt_free_strsplit (s);
1298 } 1381 }
1299 1382
1300foundpet: 1383foundpet:
1301 1384
1302 XFree (xim_styles); 1385 XFree (xim_styles);
… …
1381 NULL); 1464 NULL);
1382 } 1465 }
1383#if ENABLE_XIM_ONTHESPOT 1466#if ENABLE_XIM_ONTHESPOT
1384 else if (input_style & XIMPreeditCallbacks) 1467 else if (input_style & XIMPreeditCallbacks)
1385 { 1468 {
1469 XIMCallback xcb[4];
1470
1386 im_set_position (spot); 1471 im_set_position (spot);
1387 1472
1388 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1473 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1389 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1474 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1390 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1475 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1405#endif 1490#endif
1406 1491
1407 Input_Context = XCreateIC (xim, 1492 Input_Context = XCreateIC (xim,
1408 XNInputStyle, input_style, 1493 XNInputStyle, input_style,
1409 XNClientWindow, vt, 1494 XNClientWindow, vt,
1410 XNFocusWindow, parent[0], 1495 XNFocusWindow, parent,
1411 preedit_attr ? XNPreeditAttributes : NULL, 1496 preedit_attr ? XNPreeditAttributes : NULL,
1412 preedit_attr, 1497 preedit_attr,
1413 status_attr ? XNStatusAttributes : NULL, 1498 status_attr ? XNStatusAttributes : NULL,
1414 status_attr, NULL); 1499 status_attr, NULL);
1415 1500
… …
1428 // unfortunately, only the focus window is used by XIM, hard to fix 1513 // unfortunately, only the focus window is used by XIM, hard to fix
1429 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1514 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1430 vt_select_input (); 1515 vt_select_input ();
1431#endif 1516#endif
1432 1517
1433 IMSetPosition (); 1518 im_set_position ();
1434 1519
1435 return true; 1520 return true;
1436} 1521}
1437 1522
1438void 1523void
… …
1448 im_destroy (); 1533 im_destroy ();
1449 1534
1450 if (Input_Context) 1535 if (Input_Context)
1451 return; 1536 return;
1452 1537
1453#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1454 if (rs[Rs_imLocale]) 1538 if (rs[Rs_imLocale])
1455 SET_LOCALE (rs[Rs_imLocale]); 1539 SET_LOCALE (rs[Rs_imLocale]);
1456#endif
1457 1540
1458 p = rs[Rs_inputMethod]; 1541 p = rs[Rs_inputMethod];
1459 if (p && *p) 1542 if (p && *p)
1460 { 1543 {
1461 bool found = false; 1544 bool found = false;
1462 1545
1463 s = rxvt_splitcommastring (p); 1546 s = rxvt_strsplit (',', p);
1464 1547
1465 for (i = 0; s[i]; i++) 1548 for (i = 0; s[i]; i++)
1466 { 1549 {
1467 if (*s[i]) 1550 if (*s[i])
1468 { 1551 {
1469 strcpy (buf, "@im="); 1552 strcpy (buf, "@im=");
1470 strncat (buf, s[i], IMBUFSIZ - 5); 1553 strncat (buf, s[i], IMBUFSIZ - 5);
1471 if (IM_get_IC (buf)) 1554 if (im_get_ic (buf))
1472 { 1555 {
1473 found = true; 1556 found = true;
1474 break; 1557 break;
1475 } 1558 }
1476 } 1559 }
1477 } 1560 }
1478 1561
1479 rxvt_freecommastring (s); 1562 rxvt_free_strsplit (s);
1480 1563
1481 if (found) 1564 if (found)
1482 goto done; 1565 goto done;
1483 } 1566 }
1484 1567
1485 /* try with XMODIFIERS env. var. */ 1568 /* try with XMODIFIERS env. var. */
1486 if (IM_get_IC ("")) 1569 if (im_get_ic (""))
1487 goto done; 1570 goto done;
1488 1571
1489 /* try with no modifiers base IF the user didn't specify an IM */ 1572 /* try with no modifiers base IF the user didn't specify an IM */
1490 if (IM_get_IC ("@im=none")) 1573 if (im_get_ic ("@im=none"))
1491 goto done; 1574 goto done;
1492 1575
1493done: 1576done:
1494#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1495 if (rs[Rs_imLocale]) 1577 if (rs[Rs_imLocale])
1496 SET_LOCALE (locale); 1578 SET_LOCALE (locale);
1497#endif
1498} 1579}
1499 1580
1500void 1581void
1501rxvt_term::IMSetPosition () 1582rxvt_term::im_set_position ()
1502{ 1583{
1503 XRectangle preedit_rect, status_rect, *needed_rect; 1584 XRectangle preedit_rect, status_rect, *needed_rect;
1504 XVaNestedList preedit_attr, status_attr; 1585 XVaNestedList preedit_attr, status_attr;
1505 1586
1506 if (!Input_Context 1587 if (!Input_Context
1507 || !focus 1588 || !focus
1508 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1589 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1509 || !IMisRunning ()) 1590 || !im_is_running ())
1510 return; 1591 return;
1511 1592
1512 if (input_style & XIMPreeditPosition) 1593 if (input_style & XIMPreeditPosition)
1513 { 1594 {
1514 im_set_size (preedit_rect); 1595 im_set_size (preedit_rect);
… …
1544 1625
1545void 1626void
1546rxvt_term::get_window_origin (int &x, int &y) 1627rxvt_term::get_window_origin (int &x, int &y)
1547{ 1628{
1548 Window cr; 1629 Window cr;
1549 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1630 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1550/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1551}
1552
1553Pixmap
1554rxvt_term::get_pixmap_property (int prop_id)
1555{
1556 if (prop_id > 0 && prop_id < NUM_XA)
1557 if (xa[prop_id])
1558 {
1559 int aformat;
1560 unsigned long nitems, bytes_after;
1561 Atom atype;
1562 unsigned char *prop = NULL;
1563 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1564 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1565 &nitems, &bytes_after, &prop);
1566 if (result == Success && prop && atype == XA_PIXMAP)
1567 return *(Pixmap *)prop;
1568 }
1569
1570 return None;
1571} 1631}
1572 1632
1573#ifdef HAVE_BG_PIXMAP 1633#ifdef HAVE_BG_PIXMAP
1574# if TRACE_PIXMAPS
1575# undef update_background
1576void
1577rxvt_term::trace_update_background (const char *file, int line)
1578{
1579 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1580 update_background ();
1581}
1582# endif
1583 1634
1584void 1635void
1585rxvt_term::update_background () 1636rxvt_term::update_background ()
1586{ 1637{
1587 if (update_background_ev.is_active ()) 1638 if (update_background_ev.is_active ())
1588 return; 1639 return;
1589 1640
1590 bgPixmap.invalidate (); 1641 bg_invalidate ();
1591 1642
1643 if (!mapped)
1644 return;
1645
1592 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1646 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1593 1647
1594 if (to_wait <= 0.) 1648 if (to_wait <= 0.)
1595 bgPixmap.render (); 1649 bg_render ();
1596 else 1650 else
1597 update_background_ev.start (to_wait); 1651 update_background_ev.start (to_wait);
1598} 1652}
1599 1653
1600void 1654void
1601rxvt_term::update_background_cb (ev::timer &w, int revents) 1655rxvt_term::update_background_cb (ev::timer &w, int revents)
1602{ 1656{
1603 make_current (); 1657 make_current ();
1604 1658
1605 update_background_ev.stop (); 1659 update_background_ev.stop ();
1606 bgPixmap.render (); 1660 bg_render ();
1607 refresh_check (); 1661 refresh_check ();
1608} 1662}
1609 1663
1610#endif /* HAVE_BG_PIXMAP */ 1664#endif /* HAVE_BG_PIXMAP */
1611 1665

Diff Legend

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