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.60 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.118 by root, Thu Dec 9 06:20:41 2004 UTC

1/*--------------------------------*-C-*---------------------------------*; 1/*--------------------------------*-C-*---------------------------------*
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>
7 * - original version 7 * - original version
… …
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring> 47#include <cstring>
48 48
49vector<rxvt_term *> rxvt_term::termlist;
50
49static char curlocale[128]; 51static char curlocale[128];
50 52
51void 53bool
52rxvt_set_locale (const char *locale) 54rxvt_set_locale (const char *locale)
53{ 55{
54 if (locale && STRNCMP (locale, curlocale, 128)) 56 if (!locale || !strncmp (locale, curlocale, 128))
55 { 57 return false;
58
56 STRNCPY (curlocale, locale, 128); 59 strncpy (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale); 60 setlocale (LC_CTYPE, curlocale);
58 } 61 return true;
59} 62}
60 63
61#if ENABLE_COMBINING 64#if ENABLE_COMBINING
62class rxvt_composite_vec rxvt_composite; 65class rxvt_composite_vec rxvt_composite;
63 66
… …
120 return len; 123 return len;
121 124
122} 125}
123#endif 126#endif
124 127
125void *
126rxvt_term::operator new (size_t s)
127{
128 void *p = malloc (s);
129
130 MEMSET (p, 0, s);
131 return p;
132}
133
134void
135rxvt_term::operator delete (void *p, size_t s)
136{
137 free (p);
138}
139
140rxvt_term::rxvt_term () 128rxvt_term::rxvt_term ()
141 : 129 :
130#if TRANSPARENT
142 rootwin_ev (this, &rxvt_term::rootwin_cb), 131 rootwin_ev (this, &rxvt_term::rootwin_cb),
132#endif
133#ifdef HAVE_SCROLLBARS
134 scrollbar_ev (this, &rxvt_term::x_cb),
135#endif
136#ifdef MENUBAR
137 menubar_ev (this, &rxvt_term::x_cb),
138#endif
139#ifdef CURSOR_BLINK
140 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
141#endif
142#ifdef TEXT_BLINK
143 text_blink_ev (this, &rxvt_term::text_blink_cb),
144#endif
145#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
146 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
147#endif
148#ifdef SELECTION_SCROLLING
149 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
150#endif
151#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
152 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
153#endif
154#ifdef POINTER_BLANK
155 pointer_ev (this, &rxvt_term::pointer_cb),
156#endif
157#ifdef USE_XIM
158 im_ev (this, &rxvt_term::im_cb),
159#endif
160 sw_term (this, &rxvt_term::sig_term),
161 sw_chld (this, &rxvt_term::sig_chld),
143 termwin_ev (this, &rxvt_term::x_cb), 162 termwin_ev (this, &rxvt_term::x_cb),
144 vt_ev (this, &rxvt_term::x_cb), 163 vt_ev (this, &rxvt_term::x_cb),
145#ifdef HAVE_SCROLLBARS
146 scrollbar_ev (this, &rxvt_term::x_cb),
147#endif
148#ifdef MENUBAR
149 menubar_ev (this, &rxvt_term::x_cb),
150#endif
151#ifdef CURSOR_BLINK
152 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
153#endif
154#ifdef TEXT_BLINK
155 text_blink_ev (this, &rxvt_term::text_blink_cb),
156#endif
157#ifdef POINTER_BLANK
158 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif
160#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb),
162#endif
163 check_ev (this, &rxvt_term::check_cb), 164 check_ev (this, &rxvt_term::check_cb),
165 flush_ev (this, &rxvt_term::flush_cb),
164 destroy_ev (this, &rxvt_term::destroy_cb), 166 destroy_ev (this, &rxvt_term::destroy_cb),
165 pty_ev (this, &rxvt_term::pty_cb), 167 pty_ev (this, &rxvt_term::pty_cb),
166 incr_ev (this, &rxvt_term::incr_cb) 168 incr_ev (this, &rxvt_term::incr_cb)
167{ 169{
168 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 170 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
171
172 termlist.push_back (this);
169} 173}
170 174
171rxvt_term::~rxvt_term () 175rxvt_term::~rxvt_term ()
172{ 176{
177 termlist.erase (find (termlist.begin (), termlist.end(), this));
178
173 if (cmd_fd >= 0) 179 if (cmd_pid)
174 close (cmd_fd); 180 kill (-cmd_pid, SIGHUP);
175 181
176#ifndef NO_SETOWNER_TTYDEV 182 pty.put ();
177 privileged_ttydev (RESTORE); 183
178#endif
179#ifdef UTMP_SUPPORT 184#ifdef UTMP_SUPPORT
180 privileged_utmp (RESTORE); 185 privileged_utmp (RESTORE);
181#endif 186#endif
182 187
188#if ENABLE_STYLES
189 for (int i = RS_styleCount; --i; )
190 if (TermWin.fontset[i] != TermWin.fontset[0])
191 delete TermWin.fontset[i];
192#endif
183 delete TermWin.fontset; 193 delete TermWin.fontset[0];
184 194
185 if (display) 195 if (display)
186 { 196 {
187 selection_clear (); 197 selection_clear ();
188 198
199#ifdef USE_XIM
200 im_destroy ();
201#endif
189#ifdef MENUBAR 202#ifdef MENUBAR
190 if (menubarGC) XFreeGC (display->display, menubarGC); 203 if (menubarGC) XFreeGC (display->display, menubarGC);
191#endif 204#endif
192#ifdef XTERM_SCROLLBAR 205#ifdef XTERM_SCROLLBAR
193 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 206 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
194 if (ShadowGC) XFreeGC (display->display, ShadowGC); 207 if (ShadowGC) XFreeGC (display->display, ShadowGC);
195#endif 208#endif
… …
226 XDestroyWindow (display->display, TermWin.parent[0]); 239 XDestroyWindow (display->display, TermWin.parent[0]);
227 } 240 }
228 241
229 // TODO: free pixcolours, colours should become part of rxvt_display 242 // TODO: free pixcolours, colours should become part of rxvt_display
230 243
231 delete PixColors; 244 delete pix_colors_focused;
245#ifdef OFF_FOCUS_FADING
246 delete pix_colors_unfocused;
247#endif
232 248
233 displays.put (display); 249 displays.put (display);
234 250
235 scr_release (); 251 scr_release ();
236 252
… …
254} 270}
255 271
256void 272void
257rxvt_term::destroy () 273rxvt_term::destroy ()
258{ 274{
275 if (destroy_ev.active)
276 return;
277
278#if ENABLE_OVERLAY
279 scr_overlay_off ();
280#endif
281
259 if (display) 282 if (display)
260 { 283 {
284#if USE_XIM
285 im_ev.stop (display);
286#endif
287#if HAVE_SCROLLBARS
288 scrollbar_ev.stop (display);
289#endif
290#if MENUBAR
291 menubar_ev.stop (display);
292#endif
293#if TRANSPARENT
261 rootwin_ev.stop (display); 294 rootwin_ev.stop (display);
295#endif
296 incr_ev.stop ();
262 termwin_ev.stop (display); 297 termwin_ev.stop (display);
263 vt_ev.stop (display); 298 vt_ev.stop (display);
264#ifdef USE_XIM
265 im_destroy ();
266 im_ev.stop (display);
267#endif
268#ifdef HAVE_SCROLLBARS
269 scrollbar_ev.stop (display);
270#endif
271#ifdef MENUBAR
272 menubar_ev.stop (display);
273#endif
274 } 299 }
275 300
276 check_ev.stop (); 301 check_ev.stop ();
277 pty_ev.stop (); 302 pty_ev.stop ();
278#ifdef CURSOR_BLINK 303#ifdef CURSOR_BLINK
279 cursor_blink_ev.stop (); 304 cursor_blink_ev.stop ();
280#endif 305#endif
281#ifdef TEXT_BLINK 306#ifdef TEXT_BLINK
282 text_blink_ev.stop (); 307 text_blink_ev.stop ();
283#endif 308#endif
309#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
310 cont_scroll_ev.stop ();
311#endif
312#ifdef SELECTION_SCROLLING
313 sel_scroll_ev.stop ();
314#endif
284#ifdef POINTER_BLANK 315#ifdef POINTER_BLANK
285 pointer_ev.stop (); 316 pointer_ev.stop ();
286#endif 317#endif
287 318
288 destroy_ev.start (0); 319 destroy_ev.start (0);
… …
304 SET_R (this); 335 SET_R (this);
305 336
306 if (!init_vars ()) 337 if (!init_vars ())
307 return false; 338 return false;
308 339
340 init_secondary ();
341
342 const char **cmd_argv = init_resources (argc, argv);
343
344 set_locale ("");
345
346#if MENUBAR_MAX
347 menubar_read (rs[Rs_menu]);
348#endif
349#ifdef HAVE_SCROLLBARS
350 if (options & Opt_scrollBar)
351 scrollBar.setIdle (); /* set existence for size calculations */
352#endif
353
354 create_windows (argc, argv);
355
356 init_xlocale ();
357
358 scr_reset (); /* initialize screen */
359
360#if 0
361 XSynchronize (display->display, True);
362#endif
363
364#ifdef HAVE_SCROLLBARS
365 if (options & Opt_scrollBar)
366 resize_scrollbar (); /* create and map scrollbar */
367#endif
368#if (MENUBAR_MAX)
369 if (menubar_visible ())
370 XMapWindow (display->display, menuBar.win);
371#endif
372#ifdef TRANSPARENT
373 if (options & Opt_transparent)
374 {
375 XSelectInput (display->display, display->root, PropertyChangeMask);
376 check_our_parents ();
377 rootwin_ev.start (display, display->root);
378 }
379#endif
380
381 XMapWindow (display->display, TermWin.vt);
382 XMapWindow (display->display, TermWin.parent[0]);
383
384 set_colorfgbg ();
385
386 init_command (cmd_argv);
387
388 pty_ev.start (pty.pty, EVENT_READ);
389
390 check_ev.start ();
391
392 return true;
393}
394
395static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
396
397void
398rxvt_init ()
399{
309 /* 400 /*
310 * Save and then give up any super-user privileges 401 * Save and then give up any super-user privileges
311 * If we need privileges in any area then we must specifically request it. 402 * If we need privileges in any area then we must specifically request it.
312 * We should only need to be root in these cases: 403 * We should only need to be root in these cases:
313 * 1. write utmp entries on some systems 404 * 1. write utmp entries on some systems
314 * 2. chown tty on some systems 405 * 2. chown tty on some systems
315 */ 406 */
316 privileges (SAVE); 407 rxvt_privileges (SAVE);
317 privileges (IGNORE); 408 rxvt_privileges (IGNORE);
318 409
319 init_secondary (); 410 signal (SIGHUP, SIG_IGN);
320 411 signal (SIGPIPE, SIG_IGN);
321 const char **cmd_argv = init_resources (argc, argv);
322
323 set_locale ("");
324
325#if MENUBAR_MAX
326 menubar_read (rs[Rs_menu]);
327#endif
328#ifdef HAVE_SCROLLBARS
329 if (Options & Opt_scrollBar)
330 scrollBar.setIdle (); /* set existence for size calculations */
331#endif
332
333 create_windows (argc, argv);
334
335 init_xlocale ();
336
337 scr_reset (); /* initialize screen */
338
339#if 0
340 XSynchronize (display->display, True);
341#endif
342
343#ifdef HAVE_SCROLLBARS
344 if (Options & Opt_scrollBar)
345 resize_scrollbar (); /* create and map scrollbar */
346#endif
347#if (MENUBAR_MAX)
348 if (menubar_visible ())
349 XMapWindow (display->display, menuBar.win);
350#endif
351#ifdef TRANSPARENT
352 if (Options & Opt_transparent)
353 {
354 XSelectInput (display->display, display->root, PropertyChangeMask);
355 check_our_parents ();
356 }
357#endif
358
359 rootwin_ev.start (display, display->root);
360
361 XMapWindow (display->display, TermWin.vt);
362 XMapWindow (display->display, TermWin.parent[0]);
363
364 init_command (cmd_argv);
365
366 pty_ev.start (cmd_fd, EVENT_READ);
367
368 check_ev.start ();
369
370 return true;
371}
372
373static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
374
375void
376rxvt_init_signals ()
377{
378 /* install exit handler for cleanup */
379#if 0
380#ifdef HAVE_ATEXIT
381 atexit (rxvt_clean_exit);
382#else
383#endif
384#endif
385
386 struct sigaction sa;
387
388 sigfillset (&sa.sa_mask);
389 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
390 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
391 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
392 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
393 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
394 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
395 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
396 412
397 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 413 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
398 /* signal (SIGURG, SIG_DFL); */ 414 /* signal (SIGURG, SIG_DFL); */
399 415
400 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 416 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
417 // TODO: handle this with exceptions and tolerate the memory loss
401 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 418 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
402} 419}
403 420
404/* ------------------------------------------------------------------------- * 421/* ------------------------------------------------------------------------- *
405 * SIGNAL HANDLING & EXIT HANDLER * 422 * SIGNAL HANDLING & EXIT HANDLER *
406 * ------------------------------------------------------------------------- */ 423 * ------------------------------------------------------------------------- */
407/* 424/*
408 * Catch a SIGCHLD signal and exit if the direct child has died 425 * Catch a SIGCHLD signal and exit if the direct child has died
409 */ 426 */
410/* ARGSUSED */ 427
411/* EXTPROTO */ 428void
412RETSIGTYPE 429rxvt_term::sig_chld (sig_watcher &w)
413rxvt_Child_signal (int sig __attribute__ ((unused)))
414{ 430{
415 int pid, save_errno = errno; 431 // we are being called for every SIGCHLD, not just ours
432 int pid;
433
416 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 434 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
417 ; 435 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
418 errno = save_errno;
419
420#if 0
421 if (pid == cmd_pid) 436 if (pid == (*t)->cmd_pid)
422 exit (EXIT_SUCCESS); 437 {
423#endif 438 (*t)->destroy ();
424} 439 break;
425 440 }
426/*
427 * Catch a fatal signal and tidy up before quitting
428 */
429/* EXTPROTO */
430RETSIGTYPE
431rxvt_Exit_signal (int sig)
432{
433 signal (sig, SIG_DFL);
434#ifdef DEBUG_CMD
435 rxvt_warn ("caught signal %d, exiting.\n", sig);
436#endif
437 rxvt_clean_exit ();
438 kill (getpid (), sig);
439}
440
441/* INTPROTO */
442int
443rxvt_xerror_handler (Display *display, XErrorEvent *event)
444{
445 if (GET_R->allowedxerror == -1)
446 GET_R->allowedxerror = event->error_code;
447 else
448 {
449 old_xerror_handler (display, event);
450 GET_R->destroy ();
451 }
452
453 return 0;
454} 441}
455 442
456/*----------------------------------------------------------------------*/ 443/*----------------------------------------------------------------------*/
457/* 444/*
458 * Exit gracefully, clearing the utmp entry and restoring tty attributes 445 * Exit gracefully, clearing the utmp entry and restoring tty attributes
459 * TODO: if debugging, this should free up any known resources if we can 446 * TODO: if debugging, this should free up any known resources if we can
460 */ 447 */
461/* EXTPROTO */
462void 448void
463rxvt_clean_exit () 449rxvt_destroy_all ()
464{ 450{
465 // TODO: rxvtd should clean up all ressources 451 // TODO: rxvtd should clean up all ressources
466 if (GET_R) 452 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
453 (*t)->destroy ();
454}
455
456/*
457 * Catch a fatal signal and tidy up before quitting
458 */
459void
460rxvt_term::sig_term (sig_watcher &w)
461{
462#ifdef DEBUG_CMD
463 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
464#endif
465 rxvt_destroy_all ();
466 signal (w.signum, SIG_DFL);
467 kill (getpid (), w.signum);
468}
469
470/* INTPROTO */
471int
472rxvt_xerror_handler (Display *display, XErrorEvent *event)
473{
474 if (GET_R->allowedxerror == -1)
475 GET_R->allowedxerror = event->error_code;
476 else
477 {
478 old_xerror_handler (display, event);
467 GET_R->destroy (); 479 GET_R->destroy ();
480 }
481
482 return 0;
468} 483}
469 484
470/* ------------------------------------------------------------------------- * 485/* ------------------------------------------------------------------------- *
471 * MEMORY ALLOCATION WRAPPERS * 486 * MEMORY ALLOCATION WRAPPERS *
472 * ------------------------------------------------------------------------- */ 487 * ------------------------------------------------------------------------- */
473/* EXTPROTO */ 488void *
474void *
475rxvt_malloc (size_t size) 489rxvt_malloc (size_t size)
476{ 490{
477 void *p;
478
479 p = malloc (size); 491 void *p = malloc (size);
492
480 if (p) 493 if (!p)
494 rxvt_fatal ("memory allocation failure. aborting.\n");
495
481 return p; 496 return p;
482
483 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
484 rxvt_clean_exit ();
485 exit (EXIT_FAILURE);
486 /* NOTREACHED */
487} 497}
488 498
489/* EXTPROTO */ 499/* INTPROTO */
490void * 500void *
491rxvt_calloc (size_t number, size_t size) 501rxvt_calloc (size_t number, size_t size)
492{ 502{
493 void *p;
494
495 p = calloc (number, size); 503 void *p = calloc (number, size);
504
496 if (p) 505 if (!p)
506 rxvt_fatal ("memory allocation failure. aborting.\n");
507
497 return p; 508 return p;
498
499 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
500 rxvt_clean_exit ();
501 exit (EXIT_FAILURE);
502 /* NOTREACHED */
503} 509}
504 510
505/* EXTPROTO */ 511/* INTPROTO */
506void * 512void *
507rxvt_realloc (void *ptr, size_t size) 513rxvt_realloc (void *ptr, size_t size)
508{ 514{
509 void *p;
510
511 if (ptr)
512 p = realloc (ptr, size); 515 void *p = realloc (ptr, size);
513 else 516
514 p = malloc (size);
515 if (p) 517 if (!p)
518 rxvt_fatal ("memory allocation failure. aborting.\n");
519
516 return p; 520 return p;
517
518 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
519 rxvt_clean_exit ();
520 exit (EXIT_FAILURE);
521 /* NOTREACHED */
522} 521}
523 522
524/* ------------------------------------------------------------------------- * 523/* ------------------------------------------------------------------------- *
525 * PRIVILEGED OPERATIONS * 524 * PRIVILEGED OPERATIONS *
526 * ------------------------------------------------------------------------- */ 525 * ------------------------------------------------------------------------- */
527/* take care of suid/sgid super-user (root) privileges */ 526/* take care of suid/sgid super-user (root) privileges */
528void 527void
529rxvt_term::privileges (int mode) 528rxvt_privileges (rxvt_privaction action)
530{ 529{
530#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
531 static uid_t euid;
532 static gid_t egid;
533#endif
534
531#if ! defined(__CYGWIN32__) 535#if ! defined(__CYGWIN32__)
532# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 536# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
533 /* setreuid () is the poor man's setuid (), seteuid () */ 537 /* setreuid () is the poor man's setuid (), seteuid () */
534# define seteuid(a) setreuid(-1, (a)) 538# define seteuid(a) setreuid(-1, (a))
535# define setegid(a) setregid(-1, (a)) 539# define setegid(a) setregid(-1, (a))
536# define HAVE_SETEUID 540# define HAVE_SETEUID
537# endif 541# endif
538# ifdef HAVE_SETEUID 542# ifdef HAVE_SETEUID
539 switch (mode) 543 switch (action)
540 { 544 {
541 case IGNORE: 545 case IGNORE:
542 /* 546 /*
543 * change effective uid/gid - not real uid/gid - so we can switch 547 * change effective uid/gid - not real uid/gid - so we can switch
544 * back to root later, as required 548 * back to root later, as required
… …
554 seteuid (euid); 558 seteuid (euid);
555 setegid (egid); 559 setegid (egid);
556 break; 560 break;
557 } 561 }
558# else 562# else
559 switch (mode) 563 switch (action)
560 { 564 {
561 case IGNORE: 565 case IGNORE:
562 setuid (getuid ()); 566 setuid (getuid ());
563 setgid (getgid ()); 567 setgid (getgid ());
564 /* FALLTHROUGH */ 568 /* FALLTHROUGH */
… …
571#endif 575#endif
572} 576}
573 577
574#ifdef UTMP_SUPPORT 578#ifdef UTMP_SUPPORT
575void 579void
576rxvt_term::privileged_utmp (char action) 580rxvt_term::privileged_utmp (rxvt_privaction action)
577{ 581{
578 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
579 action, next_utmp_action, getpid ()));
580 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
581 || (Options & Opt_utmpInhibit) 582 if ((options & Opt_utmpInhibit)
582 || ttydev == NULL || *ttydev == '\0') 583 || !pty.name || !*pty.name)
583 return; 584 return;
584 585
585 privileges (RESTORE); 586 rxvt_privileges (RESTORE);
587
586 if (action == SAVE) 588 if (action == SAVE)
587 {
588 next_utmp_action = RESTORE;
589 makeutent (ttydev, rs[Rs_display_name]); 589 makeutent (pty.name, rs[Rs_display_name]);
590 }
591 else 590 else
592 { /* action == RESTORE */
593 next_utmp_action = IGNORE;
594 cleanutent (); 591 cleanutent ();
595 } 592
596 privileges (IGNORE); 593 rxvt_privileges (IGNORE);
597}
598#endif
599
600#ifndef NO_SETOWNER_TTYDEV
601void
602rxvt_term::privileged_ttydev (char action)
603{
604 D_MAIN ((stderr,
605 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
606 action, next_tty_action, getpid ()));
607 if (next_tty_action != action || (action != SAVE && action != RESTORE)
608 || ttydev == NULL || *ttydev == '\0')
609 return;
610
611 privileges (RESTORE);
612
613 if (action == SAVE)
614 {
615 next_tty_action = RESTORE;
616# ifndef RESET_TTY_TO_COMMON_DEFAULTS
617 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
618 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
619 next_tty_action = IGNORE;
620 else
621# endif
622
623 {
624 chown (ttydev, getuid (), ttygid); /* fail silently */
625 chmod (ttydev, ttymode);
626# ifdef HAVE_REVOKE
627 revoke (ttydev);
628# endif
629
630 }
631 }
632 else
633 { /* action == RESTORE */
634 next_tty_action = IGNORE;
635# ifndef RESET_TTY_TO_COMMON_DEFAULTS
636 chmod (ttydev, ttyfd_stat.st_mode);
637 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
638# else
639 chmod (ttydev,
640 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
641 chown (ttydev, 0, 0);
642# endif
643
644 }
645
646 privileges (IGNORE);
647
648# ifndef RESET_TTY_TO_COMMON_DEFAULTS
649 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
650 action == RESTORE ? "Restoring" : (action ==
651 SAVE ? "Saving" :
652 "UNKNOWN ERROR for"), ttydev,
653 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
654 ttyfd_stat.st_gid));
655# endif
656} 594}
657#endif 595#endif
658 596
659/*----------------------------------------------------------------------*/ 597/*----------------------------------------------------------------------*/
660/* 598/*
… …
725 max_height = MAX_ROWS * TermWin.fheight; 663 max_height = MAX_ROWS * TermWin.fheight;
726 664
727 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 665 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
728 666
729 sb_w = mb_h = 0; 667 sb_w = mb_h = 0;
730 window_vt_x = window_vt_y = 0; 668 window_vt_x = window_vt_y = TermWin.int_bwidth;
669
731 if (scrollbar_visible ()) 670 if (scrollbar_visible ())
732 { 671 {
733 sb_w = scrollbar_TotalWidth (); 672 sb_w = scrollbar_TotalWidth ();
734 szHint.base_width += sb_w; 673 szHint.base_width += sb_w;
735 if (! (Options & Opt_scrollBar_right)) 674 if (!(options & Opt_scrollBar_right))
736 window_vt_x = sb_w; 675 window_vt_x += sb_w;
737 } 676 }
677
738 if (menubar_visible ()) 678 if (menubar_visible ())
739 { 679 {
740 mb_h = menuBar_TotalHeight (); 680 mb_h = menuBar_TotalHeight ();
741 szHint.base_height += mb_h; 681 szHint.base_height += mb_h;
742 window_vt_y = mb_h; 682 window_vt_y += mb_h;
743 } 683 }
684
744 szHint.width_inc = TermWin.fwidth; 685 szHint.width_inc = TermWin.fwidth;
745 szHint.height_inc = TermWin.fheight; 686 szHint.height_inc = TermWin.fheight;
746 szHint.min_width = szHint.base_width + szHint.width_inc; 687 szHint.min_width = szHint.base_width + szHint.width_inc;
747 szHint.min_height = szHint.base_height + szHint.height_inc; 688 szHint.min_height = szHint.base_height + szHint.height_inc;
748 689
… …
754 else 695 else
755 { 696 {
756 MIN_IT (TermWin.width, max_width); 697 MIN_IT (TermWin.width, max_width);
757 szHint.width = szHint.base_width + TermWin.width; 698 szHint.width = szHint.base_width + TermWin.width;
758 } 699 }
700
759 if (height && height - szHint.base_height < max_height) 701 if (height && height - szHint.base_height < max_height)
760 { 702 {
761 szHint.height = height; 703 szHint.height = height;
762 TermWin.height = height - szHint.base_height; 704 TermWin.height = height - szHint.base_height;
763 } 705 }
764 else 706 else
765 { 707 {
766 MIN_IT (TermWin.height, max_height); 708 MIN_IT (TermWin.height, max_height);
767 szHint.height = szHint.base_height + TermWin.height; 709 szHint.height = szHint.base_height + TermWin.height;
768 } 710 }
711
769 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 712 if (scrollbar_visible () && (options & Opt_scrollBar_right))
770 window_sb_x = szHint.width - sb_w; 713 window_sb_x = szHint.width - sb_w;
771 714
772 if (recalc_x) 715 if (recalc_x)
773 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 716 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
774 - szHint.width - 2 * TermWin.ext_bwidth); 717 - szHint.width - 2 * TermWin.ext_bwidth);
… …
790 * Called after a window size change. 733 * Called after a window size change.
791 */ 734 */
792void 735void
793rxvt_term::tt_winch () 736rxvt_term::tt_winch ()
794{ 737{
738 if (pty.pty < 0)
739 return;
740
795 struct winsize ws; 741 struct winsize ws;
796
797 if (cmd_fd < 0)
798 return;
799 742
800 ws.ws_col = TermWin.ncol; 743 ws.ws_col = TermWin.ncol;
801 ws.ws_row = TermWin.nrow; 744 ws.ws_row = TermWin.nrow;
802 ws.ws_xpixel = ws.ws_ypixel = 0; 745 ws.ws_xpixel = TermWin.width;
803#ifndef DEBUG_SIZE 746 ws.ws_ypixel = TermWin.height;
804 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 747 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
805#else 748
806 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 749#if 0
807 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 750 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
808# ifdef SIGWINCH
809 else if (cmd_pid) /* force through to the command */ 751 if (cmd_pid) /* force through to the command */
810 kill (cmd_pid, SIGWINCH); 752 kill (cmd_pid, SIGWINCH);
811# endif
812#endif 753#endif
813} 754}
814 755
815/*----------------------------------------------------------------------*/ 756/*----------------------------------------------------------------------*/
816/* rxvt_change_font () - Switch to a new font */ 757/* set_fonts () - load and set the various fonts
817/* 758/*
818 * init = 1 - initialize 759 * init = 1 - initialize
819 * 760 *
820 * fontname == FONT_UP - switch to bigger font 761 * fontname == FONT_UP - switch to bigger font
821 * fontname == FONT_DN - switch to smaller font 762 * fontname == FONT_DN - switch to smaller font
822 */ 763 */
823bool 764bool
824rxvt_term::change_font (const char *fontname) 765rxvt_term::set_fonts ()
825{ 766{
826 if (fontname == FONT_UP)
827 {
828 // TODO
829 }
830 else if (fontname == FONT_DN)
831 {
832 // TODO
833 }
834 else
835 {
836 rxvt_fontset *fs = new rxvt_fontset (this); 767 rxvt_fontset *fs = new rxvt_fontset (this);
768 rxvt_fontprop prop;
837 769
838 if (fs && fs->populate (fontname ? fontname : "fixed")) 770 if (!fs
771 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
772 || !fs->realize_font (1))
773 {
774 delete fs;
775 return false;
776 }
777
778#if ENABLE_STYLES
779 for (int i = RS_styleCount; --i; )
780 if (TermWin.fontset[i] != TermWin.fontset[0])
781 delete TermWin.fontset[i];
782#endif
783
784 delete TermWin.fontset[0];
785 TermWin.fontset[0] = fs;
786
787 prop = (*fs)[1]->properties ();
788 fs->set_prop (prop);
789
790 TermWin.fwidth = prop.width;
791 TermWin.fheight = prop.height;
792 TermWin.fweight = prop.weight;
793 TermWin.fslant = prop.slant;
794 TermWin.fbase = (*fs)[1]->ascent;
795
796 for (int style = 1; style < 4; style++)
797 {
798#if ENABLE_STYLES
799 const char *res = rs[Rs_font + style];
800
801 if (res && !*res)
802 TermWin.fontset[style] = TermWin.fontset[0];
803 else
839 { 804 {
840 delete TermWin.fontset; 805 TermWin.fontset[style] = fs = new rxvt_fontset (this);
841 TermWin.fontset = fs; 806 rxvt_fontprop prop2 = prop;
842 TermWin.fwidth = fs->base_font ()->width;
843 TermWin.fheight = fs->base_font ()->height;
844 TermWin.fbase = fs->base_font ()->ascent;
845 807
846 if (TermWin.parent[0]) 808 if (res)
809 prop2.weight = prop2.slant = rxvt_fontprop::unset;
810 else
847 { 811 {
848 resize_all_windows (0, 0, 0); 812 res = TermWin.fontset[0]->fontdesc;
849 scr_remap_chars (); 813
850 scr_touch (true); 814 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
815 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
851 } 816 }
852 817
853 return true; 818 fs->populate (res);
819 fs->set_prop (prop2);
854 } 820 }
821#else
822 TermWin.fontset[style] = TermWin.fontset[0];
823#endif
824 }
825
826 if (TermWin.parent[0])
855 } 827 {
828 resize_all_windows (0, 0, 0);
829 scr_remap_chars ();
830 scr_touch (true);
831 }
856 832
857 return false; 833 return true;
858} 834}
859 835
860bool 836void rxvt_term::set_string_property (Atom prop, const char *str, int len)
861rxvt_term::font_up_down (int n, int direction)
862{ 837{
863 return false; 838 // TODO: SMART_WINDOW_TITLE
839 XChangeProperty (display->display, TermWin.parent[0],
840 prop, XA_STRING, 8, PropModeReplace,
841 (const unsigned char *)str, len >= 0 ? len : strlen (str));
842}
843
844void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
845{
846 // TODO: SMART_WINDOW_TITLE
847 wchar_t *ws = rxvt_mbstowcs (str, len);
848 char *s = rxvt_wcstoutf8 (ws);
849
850 XChangeProperty (display->display, TermWin.parent[0],
851 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
852 (const unsigned char *)s, strlen (s));
853
854 free (s);
855 free (ws);
864} 856}
865 857
866/*----------------------------------------------------------------------*/ 858/*----------------------------------------------------------------------*/
867/*----------------------------------------------------------------------*/ 859/*----------------------------------------------------------------------*/
868/* xterm sequences - title, iconName, color (exptl) */ 860/* xterm sequences - title, iconName, color (exptl) */
869void 861void
870rxvt_term::set_title (const char *str) 862rxvt_term::set_title (const char *str)
871{ 863{
872#ifndef SMART_WINDOW_TITLE 864 set_string_property (XA_WM_NAME, str);
873 XStoreName (display->display, TermWin.parent[0], str); 865#if ENABLE_FRILLS
874#else 866 set_utf8_property (display->atom ("_NET_WM_NAME"), str);
875 char *name;
876
877 if (!XFetchName (display->display, TermWin.parent[0], &name))
878 name = NULL;
879
880 if (name == NULL || STRCMP (name, str))
881 XStoreName (display->display, TermWin.parent[0], str);
882
883 if (name)
884 XFree (name);
885#endif 867#endif
886} 868}
887 869
888void 870void
889rxvt_term::set_icon_name (const char *str) 871rxvt_term::set_icon_name (const char *str)
890{ 872{
891#ifndef SMART_WINDOW_TITLE 873 set_string_property (XA_WM_ICON_NAME, str);
892 XSetIconName (display->display, TermWin.parent[0], str); 874#if ENABLE_FRILLS
893#else 875 set_utf8_property (display->atom ("_NET_WM_ICON_NAME"), str);
894 char *name;
895
896 if (!XGetIconName (display->display, TermWin.parent[0], &name))
897 name = NULL;
898
899 if (name == NULL || STRCMP (name, str))
900 XSetIconName (display->display, TermWin.parent[0], str);
901
902 if (name)
903 XFree (name);
904#endif 876#endif
905} 877}
906 878
907#ifdef XTERM_COLOR_CHANGE 879#ifdef XTERM_COLOR_CHANGE
908void 880void
… …
920 i = atoi (color); 892 i = atoi (color);
921 if (i >= 8 && i <= 15) 893 if (i >= 8 && i <= 15)
922 { /* bright colors */ 894 { /* bright colors */
923 i -= 8; 895 i -= 8;
924# ifndef NO_BRIGHTCOLOR 896# ifndef NO_BRIGHTCOLOR
925 PixColors[idx] = PixColors[minBrightCOLOR + i]; 897 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
926 SET_PIXCOLOR (idx); 898 SET_PIXCOLOR (idx);
927 goto Done; 899 goto Done;
928# endif 900# endif
929 901
930 } 902 }
931 if (i >= 0 && i <= 7) 903 if (i >= 0 && i <= 7)
932 { /* normal colors */ 904 { /* normal colors */
933 PixColors[idx] = PixColors[minCOLOR + i]; 905 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
934 SET_PIXCOLOR (idx); 906 SET_PIXCOLOR (idx);
935 goto Done; 907 goto Done;
936 } 908 }
937 } 909 }
910
938 if (!rXParseAllocColor (& xcol, color)) 911 if (!rXParseAllocColor (& xcol, color))
939 return; 912 return;
913
940 /* XStoreColor (display->display, XCMAP, XColor*); */ 914 /* XStoreColor (display->display, display->cmap, XColor*); */
941 915
942 /* 916 /*
943 * FIXME: should free colors here, but no idea how to do it so instead, 917 * FIXME: should free colors here, but no idea how to do it so instead,
944 * so just keep gobbling up the colormap 918 * so just keep gobbling up the colormap
945 */ 919 */
946# if 0 920# if 0
947 for (i = Color_Black; i <= Color_White; i++) 921 for (i = Color_Black; i <= Color_White; i++)
948 if (PixColors[idx] == PixColors[i]) 922 if (pix_colors[idx] == pix_colors[i])
949 break; 923 break;
950 if (i > Color_White) 924 if (i > Color_White)
951 { 925 {
952 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 926 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
953 XFreeColors (display->display, XCMAP, (PixColors + idx), 1, 927 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
954 DisplayPlanes (display->display, display->screen)); 928 DisplayPlanes (display->display, display->screen));
955 } 929 }
956# endif 930# endif
957 931
958 PixColors[idx] = xcol; 932 pix_colors_focused[idx] = xcol;
959 SET_PIXCOLOR (idx); 933 SET_PIXCOLOR (idx);
960 934
961 /* XSetWindowAttributes attr; */ 935 /* XSetWindowAttributes attr; */
962 /* Cursor cursor; */ 936 /* Cursor cursor; */
963Done: 937Done:
964 if (idx == Color_bg && ! (Options & Opt_transparent)) 938#ifdef OFF_FOCUS_FADING
965 XSetWindowBackground (display->display, TermWin.vt, 939 if (rs[Rs_fade])
966 PixColors[Color_bg]); 940 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
941#endif
967 942
968 /* handle Color_BD, scrollbar background, etc. */ 943 /*TODO: handle Color_BD, scrollbar background, etc. */
969 944
970 set_colorfgbg ();
971 recolour_cursor (); 945 recolour_cursor ();
972 /* the only reasonable way to enforce a clean update */ 946 scr_recolour ();
973 scr_poweron ();
974} 947}
975 948
976#else 949#else
977# define set_window_color (idx,color) ((void)0) 950# define set_window_color (idx,color) ((void)0)
978#endif /* XTERM_COLOR_CHANGE */ 951#endif /* XTERM_COLOR_CHANGE */
979 952
980void 953void
981rxvt_term::recolour_cursor () 954rxvt_term::recolour_cursor ()
982{ 955{
983#if TODO
984 rxvt_color xcol[2]; 956 XColor xcol[2];
985 957
986 xcol[0] = PixColors[Color_pointer]; 958 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
987 xcol[1] = PixColors[Color_bg]; 959 ? pix_colors_focused[Color_pointer_fg]
960 : pix_colors_focused[Color_fg];
961 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
962 ? pix_colors_focused[Color_pointer_bg]
963 : pix_colors_focused[Color_bg];
964
988 XQueryColors (display->display, XCMAP, xcol, 2); 965 XQueryColors (display->display, display->cmap, xcol, 2);
989 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1])); 966 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
990#endif
991} 967}
992 968
993/*----------------------------------------------------------------------*/ 969/*----------------------------------------------------------------------*/
994/* 970/*
995 * find if fg/bg matches any of the normal (low-intensity) colors 971 * find if fg/bg matches any of the normal (low-intensity) colors
996 */ 972 */
997void 973void
998rxvt_term::set_colorfgbg () 974rxvt_term::set_colorfgbg ()
999{ 975{
1000 unsigned int i; 976 unsigned int i;
1001 const char *xpmb = "\0"; 977 const char *xpmb = "\0";
1002 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 978 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1003 979
1004 env_colorfgbg =
1005 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); 980 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1006 STRCPY (fstr, "default"); 981 strcpy (fstr, "default");
1007 STRCPY (bstr, "default"); 982 strcpy (bstr, "default");
1008 for (i = Color_Black; i <= Color_White; i++) 983 for (i = Color_Black; i <= Color_White; i++)
1009 if (PixColors[Color_fg] == PixColors[i]) 984 if (pix_colors[Color_fg] == pix_colors[i])
1010 { 985 {
1011 sprintf (fstr, "%d", (i - Color_Black)); 986 sprintf (fstr, "%d", (i - Color_Black));
1012 break; 987 break;
1013 } 988 }
989
1014 for (i = Color_Black; i <= Color_White; i++) 990 for (i = Color_Black; i <= Color_White; i++)
1015 if (PixColors[Color_bg] == PixColors[i]) 991 if (pix_colors[Color_bg] == pix_colors[i])
1016 { 992 {
1017 sprintf (bstr, "%d", (i - Color_Black)); 993 sprintf (bstr, "%d", (i - Color_Black));
1018#ifdef XPM_BACKGROUND 994#ifdef XPM_BACKGROUND
1019 xpmb = "default;"; 995 xpmb = "default;";
1020#endif 996#endif
1021 break; 997 break;
1022 } 998 }
1023 999
1024 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1000 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1025
1026#ifndef NO_BRIGHTCOLOR
1027 colorfgbg = DEFAULT_RSTYLE;
1028 for (i = minCOLOR; i <= maxCOLOR; i++)
1029 {
1030 if (PixColors[Color_fg] == PixColors[i])
1031 colorfgbg = SET_FGCOLOR (colorfgbg, i);
1032 if (PixColors[Color_bg] == PixColors[i])
1033 colorfgbg = SET_BGCOLOR (colorfgbg, i);
1034 }
1035#endif
1036} 1001}
1037 1002
1038/*----------------------------------------------------------------------*/ 1003/*----------------------------------------------------------------------*/
1039/* 1004/*
1040 * Colour determination for low colour displays, routine from 1005 * Colour determination for low colour displays, routine from
… …
1065 int old_width = szHint.width, old_height = szHint.height; 1030 int old_width = szHint.width, old_height = szHint.height;
1066#endif 1031#endif
1067 1032
1068 window_calc (width, height); 1033 window_calc (width, height);
1069 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1034 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
1035
1070 if (!ignoreparent) 1036 if (!ignoreparent)
1071 { 1037 {
1072#ifdef SMART_RESIZE 1038#ifdef SMART_RESIZE
1073 /* 1039 /*
1074 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1040 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
… …
1109 dy /= 2; 1075 dy /= 2;
1110 1076
1111 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1077 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
1112 szHint.width, szHint.height); 1078 szHint.width, szHint.height);
1113#else 1079#else
1114 XResizeWindow (display->display, TermWin.parent[0], szHint.width, 1080 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height);
1115 szHint.height);
1116#endif 1081#endif
1117
1118 } 1082 }
1119 1083
1120 fix_screen = (TermWin.ncol != prev_ncol 1084 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1121 || TermWin.nrow != prev_nrow);
1122 1085
1123 if (fix_screen || width != old_width || height != old_height) 1086 if (fix_screen || width != old_width || height != old_height)
1124 { 1087 {
1125 if (scrollbar_visible ()) 1088 if (scrollbar_visible ())
1126 { 1089 {
1127 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x, 1090 XMoveResizeWindow (display->display, scrollBar.win,
1091 window_sb_x, 0,
1128 0, scrollbar_TotalWidth (), szHint.height); 1092 scrollbar_TotalWidth (), szHint.height);
1129 resize_scrollbar (); 1093 resize_scrollbar ();
1130 } 1094 }
1131 1095
1132 if (menubar_visible ()) 1096 if (menubar_visible ())
1133 XMoveResizeWindow (display->display, menuBar.win, window_vt_x, 1097 XMoveResizeWindow (display->display, menuBar.win,
1098 window_vt_x, 0,
1134 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1099 TermWin_TotalWidth (), menuBar_TotalHeight ());
1135 1100
1136 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1101 XMoveResizeWindow (display->display, TermWin.vt,
1137 window_vt_y, TermWin_TotalWidth (), 1102 window_vt_x, window_vt_y,
1138 TermWin_TotalHeight ()); 1103 TermWin_TotalWidth (), TermWin_TotalHeight ());
1139 scr_clear (height != old_height); 1104 scr_clear ();
1140#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
1141 resize_pixmap (); 1106 resize_pixmap ();
1142#endif 1107#endif
1143
1144 } 1108 }
1145 1109
1146 if (fix_screen || old_height == 0) 1110 if (fix_screen || old_height == 0)
1147 { 1111 {
1148 int curr_screen = -1; 1112 int curr_screen = -1;
… …
1189 if (width == 0) 1153 if (width == 0)
1190 width = wattr.width - szHint.base_width; 1154 width = wattr.width - szHint.base_width;
1191 if (height == 0) 1155 if (height == 0)
1192 height = wattr.height - szHint.base_height; 1156 height = wattr.height - szHint.base_height;
1193 } 1157 }
1158
1194 if (width != TermWin.width || height != TermWin.height) 1159 if (width != TermWin.width || height != TermWin.height)
1195 { 1160 {
1196 width += szHint.base_width; 1161 width += szHint.base_width;
1197 height += szHint.base_height; 1162 height += szHint.base_height;
1198 resize_all_windows (width, height, 0); 1163 resize_all_windows (width, height, 0);
… …
1203 * - X INPUT METHOD ROUTINES - * 1168 * - X INPUT METHOD ROUTINES - *
1204 * -------------------------------------------------------------------- */ 1169 * -------------------------------------------------------------------- */
1205#ifdef USE_XIM 1170#ifdef USE_XIM
1206 1171
1207void 1172void
1173rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1174{
1175 fg = pix_colors[Color_fg];
1176 bg = pix_colors[Color_bg];
1177}
1178
1179void
1208rxvt_term::im_set_size (XRectangle *size) 1180rxvt_term::im_set_size (XRectangle &size)
1209{ 1181{
1182 // the int_bwidth terms make no sense to me
1210 size->x = TermWin.int_bwidth; 1183 size.x = TermWin.int_bwidth;
1211 size->y = TermWin.int_bwidth; 1184 size.y = TermWin.int_bwidth;
1212 size->width = Width2Pixel (TermWin.ncol); 1185 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;
1213 size->height = Height2Pixel (TermWin.nrow); 1186 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;
1214} 1187}
1215 1188
1216void 1189void
1217rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) 1190rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1191 XRectangle &status_rect,
1192 const XRectangle &needed_rect)
1218{ 1193{
1219 *fg = PixColors[Color_fg]; 1194 preedit_rect.x = needed_rect.width;
1220 *bg = PixColors[Color_bg]; 1195 preedit_rect.y = 0;
1196 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;
1197 preedit_rect.height = TermWin.fheight;
1198
1199 status_rect.x = 0;
1200 status_rect.y = 0;
1201 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;
1202 status_rect.height = TermWin.fheight;
1221} 1203}
1222 1204
1223/* Checking whether input method is running. */ 1205/* Checking whether input method is running. */
1224bool 1206bool
1225rxvt_term::IMisRunning () 1207rxvt_term::IMisRunning ()
1226{ 1208{
1227 char *p; 1209 char *p;
1228 Atom atom; 1210 Atom atom;
1229 Window win; 1211 Window win;
1230 char server[IMBUFSIZ]; 1212 char server[IMBUFSIZ];
1231 1213
1232 /* get current locale modifier */ 1214 /* get current locale modifier */
1233 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1215 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1234 { 1216 {
1235 STRCPY (server, "@server="); 1217 strcpy (server, "@server=");
1236 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1218 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1219
1237 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */ 1220 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1238 *p = '\0'; 1221 *p = '\0';
1239 1222
1240 atom = XInternAtom (display->display, server, False); 1223 atom = XInternAtom (display->display, server, False);
1241 win = XGetSelectionOwner (display->display, atom); 1224 win = XGetSelectionOwner (display->display, atom);
1225
1242 if (win != None) 1226 if (win != None)
1243 return True; 1227 return True;
1244 } 1228 }
1229
1245 return False; 1230 return False;
1246} 1231}
1247 1232
1248void 1233void
1249rxvt_term::IMSendSpot () 1234rxvt_term::IMSendSpot ()
1250{ 1235{
1251 XPoint spot; 1236 XPoint nspot;
1252 XVaNestedList preedit_attr; 1237 XVaNestedList preedit_attr;
1253 1238
1254 if (Input_Context == NULL 1239 if (!Input_Context
1240 || !TermWin.focus
1255 || !TermWin.focus || ! (input_style & XIMPreeditPosition) 1241 || !(input_style & XIMPreeditPosition))
1256 || ! (event_type == KeyPress
1257 || event_type == Expose
1258 || event_type == NoExpose
1259 || event_type == SelectionNotify
1260 || event_type == ButtonRelease || event_type == FocusIn)
1261 || !IMisRunning ())
1262 return; 1242 return;
1263 1243
1264 im_set_position (&spot); 1244 im_set_position (nspot);
1245
1246 if (nspot.x == spot.x && nspot.y == spot.y)
1247 return;
1248
1249 spot = nspot;
1265 1250
1266 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1251 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1267 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1252 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1268 XFree (preedit_attr); 1253 XFree (preedit_attr);
1269} 1254}
1270 1255
1271void 1256void
1272rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1273 XRectangle * needed_rect)
1274{
1275 int mbh, vtx = 0;
1276
1277 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1278 vtx = scrollbar_TotalWidth ();
1279
1280 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1281 mbh -= TermWin.lineSpace;
1282
1283 preedit_rect->x = needed_rect->width + vtx;
1284 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1285
1286 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1287 preedit_rect->height = Height2Pixel (1);
1288
1289 status_rect->x = vtx;
1290 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1291
1292 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1293 status_rect->height = Height2Pixel (1);
1294}
1295
1296void
1297rxvt_term::im_destroy () 1257rxvt_term::im_destroy ()
1298{ 1258{
1299 if (Input_Context)
1300 {
1301 XDestroyIC (Input_Context);
1302 Input_Context = NULL;
1303 }
1304
1305 if (input_method) 1259 if (input_method)
1306 { 1260 {
1261 if (Input_Context && input_method->xim)
1262 XDestroyIC (Input_Context);
1263
1307 display->put_xim (input_method); 1264 display->put_xim (input_method);
1308 input_method = 0; 1265 input_method = 0;
1309 } 1266 }
1267
1268 Input_Context = 0;
1310} 1269}
1311 1270
1312/* 1271/*
1313 * Try to open a XIM with the current modifiers, then see if we can 1272 * Try to open a XIM with the current modifiers, then see if we can
1314 * open a suitable preedit type 1273 * open a suitable preedit type
1315 */ 1274 */
1316bool 1275bool
1317rxvt_term::IM_get_IC (const char *modifiers) 1276rxvt_term::IM_get_IC (const char *modifiers)
1318{ 1277{
1319 int i, j, found; 1278 int i, j, found;
1320 XIM xim; 1279 XIM xim;
1321 XPoint spot; 1280 XPoint spot;
1322 XRectangle rect, status_rect, needed_rect; 1281 XRectangle rect, status_rect, needed_rect;
1323 unsigned long fg, bg; 1282 unsigned long fg, bg;
1324 const char *p; 1283 const char *p;
1325 char **s; 1284 char **s;
1326 XIMStyles *xim_styles; 1285 XIMStyles *xim_styles;
1327 XVaNestedList preedit_attr, status_attr;
1328 1286
1329 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1287 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1330 return false; 1288 return false;
1331 1289
1332 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1290 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1333 input_method = display->get_xim (locale, modifiers); 1291 input_method = display->get_xim (locale, modifiers);
1334 if (input_method == NULL) 1292 if (input_method == NULL)
1335 return false; 1293 return false;
1336 1294
1337 xim = input_method->xim; 1295 xim = input_method->xim;
1296 spot.x = spot.y = -1;
1338 1297
1339 xim_styles = NULL; 1298 xim_styles = NULL;
1340 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1299 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1341 || !xim_styles || !xim_styles->count_styles) 1300 || !xim_styles || !xim_styles->count_styles)
1342 { 1301 {
1343 display->put_xim (input_method); 1302 im_destroy ();
1344 return false; 1303 return false;
1345 } 1304 }
1346 1305
1347 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1306 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1307
1308 for (int pi = 0; pi < 2; pi++)
1309 {
1310 p = pet[pi];
1311
1312 if (!p)
1313 continue;
1314
1348 s = rxvt_splitcommastring (p); 1315 s = rxvt_splitcommastring (p);
1316
1349 for (i = found = 0; !found && s[i]; i++) 1317 for (i = found = 0; !found && s[i]; i++)
1350 { 1318 {
1351 if (!STRCMP (s[i], "OverTheSpot")) 1319 if (!strcmp (s[i], "OverTheSpot"))
1352 input_style = (XIMPreeditPosition | XIMStatusNothing); 1320 input_style = (XIMPreeditPosition | XIMStatusNothing);
1353 else if (!STRCMP (s[i], "OffTheSpot")) 1321 else if (!strcmp (s[i], "OffTheSpot"))
1354 input_style = (XIMPreeditArea | XIMStatusArea); 1322 input_style = (XIMPreeditArea | XIMStatusArea);
1355 else if (!STRCMP (s[i], "Root")) 1323 else if (!strcmp (s[i], "Root"))
1356 input_style = (XIMPreeditNothing | XIMStatusNothing); 1324 input_style = (XIMPreeditNothing | XIMStatusNothing);
1325 else if (!strcmp (s[i], "None"))
1326 input_style = (XIMPreeditNone | XIMStatusNone);
1357 1327
1358 for (j = 0; j < xim_styles->count_styles; j++) 1328 for (j = 0; j < xim_styles->count_styles; j++)
1359 if (input_style == xim_styles->supported_styles[j]) 1329 if (input_style == xim_styles->supported_styles[j])
1360 { 1330 {
1331 rxvt_freecommastring (s);
1332
1361 found = 1; 1333 found = 1;
1362 break; 1334 goto foundpet;
1335 }
1336
1363 } 1337 }
1364 }
1365 1338
1366 for (i = 0; s[i]; i++) 1339 rxvt_freecommastring (s);
1367 free (s[i]); 1340 }
1368 1341
1369 free (s); 1342foundpet:
1343
1370 XFree (xim_styles); 1344 XFree (xim_styles);
1371 1345
1372 if (!found) 1346 if (!found)
1373 { 1347 {
1374 display->put_xim (input_method); 1348 im_destroy ();
1375 return false; 1349 return false;
1376 } 1350 }
1377 1351
1378 preedit_attr = status_attr = NULL; 1352 XFontSet fs = 0;
1353 XVaNestedList preedit_attr = 0, status_attr = 0;
1354
1355 if (input_style & (XIMPreeditPosition | XIMPreeditArea))
1356 {
1357 // fake us a font-set, please
1358 char **missing_charset_list;
1359 int missing_charset_count;
1360 char *def_string;
1361 char pat[512];
1362
1363 sprintf (pat,
1364 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1365 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1366 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1367 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1368 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1369 "*",
1370 TermWin.fheight,
1371 TermWin.fheight + 1, TermWin.fheight - 1,
1372 TermWin.fheight - 2, TermWin.fheight + 2);
1373
1374 fs = XCreateFontSet (display->display, pat,
1375 &missing_charset_list, &missing_charset_count, &def_string);
1376
1377 if (missing_charset_list)
1378 XFreeStringList (missing_charset_list);
1379
1380 if (!fs)
1381 {
1382 input_style &= ~(XIMPreeditPosition | XIMPreeditArea);
1383 rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
1384 }
1385 }
1379 1386
1380 if (input_style & XIMPreeditPosition) 1387 if (input_style & XIMPreeditPosition)
1381 { 1388 {
1382 im_set_size (&rect); 1389 im_set_size (rect);
1383 im_set_position (&spot); 1390 im_set_position (spot);
1384 im_set_color (&fg, &bg); 1391 im_set_color (fg, bg);
1385 1392
1386 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1393 preedit_attr = XVaCreateNestedList (0,
1394 XNForeground, fg,
1395 XNBackground, bg,
1396 XNArea, &rect,
1387 XNSpotLocation, &spot, 1397 XNSpotLocation, &spot,
1388 XNForeground, fg, XNBackground, bg,
1389 //XNFontSet, TermWin.fontset, 1398 XNFontSet, fs,
1390 NULL); 1399 NULL);
1391 } 1400 }
1392 else if (input_style & XIMPreeditArea) 1401 else if (input_style & XIMPreeditArea)
1393 { 1402 {
1394 im_set_color (&fg, &bg); 1403 im_set_color (fg, bg);
1395 1404
1396 /* 1405 /*
1397 * The necessary width of preedit area is unknown 1406 * The necessary width of preedit area is unknown
1398 * until create input context. 1407 * until create input context.
1399 */ 1408 */
1400 needed_rect.width = 0; 1409 needed_rect.width = 0;
1401
1402 im_set_preedit_area (&rect, &status_rect, &needed_rect); 1410 im_set_preedit_area (rect, status_rect, needed_rect);
1403 1411
1404 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1412 preedit_attr = XVaCreateNestedList (0,
1413 XNForeground, fg,
1405 XNForeground, fg, XNBackground, bg, 1414 XNBackground, bg,
1415 XNArea, &rect,
1416 XNFontSet, fs,
1417 NULL);
1418 status_attr = XVaCreateNestedList (0,
1419 XNForeground, fg,
1420 XNBackground, bg,
1421 XNArea, &status_rect,
1406 //XNFontSet, TermWin.fontset, 1422 XNFontSet, fs,
1407 NULL); 1423 NULL);
1408 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1409 XNForeground, fg, XNBackground, bg,
1410 //XNFontSet, TermWin.fontset,
1411 NULL);
1412 } 1424 }
1413 1425
1414 Input_Context = XCreateIC (xim, XNInputStyle, input_style, 1426 Input_Context = XCreateIC (xim,
1427 XNInputStyle, input_style,
1415 XNClientWindow, TermWin.parent[0], 1428 XNClientWindow, TermWin.vt,
1416 XNFocusWindow, TermWin.parent[0], 1429 XNFocusWindow, TermWin.parent[0],
1417 preedit_attr ? XNPreeditAttributes : NULL, 1430 preedit_attr ? XNPreeditAttributes : NULL,
1418 preedit_attr, 1431 preedit_attr,
1419 status_attr ? XNStatusAttributes : NULL, 1432 status_attr ? XNStatusAttributes : NULL,
1420 status_attr, NULL); 1433 status_attr, NULL);
1434
1421 if (preedit_attr) XFree (preedit_attr); 1435 if (preedit_attr) XFree (preedit_attr);
1422 if (status_attr) XFree (status_attr); 1436 if (status_attr) XFree (status_attr);
1437 if (fs) XFreeFontSet (display->display, fs);
1423 1438
1424 if (Input_Context == NULL) 1439 if (Input_Context == NULL)
1425 { 1440 {
1426 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1441 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1427 display->put_xim (input_method); 1442 im_destroy ();
1428 return false; 1443 return false;
1429 } 1444 }
1430 1445
1431 if (input_style & XIMPreeditArea) 1446 if (input_style & XIMPreeditArea)
1432 IMSetStatusPosition (); 1447 IMSetStatusPosition ();
… …
1458 if (p && *p) 1473 if (p && *p)
1459 { 1474 {
1460 bool found = false; 1475 bool found = false;
1461 1476
1462 s = rxvt_splitcommastring (p); 1477 s = rxvt_splitcommastring (p);
1478
1463 for (i = 0; s[i]; i++) 1479 for (i = 0; s[i]; i++)
1464 { 1480 {
1465 if (*s[i]) 1481 if (*s[i])
1466 { 1482 {
1467 STRCPY (buf, "@im="); 1483 strcpy (buf, "@im=");
1468 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1484 strncat (buf, s[i], IMBUFSIZ - 5);
1469 if (IM_get_IC (buf)) 1485 if (IM_get_IC (buf))
1470 { 1486 {
1471 found = true; 1487 found = true;
1472 break; 1488 break;
1473 } 1489 }
1474 } 1490 }
1475 } 1491 }
1476 for (i = 0; s[i]; i++) 1492
1477 free (s[i]); 1493 rxvt_freecommastring (s);
1478 free (s);
1479 1494
1480 if (found) 1495 if (found)
1481 goto done; 1496 goto done;
1482 } 1497 }
1483 1498
… …
1497} 1512}
1498 1513
1499void 1514void
1500rxvt_term::IMSetStatusPosition () 1515rxvt_term::IMSetStatusPosition ()
1501{ 1516{
1502 XRectangle preedit_rect, status_rect, *needed_rect; 1517 XRectangle preedit_rect, status_rect, *needed_rect;
1503 XVaNestedList preedit_attr, status_attr; 1518 XVaNestedList preedit_attr, status_attr;
1504 1519
1505 if (Input_Context == NULL 1520 if (!Input_Context
1521 || !TermWin.focus
1506 || !TermWin.focus || ! (input_style & XIMPreeditArea) 1522 || !(input_style & XIMPreeditArea)
1507 || !IMisRunning ()) 1523 || !IMisRunning ())
1508 return; 1524 return;
1509 1525
1510 /* Getting the necessary width of preedit area */ 1526 /* Getting the necessary width of preedit area */
1511 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1527 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1512 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1528 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1513 XFree (status_attr); 1529 XFree (status_attr);
1514 1530
1515 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); 1531 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1532 XFree (needed_rect);
1516 1533
1517 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1534 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1518 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1535 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1519 1536
1520 XSetICValues (Input_Context, 1537 XSetICValues (Input_Context,
1521 XNPreeditAttributes, preedit_attr, 1538 XNPreeditAttributes, preedit_attr,
1522 XNStatusAttributes, status_attr, NULL); 1539 XNStatusAttributes, status_attr, NULL);
1523 1540
1524 XFree (preedit_attr); 1541 XFree (preedit_attr);
1525 XFree (status_attr); 1542 XFree (status_attr);
1526} 1543}
1527#endif /* USE_XIM */ 1544#endif /* USE_XIM */

Diff Legend

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