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

Diff Legend

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