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

Diff Legend

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