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

Diff Legend

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