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

Diff Legend

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