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.155 by root, Mon Jan 2 15:35:43 2006 UTC vs.
Revision 1.232 by root, Tue May 1 21:30:01 2007 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-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2006 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.
… …
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
53static char curlocale[128]; 56static char curlocale[128], savelocale[128];
54 57
55bool 58bool
56rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
57{ 60{
61 int size = strlen (locale) + 1;
62
63 if (size > sizeof (curlocale))
64 rxvt_fatal ("locale string too long, aborting.\n");
65
58 if (!locale || !strncmp (locale, curlocale, 128)) 66 if (!locale || !memcmp (locale, curlocale, size))
59 return false; 67 return false;
60 68
61 strncpy (curlocale, locale, 128); 69 memcpy (curlocale, locale, size);
62 setlocale (LC_CTYPE, curlocale); 70 setlocale (LC_CTYPE, curlocale);
63 return true; 71 return true;
72}
73
74void
75rxvt_push_locale (const char *locale) NOTHROW
76{
77 strcpy (savelocale, curlocale);
78 rxvt_set_locale (locale);
79}
80
81void
82rxvt_pop_locale () NOTHROW
83{
84 rxvt_set_locale (savelocale);
64} 85}
65 86
66#if ENABLE_COMBINING 87#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 88class rxvt_composite_vec rxvt_composite;
68 89
… …
127} 148}
128#endif 149#endif
129 150
130rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
131 : 152 :
132#if TRANSPARENT 153#if TRANSPARENT || ENABLE_PERL
133 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
134#endif 155#endif
135#ifdef HAVE_SCROLLBARS 156#ifdef HAVE_SCROLLBARS
136 scrollbar_ev (this, &rxvt_term::x_cb), 157 scrollbar_ev (this, &rxvt_term::x_cb),
137#endif 158#endif
138#ifdef MENUBAR
139 menubar_ev (this, &rxvt_term::x_cb),
140#endif
141#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
142 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 160 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
143#endif 161#endif
144#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
145 text_blink_ev (this, &rxvt_term::text_blink_cb), 163 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
157 pointer_ev (this, &rxvt_term::pointer_cb), 175 pointer_ev (this, &rxvt_term::pointer_cb),
158#endif 176#endif
159#ifdef USE_XIM 177#ifdef USE_XIM
160 im_ev (this, &rxvt_term::im_cb), 178 im_ev (this, &rxvt_term::im_cb),
161#endif 179#endif
180#ifndef NO_BELL
181 bell_ev (this, &rxvt_term::bell_cb),
182#endif
162 termwin_ev (this, &rxvt_term::x_cb), 183 termwin_ev (this, &rxvt_term::x_cb),
163 vt_ev (this, &rxvt_term::x_cb), 184 vt_ev (this, &rxvt_term::x_cb),
185 child_ev (this, &rxvt_term::child_cb),
164 check_ev (this, &rxvt_term::check_cb), 186 check_ev (this, &rxvt_term::check_cb),
165 flush_ev (this, &rxvt_term::flush_cb), 187 flush_ev (this, &rxvt_term::flush_cb),
166 destroy_ev (this, &rxvt_term::destroy_cb), 188 destroy_ev (this, &rxvt_term::destroy_cb),
167 pty_ev (this, &rxvt_term::pty_cb), 189 pty_ev (this, &rxvt_term::pty_cb),
168 incr_ev (this, &rxvt_term::incr_cb) 190 incr_ev (this, &rxvt_term::incr_cb)
… …
171 193
172 termlist.push_back (this); 194 termlist.push_back (this);
173 195
174#ifdef KEYSYM_RESOURCE 196#ifdef KEYSYM_RESOURCE
175 keyboard = new keyboard_manager; 197 keyboard = new keyboard_manager;
176
177 if (!keyboard)
178 rxvt_fatal ("out of memory, aborting.\n");
179#endif 198#endif
180} 199}
181 200
182// clean up the most important stuff, do *not* call x or free mem etc. 201// clean up the most important stuff, do *not* call x or free mem etc.
183// for use before an emergency exit 202// for use before an emergency exit
184void rxvt_term::emergency_cleanup () 203void rxvt_term::emergency_cleanup ()
185{ 204{
186 if (cmd_pid) 205 if (cmd_pid)
187 kill (-cmd_pid, SIGHUP); 206 kill (-cmd_pid, SIGHUP);
188 207
189#ifdef UTMP_SUPPORT 208 pty_ev.stop ();
190 privileged_utmp (RESTORE); 209 delete pty; pty = 0;
191#endif
192
193 pty.put ();
194} 210}
195 211
196rxvt_term::~rxvt_term () 212rxvt_term::~rxvt_term ()
197{ 213{
198 PERL_INVOKE ((this, HOOK_DESTROY, DT_END));
199
200 termlist.erase (find (termlist.begin (), termlist.end(), this)); 214 termlist.erase (find (termlist.begin (), termlist.end(), this));
201 215
202 emergency_cleanup (); 216 emergency_cleanup ();
203 217
204#if ENABLE_STYLES 218#if ENABLE_STYLES
… …
208#endif 222#endif
209 delete fontset[0]; 223 delete fontset[0];
210 224
211 if (display) 225 if (display)
212 { 226 {
213 dDisp;
214
215 selection_clear (); 227 selection_clear ();
216 228
217#ifdef USE_XIM 229#ifdef USE_XIM
218 im_destroy (); 230 im_destroy ();
219#endif 231#endif
220#ifdef MENUBAR
221 if (menubarGC) XFreeGC (disp, menubarGC);
222#endif
223#ifdef XTERM_SCROLLBAR 232#ifdef XTERM_SCROLLBAR
224 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 233 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
225 if (ShadowGC) XFreeGC (disp, ShadowGC); 234 if (ShadowGC) XFreeGC (dpy, ShadowGC);
226#endif 235#endif
227#ifdef PLAIN_SCROLLBAR 236#ifdef PLAIN_SCROLLBAR
228 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 237 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
229#endif 238#endif
230#ifdef NEXT_SCROLLBAR 239#ifdef NEXT_SCROLLBAR
231 if (blackGC) XFreeGC (disp, blackGC); 240 if (blackGC) XFreeGC (dpy, blackGC);
232 if (whiteGC) XFreeGC (disp, whiteGC); 241 if (whiteGC) XFreeGC (dpy, whiteGC);
233 if (grayGC) XFreeGC (disp, grayGC); 242 if (grayGC) XFreeGC (dpy, grayGC);
234 if (darkGC) XFreeGC (disp, darkGC); 243 if (darkGC) XFreeGC (dpy, darkGC);
235 if (stippleGC) XFreeGC (disp, stippleGC); 244 if (stippleGC) XFreeGC (dpy, stippleGC);
236 if (dimple) XFreePixmap (disp, dimple); 245 if (dimple) XFreePixmap (dpy, dimple);
237 if (upArrow) XFreePixmap (disp, upArrow); 246 if (upArrow) XFreePixmap (dpy, upArrow);
238 if (downArrow) XFreePixmap (disp, downArrow); 247 if (downArrow) XFreePixmap (dpy, downArrow);
239 if (upArrowHi) XFreePixmap (disp, upArrowHi); 248 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
240 if (downArrowHi) XFreePixmap (disp, downArrowHi); 249 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
241#endif 250#endif
242#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 251#ifdef RXVT_SCROLLBAR
243 if (topShadowGC) XFreeGC (disp, topShadowGC); 252 if (topShadowGC) XFreeGC (dpy, topShadowGC);
244 if (botShadowGC) XFreeGC (disp, botShadowGC); 253 if (botShadowGC) XFreeGC (dpy, botShadowGC);
245 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 254 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
246#endif 255#endif
247 if (gc) XFreeGC (disp, gc); 256 if (gc) XFreeGC (dpy, gc);
248 257
249#if defined(MENUBAR) && (MENUBAR_MAX > 1)
250 delete menuBar.drawable;
251 //if (menuBar.win)
252 // XDestroyWindow (disp, menuBar.win);
253#endif
254 delete drawable; 258 delete drawable;
255 // destroy all windows 259 // destroy all windows
256 if (parent[0]) 260 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 261 XDestroyWindow (dpy, parent[0]);
258 }
259 262
260 // TODO: free pixcolours, colours should become part of rxvt_display 263 for (int i = 0; i < TOTAL_COLORS; i++)
261 264 if (ISSET_PIXCOLOR (i))
262 delete pix_colors_focused; 265 {
266 pix_colors_focused [i].free (this);
263#if OFF_FOCUS_FADING 267#if OFF_FOCUS_FADING
268 pix_colors_unfocused [i].free (this);
269#endif
270 }
271
272 clear ();
273 }
274
275 delete [] pix_colors_focused;
276#if OFF_FOCUS_FADING
264 delete pix_colors_unfocused; 277 delete [] pix_colors_unfocused;
265#endif 278#endif
266 279
267 displays.put (display); 280 displays.put (display);
268 281
269 scr_release (); 282 scr_release ();
… …
272 for (int i = 0; i < allocated.size (); i++) 285 for (int i = 0; i < allocated.size (); i++)
273 free (allocated [i]); 286 free (allocated [i]);
274 287
275 free (selection.text); 288 free (selection.text);
276 // TODO: manage env vars in child only(!) 289 // TODO: manage env vars in child only(!)
277 free (env_windowid);
278 free (env_display); 290 free (env_display);
279 free (env_term); 291 free (env_term);
280 free (env_colorfgbg);
281 free (locale); 292 free (locale);
282 free (v_buffer); 293 free (v_buffer);
283 free (incr_buf); 294 free (incr_buf);
284 295
285 delete envv; 296 delete envv;
… …
288#ifdef KEYSYM_RESOURCE 299#ifdef KEYSYM_RESOURCE
289 delete keyboard; 300 delete keyboard;
290#endif 301#endif
291} 302}
292 303
304// child has exited, usually destroys
293void 305void
294rxvt_term::child_exit () 306rxvt_term::child_cb (child_watcher &w, int status)
295{ 307{
308 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
309
296 cmd_pid = 0; 310 cmd_pid = 0;
297 311
298 if (!OPTION (Opt_hold)) 312 if (!option (Opt_hold))
299 destroy (); 313 destroy ();
300} 314}
301 315
302void 316void
303rxvt_term::destroy () 317rxvt_term::destroy ()
304{ 318{
305 if (destroy_ev.active) 319 if (destroy_ev.active)
306 return; 320 return;
307 321
322 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323
308#if ENABLE_OVERLAY 324#if ENABLE_OVERLAY
309 scr_overlay_off (); 325 scr_overlay_off ();
310#endif 326#endif
311 327
312 if (display) 328 if (display)
… …
315 im_ev.stop (display); 331 im_ev.stop (display);
316#endif 332#endif
317#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
318 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
319#endif 335#endif
320#if MENUBAR 336#if TRANSPARENT || ENABLE_PERL
321 menubar_ev.stop (display);
322#endif
323#if TRANSPARENT
324 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
325#endif 338#endif
326 incr_ev.stop (); 339 incr_ev.stop ();
327 termwin_ev.stop (display); 340 termwin_ev.stop (display);
328 vt_ev.stop (display); 341 vt_ev.stop (display);
… …
350} 363}
351 364
352void 365void
353rxvt_term::destroy_cb (time_watcher &w) 366rxvt_term::destroy_cb (time_watcher &w)
354{ 367{
355 SET_R (this); 368 make_current ();
356 369
357 delete this; 370 delete this;
358} 371}
359 372
360/*----------------------------------------------------------------------*/ 373/*----------------------------------------------------------------------*/
… …
369{ 382{
370 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 383 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
371 (*t)->emergency_cleanup (); 384 (*t)->emergency_cleanup ();
372} 385}
373 386
374#if ENABLE_FRILLS 387#if !ENABLE_MINIMAL
375static void 388static void
376print_x_error (Display *dpy, XErrorEvent *event) 389print_x_error (Display *dpy, XErrorEvent *event)
377{ 390{
378 char buffer[BUFSIZ]; 391 char buffer[BUFSIZ];
379 char mesg[BUFSIZ]; 392 char mesg[BUFSIZ];
… …
427 GET_R->allowedxerror = event->error_code; 440 GET_R->allowedxerror = event->error_code;
428 else 441 else
429 { 442 {
430 // GET_R is most likely not the terminal which caused the error, 443 // GET_R is most likely not the terminal which caused the error,
431 // so just output the error and continue 444 // so just output the error and continue
432#if ENABLE_FRILLS 445#if ENABLE_MINIMAL
446 old_xerror_handler (display, event);
447#else
433 print_x_error (display, event); 448 print_x_error (display, event);
434#else
435 old_xerror_handler (display, event);
436#endif 449#endif
437 } 450 }
438 451
439 return 0; 452 return 0;
440} 453}
… …
448 _exit (EXIT_FAILURE); 461 _exit (EXIT_FAILURE);
449} 462}
450 463
451/*----------------------------------------------------------------------*/ 464/*----------------------------------------------------------------------*/
452bool 465bool
453rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
454{ 467{
468 this->envv = envv;
469
455 SET_R (this); 470 SET_R (this);
456
457 set_locale (""); 471 set_locale ("");
472 set_environ (envv); // few things in X do not call setlocale :(
458 473
459 if (!init_vars ()) 474 if (!init_vars ())
460 return false; 475 return false;
461 476
462 init_secondary (); 477 init_secondary ();
… …
465 480
466#ifdef KEYSYM_RESOURCE 481#ifdef KEYSYM_RESOURCE
467 keyboard->register_done (); 482 keyboard->register_done ();
468#endif 483#endif
469 484
470#if MENUBAR_MAX
471 menubar_read (rs[Rs_menu]);
472#endif
473#ifdef HAVE_SCROLLBARS 485#ifdef HAVE_SCROLLBARS
474 if (OPTION (Opt_scrollBar)) 486 if (option (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */ 487 scrollBar.setIdle (); /* set existence for size calculations */
476#endif 488#endif
477 489
478#if ENABLE_PERL 490 pty = ptytty::create ();
479 rxvt_perl.init ();
480#endif
481
482 PERL_INVOKE ((this, HOOK_INIT, DT_END));
483 491
484 create_windows (argc, argv); 492 create_windows (argc, argv);
485 493
486 dDisp;
487
488 init_xlocale (); 494 init_xlocale ();
489 495
490 scr_reset (); /* initialize screen */ 496 scr_reset (); // initialize screen
491 497
492#if 0 498#if 0
493 XSynchronize (disp, True); 499 XSynchronize (dpy, True);
494#endif 500#endif
495 501
496#ifdef HAVE_SCROLLBARS 502#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar)) 503 if (option (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */ 504 resize_scrollbar (); /* create and map scrollbar */
499#endif 505#endif
500#if (MENUBAR_MAX)
501 if (menubar_visible ())
502 XMapWindow (disp, menuBar.win);
503#endif
504#ifdef TRANSPARENT 506#ifdef TRANSPARENT
505 if (OPTION (Opt_transparent)) 507 if (option (Opt_transparent))
506 { 508 {
507 XSelectInput (disp, display->root, PropertyChangeMask); 509 XSelectInput (dpy, display->root, PropertyChangeMask);
508 check_our_parents (); 510 check_our_parents ();
509 rootwin_ev.start (display, display->root); 511 rootwin_ev.start (display, display->root);
510 } 512 }
511#endif 513#endif
512 514#if ENABLE_PERL
513 XMapWindow (disp, vt); 515 rootwin_ev.start (display, display->root);
514 XMapWindow (disp, parent[0]); 516#endif
515 517
516 set_colorfgbg (); 518 set_colorfgbg ();
517 519
518 init_command (cmd_argv); 520 init_command (cmd_argv);
519 521
520 free (cmd_argv); 522 free (cmd_argv);
521 523
524 if (pty->pty >= 0)
522 pty_ev.start (pty.pty, EVENT_READ); 525 pty_ev.start (pty->pty, EVENT_READ);
523 526
524 check_ev.start (); 527 check_ev.start ();
525 528
526 PERL_INVOKE ((this, HOOK_START, DT_END)); 529 HOOK_INVOKE ((this, HOOK_START, DT_END));
530
531#if ENABLE_XEMBED
532 if (rs[Rs_embed])
533 {
534 long info[2] = { 0, XEMBED_MAPPED };
535
536 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
537 32, PropModeReplace, (unsigned char *)&info, 2);
538 }
539#endif
540
541 XMapWindow (dpy, vt);
542 XMapWindow (dpy, parent[0]);
527 543
528 return true; 544 return true;
529} 545}
530 546
531static struct sig_handlers 547static struct sig_handlers
532{ 548{
533 sig_watcher sw_chld, sw_term, sw_int; 549 sig_watcher sw_term, sw_int;
534 550
535 void sig_chld (sig_watcher &w)
536 {
537 // we are being called for every SIGCHLD, find the corresponding term
538 int pid;
539
540 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
541 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
542 if (pid == (*t)->cmd_pid)
543 {
544 (*t)->child_exit ();
545 break;
546 }
547 }
548
549 /* 551 /*
550 * Catch a fatal signal and tidy up before quitting 552 * Catch a fatal signal and tidy up before quitting
551 */ 553 */
552 void 554 void
553 sig_term (sig_watcher &w) 555 sig_term (sig_watcher &w)
554 { 556 {
555#ifdef DEBUG_CMD
556 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
557#endif
558 rxvt_emergency_cleanup (); 557 rxvt_emergency_cleanup ();
559 signal (w.signum, SIG_DFL); 558 signal (w.signum, SIG_DFL);
560 kill (getpid (), w.signum); 559 kill (getpid (), w.signum);
561 } 560 }
562 561
563 sig_handlers () 562 sig_handlers ()
564 : sw_chld (this, &sig_handlers::sig_chld),
565 sw_term (this, &sig_handlers::sig_term), 563 : sw_term (this, &sig_handlers::sig_term),
566 sw_int (this, &sig_handlers::sig_term) 564 sw_int (this, &sig_handlers::sig_term)
567 { 565 {
568 } 566 }
569} sig_handlers; 567} sig_handlers;
570 568
569char **rxvt_environ; // startup environment
570
571void 571void
572rxvt_init () 572rxvt_init ()
573{ 573{
574 /* 574 ptytty::init ();
575 * Save and then give up any super-user privileges 575
576 * If we need privileges in any area then we must specifically request it. 576 rxvt_environ = environ;
577 * We should only need to be root in these cases:
578 * 1. write utmp entries on some systems
579 * 2. chown tty on some systems
580 */
581 rxvt_privileges (SAVE);
582 rxvt_privileges (IGNORE);
583 577
584 signal (SIGHUP, SIG_IGN); 578 signal (SIGHUP, SIG_IGN);
585 signal (SIGPIPE, SIG_IGN); 579 signal (SIGPIPE, SIG_IGN);
586 580
587 sig_handlers.sw_chld.start (SIGCHLD);
588 sig_handlers.sw_term.start (SIGTERM); 581 sig_handlers.sw_term.start (SIGTERM);
589 sig_handlers.sw_int.start (SIGINT); 582 sig_handlers.sw_int.start (SIGINT);
590 583
591 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 584 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
592 /* signal (SIGURG, SIG_DFL); */ 585 /* signal (SIGURG, SIG_DFL); */
593 586
594 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 587 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
595 // TODO: handle this with exceptions and tolerate the memory loss 588 // TODO: handle this with exceptions and tolerate the memory loss
596 XSetIOErrorHandler (rxvt_xioerror_handler); 589 XSetIOErrorHandler (rxvt_xioerror_handler);
590
591 XrmInitialize ();
597} 592}
598 593
599/* ------------------------------------------------------------------------- * 594/* ------------------------------------------------------------------------- *
600 * MEMORY ALLOCATION WRAPPERS * 595 * MEMORY ALLOCATION WRAPPERS *
601 * ------------------------------------------------------------------------- */ 596 * ------------------------------------------------------------------------- */
… …
619 rxvt_fatal ("memory allocation failure. aborting.\n"); 614 rxvt_fatal ("memory allocation failure. aborting.\n");
620 615
621 return p; 616 return p;
622} 617}
623 618
624void * 619void *
625rxvt_realloc (void *ptr, size_t size) 620rxvt_realloc (void *ptr, size_t size)
626{ 621{
627 void *p = realloc (ptr, size); 622 void *p = realloc (ptr, size);
628 623
629 if (!p) 624 if (!p)
630 rxvt_fatal ("memory allocation failure. aborting.\n"); 625 rxvt_fatal ("memory allocation failure. aborting.\n");
631 626
632 return p; 627 return p;
633} 628}
634
635/* ------------------------------------------------------------------------- *
636 * PRIVILEGED OPERATIONS *
637 * ------------------------------------------------------------------------- */
638/* take care of suid/sgid super-user (root) privileges */
639void
640rxvt_privileges (rxvt_privaction action)
641{
642#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
643 static uid_t euid;
644 static gid_t egid;
645#endif
646
647#if ! defined(__CYGWIN32__)
648# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
649 /* setreuid () is the poor man's setuid (), seteuid () */
650# define seteuid(a) setreuid(-1, (a))
651# define setegid(a) setregid(-1, (a))
652# define HAVE_SETEUID
653# endif
654# ifdef HAVE_SETEUID
655 switch (action)
656 {
657 case IGNORE:
658 /*
659 * change effective uid/gid - not real uid/gid - so we can switch
660 * back to root later, as required
661 */
662 seteuid (getuid ());
663 setegid (getgid ());
664 break;
665 case SAVE:
666 euid = geteuid ();
667 egid = getegid ();
668 break;
669 case RESTORE:
670 seteuid (euid);
671 setegid (egid);
672 break;
673 }
674# else
675 switch (action)
676 {
677 case IGNORE:
678 setuid (getuid ());
679 setgid (getgid ());
680 /* FALLTHROUGH */
681 case SAVE:
682 /* FALLTHROUGH */
683 case RESTORE:
684 break;
685 }
686# endif
687#endif
688}
689
690#ifdef UTMP_SUPPORT
691void
692rxvt_term::privileged_utmp (rxvt_privaction action)
693{
694 if (OPTION (Opt_utmpInhibit)
695 || !pty.name || !*pty.name)
696 return;
697
698 rxvt_privileges (RESTORE);
699
700 if (action == SAVE)
701 makeutent (pty.name, rs[Rs_display_name]);
702 else
703 cleanutent ();
704
705 rxvt_privileges (IGNORE);
706}
707#endif
708 629
709/*----------------------------------------------------------------------*/ 630/*----------------------------------------------------------------------*/
710/* 631/*
711 * window size/position calculcations for XSizeHint and other storage. 632 * window size/position calculcations for XSizeHint and other storage.
712 * if width/height are non-zero then override calculated width/height 633 * if width/height are non-zero then override calculated width/height
713 */ 634 */
714void 635void
715rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 636rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
716{ 637{
717 short recalc_x, recalc_y; 638 short recalc_x, recalc_y;
718 int x, y, sb_w, mb_h, flags; 639 int x, y, sb_w, flags;
719 unsigned int w, h; 640 unsigned int w, h;
720 unsigned int max_width, max_height; 641 unsigned int max_width, max_height;
721 dDisp;
722
723 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
724 ncol, nrow, szHint.width, szHint.height));
725 642
726 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 643 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
727 szHint.win_gravity = NorthWestGravity; 644 szHint.win_gravity = NorthWestGravity;
728 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 645 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
729 646
… …
784 max_width = MAX_COLS * fwidth; 701 max_width = MAX_COLS * fwidth;
785 max_height = MAX_ROWS * fheight; 702 max_height = MAX_ROWS * fheight;
786 703
787 szHint.base_width = szHint.base_height = 2 * int_bwidth; 704 szHint.base_width = szHint.base_height = 2 * int_bwidth;
788 705
789 sb_w = mb_h = 0; 706 sb_w = 0;
790 window_vt_x = window_vt_y = int_bwidth; 707 window_vt_x = window_vt_y = int_bwidth;
791 708
792 if (scrollbar_visible ()) 709 if (scrollBar.state)
793 { 710 {
794 sb_w = scrollbar_TotalWidth (); 711 sb_w = scrollbar_TotalWidth ();
795 szHint.base_width += sb_w; 712 szHint.base_width += sb_w;
713
796 if (!OPTION (Opt_scrollBar_right)) 714 if (!option (Opt_scrollBar_right))
797 window_vt_x += sb_w; 715 window_vt_x += sb_w;
798 } 716 }
799 717
800 if (menubar_visible ())
801 {
802 mb_h = menuBar_TotalHeight ();
803 szHint.base_height += mb_h;
804 window_vt_y += mb_h;
805 }
806
807 szHint.width_inc = fwidth; 718 szHint.width_inc = fwidth;
808 szHint.height_inc = fheight; 719 szHint.height_inc = fheight;
809 szHint.min_width = szHint.base_width + szHint.width_inc; 720 szHint.min_width = szHint.base_width + szHint.width_inc;
810 szHint.min_height = szHint.base_height + szHint.height_inc; 721 szHint.min_height = szHint.base_height + szHint.height_inc;
811 722
812 if (newwidth && newwidth - szHint.base_width < max_width) 723 if (newwidth && newwidth - szHint.base_width < max_width)
813 { 724 {
814 szHint.width = newwidth; 725 szHint.width = newwidth;
… …
829 { 740 {
830 min_it (height, max_height); 741 min_it (height, max_height);
831 szHint.height = szHint.base_height + height; 742 szHint.height = szHint.base_height + height;
832 } 743 }
833 744
834 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 745 if (scrollBar.state && option (Opt_scrollBar_right))
835 window_sb_x = szHint.width - sb_w; 746 window_sb_x = szHint.width - sb_w;
836 747
837 if (recalc_x) 748 if (recalc_x)
838 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750
839 if (recalc_y) 751 if (recalc_y)
840 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 752 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
841 753
842 ncol = width / fwidth; 754 ncol = width / fwidth;
843 nrow = height / fheight; 755 nrow = height / fheight;
844 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
845 ncol, nrow, szHint.width,
846 szHint.height));
847 return;
848} 756}
849 757
850/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
851/* 759/*
852 * Tell the teletype handler what size the window is. 760 * Tell the teletype handler what size the window is.
853 * Called after a window size change. 761 * Called after a window size change.
854 */ 762 */
855void 763void
856rxvt_term::tt_winch () 764rxvt_term::tt_winch ()
857{ 765{
858 if (pty.pty < 0) 766 if (pty->pty < 0)
859 return; 767 return;
860 768
861 struct winsize ws; 769 struct winsize ws;
862 770
863 ws.ws_col = ncol; 771 ws.ws_col = ncol;
864 ws.ws_row = nrow; 772 ws.ws_row = nrow;
865 ws.ws_xpixel = width; 773 ws.ws_xpixel = width;
866 ws.ws_ypixel = height; 774 ws.ws_ypixel = height;
867 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 775 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
868 776
869#if 0 777#if 0
870 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 778 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
871 if (cmd_pid) /* force through to the command */ 779 if (cmd_pid) /* force through to the command */
872 kill (-cmd_pid, SIGWINCH); 780 kill (-cmd_pid, SIGWINCH);
… …
904 delete fontset[0]; 812 delete fontset[0];
905 fontset[0] = fs; 813 fontset[0] = fs;
906 814
907 prop = (*fs)[1]->properties (); 815 prop = (*fs)[1]->properties ();
908 prop.height += lineSpace; 816 prop.height += lineSpace;
817
909 fs->set_prop (prop); 818 fs->set_prop (prop, false);
910 819
911 fwidth = prop.width; 820 fwidth = prop.width;
912 fheight = prop.height; 821 fheight = prop.height;
913 fbase = (*fs)[1]->ascent; 822 fbase = prop.ascent;
914 823
915 for (int style = 1; style < 4; style++) 824 for (int style = 1; style < 4; style++)
916 { 825 {
917#if ENABLE_STYLES 826#if ENABLE_STYLES
918 const char *res = rs[Rs_font + style]; 827 const char *res = rs[Rs_font + style];
… …
923 { 832 {
924 fontset[style] = fs = new rxvt_fontset (this); 833 fontset[style] = fs = new rxvt_fontset (this);
925 rxvt_fontprop prop2 = prop; 834 rxvt_fontprop prop2 = prop;
926 835
927 if (res) 836 if (res)
928 prop2.weight = prop2.slant = rxvt_fontprop::unset; 837 {
838 fs->populate (res);
839 fs->set_prop (prop2, false);
840 }
929 else 841 else
930 { 842 {
931 res = fontset[0]->fontdesc; 843 fs->populate (fontset[0]->fontdesc);
932 844
933 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 845 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
934 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 846 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
847
848 fs->set_prop (prop2, true);
935 } 849 }
936 850
937 fs->populate (res);
938 fs->set_prop (prop2);
939 } 851 }
940#else 852#else
941 fontset[style] = fontset[0]; 853 fontset[style] = fontset[0];
942#endif 854#endif
943 } 855 }
… …
952 return true; 864 return true;
953} 865}
954 866
955void rxvt_term::set_string_property (Atom prop, const char *str, int len) 867void rxvt_term::set_string_property (Atom prop, const char *str, int len)
956{ 868{
957 XChangeProperty (display->display, parent[0], 869 XChangeProperty (dpy, parent[0],
958 prop, XA_STRING, 8, PropModeReplace, 870 prop, XA_STRING, 8, PropModeReplace,
959 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 871 (const unsigned char *)str, len >= 0 ? len : strlen (str));
960} 872}
961 873
962void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 874void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
963{ 875{
964 wchar_t *ws = rxvt_mbstowcs (str, len); 876 wchar_t *ws = rxvt_mbstowcs (str, len);
965 char *s = rxvt_wcstoutf8 (ws); 877 char *s = rxvt_wcstoutf8 (ws);
966 878
967 XChangeProperty (display->display, parent[0], 879 XChangeProperty (dpy, parent[0],
968 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 880 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
969 (const unsigned char *)s, strlen (s)); 881 (const unsigned char *)s, strlen (s));
970 882
971 free (s); 883 free (s);
972 free (ws); 884 free (ws);
… …
997void 909void
998rxvt_term::set_window_color (int idx, const char *color) 910rxvt_term::set_window_color (int idx, const char *color)
999{ 911{
1000 rxvt_color xcol; 912 rxvt_color xcol;
1001 int i; 913 int i;
1002 914
1003 if (color == NULL || *color == '\0') 915 if (color == NULL || *color == '\0')
1004 return; 916 return;
917
918 color = strdup (color);
919 allocated.push_back ((void *)color);
920 rs[Rs_color + idx] = color;
1005 921
1006 /* handle color aliases */ 922 /* handle color aliases */
1007 if (isdigit (*color)) 923 if (isdigit (*color))
1008 { 924 {
1009 i = atoi (color); 925 i = atoi (color);
1010 926
1011 if (i >= 8 && i <= 15) 927 if (i >= 8 && i <= 15)
1012 { /* bright colors */ 928 { /* bright colors */
1013 i -= 8; 929 i -= 8;
1014# ifndef NO_BRIGHTCOLOR
1015 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 930 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1016 SET_PIXCOLOR (idx);
1017 goto done; 931 goto done;
1018# endif
1019 } 932 }
1020 933
1021 if (i >= 0 && i <= 7) 934 if (i >= 0 && i <= 7)
1022 { /* normal colors */ 935 { /* normal colors */
1023 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 936 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1024 SET_PIXCOLOR (idx);
1025 goto done; 937 goto done;
1026 } 938 }
1027 } 939 }
1028 940
1029 if (!rXParseAllocColor (&xcol, color)) 941 set_color (xcol, color);
1030 return;
1031
1032 /* XStoreColor (display->display, display->cmap, XColor*); */
1033 942
1034 /* 943 /*
1035 * FIXME: should free colors here, but no idea how to do it so instead, 944 * FIXME: should free colors here, but no idea how to do it so instead,
1036 * so just keep gobbling up the colormap 945 * so just keep gobbling up the colormap
1037 */ 946 */
1038# if 0
1039 for (i = Color_Black; i <= Color_White; i++)
1040 if (pix_colors[idx] == pix_colors[i])
1041 break;
1042 if (i > Color_White)
1043 {
1044 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1045 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1046 DisplayPlanes (display->display, display->screen));
1047 }
1048# endif
1049 947
1050 pix_colors_focused[idx] = xcol; 948 pix_colors_focused[idx] = xcol;
1051 SET_PIXCOLOR (idx);
1052 949
1053 /* XSetWindowAttributes attr; */ 950 /* XSetWindowAttributes attr; */
1054 /* Cursor cursor; */ 951 /* Cursor cursor; */
1055done: 952done:
1056
1057#if OFF_FOCUS_FADING
1058 if (rs[Rs_fade])
1059 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1060#endif
1061
1062 /*TODO: handle Color_BD, scrollbar background, etc. */ 953 /*TODO: handle Color_BD, scrollbar background, etc. */
1063 954
955 update_fade_color (idx);
1064 recolour_cursor (); 956 recolour_cursor ();
1065 scr_recolour (); 957 scr_recolour ();
1066} 958}
1067 959
1068#else 960#else
… …
1070#endif /* XTERM_COLOR_CHANGE */ 962#endif /* XTERM_COLOR_CHANGE */
1071 963
1072void 964void
1073rxvt_term::recolour_cursor () 965rxvt_term::recolour_cursor ()
1074{ 966{
1075 XColor xcol[2]; 967 XColor fg, bg;
1076 968
1077 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 969 (ISSET_PIXCOLOR (Color_pointer_fg)
1078 ? pix_colors_focused[Color_pointer_fg] 970 ? pix_colors_focused[Color_pointer_fg]
1079 : pix_colors_focused[Color_fg]; 971 : pix_colors_focused[Color_fg]).get (fg);
972
1080 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 973 (ISSET_PIXCOLOR (Color_pointer_bg)
1081 ? pix_colors_focused[Color_pointer_bg] 974 ? pix_colors_focused[Color_pointer_bg]
1082 : pix_colors_focused[Color_bg]; 975 : pix_colors_focused[Color_bg]).get (bg);
1083 976
1084 XQueryColors (display->display, display->cmap, xcol, 2); 977 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1085 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1086} 978}
1087 979
1088/*----------------------------------------------------------------------*/ 980/*----------------------------------------------------------------------*/
1089/* 981/*
1090 * find if fg/bg matches any of the normal (low-intensity) colors 982 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1094{ 986{
1095 unsigned int i; 987 unsigned int i;
1096 const char *xpmb = "\0"; 988 const char *xpmb = "\0";
1097 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 989 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1098 990
1099 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1100 strcpy (fstr, "default"); 991 strcpy (fstr, "default");
1101 strcpy (bstr, "default"); 992 strcpy (bstr, "default");
1102 for (i = Color_Black; i <= Color_White; i++) 993 for (i = Color_Black; i <= Color_White; i++)
1103 if (pix_colors[Color_fg] == pix_colors[i]) 994 if (pix_colors[Color_fg] == pix_colors[i])
1104 { 995 {
… …
1119 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1010 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1120} 1011}
1121 1012
1122/*----------------------------------------------------------------------*/ 1013/*----------------------------------------------------------------------*/
1123 1014
1124int 1015bool
1125rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1016rxvt_term::set_color (rxvt_color &color, const char *name)
1126{ 1017{
1127 if (!screen_in_out->set (display, colour)) 1018 if (color.set (this, name))
1128 {
1129 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1130 return false;
1131 }
1132
1133 return true; 1019 return true;
1020
1021 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1022 return false;
1023}
1024
1025void
1026rxvt_term::alias_color (int dst, int src)
1027{
1028 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1134} 1029}
1135 1030
1136/* -------------------------------------------------------------------- * 1031/* -------------------------------------------------------------------- *
1137 * - WINDOW RESIZING - * 1032 * - WINDOW RESIZING - *
1138 * -------------------------------------------------------------------- */ 1033 * -------------------------------------------------------------------- */
1139void 1034void
1140rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1035rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1141{ 1036{
1142 int fix_screen; 1037 int fix_screen;
1143 int old_width = szHint.width, old_height = szHint.height; 1038 int old_width = szHint.width;
1144 dDisp; 1039 int old_height = szHint.height;
1145 1040
1146 window_calc (newwidth, newheight); 1041 window_calc (newwidth, newheight);
1042
1043 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1147 XSetWMNormalHints (disp, parent[0], &szHint); 1044 XSetWMNormalHints (dpy, parent[0], &szHint);
1148 1045
1149 if (!ignoreparent) 1046 if (!ignoreparent)
1150 { 1047 {
1151#ifdef SMART_RESIZE 1048#ifdef SMART_RESIZE
1152 /* 1049 /*
… …
1156 int x, y, x1, y1; 1053 int x, y, x1, y1;
1157 int dx, dy; 1054 int dx, dy;
1158 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1055 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1159 Window unused_cr; 1056 Window unused_cr;
1160 1057
1161 XTranslateCoordinates (disp, parent[0], display->root, 1058 XTranslateCoordinates (dpy, parent[0], display->root,
1162 0, 0, &x, &y, &unused_cr); 1059 0, 0, &x, &y, &unused_cr);
1163 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1060 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1164 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1061 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1165 /* 1062 /*
1166 * if display->root isn't the parent window, a WM will probably have offset 1063 * if display->root isn't the parent window, a WM will probably have offset
1167 * our position for handles and decorations. Counter it 1064 * our position for handles and decorations. Counter it
1168 */ 1065 */
… …
1170 { 1067 {
1171 x -= x1; 1068 x -= x1;
1172 y -= y1; 1069 y -= y1;
1173 } 1070 }
1174 1071
1175 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1072 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1176 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1073 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1177 dx = old_width - szHint.width; 1074 dx = old_width - szHint.width;
1178 dy = old_height - szHint.height; 1075 dy = old_height - szHint.height;
1179 1076
1180 /* Check position of the center of the window */ 1077 /* Check position of the center of the window */
1181 if (x < x1) /* left half */ 1078 if (x < x1) /* left half */
1182 dx = 0; 1079 dx = 0;
… …
1185 if (y < y1) /* top half */ 1082 if (y < y1) /* top half */
1186 dy = 0; 1083 dy = 0;
1187 else if (y == y1) /* exact center */ 1084 else if (y == y1) /* exact center */
1188 dy /= 2; 1085 dy /= 2;
1189 1086
1190 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1087 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1191 szHint.width, szHint.height); 1088 szHint.width, szHint.height);
1192#else 1089#else
1193 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1090 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1194#endif 1091#endif
1195 } 1092 }
1196 1093
1197 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1094 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1198 1095
1199 if (fix_screen || newwidth != old_width || newheight != old_height) 1096 if (fix_screen || newwidth != old_width || newheight != old_height)
1200 { 1097 {
1201 if (scrollbar_visible ()) 1098 if (scrollBar.state)
1202 { 1099 {
1203 XMoveResizeWindow (disp, scrollBar.win, 1100 XMoveResizeWindow (dpy, scrollBar.win,
1204 window_sb_x, 0, 1101 window_sb_x, 0,
1205 scrollbar_TotalWidth (), szHint.height); 1102 scrollbar_TotalWidth (), szHint.height);
1206 resize_scrollbar (); 1103 resize_scrollbar ();
1207 } 1104 }
1208 1105
1209 if (menubar_visible ())
1210 XMoveResizeWindow (disp, menuBar.win,
1211 window_vt_x, 0,
1212 TermWin_TotalWidth (), menuBar_TotalHeight ());
1213
1214 XMoveResizeWindow (disp, vt, 1106 XMoveResizeWindow (dpy, vt,
1215 window_vt_x, window_vt_y, 1107 window_vt_x, window_vt_y,
1216 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1108 width, height);
1217 1109
1218 scr_clear (); 1110 scr_clear ();
1219#ifdef XPM_BACKGROUND 1111#ifdef XPM_BACKGROUND
1220 resize_pixmap (); 1112 resize_pixmap ();
1221#endif 1113#endif
1222 } 1114 }
1223 1115
1224 if (fix_screen || old_height == 0) 1116 if (fix_screen || old_height == 0)
1225 {
1226 int curr_screen = -1;
1227 int old_ncol = prev_ncol;
1228
1229 /* scr_reset only works on the primary screen */
1230 if (old_height) /* this is not the first time through */
1231 {
1232 unsigned int ocol = ncol;
1233 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1234 curr_screen = scr_change_screen (PRIMARY);
1235 ncol = ocol;
1236 }
1237
1238 scr_reset (); 1117 scr_reset ();
1239 1118
1240 if (curr_screen >= 0) /* this is not the first time through */ 1119 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1241 { 1120 //scr_touch (false);
1242 scr_change_screen (curr_screen);
1243 selection_check (old_ncol != ncol ? 4 : 0);
1244 }
1245 }
1246
1247 old_width = szHint.width;
1248 old_height = szHint.height;
1249 1121
1250#ifdef XPM_BACKGROUND 1122#ifdef XPM_BACKGROUND
1251 if (pixmap) 1123 if (pixmap)
1252 scr_touch (false); 1124 scr_touch (false);
1253#endif 1125#endif
1254 1126
1255#ifdef USE_XIM 1127#ifdef USE_XIM
1256 IMSetStatusPosition (); 1128 IMSetPosition ();
1257#endif 1129#endif
1258} 1130}
1259 1131
1260/* 1132/*
1261 * Set the width/height of the vt window in characters. Units are pixels. 1133 * Set the width/height of the vt window in characters. Units are pixels.
… …
1266{ 1138{
1267 XWindowAttributes wattr; 1139 XWindowAttributes wattr;
1268 1140
1269 if (newwidth == 0 || newheight == 0) 1141 if (newwidth == 0 || newheight == 0)
1270 { 1142 {
1271 XGetWindowAttributes (display->display, display->root, &wattr); 1143 XGetWindowAttributes (dpy, display->root, &wattr);
1272 1144
1273 if (newwidth == 0) 1145 if (newwidth == 0)
1274 newwidth = wattr.width - szHint.base_width; 1146 newwidth = wattr.width - szHint.base_width;
1275 if (newheight == 0) 1147 if (newheight == 0)
1276 newheight = wattr.height - szHint.base_height; 1148 newheight = wattr.height - szHint.base_height;
… …
1290#ifdef USE_XIM 1162#ifdef USE_XIM
1291 1163
1292void 1164void
1293rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1165rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1294{ 1166{
1295 fg = pix_colors[Color_fg]; 1167 fg = pix_colors [Color_fg];
1296 bg = pix_colors[Color_bg]; 1168 bg = pix_colors [Color_bg];
1297} 1169}
1298 1170
1299void 1171void
1300rxvt_term::im_set_size (XRectangle &size) 1172rxvt_term::im_set_size (XRectangle &size)
1301{ 1173{
… …
1338 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1210 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1339 1211
1340 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1212 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1341 *p = '\0'; 1213 *p = '\0';
1342 1214
1343 atom = XInternAtom (display->display, server, False); 1215 atom = XInternAtom (dpy, server, False);
1344 win = XGetSelectionOwner (display->display, atom); 1216 win = XGetSelectionOwner (dpy, atom);
1345 1217
1346 if (win != None) 1218 if (win != None)
1347 return True; 1219 return True;
1348 } 1220 }
1349 1221
… …
1356 XPoint nspot; 1228 XPoint nspot;
1357 XVaNestedList preedit_attr; 1229 XVaNestedList preedit_attr;
1358 1230
1359 if (!Input_Context 1231 if (!Input_Context
1360 || !focus 1232 || !focus
1361 || !(input_style & XIMPreeditPosition)) 1233 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1362 return; 1234 return;
1363 1235
1364 im_set_position (nspot); 1236 im_set_position (nspot);
1365 1237
1366 if (nspot.x == spot.x && nspot.y == spot.y) 1238 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1385 input_method = 0; 1257 input_method = 0;
1386 } 1258 }
1387 1259
1388 Input_Context = 0; 1260 Input_Context = 0;
1389} 1261}
1262
1263#ifdef ENABLE_XIM_ONTHESPOT
1264
1265static void
1266xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1267{
1268 ((rxvt_term *)client_data)->make_current ();
1269 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1270}
1271
1272static void
1273xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1274{
1275 ((rxvt_term *)client_data)->make_current ();
1276 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1277}
1278
1279static void
1280xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1281{
1282 rxvt_term *term = (rxvt_term *)client_data;
1283 XIMText *text = call_data->text;
1284
1285 term->make_current ();
1286
1287 if (text)
1288 {
1289 void *str;
1290
1291 if (!text->encoding_is_wchar && text->string.multi_byte)
1292 {
1293 // of course, X makes it ugly again
1294 if (term->rs[Rs_imLocale])
1295 SET_LOCALE (term->rs[Rs_imLocale]);
1296
1297 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1298 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1299
1300 if (term->rs[Rs_imLocale])
1301 SET_LOCALE (term->locale);
1302 }
1303 else
1304 str = (void *)text->string.wide_char;
1305
1306 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1307 DT_INT, call_data->caret,
1308 DT_INT, call_data->chg_first,
1309 DT_INT, call_data->chg_length,
1310 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1311 DT_WCS_LEN, str, str ? (int)text->length : 0,
1312 DT_END));
1313 }
1314 else
1315 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1316 DT_INT, call_data->caret,
1317 DT_INT, call_data->chg_first,
1318 DT_INT, call_data->chg_length,
1319 DT_END));
1320}
1321
1322#if 0
1323static void
1324xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1325{
1326 ((rxvt_term *)client_data)->make_current ();
1327 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1328 DT_INT, call_data->position,
1329 DT_INT, call_data->direction,
1330 DT_INT, call_data->style,
1331 DT_END));
1332}
1333#endif
1334
1335#endif
1390 1336
1391/* 1337/*
1392 * Try to open a XIM with the current modifiers, then see if we can 1338 * Try to open a XIM with the current modifiers, then see if we can
1393 * open a suitable preedit type 1339 * open a suitable preedit type
1394 */ 1340 */
… …
1401 XRectangle rect, status_rect, needed_rect; 1347 XRectangle rect, status_rect, needed_rect;
1402 unsigned long fg, bg; 1348 unsigned long fg, bg;
1403 const char *p; 1349 const char *p;
1404 char **s; 1350 char **s;
1405 XIMStyles *xim_styles; 1351 XIMStyles *xim_styles;
1352#ifdef ENABLE_XIM_ONTHESPOT
1353 XIMCallback xcb[4];
1354#endif
1355
1356 set_environ (envv);
1406 1357
1407 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1358 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1408 return false; 1359 return false;
1409 1360
1410 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1411 input_method = display->get_xim (locale, modifiers); 1361 input_method = display->get_xim (locale, modifiers);
1412 if (input_method == NULL) 1362 if (input_method == NULL)
1413 return false; 1363 return false;
1414 1364
1415 xim = input_method->xim; 1365 xim = input_method->xim;
… …
1435 s = rxvt_splitcommastring (p); 1385 s = rxvt_splitcommastring (p);
1436 1386
1437 for (i = found = 0; !found && s[i]; i++) 1387 for (i = found = 0; !found && s[i]; i++)
1438 { 1388 {
1439 if (!strcmp (s[i], "OverTheSpot")) 1389 if (!strcmp (s[i], "OverTheSpot"))
1440 input_style = (XIMPreeditPosition | XIMStatusNothing); 1390 input_style = XIMPreeditPosition | XIMStatusNothing;
1441 else if (!strcmp (s[i], "OffTheSpot")) 1391 else if (!strcmp (s[i], "OffTheSpot"))
1442 input_style = (XIMPreeditArea | XIMStatusArea); 1392 input_style = XIMPreeditArea | XIMStatusArea;
1443 else if (!strcmp (s[i], "Root")) 1393 else if (!strcmp (s[i], "Root"))
1444 input_style = (XIMPreeditNothing | XIMStatusNothing); 1394 input_style = XIMPreeditNothing | XIMStatusNothing;
1445 else if (!strcmp (s[i], "None")) 1395 else if (!strcmp (s[i], "None"))
1446 input_style = (XIMPreeditNone | XIMStatusNone); 1396 input_style = XIMPreeditNone | XIMStatusNone;
1397#ifdef ENABLE_XIM_ONTHESPOT
1398 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1399 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1400#endif
1401 else
1402 input_style = XIMPreeditNothing | XIMStatusNothing;
1447 1403
1448 for (j = 0; j < xim_styles->count_styles; j++) 1404 for (j = 0; j < xim_styles->count_styles; j++)
1449 if (input_style == xim_styles->supported_styles[j]) 1405 if (input_style == xim_styles->supported_styles[j])
1450 { 1406 {
1451 rxvt_freecommastring (s); 1407 rxvt_freecommastring (s);
… …
1489 "*", 1445 "*",
1490 fheight, 1446 fheight,
1491 fheight + 1, fheight - 1, 1447 fheight + 1, fheight - 1,
1492 fheight - 2, fheight + 2); 1448 fheight - 2, fheight + 2);
1493 1449
1494 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1450 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1495 &missing_charset_list, &missing_charset_count, &def_string); 1451 &missing_charset_list, &missing_charset_count, &def_string);
1496 1452
1497 if (missing_charset_list) 1453 if (missing_charset_list)
1498 XFreeStringList (missing_charset_list); 1454 XFreeStringList (missing_charset_list);
1499 1455
… …
1540 XNBackground, bg, 1496 XNBackground, bg,
1541 XNArea, &status_rect, 1497 XNArea, &status_rect,
1542 XNFontSet, fs, 1498 XNFontSet, fs,
1543 NULL); 1499 NULL);
1544 } 1500 }
1501#if ENABLE_XIM_ONTHESPOT
1502 else if (input_style & XIMPreeditCallbacks)
1503 {
1504 im_set_position (spot);
1505
1506 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1507 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1508 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1509# if 0
1510 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1511# endif
1512
1513 preedit_attr = XVaCreateNestedList (0,
1514 XNSpotLocation, &spot,
1515 XNPreeditStartCallback, &xcb[0],
1516 XNPreeditDoneCallback , &xcb[1],
1517 XNPreeditDrawCallback , &xcb[2],
1518# if 0
1519 XNPreeditCaretCallback, &xcb[3],
1520# endif
1521 NULL);
1522 }
1523#endif
1545 1524
1546 Input_Context = XCreateIC (xim, 1525 Input_Context = XCreateIC (xim,
1547 XNInputStyle, input_style, 1526 XNInputStyle, input_style,
1548 XNClientWindow, vt, 1527 XNClientWindow, vt,
1549 XNFocusWindow, parent[0], 1528 XNFocusWindow, parent[0],
… …
1551 preedit_attr, 1530 preedit_attr,
1552 status_attr ? XNStatusAttributes : NULL, 1531 status_attr ? XNStatusAttributes : NULL,
1553 status_attr, NULL); 1532 status_attr, NULL);
1554 1533
1555 if (preedit_attr) XFree (preedit_attr); 1534 if (preedit_attr) XFree (preedit_attr);
1556 if (status_attr) XFree (status_attr); 1535 if (status_attr) XFree (status_attr);
1557 if (fs) XFreeFontSet (display->display, fs); 1536 if (fs) XFreeFontSet (dpy, fs);
1558 1537
1559 if (Input_Context == NULL) 1538 if (Input_Context == NULL)
1560 { 1539 {
1561 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1540 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1562 im_destroy (); 1541 im_destroy ();
1563 return false; 1542 return false;
1564 } 1543 }
1565 1544
1566 if (input_style & XIMPreeditArea) 1545#if 0
1546 // unfortunately, only the focus window is used by XIM, hard to fix
1547 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1548 vt_select_input ();
1549#endif
1550
1567 IMSetStatusPosition (); 1551 IMSetPosition ();
1568 1552
1569 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1570 return true; 1553 return true;
1571} 1554}
1572 1555
1573void 1556void
1574rxvt_term::im_cb () 1557rxvt_term::im_cb ()
… …
1576 int i; 1559 int i;
1577 const char *p; 1560 const char *p;
1578 char **s; 1561 char **s;
1579 char buf[IMBUFSIZ]; 1562 char buf[IMBUFSIZ];
1580 1563
1581 SET_R (this); 1564 make_current ();
1582 1565
1583 im_destroy (); 1566 im_destroy ();
1584 1567
1585 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1586 if (Input_Context) 1568 if (Input_Context)
1587 return; 1569 return;
1588 1570
1589#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1571#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1590 if (rs[Rs_imLocale]) 1572 if (rs[Rs_imLocale])
… …
1632 SET_LOCALE (locale); 1614 SET_LOCALE (locale);
1633#endif 1615#endif
1634} 1616}
1635 1617
1636void 1618void
1637rxvt_term::IMSetStatusPosition () 1619rxvt_term::IMSetPosition ()
1638{ 1620{
1639 XRectangle preedit_rect, status_rect, *needed_rect; 1621 XRectangle preedit_rect, status_rect, *needed_rect;
1640 XVaNestedList preedit_attr, status_attr; 1622 XVaNestedList preedit_attr, status_attr;
1641 1623
1642 if (!Input_Context 1624 if (!Input_Context
1643 || !focus 1625 || !focus
1644 || !(input_style & XIMPreeditArea) 1626 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1645 || !IMisRunning ()) 1627 || !IMisRunning ())
1646 return; 1628 return;
1647 1629
1630 if (input_style & XIMPreeditPosition)
1631 {
1632 im_set_size (preedit_rect);
1633 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1634
1635 XSetICValues (Input_Context,
1636 XNPreeditAttributes, preedit_attr, NULL);
1637 }
1638 else
1639 {
1648 /* Getting the necessary width of preedit area */ 1640 /* Getting the necessary width of preedit area */
1649 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1641 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1650 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1642 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1651 XFree (status_attr); 1643 XFree (status_attr);
1652 1644
1653 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1645 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1654 XFree (needed_rect); 1646 XFree (needed_rect);
1655 1647
1656 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1648 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1657 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1649 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1658 1650
1659 XSetICValues (Input_Context, 1651 XSetICValues (Input_Context,
1660 XNPreeditAttributes, preedit_attr, 1652 XNPreeditAttributes, preedit_attr,
1661 XNStatusAttributes, status_attr, NULL); 1653 XNStatusAttributes, status_attr,
1654 NULL);
1662 1655
1656 XFree (status_attr);
1657 }
1658
1663 XFree (preedit_attr); 1659 XFree (preedit_attr);
1664 XFree (status_attr);
1665} 1660}
1666#endif /* USE_XIM */ 1661#endif /* USE_XIM */
1667 1662
1668/*----------------------------------------------------------------------*/
1669rxvt_t rxvt_current_term;
1670
1671/*----------------------- end-of-file (C source) -----------------------*/ 1663/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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