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.298 by root, Sat Jan 12 22:13:46 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-2007 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
… …
226 if (fontset[i] != fontset[0]) 223 if (fontset[i] != fontset[0])
227 delete fontset[i]; 224 delete fontset[i];
228#endif 225#endif
229 delete fontset[0]; 226 delete fontset[0];
230 227
228#ifdef HAVE_BG_PIXMAP
229 bg_destroy ();
230#endif
231
232#if HAVE_IMG
233 delete bg_img;
234#endif
235
231 if (display) 236 if (display)
232 { 237 {
233 selection_clear (); 238 selection_clear ();
239 selection_clear (true);
234 240
235#ifdef USE_XIM 241#if USE_XIM
236 im_destroy (); 242 im_destroy ();
237#endif 243#endif
238#ifdef XTERM_SCROLLBAR 244 scrollBar.destroy ();
239 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC); 245
240 if (ShadowGC) XFreeGC (dpy, ShadowGC); 246 if (gc)
241#endif
242#ifdef PLAIN_SCROLLBAR
243 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
244#endif
245#ifdef NEXT_SCROLLBAR
246 if (blackGC) XFreeGC (dpy, blackGC);
247 if (whiteGC) XFreeGC (dpy, whiteGC);
248 if (grayGC) XFreeGC (dpy, grayGC);
249 if (darkGC) XFreeGC (dpy, darkGC);
250 if (stippleGC) XFreeGC (dpy, stippleGC);
251 if (dimple) XFreePixmap (dpy, dimple);
252 if (upArrow) XFreePixmap (dpy, upArrow);
253 if (downArrow) XFreePixmap (dpy, downArrow);
254 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
255 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
256#endif
257#ifdef RXVT_SCROLLBAR
258 if (topShadowGC) XFreeGC (dpy, topShadowGC);
259 if (botShadowGC) XFreeGC (dpy, botShadowGC);
260 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
261#endif
262 if (gc) XFreeGC (dpy, gc); 247 XFreeGC (dpy, gc);
263 248
264 delete drawable; 249 delete drawable;
250
265 // destroy all windows 251 // destroy all windows
266 if (parent[0]) 252 if (parent)
267 XDestroyWindow (dpy, parent[0]); 253 XDestroyWindow (dpy, parent);
268 254
269 for (int i = 0; i < TOTAL_COLORS; i++) 255 for (int i = 0; i < TOTAL_COLORS; i++)
270 if (ISSET_PIXCOLOR (i)) 256 if (ISSET_PIXCOLOR (i))
271 { 257 {
272 pix_colors_focused [i].free (this); 258 pix_colors_focused [i].free (this);
273#if OFF_FOCUS_FADING 259#if OFF_FOCUS_FADING
260 if (rs[Rs_fade])
274 pix_colors_unfocused [i].free (this); 261 pix_colors_unfocused [i].free (this);
275#endif 262#endif
276 } 263 }
277 264
278 clear (); 265 clear ();
279 }
280 266
281#ifdef HAVE_BG_PIXMAP
282 bgPixmap.destroy ();
283#endif
284 display->flush (); /* ideally .put should do this */ 267 display->flush (); /* ideally .put should do this */
285 displays.put (display); 268 displays.put (display);
269 }
286 270
287 scr_release (); 271 scr_release ();
288 272
289 /* clear all resources */ 273 /* clear all resources */
290 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
291 free (allocated [i]); 275 free (allocated [i]);
292 276
293 free (selection.text); 277 free (selection.text);
294 // TODO: manage env vars in child only(!) 278 free (selection.clip_text);
295 free (env_display);
296 free (env_term);
297 free (locale); 279 free (locale);
298 free (v_buffer); 280 free (v_buffer);
299 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;
300 288
301 delete envv; 289 delete envv;
302 delete argv; 290 delete argv;
303 291
304#ifdef KEYSYM_RESOURCE 292#ifdef KEYSYM_RESOURCE
305 delete keyboard; 293 delete keyboard;
306#endif 294#endif
307#ifndef NO_RESOURCES 295#ifndef NO_RESOURCES
308 XrmDestroyDatabase (option_db); 296 XrmDestroyDatabase (option_db);
309#endif 297#endif
298
299 SET_R ((rxvt_term *)0);
310} 300}
311 301
312// child has exited, usually destroys 302// child has exited, usually destroys
313void 303void
314rxvt_term::child_cb (ev::child &w, int status) 304rxvt_term::child_cb (ev::child &w, int status)
… …
336 if (display) 326 if (display)
337 { 327 {
338#if USE_XIM 328#if USE_XIM
339 im_ev.stop (display); 329 im_ev.stop (display);
340#endif 330#endif
341#if HAVE_SCROLLBARS
342 scrollbar_ev.stop (display); 331 scrollbar_ev.stop (display);
343#endif 332#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
344#if ENABLE_TRANSPARENCY || ENABLE_PERL
345 rootwin_ev.stop (display); 333 rootwin_ev.stop (display);
346#endif 334#endif
347 incr_ev.stop ();
348 termwin_ev.stop (display); 335 termwin_ev.stop (display);
349 vt_ev.stop (display); 336 vt_ev.stop (display);
350 } 337 }
351 338
352 flush_ev.stop (); 339 flush_ev.stop ();
… …
376 make_current (); 363 make_current ();
377 364
378 delete this; 365 delete this;
379} 366}
380 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
381/*----------------------------------------------------------------------*/ 380/*----------------------------------------------------------------------*/
382/* 381/*
383 * Exit gracefully, clearing the utmp entry and restoring tty attributes 382 * Exit gracefully, clearing the utmp entry and restoring tty attributes
384 * TODO: if debugging, this should free up any known resources if we can
385 */ 383 */
386static XErrorHandler old_xerror_handler; 384static XErrorHandler old_xerror_handler;
387 385
388static void 386static void
389rxvt_emergency_cleanup () 387rxvt_emergency_cleanup ()
… …
391 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++)
392 (*t)->emergency_cleanup (); 390 (*t)->emergency_cleanup ();
393} 391}
394 392
395#if !ENABLE_MINIMAL 393#if !ENABLE_MINIMAL
396static void 394static void ecb_cold
397print_x_error (Display *dpy, XErrorEvent *event) 395print_x_error (Display *dpy, XErrorEvent *event)
398{ 396{
399 char buffer[BUFSIZ]; 397 char buffer[BUFSIZ];
400 char mesg[BUFSIZ]; 398 char mesg[BUFSIZ];
401 char number[32]; 399 char number[32];
402 char *mtype = "XlibMessage"; 400
403 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
404 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
405 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);
406 rxvt_warn ("%s: %s\n", mesg, buffer); 408 rxvt_warn ("+ %s: %s\n", mesg, buffer);
409
407 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 410 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
408 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 {
409 sprintf(number, "%d", event->request_code); 464 sprintf (number, "%d", event->request_code);
410 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 465 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
411 rxvt_warn ("(which is %s)\n", buffer); 466 rxvt_warn ("+ (which is %s)\n", buffer);
412 if (event->request_code >= 128) {
413 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
414 mesg, BUFSIZ);
415 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
416 } 467 }
468
417 if ((event->error_code == BadWindow) || 469 if (event->error_code == BadWindow
418 (event->error_code == BadPixmap) || 470 || event->error_code == BadPixmap
419 (event->error_code == BadCursor) || 471 || event->error_code == BadCursor
420 (event->error_code == BadFont) || 472 || event->error_code == BadFont
421 (event->error_code == BadDrawable) || 473 || event->error_code == BadDrawable
422 (event->error_code == BadColor) || 474 || event->error_code == BadColor
423 (event->error_code == BadGC) || 475 || event->error_code == BadGC
424 (event->error_code == BadIDChoice) || 476 || event->error_code == BadIDChoice
425 (event->error_code == BadValue) || 477 || event->error_code == BadValue
426 (event->error_code == BadAtom)) { 478 || event->error_code == BadAtom)
479 {
427 if (event->error_code == BadValue) 480 if (event->error_code == BadValue)
428 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
429 mesg, BUFSIZ);
430 else if (event->error_code == BadAtom) 482 else if (event->error_code == BadAtom)
431 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 483 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
432 mesg, BUFSIZ); 484 else
433 else
434 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 485 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
435 mesg, BUFSIZ);
436 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
437 }
438 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
439 mesg, BUFSIZ);
440 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
441}
442#endif
443 486
444int 487 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
488 }
489}
490#endif
491
492int ecb_cold
445rxvt_xerror_handler (Display *display, XErrorEvent *event) 493rxvt_xerror_handler (Display *display, XErrorEvent *event)
446{ 494{
447 if (GET_R->allowedxerror == -1) 495 if (GET_R && GET_R->allowedxerror == -1)
448 GET_R->allowedxerror = event->error_code; 496 GET_R->allowedxerror = event->error_code;
449 else 497 else
450 { 498 {
451 // 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,
452 // so just output the error and continue 500 // so just output the error and continue
… …
458 } 506 }
459 507
460 return 0; 508 return 0;
461} 509}
462 510
463int 511int ecb_cold
464rxvt_xioerror_handler (Display *display) 512rxvt_xioerror_handler (Display *display)
465{ 513{
466 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",
467 DisplayString (display)); 515 DisplayString (display));
468 rxvt_emergency_cleanup (); 516 rxvt_emergency_cleanup ();
469 _exit (EXIT_FAILURE); 517 _exit (EXIT_FAILURE);
470}
471
472/*----------------------------------------------------------------------*/
473void
474rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
475{
476 this->envv = envv;
477
478 SET_R (this);
479 set_locale ("");
480 set_environ (envv); // few things in X do not call setlocale :(
481
482 init_vars ();
483
484 init_secondary ();
485
486 const char **cmd_argv = init_resources (argc, argv);
487
488#ifdef KEYSYM_RESOURCE
489 keyboard->register_done ();
490#endif
491
492#ifdef HAVE_SCROLLBARS
493 if (option (Opt_scrollBar))
494 scrollBar.setIdle (); /* set existence for size calculations */
495#endif
496
497 pty = ptytty::create ();
498
499 create_windows (argc, argv);
500
501 init_xlocale ();
502
503 scr_reset (); // initialize screen
504
505#if 0
506 XSynchronize (dpy, True);
507#endif
508
509#ifdef HAVE_SCROLLBARS
510 if (option (Opt_scrollBar))
511 resize_scrollbar (); /* create and map scrollbar */
512#endif
513#ifdef HAVE_BG_PIXMAP
514 {
515 bgPixmap.set_target (this);
516
517#ifdef ENABLE_TRANSPARENCY
518 if (option (Opt_transparent))
519 {
520 bgPixmap.set_transparent ();
521
522#ifdef HAVE_AFTERIMAGE
523 if (rs [Rs_blurradius])
524 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
525#endif
526 if (ISSET_PIXCOLOR (Color_tint))
527 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
528
529 if (rs [Rs_shade])
530 bgPixmap.set_shade (rs [Rs_shade]);
531
532 bgPixmap.set_root_pixmap ();
533 XSelectInput (dpy, display->root, PropertyChangeMask);
534 rootwin_ev.start (display, display->root);
535 }
536#endif
537
538#ifdef BG_IMAGE_FROM_FILE
539 if (rs[Rs_backgroundPixmap])
540 {
541 const char *p = rs[Rs_backgroundPixmap];
542
543 if ((p = strchr (p, ';')) != 0)
544 {
545 p++;
546 bgPixmap.set_geometry (p);
547 }
548 else
549 bgPixmap.set_defaultGeometry ();
550
551 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552 if (!bgPixmap.window_position_sensitive ())
553 update_background ();
554 }
555#endif
556 }
557#endif
558
559#if ENABLE_PERL
560 rootwin_ev.start (display, display->root);
561#endif
562
563 set_colorfgbg ();
564
565 init_command (cmd_argv);
566
567 free (cmd_argv);
568
569 if (pty->pty >= 0)
570 pty_ev.start (pty->pty, ev::READ);
571
572 HOOK_INVOKE ((this, HOOK_START, DT_END));
573
574#if ENABLE_XEMBED
575 if (rs[Rs_embed])
576 {
577 long info[2] = { 0, XEMBED_MAPPED };
578
579 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
580 32, PropModeReplace, (unsigned char *)&info, 2);
581 }
582#endif
583
584 XMapWindow (dpy, vt);
585 XMapWindow (dpy, parent[0]);
586
587 refresh_check ();
588} 518}
589 519
590static struct sig_handlers 520static struct sig_handlers
591{ 521{
592 ev::sig sw_term, sw_int; 522 ev::sig sw_term, sw_int;
… …
609 rxvt_emergency_cleanup (); 539 rxvt_emergency_cleanup ();
610 w.stop (); 540 w.stop ();
611 kill (getpid (), w.signum); 541 kill (getpid (), w.signum);
612} 542}
613 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
614char **rxvt_environ; // startup environment 611char **rxvt_environ; // startup environment
615 612
616void 613void
617rxvt_init () 614rxvt_init ()
618{ 615{
619 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))));
620 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
621 if (!ev_default_loop (0)) 625 if (!ev_default_loop ())
622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 626 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
623 627
624 rxvt_environ = environ; 628 rxvt_environ = environ;
625 629
626 signal (SIGHUP, SIG_IGN); 630 signal (SIGHUP, SIG_IGN);
627 signal (SIGPIPE, SIG_IGN); 631 signal (SIGPIPE, SIG_IGN);
628 632
629 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 633 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
630 sig_handlers.sw_int.start (SIGINT); ev_unref (); 634 sig_handlers.sw_int.start (SIGINT); ev_unref ();
631
632 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
633 /* signal (SIGURG, SIG_DFL); */
634 635
635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
636 // TODO: handle this with exceptions and tolerate the memory loss 637 // TODO: handle this with exceptions and tolerate the memory loss
637 XSetIOErrorHandler (rxvt_xioerror_handler); 638 XSetIOErrorHandler (rxvt_xioerror_handler);
638 639
639 XrmInitialize (); 640 XrmInitialize ();
641
642#if HAVE_PIXBUF
643 g_type_init ();
644#endif
640} 645}
641 646
642/*----------------------------------------------------------------------*/ 647/*----------------------------------------------------------------------*/
643/* 648/*
644 * window size/position calculations for XSizeHint and other storage. 649 * window size/position calculations for XSizeHint and other storage.
… …
646 */ 651 */
647void 652void
648rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 653rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
649{ 654{
650 short recalc_x, recalc_y; 655 short recalc_x, recalc_y;
651 int x, y, sb_w, flags; 656 int x, y, flags;
652 unsigned int w, h; 657 unsigned int w, h;
653 unsigned int max_width, max_height; 658 unsigned int max_width, max_height;
654 659
655 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 660 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
656 szHint.win_gravity = NorthWestGravity; 661 szHint.win_gravity = NorthWestGravity;
… …
666 if (rs[Rs_geometry]) 671 if (rs[Rs_geometry])
667 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 672 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
668 673
669 if (flags & WidthValue) 674 if (flags & WidthValue)
670 { 675 {
676 if (!w)
677 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
678
671 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 679 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
672 szHint.flags |= USSize; 680 szHint.flags |= USSize;
673 } 681 }
674 682
675 if (flags & HeightValue) 683 if (flags & HeightValue)
676 { 684 {
685 if (!h)
686 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
687
677 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 688 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
678 szHint.flags |= USSize; 689 szHint.flags |= USSize;
679 } 690 }
680 691
681 if (flags & XValue) 692 if (flags & XValue)
682 { 693 {
… …
713 max_width = MAX_COLS * fwidth; 724 max_width = MAX_COLS * fwidth;
714 max_height = MAX_ROWS * fheight; 725 max_height = MAX_ROWS * fheight;
715 726
716 szHint.base_width = szHint.base_height = 2 * int_bwidth; 727 szHint.base_width = szHint.base_height = 2 * int_bwidth;
717 728
718 sb_w = 0;
719 window_vt_x = window_vt_y = int_bwidth; 729 window_vt_x = window_vt_y = int_bwidth;
720 730
721 if (scrollBar.state) 731 if (scrollBar.state)
722 { 732 {
723 sb_w = scrollbar_TotalWidth (); 733 int sb_w = scrollBar.total_width ();
724 szHint.base_width += sb_w; 734 szHint.base_width += sb_w;
725 735
726 if (!option (Opt_scrollBar_right)) 736 if (!option (Opt_scrollBar_right))
727 window_vt_x += sb_w; 737 window_vt_x += sb_w;
728 } 738 }
… …
752 { 762 {
753 min_it (height, max_height); 763 min_it (height, max_height);
754 szHint.height = szHint.base_height + height; 764 szHint.height = szHint.base_height + height;
755 } 765 }
756 766
757 if (scrollBar.state && option (Opt_scrollBar_right))
758 window_sb_x = szHint.width - sb_w;
759
760 if (recalc_x) 767 if (recalc_x)
761 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 768 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
762 769
763 if (recalc_y) 770 if (recalc_y)
764 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 771 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
765 772
766 ncol = width / fwidth; 773 ncol = width / fwidth;
767 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;
768} 784}
769 785
770/*----------------------------------------------------------------------*/ 786/*----------------------------------------------------------------------*/
771/* 787/*
772 * Tell the teletype handler what size the window is. 788 * Tell the teletype handler what size the window is.
… …
780 796
781 struct winsize ws; 797 struct winsize ws;
782 798
783 ws.ws_col = ncol; 799 ws.ws_col = ncol;
784 ws.ws_row = nrow; 800 ws.ws_row = nrow;
785 ws.ws_xpixel = width; 801 ws.ws_xpixel = vt_width;
786 ws.ws_ypixel = height; 802 ws.ws_ypixel = vt_height;
787 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 803 ioctl (pty->pty, TIOCSWINSZ, &ws);
788 804
789#if 0 805#if 0
790 // TIOCSWINSZ is supposed to do this automatically and correctly 806 // TIOCSWINSZ is supposed to do this automatically and correctly
791 if (cmd_pid) /* force through to the command */ 807 if (cmd_pid) /* force through to the command */
792 kill (-cmd_pid, SIGWINCH); 808 kill (-cmd_pid, SIGWINCH);
793#endif 809#endif
794} 810}
795 811
796/*----------------------------------------------------------------------*/ 812/*----------------------------------------------------------------------*/
797/* set_fonts () - load and set the various fonts 813/* load and set the various fonts */
798 *
799 * init = 1 - initialize
800 *
801 * fontname == FONT_UP - switch to bigger font
802 * fontname == FONT_DN - switch to smaller font
803 */
804bool 814bool
805rxvt_term::set_fonts () 815rxvt_term::set_fonts ()
806{ 816{
807 rxvt_fontset *fs = new rxvt_fontset (this); 817 rxvt_fontset *fs = new rxvt_fontset (this);
808 rxvt_fontprop prop; 818 rxvt_fontprop prop;
… …
822#endif 832#endif
823 833
824 delete fontset[0]; 834 delete fontset[0];
825 fontset[0] = fs; 835 fontset[0] = fs;
826 836
827 prop = (*fs)[1]->properties (); 837 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
828 prop.height += lineSpace; 838 prop.width = max (prop.width + letterSpace, 1);
829 839
830 fs->set_prop (prop, false); 840 fs->set_prop (prop, false);
831 841
832 fwidth = prop.width; 842 fwidth = prop.width;
833 fheight = prop.height; 843 fheight = prop.height + lineSpace;
834 fbase = prop.ascent; 844 fbase = prop.ascent;
835 845
836 for (int style = 1; style < 4; style++) 846 for (int style = 1; style < 4; style++)
837 { 847 {
838#if ENABLE_STYLES 848#if ENABLE_STYLES
… …
864#else 874#else
865 fontset[style] = fontset[0]; 875 fontset[style] = fontset[0];
866#endif 876#endif
867 } 877 }
868 878
869 if (parent[0]) 879 if (parent)
870 { 880 {
871 resize_all_windows (0, 0, 0); 881 resize_all_windows (0, 0, 0);
872 scr_remap_chars (); 882 scr_remap_chars ();
873 scr_touch (true); 883 scr_touch (true);
874 } 884 }
… …
877} 887}
878 888
879void 889void
880rxvt_term::set_string_property (Atom prop, const char *str, int len) 890rxvt_term::set_string_property (Atom prop, const char *str, int len)
881{ 891{
882 XChangeProperty (dpy, parent[0], 892 XChangeProperty (dpy, parent,
883 prop, XA_STRING, 8, PropModeReplace, 893 prop, XA_STRING, 8, PropModeReplace,
884 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 894 (const unsigned char *)str, len >= 0 ? len : strlen (str));
885} 895}
886 896
887void 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
888rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 910rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
889{ 911{
890 wchar_t *ws = rxvt_mbstowcs (str, len); 912 wchar_t *ws = rxvt_mbstowcs (str, len);
891 char *s = rxvt_wcstoutf8 (ws); 913 char *s = rxvt_wcstoutf8 (ws);
892 914
893 XChangeProperty (dpy, parent[0], 915 XChangeProperty (dpy, parent,
894 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 916 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
895 (const unsigned char *)s, strlen (s)); 917 (const unsigned char *)s, strlen (s));
896 918
897 free (s); 919 free (s);
898 free (ws); 920 free (ws);
… …
902/*----------------------------------------------------------------------*/ 924/*----------------------------------------------------------------------*/
903/* xterm sequences - title, iconName, color (exptl) */ 925/* xterm sequences - title, iconName, color (exptl) */
904void 926void
905rxvt_term::set_title (const char *str) 927rxvt_term::set_title (const char *str)
906{ 928{
907 set_string_property (XA_WM_NAME, str); 929 set_mbstring_property (XA_WM_NAME, str);
908#if ENABLE_EWMH 930#if ENABLE_EWMH
909 set_utf8_property (xa[XA_NET_WM_NAME], str); 931 set_utf8_property (xa[XA_NET_WM_NAME], str);
910#endif 932#endif
911} 933}
912 934
913void 935void
914rxvt_term::set_icon_name (const char *str) 936rxvt_term::set_icon_name (const char *str)
915{ 937{
916 set_string_property (XA_WM_ICON_NAME, str); 938 set_mbstring_property (XA_WM_ICON_NAME, str);
917#if ENABLE_EWMH 939#if ENABLE_EWMH
918 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 940 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
919#endif 941#endif
920} 942}
921 943
922void 944void
923rxvt_term::set_window_color (int idx, const char *color) 945rxvt_term::set_window_color (int idx, const char *color)
924{ 946{
925#ifdef XTERM_COLOR_CHANGE 947#ifdef XTERM_COLOR_CHANGE
926 rxvt_color xcol;
927 int i;
928
929 if (color == NULL || *color == '\0') 948 if (color == NULL || *color == '\0')
930 return; 949 return;
931 950
932 color = strdup (color); 951 color = strdup (color);
933 allocated.push_back ((void *)color); 952 allocated.push_back ((void *)color);
934 rs[Rs_color + idx] = color; 953 rs[Rs_color + idx] = color;
935 954
936 /* handle color aliases */ 955 /* handle color aliases */
937 if (isdigit (*color)) 956 if (isdigit (*color))
938 { 957 {
939 i = atoi (color); 958 int i = atoi (color);
940 959
941 if (i >= 8 && i <= 15) 960 if (i >= 8 && i <= 15)
942 { 961 {
943 /* bright colors */ 962 /* bright colors */
944 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 963 alias_color (idx, minBrightCOLOR + i - 8);
945 goto done; 964 goto done;
946 } 965 }
947 966
948 if (i >= 0 && i <= 7) 967 if (i >= 0 && i <= 7)
949 { 968 {
950 /* normal colors */ 969 /* normal colors */
951 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 970 alias_color (idx, minCOLOR + i);
952 goto done; 971 goto done;
953 } 972 }
954 } 973 }
955 974
956 set_color (xcol, color); 975 pix_colors_focused[idx].free (this);
957 976 set_color (pix_colors_focused[idx], color);
958 /*
959 * FIXME: should free colors here, but no idea how to do it so instead,
960 * so just keep gobbling up the colormap
961 */
962
963 pix_colors_focused[idx] = xcol;
964 977
965done: 978done:
966 /*TODO: handle Color_BD, scrollbar background, etc. */ 979 /*TODO: handle Color_BD, scrollbar background, etc. */
967 980
968 update_fade_color (idx); 981 update_fade_color (idx);
969 recolour_cursor (); 982 recolor_cursor ();
970 scr_recolour (); 983 scr_recolor ();
971#endif /* XTERM_COLOR_CHANGE */ 984#endif /* XTERM_COLOR_CHANGE */
972} 985}
973 986
974void 987void
975rxvt_term::recolour_cursor () 988rxvt_term::recolor_cursor ()
976{ 989{
977 XColor fg, bg; 990 XColor fg, bg;
978 991
979 (ISSET_PIXCOLOR (Color_pointer_fg) 992 (ISSET_PIXCOLOR (Color_pointer_fg)
980 ? pix_colors_focused[Color_pointer_fg] 993 ? pix_colors_focused[Color_pointer_fg]
… …
989 1002
990/*----------------------------------------------------------------------*/ 1003/*----------------------------------------------------------------------*/
991/* 1004/*
992 * 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
993 */ 1006 */
994void 1007char *
995rxvt_term::set_colorfgbg () 1008rxvt_term::get_colorfgbg ()
996{ 1009{
997 unsigned int i; 1010 unsigned int i;
998 const char *xpmb = ""; 1011 const char *xpmb = "";
999 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1012 char fstr[] = "default";
1013 char bstr[] = "default";
1014 char *env_colorfgbg;
1000 1015
1001 strcpy (fstr, "default");
1002 strcpy (bstr, "default");
1003 for (i = Color_Black; i <= Color_White; i++) 1016 for (i = Color_Black; i <= Color_White; i++)
1004 if (pix_colors[Color_fg] == pix_colors[i]) 1017 if (pix_colors[Color_fg] == pix_colors[i])
1005 { 1018 {
1006 sprintf (fstr, "%d", (i - Color_Black)); 1019 sprintf (fstr, "%d", i - Color_Black);
1007 break; 1020 break;
1008 } 1021 }
1009 1022
1010 for (i = Color_Black; i <= Color_White; i++) 1023 for (i = Color_Black; i <= Color_White; i++)
1011 if (pix_colors[Color_bg] == pix_colors[i]) 1024 if (pix_colors[Color_bg] == pix_colors[i])
1012 { 1025 {
1013 sprintf (bstr, "%d", (i - Color_Black)); 1026 sprintf (bstr, "%d", i - Color_Black);
1014#ifdef BG_IMAGE_FROM_FILE 1027#if BG_IMAGE_FROM_FILE
1015 xpmb = "default;"; 1028 xpmb = "default;";
1016#endif 1029#endif
1017 break; 1030 break;
1018 } 1031 }
1019 1032
1033 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1020 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;
1021} 1036}
1022 1037
1023/*----------------------------------------------------------------------*/ 1038/*----------------------------------------------------------------------*/
1024 1039
1025bool 1040bool
… …
1033} 1048}
1034 1049
1035void 1050void
1036rxvt_term::alias_color (int dst, int src) 1051rxvt_term::alias_color (int dst, int src)
1037{ 1052{
1053 pix_colors[dst].free (this);
1038 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]);
1039} 1055}
1040 1056
1041/* -------------------------------------------------------------------- * 1057/* -------------------------------------------------------------------- *
1042 * - WINDOW RESIZING - * 1058 * - WINDOW RESIZING - *
… …
1048 int old_width = szHint.width; 1064 int old_width = szHint.width;
1049 int old_height = szHint.height; 1065 int old_height = szHint.height;
1050 1066
1051 window_calc (newwidth, newheight); 1067 window_calc (newwidth, newheight);
1052 1068
1053 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);
1054 XSetWMNormalHints (dpy, parent[0], &szHint); 1075 XSetWMNormalHints (dpy, parent, &szHint);
1076 szHint.flags |= PBaseSize | PResizeInc;
1077 }
1055 1078
1056 if (!ignoreparent) 1079 if (!ignoreparent)
1057 { 1080 {
1058#ifdef SMART_RESIZE 1081#ifdef SMART_RESIZE
1059 /* 1082 /*
… …
1063 int x, y, x1, y1; 1086 int x, y, x1, y1;
1064 int dx, dy; 1087 int dx, dy;
1065 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1088 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1066 Window unused_cr; 1089 Window unused_cr;
1067 1090
1068 XTranslateCoordinates (dpy, parent[0], display->root, 1091 XTranslateCoordinates (dpy, parent, display->root,
1069 0, 0, &x, &y, &unused_cr); 1092 0, 0, &x, &y, &unused_cr);
1070 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1093 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1071 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1094 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1072 /* 1095 /*
1073 * 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
1074 * our position for handles and decorations. Counter it 1097 * our position for handles and decorations. Counter it
1075 */ 1098 */
… …
1092 if (y < y1) /* top half */ 1115 if (y < y1) /* top half */
1093 dy = 0; 1116 dy = 0;
1094 else if (y == y1) /* exact center */ 1117 else if (y == y1) /* exact center */
1095 dy /= 2; 1118 dy /= 2;
1096 1119
1097 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1120 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1098 szHint.width, szHint.height); 1121 szHint.width, szHint.height);
1099#else 1122#else
1100 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1123 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1101#endif 1124#endif
1102 } 1125 }
1126
1127 if (set_hint)
1128 XSetWMNormalHints (dpy, parent, &szHint);
1103 1129
1104 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1130 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1105 1131
1106 if (fix_screen || newwidth != old_width || newheight != old_height) 1132 if (fix_screen || newwidth != old_width || newheight != old_height)
1107 { 1133 {
1108 if (scrollBar.state) 1134 if (scrollBar.state)
1109 { 1135 scrollBar.resize ();
1110 XMoveResizeWindow (dpy, scrollBar.win,
1111 window_sb_x, 0,
1112 scrollbar_TotalWidth (), szHint.height);
1113 resize_scrollbar ();
1114 }
1115 1136
1116 XMoveResizeWindow (dpy, vt, 1137 XMoveResizeWindow (dpy, vt,
1117 window_vt_x, window_vt_y, 1138 window_vt_x, window_vt_y,
1118 width, height); 1139 vt_width, vt_height);
1140
1141 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1119 1142
1120#ifdef HAVE_BG_PIXMAP 1143#ifdef HAVE_BG_PIXMAP
1121 if (bgPixmap.window_size_sensitive ()) 1144 if (bg_window_size_sensitive ())
1122 update_background (); 1145 update_background ();
1123#endif 1146#endif
1124
1125 scr_clear ();
1126 } 1147 }
1127 1148
1128 if (fix_screen || old_height == 0) 1149 if (fix_screen || old_height == 0)
1129 scr_reset (); 1150 scr_reset ();
1130 1151
1131 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1132 //scr_touch (false);
1133
1134#ifdef HAVE_BG_PIXMAP
1135// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1136// if (bgPixmap.pixmap)
1137// scr_touch (false);
1138#endif
1139
1140#ifdef USE_XIM 1152#if USE_XIM
1141 IMSetPosition (); 1153 im_set_position ();
1142#endif 1154#endif
1143} 1155}
1144 1156
1145/* 1157/*
1146 * 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.
… …
1159 newwidth = wattr.width - szHint.base_width; 1171 newwidth = wattr.width - szHint.base_width;
1160 if (newheight == 0) 1172 if (newheight == 0)
1161 newheight = wattr.height - szHint.base_height; 1173 newheight = wattr.height - szHint.base_height;
1162 } 1174 }
1163 1175
1164 if (newwidth != width || newheight != height) 1176 if (newwidth != vt_width || newheight != vt_height)
1165 { 1177 {
1166 newwidth += szHint.base_width; 1178 newwidth += szHint.base_width;
1167 newheight += szHint.base_height; 1179 newheight += szHint.base_height;
1168 resize_all_windows (newwidth, newheight, 0); 1180 resize_all_windows (newwidth, newheight, 0);
1169 } 1181 }
1170} 1182}
1171 1183
1172/* -------------------------------------------------------------------- * 1184/* -------------------------------------------------------------------- *
1173 * - X INPUT METHOD ROUTINES - * 1185 * - X INPUT METHOD ROUTINES - *
1174 * -------------------------------------------------------------------- */ 1186 * -------------------------------------------------------------------- */
1175#ifdef USE_XIM 1187#if USE_XIM
1176 1188
1177void 1189void
1178rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1190rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1179{ 1191{
1180 fg = pix_colors [Color_fg]; 1192 fg = pix_colors [Color_fg];
… …
1207 status_rect.height = fheight; 1219 status_rect.height = fheight;
1208} 1220}
1209 1221
1210/* Checking whether input method is running. */ 1222/* Checking whether input method is running. */
1211bool 1223bool
1212rxvt_term::IMisRunning () 1224rxvt_term::im_is_running ()
1213{ 1225{
1214 char *p;
1215 Atom atom; 1226 Atom atom;
1216 Window win; 1227 Window win;
1217 char server[IMBUFSIZ]; 1228 char server[IMBUFSIZ];
1218 1229
1219 /* get current locale modifier */ 1230 /* get current locale modifier */
1220 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1231 if (char *p = XSetLocaleModifiers (0))
1221 { 1232 {
1222 strcpy (server, "@server="); 1233 strcpy (server, "@server=");
1223 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1234 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1224 1235
1225 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1236 if (p = strchr (server + 1, '@')) /* first one only */
1226 *p = '\0'; 1237 *p = '\0';
1227 1238
1228 atom = XInternAtom (dpy, server, False); 1239 atom = XInternAtom (dpy, server, False);
1229 win = XGetSelectionOwner (dpy, atom); 1240 win = XGetSelectionOwner (dpy, atom);
1230 1241
1231 if (win != None) 1242 if (win != None)
1232 return True; 1243 return true;
1233 } 1244 }
1234 1245
1235 return False; 1246 return false;
1236} 1247}
1237 1248
1238void 1249void
1239rxvt_term::IMSendSpot () 1250rxvt_term::im_send_spot ()
1240{ 1251{
1241 XPoint nspot; 1252 XPoint nspot;
1242 XVaNestedList preedit_attr; 1253 XVaNestedList preedit_attr;
1243 1254
1244 if (!Input_Context 1255 if (!Input_Context
… …
1297 1308
1298 term->make_current (); 1309 term->make_current ();
1299 1310
1300 if (text) 1311 if (text)
1301 { 1312 {
1302 void *str; 1313 wchar_t *str;
1303 1314
1304 if (!text->encoding_is_wchar && text->string.multi_byte) 1315 if (!text->encoding_is_wchar && text->string.multi_byte)
1305 { 1316 {
1306 // of course, X makes it ugly again 1317 // of course, X makes it ugly again
1307 if (term->rs[Rs_imLocale]) 1318 if (term->rs[Rs_imLocale])
1308 SET_LOCALE (term->rs[Rs_imLocale]); 1319 SET_LOCALE (term->rs[Rs_imLocale]);
1309 1320
1310 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1321 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1311 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1322 mbstowcs (str, text->string.multi_byte, text->length + 1);
1312 1323
1313 if (term->rs[Rs_imLocale]) 1324 if (term->rs[Rs_imLocale])
1314 SET_LOCALE (term->locale); 1325 SET_LOCALE (term->locale);
1315 } 1326 }
1316 else 1327 else
1317 str = (void *)text->string.wide_char; 1328 str = text->string.wide_char;
1318 1329
1319 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1330 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1320 DT_INT, call_data->caret, 1331 DT_INT, call_data->caret,
1321 DT_INT, call_data->chg_first, 1332 DT_INT, call_data->chg_first,
1322 DT_INT, call_data->chg_length, 1333 DT_INT, call_data->chg_length,
… …
1350/* 1361/*
1351 * 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
1352 * open a suitable preedit type 1363 * open a suitable preedit type
1353 */ 1364 */
1354bool 1365bool
1355rxvt_term::IM_get_IC (const char *modifiers) 1366rxvt_term::im_get_ic (const char *modifiers)
1356{ 1367{
1357 int i, j, found; 1368 int i, j, found;
1358 XIM xim; 1369 XIM xim;
1359 XPoint spot; 1370 XPoint spot;
1360 XRectangle rect, status_rect, needed_rect; 1371 XRectangle rect, status_rect, needed_rect;
1361 unsigned long fg, bg; 1372 unsigned long fg, bg;
1362 const char *p; 1373 const char *p;
1363 char **s; 1374 char **s;
1364 XIMStyles *xim_styles; 1375 XIMStyles *xim_styles;
1365#ifdef ENABLE_XIM_ONTHESPOT
1366 XIMCallback xcb[4];
1367#endif
1368 1376
1369 set_environ (envv); 1377 set_environ (env);
1370 1378
1371 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1379 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1372 return false; 1380 return false;
1373 1381
1374 input_method = display->get_xim (locale, modifiers); 1382 input_method = display->get_xim (locale, modifiers);
1375 if (input_method == NULL) 1383 if (input_method == NULL)
1376 return false; 1384 return false;
… …
1393 p = pet[pi]; 1401 p = pet[pi];
1394 1402
1395 if (!p) 1403 if (!p)
1396 continue; 1404 continue;
1397 1405
1398 s = rxvt_splitcommastring (p); 1406 s = rxvt_strsplit (',', p);
1399 1407
1400 for (i = found = 0; !found && s[i]; i++) 1408 for (i = found = 0; !found && s[i]; i++)
1401 { 1409 {
1402 if (!strcmp (s[i], "OverTheSpot")) 1410 if (!strcmp (s[i], "OverTheSpot"))
1403 input_style = XIMPreeditPosition | XIMStatusNothing; 1411 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1415 input_style = XIMPreeditNothing | XIMStatusNothing; 1423 input_style = XIMPreeditNothing | XIMStatusNothing;
1416 1424
1417 for (j = 0; j < xim_styles->count_styles; j++) 1425 for (j = 0; j < xim_styles->count_styles; j++)
1418 if (input_style == xim_styles->supported_styles[j]) 1426 if (input_style == xim_styles->supported_styles[j])
1419 { 1427 {
1420 rxvt_freecommastring (s); 1428 rxvt_free_strsplit (s);
1421 1429
1422 found = 1; 1430 found = 1;
1423 goto foundpet; 1431 goto foundpet;
1424 } 1432 }
1425 1433
1426 } 1434 }
1427 1435
1428 rxvt_freecommastring (s); 1436 rxvt_free_strsplit (s);
1429 } 1437 }
1430 1438
1431foundpet: 1439foundpet:
1432 1440
1433 XFree (xim_styles); 1441 XFree (xim_styles);
… …
1512 NULL); 1520 NULL);
1513 } 1521 }
1514#if ENABLE_XIM_ONTHESPOT 1522#if ENABLE_XIM_ONTHESPOT
1515 else if (input_style & XIMPreeditCallbacks) 1523 else if (input_style & XIMPreeditCallbacks)
1516 { 1524 {
1525 XIMCallback xcb[4];
1526
1517 im_set_position (spot); 1527 im_set_position (spot);
1518 1528
1519 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;
1520 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;
1521 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;
… …
1536#endif 1546#endif
1537 1547
1538 Input_Context = XCreateIC (xim, 1548 Input_Context = XCreateIC (xim,
1539 XNInputStyle, input_style, 1549 XNInputStyle, input_style,
1540 XNClientWindow, vt, 1550 XNClientWindow, vt,
1541 XNFocusWindow, parent[0], 1551 XNFocusWindow, parent,
1542 preedit_attr ? XNPreeditAttributes : NULL, 1552 preedit_attr ? XNPreeditAttributes : NULL,
1543 preedit_attr, 1553 preedit_attr,
1544 status_attr ? XNStatusAttributes : NULL, 1554 status_attr ? XNStatusAttributes : NULL,
1545 status_attr, NULL); 1555 status_attr, NULL);
1546 1556
… …
1559 // 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
1560 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1570 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1561 vt_select_input (); 1571 vt_select_input ();
1562#endif 1572#endif
1563 1573
1564 IMSetPosition (); 1574 im_set_position ();
1565 1575
1566 return true; 1576 return true;
1567} 1577}
1568 1578
1569void 1579void
… …
1579 im_destroy (); 1589 im_destroy ();
1580 1590
1581 if (Input_Context) 1591 if (Input_Context)
1582 return; 1592 return;
1583 1593
1584#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1585 if (rs[Rs_imLocale]) 1594 if (rs[Rs_imLocale])
1586 SET_LOCALE (rs[Rs_imLocale]); 1595 SET_LOCALE (rs[Rs_imLocale]);
1587#endif
1588 1596
1589 p = rs[Rs_inputMethod]; 1597 p = rs[Rs_inputMethod];
1590 if (p && *p) 1598 if (p && *p)
1591 { 1599 {
1592 bool found = false; 1600 bool found = false;
1593 1601
1594 s = rxvt_splitcommastring (p); 1602 s = rxvt_strsplit (',', p);
1595 1603
1596 for (i = 0; s[i]; i++) 1604 for (i = 0; s[i]; i++)
1597 { 1605 {
1598 if (*s[i]) 1606 if (*s[i])
1599 { 1607 {
1600 strcpy (buf, "@im="); 1608 strcpy (buf, "@im=");
1601 strncat (buf, s[i], IMBUFSIZ - 5); 1609 strncat (buf, s[i], IMBUFSIZ - 5);
1602 if (IM_get_IC (buf)) 1610 if (im_get_ic (buf))
1603 { 1611 {
1604 found = true; 1612 found = true;
1605 break; 1613 break;
1606 } 1614 }
1607 } 1615 }
1608 } 1616 }
1609 1617
1610 rxvt_freecommastring (s); 1618 rxvt_free_strsplit (s);
1611 1619
1612 if (found) 1620 if (found)
1613 goto done; 1621 goto done;
1614 } 1622 }
1615 1623
1616 /* try with XMODIFIERS env. var. */ 1624 /* try with XMODIFIERS env. var. */
1617 if (IM_get_IC ("")) 1625 if (im_get_ic (""))
1618 goto done; 1626 goto done;
1619 1627
1620 /* 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 */
1621 if (IM_get_IC ("@im=none")) 1629 if (im_get_ic ("@im=none"))
1622 goto done; 1630 goto done;
1623 1631
1624done: 1632done:
1625#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1626 if (rs[Rs_imLocale]) 1633 if (rs[Rs_imLocale])
1627 SET_LOCALE (locale); 1634 SET_LOCALE (locale);
1628#endif
1629} 1635}
1630 1636
1631void 1637void
1632rxvt_term::IMSetPosition () 1638rxvt_term::im_set_position ()
1633{ 1639{
1634 XRectangle preedit_rect, status_rect, *needed_rect; 1640 XRectangle preedit_rect, status_rect, *needed_rect;
1635 XVaNestedList preedit_attr, status_attr; 1641 XVaNestedList preedit_attr, status_attr;
1636 1642
1637 if (!Input_Context 1643 if (!Input_Context
1638 || !focus 1644 || !focus
1639 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1645 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1640 || !IMisRunning ()) 1646 || !im_is_running ())
1641 return; 1647 return;
1642 1648
1643 if (input_style & XIMPreeditPosition) 1649 if (input_style & XIMPreeditPosition)
1644 { 1650 {
1645 im_set_size (preedit_rect); 1651 im_set_size (preedit_rect);
… …
1675 1681
1676void 1682void
1677rxvt_term::get_window_origin (int &x, int &y) 1683rxvt_term::get_window_origin (int &x, int &y)
1678{ 1684{
1679 Window cr; 1685 Window cr;
1680 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1686 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1681/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1682}
1683
1684Pixmap
1685rxvt_term::get_pixmap_property (int prop_id)
1686{
1687 if (prop_id > 0 && prop_id < NUM_XA)
1688 if (xa[prop_id])
1689 {
1690 int aformat;
1691 unsigned long nitems, bytes_after;
1692 Atom atype;
1693 unsigned char *prop = NULL;
1694 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1695 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1696 &nitems, &bytes_after, &prop);
1697 if (result == Success && prop && atype == XA_PIXMAP)
1698 return *(Pixmap *)prop;
1699 }
1700
1701 return None;
1702} 1687}
1703 1688
1704#ifdef HAVE_BG_PIXMAP 1689#ifdef HAVE_BG_PIXMAP
1705# if TRACE_PIXMAPS
1706# undef update_background
1707void
1708rxvt_term::trace_update_background (const char *file, int line)
1709{
1710 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1711 update_background ();
1712}
1713# endif
1714 1690
1715void 1691void
1716rxvt_term::update_background () 1692rxvt_term::update_background ()
1717{ 1693{
1718 if (update_background_ev.is_active ()) 1694 if (update_background_ev.is_active ())
1719 return; 1695 return;
1720 1696
1721 bgPixmap.invalidate ();
1722
1723 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1697 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1724 1698
1725 if (to_wait <= 0.) 1699 if (to_wait <= 0.)
1726 bgPixmap.render (); 1700 bg_render ();
1727 else 1701 else
1728 update_background_ev.start (to_wait); 1702 update_background_ev.start (to_wait);
1729} 1703}
1730 1704
1731void 1705void
1732rxvt_term::update_background_cb (ev::timer &w, int revents) 1706rxvt_term::update_background_cb (ev::timer &w, int revents)
1733{ 1707{
1734 make_current (); 1708 make_current ();
1735 1709
1736 update_background_ev.stop (); 1710 update_background_ev.stop ();
1737 bgPixmap.render (); 1711 bg_render ();
1738 refresh_check (); 1712 refresh_check ();
1739} 1713}
1740 1714
1741#endif /* HAVE_BG_PIXMAP */ 1715#endif /* HAVE_BG_PIXMAP */
1742 1716

Diff Legend

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