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

Diff Legend

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