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.191 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.315 by root, Wed Nov 5 12:29:26 2008 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.
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 43#include <termios.h>
44
45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE
47# include <X11/Xlocale.h>
48#else
49# ifdef HAVE_SETLOCALE
50# include <clocale>
51# endif
49#endif 52#endif
50 53
51vector<rxvt_term *> rxvt_term::termlist; 54vector<rxvt_term *> rxvt_term::termlist;
52 55
53// used to tell global functions which terminal instance is "active" 56// used to tell global functions which terminal instance is "active"
… …
56static char curlocale[128], savelocale[128]; 59static char curlocale[128], savelocale[128];
57 60
58bool 61bool
59rxvt_set_locale (const char *locale) NOTHROW 62rxvt_set_locale (const char *locale) NOTHROW
60{ 63{
64 int size = strlen (locale) + 1;
65
66 if (size > sizeof (curlocale))
67 rxvt_fatal ("locale string too long, aborting.\n");
68
61 if (!locale || !strncmp (locale, curlocale, 128)) 69 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 70 return false;
63 71
64 strncpy (curlocale, locale, 128); 72 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 73 setlocale (LC_CTYPE, curlocale);
66 return true; 74 return true;
67} 75}
68 76
69void 77void
… …
83class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
84 92
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 94{
87 compose_char *cc; 95 compose_char *cc;
88 96
89 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 99 cc = (*this)[c1];
92 while (cc) 100 while (cc)
93 { 101 {
… …
142 150
143} 151}
144#endif 152#endif
145 153
146rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
147 : 155{
148#if TRANSPARENT 156#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 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 158#endif
154#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
156#endif 161#endif
157#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
159#endif 164#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
162#endif 167#endif
163#ifdef SELECTION_SCROLLING 168#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
165#endif 170#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif
177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
178#ifdef USE_XIM
179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
168#endif 180#endif
169#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 183#endif
172#ifdef USE_XIM 184#ifndef NO_BELL
173 im_ev (this, &rxvt_term::im_cb), 185 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
174#endif 186#endif
175 termwin_ev (this, &rxvt_term::x_cb), 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
176 vt_ev (this, &rxvt_term::x_cb), 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
177 child_ev (this, &rxvt_term::child_cb), 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
178 check_ev (this, &rxvt_term::check_cb), 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
179 flush_ev (this, &rxvt_term::flush_cb), 191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
180 destroy_ev (this, &rxvt_term::destroy_cb), 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
181 pty_ev (this, &rxvt_term::pty_cb), 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
182 incr_ev (this, &rxvt_term::incr_cb) 194
183{
184 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
185 196
186 termlist.push_back (this); 197 termlist.push_back (this);
187 198
188#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
… …
190#endif 201#endif
191} 202}
192 203
193// clean up the most important stuff, do *not* call x or free mem etc. 204// clean up the most important stuff, do *not* call x or free mem etc.
194// for use before an emergency exit 205// for use before an emergency exit
206void
195void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
196{ 208{
197 if (cmd_pid) 209 if (cmd_pid)
198 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
199 211
212 pty_ev.stop ();
200 delete pty; pty = 0; 213 delete pty; pty = 0;
201} 214}
202 215
203rxvt_term::~rxvt_term () 216rxvt_term::~rxvt_term ()
204{ 217{
… …
211 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
212 delete fontset[i]; 225 delete fontset[i];
213#endif 226#endif
214 delete fontset[0]; 227 delete fontset[0];
215 228
229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy ();
231#endif
232#ifdef HAVE_AFTERIMAGE
233 if (asv)
234 destroy_asvisual (asv, 0);
235 if (asimman)
236 destroy_image_manager (asimman, 0);
237#endif
238
216 if (display) 239 if (display)
217 { 240 {
218 dDisp;
219
220 selection_clear (); 241 selection_clear ();
221 242
222#ifdef USE_XIM 243#ifdef USE_XIM
223 im_destroy (); 244 im_destroy ();
224#endif 245#endif
225#ifdef XTERM_SCROLLBAR 246 scrollBar.destroy ();
226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
227 if (ShadowGC) XFreeGC (disp, ShadowGC);
228#endif
229#ifdef PLAIN_SCROLLBAR
230 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
231#endif
232#ifdef NEXT_SCROLLBAR
233 if (blackGC) XFreeGC (disp, blackGC);
234 if (whiteGC) XFreeGC (disp, whiteGC);
235 if (grayGC) XFreeGC (disp, grayGC);
236 if (darkGC) XFreeGC (disp, darkGC);
237 if (stippleGC) XFreeGC (disp, stippleGC);
238 if (dimple) XFreePixmap (disp, dimple);
239 if (upArrow) XFreePixmap (disp, upArrow);
240 if (downArrow) XFreePixmap (disp, downArrow);
241 if (upArrowHi) XFreePixmap (disp, upArrowHi);
242 if (downArrowHi) XFreePixmap (disp, downArrowHi);
243#endif
244#ifdef RXVT_SCROLLBAR
245 if (topShadowGC) XFreeGC (disp, topShadowGC);
246 if (botShadowGC) XFreeGC (disp, botShadowGC);
247 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
248#endif
249 if (gc) XFreeGC (disp, gc); 247 if (gc) XFreeGC (dpy, gc);
250 248
251 delete drawable; 249 delete drawable;
252 // destroy all windows 250 // destroy all windows
253 if (parent[0]) 251 if (parent[0])
254 XDestroyWindow (disp, parent[0]); 252 XDestroyWindow (dpy, parent[0]);
255 }
256 253
257 // TODO: free pixcolours, colours should become part of rxvt_display 254 for (int i = 0; i < TOTAL_COLORS; i++)
258 delete pix_colors_focused; 255 if (ISSET_PIXCOLOR (i))
256 {
257 pix_colors_focused [i].free (this);
259#if OFF_FOCUS_FADING 258#if OFF_FOCUS_FADING
260 delete pix_colors_unfocused; 259 pix_colors_unfocused [i].free (this);
261#endif 260#endif
261 }
262 262
263 clear ();
264
265 display->flush (); /* ideally .put should do this */
263 displays.put (display); 266 displays.put (display);
267 }
264 268
265 scr_release (); 269 scr_release ();
266 270
267 /* clear all resources */ 271 /* clear all resources */
268 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
269 free (allocated [i]); 273 free (allocated [i]);
270 274
271 free (selection.text); 275 free (selection.text);
272 // TODO: manage env vars in child only(!) 276 // TODO: manage env vars in child only(!)
273 free (env_windowid);
274 free (env_display); 277 free (env_display);
275 free (env_term); 278 free (env_term);
276 free (env_colorfgbg);
277 free (locale); 279 free (locale);
278 free (v_buffer); 280 free (v_buffer);
279 free (incr_buf); 281 free (incr_buf);
280 282
281 delete envv; 283 delete envv;
282 delete argv; 284 delete argv;
283 285
284#ifdef KEYSYM_RESOURCE 286#ifdef KEYSYM_RESOURCE
285 delete keyboard; 287 delete keyboard;
286#endif 288#endif
289#ifndef NO_RESOURCES
290 XrmDestroyDatabase (option_db);
291#endif
287} 292}
288 293
289// child has exited, usually destroys 294// child has exited, usually destroys
290void 295void
291rxvt_term::child_cb (child_watcher &w, int status) 296rxvt_term::child_cb (ev::child &w, int status)
292{ 297{
293 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 298 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
294 299
295 cmd_pid = 0; 300 cmd_pid = 0;
296 301
297 if (!OPTION (Opt_hold)) 302 if (!option (Opt_hold))
298 destroy (); 303 destroy ();
299} 304}
300 305
301void 306void
302rxvt_term::destroy () 307rxvt_term::destroy ()
303{ 308{
304 if (destroy_ev.active) 309 if (destroy_ev.is_active ())
305 return; 310 return;
306 311
307 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 312 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
308 return;
309 313
310#if ENABLE_OVERLAY 314#if ENABLE_OVERLAY
311 scr_overlay_off (); 315 scr_overlay_off ();
312#endif 316#endif
313 317
314 if (display) 318 if (display)
315 { 319 {
316#if USE_XIM 320#if USE_XIM
317 im_ev.stop (display); 321 im_ev.stop (display);
318#endif 322#endif
319#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
321#endif 324#if ENABLE_TRANSPARENCY || ENABLE_PERL
322#if TRANSPARENT
323 rootwin_ev.stop (display); 325 rootwin_ev.stop (display);
324#endif 326#endif
325 incr_ev.stop (); 327 incr_ev.stop ();
326 termwin_ev.stop (display); 328 termwin_ev.stop (display);
327 vt_ev.stop (display); 329 vt_ev.stop (display);
328 } 330 }
329 331
330 check_ev.stop (); 332 flush_ev.stop ();
331 pty_ev.stop (); 333 pty_ev.stop ();
332#ifdef CURSOR_BLINK 334#ifdef CURSOR_BLINK
333 cursor_blink_ev.stop (); 335 cursor_blink_ev.stop ();
334#endif 336#endif
335#ifdef TEXT_BLINK 337#ifdef TEXT_BLINK
… …
343#endif 345#endif
344#ifdef POINTER_BLANK 346#ifdef POINTER_BLANK
345 pointer_ev.stop (); 347 pointer_ev.stop ();
346#endif 348#endif
347 349
348 destroy_ev.start (0); 350 destroy_ev.start ();
349} 351}
350 352
351void 353void
352rxvt_term::destroy_cb (time_watcher &w) 354rxvt_term::destroy_cb (ev::idle &w, int revents)
353{ 355{
354 make_current (); 356 make_current ();
355 357
356 delete this; 358 delete this;
357} 359}
… …
368{ 370{
369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 371 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370 (*t)->emergency_cleanup (); 372 (*t)->emergency_cleanup ();
371} 373}
372 374
373#if ENABLE_FRILLS 375#if !ENABLE_MINIMAL
374static void 376static void
375print_x_error (Display *dpy, XErrorEvent *event) 377print_x_error (Display *dpy, XErrorEvent *event)
376{ 378{
377 char buffer[BUFSIZ]; 379 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 380 char mesg[BUFSIZ];
… …
411 else 413 else
412 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413 mesg, BUFSIZ); 415 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415 } 417 }
416 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417 mesg, BUFSIZ); 419 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419} 421}
420#endif 422#endif
421 423
… …
426 GET_R->allowedxerror = event->error_code; 428 GET_R->allowedxerror = event->error_code;
427 else 429 else
428 { 430 {
429 // GET_R is most likely not the terminal which caused the error, 431 // GET_R is most likely not the terminal which caused the error,
430 // so just output the error and continue 432 // so just output the error and continue
431#if ENABLE_FRILLS 433#if ENABLE_MINIMAL
434 old_xerror_handler (display, event);
435#else
432 print_x_error (display, event); 436 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 437#endif
436 } 438 }
437 439
438 return 0; 440 return 0;
439} 441}
… …
445 DisplayString (display)); 447 DisplayString (display));
446 rxvt_emergency_cleanup (); 448 rxvt_emergency_cleanup ();
447 _exit (EXIT_FAILURE); 449 _exit (EXIT_FAILURE);
448} 450}
449 451
450/*----------------------------------------------------------------------*/
451bool
452rxvt_term::init (int argc, const char *const *argv)
453{
454 SET_R (this);
455 set_locale ("");
456 set_environ (envv); // few things in X do not call setlocale :(
457
458 if (!init_vars ())
459 return false;
460
461 init_secondary ();
462
463 const char **cmd_argv = init_resources (argc, argv);
464
465#ifdef KEYSYM_RESOURCE
466 keyboard->register_done ();
467#endif
468
469#if ENABLE_PERL
470 if (!rs[Rs_perl_ext_1])
471 rs[Rs_perl_ext_1] = "default";
472
473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
476 {
477 rxvt_perl.init (this);
478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
479 }
480#endif
481
482#ifdef HAVE_SCROLLBARS
483 if (OPTION (Opt_scrollBar))
484 scrollBar.setIdle (); /* set existence for size calculations */
485#endif
486
487 pty = rxvt_new_ptytty ();
488
489 create_windows (argc, argv);
490
491 dDisp;
492
493 init_xlocale ();
494
495 scr_reset (); // initialize screen
496
497#if 0
498 XSynchronize (disp, True);
499#endif
500
501#ifdef HAVE_SCROLLBARS
502 if (OPTION (Opt_scrollBar))
503 resize_scrollbar (); /* create and map scrollbar */
504#endif
505#ifdef TRANSPARENT
506 if (OPTION (Opt_transparent))
507 {
508 XSelectInput (disp, display->root, PropertyChangeMask);
509 check_our_parents ();
510 rootwin_ev.start (display, display->root);
511 }
512#endif
513
514 set_colorfgbg ();
515
516 init_command (cmd_argv);
517
518 free (cmd_argv);
519
520 if (pty->pty >= 0)
521 pty_ev.start (pty->pty, EVENT_READ);
522
523 check_ev.start ();
524
525 HOOK_INVOKE ((this, HOOK_START, DT_END));
526
527 XMapWindow (disp, vt);
528 XMapWindow (disp, parent[0]);
529
530 return true;
531}
532
533static struct sig_handlers 452static struct sig_handlers
534{ 453{
535 sig_watcher sw_term, sw_int; 454 ev::sig sw_term, sw_int;
536 455
537 /* 456 /*
538 * Catch a fatal signal and tidy up before quitting 457 * Catch a fatal signal and tidy up before quitting
539 */ 458 */
540 void 459 void sig_term (ev::sig &w, int revents);
541 sig_term (sig_watcher &w) 460
461 sig_handlers ()
542 { 462 {
543#ifdef DEBUG_CMD 463 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
544 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
545#endif
546 rxvt_emergency_cleanup ();
547 signal (w.signum, SIG_DFL);
548 kill (getpid (), w.signum);
549 }
550
551 sig_handlers ()
552 : sw_term (this, &sig_handlers::sig_term),
553 sw_int (this, &sig_handlers::sig_term) 464 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
554 {
555 } 465 }
556} sig_handlers; 466} sig_handlers;
557 467
468void
469sig_handlers::sig_term (ev::sig &w, int revents)
470{
471 rxvt_emergency_cleanup ();
472 w.stop ();
473 kill (getpid (), w.signum);
474}
475
558char **rxvt_environ; // startup environment 476char **rxvt_environ; // startup environment
559 477
560void 478void
561rxvt_init () 479rxvt_init ()
562{ 480{
563 uid_t uid = getuid (); 481 ptytty::init ();
564 gid_t gid = getgid ();
565
566 // before doing anything else, check for setuid/setgid operation,
567 // start the helper process and drop privileges
568 if (uid != geteuid ()
569 || gid != getegid ())
570 {
571#if PTYTTY_HELPER
572 rxvt_ptytty_server ();
573#else
574 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
575#endif
576 482
577 // drop privileges 483 if (!ev_default_loop (0))
578#if HAVE_SETRESUID 484 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
579 setresgid (gid, gid, gid);
580 setresuid (uid, uid, uid);
581#elif HAVE_SETREUID
582 setregid (gid, gid);
583 setreuid (uid, uid);
584#elif HAVE_SETUID
585 setgid (gid);
586 setuid (uid);
587#endif
588
589 if (uid != geteuid ()
590 || gid != getegid ())
591 rxvt_fatal ("unable to drop privileges, aborting.\n");
592 }
593 485
594 rxvt_environ = environ; 486 rxvt_environ = environ;
595 487
596 signal (SIGHUP, SIG_IGN); 488 signal (SIGHUP, SIG_IGN);
597 signal (SIGPIPE, SIG_IGN); 489 signal (SIGPIPE, SIG_IGN);
598 490
599 sig_handlers.sw_term.start (SIGTERM); 491 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
600 sig_handlers.sw_int.start (SIGINT); 492 sig_handlers.sw_int.start (SIGINT); ev_unref ();
601 493
602 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 494 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
603 /* signal (SIGURG, SIG_DFL); */ 495 /* signal (SIGURG, SIG_DFL); */
604 496
605 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 497 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
607 XSetIOErrorHandler (rxvt_xioerror_handler); 499 XSetIOErrorHandler (rxvt_xioerror_handler);
608 500
609 XrmInitialize (); 501 XrmInitialize ();
610} 502}
611 503
612/* ------------------------------------------------------------------------- *
613 * MEMORY ALLOCATION WRAPPERS *
614 * ------------------------------------------------------------------------- */
615void *
616rxvt_malloc (size_t size)
617{
618 void *p = malloc (size);
619
620 if (!p)
621 rxvt_fatal ("memory allocation failure. aborting.\n");
622
623 return p;
624}
625
626void *
627rxvt_calloc (size_t number, size_t size)
628{
629 void *p = calloc (number, size);
630
631 if (!p)
632 rxvt_fatal ("memory allocation failure. aborting.\n");
633
634 return p;
635}
636
637void *
638rxvt_realloc (void *ptr, size_t size)
639{
640 void *p = realloc (ptr, size);
641
642 if (!p)
643 rxvt_fatal ("memory allocation failure. aborting.\n");
644
645 return p;
646}
647
648/*----------------------------------------------------------------------*/ 504/*----------------------------------------------------------------------*/
649/* 505/*
650 * window size/position calculcations for XSizeHint and other storage. 506 * window size/position calculations for XSizeHint and other storage.
651 * if width/height are non-zero then override calculated width/height 507 * if width/height are non-zero then override calculated width/height
652 */ 508 */
653void 509void
654rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 510rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
655{ 511{
656 short recalc_x, recalc_y; 512 short recalc_x, recalc_y;
657 int x, y, sb_w, flags; 513 int x, y, flags;
658 unsigned int w, h; 514 unsigned int w, h;
659 unsigned int max_width, max_height; 515 unsigned int max_width, max_height;
660 dDisp;
661
662 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
663 ncol, nrow, szHint.width, szHint.height));
664 516
665 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 517 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
666 szHint.win_gravity = NorthWestGravity; 518 szHint.win_gravity = NorthWestGravity;
667 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 519 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
668 520
… …
676 if (rs[Rs_geometry]) 528 if (rs[Rs_geometry])
677 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 529 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
678 530
679 if (flags & WidthValue) 531 if (flags & WidthValue)
680 { 532 {
533 if (!w)
534 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
535
681 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 536 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
682 szHint.flags |= USSize; 537 szHint.flags |= USSize;
683 } 538 }
684 539
685 if (flags & HeightValue) 540 if (flags & HeightValue)
686 { 541 {
542 if (!h)
543 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
544
687 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 545 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
688 szHint.flags |= USSize; 546 szHint.flags |= USSize;
689 } 547 }
690 548
691 if (flags & XValue) 549 if (flags & XValue)
692 { 550 {
… …
723 max_width = MAX_COLS * fwidth; 581 max_width = MAX_COLS * fwidth;
724 max_height = MAX_ROWS * fheight; 582 max_height = MAX_ROWS * fheight;
725 583
726 szHint.base_width = szHint.base_height = 2 * int_bwidth; 584 szHint.base_width = szHint.base_height = 2 * int_bwidth;
727 585
728 sb_w = 0;
729 window_vt_x = window_vt_y = int_bwidth; 586 window_vt_x = window_vt_y = int_bwidth;
730 587
731 if (scrollBar.state) 588 if (scrollBar.state)
732 { 589 {
733 sb_w = scrollbar_TotalWidth (); 590 int sb_w = scrollBar.total_width ();
734 szHint.base_width += sb_w; 591 szHint.base_width += sb_w;
592
735 if (!OPTION (Opt_scrollBar_right)) 593 if (!option (Opt_scrollBar_right))
736 window_vt_x += sb_w; 594 window_vt_x += sb_w;
737 } 595 }
738 596
739 szHint.width_inc = fwidth; 597 szHint.width_inc = fwidth;
740 szHint.height_inc = fheight; 598 szHint.height_inc = fheight;
741 szHint.min_width = szHint.base_width + szHint.width_inc; 599 szHint.min_width = szHint.base_width + szHint.width_inc;
742 szHint.min_height = szHint.base_height + szHint.height_inc; 600 szHint.min_height = szHint.base_height + szHint.height_inc;
743 601
744 if (newwidth && newwidth - szHint.base_width < max_width) 602 if (newwidth && newwidth - szHint.base_width < max_width)
745 { 603 {
746 szHint.width = newwidth; 604 szHint.width = newwidth;
… …
761 { 619 {
762 min_it (height, max_height); 620 min_it (height, max_height);
763 szHint.height = szHint.base_height + height; 621 szHint.height = szHint.base_height + height;
764 } 622 }
765 623
766 if (scrollBar.state && OPTION (Opt_scrollBar_right))
767 window_sb_x = szHint.width - sb_w;
768
769 if (recalc_x) 624 if (recalc_x)
770 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 625 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
626
771 if (recalc_y) 627 if (recalc_y)
772 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
773 629
774 ncol = width / fwidth; 630 ncol = width / fwidth;
775 nrow = height / fheight; 631 nrow = height / fheight;
776 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
777 ncol, nrow, szHint.width,
778 szHint.height));
779 return;
780} 632}
781 633
782/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
783/* 635/*
784 * Tell the teletype handler what size the window is. 636 * Tell the teletype handler what size the window is.
… …
797 ws.ws_xpixel = width; 649 ws.ws_xpixel = width;
798 ws.ws_ypixel = height; 650 ws.ws_ypixel = height;
799 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 651 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
800 652
801#if 0 653#if 0
802 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 654 // TIOCSWINSZ is supposed to do this automatically and correctly
803 if (cmd_pid) /* force through to the command */ 655 if (cmd_pid) /* force through to the command */
804 kill (-cmd_pid, SIGWINCH); 656 kill (-cmd_pid, SIGWINCH);
805#endif 657#endif
806} 658}
807 659
… …
836 delete fontset[0]; 688 delete fontset[0];
837 fontset[0] = fs; 689 fontset[0] = fs;
838 690
839 prop = (*fs)[1]->properties (); 691 prop = (*fs)[1]->properties ();
840 prop.height += lineSpace; 692 prop.height += lineSpace;
693
841 fs->set_prop (prop); 694 fs->set_prop (prop, false);
842 695
843 fwidth = prop.width; 696 fwidth = prop.width;
844 fheight = prop.height; 697 fheight = prop.height;
845 fbase = prop.ascent; 698 fbase = prop.ascent;
846 699
… …
855 { 708 {
856 fontset[style] = fs = new rxvt_fontset (this); 709 fontset[style] = fs = new rxvt_fontset (this);
857 rxvt_fontprop prop2 = prop; 710 rxvt_fontprop prop2 = prop;
858 711
859 if (res) 712 if (res)
860 prop2.weight = prop2.slant = rxvt_fontprop::unset; 713 {
714 fs->populate (res);
715 fs->set_prop (prop2, false);
716 }
861 else 717 else
862 { 718 {
863 res = fontset[0]->fontdesc; 719 fs->populate (fontset[0]->fontdesc);
864 720
865 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 721 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
866 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 722 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
723
724 fs->set_prop (prop2, true);
867 } 725 }
868 726
869 fs->populate (res);
870 fs->set_prop (prop2);
871 } 727 }
872#else 728#else
873 fontset[style] = fontset[0]; 729 fontset[style] = fontset[0];
874#endif 730#endif
875 } 731 }
… …
877 if (parent[0]) 733 if (parent[0])
878 { 734 {
879 resize_all_windows (0, 0, 0); 735 resize_all_windows (0, 0, 0);
880 scr_remap_chars (); 736 scr_remap_chars ();
881 scr_touch (true); 737 scr_touch (true);
882 } 738 }
883 739
884 return true; 740 return true;
885} 741}
886 742
743void
887void rxvt_term::set_string_property (Atom prop, const char *str, int len) 744rxvt_term::set_string_property (Atom prop, const char *str, int len)
888{ 745{
889 XChangeProperty (display->display, parent[0], 746 XChangeProperty (dpy, parent[0],
890 prop, XA_STRING, 8, PropModeReplace, 747 prop, XA_STRING, 8, PropModeReplace,
891 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 748 (const unsigned char *)str, len >= 0 ? len : strlen (str));
892} 749}
893 750
751void
894void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 752rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
895{ 753{
896 wchar_t *ws = rxvt_mbstowcs (str, len); 754 wchar_t *ws = rxvt_mbstowcs (str, len);
897 char *s = rxvt_wcstoutf8 (ws); 755 char *s = rxvt_wcstoutf8 (ws);
898 756
899 XChangeProperty (display->display, parent[0], 757 XChangeProperty (dpy, parent[0],
900 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 758 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
901 (const unsigned char *)s, strlen (s)); 759 (const unsigned char *)s, strlen (s));
902 760
903 free (s); 761 free (s);
904 free (ws); 762 free (ws);
… …
923#if ENABLE_EWMH 781#if ENABLE_EWMH
924 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 782 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
925#endif 783#endif
926} 784}
927 785
786void
787rxvt_term::set_window_color (int idx, const char *color)
788{
928#ifdef XTERM_COLOR_CHANGE 789#ifdef XTERM_COLOR_CHANGE
929void
930rxvt_term::set_window_color (int idx, const char *color)
931{
932 rxvt_color xcol; 790 rxvt_color xcol;
933 int i;
934 791
935 if (color == NULL || *color == '\0') 792 if (color == NULL || *color == '\0')
936 return; 793 return;
937 794
795 color = strdup (color);
796 allocated.push_back ((void *)color);
797 rs[Rs_color + idx] = color;
798
938 /* handle color aliases */ 799 /* handle color aliases */
939 if (isdigit (*color)) 800 if (isdigit (*color))
940 { 801 {
941 i = atoi (color); 802 int i = atoi (color);
942 803
943 if (i >= 8 && i <= 15) 804 if (i >= 8 && i <= 15)
805 {
944 { /* bright colors */ 806 /* bright colors */
945 i -= 8;
946 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 807 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
947 SET_PIXCOLOR (idx);
948 goto done; 808 goto done;
949 } 809 }
950 810
951 if (i >= 0 && i <= 7) 811 if (i >= 0 && i <= 7)
812 {
952 { /* normal colors */ 813 /* normal colors */
953 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 814 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
954 SET_PIXCOLOR (idx);
955 goto done; 815 goto done;
956 } 816 }
957 } 817 }
958 818
959 if (!rXParseAllocColor (&xcol, color)) 819 set_color (xcol, color);
960 return;
961
962 /* XStoreColor (display->display, display->cmap, XColor*); */
963 820
964 /* 821 /*
965 * FIXME: should free colors here, but no idea how to do it so instead, 822 * FIXME: should free colors here, but no idea how to do it so instead,
966 * so just keep gobbling up the colormap 823 * so just keep gobbling up the colormap
967 */ 824 */
968# if 0
969 for (i = Color_Black; i <= Color_White; i++)
970 if (pix_colors[idx] == pix_colors[i])
971 break;
972 if (i > Color_White)
973 {
974 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
975 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
976 DisplayPlanes (display->display, display->screen));
977 }
978# endif
979 825
980 pix_colors_focused[idx] = xcol; 826 pix_colors_focused[idx] = xcol;
981 SET_PIXCOLOR (idx);
982 827
983 /* XSetWindowAttributes attr; */
984 /* Cursor cursor; */
985done: 828done:
986
987#if OFF_FOCUS_FADING
988 if (rs[Rs_fade])
989 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
990#endif
991
992 /*TODO: handle Color_BD, scrollbar background, etc. */ 829 /*TODO: handle Color_BD, scrollbar background, etc. */
993 830
831 update_fade_color (idx);
994 recolour_cursor (); 832 recolour_cursor ();
995 scr_recolour (); 833 scr_recolour ();
834#endif /* XTERM_COLOR_CHANGE */
996} 835}
997
998#else
999# define set_window_color (idx,color) ((void)0)
1000#endif /* XTERM_COLOR_CHANGE */
1001 836
1002void 837void
1003rxvt_term::recolour_cursor () 838rxvt_term::recolour_cursor ()
1004{ 839{
1005 XColor xcol[2]; 840 XColor fg, bg;
1006 841
1007 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 842 (ISSET_PIXCOLOR (Color_pointer_fg)
1008 ? pix_colors_focused[Color_pointer_fg] 843 ? pix_colors_focused[Color_pointer_fg]
1009 : pix_colors_focused[Color_fg]; 844 : pix_colors_focused[Color_fg]).get (fg);
845
1010 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 846 (ISSET_PIXCOLOR (Color_pointer_bg)
1011 ? pix_colors_focused[Color_pointer_bg] 847 ? pix_colors_focused[Color_pointer_bg]
1012 : pix_colors_focused[Color_bg]; 848 : pix_colors_focused[Color_bg]).get (bg);
1013 849
1014 XQueryColors (display->display, display->cmap, xcol, 2); 850 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1015 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1016} 851}
1017 852
1018/*----------------------------------------------------------------------*/ 853/*----------------------------------------------------------------------*/
1019/* 854/*
1020 * find if fg/bg matches any of the normal (low-intensity) colors 855 * find if fg/bg matches any of the normal (low-intensity) colors
1021 */ 856 */
1022void 857void
1023rxvt_term::set_colorfgbg () 858rxvt_term::set_colorfgbg ()
1024{ 859{
1025 unsigned int i; 860 unsigned int i;
1026 const char *xpmb = "\0"; 861 const char *xpmb = "";
1027 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 862 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1028 863
1029 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1030 strcpy (fstr, "default"); 864 strcpy (fstr, "default");
1031 strcpy (bstr, "default"); 865 strcpy (bstr, "default");
1032 for (i = Color_Black; i <= Color_White; i++) 866 for (i = Color_Black; i <= Color_White; i++)
1033 if (pix_colors[Color_fg] == pix_colors[i]) 867 if (pix_colors[Color_fg] == pix_colors[i])
1034 { 868 {
… …
1038 872
1039 for (i = Color_Black; i <= Color_White; i++) 873 for (i = Color_Black; i <= Color_White; i++)
1040 if (pix_colors[Color_bg] == pix_colors[i]) 874 if (pix_colors[Color_bg] == pix_colors[i])
1041 { 875 {
1042 sprintf (bstr, "%d", (i - Color_Black)); 876 sprintf (bstr, "%d", (i - Color_Black));
1043#ifdef XPM_BACKGROUND 877#ifdef BG_IMAGE_FROM_FILE
1044 xpmb = "default;"; 878 xpmb = "default;";
1045#endif 879#endif
1046 break; 880 break;
1047 } 881 }
1048 882
1049 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 883 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1050} 884}
1051 885
1052/*----------------------------------------------------------------------*/ 886/*----------------------------------------------------------------------*/
1053 887
1054int 888bool
1055rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 889rxvt_term::set_color (rxvt_color &color, const char *name)
1056{ 890{
1057 if (!screen_in_out->set (display, colour)) 891 if (color.set (this, name))
1058 {
1059 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1060 return false;
1061 }
1062
1063 return true; 892 return true;
893
894 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
895 return false;
896}
897
898void
899rxvt_term::alias_color (int dst, int src)
900{
901 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1064} 902}
1065 903
1066/* -------------------------------------------------------------------- * 904/* -------------------------------------------------------------------- *
1067 * - WINDOW RESIZING - * 905 * - WINDOW RESIZING - *
1068 * -------------------------------------------------------------------- */ 906 * -------------------------------------------------------------------- */
1069void 907void
1070rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 908rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1071{ 909{
1072 int fix_screen; 910 int fix_screen;
1073 int old_width = szHint.width, old_height = szHint.height; 911 int old_width = szHint.width;
1074 dDisp; 912 int old_height = szHint.height;
1075 913
1076 window_calc (newwidth, newheight); 914 window_calc (newwidth, newheight);
915
916 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
917
918 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
919 if (set_hint)
920 {
921 szHint.flags &= ~(PBaseSize | PResizeInc);
1077 XSetWMNormalHints (disp, parent[0], &szHint); 922 XSetWMNormalHints (dpy, parent[0], &szHint);
923 szHint.flags |= PBaseSize | PResizeInc;
924 }
1078 925
1079 if (!ignoreparent) 926 if (!ignoreparent)
1080 { 927 {
1081#ifdef SMART_RESIZE 928#ifdef SMART_RESIZE
1082 /* 929 /*
… …
1086 int x, y, x1, y1; 933 int x, y, x1, y1;
1087 int dx, dy; 934 int dx, dy;
1088 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 935 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1089 Window unused_cr; 936 Window unused_cr;
1090 937
1091 XTranslateCoordinates (disp, parent[0], display->root, 938 XTranslateCoordinates (dpy, parent[0], display->root,
1092 0, 0, &x, &y, &unused_cr); 939 0, 0, &x, &y, &unused_cr);
1093 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 940 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1094 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 941 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1095 /* 942 /*
1096 * if display->root isn't the parent window, a WM will probably have offset 943 * if display->root isn't the parent window, a WM will probably have offset
1097 * our position for handles and decorations. Counter it 944 * our position for handles and decorations. Counter it
1098 */ 945 */
… …
1100 { 947 {
1101 x -= x1; 948 x -= x1;
1102 y -= y1; 949 y -= y1;
1103 } 950 }
1104 951
1105 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 952 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1106 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 953 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1107 dx = old_width - szHint.width; 954 dx = old_width - szHint.width;
1108 dy = old_height - szHint.height; 955 dy = old_height - szHint.height;
1109 956
1110 /* Check position of the center of the window */ 957 /* Check position of the center of the window */
1111 if (x < x1) /* left half */ 958 if (x < x1) /* left half */
1112 dx = 0; 959 dx = 0;
… …
1115 if (y < y1) /* top half */ 962 if (y < y1) /* top half */
1116 dy = 0; 963 dy = 0;
1117 else if (y == y1) /* exact center */ 964 else if (y == y1) /* exact center */
1118 dy /= 2; 965 dy /= 2;
1119 966
1120 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 967 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1121 szHint.width, szHint.height); 968 szHint.width, szHint.height);
1122#else 969#else
1123 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 970 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1124#endif 971#endif
1125 } 972 }
973
974 if (set_hint)
975 XSetWMNormalHints (dpy, parent[0], &szHint);
1126 976
1127 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 977 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1128 978
1129 if (fix_screen || newwidth != old_width || newheight != old_height) 979 if (fix_screen || newwidth != old_width || newheight != old_height)
1130 { 980 {
1131 if (scrollBar.state) 981 if (scrollBar.state)
1132 { 982 scrollBar.resize ();
1133 XMoveResizeWindow (disp, scrollBar.win,
1134 window_sb_x, 0,
1135 scrollbar_TotalWidth (), szHint.height);
1136 resize_scrollbar ();
1137 }
1138 983
1139 XMoveResizeWindow (disp, vt, 984 XMoveResizeWindow (dpy, vt,
1140 window_vt_x, window_vt_y, 985 window_vt_x, window_vt_y,
1141 width, height); 986 width, height);
1142 987
1143 scr_clear (); 988#ifdef HAVE_BG_PIXMAP
1144#ifdef XPM_BACKGROUND 989 if (bgPixmap.window_size_sensitive ())
1145 resize_pixmap (); 990 update_background ();
1146#endif 991#endif
1147 } 992 }
1148 993
1149 if (fix_screen || old_height == 0) 994 if (fix_screen || old_height == 0)
1150 {
1151 int curr_screen = -1;
1152 int old_ncol = prev_ncol;
1153
1154 /* scr_reset only works on the primary screen */
1155 if (old_height) /* this is not the first time through */
1156 {
1157 unsigned int ocol = ncol;
1158 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1159 curr_screen = scr_change_screen (PRIMARY);
1160 ncol = ocol;
1161 }
1162
1163 scr_reset (); 995 scr_reset ();
1164 996
1165 if (curr_screen >= 0) /* this is not the first time through */ 997 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1166 { 998 //scr_touch (false);
1167 scr_change_screen (curr_screen);
1168 selection_check (old_ncol != ncol ? 4 : 0);
1169 }
1170 }
1171 999
1172 old_width = szHint.width; 1000#ifdef HAVE_BG_PIXMAP
1173 old_height = szHint.height; 1001// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1174 1002// if (bgPixmap.pixmap)
1175#ifdef XPM_BACKGROUND
1176 if (pixmap)
1177 scr_touch (false); 1003// scr_touch (false);
1178#endif 1004#endif
1179 1005
1180#ifdef USE_XIM 1006#ifdef USE_XIM
1181 IMSetStatusPosition (); 1007 IMSetPosition ();
1182#endif 1008#endif
1183} 1009}
1184 1010
1185/* 1011/*
1186 * Set the width/height of the vt window in characters. Units are pixels. 1012 * Set the width/height of the vt window in characters. Units are pixels.
… …
1191{ 1017{
1192 XWindowAttributes wattr; 1018 XWindowAttributes wattr;
1193 1019
1194 if (newwidth == 0 || newheight == 0) 1020 if (newwidth == 0 || newheight == 0)
1195 { 1021 {
1196 XGetWindowAttributes (display->display, display->root, &wattr); 1022 XGetWindowAttributes (dpy, display->root, &wattr);
1197 1023
1198 if (newwidth == 0) 1024 if (newwidth == 0)
1199 newwidth = wattr.width - szHint.base_width; 1025 newwidth = wattr.width - szHint.base_width;
1200 if (newheight == 0) 1026 if (newheight == 0)
1201 newheight = wattr.height - szHint.base_height; 1027 newheight = wattr.height - szHint.base_height;
… …
1215#ifdef USE_XIM 1041#ifdef USE_XIM
1216 1042
1217void 1043void
1218rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1044rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1219{ 1045{
1220 fg = pix_colors[Color_fg]; 1046 fg = pix_colors [Color_fg];
1221 bg = pix_colors[Color_bg]; 1047 bg = pix_colors [Color_bg];
1222} 1048}
1223 1049
1224void 1050void
1225rxvt_term::im_set_size (XRectangle &size) 1051rxvt_term::im_set_size (XRectangle &size)
1226{ 1052{
… …
1263 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1089 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1264 1090
1265 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1091 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1266 *p = '\0'; 1092 *p = '\0';
1267 1093
1268 atom = XInternAtom (display->display, server, False); 1094 atom = XInternAtom (dpy, server, False);
1269 win = XGetSelectionOwner (display->display, atom); 1095 win = XGetSelectionOwner (dpy, atom);
1270 1096
1271 if (win != None) 1097 if (win != None)
1272 return True; 1098 return True;
1273 } 1099 }
1274 1100
… …
1281 XPoint nspot; 1107 XPoint nspot;
1282 XVaNestedList preedit_attr; 1108 XVaNestedList preedit_attr;
1283 1109
1284 if (!Input_Context 1110 if (!Input_Context
1285 || !focus 1111 || !focus
1286 || !(input_style & XIMPreeditPosition)) 1112 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1287 return; 1113 return;
1288 1114
1289 im_set_position (nspot); 1115 im_set_position (nspot);
1290 1116
1291 if (nspot.x == spot.x && nspot.y == spot.y) 1117 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1310 input_method = 0; 1136 input_method = 0;
1311 } 1137 }
1312 1138
1313 Input_Context = 0; 1139 Input_Context = 0;
1314} 1140}
1141
1142#ifdef ENABLE_XIM_ONTHESPOT
1143
1144static void
1145xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1146{
1147 ((rxvt_term *)client_data)->make_current ();
1148 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1149}
1150
1151static void
1152xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1153{
1154 ((rxvt_term *)client_data)->make_current ();
1155 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1156}
1157
1158static void
1159xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1160{
1161 rxvt_term *term = (rxvt_term *)client_data;
1162 XIMText *text = call_data->text;
1163
1164 term->make_current ();
1165
1166 if (text)
1167 {
1168 void *str;
1169
1170 if (!text->encoding_is_wchar && text->string.multi_byte)
1171 {
1172 // of course, X makes it ugly again
1173 if (term->rs[Rs_imLocale])
1174 SET_LOCALE (term->rs[Rs_imLocale]);
1175
1176 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1177 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1178
1179 if (term->rs[Rs_imLocale])
1180 SET_LOCALE (term->locale);
1181 }
1182 else
1183 str = (void *)text->string.wide_char;
1184
1185 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1186 DT_INT, call_data->caret,
1187 DT_INT, call_data->chg_first,
1188 DT_INT, call_data->chg_length,
1189 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1190 DT_WCS_LEN, str, str ? (int)text->length : 0,
1191 DT_END));
1192 }
1193 else
1194 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1195 DT_INT, call_data->caret,
1196 DT_INT, call_data->chg_first,
1197 DT_INT, call_data->chg_length,
1198 DT_END));
1199}
1200
1201#if 0
1202static void
1203xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1204{
1205 ((rxvt_term *)client_data)->make_current ();
1206 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1207 DT_INT, call_data->position,
1208 DT_INT, call_data->direction,
1209 DT_INT, call_data->style,
1210 DT_END));
1211}
1212#endif
1213
1214#endif
1315 1215
1316/* 1216/*
1317 * Try to open a XIM with the current modifiers, then see if we can 1217 * Try to open a XIM with the current modifiers, then see if we can
1318 * open a suitable preedit type 1218 * open a suitable preedit type
1319 */ 1219 */
… …
1326 XRectangle rect, status_rect, needed_rect; 1226 XRectangle rect, status_rect, needed_rect;
1327 unsigned long fg, bg; 1227 unsigned long fg, bg;
1328 const char *p; 1228 const char *p;
1329 char **s; 1229 char **s;
1330 XIMStyles *xim_styles; 1230 XIMStyles *xim_styles;
1231#ifdef ENABLE_XIM_ONTHESPOT
1232 XIMCallback xcb[4];
1233#endif
1331 1234
1332 set_environ (envv); 1235 set_environ (envv);
1333 1236
1334 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1237 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1335 return false; 1238 return false;
1336 1239
1337 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1338 input_method = display->get_xim (locale, modifiers); 1240 input_method = display->get_xim (locale, modifiers);
1339 if (input_method == NULL) 1241 if (input_method == NULL)
1340 return false; 1242 return false;
1341 1243
1342 xim = input_method->xim; 1244 xim = input_method->xim;
… …
1362 s = rxvt_splitcommastring (p); 1264 s = rxvt_splitcommastring (p);
1363 1265
1364 for (i = found = 0; !found && s[i]; i++) 1266 for (i = found = 0; !found && s[i]; i++)
1365 { 1267 {
1366 if (!strcmp (s[i], "OverTheSpot")) 1268 if (!strcmp (s[i], "OverTheSpot"))
1367 input_style = (XIMPreeditPosition | XIMStatusNothing); 1269 input_style = XIMPreeditPosition | XIMStatusNothing;
1368 else if (!strcmp (s[i], "OffTheSpot")) 1270 else if (!strcmp (s[i], "OffTheSpot"))
1369 input_style = (XIMPreeditArea | XIMStatusArea); 1271 input_style = XIMPreeditArea | XIMStatusArea;
1370 else if (!strcmp (s[i], "Root")) 1272 else if (!strcmp (s[i], "Root"))
1371 input_style = (XIMPreeditNothing | XIMStatusNothing); 1273 input_style = XIMPreeditNothing | XIMStatusNothing;
1372 else if (!strcmp (s[i], "None")) 1274 else if (!strcmp (s[i], "None"))
1373 input_style = (XIMPreeditNone | XIMStatusNone); 1275 input_style = XIMPreeditNone | XIMStatusNone;
1276#ifdef ENABLE_XIM_ONTHESPOT
1277 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1278 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1279#endif
1280 else
1281 input_style = XIMPreeditNothing | XIMStatusNothing;
1374 1282
1375 for (j = 0; j < xim_styles->count_styles; j++) 1283 for (j = 0; j < xim_styles->count_styles; j++)
1376 if (input_style == xim_styles->supported_styles[j]) 1284 if (input_style == xim_styles->supported_styles[j])
1377 { 1285 {
1378 rxvt_freecommastring (s); 1286 rxvt_freecommastring (s);
… …
1416 "*", 1324 "*",
1417 fheight, 1325 fheight,
1418 fheight + 1, fheight - 1, 1326 fheight + 1, fheight - 1,
1419 fheight - 2, fheight + 2); 1327 fheight - 2, fheight + 2);
1420 1328
1421 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1329 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1422 &missing_charset_list, &missing_charset_count, &def_string); 1330 &missing_charset_list, &missing_charset_count, &def_string);
1423 1331
1424 if (missing_charset_list) 1332 if (missing_charset_list)
1425 XFreeStringList (missing_charset_list); 1333 XFreeStringList (missing_charset_list);
1426 1334
… …
1467 XNBackground, bg, 1375 XNBackground, bg,
1468 XNArea, &status_rect, 1376 XNArea, &status_rect,
1469 XNFontSet, fs, 1377 XNFontSet, fs,
1470 NULL); 1378 NULL);
1471 } 1379 }
1380#if ENABLE_XIM_ONTHESPOT
1381 else if (input_style & XIMPreeditCallbacks)
1382 {
1383 im_set_position (spot);
1384
1385 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1386 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1387 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1388# if 0
1389 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1390# endif
1391
1392 preedit_attr = XVaCreateNestedList (0,
1393 XNSpotLocation, &spot,
1394 XNPreeditStartCallback, &xcb[0],
1395 XNPreeditDoneCallback , &xcb[1],
1396 XNPreeditDrawCallback , &xcb[2],
1397# if 0
1398 XNPreeditCaretCallback, &xcb[3],
1399# endif
1400 NULL);
1401 }
1402#endif
1472 1403
1473 Input_Context = XCreateIC (xim, 1404 Input_Context = XCreateIC (xim,
1474 XNInputStyle, input_style, 1405 XNInputStyle, input_style,
1475 XNClientWindow, vt, 1406 XNClientWindow, vt,
1476 XNFocusWindow, parent[0], 1407 XNFocusWindow, parent[0],
… …
1478 preedit_attr, 1409 preedit_attr,
1479 status_attr ? XNStatusAttributes : NULL, 1410 status_attr ? XNStatusAttributes : NULL,
1480 status_attr, NULL); 1411 status_attr, NULL);
1481 1412
1482 if (preedit_attr) XFree (preedit_attr); 1413 if (preedit_attr) XFree (preedit_attr);
1483 if (status_attr) XFree (status_attr); 1414 if (status_attr) XFree (status_attr);
1484 if (fs) XFreeFontSet (display->display, fs); 1415 if (fs) XFreeFontSet (dpy, fs);
1485 1416
1486 if (Input_Context == NULL) 1417 if (Input_Context == NULL)
1487 { 1418 {
1488 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1419 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1489 im_destroy (); 1420 im_destroy ();
1490 return false; 1421 return false;
1491 } 1422 }
1492 1423
1493 if (input_style & XIMPreeditArea) 1424#if 0
1425 // unfortunately, only the focus window is used by XIM, hard to fix
1426 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1427 vt_select_input ();
1428#endif
1429
1494 IMSetStatusPosition (); 1430 IMSetPosition ();
1495 1431
1496 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1497 return true; 1432 return true;
1498} 1433}
1499 1434
1500void 1435void
1501rxvt_term::im_cb () 1436rxvt_term::im_cb ()
… …
1507 1442
1508 make_current (); 1443 make_current ();
1509 1444
1510 im_destroy (); 1445 im_destroy ();
1511 1446
1512 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1513 if (Input_Context) 1447 if (Input_Context)
1514 return; 1448 return;
1515 1449
1516#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1450#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1517 if (rs[Rs_imLocale]) 1451 if (rs[Rs_imLocale])
… …
1559 SET_LOCALE (locale); 1493 SET_LOCALE (locale);
1560#endif 1494#endif
1561} 1495}
1562 1496
1563void 1497void
1564rxvt_term::IMSetStatusPosition () 1498rxvt_term::IMSetPosition ()
1565{ 1499{
1566 XRectangle preedit_rect, status_rect, *needed_rect; 1500 XRectangle preedit_rect, status_rect, *needed_rect;
1567 XVaNestedList preedit_attr, status_attr; 1501 XVaNestedList preedit_attr, status_attr;
1568 1502
1569 if (!Input_Context 1503 if (!Input_Context
1570 || !focus 1504 || !focus
1571 || !(input_style & XIMPreeditArea) 1505 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1572 || !IMisRunning ()) 1506 || !IMisRunning ())
1573 return; 1507 return;
1574 1508
1509 if (input_style & XIMPreeditPosition)
1510 {
1511 im_set_size (preedit_rect);
1512 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1513
1514 XSetICValues (Input_Context,
1515 XNPreeditAttributes, preedit_attr, NULL);
1516 }
1517 else
1518 {
1575 /* Getting the necessary width of preedit area */ 1519 /* Getting the necessary width of preedit area */
1576 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1520 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1577 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1521 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1578 XFree (status_attr); 1522 XFree (status_attr);
1579 1523
1580 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1524 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1581 XFree (needed_rect); 1525 XFree (needed_rect);
1582 1526
1583 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1527 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1584 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1528 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1585 1529
1586 XSetICValues (Input_Context, 1530 XSetICValues (Input_Context,
1587 XNPreeditAttributes, preedit_attr, 1531 XNPreeditAttributes, preedit_attr,
1588 XNStatusAttributes, status_attr, NULL); 1532 XNStatusAttributes, status_attr,
1533 NULL);
1589 1534
1535 XFree (status_attr);
1536 }
1537
1590 XFree (preedit_attr); 1538 XFree (preedit_attr);
1591 XFree (status_attr);
1592} 1539}
1593#endif /* USE_XIM */ 1540#endif /* USE_XIM */
1541
1542void
1543rxvt_term::get_window_origin (int &x, int &y)
1544{
1545 Window cr;
1546 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1547/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1548}
1549
1550Pixmap
1551rxvt_term::get_pixmap_property (int prop_id)
1552{
1553 if (prop_id > 0 && prop_id < NUM_XA)
1554 if (xa[prop_id])
1555 {
1556 int aformat;
1557 unsigned long nitems, bytes_after;
1558 Atom atype;
1559 unsigned char *prop = NULL;
1560 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1561 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1562 &nitems, &bytes_after, &prop);
1563 if (result == Success && prop && atype == XA_PIXMAP)
1564 return *(Pixmap *)prop;
1565 }
1566
1567 return None;
1568}
1569
1570#ifdef HAVE_BG_PIXMAP
1571# if TRACE_PIXMAPS
1572# undef update_background
1573void
1574rxvt_term::trace_update_background (const char *file, int line)
1575{
1576 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1577 update_background ();
1578}
1579# endif
1580
1581void
1582rxvt_term::update_background ()
1583{
1584 if (update_background_ev.is_active ())
1585 return;
1586
1587 bgPixmap.invalidate ();
1588
1589 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1590
1591 if (to_wait <= 0.)
1592 bgPixmap.render ();
1593 else
1594 update_background_ev.start (to_wait);
1595}
1596
1597void
1598rxvt_term::update_background_cb (ev::timer &w, int revents)
1599{
1600 make_current ();
1601
1602 update_background_ev.stop ();
1603 bgPixmap.render ();
1604 refresh_check ();
1605}
1606
1607#endif /* HAVE_BG_PIXMAP */
1594 1608
1595/*----------------------- end-of-file (C source) -----------------------*/ 1609/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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