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.271 by root, Tue Dec 4 16:33:42 2007 UTC vs.
Revision 1.376 by root, Mon Jun 4 15:18:52 2012 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <assert.h>
40#include <csignal> 42#include <signal.h>
41#include <cstring> 43#include <string.h>
42 44
43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 45#include <termios.h>
45#endif
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 51# include <locale.h>
53# endif 52#endif
54#endif
55 53
54struct termios rxvt_term::def_tio;
56vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
57 56
58// used to tell global functions which terminal instance is "active" 57// used to tell global functions which terminal instance is "active"
59rxvt_t rxvt_current_term; 58rxvt_t rxvt_current_term;
60 59
… …
95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
96{ 95{
97 compose_char *cc; 96 compose_char *cc;
98 97
99 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
100 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
101 cc = (*this)[c1]; 100 cc = (*this)[c1];
102 while (cc) 101 while (cc)
103 { 102 {
104 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
105 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
106 } 105 }
107 106
108 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
109 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
110 {
111 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
113 }
114 111
115 // allocate a new combination 112 // allocate a new combination
116 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
117 { 114 {
118 static int seen; 115 static int seen;
119 116
120 if (!seen++) 117 if (!seen++)
121 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
122 119
123 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
124 } 121 }
125 122
126 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
157{ 154{
158#if HAVE_BG_PIXMAP 155#if HAVE_BG_PIXMAP
159 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this); 156 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
160#endif 157#endif
161#ifdef CURSOR_BLINK 158#ifdef CURSOR_BLINK
162 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); 159 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
163#endif 160#endif
164#ifdef TEXT_BLINK 161#ifdef TEXT_BLINK
165 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); 162 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
166#endif 163#endif
167#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 164#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
168 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this); 165 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
169#endif 166#endif
170#ifdef SELECTION_SCROLLING 167#ifdef SELECTION_SCROLLING
… …
172#endif 169#endif
173#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
174 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);
175#endif 172#endif
176#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if ENABLE_TRANSPARENCY || ENABLE_PERL
177 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
178#endif 175#endif
179#ifdef HAVE_SCROLLBARS
180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
181#endif
182#ifdef USE_XIM 177#if USE_XIM
183 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
184#endif 179#endif
185#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
186 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
187#endif 182#endif
188#ifndef NO_BELL 183#ifndef NO_BELL
189 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this); 184 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190#endif 185#endif
191 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
193 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
194 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
195 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
196 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
197 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
199 192
200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201 194
… …
229 if (fontset[i] != fontset[0]) 222 if (fontset[i] != fontset[0])
230 delete fontset[i]; 223 delete fontset[i];
231#endif 224#endif
232 delete fontset[0]; 225 delete fontset[0];
233 226
227#ifdef HAVE_BG_PIXMAP
228 bg_destroy ();
229#endif
230
234 if (display) 231 if (display)
235 { 232 {
236 selection_clear (); 233 selection_clear ();
234 selection_clear (true);
237 235
238#ifdef USE_XIM 236#if USE_XIM
239 im_destroy (); 237 im_destroy ();
240#endif 238#endif
241#ifdef XTERM_SCROLLBAR 239 scrollBar.destroy ();
242 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
243 if (ShadowGC) XFreeGC (dpy, ShadowGC);
244#endif
245#ifdef PLAIN_SCROLLBAR
246 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
247#endif
248#ifdef NEXT_SCROLLBAR
249 if (blackGC) XFreeGC (dpy, blackGC);
250 if (whiteGC) XFreeGC (dpy, whiteGC);
251 if (grayGC) XFreeGC (dpy, grayGC);
252 if (darkGC) XFreeGC (dpy, darkGC);
253 if (stippleGC) XFreeGC (dpy, stippleGC);
254 if (dimple) XFreePixmap (dpy, dimple);
255 if (upArrow) XFreePixmap (dpy, upArrow);
256 if (downArrow) XFreePixmap (dpy, downArrow);
257 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
258 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
259#endif
260#ifdef RXVT_SCROLLBAR
261 if (topShadowGC) XFreeGC (dpy, topShadowGC);
262 if (botShadowGC) XFreeGC (dpy, botShadowGC);
263 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
264#endif
265 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
266 241
267 delete drawable; 242 delete drawable;
268 // destroy all windows 243 // destroy all windows
269 if (parent[0]) 244 if (parent)
270 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
271 246
272 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
273 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
274 { 249 {
275 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
277 pix_colors_unfocused [i].free (this); 252 pix_colors_unfocused [i].free (this);
278#endif 253#endif
279 } 254 }
280 255
281 clear (); 256 clear ();
282 }
283 257
284 delete [] pix_colors_focused; 258 display->flush (); /* ideally .put should do this */
285#if OFF_FOCUS_FADING
286 delete [] pix_colors_unfocused;
287#endif
288
289#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy ();
291#endif
292 displays.put (display); 259 displays.put (display);
260 }
293 261
294 scr_release (); 262 scr_release ();
295 263
296 /* clear all resources */ 264 /* clear all resources */
297 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
298 free (allocated [i]); 266 free (allocated [i]);
299 267
300 free (selection.text); 268 free (selection.text);
301 // TODO: manage env vars in child only(!) 269 free (selection.clip_text);
302 free (env_display);
303 free (env_term);
304 free (locale); 270 free (locale);
305 free (v_buffer); 271 free (v_buffer);
306 free (incr_buf); 272
273 delete selection_req;
307 274
308 delete envv; 275 delete envv;
309 delete argv; 276 delete argv;
310 277
311#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
… …
329} 296}
330 297
331void 298void
332rxvt_term::destroy () 299rxvt_term::destroy ()
333{ 300{
334 if (destroy_ev.active) 301 if (destroy_ev.is_active ())
335 return; 302 return;
336 303
337 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 304 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
338 305
339#if ENABLE_OVERLAY 306#if ENABLE_OVERLAY
… …
343 if (display) 310 if (display)
344 { 311 {
345#if USE_XIM 312#if USE_XIM
346 im_ev.stop (display); 313 im_ev.stop (display);
347#endif 314#endif
348#if HAVE_SCROLLBARS
349 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
350#endif
351#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
352 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
353#endif 318#endif
354 incr_ev.stop ();
355 termwin_ev.stop (display); 319 termwin_ev.stop (display);
356 vt_ev.stop (display); 320 vt_ev.stop (display);
357 } 321 }
358 322
359 prepare_ev.stop (); 323 flush_ev.stop ();
360 pty_ev.stop (); 324 pty_ev.stop ();
361#ifdef CURSOR_BLINK 325#ifdef CURSOR_BLINK
362 cursor_blink_ev.stop (); 326 cursor_blink_ev.stop ();
363#endif 327#endif
364#ifdef TEXT_BLINK 328#ifdef TEXT_BLINK
… …
381rxvt_term::destroy_cb (ev::idle &w, int revents) 345rxvt_term::destroy_cb (ev::idle &w, int revents)
382{ 346{
383 make_current (); 347 make_current ();
384 348
385 delete this; 349 delete this;
350}
351
352void
353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
354{
355 if (!opt)
356 return;
357
358 uint8_t mask = 1 << (opt & 7);
359 uint8_t &val = options [opt >> 3];
360
361 val = val & ~mask | (set ? mask : 0);
386} 362}
387 363
388/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
389/* 365/*
390 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
398 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 374 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
399 (*t)->emergency_cleanup (); 375 (*t)->emergency_cleanup ();
400} 376}
401 377
402#if !ENABLE_MINIMAL 378#if !ENABLE_MINIMAL
403static void 379static void ecb_cold
404print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
405{ 381{
406 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
407 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
408 char number[32]; 384 char number[32];
409 char *mtype = "XlibMessage"; 385 const char mtype[] = "XlibMessage";
410 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
411 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
412 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 388 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
413 rxvt_warn ("%s: %s\n", mesg, buffer); 389 rxvt_warn ("%s: %s\n", mesg, buffer);
414 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
415 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
416 sprintf(number, "%d", event->request_code); 392 sprintf(number, "%d", event->request_code);
417 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
418 rxvt_warn ("(which is %s)\n", buffer); 394 rxvt_warn ("(which is %s)\n", buffer);
419 if (event->request_code >= 128) { 395 if (event->request_code >= 128) {
420 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
421 mesg, BUFSIZ); 397 mesg, BUFSIZ);
422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
423 } 399 }
424 if ((event->error_code == BadWindow) || 400 if ((event->error_code == BadWindow) ||
425 (event->error_code == BadPixmap) || 401 (event->error_code == BadPixmap) ||
426 (event->error_code == BadCursor) || 402 (event->error_code == BadCursor) ||
427 (event->error_code == BadFont) || 403 (event->error_code == BadFont) ||
428 (event->error_code == BadDrawable) || 404 (event->error_code == BadDrawable) ||
429 (event->error_code == BadColor) || 405 (event->error_code == BadColor) ||
430 (event->error_code == BadGC) || 406 (event->error_code == BadGC) ||
431 (event->error_code == BadIDChoice) || 407 (event->error_code == BadIDChoice) ||
432 (event->error_code == BadValue) || 408 (event->error_code == BadValue) ||
433 (event->error_code == BadAtom)) { 409 (event->error_code == BadAtom)) {
434 if (event->error_code == BadValue) 410 if (event->error_code == BadValue)
435 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
436 mesg, BUFSIZ); 412 mesg, BUFSIZ);
437 else if (event->error_code == BadAtom) 413 else if (event->error_code == BadAtom)
438 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
439 mesg, BUFSIZ); 415 mesg, BUFSIZ);
440 else 416 else
441 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
442 mesg, BUFSIZ); 418 mesg, BUFSIZ);
443 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
444 } 420 }
445 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
446 mesg, BUFSIZ); 422 mesg, BUFSIZ);
447 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
448} 424}
449#endif 425#endif
450 426
451int 427int ecb_cold
452rxvt_xerror_handler (Display *display, XErrorEvent *event) 428rxvt_xerror_handler (Display *display, XErrorEvent *event)
453{ 429{
454 if (GET_R->allowedxerror == -1) 430 if (GET_R->allowedxerror == -1)
455 GET_R->allowedxerror = event->error_code; 431 GET_R->allowedxerror = event->error_code;
456 else 432 else
… …
465 } 441 }
466 442
467 return 0; 443 return 0;
468} 444}
469 445
470int 446int ecb_cold
471rxvt_xioerror_handler (Display *display) 447rxvt_xioerror_handler (Display *display)
472{ 448{
473 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 449 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
474 DisplayString (display)); 450 DisplayString (display));
475 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
476 _exit (EXIT_FAILURE); 452 _exit (EXIT_FAILURE);
477}
478
479/*----------------------------------------------------------------------*/
480bool
481rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
482{
483 this->envv = envv;
484
485 SET_R (this);
486 set_locale ("");
487 set_environ (envv); // few things in X do not call setlocale :(
488
489 if (!init_vars ())
490 return false;
491
492 init_secondary ();
493
494 const char **cmd_argv = init_resources (argc, argv);
495
496#ifdef KEYSYM_RESOURCE
497 keyboard->register_done ();
498#endif
499
500#ifdef HAVE_SCROLLBARS
501 if (option (Opt_scrollBar))
502 scrollBar.setIdle (); /* set existence for size calculations */
503#endif
504
505 pty = ptytty::create ();
506
507 create_windows (argc, argv);
508
509 init_xlocale ();
510
511 scr_reset (); // initialize screen
512
513#if 0
514 XSynchronize (dpy, True);
515#endif
516
517#ifdef HAVE_SCROLLBARS
518 if (option (Opt_scrollBar))
519 resize_scrollbar (); /* create and map scrollbar */
520#endif
521#ifdef HAVE_BG_PIXMAP
522 {
523 bgPixmap.set_target (this);
524
525#ifdef ENABLE_TRANSPARENCY
526 if (option (Opt_transparent))
527 {
528 bgPixmap.set_transparent ();
529#ifdef HAVE_AFTERIMAGE
530 if (rs [Rs_blurradius])
531 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
532#endif
533 if (ISSET_PIXCOLOR (Color_tint))
534 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
535 if (rs [Rs_shade])
536 bgPixmap.set_shade (rs [Rs_shade]);
537
538 bgPixmap.set_root_pixmap ();
539 XSelectInput (dpy, display->root, PropertyChangeMask);
540 rootwin_ev.start (display, display->root);
541 }
542#endif
543
544#ifdef BG_IMAGE_FROM_FILE
545 if (rs[Rs_backgroundPixmap] != NULL)
546 {
547 const char *p = rs[Rs_backgroundPixmap];
548
549 if ((p = strchr (p, ';')) != NULL)
550 {
551 p++;
552 bgPixmap.set_geometry (p);
553 }
554 else
555 bgPixmap.set_defaultGeometry ();
556
557 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
558 if (!bgPixmap.window_position_sensitive ())
559 update_background ();
560 }
561#endif
562 }
563#endif
564
565#if ENABLE_PERL
566 rootwin_ev.start (display, display->root);
567#endif
568
569 set_colorfgbg ();
570
571 init_command (cmd_argv);
572
573 free (cmd_argv);
574
575 if (pty->pty >= 0)
576 pty_ev.start (pty->pty, ev::READ);
577
578 prepare_ev.start ();
579
580 HOOK_INVOKE ((this, HOOK_START, DT_END));
581
582#if ENABLE_XEMBED
583 if (rs[Rs_embed])
584 {
585 long info[2] = { 0, XEMBED_MAPPED };
586
587 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
588 32, PropModeReplace, (unsigned char *)&info, 2);
589 }
590#endif
591
592 XMapWindow (dpy, vt);
593 XMapWindow (dpy, parent[0]);
594
595 return true;
596} 453}
597 454
598static struct sig_handlers 455static struct sig_handlers
599{ 456{
600 ev::sig sw_term, sw_int; 457 ev::sig sw_term, sw_int;
… …
617 rxvt_emergency_cleanup (); 474 rxvt_emergency_cleanup ();
618 w.stop (); 475 w.stop ();
619 kill (getpid (), w.signum); 476 kill (getpid (), w.signum);
620} 477}
621 478
479static void
480rxvt_get_ttymode (struct termios *tio)
481{
482 if (tcgetattr (STDIN_FILENO, tio) < 0)
483 memset (tio, 0, sizeof (struct termios));
484
485 for (int i = 0; i < NCCS; i++)
486 tio->c_cc[i] = VDISABLE;
487
488 tio->c_cc[VINTR] = CINTR;
489 tio->c_cc[VQUIT] = CQUIT;
490 tio->c_cc[VERASE] = CERASE;
491#ifdef VERASE2
492 tio->c_cc[VERASE2] = CERASE2;
493#endif
494 tio->c_cc[VKILL] = CKILL;
495 tio->c_cc[VEOF] = CEOF;
496 tio->c_cc[VSTART] = CSTART;
497 tio->c_cc[VSTOP] = CSTOP;
498 tio->c_cc[VSUSP] = CSUSP;
499# ifdef VDSUSP
500 tio->c_cc[VDSUSP] = CDSUSP;
501# endif
502# ifdef VREPRINT
503 tio->c_cc[VREPRINT] = CRPRNT;
504# endif
505# ifdef VDISCRD
506 tio->c_cc[VDISCRD] = CFLUSH;
507# endif
508# ifdef VWERSE
509 tio->c_cc[VWERSE] = CWERASE;
510# endif
511# ifdef VLNEXT
512 tio->c_cc[VLNEXT] = CLNEXT;
513# endif
514# ifdef VSTATUS
515 tio->c_cc[VSTATUS] = CSTATUS;
516# endif
517
518# if VMIN != VEOF
519 tio->c_cc[VMIN] = 1;
520# endif
521# if VTIME != VEOL
522 tio->c_cc[VTIME] = 0;
523# endif
524
525 /* input modes */
526 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
527# ifdef IMAXBEL
528 | IMAXBEL
529# endif
530 | IXON);
531
532 /* output modes */
533 tio->c_oflag = (OPOST | ONLCR);
534
535 /* control modes */
536 tio->c_cflag = (CS8 | CREAD);
537
538 /* local modes */
539 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
540# if defined (ECHOCTL) && defined (ECHOKE)
541 | ECHOCTL | ECHOKE
542# endif
543 | ECHOE | ECHOK);
544}
545
622char **rxvt_environ; // startup environment 546char **rxvt_environ; // startup environment
623 547
624void 548void
625rxvt_init () 549rxvt_init ()
626{ 550{
627 ptytty::init (); 551 assert (("fontMask must not overlap other RS masks",
552 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
628 553
554 rxvt_get_ttymode (&rxvt_term::def_tio);
555
556 // get rid of stdin/stdout as we don't need them, to free resources
557 dup2 (STDERR_FILENO, STDIN_FILENO);
558 dup2 (STDERR_FILENO, STDOUT_FILENO);
559
629 if (!ev_default_loop (0)) 560 if (!ev_default_loop ())
630 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 561 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
631 562
632 rxvt_environ = environ; 563 rxvt_environ = environ;
633 564
634 signal (SIGHUP, SIG_IGN); 565 signal (SIGHUP, SIG_IGN);
635 signal (SIGPIPE, SIG_IGN); 566 signal (SIGPIPE, SIG_IGN);
636 567
637 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 568 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
638 sig_handlers.sw_int.start (SIGINT); ev_unref (); 569 sig_handlers.sw_int.start (SIGINT); ev_unref ();
639
640 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
641 /* signal (SIGURG, SIG_DFL); */
642 570
643 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 571 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
644 // TODO: handle this with exceptions and tolerate the memory loss 572 // TODO: handle this with exceptions and tolerate the memory loss
645 XSetIOErrorHandler (rxvt_xioerror_handler); 573 XSetIOErrorHandler (rxvt_xioerror_handler);
646 574
647 XrmInitialize (); 575 XrmInitialize ();
648}
649 576
650/* ------------------------------------------------------------------------- * 577#if HAVE_PIXBUF
651 * MEMORY ALLOCATION WRAPPERS * 578 g_type_init ();
652 * ------------------------------------------------------------------------- */ 579#endif
653void *
654rxvt_malloc (size_t size)
655{
656 void *p = malloc (size);
657
658 if (!p)
659 rxvt_fatal ("memory allocation failure. aborting.\n");
660
661 return p;
662}
663
664void *
665rxvt_calloc (size_t number, size_t size)
666{
667 void *p = calloc (number, size);
668
669 if (!p)
670 rxvt_fatal ("memory allocation failure. aborting.\n");
671
672 return p;
673}
674
675void *
676rxvt_realloc (void *ptr, size_t size)
677{
678 void *p = realloc (ptr, size);
679
680 if (!p)
681 rxvt_fatal ("memory allocation failure. aborting.\n");
682
683 return p;
684} 580}
685 581
686/*----------------------------------------------------------------------*/ 582/*----------------------------------------------------------------------*/
687/* 583/*
688 * window size/position calculations for XSizeHint and other storage. 584 * window size/position calculations for XSizeHint and other storage.
… …
690 */ 586 */
691void 587void
692rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 588rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
693{ 589{
694 short recalc_x, recalc_y; 590 short recalc_x, recalc_y;
695 int x, y, sb_w, flags; 591 int x, y, flags;
696 unsigned int w, h; 592 unsigned int w, h;
697 unsigned int max_width, max_height; 593 unsigned int max_width, max_height;
698 594
699 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 595 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
700 szHint.win_gravity = NorthWestGravity; 596 szHint.win_gravity = NorthWestGravity;
… …
710 if (rs[Rs_geometry]) 606 if (rs[Rs_geometry])
711 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 607 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
712 608
713 if (flags & WidthValue) 609 if (flags & WidthValue)
714 { 610 {
611 if (!w)
612 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
613
715 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 614 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
716 szHint.flags |= USSize; 615 szHint.flags |= USSize;
717 } 616 }
718 617
719 if (flags & HeightValue) 618 if (flags & HeightValue)
720 { 619 {
620 if (!h)
621 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
622
721 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 623 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
722 szHint.flags |= USSize; 624 szHint.flags |= USSize;
723 } 625 }
724 626
725 if (flags & XValue) 627 if (flags & XValue)
726 { 628 {
… …
757 max_width = MAX_COLS * fwidth; 659 max_width = MAX_COLS * fwidth;
758 max_height = MAX_ROWS * fheight; 660 max_height = MAX_ROWS * fheight;
759 661
760 szHint.base_width = szHint.base_height = 2 * int_bwidth; 662 szHint.base_width = szHint.base_height = 2 * int_bwidth;
761 663
762 sb_w = 0;
763 window_vt_x = window_vt_y = int_bwidth; 664 window_vt_x = window_vt_y = int_bwidth;
764 665
765 if (scrollBar.state) 666 if (scrollBar.state)
766 { 667 {
767 sb_w = scrollbar_TotalWidth (); 668 int sb_w = scrollBar.total_width ();
768 szHint.base_width += sb_w; 669 szHint.base_width += sb_w;
769 670
770 if (!option (Opt_scrollBar_right)) 671 if (!option (Opt_scrollBar_right))
771 window_vt_x += sb_w; 672 window_vt_x += sb_w;
772 } 673 }
… …
796 { 697 {
797 min_it (height, max_height); 698 min_it (height, max_height);
798 szHint.height = szHint.base_height + height; 699 szHint.height = szHint.base_height + height;
799 } 700 }
800 701
801 if (scrollBar.state && option (Opt_scrollBar_right))
802 window_sb_x = szHint.width - sb_w;
803
804 if (recalc_x) 702 if (recalc_x)
805 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 703 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
806 704
807 if (recalc_y) 705 if (recalc_y)
808 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 706 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
809 707
810 ncol = width / fwidth; 708 ncol = width / fwidth;
811 nrow = height / fheight; 709 nrow = height / fheight;
710
711 // When the size of the vt window is not a multiple of the cell
712 // size, i.e., when the wm does not honour our size hints, there are
713 // extra areas not covered by the terminal screen. Such gaps, when a
714 // bg pixmap is set, would have to be cleared manually to properly
715 // refresh the background. We take the simpler route and shrink the
716 // vt window so as to avoid creating gaps.
717 vt_width = ncol * fwidth;
718 vt_height = nrow * fheight;
812} 719}
813 720
814/*----------------------------------------------------------------------*/ 721/*----------------------------------------------------------------------*/
815/* 722/*
816 * Tell the teletype handler what size the window is. 723 * Tell the teletype handler what size the window is.
… …
824 731
825 struct winsize ws; 732 struct winsize ws;
826 733
827 ws.ws_col = ncol; 734 ws.ws_col = ncol;
828 ws.ws_row = nrow; 735 ws.ws_row = nrow;
829 ws.ws_xpixel = width; 736 ws.ws_xpixel = vt_width;
830 ws.ws_ypixel = height; 737 ws.ws_ypixel = vt_height;
831 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 738 ioctl (pty->pty, TIOCSWINSZ, &ws);
832 739
833#if 0 740#if 0
834 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 741 // TIOCSWINSZ is supposed to do this automatically and correctly
835 if (cmd_pid) /* force through to the command */ 742 if (cmd_pid) /* force through to the command */
836 kill (-cmd_pid, SIGWINCH); 743 kill (-cmd_pid, SIGWINCH);
837#endif 744#endif
838} 745}
839 746
840/*----------------------------------------------------------------------*/ 747/*----------------------------------------------------------------------*/
841/* set_fonts () - load and set the various fonts 748/* load and set the various fonts */
842 *
843 * init = 1 - initialize
844 *
845 * fontname == FONT_UP - switch to bigger font
846 * fontname == FONT_DN - switch to smaller font
847 */
848bool 749bool
849rxvt_term::set_fonts () 750rxvt_term::set_fonts ()
850{ 751{
851 rxvt_fontset *fs = new rxvt_fontset (this); 752 rxvt_fontset *fs = new rxvt_fontset (this);
852 rxvt_fontprop prop; 753 rxvt_fontprop prop;
… …
866#endif 767#endif
867 768
868 delete fontset[0]; 769 delete fontset[0];
869 fontset[0] = fs; 770 fontset[0] = fs;
870 771
871 prop = (*fs)[1]->properties (); 772 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
872 prop.height += lineSpace; 773 prop.width += letterSpace;
873 774
874 fs->set_prop (prop, false); 775 fs->set_prop (prop, false);
875 776
876 fwidth = prop.width; 777 fwidth = prop.width;
877 fheight = prop.height; 778 fheight = prop.height + lineSpace;
878 fbase = prop.ascent; 779 fbase = prop.ascent;
879 780
880 for (int style = 1; style < 4; style++) 781 for (int style = 1; style < 4; style++)
881 { 782 {
882#if ENABLE_STYLES 783#if ENABLE_STYLES
… …
908#else 809#else
909 fontset[style] = fontset[0]; 810 fontset[style] = fontset[0];
910#endif 811#endif
911 } 812 }
912 813
913 if (parent[0]) 814 if (parent)
914 { 815 {
915 resize_all_windows (0, 0, 0); 816 resize_all_windows (0, 0, 0);
916 scr_remap_chars (); 817 scr_remap_chars ();
917 scr_touch (true); 818 scr_touch (true);
918 } 819 }
… …
921} 822}
922 823
923void 824void
924rxvt_term::set_string_property (Atom prop, const char *str, int len) 825rxvt_term::set_string_property (Atom prop, const char *str, int len)
925{ 826{
926 XChangeProperty (dpy, parent[0], 827 XChangeProperty (dpy, parent,
927 prop, XA_STRING, 8, PropModeReplace, 828 prop, XA_STRING, 8, PropModeReplace,
928 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 829 (const unsigned char *)str, len >= 0 ? len : strlen (str));
929} 830}
930 831
931void 832void
833rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
834{
835 XTextProperty ct;
836
837 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
838 {
839 XSetTextProperty (dpy, parent, &ct, prop);
840 XFree (ct.value);
841 }
842}
843
844void
932rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 845rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
933{ 846{
934 wchar_t *ws = rxvt_mbstowcs (str, len); 847 wchar_t *ws = rxvt_mbstowcs (str, len);
935 char *s = rxvt_wcstoutf8 (ws); 848 char *s = rxvt_wcstoutf8 (ws);
936 849
937 XChangeProperty (dpy, parent[0], 850 XChangeProperty (dpy, parent,
938 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 851 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
939 (const unsigned char *)s, strlen (s)); 852 (const unsigned char *)s, strlen (s));
940 853
941 free (s); 854 free (s);
942 free (ws); 855 free (ws);
… …
946/*----------------------------------------------------------------------*/ 859/*----------------------------------------------------------------------*/
947/* xterm sequences - title, iconName, color (exptl) */ 860/* xterm sequences - title, iconName, color (exptl) */
948void 861void
949rxvt_term::set_title (const char *str) 862rxvt_term::set_title (const char *str)
950{ 863{
951 set_string_property (XA_WM_NAME, str); 864 set_mbstring_property (XA_WM_NAME, str);
952#if ENABLE_EWMH 865#if ENABLE_EWMH
953 set_utf8_property (xa[XA_NET_WM_NAME], str); 866 set_utf8_property (xa[XA_NET_WM_NAME], str);
954#endif 867#endif
955} 868}
956 869
957void 870void
958rxvt_term::set_icon_name (const char *str) 871rxvt_term::set_icon_name (const char *str)
959{ 872{
960 set_string_property (XA_WM_ICON_NAME, str); 873 set_mbstring_property (XA_WM_ICON_NAME, str);
961#if ENABLE_EWMH 874#if ENABLE_EWMH
962 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 875 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
963#endif 876#endif
964} 877}
965 878
966void 879void
967rxvt_term::set_window_color (int idx, const char *color) 880rxvt_term::set_window_color (int idx, const char *color)
968{ 881{
969#ifdef XTERM_COLOR_CHANGE 882#ifdef XTERM_COLOR_CHANGE
970 rxvt_color xcol; 883 rxvt_color xcol;
971 int i;
972 884
973 if (color == NULL || *color == '\0') 885 if (color == NULL || *color == '\0')
974 return; 886 return;
975 887
976 color = strdup (color); 888 color = strdup (color);
… …
978 rs[Rs_color + idx] = color; 890 rs[Rs_color + idx] = color;
979 891
980 /* handle color aliases */ 892 /* handle color aliases */
981 if (isdigit (*color)) 893 if (isdigit (*color))
982 { 894 {
983 i = atoi (color); 895 int i = atoi (color);
984 896
985 if (i >= 8 && i <= 15) 897 if (i >= 8 && i <= 15)
986 { 898 {
987 /* bright colors */ 899 /* bright colors */
988 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 900 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1033 945
1034/*----------------------------------------------------------------------*/ 946/*----------------------------------------------------------------------*/
1035/* 947/*
1036 * find if fg/bg matches any of the normal (low-intensity) colors 948 * find if fg/bg matches any of the normal (low-intensity) colors
1037 */ 949 */
1038void 950char *
1039rxvt_term::set_colorfgbg () 951rxvt_term::get_colorfgbg ()
1040{ 952{
1041 unsigned int i; 953 unsigned int i;
1042 const char *xpmb = ""; 954 const char *xpmb = "";
1043 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 955 char fstr[] = "default";
956 char bstr[] = "default";
957 char *env_colorfgbg;
1044 958
1045 strcpy (fstr, "default");
1046 strcpy (bstr, "default");
1047 for (i = Color_Black; i <= Color_White; i++) 959 for (i = Color_Black; i <= Color_White; i++)
1048 if (pix_colors[Color_fg] == pix_colors[i]) 960 if (pix_colors[Color_fg] == pix_colors[i])
1049 { 961 {
1050 sprintf (fstr, "%d", (i - Color_Black)); 962 sprintf (fstr, "%d", i - Color_Black);
1051 break; 963 break;
1052 } 964 }
1053 965
1054 for (i = Color_Black; i <= Color_White; i++) 966 for (i = Color_Black; i <= Color_White; i++)
1055 if (pix_colors[Color_bg] == pix_colors[i]) 967 if (pix_colors[Color_bg] == pix_colors[i])
1056 { 968 {
1057 sprintf (bstr, "%d", (i - Color_Black)); 969 sprintf (bstr, "%d", i - Color_Black);
1058#ifdef BG_IMAGE_FROM_FILE 970#if BG_IMAGE_FROM_FILE
1059 xpmb = "default;"; 971 xpmb = "default;";
1060#endif 972#endif
1061 break; 973 break;
1062 } 974 }
1063 975
976 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1064 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 977 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
978 return env_colorfgbg;
1065} 979}
1066 980
1067/*----------------------------------------------------------------------*/ 981/*----------------------------------------------------------------------*/
1068 982
1069bool 983bool
… …
1092 int old_width = szHint.width; 1006 int old_width = szHint.width;
1093 int old_height = szHint.height; 1007 int old_height = szHint.height;
1094 1008
1095 window_calc (newwidth, newheight); 1009 window_calc (newwidth, newheight);
1096 1010
1097 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1011 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1012
1013 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1014 if (set_hint)
1015 {
1016 szHint.flags &= ~(PBaseSize | PResizeInc);
1098 XSetWMNormalHints (dpy, parent[0], &szHint); 1017 XSetWMNormalHints (dpy, parent, &szHint);
1018 szHint.flags |= PBaseSize | PResizeInc;
1019 }
1099 1020
1100 if (!ignoreparent) 1021 if (!ignoreparent)
1101 { 1022 {
1102#ifdef SMART_RESIZE 1023#ifdef SMART_RESIZE
1103 /* 1024 /*
… …
1107 int x, y, x1, y1; 1028 int x, y, x1, y1;
1108 int dx, dy; 1029 int dx, dy;
1109 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1030 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1110 Window unused_cr; 1031 Window unused_cr;
1111 1032
1112 XTranslateCoordinates (dpy, parent[0], display->root, 1033 XTranslateCoordinates (dpy, parent, display->root,
1113 0, 0, &x, &y, &unused_cr); 1034 0, 0, &x, &y, &unused_cr);
1114 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1035 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1115 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1036 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1116 /* 1037 /*
1117 * if display->root isn't the parent window, a WM will probably have offset 1038 * if display->root isn't the parent window, a WM will probably have offset
1118 * our position for handles and decorations. Counter it 1039 * our position for handles and decorations. Counter it
1119 */ 1040 */
… …
1136 if (y < y1) /* top half */ 1057 if (y < y1) /* top half */
1137 dy = 0; 1058 dy = 0;
1138 else if (y == y1) /* exact center */ 1059 else if (y == y1) /* exact center */
1139 dy /= 2; 1060 dy /= 2;
1140 1061
1141 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1062 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1142 szHint.width, szHint.height); 1063 szHint.width, szHint.height);
1143#else 1064#else
1144 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1065 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1145#endif 1066#endif
1146 } 1067 }
1068
1069 if (set_hint)
1070 XSetWMNormalHints (dpy, parent, &szHint);
1147 1071
1148 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1072 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1149 1073
1150 if (fix_screen || newwidth != old_width || newheight != old_height) 1074 if (fix_screen || newwidth != old_width || newheight != old_height)
1151 { 1075 {
1152 if (scrollBar.state) 1076 if (scrollBar.state)
1153 { 1077 scrollBar.resize ();
1154 XMoveResizeWindow (dpy, scrollBar.win,
1155 window_sb_x, 0,
1156 scrollbar_TotalWidth (), szHint.height);
1157 resize_scrollbar ();
1158 }
1159 1078
1160 XMoveResizeWindow (dpy, vt, 1079 XMoveResizeWindow (dpy, vt,
1161 window_vt_x, window_vt_y, 1080 window_vt_x, window_vt_y,
1162 width, height); 1081 vt_width, vt_height);
1163 1082
1164#ifdef HAVE_BG_PIXMAP 1083#ifdef HAVE_BG_PIXMAP
1165 if (bgPixmap.window_size_sensitive ()) 1084 if (bg_window_size_sensitive ())
1166 update_background (); 1085 update_background ();
1167#endif 1086#endif
1168
1169 scr_clear ();
1170 } 1087 }
1171 1088
1172 if (fix_screen || old_height == 0) 1089 if (fix_screen || old_height == 0)
1173 scr_reset (); 1090 scr_reset ();
1174 1091
1175 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1176 //scr_touch (false);
1177
1178#ifdef HAVE_BG_PIXMAP
1179// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1180// if (bgPixmap.pixmap)
1181// scr_touch (false);
1182#endif
1183
1184#ifdef USE_XIM 1092#if USE_XIM
1185 IMSetPosition (); 1093 im_set_position ();
1186#endif 1094#endif
1187} 1095}
1188 1096
1189/* 1097/*
1190 * Set the width/height of the vt window in characters. Units are pixels. 1098 * Set the width/height of the vt window in characters. Units are pixels.
… …
1203 newwidth = wattr.width - szHint.base_width; 1111 newwidth = wattr.width - szHint.base_width;
1204 if (newheight == 0) 1112 if (newheight == 0)
1205 newheight = wattr.height - szHint.base_height; 1113 newheight = wattr.height - szHint.base_height;
1206 } 1114 }
1207 1115
1208 if (newwidth != width || newheight != height) 1116 if (newwidth != vt_width || newheight != vt_height)
1209 { 1117 {
1210 newwidth += szHint.base_width; 1118 newwidth += szHint.base_width;
1211 newheight += szHint.base_height; 1119 newheight += szHint.base_height;
1212 resize_all_windows (newwidth, newheight, 0); 1120 resize_all_windows (newwidth, newheight, 0);
1213 } 1121 }
1214} 1122}
1215 1123
1216/* -------------------------------------------------------------------- * 1124/* -------------------------------------------------------------------- *
1217 * - X INPUT METHOD ROUTINES - * 1125 * - X INPUT METHOD ROUTINES - *
1218 * -------------------------------------------------------------------- */ 1126 * -------------------------------------------------------------------- */
1219#ifdef USE_XIM 1127#if USE_XIM
1220 1128
1221void 1129void
1222rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1130rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1223{ 1131{
1224 fg = pix_colors [Color_fg]; 1132 fg = pix_colors [Color_fg];
… …
1251 status_rect.height = fheight; 1159 status_rect.height = fheight;
1252} 1160}
1253 1161
1254/* Checking whether input method is running. */ 1162/* Checking whether input method is running. */
1255bool 1163bool
1256rxvt_term::IMisRunning () 1164rxvt_term::im_is_running ()
1257{ 1165{
1258 char *p;
1259 Atom atom; 1166 Atom atom;
1260 Window win; 1167 Window win;
1261 char server[IMBUFSIZ]; 1168 char server[IMBUFSIZ];
1262 1169
1263 /* get current locale modifier */ 1170 /* get current locale modifier */
1264 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1171 if (char *p = XSetLocaleModifiers (0))
1265 { 1172 {
1266 strcpy (server, "@server="); 1173 strcpy (server, "@server=");
1267 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1174 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1268 1175
1269 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1176 if (p = strchr (server + 1, '@')) /* first one only */
1270 *p = '\0'; 1177 *p = '\0';
1271 1178
1272 atom = XInternAtom (dpy, server, False); 1179 atom = XInternAtom (dpy, server, False);
1273 win = XGetSelectionOwner (dpy, atom); 1180 win = XGetSelectionOwner (dpy, atom);
1274 1181
1275 if (win != None) 1182 if (win != None)
1276 return True; 1183 return true;
1277 } 1184 }
1278 1185
1279 return False; 1186 return false;
1280} 1187}
1281 1188
1282void 1189void
1283rxvt_term::IMSendSpot () 1190rxvt_term::im_send_spot ()
1284{ 1191{
1285 XPoint nspot; 1192 XPoint nspot;
1286 XVaNestedList preedit_attr; 1193 XVaNestedList preedit_attr;
1287 1194
1288 if (!Input_Context 1195 if (!Input_Context
… …
1341 1248
1342 term->make_current (); 1249 term->make_current ();
1343 1250
1344 if (text) 1251 if (text)
1345 { 1252 {
1346 void *str; 1253 wchar_t *str;
1347 1254
1348 if (!text->encoding_is_wchar && text->string.multi_byte) 1255 if (!text->encoding_is_wchar && text->string.multi_byte)
1349 { 1256 {
1350 // of course, X makes it ugly again 1257 // of course, X makes it ugly again
1351 if (term->rs[Rs_imLocale]) 1258 if (term->rs[Rs_imLocale])
1352 SET_LOCALE (term->rs[Rs_imLocale]); 1259 SET_LOCALE (term->rs[Rs_imLocale]);
1353 1260
1354 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1261 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1355 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1262 mbstowcs (str, text->string.multi_byte, text->length + 1);
1356 1263
1357 if (term->rs[Rs_imLocale]) 1264 if (term->rs[Rs_imLocale])
1358 SET_LOCALE (term->locale); 1265 SET_LOCALE (term->locale);
1359 } 1266 }
1360 else 1267 else
1361 str = (void *)text->string.wide_char; 1268 str = text->string.wide_char;
1362 1269
1363 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1270 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1364 DT_INT, call_data->caret, 1271 DT_INT, call_data->caret,
1365 DT_INT, call_data->chg_first, 1272 DT_INT, call_data->chg_first,
1366 DT_INT, call_data->chg_length, 1273 DT_INT, call_data->chg_length,
… …
1394/* 1301/*
1395 * Try to open a XIM with the current modifiers, then see if we can 1302 * Try to open a XIM with the current modifiers, then see if we can
1396 * open a suitable preedit type 1303 * open a suitable preedit type
1397 */ 1304 */
1398bool 1305bool
1399rxvt_term::IM_get_IC (const char *modifiers) 1306rxvt_term::im_get_ic (const char *modifiers)
1400{ 1307{
1401 int i, j, found; 1308 int i, j, found;
1402 XIM xim; 1309 XIM xim;
1403 XPoint spot; 1310 XPoint spot;
1404 XRectangle rect, status_rect, needed_rect; 1311 XRectangle rect, status_rect, needed_rect;
1405 unsigned long fg, bg; 1312 unsigned long fg, bg;
1406 const char *p; 1313 const char *p;
1407 char **s; 1314 char **s;
1408 XIMStyles *xim_styles; 1315 XIMStyles *xim_styles;
1409#ifdef ENABLE_XIM_ONTHESPOT
1410 XIMCallback xcb[4];
1411#endif
1412 1316
1413 set_environ (envv); 1317 set_environ (envv);
1414 1318
1415 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1416 return false; 1320 return false;
… …
1437 p = pet[pi]; 1341 p = pet[pi];
1438 1342
1439 if (!p) 1343 if (!p)
1440 continue; 1344 continue;
1441 1345
1442 s = rxvt_splitcommastring (p); 1346 s = rxvt_strsplit (',', p);
1443 1347
1444 for (i = found = 0; !found && s[i]; i++) 1348 for (i = found = 0; !found && s[i]; i++)
1445 { 1349 {
1446 if (!strcmp (s[i], "OverTheSpot")) 1350 if (!strcmp (s[i], "OverTheSpot"))
1447 input_style = XIMPreeditPosition | XIMStatusNothing; 1351 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1459 input_style = XIMPreeditNothing | XIMStatusNothing; 1363 input_style = XIMPreeditNothing | XIMStatusNothing;
1460 1364
1461 for (j = 0; j < xim_styles->count_styles; j++) 1365 for (j = 0; j < xim_styles->count_styles; j++)
1462 if (input_style == xim_styles->supported_styles[j]) 1366 if (input_style == xim_styles->supported_styles[j])
1463 { 1367 {
1464 rxvt_freecommastring (s); 1368 rxvt_free_strsplit (s);
1465 1369
1466 found = 1; 1370 found = 1;
1467 goto foundpet; 1371 goto foundpet;
1468 } 1372 }
1469 1373
1470 } 1374 }
1471 1375
1472 rxvt_freecommastring (s); 1376 rxvt_free_strsplit (s);
1473 } 1377 }
1474 1378
1475foundpet: 1379foundpet:
1476 1380
1477 XFree (xim_styles); 1381 XFree (xim_styles);
… …
1556 NULL); 1460 NULL);
1557 } 1461 }
1558#if ENABLE_XIM_ONTHESPOT 1462#if ENABLE_XIM_ONTHESPOT
1559 else if (input_style & XIMPreeditCallbacks) 1463 else if (input_style & XIMPreeditCallbacks)
1560 { 1464 {
1465 XIMCallback xcb[4];
1466
1561 im_set_position (spot); 1467 im_set_position (spot);
1562 1468
1563 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1469 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1564 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1470 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1565 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1471 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1580#endif 1486#endif
1581 1487
1582 Input_Context = XCreateIC (xim, 1488 Input_Context = XCreateIC (xim,
1583 XNInputStyle, input_style, 1489 XNInputStyle, input_style,
1584 XNClientWindow, vt, 1490 XNClientWindow, vt,
1585 XNFocusWindow, parent[0], 1491 XNFocusWindow, parent,
1586 preedit_attr ? XNPreeditAttributes : NULL, 1492 preedit_attr ? XNPreeditAttributes : NULL,
1587 preedit_attr, 1493 preedit_attr,
1588 status_attr ? XNStatusAttributes : NULL, 1494 status_attr ? XNStatusAttributes : NULL,
1589 status_attr, NULL); 1495 status_attr, NULL);
1590 1496
… …
1603 // unfortunately, only the focus window is used by XIM, hard to fix 1509 // unfortunately, only the focus window is used by XIM, hard to fix
1604 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1510 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1605 vt_select_input (); 1511 vt_select_input ();
1606#endif 1512#endif
1607 1513
1608 IMSetPosition (); 1514 im_set_position ();
1609 1515
1610 return true; 1516 return true;
1611} 1517}
1612 1518
1613void 1519void
… …
1623 im_destroy (); 1529 im_destroy ();
1624 1530
1625 if (Input_Context) 1531 if (Input_Context)
1626 return; 1532 return;
1627 1533
1628#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1629 if (rs[Rs_imLocale]) 1534 if (rs[Rs_imLocale])
1630 SET_LOCALE (rs[Rs_imLocale]); 1535 SET_LOCALE (rs[Rs_imLocale]);
1631#endif
1632 1536
1633 p = rs[Rs_inputMethod]; 1537 p = rs[Rs_inputMethod];
1634 if (p && *p) 1538 if (p && *p)
1635 { 1539 {
1636 bool found = false; 1540 bool found = false;
1637 1541
1638 s = rxvt_splitcommastring (p); 1542 s = rxvt_strsplit (',', p);
1639 1543
1640 for (i = 0; s[i]; i++) 1544 for (i = 0; s[i]; i++)
1641 { 1545 {
1642 if (*s[i]) 1546 if (*s[i])
1643 { 1547 {
1644 strcpy (buf, "@im="); 1548 strcpy (buf, "@im=");
1645 strncat (buf, s[i], IMBUFSIZ - 5); 1549 strncat (buf, s[i], IMBUFSIZ - 5);
1646 if (IM_get_IC (buf)) 1550 if (im_get_ic (buf))
1647 { 1551 {
1648 found = true; 1552 found = true;
1649 break; 1553 break;
1650 } 1554 }
1651 } 1555 }
1652 } 1556 }
1653 1557
1654 rxvt_freecommastring (s); 1558 rxvt_free_strsplit (s);
1655 1559
1656 if (found) 1560 if (found)
1657 goto done; 1561 goto done;
1658 } 1562 }
1659 1563
1660 /* try with XMODIFIERS env. var. */ 1564 /* try with XMODIFIERS env. var. */
1661 if (IM_get_IC ("")) 1565 if (im_get_ic (""))
1662 goto done; 1566 goto done;
1663 1567
1664 /* try with no modifiers base IF the user didn't specify an IM */ 1568 /* try with no modifiers base IF the user didn't specify an IM */
1665 if (IM_get_IC ("@im=none")) 1569 if (im_get_ic ("@im=none"))
1666 goto done; 1570 goto done;
1667 1571
1668done: 1572done:
1669#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1670 if (rs[Rs_imLocale]) 1573 if (rs[Rs_imLocale])
1671 SET_LOCALE (locale); 1574 SET_LOCALE (locale);
1672#endif
1673} 1575}
1674 1576
1675void 1577void
1676rxvt_term::IMSetPosition () 1578rxvt_term::im_set_position ()
1677{ 1579{
1678 XRectangle preedit_rect, status_rect, *needed_rect; 1580 XRectangle preedit_rect, status_rect, *needed_rect;
1679 XVaNestedList preedit_attr, status_attr; 1581 XVaNestedList preedit_attr, status_attr;
1680 1582
1681 if (!Input_Context 1583 if (!Input_Context
1682 || !focus 1584 || !focus
1683 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1585 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1684 || !IMisRunning ()) 1586 || !im_is_running ())
1685 return; 1587 return;
1686 1588
1687 if (input_style & XIMPreeditPosition) 1589 if (input_style & XIMPreeditPosition)
1688 { 1590 {
1689 im_set_size (preedit_rect); 1591 im_set_size (preedit_rect);
… …
1719 1621
1720void 1622void
1721rxvt_term::get_window_origin (int &x, int &y) 1623rxvt_term::get_window_origin (int &x, int &y)
1722{ 1624{
1723 Window cr; 1625 Window cr;
1724 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1626 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1725/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1726}
1727
1728Pixmap
1729rxvt_term::get_pixmap_property (int prop_id)
1730{
1731 if (prop_id > 0 && prop_id < NUM_XA)
1732 if (xa[prop_id])
1733 {
1734 int aformat;
1735 unsigned long nitems, bytes_after;
1736 Atom atype;
1737 unsigned char *prop = NULL;
1738 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1739 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1740 &nitems, &bytes_after, &prop);
1741 if (result == Success && prop && atype == XA_PIXMAP)
1742 {
1743 return *(Pixmap *)prop;
1744 }
1745 }
1746 return None;
1747} 1627}
1748 1628
1749#ifdef HAVE_BG_PIXMAP 1629#ifdef HAVE_BG_PIXMAP
1750# if TRACE_PIXMAPS
1751# undef update_background
1752int rxvt_term::trace_update_background (const char *file, int line)
1753{
1754 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1755 update_background ();
1756}
1757# endif
1758 1630
1759int 1631void
1760rxvt_term::update_background () 1632rxvt_term::update_background ()
1761{ 1633{
1634 if (update_background_ev.is_active ())
1635 return;
1636
1762 bgPixmap.invalidate (); 1637 bg_invalidate ();
1763 1638
1764 /* no chance of real time refresh if we are blurring! */ 1639 if (!mapped)
1765 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1640 return;
1641
1642 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1643
1644 if (to_wait <= 0.)
1766 bgPixmap.render (); 1645 bg_render ();
1767 else 1646 else
1768 {
1769 update_background_ev.stop ();
1770
1771 if (!bgPixmap.need_client_side_rendering())
1772 update_background_ev.start (.05); 1647 update_background_ev.start (to_wait);
1773 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1774 update_background_ev.start (.20); /* very slow !!! */
1775 else
1776 update_background_ev.start (.07);
1777 }
1778
1779 return 0;
1780} 1648}
1781 1649
1782void 1650void
1783rxvt_term::update_background_cb (ev::timer &w, int revents) 1651rxvt_term::update_background_cb (ev::timer &w, int revents)
1784{ 1652{
1653 make_current ();
1654
1655 update_background_ev.stop ();
1785 bgPixmap.render (); 1656 bg_render ();
1657 refresh_check ();
1786} 1658}
1787 1659
1788#endif /* HAVE_BG_PIXMAP */ 1660#endif /* HAVE_BG_PIXMAP */
1789 1661
1790/*----------------------- end-of-file (C source) -----------------------*/ 1662/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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