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.205 by root, Wed Jan 25 13:24:45 2006 UTC vs.
Revision 1.331 by sf-exg, Mon Jul 26 22:07:38 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 dDisp;
222
223 selection_clear (); 242 selection_clear ();
243 selection_clear (true);
224 244
225#ifdef USE_XIM 245#ifdef USE_XIM
226 im_destroy (); 246 im_destroy ();
227#endif 247#endif
228#ifdef XTERM_SCROLLBAR 248 scrollBar.destroy ();
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC);
231#endif
232#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
234#endif
235#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
246#endif
247#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
251#endif
252 if (gc) XFreeGC (disp, gc); 249 if (gc) XFreeGC (dpy, gc);
253 250
254 delete drawable; 251 delete drawable;
255 // destroy all windows 252 // destroy all windows
256 if (parent[0]) 253 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 254 XDestroyWindow (dpy, parent[0]);
258 }
259 255
260 // TODO: free pixcolours, colours should become part of rxvt_display 256 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 257 if (ISSET_PIXCOLOR (i))
258 {
259 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 260#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 261 pix_colors_unfocused [i].free (this);
264#endif 262#endif
263 }
265 264
265 clear ();
266
267 display->flush (); /* ideally .put should do this */
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}
… …
368{ 373{
369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 374 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370 (*t)->emergency_cleanup (); 375 (*t)->emergency_cleanup ();
371} 376}
372 377
373#if ENABLE_FRILLS 378#if !ENABLE_MINIMAL
374static void 379static void
375print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
376{ 381{
377 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
379 char number[32]; 384 char number[32];
380 char *mtype = "XlibMessage"; 385 char *mtype = "XlibMessage";
381 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
382 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
383 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 388 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
384 rxvt_warn ("%s: %s\n", mesg, buffer); 389 rxvt_warn ("%s: %s\n", mesg, buffer);
385 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
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
… …
426 GET_R->allowedxerror = event->error_code; 431 GET_R->allowedxerror = event->error_code;
427 else 432 else
428 { 433 {
429 // GET_R is most likely not the terminal which caused the error, 434 // GET_R is most likely not the terminal which caused the error,
430 // so just output the error and continue 435 // so just output the error and continue
431#if ENABLE_FRILLS 436#if ENABLE_MINIMAL
437 old_xerror_handler (display, event);
438#else
432 print_x_error (display, event); 439 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 440#endif
436 } 441 }
437 442
438 return 0; 443 return 0;
439} 444}
… …
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 dDisp;
481
482 init_xlocale ();
483
484 scr_reset (); // initialize screen
485
486#if 0
487 XSynchronize (disp, True);
488#endif
489
490#ifdef HAVE_SCROLLBARS
491 if (OPTION (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */
493#endif
494#ifdef TRANSPARENT
495 if (OPTION (Opt_transparent))
496 {
497 XSelectInput (disp, display->root, PropertyChangeMask);
498 check_our_parents ();
499 rootwin_ev.start (display, display->root);
500 }
501#endif
502
503 set_colorfgbg ();
504
505 init_command (cmd_argv);
506
507 free (cmd_argv);
508
509 if (pty->pty >= 0)
510 pty_ev.start (pty->pty, EVENT_READ);
511
512 check_ev.start ();
513
514 HOOK_INVOKE ((this, HOOK_START, DT_END));
515
516#if ENABLE_XEMBED
517 if (rs[Rs_embed])
518 {
519 long info[2] = { 0, XEMBED_MAPPED };
520
521 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
522 32, PropModeReplace, (unsigned char *)&info, 2);
523 }
524#endif
525
526 XMapWindow (disp, vt);
527 XMapWindow (disp, parent[0]);
528
529 return true;
530}
531
532static struct sig_handlers 455static struct sig_handlers
533{ 456{
534 sig_watcher sw_term, sw_int; 457 ev::sig sw_term, sw_int;
535 458
536 /* 459 /*
537 * Catch a fatal signal and tidy up before quitting 460 * Catch a fatal signal and tidy up before quitting
538 */ 461 */
539 void 462 void sig_term (ev::sig &w, int revents);
540 sig_term (sig_watcher &w) 463
464 sig_handlers ()
541 { 465 {
542 rxvt_emergency_cleanup (); 466 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
543 signal (w.signum, SIG_DFL);
544 kill (getpid (), w.signum);
545 }
546
547 sig_handlers ()
548 : sw_term (this, &sig_handlers::sig_term),
549 sw_int (this, &sig_handlers::sig_term) 467 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
550 {
551 } 468 }
552} sig_handlers; 469} sig_handlers;
553 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
554char **rxvt_environ; // startup environment 479char **rxvt_environ; // startup environment
555 480
556void 481void
557rxvt_init () 482rxvt_init ()
558{ 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
487 // get rid of stdin/stdout as we don't need them, to free resources
488 dup2 (STDERR_FILENO, STDIN_FILENO);
489 dup2 (STDERR_FILENO, STDOUT_FILENO);
490
559 ptytty::init (); 491 ptytty::init ();
492
493 if (!ev_default_loop (0))
494 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
560 495
561 rxvt_environ = environ; 496 rxvt_environ = environ;
562 497
563 signal (SIGHUP, SIG_IGN); 498 signal (SIGHUP, SIG_IGN);
564 signal (SIGPIPE, SIG_IGN); 499 signal (SIGPIPE, SIG_IGN);
565 500
566 sig_handlers.sw_term.start (SIGTERM); 501 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
567 sig_handlers.sw_int.start (SIGINT); 502 sig_handlers.sw_int.start (SIGINT); ev_unref ();
568
569 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
570 /* signal (SIGURG, SIG_DFL); */
571 503
572 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 504 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
573 // TODO: handle this with exceptions and tolerate the memory loss 505 // TODO: handle this with exceptions and tolerate the memory loss
574 XSetIOErrorHandler (rxvt_xioerror_handler); 506 XSetIOErrorHandler (rxvt_xioerror_handler);
575 507
576 XrmInitialize (); 508 XrmInitialize ();
577} 509}
578 510
579/* ------------------------------------------------------------------------- *
580 * MEMORY ALLOCATION WRAPPERS *
581 * ------------------------------------------------------------------------- */
582void *
583rxvt_malloc (size_t size)
584{
585 void *p = malloc (size);
586
587 if (!p)
588 rxvt_fatal ("memory allocation failure. aborting.\n");
589
590 return p;
591}
592
593void *
594rxvt_calloc (size_t number, size_t size)
595{
596 void *p = calloc (number, size);
597
598 if (!p)
599 rxvt_fatal ("memory allocation failure. aborting.\n");
600
601 return p;
602}
603
604void *
605rxvt_realloc (void *ptr, size_t size)
606{
607 void *p = realloc (ptr, size);
608
609 if (!p)
610 rxvt_fatal ("memory allocation failure. aborting.\n");
611
612 return p;
613}
614
615/*----------------------------------------------------------------------*/ 511/*----------------------------------------------------------------------*/
616/* 512/*
617 * window size/position calculcations for XSizeHint and other storage. 513 * window size/position calculations for XSizeHint and other storage.
618 * if width/height are non-zero then override calculated width/height 514 * if width/height are non-zero then override calculated width/height
619 */ 515 */
620void 516void
621rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 517rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
622{ 518{
623 short recalc_x, recalc_y; 519 short recalc_x, recalc_y;
624 int x, y, sb_w, flags; 520 int x, y, flags;
625 unsigned int w, h; 521 unsigned int w, h;
626 unsigned int max_width, max_height; 522 unsigned int max_width, max_height;
627 dDisp;
628 523
629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 524 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
630 szHint.win_gravity = NorthWestGravity; 525 szHint.win_gravity = NorthWestGravity;
631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 526 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
632 527
… …
640 if (rs[Rs_geometry]) 535 if (rs[Rs_geometry])
641 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 536 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
642 537
643 if (flags & WidthValue) 538 if (flags & WidthValue)
644 { 539 {
540 if (!w)
541 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
542
645 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 543 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
646 szHint.flags |= USSize; 544 szHint.flags |= USSize;
647 } 545 }
648 546
649 if (flags & HeightValue) 547 if (flags & HeightValue)
650 { 548 {
549 if (!h)
550 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
551
651 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 552 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
652 szHint.flags |= USSize; 553 szHint.flags |= USSize;
653 } 554 }
654 555
655 if (flags & XValue) 556 if (flags & XValue)
656 { 557 {
… …
687 max_width = MAX_COLS * fwidth; 588 max_width = MAX_COLS * fwidth;
688 max_height = MAX_ROWS * fheight; 589 max_height = MAX_ROWS * fheight;
689 590
690 szHint.base_width = szHint.base_height = 2 * int_bwidth; 591 szHint.base_width = szHint.base_height = 2 * int_bwidth;
691 592
692 sb_w = 0;
693 window_vt_x = window_vt_y = int_bwidth; 593 window_vt_x = window_vt_y = int_bwidth;
694 594
695 if (scrollBar.state) 595 if (scrollBar.state)
696 { 596 {
697 sb_w = scrollbar_TotalWidth (); 597 int sb_w = scrollBar.total_width ();
698 szHint.base_width += sb_w; 598 szHint.base_width += sb_w;
599
699 if (!OPTION (Opt_scrollBar_right)) 600 if (!option (Opt_scrollBar_right))
700 window_vt_x += sb_w; 601 window_vt_x += sb_w;
701 } 602 }
702 603
703 szHint.width_inc = fwidth; 604 szHint.width_inc = fwidth;
704 szHint.height_inc = fheight; 605 szHint.height_inc = fheight;
705 szHint.min_width = szHint.base_width + szHint.width_inc; 606 szHint.min_width = szHint.base_width + szHint.width_inc;
706 szHint.min_height = szHint.base_height + szHint.height_inc; 607 szHint.min_height = szHint.base_height + szHint.height_inc;
707 608
708 if (newwidth && newwidth - szHint.base_width < max_width) 609 if (newwidth && newwidth - szHint.base_width < max_width)
709 { 610 {
710 szHint.width = newwidth; 611 szHint.width = newwidth;
… …
725 { 626 {
726 min_it (height, max_height); 627 min_it (height, max_height);
727 szHint.height = szHint.base_height + height; 628 szHint.height = szHint.base_height + height;
728 } 629 }
729 630
730 if (scrollBar.state && OPTION (Opt_scrollBar_right))
731 window_sb_x = szHint.width - sb_w;
732
733 if (recalc_x) 631 if (recalc_x)
734 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 632 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
633
735 if (recalc_y) 634 if (recalc_y)
736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 635 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
737 636
738 ncol = width / fwidth; 637 ncol = width / fwidth;
739 nrow = height / fheight; 638 nrow = height / fheight;
740} 639}
741 640
742/*----------------------------------------------------------------------*/ 641/*----------------------------------------------------------------------*/
743/* 642/*
… …
754 653
755 ws.ws_col = ncol; 654 ws.ws_col = ncol;
756 ws.ws_row = nrow; 655 ws.ws_row = nrow;
757 ws.ws_xpixel = width; 656 ws.ws_xpixel = width;
758 ws.ws_ypixel = height; 657 ws.ws_ypixel = height;
759 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 658 ioctl (pty->pty, TIOCSWINSZ, &ws);
760 659
761#if 0 660#if 0
762 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 661 // TIOCSWINSZ is supposed to do this automatically and correctly
763 if (cmd_pid) /* force through to the command */ 662 if (cmd_pid) /* force through to the command */
764 kill (-cmd_pid, SIGWINCH); 663 kill (-cmd_pid, SIGWINCH);
765#endif 664#endif
766} 665}
767 666
… …
794#endif 693#endif
795 694
796 delete fontset[0]; 695 delete fontset[0];
797 fontset[0] = fs; 696 fontset[0] = fs;
798 697
799 prop = (*fs)[1]->properties (); 698 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
800 prop.height += lineSpace; 699 prop.height += lineSpace;
700 prop.width += letterSpace;
701
801 fs->set_prop (prop); 702 fs->set_prop (prop, false);
802 703
803 fwidth = prop.width; 704 fwidth = prop.width;
804 fheight = prop.height; 705 fheight = prop.height;
805 fbase = prop.ascent; 706 fbase = prop.ascent;
806 707
… …
815 { 716 {
816 fontset[style] = fs = new rxvt_fontset (this); 717 fontset[style] = fs = new rxvt_fontset (this);
817 rxvt_fontprop prop2 = prop; 718 rxvt_fontprop prop2 = prop;
818 719
819 if (res) 720 if (res)
820 prop2.weight = prop2.slant = rxvt_fontprop::unset; 721 {
722 fs->populate (res);
723 fs->set_prop (prop2, false);
724 }
821 else 725 else
822 { 726 {
823 res = fontset[0]->fontdesc; 727 fs->populate (fontset[0]->fontdesc);
824 728
825 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 729 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
826 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 730 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
731
732 fs->set_prop (prop2, true);
827 } 733 }
828 734
829 fs->populate (res);
830 fs->set_prop (prop2);
831 } 735 }
832#else 736#else
833 fontset[style] = fontset[0]; 737 fontset[style] = fontset[0];
834#endif 738#endif
835 } 739 }
… …
837 if (parent[0]) 741 if (parent[0])
838 { 742 {
839 resize_all_windows (0, 0, 0); 743 resize_all_windows (0, 0, 0);
840 scr_remap_chars (); 744 scr_remap_chars ();
841 scr_touch (true); 745 scr_touch (true);
842 } 746 }
843 747
844 return true; 748 return true;
845} 749}
846 750
751void
847void rxvt_term::set_string_property (Atom prop, const char *str, int len) 752rxvt_term::set_string_property (Atom prop, const char *str, int len)
848{ 753{
849 XChangeProperty (display->display, parent[0], 754 XChangeProperty (dpy, parent[0],
850 prop, XA_STRING, 8, PropModeReplace, 755 prop, XA_STRING, 8, PropModeReplace,
851 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 756 (const unsigned char *)str, len >= 0 ? len : strlen (str));
852} 757}
853 758
759void
760rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
761{
762 XTextProperty ct;
763
764 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
765 {
766 XSetTextProperty (dpy, parent[0], &ct, prop);
767 XFree (ct.value);
768 }
769}
770
771void
854void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 772rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
855{ 773{
856 wchar_t *ws = rxvt_mbstowcs (str, len); 774 wchar_t *ws = rxvt_mbstowcs (str, len);
857 char *s = rxvt_wcstoutf8 (ws); 775 char *s = rxvt_wcstoutf8 (ws);
858 776
859 XChangeProperty (display->display, parent[0], 777 XChangeProperty (dpy, parent[0],
860 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 778 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
861 (const unsigned char *)s, strlen (s)); 779 (const unsigned char *)s, strlen (s));
862 780
863 free (s); 781 free (s);
864 free (ws); 782 free (ws);
… …
868/*----------------------------------------------------------------------*/ 786/*----------------------------------------------------------------------*/
869/* xterm sequences - title, iconName, color (exptl) */ 787/* xterm sequences - title, iconName, color (exptl) */
870void 788void
871rxvt_term::set_title (const char *str) 789rxvt_term::set_title (const char *str)
872{ 790{
873 set_string_property (XA_WM_NAME, str); 791 set_mbstring_property (XA_WM_NAME, str);
874#if ENABLE_EWMH 792#if ENABLE_EWMH
875 set_utf8_property (xa[XA_NET_WM_NAME], str); 793 set_utf8_property (xa[XA_NET_WM_NAME], str);
876#endif 794#endif
877} 795}
878 796
879void 797void
880rxvt_term::set_icon_name (const char *str) 798rxvt_term::set_icon_name (const char *str)
881{ 799{
882 set_string_property (XA_WM_ICON_NAME, str); 800 set_mbstring_property (XA_WM_ICON_NAME, str);
883#if ENABLE_EWMH 801#if ENABLE_EWMH
884 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 802 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
885#endif 803#endif
886} 804}
887 805
806void
807rxvt_term::set_window_color (int idx, const char *color)
808{
888#ifdef XTERM_COLOR_CHANGE 809#ifdef XTERM_COLOR_CHANGE
889void
890rxvt_term::set_window_color (int idx, const char *color)
891{
892 rxvt_color xcol; 810 rxvt_color xcol;
893 int i;
894 811
895 if (color == NULL || *color == '\0') 812 if (color == NULL || *color == '\0')
896 return; 813 return;
897 814
815 color = strdup (color);
816 allocated.push_back ((void *)color);
817 rs[Rs_color + idx] = color;
818
898 /* handle color aliases */ 819 /* handle color aliases */
899 if (isdigit (*color)) 820 if (isdigit (*color))
900 { 821 {
901 i = atoi (color); 822 int i = atoi (color);
902 823
903 if (i >= 8 && i <= 15) 824 if (i >= 8 && i <= 15)
825 {
904 { /* bright colors */ 826 /* bright colors */
905 i -= 8;
906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 827 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
907 SET_PIXCOLOR (idx);
908 goto done; 828 goto done;
909 } 829 }
910 830
911 if (i >= 0 && i <= 7) 831 if (i >= 0 && i <= 7)
832 {
912 { /* normal colors */ 833 /* normal colors */
913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 834 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
914 SET_PIXCOLOR (idx);
915 goto done; 835 goto done;
916 } 836 }
917 } 837 }
918 838
919 if (!rXParseAllocColor (&xcol, color)) 839 set_color (xcol, color);
920 return;
921
922 /* XStoreColor (display->display, display->cmap, XColor*); */
923 840
924 /* 841 /*
925 * FIXME: should free colors here, but no idea how to do it so instead, 842 * FIXME: should free colors here, but no idea how to do it so instead,
926 * so just keep gobbling up the colormap 843 * so just keep gobbling up the colormap
927 */ 844 */
928# if 0
929 for (i = Color_Black; i <= Color_White; i++)
930 if (pix_colors[idx] == pix_colors[i])
931 break;
932 if (i > Color_White)
933 {
934 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
935 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
936 DisplayPlanes (display->display, display->screen));
937 }
938# endif
939 845
940 pix_colors_focused[idx] = xcol; 846 pix_colors_focused[idx] = xcol;
941 SET_PIXCOLOR (idx);
942 847
943 /* XSetWindowAttributes attr; */
944 /* Cursor cursor; */
945done: 848done:
946
947#if OFF_FOCUS_FADING
948 if (rs[Rs_fade])
949 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
950#endif
951
952 /*TODO: handle Color_BD, scrollbar background, etc. */ 849 /*TODO: handle Color_BD, scrollbar background, etc. */
953 850
851 update_fade_color (idx);
954 recolour_cursor (); 852 recolour_cursor ();
955 scr_recolour (); 853 scr_recolour ();
854#endif /* XTERM_COLOR_CHANGE */
956} 855}
957
958#else
959# define set_window_color (idx,color) ((void)0)
960#endif /* XTERM_COLOR_CHANGE */
961 856
962void 857void
963rxvt_term::recolour_cursor () 858rxvt_term::recolour_cursor ()
964{ 859{
965 XColor xcol[2]; 860 XColor fg, bg;
966 861
967 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 862 (ISSET_PIXCOLOR (Color_pointer_fg)
968 ? pix_colors_focused[Color_pointer_fg] 863 ? pix_colors_focused[Color_pointer_fg]
969 : pix_colors_focused[Color_fg]; 864 : pix_colors_focused[Color_fg]).get (fg);
865
970 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 866 (ISSET_PIXCOLOR (Color_pointer_bg)
971 ? pix_colors_focused[Color_pointer_bg] 867 ? pix_colors_focused[Color_pointer_bg]
972 : pix_colors_focused[Color_bg]; 868 : pix_colors_focused[Color_bg]).get (bg);
973 869
974 XQueryColors (display->display, display->cmap, xcol, 2); 870 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
975 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
976} 871}
977 872
978/*----------------------------------------------------------------------*/ 873/*----------------------------------------------------------------------*/
979/* 874/*
980 * find if fg/bg matches any of the normal (low-intensity) colors 875 * find if fg/bg matches any of the normal (low-intensity) colors
981 */ 876 */
982void 877void
983rxvt_term::set_colorfgbg () 878rxvt_term::set_colorfgbg ()
984{ 879{
985 unsigned int i; 880 unsigned int i;
986 const char *xpmb = "\0"; 881 const char *xpmb = "";
987 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 882 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
988 883
989 strcpy (fstr, "default"); 884 strcpy (fstr, "default");
990 strcpy (bstr, "default"); 885 strcpy (bstr, "default");
991 for (i = Color_Black; i <= Color_White; i++) 886 for (i = Color_Black; i <= Color_White; i++)
… …
997 892
998 for (i = Color_Black; i <= Color_White; i++) 893 for (i = Color_Black; i <= Color_White; i++)
999 if (pix_colors[Color_bg] == pix_colors[i]) 894 if (pix_colors[Color_bg] == pix_colors[i])
1000 { 895 {
1001 sprintf (bstr, "%d", (i - Color_Black)); 896 sprintf (bstr, "%d", (i - Color_Black));
1002#ifdef XPM_BACKGROUND 897#ifdef BG_IMAGE_FROM_FILE
1003 xpmb = "default;"; 898 xpmb = "default;";
1004#endif 899#endif
1005 break; 900 break;
1006 } 901 }
1007 902
1008 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 903 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1009} 904}
1010 905
1011/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
1012 907
1013int 908bool
1014rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 909rxvt_term::set_color (rxvt_color &color, const char *name)
1015{ 910{
1016 if (!screen_in_out->set (display, colour)) 911 if (color.set (this, name))
1017 {
1018 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1019 return false;
1020 }
1021
1022 return true; 912 return true;
913
914 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
915 return false;
916}
917
918void
919rxvt_term::alias_color (int dst, int src)
920{
921 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1023} 922}
1024 923
1025/* -------------------------------------------------------------------- * 924/* -------------------------------------------------------------------- *
1026 * - WINDOW RESIZING - * 925 * - WINDOW RESIZING - *
1027 * -------------------------------------------------------------------- */ 926 * -------------------------------------------------------------------- */
… …
1029rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 928rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1030{ 929{
1031 int fix_screen; 930 int fix_screen;
1032 int old_width = szHint.width; 931 int old_width = szHint.width;
1033 int old_height = szHint.height; 932 int old_height = szHint.height;
1034 dDisp;
1035 933
1036 window_calc (newwidth, newheight); 934 window_calc (newwidth, newheight);
935
936 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
937
938 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
939 if (set_hint)
940 {
941 szHint.flags &= ~(PBaseSize | PResizeInc);
1037 XSetWMNormalHints (disp, parent[0], &szHint); 942 XSetWMNormalHints (dpy, parent[0], &szHint);
943 szHint.flags |= PBaseSize | PResizeInc;
944 }
1038 945
1039 if (!ignoreparent) 946 if (!ignoreparent)
1040 { 947 {
1041#ifdef SMART_RESIZE 948#ifdef SMART_RESIZE
1042 /* 949 /*
… …
1046 int x, y, x1, y1; 953 int x, y, x1, y1;
1047 int dx, dy; 954 int dx, dy;
1048 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 955 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1049 Window unused_cr; 956 Window unused_cr;
1050 957
1051 XTranslateCoordinates (disp, parent[0], display->root, 958 XTranslateCoordinates (dpy, parent[0], display->root,
1052 0, 0, &x, &y, &unused_cr); 959 0, 0, &x, &y, &unused_cr);
1053 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 960 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1054 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 961 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1055 /* 962 /*
1056 * if display->root isn't the parent window, a WM will probably have offset 963 * if display->root isn't the parent window, a WM will probably have offset
1057 * our position for handles and decorations. Counter it 964 * our position for handles and decorations. Counter it
1058 */ 965 */
… …
1060 { 967 {
1061 x -= x1; 968 x -= x1;
1062 y -= y1; 969 y -= y1;
1063 } 970 }
1064 971
1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 972 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 973 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1067 dx = old_width - szHint.width; 974 dx = old_width - szHint.width;
1068 dy = old_height - szHint.height; 975 dy = old_height - szHint.height;
1069 976
1070 /* Check position of the center of the window */ 977 /* Check position of the center of the window */
1071 if (x < x1) /* left half */ 978 if (x < x1) /* left half */
… …
1075 if (y < y1) /* top half */ 982 if (y < y1) /* top half */
1076 dy = 0; 983 dy = 0;
1077 else if (y == y1) /* exact center */ 984 else if (y == y1) /* exact center */
1078 dy /= 2; 985 dy /= 2;
1079 986
1080 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 987 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1081 szHint.width, szHint.height); 988 szHint.width, szHint.height);
1082#else 989#else
1083 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 990 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1084#endif 991#endif
1085 } 992 }
993
994 if (set_hint)
995 XSetWMNormalHints (dpy, parent[0], &szHint);
1086 996
1087 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 997 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1088 998
1089 if (fix_screen || newwidth != old_width || newheight != old_height) 999 if (fix_screen || newwidth != old_width || newheight != old_height)
1090 { 1000 {
1091 if (scrollBar.state) 1001 if (scrollBar.state)
1092 { 1002 scrollBar.resize ();
1093 XMoveResizeWindow (disp, scrollBar.win,
1094 window_sb_x, 0,
1095 scrollbar_TotalWidth (), szHint.height);
1096 resize_scrollbar ();
1097 }
1098 1003
1099 XMoveResizeWindow (disp, vt, 1004 XMoveResizeWindow (dpy, vt,
1100 window_vt_x, window_vt_y, 1005 window_vt_x, window_vt_y,
1101 width, height); 1006 width, height);
1102 1007
1103 scr_clear (); 1008#ifdef HAVE_BG_PIXMAP
1104#ifdef XPM_BACKGROUND 1009 if (bgPixmap.window_size_sensitive ())
1105 resize_pixmap (); 1010 update_background ();
1106#endif 1011#endif
1107 } 1012 }
1108 1013
1109 if (fix_screen || old_height == 0) 1014 if (fix_screen || old_height == 0)
1110 scr_reset (); 1015 scr_reset ();
1111 1016
1112#ifdef XPM_BACKGROUND 1017#ifdef HAVE_BG_PIXMAP
1113 if (pixmap) 1018// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1019// if (bgPixmap.pixmap)
1114 scr_touch (false); 1020// scr_touch (false);
1115#endif 1021#endif
1116 1022
1117#ifdef USE_XIM 1023#ifdef USE_XIM
1118 IMSetStatusPosition (); 1024 IMSetPosition ();
1119#endif 1025#endif
1120} 1026}
1121 1027
1122/* 1028/*
1123 * Set the width/height of the vt window in characters. Units are pixels. 1029 * Set the width/height of the vt window in characters. Units are pixels.
… …
1128{ 1034{
1129 XWindowAttributes wattr; 1035 XWindowAttributes wattr;
1130 1036
1131 if (newwidth == 0 || newheight == 0) 1037 if (newwidth == 0 || newheight == 0)
1132 { 1038 {
1133 XGetWindowAttributes (display->display, display->root, &wattr); 1039 XGetWindowAttributes (dpy, display->root, &wattr);
1134 1040
1135 if (newwidth == 0) 1041 if (newwidth == 0)
1136 newwidth = wattr.width - szHint.base_width; 1042 newwidth = wattr.width - szHint.base_width;
1137 if (newheight == 0) 1043 if (newheight == 0)
1138 newheight = wattr.height - szHint.base_height; 1044 newheight = wattr.height - szHint.base_height;
… …
1152#ifdef USE_XIM 1058#ifdef USE_XIM
1153 1059
1154void 1060void
1155rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1061rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1156{ 1062{
1157 fg = pix_colors[Color_fg]; 1063 fg = pix_colors [Color_fg];
1158 bg = pix_colors[Color_bg]; 1064 bg = pix_colors [Color_bg];
1159} 1065}
1160 1066
1161void 1067void
1162rxvt_term::im_set_size (XRectangle &size) 1068rxvt_term::im_set_size (XRectangle &size)
1163{ 1069{
… …
1186 1092
1187/* Checking whether input method is running. */ 1093/* Checking whether input method is running. */
1188bool 1094bool
1189rxvt_term::IMisRunning () 1095rxvt_term::IMisRunning ()
1190{ 1096{
1191 char *p;
1192 Atom atom; 1097 Atom atom;
1193 Window win; 1098 Window win;
1194 char server[IMBUFSIZ]; 1099 char server[IMBUFSIZ];
1195 1100
1196 /* get current locale modifier */ 1101 /* get current locale modifier */
1197 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1102 if (char *p = XSetLocaleModifiers (0))
1198 { 1103 {
1199 strcpy (server, "@server="); 1104 strcpy (server, "@server=");
1200 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1105 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1201 1106
1202 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1107 if (p = strchr (server + 1, '@')) /* first one only */
1203 *p = '\0'; 1108 *p = '\0';
1204 1109
1205 atom = XInternAtom (display->display, server, False); 1110 atom = XInternAtom (dpy, server, False);
1206 win = XGetSelectionOwner (display->display, atom); 1111 win = XGetSelectionOwner (dpy, atom);
1207 1112
1208 if (win != None) 1113 if (win != None)
1209 return True; 1114 return True;
1210 } 1115 }
1211 1116
… …
1274 1179
1275 term->make_current (); 1180 term->make_current ();
1276 1181
1277 if (text) 1182 if (text)
1278 { 1183 {
1279 void *str; 1184 wchar_t *str;
1280 1185
1281 if (!text->encoding_is_wchar && text->string.multi_byte) 1186 if (!text->encoding_is_wchar && text->string.multi_byte)
1282 { 1187 {
1283 // of course, X makes it ugly again 1188 // of course, X makes it ugly again
1284 if (term->rs[Rs_imLocale]) 1189 if (term->rs[Rs_imLocale])
1285 SET_LOCALE (term->rs[Rs_imLocale]); 1190 SET_LOCALE (term->rs[Rs_imLocale]);
1286 1191
1287 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1192 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1288 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1193 mbstowcs (str, text->string.multi_byte, text->length + 1);
1289 1194
1290 if (term->rs[Rs_imLocale]) 1195 if (term->rs[Rs_imLocale])
1291 SET_LOCALE (term->locale); 1196 SET_LOCALE (term->locale);
1292 } 1197 }
1293 else 1198 else
1294 str = (void *)text->string.wide_char; 1199 str = text->string.wide_char;
1295 1200
1296 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1201 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1297 DT_INT, call_data->caret, 1202 DT_INT, call_data->caret,
1298 DT_INT, call_data->chg_first, 1203 DT_INT, call_data->chg_first,
1299 DT_INT, call_data->chg_length, 1204 DT_INT, call_data->chg_length,
1300 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1205 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1435 "*", 1340 "*",
1436 fheight, 1341 fheight,
1437 fheight + 1, fheight - 1, 1342 fheight + 1, fheight - 1,
1438 fheight - 2, fheight + 2); 1343 fheight - 2, fheight + 2);
1439 1344
1440 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1345 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1441 &missing_charset_list, &missing_charset_count, &def_string); 1346 &missing_charset_list, &missing_charset_count, &def_string);
1442 1347
1443 if (missing_charset_list) 1348 if (missing_charset_list)
1444 XFreeStringList (missing_charset_list); 1349 XFreeStringList (missing_charset_list);
1445 1350
… …
1520 preedit_attr, 1425 preedit_attr,
1521 status_attr ? XNStatusAttributes : NULL, 1426 status_attr ? XNStatusAttributes : NULL,
1522 status_attr, NULL); 1427 status_attr, NULL);
1523 1428
1524 if (preedit_attr) XFree (preedit_attr); 1429 if (preedit_attr) XFree (preedit_attr);
1525 if (status_attr) XFree (status_attr); 1430 if (status_attr) XFree (status_attr);
1526 if (fs) XFreeFontSet (display->display, fs); 1431 if (fs) XFreeFontSet (dpy, fs);
1527 1432
1528 if (Input_Context == NULL) 1433 if (Input_Context == NULL)
1529 { 1434 {
1530 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1435 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1531 im_destroy (); 1436 im_destroy ();
… …
1536 // unfortunately, only the focus window is used by XIM, hard to fix 1441 // unfortunately, only the focus window is used by XIM, hard to fix
1537 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1442 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1538 vt_select_input (); 1443 vt_select_input ();
1539#endif 1444#endif
1540 1445
1541 if (input_style & XIMPreeditArea)
1542 IMSetStatusPosition (); 1446 IMSetPosition ();
1543 1447
1544 return true; 1448 return true;
1545} 1449}
1546 1450
1547void 1451void
… …
1605 SET_LOCALE (locale); 1509 SET_LOCALE (locale);
1606#endif 1510#endif
1607} 1511}
1608 1512
1609void 1513void
1610rxvt_term::IMSetStatusPosition () 1514rxvt_term::IMSetPosition ()
1611{ 1515{
1612 XRectangle preedit_rect, status_rect, *needed_rect; 1516 XRectangle preedit_rect, status_rect, *needed_rect;
1613 XVaNestedList preedit_attr, status_attr; 1517 XVaNestedList preedit_attr, status_attr;
1614 1518
1615 if (!Input_Context 1519 if (!Input_Context
1616 || !focus 1520 || !focus
1617 || !(input_style & XIMPreeditArea) 1521 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1618 || !IMisRunning ()) 1522 || !IMisRunning ())
1619 return; 1523 return;
1620 1524
1525 if (input_style & XIMPreeditPosition)
1526 {
1527 im_set_size (preedit_rect);
1528 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1529
1530 XSetICValues (Input_Context,
1531 XNPreeditAttributes, preedit_attr, NULL);
1532 }
1533 else
1534 {
1621 /* Getting the necessary width of preedit area */ 1535 /* Getting the necessary width of preedit area */
1622 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1536 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1623 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1537 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1624 XFree (status_attr); 1538 XFree (status_attr);
1625 1539
1626 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1540 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1627 XFree (needed_rect); 1541 XFree (needed_rect);
1628 1542
1629 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1543 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1544 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1631 1545
1632 XSetICValues (Input_Context, 1546 XSetICValues (Input_Context,
1633 XNPreeditAttributes, preedit_attr, 1547 XNPreeditAttributes, preedit_attr,
1634 XNStatusAttributes, status_attr, NULL); 1548 XNStatusAttributes, status_attr,
1549 NULL);
1635 1550
1551 XFree (status_attr);
1552 }
1553
1636 XFree (preedit_attr); 1554 XFree (preedit_attr);
1637 XFree (status_attr);
1638} 1555}
1639#endif /* USE_XIM */ 1556#endif /* USE_XIM */
1557
1558void
1559rxvt_term::get_window_origin (int &x, int &y)
1560{
1561 Window cr;
1562 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1563/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1564}
1565
1566Pixmap
1567rxvt_term::get_pixmap_property (int prop_id)
1568{
1569 if (prop_id > 0 && prop_id < NUM_XA)
1570 if (xa[prop_id])
1571 {
1572 int aformat;
1573 unsigned long nitems, bytes_after;
1574 Atom atype;
1575 unsigned char *prop = NULL;
1576 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1577 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1578 &nitems, &bytes_after, &prop);
1579 if (result == Success && prop && atype == XA_PIXMAP)
1580 return *(Pixmap *)prop;
1581 }
1582
1583 return None;
1584}
1585
1586#ifdef HAVE_BG_PIXMAP
1587# if TRACE_PIXMAPS
1588# undef update_background
1589void
1590rxvt_term::trace_update_background (const char *file, int line)
1591{
1592 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1593 update_background ();
1594}
1595# endif
1596
1597void
1598rxvt_term::update_background ()
1599{
1600 if (update_background_ev.is_active ())
1601 return;
1602
1603 bgPixmap.invalidate ();
1604
1605 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1606
1607 if (to_wait <= 0.)
1608 bgPixmap.render ();
1609 else
1610 update_background_ev.start (to_wait);
1611}
1612
1613void
1614rxvt_term::update_background_cb (ev::timer &w, int revents)
1615{
1616 make_current ();
1617
1618 update_background_ev.stop ();
1619 bgPixmap.render ();
1620 refresh_check ();
1621}
1622
1623#endif /* HAVE_BG_PIXMAP */
1640 1624
1641/*----------------------- end-of-file (C source) -----------------------*/ 1625/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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