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.30 by pcg, Thu Feb 12 01:53:25 2004 UTC vs.
Revision 1.60 by pcg, Sun Mar 28 02:07:08 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>
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
16 * 17 *
17 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 21 * (at your option) any later version.
… …
55 STRNCPY (curlocale, locale, 128); 56 STRNCPY (curlocale, locale, 128);
56 setlocale (LC_CTYPE, curlocale); 57 setlocale (LC_CTYPE, curlocale);
57 } 58 }
58} 59}
59 60
61#if ENABLE_COMBINING
62class rxvt_composite_vec rxvt_composite;
63
64text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
65{
66 compose_char *cc;
67
68 // break compose chains, as stupid readline really likes to duplicate
69 // composing characters for some reason near the end of a line.
70 cc = (*this)[c1];
71 while (cc)
72 {
73 if (cc->c2 == c2) return c1;
74 cc = (*this)[cc->c1];
75 }
76
77 // check to see wether this combination already exists otherwise
78 for (cc = v.end (); cc-- > v.begin (); )
79 {
80 if (cc->c1 == c1 && cc->c2 == c2)
81 return COMPOSE_LO + (cc - v.begin ());
82 }
83
84 // allocate a new combination
85 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
86 {
87 static int seen;
88
89 if (!seen++)
90 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
91
92 return REPLACEMENT_CHAR;
93 }
94
95 v.push_back (compose_char (c1, c2));
96
97 return v.size () - 1 + COMPOSE_LO;
98}
99
100int rxvt_composite_vec::expand (unicode_t c, wchar_t *r)
101{
102 compose_char *cc = (*this)[c];
103
104 if (!cc)
105 {
106 if (r) *r = c;
107 return 1;
108 }
109
110 int len = expand (cc->c1, r);
111
112 if (r) r += len;
113
114 if (cc->c2 != NOCHAR)
115 {
116 len++;
117 if (r) *r++ = cc->c2;
118 }
119
120 return len;
121
122}
123#endif
124
60void * 125void *
61rxvt_term::operator new (size_t s) 126rxvt_term::operator new (size_t s)
62{ 127{
63 void *p = malloc (s); 128 void *p = malloc (s);
64 129
… …
79 vt_ev (this, &rxvt_term::x_cb), 144 vt_ev (this, &rxvt_term::x_cb),
80#ifdef HAVE_SCROLLBARS 145#ifdef HAVE_SCROLLBARS
81 scrollbar_ev (this, &rxvt_term::x_cb), 146 scrollbar_ev (this, &rxvt_term::x_cb),
82#endif 147#endif
83#ifdef MENUBAR 148#ifdef MENUBAR
84 menubar_ev (this, &rxvt_term::x_cb), fixme 149 menubar_ev (this, &rxvt_term::x_cb),
85#endif 150#endif
86#ifdef CURSOR_BLINK 151#ifdef CURSOR_BLINK
87 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 152 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
88#endif 153#endif
89#ifdef TEXT_BLINK 154#ifdef TEXT_BLINK
90 text_blink_ev (this, &rxvt_term::text_blink_cb), 155 text_blink_ev (this, &rxvt_term::text_blink_cb),
91#endif 156#endif
92#ifdef POINTER_BLANK 157#ifdef POINTER_BLANK
93 pointer_ev (this, &rxvt_term::pointer_cb), 158 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif
160#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb),
94#endif 162#endif
95 check_ev (this, &rxvt_term::check_cb), 163 check_ev (this, &rxvt_term::check_cb),
96 destroy_ev (this, &rxvt_term::destroy_cb), 164 destroy_ev (this, &rxvt_term::destroy_cb),
97 pty_ev (this, &rxvt_term::pty_cb), 165 pty_ev (this, &rxvt_term::pty_cb),
98 incr_ev (this, &rxvt_term::incr_cb), 166 incr_ev (this, &rxvt_term::incr_cb)
99#ifdef USE_XIM
100 im_ev (this, &rxvt_term::im_cb)
101#endif
102{ 167{
103 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 168 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
104} 169}
105 170
106rxvt_term::~rxvt_term () 171rxvt_term::~rxvt_term ()
107{ 172{
108 if (cmd_fd >= 0) 173 if (cmd_fd >= 0)
109 close (cmd_fd); 174 close (cmd_fd);
110 175
111 scr_release ();
112
113 free (locale);
114 free (codeset);
115
116#ifndef NO_SETOWNER_TTYDEV 176#ifndef NO_SETOWNER_TTYDEV
117 privileged_ttydev (RESTORE); 177 privileged_ttydev (RESTORE);
118#endif 178#endif
119#ifdef UTMP_SUPPORT 179#ifdef UTMP_SUPPORT
120 privileged_utmp (RESTORE); 180 privileged_utmp (RESTORE);
121#endif 181#endif
122 182
123 // TODO: free pixcolours, colours should become part of rxvt_display 183 delete TermWin.fontset;
124 184
125 delete PixColors;
126
127 displays.put (display);
128}
129
130void
131rxvt_term::destroy ()
132{
133 if (display) 185 if (display)
134 { 186 {
187 selection_clear ();
188
189#ifdef MENUBAR
190 if (menubarGC) XFreeGC (display->display, menubarGC);
191#endif
192#ifdef XTERM_SCROLLBAR
193 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
194 if (ShadowGC) XFreeGC (display->display, ShadowGC);
195#endif
196#ifdef PLAIN_SCROLLBAR
197 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC);
198#endif
199#ifdef NEXT_SCROLLBAR
200 if (blackGC) XFreeGC (display->display, blackGC);
201 if (whiteGC) XFreeGC (display->display, whiteGC);
202 if (grayGC) XFreeGC (display->display, grayGC);
203 if (darkGC) XFreeGC (display->display, darkGC);
204 if (stippleGC) XFreeGC (display->display, stippleGC);
205 if (dimple) XFreePixmap (display->display, dimple);
206 if (upArrow) XFreePixmap (display->display, upArrow);
207 if (downArrow) XFreePixmap (display->display, downArrow);
208 if (upArrowHi) XFreePixmap (display->display, upArrowHi);
209 if (downArrowHi) XFreePixmap (display->display, downArrowHi);
210#endif
211#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
212 if (topShadowGC) XFreeGC (display->display, topShadowGC);
213 if (botShadowGC) XFreeGC (display->display, botShadowGC);
214 if (scrollbarGC) XFreeGC (display->display, scrollbarGC);
215#endif
216 if (TermWin.gc) XFreeGC (display->display, TermWin.gc);
217
218#if defined(MENUBAR) && (MENUBAR_MAX > 1)
219 delete menuBar.drawable;
220 //if (menuBar.win)
221 // XDestroyWindow (display->display, menuBar.win);
222#endif
223 delete TermWin.drawable;
224 // destroy all windows
135 if (TermWin.parent[0]) 225 if (TermWin.parent[0])
136 XDestroyWindow (display->display, TermWin.parent[0]); 226 XDestroyWindow (display->display, TermWin.parent[0]);
227 }
137 228
229 // TODO: free pixcolours, colours should become part of rxvt_display
230
231 delete PixColors;
232
233 displays.put (display);
234
235 scr_release ();
236
237 /* clear all resources */
238 for (int i = 0; i < allocated.size (); i++)
239 free (allocated[i]);
240
241 free (selection.text);
242 // TODO: manage env vars in child only(!)
243 free (env_windowid);
244 free (env_display);
245 free (env_term);
246 free (env_colorfgbg);
247 free (locale);
248#if 0
249 free (codeset);
250#endif
251
252 delete envv;
253 delete argv;
254}
255
256void
257rxvt_term::destroy ()
258{
259 if (display)
260 {
261 rootwin_ev.stop (display);
138 termwin_ev.stop (display); 262 termwin_ev.stop (display);
139 vt_ev.stop (display); 263 vt_ev.stop (display);
140
141#ifdef USE_XIM 264#ifdef USE_XIM
142 im_destroy (); 265 im_destroy ();
143 im_ev.stop (display); 266 im_ev.stop (display);
144#endif 267#endif
145#ifdef HAVE_SCROLLBARS 268#ifdef HAVE_SCROLLBARS
… …
172 295
173 delete this; 296 delete this;
174} 297}
175 298
176/*----------------------------------------------------------------------*/ 299/*----------------------------------------------------------------------*/
177/* rxvt_init() */ 300/* rxvt_init () */
178/* LIBPROTO */
179rxvt_t
180rxvt_init (int argc, const char *const *argv)
181{
182 SET_R (new rxvt_term);
183
184 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
185 {
186 delete GET_R;
187 SET_R (0);
188 }
189
190 return GET_R;
191}
192
193static int (*old_xerror_handler)(Display *dpy, XErrorEvent *event);
194
195void
196rxvt_init_signals ()
197{
198 /* install exit handler for cleanup */
199#if 0
200#ifdef HAVE_ATEXIT
201 atexit(rxvt_clean_exit);
202#else
203#endif
204#endif
205
206 struct sigaction sa;
207
208 sigfillset (&sa.sa_mask);
209 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
210 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
211 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
212 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
213 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
214 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
215 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
216
217 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
218 /* signal (SIGURG, SIG_DFL); */
219
220 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
221 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
222}
223
224bool 301bool
225rxvt_term::init (int argc, const char *const *argv) 302rxvt_term::init (int argc, const char *const *argv)
226{ 303{
304 SET_R (this);
305
306 if (!init_vars ())
307 return false;
308
227 /* 309 /*
228 * Save and then give up any super-user privileges 310 * Save and then give up any super-user privileges
229 * If we need privileges in any area then we must specifically request it. 311 * If we need privileges in any area then we must specifically request it.
230 * We should only need to be root in these cases: 312 * We should only need to be root in these cases:
231 * 1. write utmp entries on some systems 313 * 1. write utmp entries on some systems
… …
238 320
239 const char **cmd_argv = init_resources (argc, argv); 321 const char **cmd_argv = init_resources (argc, argv);
240 322
241 set_locale (""); 323 set_locale ("");
242 324
243#if (MENUBAR_MAX) 325#if MENUBAR_MAX
244 menubar_read (rs[Rs_menu]); 326 menubar_read (rs[Rs_menu]);
245#endif 327#endif
246#ifdef HAVE_SCROLLBARS 328#ifdef HAVE_SCROLLBARS
247 if (Options & Opt_scrollBar) 329 if (Options & Opt_scrollBar)
248 scrollBar.setIdle (); /* set existence for size calculations */ 330 scrollBar.setIdle (); /* set existence for size calculations */
… …
251 create_windows (argc, argv); 333 create_windows (argc, argv);
252 334
253 init_xlocale (); 335 init_xlocale ();
254 336
255 scr_reset (); /* initialize screen */ 337 scr_reset (); /* initialize screen */
256#ifdef RXVT_GRAPHICS
257 Gr_reset (); /* reset graphics */
258#endif
259 338
260#if 0 339#if 0
261#ifdef DEBUG_X
262 XSynchronize(display->display, True); 340 XSynchronize (display->display, True);
263#endif
264#endif 341#endif
265 342
266#ifdef HAVE_SCROLLBARS 343#ifdef HAVE_SCROLLBARS
267 if (Options & Opt_scrollBar) 344 if (Options & Opt_scrollBar)
268 resize_scrollbar (); /* create and map scrollbar */ 345 resize_scrollbar (); /* create and map scrollbar */
269#endif 346#endif
270#if (MENUBAR_MAX) 347#if (MENUBAR_MAX)
271 if (menubar_visible(r)) 348 if (menubar_visible ())
272 XMapWindow (display->display, menuBar.win); 349 XMapWindow (display->display, menuBar.win);
273#endif 350#endif
274#ifdef TRANSPARENT 351#ifdef TRANSPARENT
275 if (Options & Opt_transparent) 352 if (Options & Opt_transparent)
276 { 353 {
… …
282 rootwin_ev.start (display, display->root); 359 rootwin_ev.start (display, display->root);
283 360
284 XMapWindow (display->display, TermWin.vt); 361 XMapWindow (display->display, TermWin.vt);
285 XMapWindow (display->display, TermWin.parent[0]); 362 XMapWindow (display->display, TermWin.parent[0]);
286 363
287 init_env ();
288 init_command (cmd_argv); 364 init_command (cmd_argv);
289 365
290 pty_ev.start (cmd_fd, EVENT_READ); 366 pty_ev.start (cmd_fd, EVENT_READ);
291 367
292 check_ev.start (); 368 check_ev.start ();
293 369
294 return true; 370 return true;
371}
372
373static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
374
375void
376rxvt_init_signals ()
377{
378 /* install exit handler for cleanup */
379#if 0
380#ifdef HAVE_ATEXIT
381 atexit (rxvt_clean_exit);
382#else
383#endif
384#endif
385
386 struct sigaction sa;
387
388 sigfillset (&sa.sa_mask);
389 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
390 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
391 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
392 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
393 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
394 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
395 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
396
397 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
398 /* signal (SIGURG, SIG_DFL); */
399
400 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
401 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
295} 402}
296 403
297/* ------------------------------------------------------------------------- * 404/* ------------------------------------------------------------------------- *
298 * SIGNAL HANDLING & EXIT HANDLER * 405 * SIGNAL HANDLING & EXIT HANDLER *
299 * ------------------------------------------------------------------------- */ 406 * ------------------------------------------------------------------------- */
… …
301 * Catch a SIGCHLD signal and exit if the direct child has died 408 * Catch a SIGCHLD signal and exit if the direct child has died
302 */ 409 */
303/* ARGSUSED */ 410/* ARGSUSED */
304/* EXTPROTO */ 411/* EXTPROTO */
305RETSIGTYPE 412RETSIGTYPE
306rxvt_Child_signal(int sig __attribute__ ((unused))) 413rxvt_Child_signal (int sig __attribute__ ((unused)))
307{ 414{
308 int pid, save_errno = errno; 415 int pid, save_errno = errno;
309 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 416 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
310 ; 417 ;
311 errno = save_errno; 418 errno = save_errno;
… …
319/* 426/*
320 * Catch a fatal signal and tidy up before quitting 427 * Catch a fatal signal and tidy up before quitting
321 */ 428 */
322/* EXTPROTO */ 429/* EXTPROTO */
323RETSIGTYPE 430RETSIGTYPE
324rxvt_Exit_signal(int sig) 431rxvt_Exit_signal (int sig)
325{ 432{
326 signal (sig, SIG_DFL); 433 signal (sig, SIG_DFL);
327#ifdef DEBUG_CMD 434#ifdef DEBUG_CMD
328 rxvt_print_error ("signal %d", sig); 435 rxvt_warn ("caught signal %d, exiting.\n", sig);
329#endif 436#endif
330 rxvt_clean_exit(); 437 rxvt_clean_exit ();
331 kill (getpid (), sig); 438 kill (getpid (), sig);
332} 439}
333 440
334/* INTPROTO */ 441/* INTPROTO */
335int 442int
… …
363/* ------------------------------------------------------------------------- * 470/* ------------------------------------------------------------------------- *
364 * MEMORY ALLOCATION WRAPPERS * 471 * MEMORY ALLOCATION WRAPPERS *
365 * ------------------------------------------------------------------------- */ 472 * ------------------------------------------------------------------------- */
366/* EXTPROTO */ 473/* EXTPROTO */
367void * 474void *
368rxvt_malloc(size_t size) 475rxvt_malloc (size_t size)
369{ 476{
370 void *p; 477 void *p;
371 478
372 p = malloc(size); 479 p = malloc (size);
373 if (p) 480 if (p)
374 return p; 481 return p;
375 482
376 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 483 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
377 rxvt_clean_exit(); 484 rxvt_clean_exit ();
378 exit(EXIT_FAILURE); 485 exit (EXIT_FAILURE);
379 /* NOTREACHED */ 486 /* NOTREACHED */
380} 487}
381 488
382/* EXTPROTO */ 489/* EXTPROTO */
383void * 490void *
384rxvt_calloc(size_t number, size_t size) 491rxvt_calloc (size_t number, size_t size)
385{ 492{
386 void *p; 493 void *p;
387 494
388 p = calloc(number, size); 495 p = calloc (number, size);
389 if (p) 496 if (p)
390 return p; 497 return p;
391 498
392 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 499 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
393 rxvt_clean_exit(); 500 rxvt_clean_exit ();
394 exit(EXIT_FAILURE); 501 exit (EXIT_FAILURE);
395 /* NOTREACHED */ 502 /* NOTREACHED */
396} 503}
397 504
398/* EXTPROTO */ 505/* EXTPROTO */
399void * 506void *
400rxvt_realloc(void *ptr, size_t size) 507rxvt_realloc (void *ptr, size_t size)
401{ 508{
402 void *p; 509 void *p;
403 510
404 if (ptr) 511 if (ptr)
405 p = realloc(ptr, size); 512 p = realloc (ptr, size);
406 else 513 else
407 p = malloc(size); 514 p = malloc (size);
408 if (p) 515 if (p)
409 return p; 516 return p;
410 517
411 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 518 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
412 rxvt_clean_exit(); 519 rxvt_clean_exit ();
413 exit(EXIT_FAILURE); 520 exit (EXIT_FAILURE);
414 /* NOTREACHED */ 521 /* NOTREACHED */
415} 522}
416 523
417/* ------------------------------------------------------------------------- * 524/* ------------------------------------------------------------------------- *
418 * PRIVILEGED OPERATIONS * 525 * PRIVILEGED OPERATIONS *
… …
421void 528void
422rxvt_term::privileges (int mode) 529rxvt_term::privileges (int mode)
423{ 530{
424#if ! defined(__CYGWIN32__) 531#if ! defined(__CYGWIN32__)
425# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 532# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
426 /* setreuid() is the poor man's setuid(), seteuid() */ 533 /* setreuid () is the poor man's setuid (), seteuid () */
427# define seteuid(a) setreuid(-1, (a)) 534# define seteuid(a) setreuid(-1, (a))
428# define setegid(a) setregid(-1, (a)) 535# define setegid(a) setregid(-1, (a))
429# define HAVE_SETEUID 536# define HAVE_SETEUID
430# endif 537# endif
431# ifdef HAVE_SETEUID 538# ifdef HAVE_SETEUID
… …
434 case IGNORE: 541 case IGNORE:
435 /* 542 /*
436 * change effective uid/gid - not real uid/gid - so we can switch 543 * change effective uid/gid - not real uid/gid - so we can switch
437 * back to root later, as required 544 * back to root later, as required
438 */ 545 */
439 seteuid(getuid()); 546 seteuid (getuid ());
440 setegid(getgid()); 547 setegid (getgid ());
441 break; 548 break;
442 case SAVE: 549 case SAVE:
443 euid = geteuid(); 550 euid = geteuid ();
444 egid = getegid(); 551 egid = getegid ();
445 break; 552 break;
446 case RESTORE: 553 case RESTORE:
447 seteuid(euid); 554 seteuid (euid);
448 setegid(egid); 555 setegid (egid);
449 break; 556 break;
450 } 557 }
451# else 558# else
452 switch (mode) 559 switch (mode)
453 { 560 {
454 case IGNORE: 561 case IGNORE:
455 setuid(getuid()); 562 setuid (getuid ());
456 setgid(getgid()); 563 setgid (getgid ());
457 /* FALLTHROUGH */ 564 /* FALLTHROUGH */
458 case SAVE: 565 case SAVE:
459 /* FALLTHROUGH */ 566 /* FALLTHROUGH */
460 case RESTORE: 567 case RESTORE:
461 break; 568 break;
… …
466 573
467#ifdef UTMP_SUPPORT 574#ifdef UTMP_SUPPORT
468void 575void
469rxvt_term::privileged_utmp (char action) 576rxvt_term::privileged_utmp (char action)
470{ 577{
471 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 578 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
472 action, next_utmp_action, getpid())); 579 action, next_utmp_action, getpid ()));
473 if (next_utmp_action != action || (action != SAVE && action != RESTORE) 580 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
474 || (Options & Opt_utmpInhibit) 581 || (Options & Opt_utmpInhibit)
475 || ttydev == NULL || *ttydev == '\0') 582 || ttydev == NULL || *ttydev == '\0')
476 return; 583 return;
477 584
… …
492 599
493#ifndef NO_SETOWNER_TTYDEV 600#ifndef NO_SETOWNER_TTYDEV
494void 601void
495rxvt_term::privileged_ttydev (char action) 602rxvt_term::privileged_ttydev (char action)
496{ 603{
497 D_MAIN((stderr, 604 D_MAIN ((stderr,
498 "privileged_ttydev (%c); waiting for: %c (pid: %d)", 605 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
499 action, next_tty_action, getpid())); 606 action, next_tty_action, getpid ()));
500 if (next_tty_action != action || (action != SAVE && action != RESTORE) 607 if (next_tty_action != action || (action != SAVE && action != RESTORE)
501 || ttydev == NULL || *ttydev == '\0') 608 || ttydev == NULL || *ttydev == '\0')
502 return; 609 return;
503 610
504 privileges (RESTORE); 611 privileges (RESTORE);
505 612
506 if (action == SAVE) 613 if (action == SAVE)
507 { 614 {
508 next_tty_action = RESTORE; 615 next_tty_action = RESTORE;
509# ifndef RESET_TTY_TO_COMMON_DEFAULTS 616# ifndef RESET_TTY_TO_COMMON_DEFAULTS
510 /* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 617 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
511 if (lstat(ttydev, &ttyfd_stat) < 0) /* you lose out */ 618 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
512 next_tty_action = IGNORE; 619 next_tty_action = IGNORE;
513 else 620 else
514# endif 621# endif
515 622
516 { 623 {
517 chown(ttydev, getuid(), ttygid); /* fail silently */ 624 chown (ttydev, getuid (), ttygid); /* fail silently */
518 chmod(ttydev, ttymode); 625 chmod (ttydev, ttymode);
519# ifdef HAVE_REVOKE 626# ifdef HAVE_REVOKE
520 revoke(ttydev); 627 revoke (ttydev);
521# endif 628# endif
522 629
523 } 630 }
524 } 631 }
525 else 632 else
526 { /* action == RESTORE */ 633 { /* action == RESTORE */
527 next_tty_action = IGNORE; 634 next_tty_action = IGNORE;
528# ifndef RESET_TTY_TO_COMMON_DEFAULTS 635# ifndef RESET_TTY_TO_COMMON_DEFAULTS
529 chmod(ttydev, ttyfd_stat.st_mode); 636 chmod (ttydev, ttyfd_stat.st_mode);
530 chown(ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid); 637 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
531# else 638# else
532 chmod(ttydev, 639 chmod (ttydev,
533 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 640 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
534 chown(ttydev, 0, 0); 641 chown (ttydev, 0, 0);
535# endif 642# endif
536 643
537 } 644 }
538 645
539 privileges (IGNORE); 646 privileges (IGNORE);
540 647
541# ifndef RESET_TTY_TO_COMMON_DEFAULTS 648# ifndef RESET_TTY_TO_COMMON_DEFAULTS
542 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 649 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
543 action == RESTORE ? "Restoring" : (action == 650 action == RESTORE ? "Restoring" : (action ==
544 SAVE ? "Saving" : 651 SAVE ? "Saving" :
545 "UNKNOWN ERROR for"), ttydev, 652 "UNKNOWN ERROR for"), ttydev,
546 ttyfd_stat.st_mode, ttyfd_stat.st_uid, 653 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
547 ttyfd_stat.st_gid)); 654 ttyfd_stat.st_gid));
… …
560 short recalc_x, recalc_y; 667 short recalc_x, recalc_y;
561 int x, y, sb_w, mb_h, flags; 668 int x, y, sb_w, mb_h, flags;
562 unsigned int w, h; 669 unsigned int w, h;
563 unsigned int max_width, max_height; 670 unsigned int max_width, max_height;
564 671
565 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 672 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
566 TermWin.ncol, TermWin.nrow, szHint.width, 673 TermWin.ncol, TermWin.nrow, szHint.width,
567 szHint.height)); 674 szHint.height));
568 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 675 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
569 szHint.win_gravity = NorthWestGravity; 676 szHint.win_gravity = NorthWestGravity;
570 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 677 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
… …
573 flags = 0; 680 flags = 0;
574 if (!parsed_geometry) 681 if (!parsed_geometry)
575 { 682 {
576 parsed_geometry = 1; 683 parsed_geometry = 1;
577 if (rs[Rs_geometry]) 684 if (rs[Rs_geometry])
578 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h); 685 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
579 if (flags & WidthValue) 686 if (flags & WidthValue)
580 { 687 {
581 TermWin.ncol = BOUND_POSITIVE_INT16(w); 688 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
582 szHint.flags |= USSize; 689 szHint.flags |= USSize;
583 } 690 }
584 if (flags & HeightValue) 691 if (flags & HeightValue)
585 { 692 {
586 TermWin.nrow = BOUND_POSITIVE_INT16(h); 693 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
587 szHint.flags |= USSize; 694 szHint.flags |= USSize;
588 } 695 }
589 if (flags & XValue) 696 if (flags & XValue)
590 { 697 {
591 szHint.x = x; 698 szHint.x = x;
… …
608 else 715 else
609 szHint.win_gravity = SouthWestGravity; 716 szHint.win_gravity = SouthWestGravity;
610 } 717 }
611 } 718 }
612 } 719 }
720
613 /* TODO: BOUNDS */ 721 /* TODO: BOUNDS */
614 TermWin.width = TermWin.ncol * TermWin.fwidth; 722 TermWin.width = TermWin.ncol * TermWin.fwidth;
615 TermWin.height = TermWin.nrow * TermWin.fheight; 723 TermWin.height = TermWin.nrow * TermWin.fheight;
616 max_width = MAX_COLS * TermWin.fwidth; 724 max_width = MAX_COLS * TermWin.fwidth;
617 max_height = MAX_ROWS * TermWin.fheight; 725 max_height = MAX_ROWS * TermWin.fheight;
… …
620 728
621 sb_w = mb_h = 0; 729 sb_w = mb_h = 0;
622 window_vt_x = window_vt_y = 0; 730 window_vt_x = window_vt_y = 0;
623 if (scrollbar_visible ()) 731 if (scrollbar_visible ())
624 { 732 {
625 sb_w = scrollbar_TotalWidth(); 733 sb_w = scrollbar_TotalWidth ();
626 szHint.base_width += sb_w; 734 szHint.base_width += sb_w;
627 if (!(Options & Opt_scrollBar_right)) 735 if (! (Options & Opt_scrollBar_right))
628 window_vt_x = sb_w; 736 window_vt_x = sb_w;
629 } 737 }
630 if (menubar_visible ()) 738 if (menubar_visible ())
631 { 739 {
632 mb_h = menuBar_TotalHeight(); 740 mb_h = menuBar_TotalHeight ();
633 szHint.base_height += mb_h; 741 szHint.base_height += mb_h;
634 window_vt_y = mb_h; 742 window_vt_y = mb_h;
635 } 743 }
636 szHint.width_inc = TermWin.fwidth; 744 szHint.width_inc = TermWin.fwidth;
637 szHint.height_inc = TermWin.fheight; 745 szHint.height_inc = TermWin.fheight;
… …
643 szHint.width = width; 751 szHint.width = width;
644 TermWin.width = width - szHint.base_width; 752 TermWin.width = width - szHint.base_width;
645 } 753 }
646 else 754 else
647 { 755 {
648 MIN_IT(TermWin.width, max_width); 756 MIN_IT (TermWin.width, max_width);
649 szHint.width = szHint.base_width + TermWin.width; 757 szHint.width = szHint.base_width + TermWin.width;
650 } 758 }
651 if (height && height - szHint.base_height < max_height) 759 if (height && height - szHint.base_height < max_height)
652 { 760 {
653 szHint.height = height; 761 szHint.height = height;
654 TermWin.height = height - szHint.base_height; 762 TermWin.height = height - szHint.base_height;
655 } 763 }
656 else 764 else
657 { 765 {
658 MIN_IT(TermWin.height, max_height); 766 MIN_IT (TermWin.height, max_height);
659 szHint.height = szHint.base_height + TermWin.height; 767 szHint.height = szHint.base_height + TermWin.height;
660 } 768 }
661 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 769 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
662 window_sb_x = szHint.width - sb_w; 770 window_sb_x = szHint.width - sb_w;
663 771
… …
668 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 776 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
669 - szHint.height - 2 * TermWin.ext_bwidth); 777 - szHint.height - 2 * TermWin.ext_bwidth);
670 778
671 TermWin.ncol = TermWin.width / TermWin.fwidth; 779 TermWin.ncol = TermWin.width / TermWin.fwidth;
672 TermWin.nrow = TermWin.height / TermWin.fheight; 780 TermWin.nrow = TermWin.height / TermWin.fheight;
673 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 781 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
674 TermWin.ncol, TermWin.nrow, szHint.width, 782 TermWin.ncol, TermWin.nrow, szHint.width,
675 szHint.height)); 783 szHint.height));
676 return; 784 return;
677} 785}
678 786
… …
694 ws.ws_xpixel = ws.ws_ypixel = 0; 802 ws.ws_xpixel = ws.ws_ypixel = 0;
695#ifndef DEBUG_SIZE 803#ifndef DEBUG_SIZE
696 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 804 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
697#else 805#else
698 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 806 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
699 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 807 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
700# ifdef SIGWINCH 808# ifdef SIGWINCH
701 else if (cmd_pid) /* force through to the command */ 809 else if (cmd_pid) /* force through to the command */
702 kill (cmd_pid, SIGWINCH); 810 kill (cmd_pid, SIGWINCH);
703# endif 811# endif
704#endif 812#endif
705} 813}
706 814
707/*----------------------------------------------------------------------*/ 815/*----------------------------------------------------------------------*/
708/* rxvt_change_font() - Switch to a new font */ 816/* rxvt_change_font () - Switch to a new font */
709/* 817/*
710 * init = 1 - initialize 818 * init = 1 - initialize
711 * 819 *
712 * fontname == FONT_UP - switch to bigger font 820 * fontname == FONT_UP - switch to bigger font
713 * fontname == FONT_DN - switch to smaller font 821 * fontname == FONT_DN - switch to smaller font
714 */ 822 */
715void 823bool
716rxvt_term::change_font (int init, const char *fontname) 824rxvt_term::change_font (const char *fontname)
717{} 825{
826 if (fontname == FONT_UP)
827 {
828 // TODO
829 }
830 else if (fontname == FONT_DN)
831 {
832 // TODO
833 }
834 else
835 {
836 rxvt_fontset *fs = new rxvt_fontset (this);
718 837
719void 838 if (fs && fs->populate (fontname ? fontname : "fixed"))
839 {
840 delete TermWin.fontset;
841 TermWin.fontset = fs;
842 TermWin.fwidth = fs->base_font ()->width;
843 TermWin.fheight = fs->base_font ()->height;
844 TermWin.fbase = fs->base_font ()->ascent;
845
846 if (TermWin.parent[0])
847 {
848 resize_all_windows (0, 0, 0);
849 scr_remap_chars ();
850 scr_touch (true);
851 }
852
853 return true;
854 }
855 }
856
857 return false;
858}
859
860bool
720rxvt_term::font_up_down (int n, int direction) 861rxvt_term::font_up_down (int n, int direction)
721{} 862{
863 return false;
864}
722 865
723/*----------------------------------------------------------------------*/ 866/*----------------------------------------------------------------------*/
724/*----------------------------------------------------------------------*/ 867/*----------------------------------------------------------------------*/
725/* xterm sequences - title, iconName, color (exptl) */ 868/* xterm sequences - title, iconName, color (exptl) */
726void 869void
727rxvt_term::set_title (const char *str) 870rxvt_term::set_title (const char *str)
728{ 871{
729#ifndef SMART_WINDOW_TITLE 872#ifndef SMART_WINDOW_TITLE
730 XStoreName(display->display, TermWin.parent[0], str); 873 XStoreName (display->display, TermWin.parent[0], str);
731#else 874#else
732 char *name; 875 char *name;
733 876
734 if (XFetchName(display->display, TermWin.parent[0], &name) == 0) 877 if (!XFetchName (display->display, TermWin.parent[0], &name))
735 name = NULL; 878 name = NULL;
879
736 if (name == NULL || STRCMP(name, str)) 880 if (name == NULL || STRCMP (name, str))
737 XStoreName(display->display, TermWin.parent[0], str); 881 XStoreName (display->display, TermWin.parent[0], str);
882
738 if (name) 883 if (name)
739 XFree(name); 884 XFree (name);
740#endif 885#endif
741} 886}
742 887
743void 888void
744rxvt_term::set_iconName (const char *str) 889rxvt_term::set_icon_name (const char *str)
745{ 890{
746#ifndef SMART_WINDOW_TITLE 891#ifndef SMART_WINDOW_TITLE
747 XSetIconName(display->display, TermWin.parent[0], str); 892 XSetIconName (display->display, TermWin.parent[0], str);
748#else 893#else
749 char *name; 894 char *name;
750 895
751 if (XGetIconName(display->display, TermWin.parent[0], &name)) 896 if (!XGetIconName (display->display, TermWin.parent[0], &name))
752 name = NULL; 897 name = NULL;
898
753 if (name == NULL || STRCMP(name, str)) 899 if (name == NULL || STRCMP (name, str))
754 XSetIconName(display->display, TermWin.parent[0], str); 900 XSetIconName (display->display, TermWin.parent[0], str);
901
755 if (name) 902 if (name)
756 XFree(name); 903 XFree (name);
757#endif 904#endif
758} 905}
759 906
760#ifdef XTERM_COLOR_CHANGE 907#ifdef XTERM_COLOR_CHANGE
761void 908void
762rxvt_term::set_window_color (int idx, const char *color) 909rxvt_term::set_window_color (int idx, const char *color)
763{ 910{
764 rxvt_color xcol; 911 rxvt_color xcol;
765 int i; 912 int i;
766 913
767 if (color == NULL || *color == '\0') 914 if (color == NULL || *color == '\0')
768 return; 915 return;
769 916
770 /* handle color aliases */ 917 /* handle color aliases */
771 if (isdigit(*color)) 918 if (isdigit (*color))
772 { 919 {
773 i = atoi(color); 920 i = atoi (color);
774 if (i >= 8 && i <= 15) 921 if (i >= 8 && i <= 15)
775 { /* bright colors */ 922 { /* bright colors */
776 i -= 8; 923 i -= 8;
777# ifndef NO_BRIGHTCOLOR 924# ifndef NO_BRIGHTCOLOR
778 PixColors[idx] = PixColors[minBrightCOLOR + i]; 925 PixColors[idx] = PixColors[minBrightCOLOR + i];
779 SET_PIXCOLOR(idx); 926 SET_PIXCOLOR (idx);
780 goto Done; 927 goto Done;
781# endif 928# endif
782 929
783 } 930 }
784 if (i >= 0 && i <= 7) 931 if (i >= 0 && i <= 7)
785 { /* normal colors */ 932 { /* normal colors */
786 PixColors[idx] = PixColors[minCOLOR + i]; 933 PixColors[idx] = PixColors[minCOLOR + i];
787 SET_PIXCOLOR(idx); 934 SET_PIXCOLOR (idx);
788 goto Done; 935 goto Done;
789 } 936 }
790 } 937 }
791 if (!rXParseAllocColor (& xcol, color)) 938 if (!rXParseAllocColor (& xcol, color))
792 return; 939 return;
… …
801 if (PixColors[idx] == PixColors[i]) 948 if (PixColors[idx] == PixColors[i])
802 break; 949 break;
803 if (i > Color_White) 950 if (i > Color_White)
804 { 951 {
805 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 952 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
806 XFreeColors(display->display, XCMAP, (PixColors + idx), 1, 953 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
807 DisplayPlanes(display->display, display->screen)); 954 DisplayPlanes (display->display, display->screen));
808 } 955 }
809# endif 956# endif
810 957
811 PixColors[idx] = xcol; 958 PixColors[idx] = xcol;
812 SET_PIXCOLOR(idx); 959 SET_PIXCOLOR (idx);
813 960
814 /* XSetWindowAttributes attr; */ 961 /* XSetWindowAttributes attr; */
815 /* Cursor cursor; */ 962 /* Cursor cursor; */
816Done: 963Done:
817 if (idx == Color_bg && !(Options & Opt_transparent)) 964 if (idx == Color_bg && ! (Options & Opt_transparent))
818 XSetWindowBackground(display->display, TermWin.vt, 965 XSetWindowBackground (display->display, TermWin.vt,
819 PixColors[Color_bg]); 966 PixColors[Color_bg]);
820 967
821 /* handle Color_BD, scrollbar background, etc. */ 968 /* handle Color_BD, scrollbar background, etc. */
822 969
823 set_colorfgbg (); 970 set_colorfgbg ();
… …
837 rxvt_color xcol[2]; 984 rxvt_color xcol[2];
838 985
839 xcol[0] = PixColors[Color_pointer]; 986 xcol[0] = PixColors[Color_pointer];
840 xcol[1] = PixColors[Color_bg]; 987 xcol[1] = PixColors[Color_bg];
841 XQueryColors (display->display, XCMAP, xcol, 2); 988 XQueryColors (display->display, XCMAP, xcol, 2);
842 XRecolorCursor (display->display, TermWin_cursor, &(xcol[0]), &(xcol[1])); 989 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
843#endif 990#endif
844} 991}
845 992
846/*----------------------------------------------------------------------*/ 993/*----------------------------------------------------------------------*/
847/* 994/*
… …
850void 997void
851rxvt_term::set_colorfgbg () 998rxvt_term::set_colorfgbg ()
852{ 999{
853 unsigned int i; 1000 unsigned int i;
854 const char *xpmb = "\0"; 1001 const char *xpmb = "\0";
855 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 1002 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
856 1003
857 env_colorfgbg = 1004 env_colorfgbg =
858 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 1005 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
859 STRCPY(fstr, "default"); 1006 STRCPY (fstr, "default");
860 STRCPY(bstr, "default"); 1007 STRCPY (bstr, "default");
861 for (i = Color_Black; i <= Color_White; i++) 1008 for (i = Color_Black; i <= Color_White; i++)
862 if (PixColors[Color_fg] == PixColors[i]) 1009 if (PixColors[Color_fg] == PixColors[i])
863 { 1010 {
864 sprintf(fstr, "%d", (i - Color_Black)); 1011 sprintf (fstr, "%d", (i - Color_Black));
865 break; 1012 break;
866 } 1013 }
867 for (i = Color_Black; i <= Color_White; i++) 1014 for (i = Color_Black; i <= Color_White; i++)
868 if (PixColors[Color_bg] == PixColors[i]) 1015 if (PixColors[Color_bg] == PixColors[i])
869 { 1016 {
870 sprintf(bstr, "%d", (i - Color_Black)); 1017 sprintf (bstr, "%d", (i - Color_Black));
871#ifdef XPM_BACKGROUND 1018#ifdef XPM_BACKGROUND
872 xpmb = "default;"; 1019 xpmb = "default;";
873#endif 1020#endif
874 break; 1021 break;
875 } 1022 }
1023
876 sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1024 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
877 putenv(env_colorfgbg);
878 1025
879#ifndef NO_BRIGHTCOLOR 1026#ifndef NO_BRIGHTCOLOR
880 colorfgbg = DEFAULT_RSTYLE; 1027 colorfgbg = DEFAULT_RSTYLE;
881 for (i = minCOLOR; i <= maxCOLOR; i++) 1028 for (i = minCOLOR; i <= maxCOLOR; i++)
882 { 1029 {
883 if (PixColors[Color_fg] == PixColors[i]) 1030 if (PixColors[Color_fg] == PixColors[i])
884 colorfgbg = SET_FGCOLOR(colorfgbg, i); 1031 colorfgbg = SET_FGCOLOR (colorfgbg, i);
885 if (PixColors[Color_bg] == PixColors[i]) 1032 if (PixColors[Color_bg] == PixColors[i])
886 colorfgbg = SET_BGCOLOR(colorfgbg, i); 1033 colorfgbg = SET_BGCOLOR (colorfgbg, i);
887 } 1034 }
888#endif 1035#endif
889} 1036}
890 1037
891/*----------------------------------------------------------------------*/ 1038/*----------------------------------------------------------------------*/
… …
897int 1044int
898rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1045rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
899{ 1046{
900 if (!screen_in_out->set (display, colour)) 1047 if (!screen_in_out->set (display, colour))
901 { 1048 {
902 rxvt_print_error("can't allocate colour: %s", colour); 1049 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
903 return false; 1050 return false;
904 } 1051 }
905 1052
906 return true; 1053 return true;
907} 1054}
… …
987 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1134 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
988 1135
989 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1136 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
990 window_vt_y, TermWin_TotalWidth (), 1137 window_vt_y, TermWin_TotalWidth (),
991 TermWin_TotalHeight ()); 1138 TermWin_TotalHeight ());
992#ifdef RXVT_GRAPHICS 1139 scr_clear (height != old_height);
993 if (old_height)
994 Gr_Resize (old_width - szHint.base_width,
995 old_height - szHint.base_height);
996#endif
997 scr_clear ();
998#ifdef XPM_BACKGROUND 1140#ifdef XPM_BACKGROUND
999 resize_pixmap (); 1141 resize_pixmap ();
1000#endif 1142#endif
1001 1143
1002 } 1144 }
… …
1013 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1155 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1014 curr_screen = scr_change_screen (PRIMARY); 1156 curr_screen = scr_change_screen (PRIMARY);
1015 TermWin.ncol = ncol; 1157 TermWin.ncol = ncol;
1016 } 1158 }
1017 1159
1018 scr_reset(); 1160 scr_reset ();
1019 1161
1020 if (curr_screen >= 0) /* this is not the first time through */ 1162 if (curr_screen >= 0) /* this is not the first time through */
1021 { 1163 {
1022 scr_change_screen (curr_screen); 1164 scr_change_screen (curr_screen);
1023 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1165 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
… …
1041{ 1183{
1042 XWindowAttributes wattr; 1184 XWindowAttributes wattr;
1043 1185
1044 if (width == 0 || height == 0) 1186 if (width == 0 || height == 0)
1045 { 1187 {
1046 XGetWindowAttributes(display->display, display->root, &wattr); 1188 XGetWindowAttributes (display->display, display->root, &wattr);
1047 if (width == 0) 1189 if (width == 0)
1048 width = wattr.width - szHint.base_width; 1190 width = wattr.width - szHint.base_width;
1049 if (height == 0) 1191 if (height == 0)
1050 height = wattr.height - szHint.base_height; 1192 height = wattr.height - szHint.base_height;
1051 } 1193 }
… …
1065void 1207void
1066rxvt_term::im_set_size (XRectangle *size) 1208rxvt_term::im_set_size (XRectangle *size)
1067{ 1209{
1068 size->x = TermWin.int_bwidth; 1210 size->x = TermWin.int_bwidth;
1069 size->y = TermWin.int_bwidth; 1211 size->y = TermWin.int_bwidth;
1070 size->width = Width2Pixel(TermWin.ncol); 1212 size->width = Width2Pixel (TermWin.ncol);
1071 size->height = Height2Pixel(TermWin.nrow); 1213 size->height = Height2Pixel (TermWin.nrow);
1072} 1214}
1073 1215
1074void 1216void
1075rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) 1217rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
1076{ 1218{
… …
1086 Atom atom; 1228 Atom atom;
1087 Window win; 1229 Window win;
1088 char server[IMBUFSIZ]; 1230 char server[IMBUFSIZ];
1089 1231
1090 /* get current locale modifier */ 1232 /* get current locale modifier */
1091 if ((p = XSetLocaleModifiers(NULL)) != NULL) 1233 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1092 { 1234 {
1093 STRCPY(server, "@server="); 1235 STRCPY (server, "@server=");
1094 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1236 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1095 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1237 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1096 *p = '\0'; 1238 *p = '\0';
1097 1239
1098 atom = XInternAtom(display->display, server, False); 1240 atom = XInternAtom (display->display, server, False);
1099 win = XGetSelectionOwner(display->display, atom); 1241 win = XGetSelectionOwner (display->display, atom);
1100 if (win != None) 1242 if (win != None)
1101 return True; 1243 return True;
1102 } 1244 }
1103 return False; 1245 return False;
1104} 1246}
… …
1108{ 1250{
1109 XPoint spot; 1251 XPoint spot;
1110 XVaNestedList preedit_attr; 1252 XVaNestedList preedit_attr;
1111 1253
1112 if (Input_Context == NULL 1254 if (Input_Context == NULL
1113 || !TermWin.focus || !(input_style & XIMPreeditPosition) 1255 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1114 || !(event_type == KeyPress 1256 || ! (event_type == KeyPress
1115 || event_type == Expose 1257 || event_type == Expose
1116 || event_type == NoExpose 1258 || event_type == NoExpose
1117 || event_type == SelectionNotify 1259 || event_type == SelectionNotify
1118 || event_type == ButtonRelease || event_type == FocusIn) 1260 || event_type == ButtonRelease || event_type == FocusIn)
1119 || !IMisRunning ()) 1261 || !IMisRunning ())
1120 return; 1262 return;
1121 1263
1122 im_set_position (&spot); 1264 im_set_position (&spot);
1123 1265
1124 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1266 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1125 XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1267 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1126 XFree(preedit_attr); 1268 XFree (preedit_attr);
1127} 1269}
1128 1270
1129void 1271void
1130rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, 1272rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1131 XRectangle * needed_rect) 1273 XRectangle * needed_rect)
1132{ 1274{
1133 int mbh, vtx = 0; 1275 int mbh, vtx = 0;
1134 1276
1135 if (scrollbar_visible () && !(Options & Opt_scrollBar_right)) 1277 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1136 vtx = scrollbar_TotalWidth(); 1278 vtx = scrollbar_TotalWidth ();
1137 1279
1138 mbh = menubar_visible () ? menuBar_TotalHeight() : 0; 1280 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1139 mbh -= TermWin.lineSpace; 1281 mbh -= TermWin.lineSpace;
1140 1282
1141 preedit_rect->x = needed_rect->width + vtx; 1283 preedit_rect->x = needed_rect->width + vtx;
1142 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1284 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1143 1285
1144 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx; 1286 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1145 preedit_rect->height = Height2Pixel(1); 1287 preedit_rect->height = Height2Pixel (1);
1146 1288
1147 status_rect->x = vtx; 1289 status_rect->x = vtx;
1148 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1290 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1149 1291
1150 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1); 1292 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1151 status_rect->height = Height2Pixel(1); 1293 status_rect->height = Height2Pixel (1);
1152} 1294}
1153 1295
1154void 1296void
1155rxvt_term::im_destroy () 1297rxvt_term::im_destroy ()
1156{ 1298{
… …
1182 const char *p; 1324 const char *p;
1183 char **s; 1325 char **s;
1184 XIMStyles *xim_styles; 1326 XIMStyles *xim_styles;
1185 XVaNestedList preedit_attr, status_attr; 1327 XVaNestedList preedit_attr, status_attr;
1186 1328
1187 if (!((p = XSetLocaleModifiers (modifiers)) && *p)) 1329 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1188 return false; 1330 return false;
1189 1331
1190 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1332 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1191 input_method = display->get_xim (locale, modifiers); 1333 input_method = display->get_xim (locale, modifiers);
1192 if (input_method == NULL) 1334 if (input_method == NULL)
1193 return false; 1335 return false;
1194 1336
1195 xim = input_method->xim; 1337 xim = input_method->xim;
… …
1201 display->put_xim (input_method); 1343 display->put_xim (input_method);
1202 return false; 1344 return false;
1203 } 1345 }
1204 1346
1205 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1347 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1206 s = rxvt_splitcommastring(p); 1348 s = rxvt_splitcommastring (p);
1207 for (i = found = 0; !found && s[i]; i++) 1349 for (i = found = 0; !found && s[i]; i++)
1208 { 1350 {
1209 if (!STRCMP(s[i], "OverTheSpot")) 1351 if (!STRCMP (s[i], "OverTheSpot"))
1210 input_style = (XIMPreeditPosition | XIMStatusNothing); 1352 input_style = (XIMPreeditPosition | XIMStatusNothing);
1211 else if (!STRCMP(s[i], "OffTheSpot")) 1353 else if (!STRCMP (s[i], "OffTheSpot"))
1212 input_style = (XIMPreeditArea | XIMStatusArea); 1354 input_style = (XIMPreeditArea | XIMStatusArea);
1213 else if (!STRCMP(s[i], "Root")) 1355 else if (!STRCMP (s[i], "Root"))
1214 input_style = (XIMPreeditNothing | XIMStatusNothing); 1356 input_style = (XIMPreeditNothing | XIMStatusNothing);
1215 1357
1216 for (j = 0; j < xim_styles->count_styles; j++) 1358 for (j = 0; j < xim_styles->count_styles; j++)
1217 if (input_style == xim_styles->supported_styles[j]) 1359 if (input_style == xim_styles->supported_styles[j])
1218 { 1360 {
… …
1239 { 1381 {
1240 im_set_size (&rect); 1382 im_set_size (&rect);
1241 im_set_position (&spot); 1383 im_set_position (&spot);
1242 im_set_color (&fg, &bg); 1384 im_set_color (&fg, &bg);
1243 1385
1244 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1386 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1245 XNSpotLocation, &spot, 1387 XNSpotLocation, &spot,
1246 XNForeground, fg, XNBackground, bg, 1388 XNForeground, fg, XNBackground, bg,
1247 //XNFontSet, TermWin.fontset, 1389 //XNFontSet, TermWin.fontset,
1248 NULL); 1390 NULL);
1249 } 1391 }
… …
1257 */ 1399 */
1258 needed_rect.width = 0; 1400 needed_rect.width = 0;
1259 1401
1260 im_set_preedit_area (&rect, &status_rect, &needed_rect); 1402 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1261 1403
1262 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1404 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1263 XNForeground, fg, XNBackground, bg, 1405 XNForeground, fg, XNBackground, bg,
1264 //XNFontSet, TermWin.fontset, 1406 //XNFontSet, TermWin.fontset,
1265 NULL); 1407 NULL);
1266 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, 1408 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1267 XNForeground, fg, XNBackground, bg, 1409 XNForeground, fg, XNBackground, bg,
1268 //XNFontSet, TermWin.fontset, 1410 //XNFontSet, TermWin.fontset,
1269 NULL); 1411 NULL);
1270 } 1412 }
1271 1413
1272 Input_Context = XCreateIC(xim, XNInputStyle, input_style, 1414 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1273 XNClientWindow, TermWin.parent[0], 1415 XNClientWindow, TermWin.parent[0],
1274 XNFocusWindow, TermWin.parent[0], 1416 XNFocusWindow, TermWin.parent[0],
1275 preedit_attr ? XNPreeditAttributes : NULL, 1417 preedit_attr ? XNPreeditAttributes : NULL,
1276 preedit_attr, 1418 preedit_attr,
1277 status_attr ? XNStatusAttributes : NULL, 1419 status_attr ? XNStatusAttributes : NULL,
1278 status_attr, NULL); 1420 status_attr, NULL);
1279 if (preedit_attr) XFree(preedit_attr); 1421 if (preedit_attr) XFree (preedit_attr);
1280 if (status_attr) XFree(status_attr); 1422 if (status_attr) XFree (status_attr);
1281 1423
1282 if (Input_Context == NULL) 1424 if (Input_Context == NULL)
1283 { 1425 {
1284 rxvt_print_error("failed to create input context"); 1426 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1285 display->put_xim (input_method); 1427 display->put_xim (input_method);
1286 return false; 1428 return false;
1287 } 1429 }
1288 1430
1289 if (input_style & XIMPreeditArea) 1431 if (input_style & XIMPreeditArea)
1290 IMSetStatusPosition (); 1432 IMSetStatusPosition ();
1291 1433
1292 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1434 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1293 return true; 1435 return true;
1294} 1436}
1295 1437
1296void 1438void
1297rxvt_term::im_cb () 1439rxvt_term::im_cb ()
… …
1301 char **s; 1443 char **s;
1302 char buf[IMBUFSIZ]; 1444 char buf[IMBUFSIZ];
1303 1445
1304 im_destroy (); 1446 im_destroy ();
1305 1447
1306 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1448 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1307 if (Input_Context) 1449 if (Input_Context)
1308 return; 1450 return;
1309 1451
1310#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1452#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1311 if (rs[Rs_imLocale]) 1453 if (rs[Rs_imLocale])
1312 setlocale (LC_CTYPE, rs[Rs_imLocale]); 1454 SET_LOCALE (rs[Rs_imLocale]);
1313#endif 1455#endif
1314 1456
1315 p = rs[Rs_inputMethod]; 1457 p = rs[Rs_inputMethod];
1316 if (p && *p) 1458 if (p && *p)
1317 { 1459 {
… …
1330 break; 1472 break;
1331 } 1473 }
1332 } 1474 }
1333 } 1475 }
1334 for (i = 0; s[i]; i++) 1476 for (i = 0; s[i]; i++)
1335 free(s[i]); 1477 free (s[i]);
1336 free(s); 1478 free (s);
1337 1479
1338 if (found) 1480 if (found)
1339 goto done; 1481 goto done;
1340 } 1482 }
1341 1483
… …
1348 goto done; 1490 goto done;
1349 1491
1350done: 1492done:
1351#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1493#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1352 if (rs[Rs_imLocale]) 1494 if (rs[Rs_imLocale])
1353 setlocale (LC_CTYPE, locale); 1495 SET_LOCALE (locale);
1354#endif 1496#endif
1355} 1497}
1356 1498
1357void 1499void
1358rxvt_term::IMSetStatusPosition () 1500rxvt_term::IMSetStatusPosition ()
1359{ 1501{
1360 XRectangle preedit_rect, status_rect, *needed_rect; 1502 XRectangle preedit_rect, status_rect, *needed_rect;
1361 XVaNestedList preedit_attr, status_attr; 1503 XVaNestedList preedit_attr, status_attr;
1362 1504
1363 if (Input_Context == NULL 1505 if (Input_Context == NULL
1364 || !TermWin.focus || !(input_style & XIMPreeditArea) 1506 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1365 || !IMisRunning ()) 1507 || !IMisRunning ())
1366 return; 1508 return;
1367 1509
1368 /* Getting the necessary width of preedit area */ 1510 /* Getting the necessary width of preedit area */
1369 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1511 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1370 XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL); 1512 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1371 XFree(status_attr); 1513 XFree (status_attr);
1372 1514
1373 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); 1515 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1374 1516
1375 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1517 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1376 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1518 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1377 1519
1378 XSetICValues(Input_Context, 1520 XSetICValues (Input_Context,
1379 XNPreeditAttributes, preedit_attr, 1521 XNPreeditAttributes, preedit_attr,
1380 XNStatusAttributes, status_attr, NULL); 1522 XNStatusAttributes, status_attr, NULL);
1381 1523
1382 XFree(preedit_attr); 1524 XFree (preedit_attr);
1383 XFree(status_attr); 1525 XFree (status_attr);
1384} 1526}
1385#endif /* USE_XIM */ 1527#endif /* USE_XIM */
1386 1528
1387/*----------------------------------------------------------------------*/ 1529/*----------------------------------------------------------------------*/
1388rxvt_t rxvt_current_term; 1530rxvt_t rxvt_current_term;

Diff Legend

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