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.302 by root, Fri Jan 25 16:04:57 2008 UTC vs.
Revision 1.399 by sf-exg, Tue Oct 13 08:10:43 2015 UTC

11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
17 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
17 * 18 *
18 * This program is free software; you can redistribute it and/or modify 19 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 20 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 21 * the Free Software Foundation; either version 3 of the License, or
21 * (at your option) any later version. 22 * (at your option) any later version.
22 * 23 *
23 * This program is distributed in the hope that it will be useful, 24 * This program is distributed in the hope that it will be useful,
24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 25 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 31 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 32 *---------------------------------------------------------------------*/
32 33
33#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "init.h"
35#include "keyboard.h" 37#include "keyboard.h"
36#include "rxvtperl.h" 38#include "rxvtperl.h"
37 39
38#include <limits> 40#include <limits>
39 41
42#include <assert.h>
40#include <csignal> 43#include <signal.h>
41#include <cstring> 44#include <string.h>
42 45
43#include <termios.h> 46#include <termios.h>
44 47
45#ifdef HAVE_XSETLOCALE 48#ifdef HAVE_XSETLOCALE
46# define X_LOCALE 49# define X_LOCALE
47# include <X11/Xlocale.h> 50# include <X11/Xlocale.h>
48#else 51#else
49# ifdef HAVE_SETLOCALE
50# include <clocale> 52# include <locale.h>
51# endif 53#endif
52#endif
53 54
55struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 56vector<rxvt_term *> rxvt_term::termlist;
55 57
56// used to tell global functions which terminal instance is "active" 58// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 59rxvt_t rxvt_current_term;
58 60
93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94{ 96{
95 compose_char *cc; 97 compose_char *cc;
96 98
97 // break compose chains, as stupid readline really likes to duplicate 99 // break compose chains, as stupid readline really likes to duplicate
98 // composing characters for some reason near the end of a line. 100 // composing characters for some reason, near the end of a line.
99 cc = (*this)[c1]; 101 cc = (*this)[c1];
100 while (cc) 102 while (cc)
101 { 103 {
102 if (cc->c2 == c2) return c1; 104 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 105 cc = (*this)[cc->c1];
104 } 106 }
105 107
106 // check to see wether this combination already exists otherwise 108 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 109 for (cc = v.begin (); cc < v.end (); cc++)
108 {
109 if (cc->c1 == c1 && cc->c2 == c2) 110 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 111 return COMPOSE_LO + (cc - v.begin ());
111 }
112 112
113 // allocate a new combination 113 // allocate a new combination
114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115 { 115 {
116 static int seen; 116 static int seen;
117 117
118 if (!seen++) 118 if (!seen++)
119 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 119 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120 120
121 return REPLACEMENT_CHAR; 121 return REPLACEMENT_CHAR;
122 } 122 }
123 123
124 v.push_back (compose_char (c1, c2)); 124 v.push_back (compose_char (c1, c2));
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif 170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 176#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM 178#if USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182#endif 180#endif
183#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
185#endif 183#endif
188#endif 186#endif
189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 193
197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 194 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
198 195
227 delete fontset[i]; 224 delete fontset[i];
228#endif 225#endif
229 delete fontset[0]; 226 delete fontset[0];
230 227
231#ifdef HAVE_BG_PIXMAP 228#ifdef HAVE_BG_PIXMAP
232 bgPixmap.destroy (); 229 bg_destroy ();
230#endif
231
232#if HAVE_IMG
233 delete bg_img;
233#endif 234#endif
234 235
235 if (display) 236 if (display)
236 { 237 {
237 selection_clear (); 238 selection_clear ();
239 selection_clear (true);
238 240
239#ifdef USE_XIM 241#if USE_XIM
240 im_destroy (); 242 im_destroy ();
241#endif 243#endif
242#ifdef XTERM_SCROLLBAR 244 scrollBar.destroy ();
243 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC); 245
244 if (ShadowGC) XFreeGC (dpy, ShadowGC); 246 if (gc)
245#endif
246#ifdef PLAIN_SCROLLBAR
247 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
248#endif
249#ifdef NEXT_SCROLLBAR
250 if (blackGC) XFreeGC (dpy, blackGC);
251 if (whiteGC) XFreeGC (dpy, whiteGC);
252 if (grayGC) XFreeGC (dpy, grayGC);
253 if (darkGC) XFreeGC (dpy, darkGC);
254 if (stippleGC) XFreeGC (dpy, stippleGC);
255 if (dimple) XFreePixmap (dpy, dimple);
256 if (upArrow) XFreePixmap (dpy, upArrow);
257 if (downArrow) XFreePixmap (dpy, downArrow);
258 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
259 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
260#endif
261#ifdef RXVT_SCROLLBAR
262 if (topShadowGC) XFreeGC (dpy, topShadowGC);
263 if (botShadowGC) XFreeGC (dpy, botShadowGC);
264 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
265#endif
266 if (gc) XFreeGC (dpy, gc); 247 XFreeGC (dpy, gc);
267 248
268 delete drawable; 249 delete drawable;
250
269 // destroy all windows 251 // destroy all windows
270 if (parent[0]) 252 if (parent)
271 XDestroyWindow (dpy, parent[0]); 253 XDestroyWindow (dpy, parent);
272 254
273 for (int i = 0; i < TOTAL_COLORS; i++) 255 for (int i = 0; i < TOTAL_COLORS; i++)
274 if (ISSET_PIXCOLOR (i)) 256 if (ISSET_PIXCOLOR (i))
275 { 257 {
276 pix_colors_focused [i].free (this); 258 pix_colors_focused [i].free (this);
277#if OFF_FOCUS_FADING 259#if OFF_FOCUS_FADING
260 if (rs[Rs_fade])
278 pix_colors_unfocused [i].free (this); 261 pix_colors_unfocused [i].free (this);
279#endif 262#endif
280 } 263 }
281 264
282 clear (); 265 clear ();
283 266
290 /* clear all resources */ 273 /* clear all resources */
291 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
292 free (allocated [i]); 275 free (allocated [i]);
293 276
294 free (selection.text); 277 free (selection.text);
295 // TODO: manage env vars in child only(!) 278 free (selection.clip_text);
296 free (env_display);
297 free (env_term);
298 free (locale); 279 free (locale);
299 free (v_buffer); 280 free (v_buffer);
300 free (incr_buf); 281
282 delete selection_req;
283
284 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
285 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
286
287 delete [] env;
301 288
302 delete envv; 289 delete envv;
303 delete argv; 290 delete argv;
304 291
305#ifdef KEYSYM_RESOURCE 292#ifdef KEYSYM_RESOURCE
306 delete keyboard; 293 delete keyboard;
307#endif 294#endif
308#ifndef NO_RESOURCES 295#ifndef NO_RESOURCES
309 XrmDestroyDatabase (option_db); 296 XrmDestroyDatabase (option_db);
310#endif 297#endif
298
299 SET_R ((rxvt_term *)0);
311} 300}
312 301
313// child has exited, usually destroys 302// child has exited, usually destroys
314void 303void
315rxvt_term::child_cb (ev::child &w, int status) 304rxvt_term::child_cb (ev::child &w, int status)
337 if (display) 326 if (display)
338 { 327 {
339#if USE_XIM 328#if USE_XIM
340 im_ev.stop (display); 329 im_ev.stop (display);
341#endif 330#endif
342#if HAVE_SCROLLBARS
343 scrollbar_ev.stop (display); 331 scrollbar_ev.stop (display);
344#endif 332#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
345#if ENABLE_TRANSPARENCY || ENABLE_PERL
346 rootwin_ev.stop (display); 333 rootwin_ev.stop (display);
347#endif 334#endif
348 incr_ev.stop ();
349 termwin_ev.stop (display); 335 termwin_ev.stop (display);
350 vt_ev.stop (display); 336 vt_ev.stop (display);
351 } 337 }
352 338
353 flush_ev.stop (); 339 flush_ev.stop ();
377 make_current (); 363 make_current ();
378 364
379 delete this; 365 delete this;
380} 366}
381 367
368void
369rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
370{
371 if (!opt)
372 return;
373
374 uint8_t mask = 1 << (opt & 7);
375 uint8_t &val = options [opt >> 3];
376
377 val = val & ~mask | (set ? mask : 0);
378}
379
382/*----------------------------------------------------------------------*/ 380/*----------------------------------------------------------------------*/
383/* 381/*
384 * Exit gracefully, clearing the utmp entry and restoring tty attributes 382 * Exit gracefully, clearing the utmp entry and restoring tty attributes
385 * TODO: if debugging, this should free up any known resources if we can
386 */ 383 */
387static XErrorHandler old_xerror_handler; 384static XErrorHandler old_xerror_handler;
388 385
389static void 386static void
390rxvt_emergency_cleanup () 387rxvt_emergency_cleanup ()
392 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 389 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
393 (*t)->emergency_cleanup (); 390 (*t)->emergency_cleanup ();
394} 391}
395 392
396#if !ENABLE_MINIMAL 393#if !ENABLE_MINIMAL
397static void 394static void ecb_cold
398print_x_error (Display *dpy, XErrorEvent *event) 395print_x_error (Display *dpy, XErrorEvent *event)
399{ 396{
400 char buffer[BUFSIZ]; 397 char buffer[BUFSIZ];
401 char mesg[BUFSIZ]; 398 char mesg[BUFSIZ];
402 char number[32]; 399 char number[32];
403 char *mtype = "XlibMessage"; 400
404 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
405 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
406 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 401 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
402
403 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
404 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
405
406 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
407 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
407 rxvt_warn ("%s: %s\n", mesg, buffer); 408 rxvt_warn ("+ %s: %s\n", mesg, buffer);
409
408 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 410 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
409 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 411 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
412
413 if (event->request_code >= 128)
414 {
415#if 0
416 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
417 int nexts;
418 char **exts = XListExtensions (dpy, &nexts);
419
420 while (nexts)
421 {
422 char *extname = exts [nexts - 1];
423 int major, first_event, first_error;
424
425 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
426 {
427 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
428 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
429
430 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
431 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
432 rxvt_warn ("+ (which is %s)\n", buffer);
433
434 break;
435 }
436
437 printf ("nextss %d %s\n", nexts, extname);//D
438 --nexts;
439 ++exts;
440 }
441#else
442 int nexts = 0;
443 char **exts = 0;
444#endif
445
446 if (!nexts)
447 {
448 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
449
450 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
451 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
452
453#if 0
454 sprintf (number, "RENDER.%d", event->minor_code);
455 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
456 rxvt_warn ("+ (which is %s)\n", buffer);
457#endif
458 }
459
460 XFreeExtensionList (exts);
461 }
462 else
463 {
410 sprintf(number, "%d", event->request_code); 464 sprintf (number, "%d", event->request_code);
411 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 465 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
412 rxvt_warn ("(which is %s)\n", buffer); 466 rxvt_warn ("+ (which is %s)\n", buffer);
413 if (event->request_code >= 128) {
414 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
415 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
417 } 467 }
468
418 if ((event->error_code == BadWindow) || 469 if (event->error_code == BadWindow
419 (event->error_code == BadPixmap) || 470 || event->error_code == BadPixmap
420 (event->error_code == BadCursor) || 471 || event->error_code == BadCursor
421 (event->error_code == BadFont) || 472 || event->error_code == BadFont
422 (event->error_code == BadDrawable) || 473 || event->error_code == BadDrawable
423 (event->error_code == BadColor) || 474 || event->error_code == BadColor
424 (event->error_code == BadGC) || 475 || event->error_code == BadGC
425 (event->error_code == BadIDChoice) || 476 || event->error_code == BadIDChoice
426 (event->error_code == BadValue) || 477 || event->error_code == BadValue
427 (event->error_code == BadAtom)) { 478 || event->error_code == BadAtom)
479 {
428 if (event->error_code == BadValue) 480 if (event->error_code == BadValue)
429 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
430 mesg, BUFSIZ);
431 else if (event->error_code == BadAtom) 482 else if (event->error_code == BadAtom)
432 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 483 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
433 mesg, BUFSIZ); 484 else
434 else
435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 485 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
436 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438 }
439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442}
443#endif
444 486
445int 487 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
488 }
489}
490#endif
491
492int ecb_cold
446rxvt_xerror_handler (Display *display, XErrorEvent *event) 493rxvt_xerror_handler (Display *display, XErrorEvent *event)
447{ 494{
448 if (GET_R->allowedxerror == -1) 495 if (GET_R && GET_R->allowedxerror == -1)
449 GET_R->allowedxerror = event->error_code; 496 GET_R->allowedxerror = event->error_code;
450 else 497 else
451 { 498 {
452 // GET_R is most likely not the terminal which caused the error, 499 // GET_R is most likely not the terminal which caused the error,
453 // so just output the error and continue 500 // so just output the error and continue
459 } 506 }
460 507
461 return 0; 508 return 0;
462} 509}
463 510
464int 511int ecb_cold
465rxvt_xioerror_handler (Display *display) 512rxvt_xioerror_handler (Display *display)
466{ 513{
467 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 514 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
468 DisplayString (display)); 515 DisplayString (display));
469 rxvt_emergency_cleanup (); 516 rxvt_emergency_cleanup ();
492 rxvt_emergency_cleanup (); 539 rxvt_emergency_cleanup ();
493 w.stop (); 540 w.stop ();
494 kill (getpid (), w.signum); 541 kill (getpid (), w.signum);
495} 542}
496 543
544static void
545rxvt_get_ttymode (struct termios *tio)
546{
547 if (tcgetattr (STDIN_FILENO, tio) < 0)
548 memset (tio, 0, sizeof (struct termios));
549
550 for (int i = 0; i < NCCS; i++)
551 tio->c_cc[i] = VDISABLE;
552
553 tio->c_cc[VINTR] = CINTR;
554 tio->c_cc[VQUIT] = CQUIT;
555 tio->c_cc[VERASE] = CERASE;
556#ifdef VERASE2
557 tio->c_cc[VERASE2] = CERASE2;
558#endif
559 tio->c_cc[VKILL] = CKILL;
560 tio->c_cc[VEOF] = CEOF;
561 tio->c_cc[VSTART] = CSTART;
562 tio->c_cc[VSTOP] = CSTOP;
563 tio->c_cc[VSUSP] = CSUSP;
564# ifdef VDSUSP
565 tio->c_cc[VDSUSP] = CDSUSP;
566# endif
567# ifdef VREPRINT
568 tio->c_cc[VREPRINT] = CRPRNT;
569# endif
570# ifdef VDISCRD
571 tio->c_cc[VDISCRD] = CFLUSH;
572# endif
573# ifdef VWERSE
574 tio->c_cc[VWERSE] = CWERASE;
575# endif
576# ifdef VLNEXT
577 tio->c_cc[VLNEXT] = CLNEXT;
578# endif
579# ifdef VSTATUS
580 tio->c_cc[VSTATUS] = CSTATUS;
581# endif
582
583# if VMIN != VEOF
584 tio->c_cc[VMIN] = 1;
585# endif
586# if VTIME != VEOL
587 tio->c_cc[VTIME] = 0;
588# endif
589
590 /* input modes */
591 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
592# ifdef IMAXBEL
593 | IMAXBEL
594# endif
595 | IXON);
596
597 /* output modes */
598 tio->c_oflag = (OPOST | ONLCR);
599
600 /* control modes */
601 tio->c_cflag = (CS8 | CREAD);
602
603 /* local modes */
604 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
605# if defined (ECHOCTL) && defined (ECHOKE)
606 | ECHOCTL | ECHOKE
607# endif
608 | ECHOE | ECHOK);
609}
610
497char **rxvt_environ; // startup environment 611char **rxvt_environ; // startup environment
498 612
499void 613void
500rxvt_init () 614rxvt_init ()
501{ 615{
502 ptytty::init (); 616 assert (("fontMask must not overlap other RS masks",
617 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
503 618
619 rxvt_get_ttymode (&rxvt_term::def_tio);
620
621 // get rid of stdin/stdout as we don't need them, to free resources
622 dup2 (STDERR_FILENO, STDIN_FILENO);
623 dup2 (STDERR_FILENO, STDOUT_FILENO);
624
504 if (!ev_default_loop (0)) 625 if (!ev_default_loop ())
505 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 626 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
506 627
507 rxvt_environ = environ; 628 rxvt_environ = environ;
508 629
509 signal (SIGHUP, SIG_IGN); 630 signal (SIGHUP, SIG_IGN);
510 signal (SIGPIPE, SIG_IGN); 631 signal (SIGPIPE, SIG_IGN);
511 632
512 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 633 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
513 sig_handlers.sw_int.start (SIGINT); ev_unref (); 634 sig_handlers.sw_int.start (SIGINT); ev_unref ();
514
515 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
516 /* signal (SIGURG, SIG_DFL); */
517 635
518 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
519 // TODO: handle this with exceptions and tolerate the memory loss 637 // TODO: handle this with exceptions and tolerate the memory loss
520 XSetIOErrorHandler (rxvt_xioerror_handler); 638 XSetIOErrorHandler (rxvt_xioerror_handler);
521 639
522 XrmInitialize (); 640 XrmInitialize ();
641
642#if HAVE_PIXBUF
643 g_type_init ();
644#endif
523} 645}
524 646
525/*----------------------------------------------------------------------*/ 647/*----------------------------------------------------------------------*/
526/* 648/*
527 * window size/position calculations for XSizeHint and other storage. 649 * window size/position calculations for XSizeHint and other storage.
529 */ 651 */
530void 652void
531rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 653rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
532{ 654{
533 short recalc_x, recalc_y; 655 short recalc_x, recalc_y;
534 int x, y, sb_w, flags; 656 int x, y, flags;
535 unsigned int w, h; 657 unsigned int w, h;
536 unsigned int max_width, max_height; 658 unsigned int max_width, max_height;
537 659
538 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 660 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
539 szHint.win_gravity = NorthWestGravity; 661 szHint.win_gravity = NorthWestGravity;
549 if (rs[Rs_geometry]) 671 if (rs[Rs_geometry])
550 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 672 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
551 673
552 if (flags & WidthValue) 674 if (flags & WidthValue)
553 { 675 {
676 if (!w)
677 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
678
554 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 679 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
555 szHint.flags |= USSize; 680 szHint.flags |= USSize;
556 } 681 }
557 682
558 if (flags & HeightValue) 683 if (flags & HeightValue)
559 { 684 {
685 if (!h)
686 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
687
560 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 688 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
561 szHint.flags |= USSize; 689 szHint.flags |= USSize;
562 } 690 }
563 691
564 if (flags & XValue) 692 if (flags & XValue)
565 { 693 {
596 max_width = MAX_COLS * fwidth; 724 max_width = MAX_COLS * fwidth;
597 max_height = MAX_ROWS * fheight; 725 max_height = MAX_ROWS * fheight;
598 726
599 szHint.base_width = szHint.base_height = 2 * int_bwidth; 727 szHint.base_width = szHint.base_height = 2 * int_bwidth;
600 728
601 sb_w = 0;
602 window_vt_x = window_vt_y = int_bwidth; 729 window_vt_x = window_vt_y = int_bwidth;
603 730
604 if (scrollBar.state) 731 if (scrollBar.state)
605 { 732 {
606 sb_w = scrollbar_TotalWidth (); 733 int sb_w = scrollBar.total_width ();
607 szHint.base_width += sb_w; 734 szHint.base_width += sb_w;
608 735
609 if (!option (Opt_scrollBar_right)) 736 if (!option (Opt_scrollBar_right))
610 window_vt_x += sb_w; 737 window_vt_x += sb_w;
611 } 738 }
635 { 762 {
636 min_it (height, max_height); 763 min_it (height, max_height);
637 szHint.height = szHint.base_height + height; 764 szHint.height = szHint.base_height + height;
638 } 765 }
639 766
640 if (scrollBar.state && option (Opt_scrollBar_right))
641 window_sb_x = szHint.width - sb_w;
642
643 if (recalc_x) 767 if (recalc_x)
644 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 768 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
645 769
646 if (recalc_y) 770 if (recalc_y)
647 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 771 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
648 772
649 ncol = width / fwidth; 773 ncol = width / fwidth;
650 nrow = height / fheight; 774 nrow = height / fheight;
775
776 // When the size of the vt window is not a multiple of the cell
777 // size, i.e., when the wm does not honour our size hints, there are
778 // extra areas not covered by the terminal screen. Such gaps, when a
779 // bg pixmap is set, would have to be cleared manually to properly
780 // refresh the background. We take the simpler route and shrink the
781 // vt window so as to avoid creating gaps.
782 vt_width = ncol * fwidth;
783 vt_height = nrow * fheight;
651} 784}
652 785
653/*----------------------------------------------------------------------*/ 786/*----------------------------------------------------------------------*/
654/* 787/*
655 * Tell the teletype handler what size the window is. 788 * Tell the teletype handler what size the window is.
663 796
664 struct winsize ws; 797 struct winsize ws;
665 798
666 ws.ws_col = ncol; 799 ws.ws_col = ncol;
667 ws.ws_row = nrow; 800 ws.ws_row = nrow;
668 ws.ws_xpixel = width; 801 ws.ws_xpixel = vt_width;
669 ws.ws_ypixel = height; 802 ws.ws_ypixel = vt_height;
670 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 803 ioctl (pty->pty, TIOCSWINSZ, &ws);
671 804
672#if 0 805#if 0
673 // TIOCSWINSZ is supposed to do this automatically and correctly 806 // TIOCSWINSZ is supposed to do this automatically and correctly
674 if (cmd_pid) /* force through to the command */ 807 if (cmd_pid) /* force through to the command */
675 kill (-cmd_pid, SIGWINCH); 808 kill (-cmd_pid, SIGWINCH);
676#endif 809#endif
677} 810}
678 811
679/*----------------------------------------------------------------------*/ 812/*----------------------------------------------------------------------*/
680/* set_fonts () - load and set the various fonts 813/* load and set the various fonts */
681 *
682 * init = 1 - initialize
683 *
684 * fontname == FONT_UP - switch to bigger font
685 * fontname == FONT_DN - switch to smaller font
686 */
687bool 814bool
688rxvt_term::set_fonts () 815rxvt_term::set_fonts ()
689{ 816{
690 rxvt_fontset *fs = new rxvt_fontset (this); 817 rxvt_fontset *fs = new rxvt_fontset (this);
691 rxvt_fontprop prop; 818 rxvt_fontprop prop;
705#endif 832#endif
706 833
707 delete fontset[0]; 834 delete fontset[0];
708 fontset[0] = fs; 835 fontset[0] = fs;
709 836
710 prop = (*fs)[1]->properties (); 837 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
711 prop.height += lineSpace; 838 prop.width = max (prop.width + letterSpace, 1);
712 839
713 fs->set_prop (prop, false); 840 fs->set_prop (prop, false);
714 841
715 fwidth = prop.width; 842 fwidth = prop.width;
716 fheight = prop.height; 843 fheight = prop.height + lineSpace;
717 fbase = prop.ascent; 844 fbase = prop.ascent;
718 845
719 for (int style = 1; style < 4; style++) 846 for (int style = 1; style < 4; style++)
720 { 847 {
721#if ENABLE_STYLES 848#if ENABLE_STYLES
747#else 874#else
748 fontset[style] = fontset[0]; 875 fontset[style] = fontset[0];
749#endif 876#endif
750 } 877 }
751 878
752 if (parent[0]) 879 if (parent)
753 { 880 {
754 resize_all_windows (0, 0, 0); 881 resize_all_windows (0, 0, 0);
755 scr_remap_chars (); 882 scr_remap_chars ();
756 scr_touch (true); 883 scr_touch (true);
757 } 884 }
760} 887}
761 888
762void 889void
763rxvt_term::set_string_property (Atom prop, const char *str, int len) 890rxvt_term::set_string_property (Atom prop, const char *str, int len)
764{ 891{
765 XChangeProperty (dpy, parent[0], 892 XChangeProperty (dpy, parent,
766 prop, XA_STRING, 8, PropModeReplace, 893 prop, XA_STRING, 8, PropModeReplace,
767 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 894 (const unsigned char *)str, len >= 0 ? len : strlen (str));
768} 895}
769 896
770void 897void
898rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
899{
900 XTextProperty ct;
901
902 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
903 {
904 XSetTextProperty (dpy, parent, &ct, prop);
905 XFree (ct.value);
906 }
907}
908
909void
771rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 910rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
772{ 911{
773 wchar_t *ws = rxvt_mbstowcs (str, len); 912 wchar_t *ws = rxvt_mbstowcs (str, len);
774 char *s = rxvt_wcstoutf8 (ws); 913 char *s = rxvt_wcstoutf8 (ws);
775 914
776 XChangeProperty (dpy, parent[0], 915 XChangeProperty (dpy, parent,
777 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 916 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
778 (const unsigned char *)s, strlen (s)); 917 (const unsigned char *)s, strlen (s));
779 918
780 free (s); 919 free (s);
781 free (ws); 920 free (ws);
785/*----------------------------------------------------------------------*/ 924/*----------------------------------------------------------------------*/
786/* xterm sequences - title, iconName, color (exptl) */ 925/* xterm sequences - title, iconName, color (exptl) */
787void 926void
788rxvt_term::set_title (const char *str) 927rxvt_term::set_title (const char *str)
789{ 928{
790 set_string_property (XA_WM_NAME, str); 929 set_mbstring_property (XA_WM_NAME, str);
791#if ENABLE_EWMH 930#if ENABLE_EWMH
792 set_utf8_property (xa[XA_NET_WM_NAME], str); 931 set_utf8_property (xa[XA_NET_WM_NAME], str);
793#endif 932#endif
794} 933}
795 934
796void 935void
797rxvt_term::set_icon_name (const char *str) 936rxvt_term::set_icon_name (const char *str)
798{ 937{
799 set_string_property (XA_WM_ICON_NAME, str); 938 set_mbstring_property (XA_WM_ICON_NAME, str);
800#if ENABLE_EWMH 939#if ENABLE_EWMH
801 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 940 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
802#endif 941#endif
803} 942}
804 943
805void 944void
806rxvt_term::set_window_color (int idx, const char *color) 945rxvt_term::set_window_color (int idx, const char *color)
807{ 946{
808#ifdef XTERM_COLOR_CHANGE 947#ifdef XTERM_COLOR_CHANGE
809 rxvt_color xcol;
810 int i;
811
812 if (color == NULL || *color == '\0') 948 if (color == NULL || *color == '\0')
813 return; 949 return;
814 950
815 color = strdup (color); 951 color = strdup (color);
816 allocated.push_back ((void *)color); 952 allocated.push_back ((void *)color);
817 rs[Rs_color + idx] = color; 953 rs[Rs_color + idx] = color;
818 954
819 /* handle color aliases */ 955 /* handle color aliases */
820 if (isdigit (*color)) 956 if (isdigit (*color))
821 { 957 {
822 i = atoi (color); 958 int i = atoi (color);
823 959
824 if (i >= 8 && i <= 15) 960 if (i >= 8 && i <= 15)
825 { 961 {
826 /* bright colors */ 962 /* bright colors */
827 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 963 alias_color (idx, minBrightCOLOR + i - 8);
828 goto done; 964 goto done;
829 } 965 }
830 966
831 if (i >= 0 && i <= 7) 967 if (i >= 0 && i <= 7)
832 { 968 {
833 /* normal colors */ 969 /* normal colors */
834 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 970 alias_color (idx, minCOLOR + i);
835 goto done; 971 goto done;
836 } 972 }
837 } 973 }
838 974
839 set_color (xcol, color); 975 pix_colors_focused[idx].free (this);
840 976 set_color (pix_colors_focused[idx], color);
841 /*
842 * FIXME: should free colors here, but no idea how to do it so instead,
843 * so just keep gobbling up the colormap
844 */
845
846 pix_colors_focused[idx] = xcol;
847 977
848done: 978done:
849 /*TODO: handle Color_BD, scrollbar background, etc. */ 979 /*TODO: handle Color_BD, scrollbar background, etc. */
850 980
851 update_fade_color (idx); 981 update_fade_color (idx);
852 recolour_cursor (); 982 recolor_cursor ();
853 scr_recolour (); 983 scr_recolor ();
854#endif /* XTERM_COLOR_CHANGE */ 984#endif /* XTERM_COLOR_CHANGE */
855} 985}
856 986
857void 987void
858rxvt_term::recolour_cursor () 988rxvt_term::recolor_cursor ()
859{ 989{
860 XColor fg, bg; 990 XColor fg, bg;
861 991
862 (ISSET_PIXCOLOR (Color_pointer_fg) 992 (ISSET_PIXCOLOR (Color_pointer_fg)
863 ? pix_colors_focused[Color_pointer_fg] 993 ? pix_colors_focused[Color_pointer_fg]
872 1002
873/*----------------------------------------------------------------------*/ 1003/*----------------------------------------------------------------------*/
874/* 1004/*
875 * find if fg/bg matches any of the normal (low-intensity) colors 1005 * find if fg/bg matches any of the normal (low-intensity) colors
876 */ 1006 */
877void 1007char *
878rxvt_term::set_colorfgbg () 1008rxvt_term::get_colorfgbg ()
879{ 1009{
880 unsigned int i; 1010 unsigned int i;
881 const char *xpmb = ""; 1011 const char *xpmb = "";
882 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1012 char fstr[] = "default";
1013 char bstr[] = "default";
1014 char *env_colorfgbg;
883 1015
884 strcpy (fstr, "default");
885 strcpy (bstr, "default");
886 for (i = Color_Black; i <= Color_White; i++) 1016 for (i = Color_Black; i <= Color_White; i++)
887 if (pix_colors[Color_fg] == pix_colors[i]) 1017 if (pix_colors[Color_fg] == pix_colors[i])
888 { 1018 {
889 sprintf (fstr, "%d", (i - Color_Black)); 1019 sprintf (fstr, "%d", i - Color_Black);
890 break; 1020 break;
891 } 1021 }
892 1022
893 for (i = Color_Black; i <= Color_White; i++) 1023 for (i = Color_Black; i <= Color_White; i++)
894 if (pix_colors[Color_bg] == pix_colors[i]) 1024 if (pix_colors[Color_bg] == pix_colors[i])
895 { 1025 {
896 sprintf (bstr, "%d", (i - Color_Black)); 1026 sprintf (bstr, "%d", i - Color_Black);
897#ifdef BG_IMAGE_FROM_FILE 1027#if BG_IMAGE_FROM_FILE
898 xpmb = "default;"; 1028 xpmb = "default;";
899#endif 1029#endif
900 break; 1030 break;
901 } 1031 }
902 1032
1033 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
903 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1034 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1035 return env_colorfgbg;
904} 1036}
905 1037
906/*----------------------------------------------------------------------*/ 1038/*----------------------------------------------------------------------*/
907 1039
908bool 1040bool
916} 1048}
917 1049
918void 1050void
919rxvt_term::alias_color (int dst, int src) 1051rxvt_term::alias_color (int dst, int src)
920{ 1052{
1053 pix_colors[dst].free (this);
921 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); 1054 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
922} 1055}
923 1056
924/* -------------------------------------------------------------------- * 1057/* -------------------------------------------------------------------- *
925 * - WINDOW RESIZING - * 1058 * - WINDOW RESIZING - *
931 int old_width = szHint.width; 1064 int old_width = szHint.width;
932 int old_height = szHint.height; 1065 int old_height = szHint.height;
933 1066
934 window_calc (newwidth, newheight); 1067 window_calc (newwidth, newheight);
935 1068
936 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1069 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1070
1071 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1072 if (set_hint)
1073 {
1074 szHint.flags &= ~(PBaseSize | PResizeInc);
937 XSetWMNormalHints (dpy, parent[0], &szHint); 1075 XSetWMNormalHints (dpy, parent, &szHint);
1076 szHint.flags |= PBaseSize | PResizeInc;
1077 }
938 1078
939 if (!ignoreparent) 1079 if (!ignoreparent)
940 { 1080 {
941#ifdef SMART_RESIZE 1081#ifdef SMART_RESIZE
942 /* 1082 /*
946 int x, y, x1, y1; 1086 int x, y, x1, y1;
947 int dx, dy; 1087 int dx, dy;
948 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1088 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
949 Window unused_cr; 1089 Window unused_cr;
950 1090
951 XTranslateCoordinates (dpy, parent[0], display->root, 1091 XTranslateCoordinates (dpy, parent, display->root,
952 0, 0, &x, &y, &unused_cr); 1092 0, 0, &x, &y, &unused_cr);
953 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1093 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
954 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1094 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
955 /* 1095 /*
956 * if display->root isn't the parent window, a WM will probably have offset 1096 * if display->root isn't the parent window, a WM will probably have offset
957 * our position for handles and decorations. Counter it 1097 * our position for handles and decorations. Counter it
958 */ 1098 */
975 if (y < y1) /* top half */ 1115 if (y < y1) /* top half */
976 dy = 0; 1116 dy = 0;
977 else if (y == y1) /* exact center */ 1117 else if (y == y1) /* exact center */
978 dy /= 2; 1118 dy /= 2;
979 1119
980 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1120 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
981 szHint.width, szHint.height); 1121 szHint.width, szHint.height);
982#else 1122#else
983 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1123 XResizeWindow (dpy, parent, szHint.width, szHint.height);
984#endif 1124#endif
985 } 1125 }
1126
1127 if (set_hint)
1128 XSetWMNormalHints (dpy, parent, &szHint);
986 1129
987 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1130 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
988 1131
989 if (fix_screen || newwidth != old_width || newheight != old_height) 1132 if (fix_screen || newwidth != old_width || newheight != old_height)
990 { 1133 {
991 if (scrollBar.state) 1134 if (scrollBar.state)
992 { 1135 scrollBar.resize ();
993 XMoveResizeWindow (dpy, scrollBar.win,
994 window_sb_x, 0,
995 scrollbar_TotalWidth (), szHint.height);
996 resize_scrollbar ();
997 }
998 1136
999 XMoveResizeWindow (dpy, vt, 1137 XMoveResizeWindow (dpy, vt,
1000 window_vt_x, window_vt_y, 1138 window_vt_x, window_vt_y,
1001 width, height); 1139 vt_width, vt_height);
1140
1141 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1002 1142
1003#ifdef HAVE_BG_PIXMAP 1143#ifdef HAVE_BG_PIXMAP
1004 if (bgPixmap.window_size_sensitive ()) 1144 if (bg_window_size_sensitive ())
1005 update_background (); 1145 update_background ();
1006#endif 1146#endif
1007
1008 scr_clear ();
1009 } 1147 }
1010 1148
1011 if (fix_screen || old_height == 0) 1149 if (fix_screen || old_height == 0)
1012 scr_reset (); 1150 scr_reset ();
1013 1151
1014 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1015 //scr_touch (false);
1016
1017#ifdef HAVE_BG_PIXMAP
1018// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1019// if (bgPixmap.pixmap)
1020// scr_touch (false);
1021#endif
1022
1023#ifdef USE_XIM 1152#if USE_XIM
1024 IMSetPosition (); 1153 im_set_position ();
1025#endif 1154#endif
1026} 1155}
1027 1156
1028/* 1157/*
1029 * Set the width/height of the vt window in characters. Units are pixels. 1158 * Set the width/height of the vt window in characters. Units are pixels.
1042 newwidth = wattr.width - szHint.base_width; 1171 newwidth = wattr.width - szHint.base_width;
1043 if (newheight == 0) 1172 if (newheight == 0)
1044 newheight = wattr.height - szHint.base_height; 1173 newheight = wattr.height - szHint.base_height;
1045 } 1174 }
1046 1175
1047 if (newwidth != width || newheight != height) 1176 if (newwidth != vt_width || newheight != vt_height)
1048 { 1177 {
1049 newwidth += szHint.base_width; 1178 newwidth += szHint.base_width;
1050 newheight += szHint.base_height; 1179 newheight += szHint.base_height;
1051 resize_all_windows (newwidth, newheight, 0); 1180 resize_all_windows (newwidth, newheight, 0);
1052 } 1181 }
1053} 1182}
1054 1183
1055/* -------------------------------------------------------------------- * 1184/* -------------------------------------------------------------------- *
1056 * - X INPUT METHOD ROUTINES - * 1185 * - X INPUT METHOD ROUTINES - *
1057 * -------------------------------------------------------------------- */ 1186 * -------------------------------------------------------------------- */
1058#ifdef USE_XIM 1187#if USE_XIM
1059 1188
1060void 1189void
1061rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1190rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1062{ 1191{
1063 fg = pix_colors [Color_fg]; 1192 fg = pix_colors [Color_fg];
1090 status_rect.height = fheight; 1219 status_rect.height = fheight;
1091} 1220}
1092 1221
1093/* Checking whether input method is running. */ 1222/* Checking whether input method is running. */
1094bool 1223bool
1095rxvt_term::IMisRunning () 1224rxvt_term::im_is_running ()
1096{ 1225{
1097 char *p;
1098 Atom atom; 1226 Atom atom;
1099 Window win; 1227 Window win;
1100 char server[IMBUFSIZ]; 1228 char server[IMBUFSIZ];
1101 1229
1102 /* get current locale modifier */ 1230 /* get current locale modifier */
1103 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1231 if (char *p = XSetLocaleModifiers (0))
1104 { 1232 {
1105 strcpy (server, "@server="); 1233 strcpy (server, "@server=");
1106 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1234 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1107 1235
1108 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1236 if (p = strchr (server + 1, '@')) /* first one only */
1109 *p = '\0'; 1237 *p = '\0';
1110 1238
1111 atom = XInternAtom (dpy, server, False); 1239 atom = XInternAtom (dpy, server, False);
1112 win = XGetSelectionOwner (dpy, atom); 1240 win = XGetSelectionOwner (dpy, atom);
1113 1241
1114 if (win != None) 1242 if (win != None)
1115 return True; 1243 return true;
1116 } 1244 }
1117 1245
1118 return False; 1246 return false;
1119} 1247}
1120 1248
1121void 1249void
1122rxvt_term::IMSendSpot () 1250rxvt_term::im_send_spot ()
1123{ 1251{
1124 XPoint nspot; 1252 XPoint nspot;
1125 XVaNestedList preedit_attr; 1253 XVaNestedList preedit_attr;
1126 1254
1127 if (!Input_Context 1255 if (!Input_Context
1180 1308
1181 term->make_current (); 1309 term->make_current ();
1182 1310
1183 if (text) 1311 if (text)
1184 { 1312 {
1185 void *str; 1313 wchar_t *str;
1186 1314
1187 if (!text->encoding_is_wchar && text->string.multi_byte) 1315 if (!text->encoding_is_wchar && text->string.multi_byte)
1188 { 1316 {
1189 // of course, X makes it ugly again 1317 // of course, X makes it ugly again
1190 if (term->rs[Rs_imLocale]) 1318 if (term->rs[Rs_imLocale])
1191 SET_LOCALE (term->rs[Rs_imLocale]); 1319 SET_LOCALE (term->rs[Rs_imLocale]);
1192 1320
1193 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1321 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1194 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1322 mbstowcs (str, text->string.multi_byte, text->length + 1);
1195 1323
1196 if (term->rs[Rs_imLocale]) 1324 if (term->rs[Rs_imLocale])
1197 SET_LOCALE (term->locale); 1325 SET_LOCALE (term->locale);
1198 } 1326 }
1199 else 1327 else
1200 str = (void *)text->string.wide_char; 1328 str = text->string.wide_char;
1201 1329
1202 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1330 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1203 DT_INT, call_data->caret, 1331 DT_INT, call_data->caret,
1204 DT_INT, call_data->chg_first, 1332 DT_INT, call_data->chg_first,
1205 DT_INT, call_data->chg_length, 1333 DT_INT, call_data->chg_length,
1233/* 1361/*
1234 * Try to open a XIM with the current modifiers, then see if we can 1362 * Try to open a XIM with the current modifiers, then see if we can
1235 * open a suitable preedit type 1363 * open a suitable preedit type
1236 */ 1364 */
1237bool 1365bool
1238rxvt_term::IM_get_IC (const char *modifiers) 1366rxvt_term::im_get_ic (const char *modifiers)
1239{ 1367{
1240 int i, j, found; 1368 int i, j, found;
1241 XIM xim; 1369 XIM xim;
1242 XPoint spot; 1370 XPoint spot;
1243 XRectangle rect, status_rect, needed_rect; 1371 XRectangle rect, status_rect, needed_rect;
1244 unsigned long fg, bg; 1372 unsigned long fg, bg;
1245 const char *p; 1373 const char *p;
1246 char **s; 1374 char **s;
1247 XIMStyles *xim_styles; 1375 XIMStyles *xim_styles;
1248#ifdef ENABLE_XIM_ONTHESPOT
1249 XIMCallback xcb[4];
1250#endif
1251 1376
1252 set_environ (envv); 1377 set_environ (env);
1253 1378
1254 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1379 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1255 return false; 1380 return false;
1256 1381
1257 input_method = display->get_xim (locale, modifiers); 1382 input_method = display->get_xim (locale, modifiers);
1258 if (input_method == NULL) 1383 if (input_method == NULL)
1259 return false; 1384 return false;
1276 p = pet[pi]; 1401 p = pet[pi];
1277 1402
1278 if (!p) 1403 if (!p)
1279 continue; 1404 continue;
1280 1405
1281 s = rxvt_splitcommastring (p); 1406 s = rxvt_strsplit (',', p);
1282 1407
1283 for (i = found = 0; !found && s[i]; i++) 1408 for (i = found = 0; !found && s[i]; i++)
1284 { 1409 {
1285 if (!strcmp (s[i], "OverTheSpot")) 1410 if (!strcmp (s[i], "OverTheSpot"))
1286 input_style = XIMPreeditPosition | XIMStatusNothing; 1411 input_style = XIMPreeditPosition | XIMStatusNothing;
1298 input_style = XIMPreeditNothing | XIMStatusNothing; 1423 input_style = XIMPreeditNothing | XIMStatusNothing;
1299 1424
1300 for (j = 0; j < xim_styles->count_styles; j++) 1425 for (j = 0; j < xim_styles->count_styles; j++)
1301 if (input_style == xim_styles->supported_styles[j]) 1426 if (input_style == xim_styles->supported_styles[j])
1302 { 1427 {
1303 rxvt_freecommastring (s); 1428 rxvt_free_strsplit (s);
1304 1429
1305 found = 1; 1430 found = 1;
1306 goto foundpet; 1431 goto foundpet;
1307 } 1432 }
1308 1433
1309 } 1434 }
1310 1435
1311 rxvt_freecommastring (s); 1436 rxvt_free_strsplit (s);
1312 } 1437 }
1313 1438
1314foundpet: 1439foundpet:
1315 1440
1316 XFree (xim_styles); 1441 XFree (xim_styles);
1395 NULL); 1520 NULL);
1396 } 1521 }
1397#if ENABLE_XIM_ONTHESPOT 1522#if ENABLE_XIM_ONTHESPOT
1398 else if (input_style & XIMPreeditCallbacks) 1523 else if (input_style & XIMPreeditCallbacks)
1399 { 1524 {
1525 XIMCallback xcb[4];
1526
1400 im_set_position (spot); 1527 im_set_position (spot);
1401 1528
1402 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1529 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1403 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1530 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1404 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1531 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1419#endif 1546#endif
1420 1547
1421 Input_Context = XCreateIC (xim, 1548 Input_Context = XCreateIC (xim,
1422 XNInputStyle, input_style, 1549 XNInputStyle, input_style,
1423 XNClientWindow, vt, 1550 XNClientWindow, vt,
1424 XNFocusWindow, parent[0], 1551 XNFocusWindow, parent,
1425 preedit_attr ? XNPreeditAttributes : NULL, 1552 preedit_attr ? XNPreeditAttributes : NULL,
1426 preedit_attr, 1553 preedit_attr,
1427 status_attr ? XNStatusAttributes : NULL, 1554 status_attr ? XNStatusAttributes : NULL,
1428 status_attr, NULL); 1555 status_attr, NULL);
1429 1556
1442 // unfortunately, only the focus window is used by XIM, hard to fix 1569 // unfortunately, only the focus window is used by XIM, hard to fix
1443 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1570 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1444 vt_select_input (); 1571 vt_select_input ();
1445#endif 1572#endif
1446 1573
1447 IMSetPosition (); 1574 im_set_position ();
1448 1575
1449 return true; 1576 return true;
1450} 1577}
1451 1578
1452void 1579void
1462 im_destroy (); 1589 im_destroy ();
1463 1590
1464 if (Input_Context) 1591 if (Input_Context)
1465 return; 1592 return;
1466 1593
1467#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1468 if (rs[Rs_imLocale]) 1594 if (rs[Rs_imLocale])
1469 SET_LOCALE (rs[Rs_imLocale]); 1595 SET_LOCALE (rs[Rs_imLocale]);
1470#endif
1471 1596
1472 p = rs[Rs_inputMethod]; 1597 p = rs[Rs_inputMethod];
1473 if (p && *p) 1598 if (p && *p)
1474 { 1599 {
1475 bool found = false; 1600 bool found = false;
1476 1601
1477 s = rxvt_splitcommastring (p); 1602 s = rxvt_strsplit (',', p);
1478 1603
1479 for (i = 0; s[i]; i++) 1604 for (i = 0; s[i]; i++)
1480 { 1605 {
1481 if (*s[i]) 1606 if (*s[i])
1482 { 1607 {
1483 strcpy (buf, "@im="); 1608 strcpy (buf, "@im=");
1484 strncat (buf, s[i], IMBUFSIZ - 5); 1609 strncat (buf, s[i], IMBUFSIZ - 5);
1485 if (IM_get_IC (buf)) 1610 if (im_get_ic (buf))
1486 { 1611 {
1487 found = true; 1612 found = true;
1488 break; 1613 break;
1489 } 1614 }
1490 } 1615 }
1491 } 1616 }
1492 1617
1493 rxvt_freecommastring (s); 1618 rxvt_free_strsplit (s);
1494 1619
1495 if (found) 1620 if (found)
1496 goto done; 1621 goto done;
1497 } 1622 }
1498 1623
1499 /* try with XMODIFIERS env. var. */ 1624 /* try with XMODIFIERS env. var. */
1500 if (IM_get_IC ("")) 1625 if (im_get_ic (""))
1501 goto done; 1626 goto done;
1502 1627
1503 /* try with no modifiers base IF the user didn't specify an IM */ 1628 /* try with no modifiers base IF the user didn't specify an IM */
1504 if (IM_get_IC ("@im=none")) 1629 if (im_get_ic ("@im=none"))
1505 goto done; 1630 goto done;
1506 1631
1507done: 1632done:
1508#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1509 if (rs[Rs_imLocale]) 1633 if (rs[Rs_imLocale])
1510 SET_LOCALE (locale); 1634 SET_LOCALE (locale);
1511#endif
1512} 1635}
1513 1636
1514void 1637void
1515rxvt_term::IMSetPosition () 1638rxvt_term::im_set_position ()
1516{ 1639{
1517 XRectangle preedit_rect, status_rect, *needed_rect; 1640 XRectangle preedit_rect, status_rect, *needed_rect;
1518 XVaNestedList preedit_attr, status_attr; 1641 XVaNestedList preedit_attr, status_attr;
1519 1642
1520 if (!Input_Context 1643 if (!Input_Context
1521 || !focus 1644 || !focus
1522 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1645 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1523 || !IMisRunning ()) 1646 || !im_is_running ())
1524 return; 1647 return;
1525 1648
1526 if (input_style & XIMPreeditPosition) 1649 if (input_style & XIMPreeditPosition)
1527 { 1650 {
1528 im_set_size (preedit_rect); 1651 im_set_size (preedit_rect);
1558 1681
1559void 1682void
1560rxvt_term::get_window_origin (int &x, int &y) 1683rxvt_term::get_window_origin (int &x, int &y)
1561{ 1684{
1562 Window cr; 1685 Window cr;
1563 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1686 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1564/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1565}
1566
1567Pixmap
1568rxvt_term::get_pixmap_property (int prop_id)
1569{
1570 if (prop_id > 0 && prop_id < NUM_XA)
1571 if (xa[prop_id])
1572 {
1573 int aformat;
1574 unsigned long nitems, bytes_after;
1575 Atom atype;
1576 unsigned char *prop = NULL;
1577 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1578 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1579 &nitems, &bytes_after, &prop);
1580 if (result == Success && prop && atype == XA_PIXMAP)
1581 return *(Pixmap *)prop;
1582 }
1583
1584 return None;
1585} 1687}
1586 1688
1587#ifdef HAVE_BG_PIXMAP 1689#ifdef HAVE_BG_PIXMAP
1588# if TRACE_PIXMAPS
1589# undef update_background
1590void
1591rxvt_term::trace_update_background (const char *file, int line)
1592{
1593 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1594 update_background ();
1595}
1596# endif
1597 1690
1598void 1691void
1599rxvt_term::update_background () 1692rxvt_term::update_background ()
1600{ 1693{
1601 if (update_background_ev.is_active ()) 1694 if (update_background_ev.is_active ())
1602 return; 1695 return;
1603 1696
1604 bgPixmap.invalidate ();
1605
1606 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1697 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1607 1698
1608 if (to_wait <= 0.) 1699 if (to_wait <= 0.)
1609 bgPixmap.render (); 1700 bg_render ();
1610 else 1701 else
1611 update_background_ev.start (to_wait); 1702 update_background_ev.start (to_wait);
1612} 1703}
1613 1704
1614void 1705void
1615rxvt_term::update_background_cb (ev::timer &w, int revents) 1706rxvt_term::update_background_cb (ev::timer &w, int revents)
1616{ 1707{
1617 make_current (); 1708 make_current ();
1618 1709
1619 update_background_ev.stop (); 1710 update_background_ev.stop ();
1620 bgPixmap.render (); 1711 bg_render ();
1621 refresh_check (); 1712 refresh_check ();
1622} 1713}
1623 1714
1624#endif /* HAVE_BG_PIXMAP */ 1715#endif /* HAVE_BG_PIXMAP */
1625 1716

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines