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

Diff Legend

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