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.215 by root, Wed Feb 1 18:36:48 2006 UTC vs.
Revision 1.328 by sf-exg, Mon Jul 19 16:43:21 2010 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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-2008 Marc Lehmann <pcg@goof.com>
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.
… …
35#include "keyboard.h" 35#include "keyboard.h"
36#include "rxvtperl.h" 36#include "rxvtperl.h"
37 37
38#include <limits> 38#include <limits>
39 39
40#include <cassert>
40#include <csignal> 41#include <csignal>
41#include <cstring> 42#include <cstring>
42 43
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 44#include <termios.h>
45
46#ifdef HAVE_XSETLOCALE
47# define X_LOCALE
48# include <X11/Xlocale.h>
49#else
50# ifdef HAVE_SETLOCALE
51# include <clocale>
52# endif
49#endif 53#endif
50 54
51vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
52 56
53// used to tell global functions which terminal instance is "active" 57// used to tell global functions which terminal instance is "active"
… …
56static char curlocale[128], savelocale[128]; 60static char curlocale[128], savelocale[128];
57 61
58bool 62bool
59rxvt_set_locale (const char *locale) NOTHROW 63rxvt_set_locale (const char *locale) NOTHROW
60{ 64{
65 int size = strlen (locale) + 1;
66
67 if (size > sizeof (curlocale))
68 rxvt_fatal ("locale string too long, aborting.\n");
69
61 if (!locale || !strncmp (locale, curlocale, 128)) 70 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 71 return false;
63 72
64 strncpy (curlocale, locale, 128); 73 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 74 setlocale (LC_CTYPE, curlocale);
66 return true; 75 return true;
67} 76}
68 77
69void 78void
… …
83class rxvt_composite_vec rxvt_composite; 92class rxvt_composite_vec rxvt_composite;
84 93
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 95{
87 compose_char *cc; 96 compose_char *cc;
88 97
89 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 99 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 100 cc = (*this)[c1];
92 while (cc) 101 while (cc)
93 { 102 {
94 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
95 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
96 } 105 }
97 106
98 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
99 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.end (); cc-- > v.begin (); )
100 { 109 {
101 if (cc->c1 == c1 && cc->c2 == c2) 110 if (cc->c1 == c1 && cc->c2 == c2)
102 return COMPOSE_LO + (cc - v.begin ()); 111 return COMPOSE_LO + (cc - v.begin ());
103 } 112 }
… …
142 151
143} 152}
144#endif 153#endif
145 154
146rxvt_term::rxvt_term () 155rxvt_term::rxvt_term ()
147 : 156{
148#if TRANSPARENT 157#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 158 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
150#endif
151#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 159#endif
154#ifdef CURSOR_BLINK 160#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 161 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
156#endif 162#endif
157#ifdef TEXT_BLINK 163#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 164 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
159#endif 165#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 166#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 167 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
162#endif 168#endif
163#ifdef SELECTION_SCROLLING 169#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
165#endif 171#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
168#endif 181#endif
169#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 184#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL 185#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 186 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177#endif 187#endif
178 termwin_ev (this, &rxvt_term::x_cb), 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179 vt_ev (this, &rxvt_term::x_cb), 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180 child_ev (this, &rxvt_term::child_cb), 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181 check_ev (this, &rxvt_term::check_cb), 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182 flush_ev (this, &rxvt_term::flush_cb), 192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183 destroy_ev (this, &rxvt_term::destroy_cb), 193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184 pty_ev (this, &rxvt_term::pty_cb), 194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185 incr_ev (this, &rxvt_term::incr_cb) 195
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 197
189 termlist.push_back (this); 198 termlist.push_back (this);
190 199
191#ifdef KEYSYM_RESOURCE 200#ifdef KEYSYM_RESOURCE
… …
193#endif 202#endif
194} 203}
195 204
196// clean up the most important stuff, do *not* call x or free mem etc. 205// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 206// for use before an emergency exit
207void
198void rxvt_term::emergency_cleanup () 208rxvt_term::emergency_cleanup ()
199{ 209{
200 if (cmd_pid) 210 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 211 kill (-cmd_pid, SIGHUP);
202 212
213 pty_ev.stop ();
203 delete pty; pty = 0; 214 delete pty; pty = 0;
204} 215}
205 216
206rxvt_term::~rxvt_term () 217rxvt_term::~rxvt_term ()
207{ 218{
… …
214 if (fontset[i] != fontset[0]) 225 if (fontset[i] != fontset[0])
215 delete fontset[i]; 226 delete fontset[i];
216#endif 227#endif
217 delete fontset[0]; 228 delete fontset[0];
218 229
230#ifdef HAVE_BG_PIXMAP
231 bgPixmap.destroy ();
232#endif
233#ifdef HAVE_AFTERIMAGE
234 if (asv)
235 destroy_asvisual (asv, 0);
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif
239
219 if (display) 240 if (display)
220 { 241 {
221 selection_clear (); 242 selection_clear ();
243 selection_clear (true);
222 244
223#ifdef USE_XIM 245#ifdef USE_XIM
224 im_destroy (); 246 im_destroy ();
225#endif 247#endif
226#ifdef XTERM_SCROLLBAR 248 scrollBar.destroy ();
227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
229#endif
230#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
232#endif
233#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (xdisp, blackGC);
235 if (whiteGC) XFreeGC (xdisp, whiteGC);
236 if (grayGC) XFreeGC (xdisp, grayGC);
237 if (darkGC) XFreeGC (xdisp, darkGC);
238 if (stippleGC) XFreeGC (xdisp, stippleGC);
239 if (dimple) XFreePixmap (xdisp, dimple);
240 if (upArrow) XFreePixmap (xdisp, upArrow);
241 if (downArrow) XFreePixmap (xdisp, downArrow);
242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
244#endif
245#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
249#endif
250 if (gc) XFreeGC (xdisp, gc); 249 if (gc) XFreeGC (dpy, gc);
251 250
252 delete drawable; 251 delete drawable;
253 // destroy all windows 252 // destroy all windows
254 if (parent[0]) 253 if (parent[0])
255 XDestroyWindow (xdisp, parent[0]); 254 XDestroyWindow (dpy, parent[0]);
255
256 for (int i = 0; i < TOTAL_COLORS; i++)
257 if (ISSET_PIXCOLOR (i))
258 {
259 pix_colors_focused [i].free (this);
260#if OFF_FOCUS_FADING
261 pix_colors_unfocused [i].free (this);
262#endif
263 }
256 264
257 clear (); 265 clear ();
258 }
259 266
260 // TODO: free pixcolours, colours should become part of rxvt_display 267 display->flush (); /* ideally .put should do this */
261 delete pix_colors_focused;
262#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused;
264#endif
265
266 displays.put (display); 268 displays.put (display);
269 }
267 270
268 scr_release (); 271 scr_release ();
269 272
270 /* clear all resources */ 273 /* clear all resources */
271 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 275 free (allocated [i]);
273 276
274 free (selection.text); 277 free (selection.text);
278 free (selection.clip_text);
275 // TODO: manage env vars in child only(!) 279 // TODO: manage env vars in child only(!)
276 free (env_display); 280 free (env_display);
277 free (env_term); 281 free (env_term);
278 free (locale); 282 free (locale);
279 free (v_buffer); 283 free (v_buffer);
… …
283 delete argv; 287 delete argv;
284 288
285#ifdef KEYSYM_RESOURCE 289#ifdef KEYSYM_RESOURCE
286 delete keyboard; 290 delete keyboard;
287#endif 291#endif
292#ifndef NO_RESOURCES
293 XrmDestroyDatabase (option_db);
294#endif
288} 295}
289 296
290// child has exited, usually destroys 297// child has exited, usually destroys
291void 298void
292rxvt_term::child_cb (child_watcher &w, int status) 299rxvt_term::child_cb (ev::child &w, int status)
293{ 300{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 301 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295 302
296 cmd_pid = 0; 303 cmd_pid = 0;
297 304
298 if (!OPTION (Opt_hold)) 305 if (!option (Opt_hold))
299 destroy (); 306 destroy ();
300} 307}
301 308
302void 309void
303rxvt_term::destroy () 310rxvt_term::destroy ()
304{ 311{
305 if (destroy_ev.active) 312 if (destroy_ev.is_active ())
306 return; 313 return;
307 314
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 315 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309 316
310#if ENABLE_OVERLAY 317#if ENABLE_OVERLAY
… …
314 if (display) 321 if (display)
315 { 322 {
316#if USE_XIM 323#if USE_XIM
317 im_ev.stop (display); 324 im_ev.stop (display);
318#endif 325#endif
319#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 326 scrollbar_ev.stop (display);
321#endif 327#if ENABLE_TRANSPARENCY || ENABLE_PERL
322#if TRANSPARENT
323 rootwin_ev.stop (display); 328 rootwin_ev.stop (display);
324#endif 329#endif
325 incr_ev.stop (); 330 incr_ev.stop ();
326 termwin_ev.stop (display); 331 termwin_ev.stop (display);
327 vt_ev.stop (display); 332 vt_ev.stop (display);
328 } 333 }
329 334
330 check_ev.stop (); 335 flush_ev.stop ();
331 pty_ev.stop (); 336 pty_ev.stop ();
332#ifdef CURSOR_BLINK 337#ifdef CURSOR_BLINK
333 cursor_blink_ev.stop (); 338 cursor_blink_ev.stop ();
334#endif 339#endif
335#ifdef TEXT_BLINK 340#ifdef TEXT_BLINK
… …
343#endif 348#endif
344#ifdef POINTER_BLANK 349#ifdef POINTER_BLANK
345 pointer_ev.stop (); 350 pointer_ev.stop ();
346#endif 351#endif
347 352
348 destroy_ev.start (0); 353 destroy_ev.start ();
349} 354}
350 355
351void 356void
352rxvt_term::destroy_cb (time_watcher &w) 357rxvt_term::destroy_cb (ev::idle &w, int revents)
353{ 358{
354 make_current (); 359 make_current ();
355 360
356 delete this; 361 delete this;
357} 362}
… …
386 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
387 sprintf(number, "%d", event->request_code); 392 sprintf(number, "%d", event->request_code);
388 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
389 rxvt_warn ("(which is %s)\n", buffer); 394 rxvt_warn ("(which is %s)\n", buffer);
390 if (event->request_code >= 128) { 395 if (event->request_code >= 128) {
391 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
392 mesg, BUFSIZ); 397 mesg, BUFSIZ);
393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
394 } 399 }
395 if ((event->error_code == BadWindow) || 400 if ((event->error_code == BadWindow) ||
396 (event->error_code == BadPixmap) || 401 (event->error_code == BadPixmap) ||
397 (event->error_code == BadCursor) || 402 (event->error_code == BadCursor) ||
398 (event->error_code == BadFont) || 403 (event->error_code == BadFont) ||
399 (event->error_code == BadDrawable) || 404 (event->error_code == BadDrawable) ||
400 (event->error_code == BadColor) || 405 (event->error_code == BadColor) ||
401 (event->error_code == BadGC) || 406 (event->error_code == BadGC) ||
402 (event->error_code == BadIDChoice) || 407 (event->error_code == BadIDChoice) ||
403 (event->error_code == BadValue) || 408 (event->error_code == BadValue) ||
404 (event->error_code == BadAtom)) { 409 (event->error_code == BadAtom)) {
405 if (event->error_code == BadValue) 410 if (event->error_code == BadValue)
406 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
407 mesg, BUFSIZ); 412 mesg, BUFSIZ);
408 else if (event->error_code == BadAtom) 413 else if (event->error_code == BadAtom)
409 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
410 mesg, BUFSIZ); 415 mesg, BUFSIZ);
411 else 416 else
412 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413 mesg, BUFSIZ); 418 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415 } 420 }
416 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417 mesg, BUFSIZ); 422 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419} 424}
420#endif 425#endif
421 426
422int 427int
… …
445 DisplayString (display)); 450 DisplayString (display));
446 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
447 _exit (EXIT_FAILURE); 452 _exit (EXIT_FAILURE);
448} 453}
449 454
450/*----------------------------------------------------------------------*/
451bool
452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
453{
454 this->envv = envv;
455
456 SET_R (this);
457 set_locale ("");
458 set_environ (envv); // few things in X do not call setlocale :(
459
460 if (!init_vars ())
461 return false;
462
463 init_secondary ();
464
465 const char **cmd_argv = init_resources (argc, argv);
466
467#ifdef KEYSYM_RESOURCE
468 keyboard->register_done ();
469#endif
470
471#ifdef HAVE_SCROLLBARS
472 if (OPTION (Opt_scrollBar))
473 scrollBar.setIdle (); /* set existence for size calculations */
474#endif
475
476 pty = ptytty::create ();
477
478 create_windows (argc, argv);
479
480 init_xlocale ();
481
482 scr_reset (); // initialize screen
483
484#if 0
485 XSynchronize (xdisp, True);
486#endif
487
488#ifdef HAVE_SCROLLBARS
489 if (OPTION (Opt_scrollBar))
490 resize_scrollbar (); /* create and map scrollbar */
491#endif
492#ifdef TRANSPARENT
493 if (OPTION (Opt_transparent))
494 {
495 XSelectInput (xdisp, display->root, PropertyChangeMask);
496 check_our_parents ();
497 rootwin_ev.start (display, display->root);
498 }
499#endif
500
501 set_colorfgbg ();
502
503 init_command (cmd_argv);
504
505 free (cmd_argv);
506
507 if (pty->pty >= 0)
508 pty_ev.start (pty->pty, EVENT_READ);
509
510 check_ev.start ();
511
512 HOOK_INVOKE ((this, HOOK_START, DT_END));
513
514#if ENABLE_XEMBED
515 if (rs[Rs_embed])
516 {
517 long info[2] = { 0, XEMBED_MAPPED };
518
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2);
521 }
522#endif
523
524 XMapWindow (xdisp, vt);
525 XMapWindow (xdisp, parent[0]);
526
527 return true;
528}
529
530static struct sig_handlers 455static struct sig_handlers
531{ 456{
532 sig_watcher sw_term, sw_int; 457 ev::sig sw_term, sw_int;
533 458
534 /* 459 /*
535 * Catch a fatal signal and tidy up before quitting 460 * Catch a fatal signal and tidy up before quitting
536 */ 461 */
537 void 462 void sig_term (ev::sig &w, int revents);
538 sig_term (sig_watcher &w) 463
464 sig_handlers ()
539 { 465 {
540 rxvt_emergency_cleanup (); 466 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
541 signal (w.signum, SIG_DFL);
542 kill (getpid (), w.signum);
543 }
544
545 sig_handlers ()
546 : sw_term (this, &sig_handlers::sig_term),
547 sw_int (this, &sig_handlers::sig_term) 467 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
548 {
549 } 468 }
550} sig_handlers; 469} sig_handlers;
551 470
471void
472sig_handlers::sig_term (ev::sig &w, int revents)
473{
474 rxvt_emergency_cleanup ();
475 w.stop ();
476 kill (getpid (), w.signum);
477}
478
552char **rxvt_environ; // startup environment 479char **rxvt_environ; // startup environment
553 480
554void 481void
555rxvt_init () 482rxvt_init ()
556{ 483{
484 assert (("fontMask must not overlap other RS masks",
485 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
486
557 ptytty::init (); 487 ptytty::init ();
488
489 if (!ev_default_loop (0))
490 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
558 491
559 rxvt_environ = environ; 492 rxvt_environ = environ;
560 493
561 signal (SIGHUP, SIG_IGN); 494 signal (SIGHUP, SIG_IGN);
562 signal (SIGPIPE, SIG_IGN); 495 signal (SIGPIPE, SIG_IGN);
563 496
564 sig_handlers.sw_term.start (SIGTERM); 497 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
565 sig_handlers.sw_int.start (SIGINT); 498 sig_handlers.sw_int.start (SIGINT); ev_unref ();
566 499
567 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 500 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
568 /* signal (SIGURG, SIG_DFL); */ 501 /* signal (SIGURG, SIG_DFL); */
569 502
570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 503 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
572 XSetIOErrorHandler (rxvt_xioerror_handler); 505 XSetIOErrorHandler (rxvt_xioerror_handler);
573 506
574 XrmInitialize (); 507 XrmInitialize ();
575} 508}
576 509
577/* ------------------------------------------------------------------------- *
578 * MEMORY ALLOCATION WRAPPERS *
579 * ------------------------------------------------------------------------- */
580void *
581rxvt_malloc (size_t size)
582{
583 void *p = malloc (size);
584
585 if (!p)
586 rxvt_fatal ("memory allocation failure. aborting.\n");
587
588 return p;
589}
590
591void *
592rxvt_calloc (size_t number, size_t size)
593{
594 void *p = calloc (number, size);
595
596 if (!p)
597 rxvt_fatal ("memory allocation failure. aborting.\n");
598
599 return p;
600}
601
602void *
603rxvt_realloc (void *ptr, size_t size)
604{
605 void *p = realloc (ptr, size);
606
607 if (!p)
608 rxvt_fatal ("memory allocation failure. aborting.\n");
609
610 return p;
611}
612
613/*----------------------------------------------------------------------*/ 510/*----------------------------------------------------------------------*/
614/* 511/*
615 * window size/position calculcations for XSizeHint and other storage. 512 * window size/position calculations for XSizeHint and other storage.
616 * if width/height are non-zero then override calculated width/height 513 * if width/height are non-zero then override calculated width/height
617 */ 514 */
618void 515void
619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 516rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
620{ 517{
621 short recalc_x, recalc_y; 518 short recalc_x, recalc_y;
622 int x, y, sb_w, flags; 519 int x, y, flags;
623 unsigned int w, h; 520 unsigned int w, h;
624 unsigned int max_width, max_height; 521 unsigned int max_width, max_height;
625 522
626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 523 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
627 szHint.win_gravity = NorthWestGravity; 524 szHint.win_gravity = NorthWestGravity;
… …
637 if (rs[Rs_geometry]) 534 if (rs[Rs_geometry])
638 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 535 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
639 536
640 if (flags & WidthValue) 537 if (flags & WidthValue)
641 { 538 {
539 if (!w)
540 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
541
642 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 542 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
643 szHint.flags |= USSize; 543 szHint.flags |= USSize;
644 } 544 }
645 545
646 if (flags & HeightValue) 546 if (flags & HeightValue)
647 { 547 {
548 if (!h)
549 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
550
648 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 551 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
649 szHint.flags |= USSize; 552 szHint.flags |= USSize;
650 } 553 }
651 554
652 if (flags & XValue) 555 if (flags & XValue)
653 { 556 {
… …
684 max_width = MAX_COLS * fwidth; 587 max_width = MAX_COLS * fwidth;
685 max_height = MAX_ROWS * fheight; 588 max_height = MAX_ROWS * fheight;
686 589
687 szHint.base_width = szHint.base_height = 2 * int_bwidth; 590 szHint.base_width = szHint.base_height = 2 * int_bwidth;
688 591
689 sb_w = 0;
690 window_vt_x = window_vt_y = int_bwidth; 592 window_vt_x = window_vt_y = int_bwidth;
691 593
692 if (scrollBar.state) 594 if (scrollBar.state)
693 { 595 {
694 sb_w = scrollbar_TotalWidth (); 596 int sb_w = scrollBar.total_width ();
695 szHint.base_width += sb_w; 597 szHint.base_width += sb_w;
696 598
697 if (!OPTION (Opt_scrollBar_right)) 599 if (!option (Opt_scrollBar_right))
698 window_vt_x += sb_w; 600 window_vt_x += sb_w;
699 } 601 }
700 602
701 szHint.width_inc = fwidth; 603 szHint.width_inc = fwidth;
702 szHint.height_inc = fheight; 604 szHint.height_inc = fheight;
703 szHint.min_width = szHint.base_width + szHint.width_inc; 605 szHint.min_width = szHint.base_width + szHint.width_inc;
704 szHint.min_height = szHint.base_height + szHint.height_inc; 606 szHint.min_height = szHint.base_height + szHint.height_inc;
705 607
706 if (newwidth && newwidth - szHint.base_width < max_width) 608 if (newwidth && newwidth - szHint.base_width < max_width)
707 { 609 {
708 szHint.width = newwidth; 610 szHint.width = newwidth;
… …
723 { 625 {
724 min_it (height, max_height); 626 min_it (height, max_height);
725 szHint.height = szHint.base_height + height; 627 szHint.height = szHint.base_height + height;
726 } 628 }
727 629
728 if (scrollBar.state && OPTION (Opt_scrollBar_right))
729 window_sb_x = szHint.width - sb_w;
730
731 if (recalc_x) 630 if (recalc_x)
732 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 631 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
733 632
734 if (recalc_y) 633 if (recalc_y)
735 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 634 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
736 635
737 ncol = width / fwidth; 636 ncol = width / fwidth;
738 nrow = height / fheight; 637 nrow = height / fheight;
739} 638}
740 639
741/*----------------------------------------------------------------------*/ 640/*----------------------------------------------------------------------*/
742/* 641/*
… …
753 652
754 ws.ws_col = ncol; 653 ws.ws_col = ncol;
755 ws.ws_row = nrow; 654 ws.ws_row = nrow;
756 ws.ws_xpixel = width; 655 ws.ws_xpixel = width;
757 ws.ws_ypixel = height; 656 ws.ws_ypixel = height;
758 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 657 ioctl (pty->pty, TIOCSWINSZ, &ws);
759 658
760#if 0 659#if 0
761 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 660 // TIOCSWINSZ is supposed to do this automatically and correctly
762 if (cmd_pid) /* force through to the command */ 661 if (cmd_pid) /* force through to the command */
763 kill (-cmd_pid, SIGWINCH); 662 kill (-cmd_pid, SIGWINCH);
764#endif 663#endif
765} 664}
766 665
… …
793#endif 692#endif
794 693
795 delete fontset[0]; 694 delete fontset[0];
796 fontset[0] = fs; 695 fontset[0] = fs;
797 696
798 prop = (*fs)[1]->properties (); 697 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
799 prop.height += lineSpace; 698 prop.height += lineSpace;
699 prop.width += letterSpace;
700
800 fs->set_prop (prop); 701 fs->set_prop (prop, false);
801 702
802 fwidth = prop.width; 703 fwidth = prop.width;
803 fheight = prop.height; 704 fheight = prop.height;
804 fbase = prop.ascent; 705 fbase = prop.ascent;
805 706
… …
814 { 715 {
815 fontset[style] = fs = new rxvt_fontset (this); 716 fontset[style] = fs = new rxvt_fontset (this);
816 rxvt_fontprop prop2 = prop; 717 rxvt_fontprop prop2 = prop;
817 718
818 if (res) 719 if (res)
819 prop2.weight = prop2.slant = rxvt_fontprop::unset; 720 {
721 fs->populate (res);
722 fs->set_prop (prop2, false);
723 }
820 else 724 else
821 { 725 {
822 res = fontset[0]->fontdesc; 726 fs->populate (fontset[0]->fontdesc);
823 727
824 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 728 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
825 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 729 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
730
731 fs->set_prop (prop2, true);
826 } 732 }
827 733
828 fs->populate (res);
829 fs->set_prop (prop2);
830 } 734 }
831#else 735#else
832 fontset[style] = fontset[0]; 736 fontset[style] = fontset[0];
833#endif 737#endif
834 } 738 }
… …
836 if (parent[0]) 740 if (parent[0])
837 { 741 {
838 resize_all_windows (0, 0, 0); 742 resize_all_windows (0, 0, 0);
839 scr_remap_chars (); 743 scr_remap_chars ();
840 scr_touch (true); 744 scr_touch (true);
841 } 745 }
842 746
843 return true; 747 return true;
844} 748}
845 749
750void
846void rxvt_term::set_string_property (Atom prop, const char *str, int len) 751rxvt_term::set_string_property (Atom prop, const char *str, int len)
847{ 752{
848 XChangeProperty (xdisp, parent[0], 753 XChangeProperty (dpy, parent[0],
849 prop, XA_STRING, 8, PropModeReplace, 754 prop, XA_STRING, 8, PropModeReplace,
850 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 755 (const unsigned char *)str, len >= 0 ? len : strlen (str));
851} 756}
852 757
758void
759rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
760{
761 XTextProperty ct;
762
763 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
764 {
765 XSetTextProperty (dpy, parent[0], &ct, prop);
766 XFree (ct.value);
767 }
768}
769
770void
853void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 771rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
854{ 772{
855 wchar_t *ws = rxvt_mbstowcs (str, len); 773 wchar_t *ws = rxvt_mbstowcs (str, len);
856 char *s = rxvt_wcstoutf8 (ws); 774 char *s = rxvt_wcstoutf8 (ws);
857 775
858 XChangeProperty (xdisp, parent[0], 776 XChangeProperty (dpy, parent[0],
859 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 777 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
860 (const unsigned char *)s, strlen (s)); 778 (const unsigned char *)s, strlen (s));
861 779
862 free (s); 780 free (s);
863 free (ws); 781 free (ws);
… …
867/*----------------------------------------------------------------------*/ 785/*----------------------------------------------------------------------*/
868/* xterm sequences - title, iconName, color (exptl) */ 786/* xterm sequences - title, iconName, color (exptl) */
869void 787void
870rxvt_term::set_title (const char *str) 788rxvt_term::set_title (const char *str)
871{ 789{
872 set_string_property (XA_WM_NAME, str); 790 set_mbstring_property (XA_WM_NAME, str);
873#if ENABLE_EWMH 791#if ENABLE_EWMH
874 set_utf8_property (xa[XA_NET_WM_NAME], str); 792 set_utf8_property (xa[XA_NET_WM_NAME], str);
875#endif 793#endif
876} 794}
877 795
878void 796void
879rxvt_term::set_icon_name (const char *str) 797rxvt_term::set_icon_name (const char *str)
880{ 798{
881 set_string_property (XA_WM_ICON_NAME, str); 799 set_mbstring_property (XA_WM_ICON_NAME, str);
882#if ENABLE_EWMH 800#if ENABLE_EWMH
883 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 801 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
884#endif 802#endif
885} 803}
886 804
805void
806rxvt_term::set_window_color (int idx, const char *color)
807{
887#ifdef XTERM_COLOR_CHANGE 808#ifdef XTERM_COLOR_CHANGE
888void
889rxvt_term::set_window_color (int idx, const char *color)
890{
891 rxvt_color xcol; 809 rxvt_color xcol;
892 int i; 810
893
894 if (color == NULL || *color == '\0') 811 if (color == NULL || *color == '\0')
895 return; 812 return;
896 813
897 color = strdup (color); 814 color = strdup (color);
898 allocated.push_back ((void *)color); 815 allocated.push_back ((void *)color);
899 rs[Rs_color + idx] = color; 816 rs[Rs_color + idx] = color;
900 817
901 /* handle color aliases */ 818 /* handle color aliases */
902 if (isdigit (*color)) 819 if (isdigit (*color))
903 { 820 {
904 i = atoi (color); 821 int i = atoi (color);
905 822
906 if (i >= 8 && i <= 15) 823 if (i >= 8 && i <= 15)
824 {
907 { /* bright colors */ 825 /* bright colors */
908 i -= 8;
909 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 826 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
910 goto done; 827 goto done;
911 } 828 }
912 829
913 if (i >= 0 && i <= 7) 830 if (i >= 0 && i <= 7)
831 {
914 { /* normal colors */ 832 /* normal colors */
915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 833 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
916 goto done; 834 goto done;
917 } 835 }
918 } 836 }
919 837
… …
924 * so just keep gobbling up the colormap 842 * so just keep gobbling up the colormap
925 */ 843 */
926 844
927 pix_colors_focused[idx] = xcol; 845 pix_colors_focused[idx] = xcol;
928 846
929 /* XSetWindowAttributes attr; */
930 /* Cursor cursor; */
931done: 847done:
932
933#if OFF_FOCUS_FADING
934 if (rs[Rs_fade])
935 {
936 rgba c;
937 pix_colors [Color_fade].get (c);
938 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
939 }
940#endif
941
942 /*TODO: handle Color_BD, scrollbar background, etc. */ 848 /*TODO: handle Color_BD, scrollbar background, etc. */
943 849
850 update_fade_color (idx);
944 recolour_cursor (); 851 recolour_cursor ();
945 scr_recolour (); 852 scr_recolour ();
853#endif /* XTERM_COLOR_CHANGE */
946} 854}
947
948#else
949# define set_window_color (idx,color) ((void)0)
950#endif /* XTERM_COLOR_CHANGE */
951 855
952void 856void
953rxvt_term::recolour_cursor () 857rxvt_term::recolour_cursor ()
954{ 858{
955 XColor fg, bg; 859 XColor fg, bg;
… …
960 864
961 (ISSET_PIXCOLOR (Color_pointer_bg) 865 (ISSET_PIXCOLOR (Color_pointer_bg)
962 ? pix_colors_focused[Color_pointer_bg] 866 ? pix_colors_focused[Color_pointer_bg]
963 : pix_colors_focused[Color_bg]).get (bg); 867 : pix_colors_focused[Color_bg]).get (bg);
964 868
965 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg); 869 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
966} 870}
967 871
968/*----------------------------------------------------------------------*/ 872/*----------------------------------------------------------------------*/
969/* 873/*
970 * find if fg/bg matches any of the normal (low-intensity) colors 874 * find if fg/bg matches any of the normal (low-intensity) colors
971 */ 875 */
972void 876void
973rxvt_term::set_colorfgbg () 877rxvt_term::set_colorfgbg ()
974{ 878{
975 unsigned int i; 879 unsigned int i;
976 const char *xpmb = "\0"; 880 const char *xpmb = "";
977 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 881 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
978 882
979 strcpy (fstr, "default"); 883 strcpy (fstr, "default");
980 strcpy (bstr, "default"); 884 strcpy (bstr, "default");
981 for (i = Color_Black; i <= Color_White; i++) 885 for (i = Color_Black; i <= Color_White; i++)
… …
987 891
988 for (i = Color_Black; i <= Color_White; i++) 892 for (i = Color_Black; i <= Color_White; i++)
989 if (pix_colors[Color_bg] == pix_colors[i]) 893 if (pix_colors[Color_bg] == pix_colors[i])
990 { 894 {
991 sprintf (bstr, "%d", (i - Color_Black)); 895 sprintf (bstr, "%d", (i - Color_Black));
992#ifdef XPM_BACKGROUND 896#ifdef BG_IMAGE_FROM_FILE
993 xpmb = "default;"; 897 xpmb = "default;";
994#endif 898#endif
995 break; 899 break;
996 } 900 }
997 901
… …
1006 if (color.set (this, name)) 910 if (color.set (this, name))
1007 return true; 911 return true;
1008 912
1009 rxvt_warn ("can't get colour '%s', continuing without.\n", name); 913 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1010 return false; 914 return false;
915}
916
917void
918rxvt_term::alias_color (int dst, int src)
919{
920 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1011} 921}
1012 922
1013/* -------------------------------------------------------------------- * 923/* -------------------------------------------------------------------- *
1014 * - WINDOW RESIZING - * 924 * - WINDOW RESIZING - *
1015 * -------------------------------------------------------------------- */ 925 * -------------------------------------------------------------------- */
… …
1019 int fix_screen; 929 int fix_screen;
1020 int old_width = szHint.width; 930 int old_width = szHint.width;
1021 int old_height = szHint.height; 931 int old_height = szHint.height;
1022 932
1023 window_calc (newwidth, newheight); 933 window_calc (newwidth, newheight);
934
935 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
936
937 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
938 if (set_hint)
939 {
940 szHint.flags &= ~(PBaseSize | PResizeInc);
1024 XSetWMNormalHints (xdisp, parent[0], &szHint); 941 XSetWMNormalHints (dpy, parent[0], &szHint);
942 szHint.flags |= PBaseSize | PResizeInc;
943 }
1025 944
1026 if (!ignoreparent) 945 if (!ignoreparent)
1027 { 946 {
1028#ifdef SMART_RESIZE 947#ifdef SMART_RESIZE
1029 /* 948 /*
… …
1033 int x, y, x1, y1; 952 int x, y, x1, y1;
1034 int dx, dy; 953 int dx, dy;
1035 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 954 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1036 Window unused_cr; 955 Window unused_cr;
1037 956
1038 XTranslateCoordinates (xdisp, parent[0], display->root, 957 XTranslateCoordinates (dpy, parent[0], display->root,
1039 0, 0, &x, &y, &unused_cr); 958 0, 0, &x, &y, &unused_cr);
1040 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 959 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1041 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 960 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1042 /* 961 /*
1043 * if display->root isn't the parent window, a WM will probably have offset 962 * if display->root isn't the parent window, a WM will probably have offset
1044 * our position for handles and decorations. Counter it 963 * our position for handles and decorations. Counter it
1045 */ 964 */
… …
1047 { 966 {
1048 x -= x1; 967 x -= x1;
1049 y -= y1; 968 y -= y1;
1050 } 969 }
1051 970
1052 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 971 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1053 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 972 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1054 dx = old_width - szHint.width; 973 dx = old_width - szHint.width;
1055 dy = old_height - szHint.height; 974 dy = old_height - szHint.height;
1056 975
1057 /* Check position of the center of the window */ 976 /* Check position of the center of the window */
1058 if (x < x1) /* left half */ 977 if (x < x1) /* left half */
… …
1062 if (y < y1) /* top half */ 981 if (y < y1) /* top half */
1063 dy = 0; 982 dy = 0;
1064 else if (y == y1) /* exact center */ 983 else if (y == y1) /* exact center */
1065 dy /= 2; 984 dy /= 2;
1066 985
1067 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 986 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1068 szHint.width, szHint.height); 987 szHint.width, szHint.height);
1069#else 988#else
1070 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 989 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1071#endif 990#endif
1072 } 991 }
992
993 if (set_hint)
994 XSetWMNormalHints (dpy, parent[0], &szHint);
1073 995
1074 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 996 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1075 997
1076 if (fix_screen || newwidth != old_width || newheight != old_height) 998 if (fix_screen || newwidth != old_width || newheight != old_height)
1077 { 999 {
1078 if (scrollBar.state) 1000 if (scrollBar.state)
1079 { 1001 scrollBar.resize ();
1080 XMoveResizeWindow (xdisp, scrollBar.win,
1081 window_sb_x, 0,
1082 scrollbar_TotalWidth (), szHint.height);
1083 resize_scrollbar ();
1084 }
1085 1002
1086 XMoveResizeWindow (xdisp, vt, 1003 XMoveResizeWindow (dpy, vt,
1087 window_vt_x, window_vt_y, 1004 window_vt_x, window_vt_y,
1088 width, height); 1005 width, height);
1089 1006
1090 scr_clear (); 1007#ifdef HAVE_BG_PIXMAP
1091#ifdef XPM_BACKGROUND 1008 if (bgPixmap.window_size_sensitive ())
1092 resize_pixmap (); 1009 update_background ();
1093#endif 1010#endif
1094 } 1011 }
1095 1012
1096 if (fix_screen || old_height == 0) 1013 if (fix_screen || old_height == 0)
1097 scr_reset (); 1014 scr_reset ();
1098 1015
1099#ifdef XPM_BACKGROUND 1016#ifdef HAVE_BG_PIXMAP
1100 if (pixmap) 1017// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1018// if (bgPixmap.pixmap)
1101 scr_touch (false); 1019// scr_touch (false);
1102#endif 1020#endif
1103 1021
1104#ifdef USE_XIM 1022#ifdef USE_XIM
1105 IMSetStatusPosition (); 1023 IMSetPosition ();
1106#endif 1024#endif
1107} 1025}
1108 1026
1109/* 1027/*
1110 * Set the width/height of the vt window in characters. Units are pixels. 1028 * Set the width/height of the vt window in characters. Units are pixels.
… …
1115{ 1033{
1116 XWindowAttributes wattr; 1034 XWindowAttributes wattr;
1117 1035
1118 if (newwidth == 0 || newheight == 0) 1036 if (newwidth == 0 || newheight == 0)
1119 { 1037 {
1120 XGetWindowAttributes (xdisp, display->root, &wattr); 1038 XGetWindowAttributes (dpy, display->root, &wattr);
1121 1039
1122 if (newwidth == 0) 1040 if (newwidth == 0)
1123 newwidth = wattr.width - szHint.base_width; 1041 newwidth = wattr.width - szHint.base_width;
1124 if (newheight == 0) 1042 if (newheight == 0)
1125 newheight = wattr.height - szHint.base_height; 1043 newheight = wattr.height - szHint.base_height;
… …
1139#ifdef USE_XIM 1057#ifdef USE_XIM
1140 1058
1141void 1059void
1142rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1060rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1143{ 1061{
1144 fg = pix_colors[Color_fg]; 1062 fg = pix_colors [Color_fg];
1145 bg = pix_colors[Color_bg]; 1063 bg = pix_colors [Color_bg];
1146} 1064}
1147 1065
1148void 1066void
1149rxvt_term::im_set_size (XRectangle &size) 1067rxvt_term::im_set_size (XRectangle &size)
1150{ 1068{
… …
1173 1091
1174/* Checking whether input method is running. */ 1092/* Checking whether input method is running. */
1175bool 1093bool
1176rxvt_term::IMisRunning () 1094rxvt_term::IMisRunning ()
1177{ 1095{
1178 char *p;
1179 Atom atom; 1096 Atom atom;
1180 Window win; 1097 Window win;
1181 char server[IMBUFSIZ]; 1098 char server[IMBUFSIZ];
1182 1099
1183 /* get current locale modifier */ 1100 /* get current locale modifier */
1184 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1101 if (char *p = XSetLocaleModifiers (0))
1185 { 1102 {
1186 strcpy (server, "@server="); 1103 strcpy (server, "@server=");
1187 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1104 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1188 1105
1189 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1106 if (p = strchr (server + 1, '@')) /* first one only */
1190 *p = '\0'; 1107 *p = '\0';
1191 1108
1192 atom = XInternAtom (xdisp, server, False); 1109 atom = XInternAtom (dpy, server, False);
1193 win = XGetSelectionOwner (xdisp, atom); 1110 win = XGetSelectionOwner (dpy, atom);
1194 1111
1195 if (win != None) 1112 if (win != None)
1196 return True; 1113 return True;
1197 } 1114 }
1198 1115
… …
1261 1178
1262 term->make_current (); 1179 term->make_current ();
1263 1180
1264 if (text) 1181 if (text)
1265 { 1182 {
1266 void *str; 1183 wchar_t *str;
1267 1184
1268 if (!text->encoding_is_wchar && text->string.multi_byte) 1185 if (!text->encoding_is_wchar && text->string.multi_byte)
1269 { 1186 {
1270 // of course, X makes it ugly again 1187 // of course, X makes it ugly again
1271 if (term->rs[Rs_imLocale]) 1188 if (term->rs[Rs_imLocale])
1272 SET_LOCALE (term->rs[Rs_imLocale]); 1189 SET_LOCALE (term->rs[Rs_imLocale]);
1273 1190
1274 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1191 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1275 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1192 mbstowcs (str, text->string.multi_byte, text->length + 1);
1276 1193
1277 if (term->rs[Rs_imLocale]) 1194 if (term->rs[Rs_imLocale])
1278 SET_LOCALE (term->locale); 1195 SET_LOCALE (term->locale);
1279 } 1196 }
1280 else 1197 else
1281 str = (void *)text->string.wide_char; 1198 str = text->string.wide_char;
1282 1199
1283 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1200 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1284 DT_INT, call_data->caret, 1201 DT_INT, call_data->caret,
1285 DT_INT, call_data->chg_first, 1202 DT_INT, call_data->chg_first,
1286 DT_INT, call_data->chg_length, 1203 DT_INT, call_data->chg_length,
1287 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1204 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1422 "*", 1339 "*",
1423 fheight, 1340 fheight,
1424 fheight + 1, fheight - 1, 1341 fheight + 1, fheight - 1,
1425 fheight - 2, fheight + 2); 1342 fheight - 2, fheight + 2);
1426 1343
1427 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1344 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1428 &missing_charset_list, &missing_charset_count, &def_string); 1345 &missing_charset_list, &missing_charset_count, &def_string);
1429 1346
1430 if (missing_charset_list) 1347 if (missing_charset_list)
1431 XFreeStringList (missing_charset_list); 1348 XFreeStringList (missing_charset_list);
1432 1349
… …
1507 preedit_attr, 1424 preedit_attr,
1508 status_attr ? XNStatusAttributes : NULL, 1425 status_attr ? XNStatusAttributes : NULL,
1509 status_attr, NULL); 1426 status_attr, NULL);
1510 1427
1511 if (preedit_attr) XFree (preedit_attr); 1428 if (preedit_attr) XFree (preedit_attr);
1512 if (status_attr) XFree (status_attr); 1429 if (status_attr) XFree (status_attr);
1513 if (fs) XFreeFontSet (xdisp, fs); 1430 if (fs) XFreeFontSet (dpy, fs);
1514 1431
1515 if (Input_Context == NULL) 1432 if (Input_Context == NULL)
1516 { 1433 {
1517 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1434 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1518 im_destroy (); 1435 im_destroy ();
… …
1523 // unfortunately, only the focus window is used by XIM, hard to fix 1440 // unfortunately, only the focus window is used by XIM, hard to fix
1524 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1441 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1525 vt_select_input (); 1442 vt_select_input ();
1526#endif 1443#endif
1527 1444
1528 if (input_style & XIMPreeditArea)
1529 IMSetStatusPosition (); 1445 IMSetPosition ();
1530 1446
1531 return true; 1447 return true;
1532} 1448}
1533 1449
1534void 1450void
… …
1592 SET_LOCALE (locale); 1508 SET_LOCALE (locale);
1593#endif 1509#endif
1594} 1510}
1595 1511
1596void 1512void
1597rxvt_term::IMSetStatusPosition () 1513rxvt_term::IMSetPosition ()
1598{ 1514{
1599 XRectangle preedit_rect, status_rect, *needed_rect; 1515 XRectangle preedit_rect, status_rect, *needed_rect;
1600 XVaNestedList preedit_attr, status_attr; 1516 XVaNestedList preedit_attr, status_attr;
1601 1517
1602 if (!Input_Context 1518 if (!Input_Context
1603 || !focus 1519 || !focus
1604 || !(input_style & XIMPreeditArea) 1520 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1605 || !IMisRunning ()) 1521 || !IMisRunning ())
1606 return; 1522 return;
1607 1523
1524 if (input_style & XIMPreeditPosition)
1525 {
1526 im_set_size (preedit_rect);
1527 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1528
1529 XSetICValues (Input_Context,
1530 XNPreeditAttributes, preedit_attr, NULL);
1531 }
1532 else
1533 {
1608 /* Getting the necessary width of preedit area */ 1534 /* Getting the necessary width of preedit area */
1609 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1535 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1610 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1536 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1611 XFree (status_attr); 1537 XFree (status_attr);
1612 1538
1613 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1539 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1614 XFree (needed_rect); 1540 XFree (needed_rect);
1615 1541
1616 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1542 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1617 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1543 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1618 1544
1619 XSetICValues (Input_Context, 1545 XSetICValues (Input_Context,
1620 XNPreeditAttributes, preedit_attr, 1546 XNPreeditAttributes, preedit_attr,
1621 XNStatusAttributes, status_attr, NULL); 1547 XNStatusAttributes, status_attr,
1548 NULL);
1622 1549
1550 XFree (status_attr);
1551 }
1552
1623 XFree (preedit_attr); 1553 XFree (preedit_attr);
1624 XFree (status_attr);
1625} 1554}
1626#endif /* USE_XIM */ 1555#endif /* USE_XIM */
1556
1557void
1558rxvt_term::get_window_origin (int &x, int &y)
1559{
1560 Window cr;
1561 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1562/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1563}
1564
1565Pixmap
1566rxvt_term::get_pixmap_property (int prop_id)
1567{
1568 if (prop_id > 0 && prop_id < NUM_XA)
1569 if (xa[prop_id])
1570 {
1571 int aformat;
1572 unsigned long nitems, bytes_after;
1573 Atom atype;
1574 unsigned char *prop = NULL;
1575 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1576 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1577 &nitems, &bytes_after, &prop);
1578 if (result == Success && prop && atype == XA_PIXMAP)
1579 return *(Pixmap *)prop;
1580 }
1581
1582 return None;
1583}
1584
1585#ifdef HAVE_BG_PIXMAP
1586# if TRACE_PIXMAPS
1587# undef update_background
1588void
1589rxvt_term::trace_update_background (const char *file, int line)
1590{
1591 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1592 update_background ();
1593}
1594# endif
1595
1596void
1597rxvt_term::update_background ()
1598{
1599 if (update_background_ev.is_active ())
1600 return;
1601
1602 bgPixmap.invalidate ();
1603
1604 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1605
1606 if (to_wait <= 0.)
1607 bgPixmap.render ();
1608 else
1609 update_background_ev.start (to_wait);
1610}
1611
1612void
1613rxvt_term::update_background_cb (ev::timer &w, int revents)
1614{
1615 make_current ();
1616
1617 update_background_ev.stop ();
1618 bgPixmap.render ();
1619 refresh_check ();
1620}
1621
1622#endif /* HAVE_BG_PIXMAP */
1627 1623
1628/*----------------------- end-of-file (C source) -----------------------*/ 1624/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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