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.233 by sasha, Fri Jun 8 20:04:12 2007 UTC vs.
Revision 1.324 by sf-exg, Wed Mar 31 13:14:50 2010 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-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"
… …
88class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
89 92
90text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
91{ 94{
92 compose_char *cc; 95 compose_char *cc;
93 96
94 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
95 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
96 cc = (*this)[c1]; 99 cc = (*this)[c1];
97 while (cc) 100 while (cc)
98 { 101 {
99 if (cc->c2 == c2) return c1; 102 if (cc->c2 == c2) return c1;
100 cc = (*this)[cc->c1]; 103 cc = (*this)[cc->c1];
101 } 104 }
102 105
103 // check to see wether this combination already exists otherwise 106 // check to see whether this combination already exists otherwise
104 for (cc = v.end (); cc-- > v.begin (); ) 107 for (cc = v.end (); cc-- > v.begin (); )
105 { 108 {
106 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
107 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
108 } 111 }
… …
147 150
148} 151}
149#endif 152#endif
150 153
151rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
152 : 155{
153#if TRANSPARENT || ENABLE_PERL 156#if HAVE_BG_PIXMAP
154 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
155 check_our_aprents_ev(this, &rxvt_term::check_our_parents_cb),
156#endif
157#ifdef HAVE_SCROLLBARS
158 scrollbar_ev (this, &rxvt_term::x_cb),
159#endif 158#endif
160#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
161 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);
162#endif 161#endif
163#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
164 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);
165#endif 164#endif
166#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
167 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
168#endif 167#endif
169#ifdef SELECTION_SCROLLING 168#ifdef SELECTION_SCROLLING
170 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171#endif 170#endif
172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173 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),
174#endif 180#endif
175#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
176 pointer_ev (this, &rxvt_term::pointer_cb), 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
177#endif 183#endif
178#ifdef USE_XIM
179 im_ev (this, &rxvt_term::im_cb),
180#endif
181#ifndef NO_BELL 184#ifndef NO_BELL
182 bell_ev (this, &rxvt_term::bell_cb), 185 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
183#endif 186#endif
184 termwin_ev (this, &rxvt_term::x_cb), 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
185 vt_ev (this, &rxvt_term::x_cb), 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
186 child_ev (this, &rxvt_term::child_cb), 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
187 check_ev (this, &rxvt_term::check_cb), 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
188 flush_ev (this, &rxvt_term::flush_cb), 191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
189 destroy_ev (this, &rxvt_term::destroy_cb), 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
190 pty_ev (this, &rxvt_term::pty_cb), 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
191 incr_ev (this, &rxvt_term::incr_cb) 194
192{
193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
194 196
195 termlist.push_back (this); 197 termlist.push_back (this);
196 198
197#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
… …
199#endif 201#endif
200} 202}
201 203
202// 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.
203// for use before an emergency exit 205// for use before an emergency exit
206void
204void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
205{ 208{
206 if (cmd_pid) 209 if (cmd_pid)
207 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
208 211
209 pty_ev.stop (); 212 pty_ev.stop ();
… …
221 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
222 delete fontset[i]; 225 delete fontset[i];
223#endif 226#endif
224 delete fontset[0]; 227 delete fontset[0];
225 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
226 if (display) 239 if (display)
227 { 240 {
228 selection_clear (); 241 selection_clear ();
242 selection_clear (true);
229 243
230#ifdef USE_XIM 244#ifdef USE_XIM
231 im_destroy (); 245 im_destroy ();
232#endif 246#endif
233#ifdef XTERM_SCROLLBAR 247 scrollBar.destroy ();
234 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
235 if (ShadowGC) XFreeGC (dpy, ShadowGC);
236#endif
237#ifdef PLAIN_SCROLLBAR
238 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
239#endif
240#ifdef NEXT_SCROLLBAR
241 if (blackGC) XFreeGC (dpy, blackGC);
242 if (whiteGC) XFreeGC (dpy, whiteGC);
243 if (grayGC) XFreeGC (dpy, grayGC);
244 if (darkGC) XFreeGC (dpy, darkGC);
245 if (stippleGC) XFreeGC (dpy, stippleGC);
246 if (dimple) XFreePixmap (dpy, dimple);
247 if (upArrow) XFreePixmap (dpy, upArrow);
248 if (downArrow) XFreePixmap (dpy, downArrow);
249 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
250 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
251#endif
252#ifdef RXVT_SCROLLBAR
253 if (topShadowGC) XFreeGC (dpy, topShadowGC);
254 if (botShadowGC) XFreeGC (dpy, botShadowGC);
255 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
256#endif
257 if (gc) XFreeGC (dpy, gc); 248 if (gc) XFreeGC (dpy, gc);
258 249
259 delete drawable; 250 delete drawable;
260 // destroy all windows 251 // destroy all windows
261 if (parent[0]) 252 if (parent[0])
… …
269 pix_colors_unfocused [i].free (this); 260 pix_colors_unfocused [i].free (this);
270#endif 261#endif
271 } 262 }
272 263
273 clear (); 264 clear ();
274 }
275 265
276 delete [] pix_colors_focused; 266 display->flush (); /* ideally .put should do this */
277#if OFF_FOCUS_FADING
278 delete [] pix_colors_unfocused;
279#endif
280
281 displays.put (display); 267 displays.put (display);
268 }
282 269
283 scr_release (); 270 scr_release ();
284 271
285 /* clear all resources */ 272 /* clear all resources */
286 for (int i = 0; i < allocated.size (); i++) 273 for (int i = 0; i < allocated.size (); i++)
287 free (allocated [i]); 274 free (allocated [i]);
288 275
289 free (selection.text); 276 free (selection.text);
277 free (selection.clip_text);
290 // TODO: manage env vars in child only(!) 278 // TODO: manage env vars in child only(!)
291 free (env_display); 279 free (env_display);
292 free (env_term); 280 free (env_term);
293 free (locale); 281 free (locale);
294 free (v_buffer); 282 free (v_buffer);
… …
298 delete argv; 286 delete argv;
299 287
300#ifdef KEYSYM_RESOURCE 288#ifdef KEYSYM_RESOURCE
301 delete keyboard; 289 delete keyboard;
302#endif 290#endif
291#ifndef NO_RESOURCES
292 XrmDestroyDatabase (option_db);
293#endif
303} 294}
304 295
305// child has exited, usually destroys 296// child has exited, usually destroys
306void 297void
307rxvt_term::child_cb (child_watcher &w, int status) 298rxvt_term::child_cb (ev::child &w, int status)
308{ 299{
309 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 300 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
310 301
311 cmd_pid = 0; 302 cmd_pid = 0;
312 303
… …
315} 306}
316 307
317void 308void
318rxvt_term::destroy () 309rxvt_term::destroy ()
319{ 310{
320 if (destroy_ev.active) 311 if (destroy_ev.is_active ())
321 return; 312 return;
322 313
323 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 314 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
324 315
325#if ENABLE_OVERLAY 316#if ENABLE_OVERLAY
… …
329 if (display) 320 if (display)
330 { 321 {
331#if USE_XIM 322#if USE_XIM
332 im_ev.stop (display); 323 im_ev.stop (display);
333#endif 324#endif
334#if HAVE_SCROLLBARS
335 scrollbar_ev.stop (display); 325 scrollbar_ev.stop (display);
336#endif
337#if TRANSPARENT || ENABLE_PERL 326#if ENABLE_TRANSPARENCY || ENABLE_PERL
338 rootwin_ev.stop (display); 327 rootwin_ev.stop (display);
339#endif 328#endif
340 incr_ev.stop (); 329 incr_ev.stop ();
341 termwin_ev.stop (display); 330 termwin_ev.stop (display);
342 vt_ev.stop (display); 331 vt_ev.stop (display);
343 } 332 }
344 333
345 check_ev.stop (); 334 flush_ev.stop ();
346 pty_ev.stop (); 335 pty_ev.stop ();
347#ifdef CURSOR_BLINK 336#ifdef CURSOR_BLINK
348 cursor_blink_ev.stop (); 337 cursor_blink_ev.stop ();
349#endif 338#endif
350#ifdef TEXT_BLINK 339#ifdef TEXT_BLINK
… …
358#endif 347#endif
359#ifdef POINTER_BLANK 348#ifdef POINTER_BLANK
360 pointer_ev.stop (); 349 pointer_ev.stop ();
361#endif 350#endif
362 351
363 destroy_ev.start (0); 352 destroy_ev.start ();
364} 353}
365 354
366void 355void
367rxvt_term::destroy_cb (time_watcher &w) 356rxvt_term::destroy_cb (ev::idle &w, int revents)
368{ 357{
369 make_current (); 358 make_current ();
370 359
371 delete this; 360 delete this;
372} 361}
… …
426 else 415 else
427 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
428 mesg, BUFSIZ); 417 mesg, BUFSIZ);
429 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
430 } 419 }
431 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 420 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
432 mesg, BUFSIZ); 421 mesg, BUFSIZ);
433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
434} 423}
435#endif 424#endif
436 425
… …
460 DisplayString (display)); 449 DisplayString (display));
461 rxvt_emergency_cleanup (); 450 rxvt_emergency_cleanup ();
462 _exit (EXIT_FAILURE); 451 _exit (EXIT_FAILURE);
463} 452}
464 453
465/*----------------------------------------------------------------------*/
466bool
467rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
468{
469 this->envv = envv;
470
471 SET_R (this);
472 set_locale ("");
473 set_environ (envv); // few things in X do not call setlocale :(
474
475 if (!init_vars ())
476 return false;
477
478 init_secondary ();
479
480 const char **cmd_argv = init_resources (argc, argv);
481
482#ifdef KEYSYM_RESOURCE
483 keyboard->register_done ();
484#endif
485
486#ifdef HAVE_SCROLLBARS
487 if (option (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */
489#endif
490
491 pty = ptytty::create ();
492
493 create_windows (argc, argv);
494
495 init_xlocale ();
496
497 scr_reset (); // initialize screen
498
499#if 0
500 XSynchronize (dpy, True);
501#endif
502
503#ifdef HAVE_SCROLLBARS
504 if (option (Opt_scrollBar))
505 resize_scrollbar (); /* create and map scrollbar */
506#endif
507#ifdef TRANSPARENT
508 if (option (Opt_transparent))
509 {
510 XSelectInput (dpy, display->root, PropertyChangeMask);
511 check_our_parents ();
512 rootwin_ev.start (display, display->root);
513 }
514#endif
515#if ENABLE_PERL
516 rootwin_ev.start (display, display->root);
517#endif
518
519 set_colorfgbg ();
520
521 init_command (cmd_argv);
522
523 free (cmd_argv);
524
525 if (pty->pty >= 0)
526 pty_ev.start (pty->pty, EVENT_READ);
527
528 check_ev.start ();
529
530 HOOK_INVOKE ((this, HOOK_START, DT_END));
531
532#if ENABLE_XEMBED
533 if (rs[Rs_embed])
534 {
535 long info[2] = { 0, XEMBED_MAPPED };
536
537 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
538 32, PropModeReplace, (unsigned char *)&info, 2);
539 }
540#endif
541
542 XMapWindow (dpy, vt);
543 XMapWindow (dpy, parent[0]);
544
545 return true;
546}
547
548static struct sig_handlers 454static struct sig_handlers
549{ 455{
550 sig_watcher sw_term, sw_int; 456 ev::sig sw_term, sw_int;
551 457
552 /* 458 /*
553 * Catch a fatal signal and tidy up before quitting 459 * Catch a fatal signal and tidy up before quitting
554 */ 460 */
555 void 461 void sig_term (ev::sig &w, int revents);
556 sig_term (sig_watcher &w) 462
463 sig_handlers ()
557 { 464 {
558 rxvt_emergency_cleanup (); 465 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
559 signal (w.signum, SIG_DFL);
560 kill (getpid (), w.signum);
561 }
562
563 sig_handlers ()
564 : sw_term (this, &sig_handlers::sig_term),
565 sw_int (this, &sig_handlers::sig_term) 466 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
566 {
567 } 467 }
568} sig_handlers; 468} sig_handlers;
569 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
570char **rxvt_environ; // startup environment 478char **rxvt_environ; // startup environment
571 479
572void 480void
573rxvt_init () 481rxvt_init ()
574{ 482{
575 ptytty::init (); 483 ptytty::init ();
484
485 if (!ev_default_loop (0))
486 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
576 487
577 rxvt_environ = environ; 488 rxvt_environ = environ;
578 489
579 signal (SIGHUP, SIG_IGN); 490 signal (SIGHUP, SIG_IGN);
580 signal (SIGPIPE, SIG_IGN); 491 signal (SIGPIPE, SIG_IGN);
581 492
582 sig_handlers.sw_term.start (SIGTERM); 493 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
583 sig_handlers.sw_int.start (SIGINT); 494 sig_handlers.sw_int.start (SIGINT); ev_unref ();
584 495
585 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 496 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
586 /* signal (SIGURG, SIG_DFL); */ 497 /* signal (SIGURG, SIG_DFL); */
587 498
588 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 499 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
590 XSetIOErrorHandler (rxvt_xioerror_handler); 501 XSetIOErrorHandler (rxvt_xioerror_handler);
591 502
592 XrmInitialize (); 503 XrmInitialize ();
593} 504}
594 505
595/* ------------------------------------------------------------------------- *
596 * MEMORY ALLOCATION WRAPPERS *
597 * ------------------------------------------------------------------------- */
598void *
599rxvt_malloc (size_t size)
600{
601 void *p = malloc (size);
602
603 if (!p)
604 rxvt_fatal ("memory allocation failure. aborting.\n");
605
606 return p;
607}
608
609void *
610rxvt_calloc (size_t number, size_t size)
611{
612 void *p = calloc (number, size);
613
614 if (!p)
615 rxvt_fatal ("memory allocation failure. aborting.\n");
616
617 return p;
618}
619
620void *
621rxvt_realloc (void *ptr, size_t size)
622{
623 void *p = realloc (ptr, size);
624
625 if (!p)
626 rxvt_fatal ("memory allocation failure. aborting.\n");
627
628 return p;
629}
630
631/*----------------------------------------------------------------------*/ 506/*----------------------------------------------------------------------*/
632/* 507/*
633 * window size/position calculcations for XSizeHint and other storage. 508 * window size/position calculations for XSizeHint and other storage.
634 * if width/height are non-zero then override calculated width/height 509 * if width/height are non-zero then override calculated width/height
635 */ 510 */
636void 511void
637rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 512rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
638{ 513{
639 short recalc_x, recalc_y; 514 short recalc_x, recalc_y;
640 int x, y, sb_w, flags; 515 int x, y, flags;
641 unsigned int w, h; 516 unsigned int w, h;
642 unsigned int max_width, max_height; 517 unsigned int max_width, max_height;
643 518
644 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 519 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
645 szHint.win_gravity = NorthWestGravity; 520 szHint.win_gravity = NorthWestGravity;
… …
655 if (rs[Rs_geometry]) 530 if (rs[Rs_geometry])
656 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 531 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
657 532
658 if (flags & WidthValue) 533 if (flags & WidthValue)
659 { 534 {
535 if (!w)
536 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
537
660 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 538 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
661 szHint.flags |= USSize; 539 szHint.flags |= USSize;
662 } 540 }
663 541
664 if (flags & HeightValue) 542 if (flags & HeightValue)
665 { 543 {
544 if (!h)
545 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
546
666 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 547 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
667 szHint.flags |= USSize; 548 szHint.flags |= USSize;
668 } 549 }
669 550
670 if (flags & XValue) 551 if (flags & XValue)
671 { 552 {
… …
702 max_width = MAX_COLS * fwidth; 583 max_width = MAX_COLS * fwidth;
703 max_height = MAX_ROWS * fheight; 584 max_height = MAX_ROWS * fheight;
704 585
705 szHint.base_width = szHint.base_height = 2 * int_bwidth; 586 szHint.base_width = szHint.base_height = 2 * int_bwidth;
706 587
707 sb_w = 0;
708 window_vt_x = window_vt_y = int_bwidth; 588 window_vt_x = window_vt_y = int_bwidth;
709 589
710 if (scrollBar.state) 590 if (scrollBar.state)
711 { 591 {
712 sb_w = scrollbar_TotalWidth (); 592 int sb_w = scrollBar.total_width ();
713 szHint.base_width += sb_w; 593 szHint.base_width += sb_w;
714 594
715 if (!option (Opt_scrollBar_right)) 595 if (!option (Opt_scrollBar_right))
716 window_vt_x += sb_w; 596 window_vt_x += sb_w;
717 } 597 }
… …
741 { 621 {
742 min_it (height, max_height); 622 min_it (height, max_height);
743 szHint.height = szHint.base_height + height; 623 szHint.height = szHint.base_height + height;
744 } 624 }
745 625
746 if (scrollBar.state && option (Opt_scrollBar_right))
747 window_sb_x = szHint.width - sb_w;
748
749 if (recalc_x) 626 if (recalc_x)
750 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 627 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
751 628
752 if (recalc_y) 629 if (recalc_y)
753 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 630 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
754 631
755 ncol = width / fwidth; 632 ncol = width / fwidth;
756 nrow = height / fheight; 633 nrow = height / fheight;
757} 634}
758 635
759/*----------------------------------------------------------------------*/ 636/*----------------------------------------------------------------------*/
760/* 637/*
… …
771 648
772 ws.ws_col = ncol; 649 ws.ws_col = ncol;
773 ws.ws_row = nrow; 650 ws.ws_row = nrow;
774 ws.ws_xpixel = width; 651 ws.ws_xpixel = width;
775 ws.ws_ypixel = height; 652 ws.ws_ypixel = height;
776 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 653 ioctl (pty->pty, TIOCSWINSZ, &ws);
777 654
778#if 0 655#if 0
779 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 656 // TIOCSWINSZ is supposed to do this automatically and correctly
780 if (cmd_pid) /* force through to the command */ 657 if (cmd_pid) /* force through to the command */
781 kill (-cmd_pid, SIGWINCH); 658 kill (-cmd_pid, SIGWINCH);
782#endif 659#endif
783} 660}
784 661
… …
813 delete fontset[0]; 690 delete fontset[0];
814 fontset[0] = fs; 691 fontset[0] = fs;
815 692
816 prop = (*fs)[1]->properties (); 693 prop = (*fs)[1]->properties ();
817 prop.height += lineSpace; 694 prop.height += lineSpace;
695 prop.width += letterSpace;
818 696
819 fs->set_prop (prop, false); 697 fs->set_prop (prop, false);
820 698
821 fwidth = prop.width; 699 fwidth = prop.width;
822 fheight = prop.height; 700 fheight = prop.height;
… …
858 if (parent[0]) 736 if (parent[0])
859 { 737 {
860 resize_all_windows (0, 0, 0); 738 resize_all_windows (0, 0, 0);
861 scr_remap_chars (); 739 scr_remap_chars ();
862 scr_touch (true); 740 scr_touch (true);
863 } 741 }
864 742
865 return true; 743 return true;
866} 744}
867 745
746void
868void rxvt_term::set_string_property (Atom prop, const char *str, int len) 747rxvt_term::set_string_property (Atom prop, const char *str, int len)
869{ 748{
870 XChangeProperty (dpy, parent[0], 749 XChangeProperty (dpy, parent[0],
871 prop, XA_STRING, 8, PropModeReplace, 750 prop, XA_STRING, 8, PropModeReplace,
872 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 751 (const unsigned char *)str, len >= 0 ? len : strlen (str));
873} 752}
874 753
754void
875void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 755rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
876{ 756{
877 wchar_t *ws = rxvt_mbstowcs (str, len); 757 wchar_t *ws = rxvt_mbstowcs (str, len);
878 char *s = rxvt_wcstoutf8 (ws); 758 char *s = rxvt_wcstoutf8 (ws);
879 759
880 XChangeProperty (dpy, parent[0], 760 XChangeProperty (dpy, parent[0],
… …
904#if ENABLE_EWMH 784#if ENABLE_EWMH
905 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 785 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
906#endif 786#endif
907} 787}
908 788
789void
790rxvt_term::set_window_color (int idx, const char *color)
791{
909#ifdef XTERM_COLOR_CHANGE 792#ifdef XTERM_COLOR_CHANGE
910void
911rxvt_term::set_window_color (int idx, const char *color)
912{
913 rxvt_color xcol; 793 rxvt_color xcol;
914 int i; 794
915
916 if (color == NULL || *color == '\0') 795 if (color == NULL || *color == '\0')
917 return; 796 return;
918 797
919 color = strdup (color); 798 color = strdup (color);
920 allocated.push_back ((void *)color); 799 allocated.push_back ((void *)color);
921 rs[Rs_color + idx] = color; 800 rs[Rs_color + idx] = color;
922 801
923 /* handle color aliases */ 802 /* handle color aliases */
924 if (isdigit (*color)) 803 if (isdigit (*color))
925 { 804 {
926 i = atoi (color); 805 int i = atoi (color);
927 806
928 if (i >= 8 && i <= 15) 807 if (i >= 8 && i <= 15)
808 {
929 { /* bright colors */ 809 /* bright colors */
930 i -= 8;
931 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 810 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
932 goto done; 811 goto done;
933 } 812 }
934 813
935 if (i >= 0 && i <= 7) 814 if (i >= 0 && i <= 7)
815 {
936 { /* normal colors */ 816 /* normal colors */
937 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 817 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
938 goto done; 818 goto done;
939 } 819 }
940 } 820 }
941 821
… …
946 * so just keep gobbling up the colormap 826 * so just keep gobbling up the colormap
947 */ 827 */
948 828
949 pix_colors_focused[idx] = xcol; 829 pix_colors_focused[idx] = xcol;
950 830
951 /* XSetWindowAttributes attr; */
952 /* Cursor cursor; */
953done: 831done:
954 /*TODO: handle Color_BD, scrollbar background, etc. */ 832 /*TODO: handle Color_BD, scrollbar background, etc. */
955 833
956 update_fade_color (idx); 834 update_fade_color (idx);
957 recolour_cursor (); 835 recolour_cursor ();
958 scr_recolour (); 836 scr_recolour ();
837#endif /* XTERM_COLOR_CHANGE */
959} 838}
960
961#else
962# define set_window_color (idx,color) ((void)0)
963#endif /* XTERM_COLOR_CHANGE */
964 839
965void 840void
966rxvt_term::recolour_cursor () 841rxvt_term::recolour_cursor ()
967{ 842{
968 XColor fg, bg; 843 XColor fg, bg;
… …
984 */ 859 */
985void 860void
986rxvt_term::set_colorfgbg () 861rxvt_term::set_colorfgbg ()
987{ 862{
988 unsigned int i; 863 unsigned int i;
989 const char *xpmb = "\0"; 864 const char *xpmb = "";
990 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 865 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
991 866
992 strcpy (fstr, "default"); 867 strcpy (fstr, "default");
993 strcpy (bstr, "default"); 868 strcpy (bstr, "default");
994 for (i = Color_Black; i <= Color_White; i++) 869 for (i = Color_Black; i <= Color_White; i++)
… …
1000 875
1001 for (i = Color_Black; i <= Color_White; i++) 876 for (i = Color_Black; i <= Color_White; i++)
1002 if (pix_colors[Color_bg] == pix_colors[i]) 877 if (pix_colors[Color_bg] == pix_colors[i])
1003 { 878 {
1004 sprintf (bstr, "%d", (i - Color_Black)); 879 sprintf (bstr, "%d", (i - Color_Black));
1005#ifdef XPM_BACKGROUND 880#ifdef BG_IMAGE_FROM_FILE
1006 xpmb = "default;"; 881 xpmb = "default;";
1007#endif 882#endif
1008 break; 883 break;
1009 } 884 }
1010 885
… …
1039 int old_width = szHint.width; 914 int old_width = szHint.width;
1040 int old_height = szHint.height; 915 int old_height = szHint.height;
1041 916
1042 window_calc (newwidth, newheight); 917 window_calc (newwidth, newheight);
1043 918
1044 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 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);
1045 XSetWMNormalHints (dpy, parent[0], &szHint); 925 XSetWMNormalHints (dpy, parent[0], &szHint);
926 szHint.flags |= PBaseSize | PResizeInc;
927 }
1046 928
1047 if (!ignoreparent) 929 if (!ignoreparent)
1048 { 930 {
1049#ifdef SMART_RESIZE 931#ifdef SMART_RESIZE
1050 /* 932 /*
… …
1090#else 972#else
1091 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 973 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1092#endif 974#endif
1093 } 975 }
1094 976
977 if (set_hint)
978 XSetWMNormalHints (dpy, parent[0], &szHint);
979
1095 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 980 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1096 981
1097 if (fix_screen || newwidth != old_width || newheight != old_height) 982 if (fix_screen || newwidth != old_width || newheight != old_height)
1098 { 983 {
1099 if (scrollBar.state) 984 if (scrollBar.state)
1100 { 985 scrollBar.resize ();
1101 XMoveResizeWindow (dpy, scrollBar.win,
1102 window_sb_x, 0,
1103 scrollbar_TotalWidth (), szHint.height);
1104 resize_scrollbar ();
1105 }
1106 986
1107 XMoveResizeWindow (dpy, vt, 987 XMoveResizeWindow (dpy, vt,
1108 window_vt_x, window_vt_y, 988 window_vt_x, window_vt_y,
1109 width, height); 989 width, height);
1110 990
1111 scr_clear (); 991#ifdef HAVE_BG_PIXMAP
1112#ifdef XPM_BACKGROUND 992 if (bgPixmap.window_size_sensitive ())
1113 resize_pixmap (); 993 update_background ();
1114#endif 994#endif
1115 } 995 }
1116 996
1117 if (fix_screen || old_height == 0) 997 if (fix_screen || old_height == 0)
1118 scr_reset (); 998 scr_reset ();
1119 999
1120 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1000#ifdef HAVE_BG_PIXMAP
1121 //scr_touch (false); 1001// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1122 1002// if (bgPixmap.pixmap)
1123#ifdef XPM_BACKGROUND
1124 if (pixmap)
1125 scr_touch (false); 1003// scr_touch (false);
1126#endif 1004#endif
1127 1005
1128#ifdef USE_XIM 1006#ifdef USE_XIM
1129 IMSetPosition (); 1007 IMSetPosition ();
1130#endif 1008#endif
… …
1197 1075
1198/* Checking whether input method is running. */ 1076/* Checking whether input method is running. */
1199bool 1077bool
1200rxvt_term::IMisRunning () 1078rxvt_term::IMisRunning ()
1201{ 1079{
1202 char *p;
1203 Atom atom; 1080 Atom atom;
1204 Window win; 1081 Window win;
1205 char server[IMBUFSIZ]; 1082 char server[IMBUFSIZ];
1206 1083
1207 /* get current locale modifier */ 1084 /* get current locale modifier */
1208 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1085 if (char *p = XSetLocaleModifiers (0))
1209 { 1086 {
1210 strcpy (server, "@server="); 1087 strcpy (server, "@server=");
1211 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1088 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1212 1089
1213 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1090 if (p = strchr (server + 1, '@')) /* first one only */
1214 *p = '\0'; 1091 *p = '\0';
1215 1092
1216 atom = XInternAtom (dpy, server, False); 1093 atom = XInternAtom (dpy, server, False);
1217 win = XGetSelectionOwner (dpy, atom); 1094 win = XGetSelectionOwner (dpy, atom);
1218 1095
… …
1285 1162
1286 term->make_current (); 1163 term->make_current ();
1287 1164
1288 if (text) 1165 if (text)
1289 { 1166 {
1290 void *str; 1167 wchar_t *str;
1291 1168
1292 if (!text->encoding_is_wchar && text->string.multi_byte) 1169 if (!text->encoding_is_wchar && text->string.multi_byte)
1293 { 1170 {
1294 // of course, X makes it ugly again 1171 // of course, X makes it ugly again
1295 if (term->rs[Rs_imLocale]) 1172 if (term->rs[Rs_imLocale])
1296 SET_LOCALE (term->rs[Rs_imLocale]); 1173 SET_LOCALE (term->rs[Rs_imLocale]);
1297 1174
1298 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1175 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1299 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1176 mbstowcs (str, text->string.multi_byte, text->length + 1);
1300 1177
1301 if (term->rs[Rs_imLocale]) 1178 if (term->rs[Rs_imLocale])
1302 SET_LOCALE (term->locale); 1179 SET_LOCALE (term->locale);
1303 } 1180 }
1304 else 1181 else
1305 str = (void *)text->string.wide_char; 1182 str = text->string.wide_char;
1306 1183
1307 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1184 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1308 DT_INT, call_data->caret, 1185 DT_INT, call_data->caret,
1309 DT_INT, call_data->chg_first, 1186 DT_INT, call_data->chg_first,
1310 DT_INT, call_data->chg_length, 1187 DT_INT, call_data->chg_length,
1311 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1188 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1630 1507
1631 if (input_style & XIMPreeditPosition) 1508 if (input_style & XIMPreeditPosition)
1632 { 1509 {
1633 im_set_size (preedit_rect); 1510 im_set_size (preedit_rect);
1634 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1511 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1635 1512
1636 XSetICValues (Input_Context, 1513 XSetICValues (Input_Context,
1637 XNPreeditAttributes, preedit_attr, NULL); 1514 XNPreeditAttributes, preedit_attr, NULL);
1638 } 1515 }
1639 else 1516 else
1640 { 1517 {
… …
1657 XFree (status_attr); 1534 XFree (status_attr);
1658 } 1535 }
1659 1536
1660 XFree (preedit_attr); 1537 XFree (preedit_attr);
1661} 1538}
1662#endif /* USE_XIM */ 1539#endif /* USE_XIM */
1540
1541void
1542rxvt_term::get_window_origin (int &x, int &y)
1543{
1544 Window cr;
1545 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1546/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1547}
1548
1549Pixmap
1550rxvt_term::get_pixmap_property (int prop_id)
1551{
1552 if (prop_id > 0 && prop_id < NUM_XA)
1553 if (xa[prop_id])
1554 {
1555 int aformat;
1556 unsigned long nitems, bytes_after;
1557 Atom atype;
1558 unsigned char *prop = NULL;
1559 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1560 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1561 &nitems, &bytes_after, &prop);
1562 if (result == Success && prop && atype == XA_PIXMAP)
1563 return *(Pixmap *)prop;
1564 }
1565
1566 return None;
1567}
1568
1569#ifdef HAVE_BG_PIXMAP
1570# if TRACE_PIXMAPS
1571# undef update_background
1572void
1573rxvt_term::trace_update_background (const char *file, int line)
1574{
1575 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1576 update_background ();
1577}
1578# endif
1579
1580void
1581rxvt_term::update_background ()
1582{
1583 if (update_background_ev.is_active ())
1584 return;
1585
1586 bgPixmap.invalidate ();
1587
1588 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1589
1590 if (to_wait <= 0.)
1591 bgPixmap.render ();
1592 else
1593 update_background_ev.start (to_wait);
1594}
1595
1596void
1597rxvt_term::update_background_cb (ev::timer &w, int revents)
1598{
1599 make_current ();
1600
1601 update_background_ev.stop ();
1602 bgPixmap.render ();
1603 refresh_check ();
1604}
1605
1606#endif /* HAVE_BG_PIXMAP */
1663 1607
1664/*----------------------- end-of-file (C source) -----------------------*/ 1608/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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