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.5 by pcg, Tue Nov 25 15:44:38 2003 UTC vs.
Revision 1.73 by root, Fri Jul 30 14:59:12 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.5 2003/11/25 15:44:38 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * 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>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
12 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
13 * - extensive modifications 12 * - extensive modifications
14 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
15 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
16 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * 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
19 * 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
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
42 42
43#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring>
48
49vector<rxvt_term *> rxvt_term::termlist;
50
51static char curlocale[128];
52
53bool
54rxvt_set_locale (const char *locale)
55{
56 if (!locale || !STRNCMP (locale, curlocale, 128))
57 return false;
58
59 STRNCPY (curlocale, locale, 128);
60 setlocale (LC_CTYPE, curlocale);
61 return true;
62}
63
64#if ENABLE_COMBINING
65class rxvt_composite_vec rxvt_composite;
66
67text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
68{
69 compose_char *cc;
70
71 // break compose chains, as stupid readline really likes to duplicate
72 // composing characters for some reason near the end of a line.
73 cc = (*this)[c1];
74 while (cc)
75 {
76 if (cc->c2 == c2) return c1;
77 cc = (*this)[cc->c1];
78 }
79
80 // check to see wether this combination already exists otherwise
81 for (cc = v.end (); cc-- > v.begin (); )
82 {
83 if (cc->c1 == c1 && cc->c2 == c2)
84 return COMPOSE_LO + (cc - v.begin ());
85 }
86
87 // allocate a new combination
88 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
89 {
90 static int seen;
91
92 if (!seen++)
93 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");
94
95 return REPLACEMENT_CHAR;
96 }
97
98 v.push_back (compose_char (c1, c2));
99
100 return v.size () - 1 + COMPOSE_LO;
101}
102
103int rxvt_composite_vec::expand (unicode_t c, wchar_t *r)
104{
105 compose_char *cc = (*this)[c];
106
107 if (!cc)
108 {
109 if (r) *r = c;
110 return 1;
111 }
112
113 int len = expand (cc->c1, r);
114
115 if (r) r += len;
116
117 if (cc->c2 != NOCHAR)
118 {
119 len++;
120 if (r) *r++ = cc->c2;
121 }
122
123 return len;
124
125}
126#endif
127
47void * 128void *
48rxvt_term::operator new (size_t s) 129rxvt_term::operator new (size_t s)
49{ 130{
50 void *p = malloc (s); 131 void *p = malloc (s);
51 132
58{ 139{
59 free (p); 140 free (p);
60} 141}
61 142
62rxvt_term::rxvt_term () 143rxvt_term::rxvt_term ()
144 :
145 rootwin_ev (this, &rxvt_term::rootwin_cb),
146 termwin_ev (this, &rxvt_term::x_cb),
63: pty_ev (this, &rxvt_term::pty_cb), 147 vt_ev (this, &rxvt_term::x_cb),
148#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif
64#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif
157#ifdef TEXT_BLINK
65 blink_ev (this, &rxvt_term::blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
66#endif 159#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162#endif
163#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif
169#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif
172#ifdef USE_XIM
67 x_ev (this, &rxvt_term::x_cb) 173 im_ev (this, &rxvt_term::im_cb),
174#endif
175 check_ev (this, &rxvt_term::check_cb),
176 destroy_ev (this, &rxvt_term::destroy_cb),
177 pty_ev (this, &rxvt_term::pty_cb),
178 incr_ev (this, &rxvt_term::incr_cb)
68{ 179{
69 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 180 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
181
182 termlist.push_back (this);
70} 183}
71 184
72rxvt_term::~rxvt_term () 185rxvt_term::~rxvt_term ()
73{ 186{
187 termlist.erase (find (termlist.begin (), termlist.end(), this));
188
189 if (cmd_fd >= 0)
190 close (cmd_fd);
191
192#ifndef NO_SETOWNER_TTYDEV
193 privileged_ttydev (RESTORE);
194#endif
195#ifdef UTMP_SUPPORT
196 privileged_utmp (RESTORE);
197#endif
198
199 delete TermWin.fontset;
200
201 if (display)
202 {
203 selection_clear ();
204
205#ifdef MENUBAR
206 if (menubarGC) XFreeGC (display->display, menubarGC);
207#endif
208#ifdef XTERM_SCROLLBAR
209 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
210 if (ShadowGC) XFreeGC (display->display, ShadowGC);
211#endif
212#ifdef PLAIN_SCROLLBAR
213 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC);
214#endif
215#ifdef NEXT_SCROLLBAR
216 if (blackGC) XFreeGC (display->display, blackGC);
217 if (whiteGC) XFreeGC (display->display, whiteGC);
218 if (grayGC) XFreeGC (display->display, grayGC);
219 if (darkGC) XFreeGC (display->display, darkGC);
220 if (stippleGC) XFreeGC (display->display, stippleGC);
221 if (dimple) XFreePixmap (display->display, dimple);
222 if (upArrow) XFreePixmap (display->display, upArrow);
223 if (downArrow) XFreePixmap (display->display, downArrow);
224 if (upArrowHi) XFreePixmap (display->display, upArrowHi);
225 if (downArrowHi) XFreePixmap (display->display, downArrowHi);
226#endif
227#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
228 if (topShadowGC) XFreeGC (display->display, topShadowGC);
229 if (botShadowGC) XFreeGC (display->display, botShadowGC);
230 if (scrollbarGC) XFreeGC (display->display, scrollbarGC);
231#endif
232 if (TermWin.gc) XFreeGC (display->display, TermWin.gc);
233
234#if defined(MENUBAR) && (MENUBAR_MAX > 1)
235 delete menuBar.drawable;
236 //if (menuBar.win)
237 // XDestroyWindow (display->display, menuBar.win);
238#endif
239 delete TermWin.drawable;
240 // destroy all windows
241 if (TermWin.parent[0])
242 XDestroyWindow (display->display, TermWin.parent[0]);
243 }
244
245 // TODO: free pixcolours, colours should become part of rxvt_display
246
74 delete PixColors; 247 delete PixColorsFocused;
248#ifdef OFF_FOCUS_FADING
249 delete PixColorsUnFocused;
250#endif
251
252 displays.put (display);
253
254 scr_release ();
255
256 /* clear all resources */
257 for (int i = 0; i < allocated.size (); i++)
258 free (allocated[i]);
259
260 free (selection.text);
261 // TODO: manage env vars in child only(!)
262 free (env_windowid);
263 free (env_display);
264 free (env_term);
265 free (env_colorfgbg);
266 free (locale);
267#if 0
268 free (codeset);
269#endif
270
271 delete envv;
272 delete argv;
273}
274
275void
276rxvt_term::destroy ()
277{
278 if (display)
279 {
280 rootwin_ev.stop (display);
281 termwin_ev.stop (display);
282 vt_ev.stop (display);
283#ifdef USE_XIM
284 im_destroy ();
285 im_ev.stop (display);
286#endif
287#ifdef HAVE_SCROLLBARS
288 scrollbar_ev.stop (display);
289#endif
290#ifdef MENUBAR
291 menubar_ev.stop (display);
292#endif
293 }
294
295 check_ev.stop ();
296 pty_ev.stop ();
297#ifdef CURSOR_BLINK
298 cursor_blink_ev.stop ();
299#endif
300#ifdef TEXT_BLINK
301 text_blink_ev.stop ();
302#endif
303#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
304 cont_scroll_ev.stop ();
305#endif
306#ifdef SELECTION_SCROLLING
307 sel_scroll_ev.stop ();
308#endif
309#ifdef POINTER_BLANK
310 pointer_ev.stop ();
311#endif
312
313 destroy_ev.start (0);
314}
315
316void
317rxvt_term::destroy_cb (time_watcher &w)
318{
319 SET_R (this);
320
321 delete this;
75} 322}
76 323
77/*----------------------------------------------------------------------*/ 324/*----------------------------------------------------------------------*/
78/* rxvt_init() */ 325/* rxvt_init () */
79/* LIBPROTO */
80rxvt_t
81rxvt_init(int argc, const char *const *argv)
82{
83 SET_R(new rxvt_term);
84 dR;
85
86 if (!R->init_vars () || !R->init (argc, argv))
87 {
88 delete R;
89 return NULL;
90 }
91
92 return R;
93}
94
95bool 326bool
96rxvt_term::init (int argc, const char *const *argv) 327rxvt_term::init (int argc, const char *const *argv)
97{ 328{
98 dR;//TODO (scrollbar, setidle) 329 SET_R (this);
330
331 if (!init_vars ())
332 return false;
99 333
100 /* 334 /*
101 * Save and then give up any super-user privileges 335 * Save and then give up any super-user privileges
102 * If we need privileges in any area then we must specifically request it. 336 * If we need privileges in any area then we must specifically request it.
103 * We should only need to be root in these cases: 337 * We should only need to be root in these cases:
104 * 1. write utmp entries on some systems 338 * 1. write utmp entries on some systems
105 * 2. chown tty on some systems 339 * 2. chown tty on some systems
106 */ 340 */
107 rxvt_privileges (this, SAVE); 341 privileges (SAVE);
108 rxvt_privileges (this, IGNORE); 342 privileges (IGNORE);
109 343
110 rxvt_init_secondary (this); 344 init_secondary ();
111 345
112 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 346 const char **cmd_argv = init_resources (argc, argv);
113 347
348 set_locale ("");
349
114#if (MENUBAR_MAX) 350#if MENUBAR_MAX
115 rxvt_menubar_read (this, rs[Rs_menu]); 351 menubar_read (rs[Rs_menu]);
116#endif 352#endif
117#ifdef HAVE_SCROLLBARS 353#ifdef HAVE_SCROLLBARS
118 if (Options & Opt_scrollBar) 354 if (Options & Opt_scrollBar)
119 scrollbar_setIdle (); /* set existence for size calculations */ 355 scrollBar.setIdle (); /* set existence for size calculations */
120#endif 356#endif
121 357
122 rxvt_Create_Windows (this, argc, argv); 358 create_windows (argc, argv);
123 359
124 rxvt_init_xlocale (this); 360 init_xlocale ();
125 361
126 rxvt_scr_reset (this); /* initialize screen */ 362 scr_reset (); /* initialize screen */
127#ifdef RXVT_GRAPHICS
128 rxvt_Gr_reset (this); /* reset graphics */
129#endif
130 363
131#if 0 364#if 0
132#ifdef DEBUG_X
133 XSynchronize(Xdisplay, True); 365 XSynchronize (display->display, True);
134 XSetErrorHandler((XErrorHandler) abort);
135#else
136 XSetErrorHandler((XErrorHandler) rxvt_xerror_handler);
137#endif
138#endif 366#endif
139 367
140#ifdef HAVE_SCROLLBARS 368#ifdef HAVE_SCROLLBARS
141 if (Options & Opt_scrollBar) 369 if (Options & Opt_scrollBar)
142 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 370 resize_scrollbar (); /* create and map scrollbar */
143#endif 371#endif
144#if (MENUBAR_MAX) 372#if (MENUBAR_MAX)
145 if (menubar_visible(r)) 373 if (menubar_visible ())
146 XMapWindow (Xdisplay, menuBar.win); 374 XMapWindow (display->display, menuBar.win);
147#endif 375#endif
148#ifdef TRANSPARENT 376#ifdef TRANSPARENT
149 if (Options & Opt_transparent) 377 if (Options & Opt_transparent)
150 { 378 {
151 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 379 XSelectInput (display->display, display->root, PropertyChangeMask);
152 rxvt_check_our_parents (this); 380 check_our_parents ();
153 } 381 }
154#endif 382#endif
383
384 rootwin_ev.start (display, display->root);
385
155 XMapWindow (Xdisplay, TermWin.vt); 386 XMapWindow (display->display, TermWin.vt);
156 XMapWindow (Xdisplay, TermWin.parent[0]); 387 XMapWindow (display->display, TermWin.parent[0]);
157 388
158 rxvt_init_env (this);
159 rxvt_init_command (this, cmd_argv); 389 init_command (cmd_argv);
160 390
161 x_ev.start (Xfd, EVENT_READ);
162 pty_ev.start (cmd_fd, EVENT_READ); 391 pty_ev.start (cmd_fd, EVENT_READ);
163 392
393 check_ev.start ();
394
164 return true; 395 return true;
396}
397
398static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
399
400void
401rxvt_init_signals ()
402{
403 /* install exit handler for cleanup */
404#if 0
405#ifdef HAVE_ATEXIT
406 atexit (rxvt_clean_exit);
407#else
408#endif
409#endif
410
411 struct sigaction sa;
412
413 sigfillset (&sa.sa_mask);
414 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
415 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
416 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
417 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
418 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
419 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
420 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
421
422 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
423 /* signal (SIGURG, SIG_DFL); */
424
425 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
426 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
165} 427}
166 428
167/* ------------------------------------------------------------------------- * 429/* ------------------------------------------------------------------------- *
168 * SIGNAL HANDLING & EXIT HANDLER * 430 * SIGNAL HANDLING & EXIT HANDLER *
169 * ------------------------------------------------------------------------- */ 431 * ------------------------------------------------------------------------- */
170/* 432/*
171 * Catch a SIGCHLD signal and exit if the direct child has died 433 * Catch a SIGCHLD signal and exit if the direct child has died
172 */ 434 */
435
436void rxvt_term::child_exited (int pid)
437{
438 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
439 if (pid == (*t)->cmd_pid)
440 {
441 (*t)->destroy ();
442 break;
443 }
444}
445
173/* ARGSUSED */ 446/* ARGSUSED */
174/* EXTPROTO */ 447/* EXTPROTO */
175RETSIGTYPE 448RETSIGTYPE
176rxvt_Child_signal(int sig __attribute__ ((unused))) 449rxvt_Child_signal (int sig __attribute__ ((unused)))
177{ 450{
178 dR;
179 int pid, save_errno = errno; 451 int pid, save_errno = errno;
180 452
181 do { 453 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
182 errno = 0; 454 rxvt_term::child_exited (pid);
183 } while ((pid = waitpid(-1, NULL, WNOHANG)) == -1 && errno == EINTR);
184 455
185 if (pid == R->cmd_pid)
186 exit(EXIT_SUCCESS);
187
188 errno = save_errno; 456 errno = save_errno;
189 signal(SIGCHLD, rxvt_Child_signal);
190} 457}
191 458
192/* 459/*
193 * Catch a fatal signal and tidy up before quitting 460 * Catch a fatal signal and tidy up before quitting
194 */ 461 */
195/* EXTPROTO */ 462/* EXTPROTO */
196RETSIGTYPE 463RETSIGTYPE
197rxvt_Exit_signal(int sig) 464rxvt_Exit_signal (int sig)
198{ 465{
199 signal(sig, SIG_DFL); 466 signal (sig, SIG_DFL);
200#ifdef DEBUG_CMD 467#ifdef DEBUG_CMD
201 rxvt_print_error("signal %d", sig); 468 rxvt_warn ("caught signal %d, exiting.\n", sig);
202#endif 469#endif
203 rxvt_clean_exit(); 470 rxvt_clean_exit ();
204 kill(getpid(), sig); 471 kill (getpid (), sig);
205} 472}
206 473
207/* ARGSUSED */
208/* INTPROTO */ 474/* INTPROTO */
209int 475int
210rxvt_xerror_handler(const Display * display 476rxvt_xerror_handler (Display *display, XErrorEvent *event)
211 __attribute__ ((unused)), const XErrorEvent * event)
212{ 477{
213 dR;
214
215 if (R->allowedxerror == -1) { 478 if (GET_R->allowedxerror == -1)
216 R->allowedxerror = event->error_code; 479 GET_R->allowedxerror = event->error_code;
217 return 0; /* ignored anyway */ 480 else
218 } 481 {
219 rxvt_print_error("XError: Request: %d . %d, Error: %d", 482 old_xerror_handler (display, event);
220 event->request_code, event->minor_code, 483 GET_R->destroy ();
221 event->error_code); 484 }
222/* XXX: probably should call rxvt_clean_exit() bypassing X routines */ 485
223 exit(EXIT_FAILURE); 486 return 0;
224/* NOTREACHED */
225} 487}
226 488
227/*----------------------------------------------------------------------*/ 489/*----------------------------------------------------------------------*/
228/* 490/*
229 * Exit gracefully, clearing the utmp entry and restoring tty attributes 491 * Exit gracefully, clearing the utmp entry and restoring tty attributes
230 * TODO: if debugging, this should free up any known resources if we can 492 * TODO: if debugging, this should free up any known resources if we can
231 */ 493 */
232/* EXTPROTO */ 494/* EXTPROTO */
233void 495void
234rxvt_clean_exit(void) 496rxvt_clean_exit ()
235{ 497{
236 dR; 498 // TODO: rxvtd should clean up all ressources
237 499 if (GET_R)
238#ifdef DEBUG_SCREEN 500 GET_R->destroy ();
239 rxvt_scr_release(aR);
240#endif
241#ifndef NO_SETOWNER_TTYDEV
242 rxvt_privileged_ttydev(aR_ RESTORE);
243#endif
244#ifdef UTMP_SUPPORT
245 rxvt_privileged_utmp(aR_ RESTORE);
246#endif
247#ifdef USE_XIM
248 if (R->Input_Context != NULL) {
249 XDestroyIC(R->Input_Context);
250 R->Input_Context = NULL;
251 }
252#endif
253} 501}
254 502
255/* ------------------------------------------------------------------------- * 503/* ------------------------------------------------------------------------- *
256 * MEMORY ALLOCATION WRAPPERS * 504 * MEMORY ALLOCATION WRAPPERS *
257 * ------------------------------------------------------------------------- */ 505 * ------------------------------------------------------------------------- */
258/* EXTPROTO */ 506/* EXTPROTO */
259void * 507void *
260rxvt_malloc(size_t size) 508rxvt_malloc (size_t size)
261{ 509{
262 void *p; 510 void *p;
263 511
264 p = malloc(size); 512 p = malloc (size);
265 if (p) 513 if (p)
266 return p; 514 return p;
267 515
268 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 516 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
269 rxvt_clean_exit(); 517 rxvt_clean_exit ();
270 exit(EXIT_FAILURE); 518 exit (EXIT_FAILURE);
271/* NOTREACHED */ 519 /* NOTREACHED */
272} 520}
273 521
274/* EXTPROTO */ 522/* EXTPROTO */
275void * 523void *
276rxvt_calloc(size_t number, size_t size) 524rxvt_calloc (size_t number, size_t size)
277{ 525{
278 void *p; 526 void *p;
279 527
280 p = calloc(number, size); 528 p = calloc (number, size);
281 if (p) 529 if (p)
282 return p; 530 return p;
283 531
284 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 532 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
285 rxvt_clean_exit(); 533 rxvt_clean_exit ();
286 exit(EXIT_FAILURE); 534 exit (EXIT_FAILURE);
287/* NOTREACHED */ 535 /* NOTREACHED */
288} 536}
289 537
290/* EXTPROTO */ 538/* EXTPROTO */
291void * 539void *
292rxvt_realloc(void *ptr, size_t size) 540rxvt_realloc (void *ptr, size_t size)
293{ 541{
294 void *p; 542 void *p;
295 543
296 if (ptr) 544 if (ptr)
297 p = realloc(ptr, size); 545 p = realloc (ptr, size);
298 else 546 else
299 p = malloc(size); 547 p = malloc (size);
300 if (p) 548 if (p)
301 return p; 549 return p;
302 550
303 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 551 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
304 rxvt_clean_exit(); 552 rxvt_clean_exit ();
305 exit(EXIT_FAILURE); 553 exit (EXIT_FAILURE);
306/* NOTREACHED */ 554 /* NOTREACHED */
307} 555}
308 556
309/* ------------------------------------------------------------------------- * 557/* ------------------------------------------------------------------------- *
310 * PRIVILEGED OPERATIONS * 558 * PRIVILEGED OPERATIONS *
311 * ------------------------------------------------------------------------- */ 559 * ------------------------------------------------------------------------- */
312/* take care of suid/sgid super-user (root) privileges */ 560/* take care of suid/sgid super-user (root) privileges */
313/* INTPROTO */
314void 561void
315rxvt_privileges(pR_ int mode) 562rxvt_term::privileges (int mode)
316{ 563{
317#if ! defined(__CYGWIN32__) 564#if ! defined(__CYGWIN32__)
318# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 565# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
319/* setreuid() is the poor man's setuid(), seteuid() */ 566 /* setreuid () is the poor man's setuid (), seteuid () */
320# define seteuid(a) setreuid(-1, (a)) 567# define seteuid(a) setreuid(-1, (a))
321# define setegid(a) setregid(-1, (a)) 568# define setegid(a) setregid(-1, (a))
322# define HAVE_SETEUID 569# define HAVE_SETEUID
323# endif 570# endif
324# ifdef HAVE_SETEUID 571# ifdef HAVE_SETEUID
325 switch (mode) { 572 switch (mode)
573 {
326 case IGNORE: 574 case IGNORE:
327 /* 575 /*
328 * change effective uid/gid - not real uid/gid - so we can switch 576 * change effective uid/gid - not real uid/gid - so we can switch
329 * back to root later, as required 577 * back to root later, as required
330 */ 578 */
331 seteuid(getuid()); 579 seteuid (getuid ());
332 setegid(getgid()); 580 setegid (getgid ());
333 break; 581 break;
334 case SAVE: 582 case SAVE:
335 R->euid = geteuid(); 583 euid = geteuid ();
336 R->egid = getegid(); 584 egid = getegid ();
337 break; 585 break;
338 case RESTORE: 586 case RESTORE:
339 seteuid(R->euid); 587 seteuid (euid);
340 setegid(R->egid); 588 setegid (egid);
341 break; 589 break;
342 } 590 }
343# else 591# else
344 switch (mode) { 592 switch (mode)
593 {
345 case IGNORE: 594 case IGNORE:
346 setuid(getuid()); 595 setuid (getuid ());
347 setgid(getgid()); 596 setgid (getgid ());
348 /* FALLTHROUGH */ 597 /* FALLTHROUGH */
349 case SAVE: 598 case SAVE:
350 /* FALLTHROUGH */ 599 /* FALLTHROUGH */
351 case RESTORE: 600 case RESTORE:
352 break; 601 break;
353 } 602 }
354# endif 603# endif
355#endif 604#endif
356} 605}
357 606
358#ifdef UTMP_SUPPORT 607#ifdef UTMP_SUPPORT
359/* EXTPROTO */
360void 608void
361rxvt_privileged_utmp(pR_ char action) 609rxvt_term::privileged_utmp (char action)
362{ 610{
363 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 611 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
364 action, R->next_utmp_action, getpid())); 612 action, next_utmp_action, getpid ()));
365 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 613 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
366 || (R->Options & Opt_utmpInhibit) 614 || (Options & Opt_utmpInhibit)
367 || R->ttydev == NULL || *R->ttydev == '\0') 615 || ttydev == NULL || *ttydev == '\0')
368 return; 616 return;
369 617
370 rxvt_privileges(aR_ RESTORE); 618 privileges (RESTORE);
371 if (action == SAVE) { 619 if (action == SAVE)
620 {
372 R->next_utmp_action = RESTORE; 621 next_utmp_action = RESTORE;
373 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 622 makeutent (ttydev, rs[Rs_display_name]);
623 }
624 else
374 } else { /* action == RESTORE */ 625 { /* action == RESTORE */
375 R->next_utmp_action = IGNORE; 626 next_utmp_action = IGNORE;
376 rxvt_cleanutent(aR); 627 cleanutent ();
377 } 628 }
378 rxvt_privileges(aR_ IGNORE); 629 privileges (IGNORE);
379} 630}
380#endif 631#endif
381 632
382#ifndef NO_SETOWNER_TTYDEV 633#ifndef NO_SETOWNER_TTYDEV
383/* EXTPROTO */
384void 634void
385rxvt_privileged_ttydev(pR_ char action) 635rxvt_term::privileged_ttydev (char action)
386{ 636{
387 D_MAIN((stderr, 637 D_MAIN ((stderr,
388 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 638 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
389 action, R->next_tty_action, getpid())); 639 action, next_tty_action, getpid ()));
390 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 640 if (next_tty_action != action || (action != SAVE && action != RESTORE)
391 || R->ttydev == NULL || *R->ttydev == '\0') 641 || ttydev == NULL || *ttydev == '\0')
392 return; 642 return;
393 643
394 rxvt_privileges(aR_ RESTORE); 644 privileges (RESTORE);
395 645
396 if (action == SAVE) { 646 if (action == SAVE)
647 {
397 R->next_tty_action = RESTORE; 648 next_tty_action = RESTORE;
398# ifndef RESET_TTY_TO_COMMON_DEFAULTS 649# ifndef RESET_TTY_TO_COMMON_DEFAULTS
399/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 650 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
400 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 651 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
401 R->next_tty_action = IGNORE; 652 next_tty_action = IGNORE;
402 else 653 else
403# endif 654# endif
655
404 { 656 {
405 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 657 chown (ttydev, getuid (), ttygid); /* fail silently */
406 chmod(R->ttydev, R->ttymode); 658 chmod (ttydev, ttymode);
407# ifdef HAVE_REVOKE 659# ifdef HAVE_REVOKE
408 revoke(R->ttydev); 660 revoke (ttydev);
409# endif 661# endif
662
410 } 663 }
664 }
665 else
411 } else { /* action == RESTORE */ 666 { /* action == RESTORE */
412 R->next_tty_action = IGNORE; 667 next_tty_action = IGNORE;
413# ifndef RESET_TTY_TO_COMMON_DEFAULTS 668# ifndef RESET_TTY_TO_COMMON_DEFAULTS
414 chmod(R->ttydev, R->ttyfd_stat.st_mode); 669 chmod (ttydev, ttyfd_stat.st_mode);
415 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 670 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
416# else 671# else
417 chmod(R->ttydev, 672 chmod (ttydev,
418 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 673 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
419 chown(R->ttydev, 0, 0); 674 chown (ttydev, 0, 0);
420# endif 675# endif
421 }
422 676
677 }
678
423 rxvt_privileges(aR_ IGNORE); 679 privileges (IGNORE);
424 680
425# ifndef RESET_TTY_TO_COMMON_DEFAULTS 681# ifndef RESET_TTY_TO_COMMON_DEFAULTS
426 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 682 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
427 action == RESTORE ? "Restoring" : (action == 683 action == RESTORE ? "Restoring" : (action ==
428 SAVE ? "Saving" : 684 SAVE ? "Saving" :
429 "UNKNOWN ERROR for"), R->ttydev, 685 "UNKNOWN ERROR for"), ttydev,
430 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 686 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
431 R->ttyfd_stat.st_gid)); 687 ttyfd_stat.st_gid));
432# endif 688# endif
433} 689}
434#endif 690#endif
435 691
436/*----------------------------------------------------------------------*/ 692/*----------------------------------------------------------------------*/
437/* 693/*
438 * window size/position calculcations for XSizeHint and other storage. 694 * window size/position calculcations for XSizeHint and other storage.
439 * if width/height are non-zero then override calculated width/height 695 * if width/height are non-zero then override calculated width/height
440 */ 696 */
441/* EXTPROTO */
442void 697void
443rxvt_window_calc(pR_ unsigned int width, unsigned int height) 698rxvt_term::window_calc (unsigned int width, unsigned int height)
444{ 699{
445 short recalc_x, recalc_y; 700 short recalc_x, recalc_y;
446 int x, y, sb_w, mb_h, flags; 701 int x, y, sb_w, mb_h, flags;
447 unsigned int w, h; 702 unsigned int w, h;
448 unsigned int max_width, max_height; 703 unsigned int max_width, max_height;
449 704
450 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 705 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
451 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 706 TermWin.ncol, TermWin.nrow, szHint.width,
452 R->szHint.height)); 707 szHint.height));
453 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 708 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
454 R->szHint.win_gravity = NorthWestGravity; 709 szHint.win_gravity = NorthWestGravity;
455/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 710 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
456 711
457 recalc_x = recalc_y = 0; 712 recalc_x = recalc_y = 0;
458 flags = 0; 713 flags = 0;
459 if (!R->parsed_geometry) { 714 if (!parsed_geometry)
715 {
460 R->parsed_geometry = 1; 716 parsed_geometry = 1;
461 if (R->rs[Rs_geometry]) 717 if (rs[Rs_geometry])
462 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 718 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
463 if (flags & WidthValue) { 719 if (flags & WidthValue)
720 {
464 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 721 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
465 R->szHint.flags |= USSize; 722 szHint.flags |= USSize;
466 } 723 }
467 if (flags & HeightValue) { 724 if (flags & HeightValue)
725 {
468 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 726 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
469 R->szHint.flags |= USSize; 727 szHint.flags |= USSize;
470 } 728 }
471 if (flags & XValue) { 729 if (flags & XValue)
730 {
472 R->szHint.x = x; 731 szHint.x = x;
473 R->szHint.flags |= USPosition; 732 szHint.flags |= USPosition;
474 if (flags & XNegative) { 733 if (flags & XNegative)
734 {
475 recalc_x = 1; 735 recalc_x = 1;
476 R->szHint.win_gravity = NorthEastGravity; 736 szHint.win_gravity = NorthEastGravity;
477 } 737 }
478 } 738 }
479 if (flags & YValue) { 739 if (flags & YValue)
740 {
480 R->szHint.y = y; 741 szHint.y = y;
481 R->szHint.flags |= USPosition; 742 szHint.flags |= USPosition;
482 if (flags & YNegative) { 743 if (flags & YNegative)
744 {
483 recalc_y = 1; 745 recalc_y = 1;
484 if (R->szHint.win_gravity == NorthEastGravity) 746 if (szHint.win_gravity == NorthEastGravity)
485 R->szHint.win_gravity = SouthEastGravity; 747 szHint.win_gravity = SouthEastGravity;
486 else 748 else
487 R->szHint.win_gravity = SouthWestGravity; 749 szHint.win_gravity = SouthWestGravity;
488 } 750 }
489 } 751 }
490 } 752 }
753
491/* TODO: BOUNDS */ 754 /* TODO: BOUNDS */
492 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 755 TermWin.width = TermWin.ncol * TermWin.fwidth;
493 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 756 TermWin.height = TermWin.nrow * TermWin.fheight;
494 max_width = MAX_COLS * R->TermWin.fwidth; 757 max_width = MAX_COLS * TermWin.fwidth;
495 max_height = MAX_ROWS * R->TermWin.fheight; 758 max_height = MAX_ROWS * TermWin.fheight;
496 759
497 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 760 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
498 761
499 sb_w = mb_h = 0; 762 sb_w = mb_h = 0;
500 R->window_vt_x = R->window_vt_y = 0; 763 window_vt_x = window_vt_y = TermWin.int_bwidth;
764
501 if (scrollbar_visible(R)) { 765 if (scrollbar_visible ())
766 {
502 sb_w = scrollbar_TotalWidth(); 767 sb_w = scrollbar_TotalWidth ();
503 R->szHint.base_width += sb_w; 768 szHint.base_width += sb_w;
504 if (!(R->Options & Opt_scrollBar_right)) 769 if (!(Options & Opt_scrollBar_right))
505 R->window_vt_x = sb_w; 770 window_vt_x += sb_w;
506 } 771 }
772
507 if (menubar_visible(R)) { 773 if (menubar_visible ())
774 {
508 mb_h = menuBar_TotalHeight(); 775 mb_h = menuBar_TotalHeight ();
509 R->szHint.base_height += mb_h; 776 szHint.base_height += mb_h;
510 R->window_vt_y = mb_h; 777 window_vt_y += mb_h;
511 } 778 }
779
512 R->szHint.width_inc = R->TermWin.fwidth; 780 szHint.width_inc = TermWin.fwidth;
513 R->szHint.height_inc = R->TermWin.fheight; 781 szHint.height_inc = TermWin.fheight;
514 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 782 szHint.min_width = szHint.base_width + szHint.width_inc;
515 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 783 szHint.min_height = szHint.base_height + szHint.height_inc;
516 784
517 if (width && width - R->szHint.base_width < max_width) { 785 if (width && width - szHint.base_width < max_width)
786 {
518 R->szHint.width = width; 787 szHint.width = width;
519 R->TermWin.width = width - R->szHint.base_width; 788 TermWin.width = width - szHint.base_width;
520 } else { 789 }
790 else
791 {
521 MIN_IT(R->TermWin.width, max_width); 792 MIN_IT (TermWin.width, max_width);
522 R->szHint.width = R->szHint.base_width + R->TermWin.width; 793 szHint.width = szHint.base_width + TermWin.width;
523 } 794 }
795
524 if (height && height - R->szHint.base_height < max_height) { 796 if (height && height - szHint.base_height < max_height)
797 {
525 R->szHint.height = height; 798 szHint.height = height;
526 R->TermWin.height = height - R->szHint.base_height; 799 TermWin.height = height - szHint.base_height;
527 } else { 800 }
801 else
802 {
528 MIN_IT(R->TermWin.height, max_height); 803 MIN_IT (TermWin.height, max_height);
529 R->szHint.height = R->szHint.base_height + R->TermWin.height; 804 szHint.height = szHint.base_height + TermWin.height;
530 } 805 }
806
531 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 807 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
532 R->window_sb_x = R->szHint.width - sb_w; 808 window_sb_x = szHint.width - sb_w;
533 809
534 if (recalc_x) 810 if (recalc_x)
535 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 811 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
536 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 812 - szHint.width - 2 * TermWin.ext_bwidth);
537 if (recalc_y) 813 if (recalc_y)
538 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 814 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
539 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 815 - szHint.height - 2 * TermWin.ext_bwidth);
540 816
541 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 817 TermWin.ncol = TermWin.width / TermWin.fwidth;
542 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 818 TermWin.nrow = TermWin.height / TermWin.fheight;
543 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 819 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
544 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 820 TermWin.ncol, TermWin.nrow, szHint.width,
545 R->szHint.height)); 821 szHint.height));
546 return; 822 return;
547} 823}
548 824
549/*----------------------------------------------------------------------*/ 825/*----------------------------------------------------------------------*/
550/* 826/*
551 * Tell the teletype handler what size the window is. 827 * Tell the teletype handler what size the window is.
552 * Called after a window size change. 828 * Called after a window size change.
553 */ 829 */
554/* EXTPROTO */
555void 830void
556rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) 831rxvt_term::tt_winch ()
557{ 832{
558 struct winsize ws; 833 struct winsize ws;
559 834
560 if (fd < 0) 835 if (cmd_fd < 0)
561 return; 836 return;
837
562 ws.ws_col = col; 838 ws.ws_col = TermWin.ncol;
563 ws.ws_row = row; 839 ws.ws_row = TermWin.nrow;
564 ws.ws_xpixel = ws.ws_ypixel = 0; 840 ws.ws_xpixel = ws.ws_ypixel = 0;
565#ifndef DEBUG_SIZE 841#ifndef DEBUG_SIZE
566 (void)ioctl(fd, TIOCSWINSZ, &ws); 842 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
567#else 843#else
568 if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { 844 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
569 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 845 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
570 }
571# ifdef SIGWINCH 846# ifdef SIGWINCH
572 else if (pid) /* force through to the command */ 847 else if (cmd_pid) /* force through to the command */
573 kill(pid, SIGWINCH); 848 kill (cmd_pid, SIGWINCH);
574# endif 849# endif
575#endif 850#endif
576} 851}
577 852
578/*----------------------------------------------------------------------*/ 853/*----------------------------------------------------------------------*/
579/* rxvt_change_font() - Switch to a new font */ 854/* rxvt_change_font () - Switch to a new font */
580/* 855/*
581 * init = 1 - initialize 856 * init = 1 - initialize
582 * 857 *
583 * fontname == FONT_UP - switch to bigger font 858 * fontname == FONT_UP - switch to bigger font
584 * fontname == FONT_DN - switch to smaller font 859 * fontname == FONT_DN - switch to smaller font
585 */ 860 */
586/* EXTPROTO */ 861bool
587void
588rxvt_change_font(pR_ int init, const char *fontname) 862rxvt_term::change_font (const char *fontname)
589{ 863{
590} 864 if (fontname == FONT_UP)
865 {
866 // TODO
867 }
868 else if (fontname == FONT_DN)
869 {
870 // TODO
871 }
872 else
873 {
874 rxvt_fontset *fs = new rxvt_fontset (this);
591 875
592/* INTPROTO */ 876 if (fs && fs->populate (fontname ? fontname : "fixed"))
593void 877 {
878 delete TermWin.fontset;
879 TermWin.fontset = fs;
880 TermWin.fwidth = fs->base_font ()->width;
881 TermWin.fheight = fs->base_font ()->height;
882 TermWin.fbase = fs->base_font ()->ascent;
883
884 if (TermWin.parent[0])
885 {
886 resize_all_windows (0, 0, 0);
887 scr_remap_chars ();
888 scr_touch (true);
889 }
890
891 return true;
892 }
893 }
894
895 return false;
896}
897
898bool
594rxvt_font_up_down(pR_ int n, int direction) 899rxvt_term::font_up_down (int n, int direction)
595{ 900{
901 return false;
596} 902}
597 903
598/*----------------------------------------------------------------------*/ 904/*----------------------------------------------------------------------*/
599/*----------------------------------------------------------------------*/ 905/*----------------------------------------------------------------------*/
600/* xterm sequences - title, iconName, color (exptl) */ 906/* xterm sequences - title, iconName, color (exptl) */
601/* EXTPROTO */
602void 907void
603rxvt_set_title(pR_ const char *str) 908rxvt_term::set_title (const char *str)
604{ 909{
605#ifndef SMART_WINDOW_TITLE 910#ifdef SMART_WINDOW_TITLE
911 char *name;
912
913 if (!XFetchName (display->display, TermWin.parent[0], &name))
914 name = NULL;
915
916 if (name == NULL || STRCMP (name, str))
917#endif
606 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 918 XStoreName (display->display, TermWin.parent[0], str);
919
920#ifdef SMART_WINDOW_TITLE
921 if (name)
922 XFree (name);
923#endif
924}
925
926void
927rxvt_term::set_icon_name (const char *str)
928{
929#ifdef SMART_WINDOW_TITLE
930 char *name;
931
932 if (!XGetIconName (display->display, TermWin.parent[0], &name))
933 name = NULL;
934
935 if (name == NULL || STRCMP (name, str))
936#endif
937 XSetIconName (display->display, TermWin.parent[0], str);
938
939#ifdef SMART_WINDOW_TITLE
940 if (name)
941 XFree (name);
942#endif
943}
944
945#ifdef XTERM_COLOR_CHANGE
946void
947rxvt_term::set_window_color (int idx, const char *color)
948{
949 rxvt_color xcol;
950 int i;
951
952 if (color == NULL || *color == '\0')
953 return;
954
955 /* handle color aliases */
956 if (isdigit (*color))
957 {
958 i = atoi (color);
959 if (i >= 8 && i <= 15)
960 { /* bright colors */
961 i -= 8;
962# ifndef NO_BRIGHTCOLOR
963 PixColorsFocused[idx] = PixColorsFocused[minBrightCOLOR + i];
964 SET_PIXCOLOR (idx);
965 goto Done;
966# endif
967
968 }
969 if (i >= 0 && i <= 7)
970 { /* normal colors */
971 PixColorsFocused[idx] = PixColorsFocused[minCOLOR + i];
972 SET_PIXCOLOR (idx);
973 goto Done;
974 }
975 }
976
977 if (!rXParseAllocColor (& xcol, color))
978 return;
979
980 /* XStoreColor (display->display, XCMAP, XColor*); */
981
982 /*
983 * FIXME: should free colors here, but no idea how to do it so instead,
984 * so just keep gobbling up the colormap
985 */
986# if 0
987 for (i = Color_Black; i <= Color_White; i++)
988 if (PixColors[idx] == PixColors[i])
989 break;
990 if (i > Color_White)
991 {
992 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
993 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
994 DisplayPlanes (display->display, display->screen));
995 }
996# endif
997
998 PixColorsFocused[idx] = xcol;
999 SET_PIXCOLOR (idx);
1000
1001 /* XSetWindowAttributes attr; */
1002 /* Cursor cursor; */
1003Done:
1004#ifdef OFF_FOCUS_FADING
1005 PixColorsUnFocused[idx] = PixColorsFocused[idx].fade (display, atoi (rs[Rs_fade]));
1006#endif
1007 if (idx == Color_bg && ! (Options & Opt_transparent))
1008 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1009
1010 /* handle Color_BD, scrollbar background, etc. */
1011
1012 set_colorfgbg ();
1013 recolour_cursor ();
1014 scr_touch (true);
1015}
1016
607#else 1017#else
608 char *name;
609
610 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0)
611 name = NULL;
612 if (name == NULL || STRCMP(name, str))
613 XStoreName(R->Xdisplay, R->TermWin.parent[0], str);
614 if (name)
615 XFree(name);
616#endif
617}
618
619/* EXTPROTO */
620void
621rxvt_set_iconName(pR_ const char *str)
622{
623#ifndef SMART_WINDOW_TITLE
624 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str);
625#else
626 char *name;
627
628 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name))
629 name = NULL;
630 if (name == NULL || STRCMP(name, str))
631 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str);
632 if (name)
633 XFree(name);
634#endif
635}
636
637#ifdef XTERM_COLOR_CHANGE
638/* EXTPROTO */
639void
640rxvt_set_window_color(pR_ int idx, const char *color)
641{
642 rxvt_color xcol;
643 int i;
644
645 if (color == NULL || *color == '\0')
646 return;
647
648/* handle color aliases */
649 if (isdigit(*color)) {
650 i = atoi(color);
651 if (i >= 8 && i <= 15) { /* bright colors */
652 i -= 8;
653# ifndef NO_BRIGHTCOLOR
654 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i];
655 SET_PIXCOLOR(R, idx);
656 goto Done;
657# endif
658 }
659 if (i >= 0 && i <= 7) { /* normal colors */
660 R->PixColors[idx] = R->PixColors[minCOLOR + i];
661 SET_PIXCOLOR(R, idx);
662 goto Done;
663 }
664 }
665 if (!rxvt_rXParseAllocColor(aR_ & xcol, color))
666 return;
667/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */
668
669/*
670 * FIXME: should free colors here, but no idea how to do it so instead,
671 * so just keep gobbling up the colormap
672 */
673# if 0
674 for (i = Color_Black; i <= Color_White; i++)
675 if (R->PixColors[idx] == R->PixColors[i])
676 break;
677 if (i > Color_White) {
678 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */
679 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1,
680 DisplayPlanes(R->Xdisplay, Xscreen));
681 }
682# endif
683
684 R->PixColors[idx] = xcol;
685 SET_PIXCOLOR(R, idx);
686
687/* XSetWindowAttributes attr; */
688/* Cursor cursor; */
689 Done:
690 if (idx == Color_bg && !(R->Options & Opt_transparent))
691 XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
692 R->PixColors[Color_bg]);
693
694/* handle Color_BD, scrollbar background, etc. */
695
696 rxvt_set_colorfgbg(aR);
697 rxvt_recolour_cursor(aR);
698/* the only reasonable way to enforce a clean update */
699 rxvt_scr_poweron(aR);
700}
701
702#else
703# define rxvt_set_window_color(aR_ idx,color) ((void)0) 1018# define set_window_color (idx,color) ((void)0)
704#endif /* XTERM_COLOR_CHANGE */ 1019#endif /* XTERM_COLOR_CHANGE */
705 1020
706/* EXTPROTO */
707void 1021void
708rxvt_recolour_cursor(pR) 1022rxvt_term::recolour_cursor ()
709{ 1023{
710 rxvt_color xcol[2]; 1024 XColor xcol[2];
711 1025
712#if TODO 1026 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColorsFocused[Color_pointer_fg] : PixColorsFocused[Color_fg];
713 xcol[0] = R->PixColors[Color_pointer]; 1027 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColorsFocused[Color_pointer_bg] : PixColorsFocused[Color_bg];
714 xcol[1] = R->PixColors[Color_bg];
715 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 1028 XQueryColors (display->display, XCMAP, xcol, 2);
716 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 1029 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
717#endif
718} 1030}
719 1031
720/*----------------------------------------------------------------------*/ 1032/*----------------------------------------------------------------------*/
721/* 1033/*
722 * find if fg/bg matches any of the normal (low-intensity) colors 1034 * find if fg/bg matches any of the normal (low-intensity) colors
723 */ 1035 */
724/* INTPROTO */
725void 1036void
726rxvt_set_colorfgbg(pR) 1037rxvt_term::set_colorfgbg ()
727{ 1038{
728 unsigned int i; 1039 unsigned int i;
729 const char *xpmb = "\0"; 1040 const char *xpmb = "\0";
730 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 1041 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
731 1042
732 R->env_colorfgbg = 1043 env_colorfgbg =
733 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 1044 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
734 STRCPY(fstr, "default"); 1045 STRCPY (fstr, "default");
735 STRCPY(bstr, "default"); 1046 STRCPY (bstr, "default");
736 for (i = Color_Black; i <= Color_White; i++) 1047 for (i = Color_Black; i <= Color_White; i++)
737 if (R->PixColors[Color_fg] == R->PixColors[i]) { 1048 if (PixColors[Color_fg] == PixColors[i])
1049 {
738 sprintf(fstr, "%d", (i - Color_Black)); 1050 sprintf (fstr, "%d", (i - Color_Black));
739 break; 1051 break;
740 } 1052 }
741 for (i = Color_Black; i <= Color_White; i++) 1053 for (i = Color_Black; i <= Color_White; i++)
742 if (R->PixColors[Color_bg] == R->PixColors[i]) { 1054 if (PixColors[Color_bg] == PixColors[i])
1055 {
743 sprintf(bstr, "%d", (i - Color_Black)); 1056 sprintf (bstr, "%d", (i - Color_Black));
744#ifdef XPM_BACKGROUND 1057#ifdef XPM_BACKGROUND
745 xpmb = "default;"; 1058 xpmb = "default;";
746#endif 1059#endif
747 break; 1060 break;
748 } 1061 }
1062
749 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1063 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
750 putenv(R->env_colorfgbg);
751 1064
752#ifndef NO_BRIGHTCOLOR 1065#ifndef NO_BRIGHTCOLOR
753 R->colorfgbg = DEFAULT_RSTYLE; 1066 colorfgbg = DEFAULT_RSTYLE;
754 for (i = minCOLOR; i <= maxCOLOR; i++) { 1067 for (i = minCOLOR; i <= maxCOLOR; i++)
1068 {
755 if (R->PixColors[Color_fg] == R->PixColors[i]) 1069 if (PixColors[Color_fg] == PixColors[i])
756 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 1070 colorfgbg = SET_FGCOLOR (colorfgbg, i);
757 if (R->PixColors[Color_bg] == R->PixColors[i]) 1071 if (PixColors[Color_bg] == PixColors[i])
758 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 1072 colorfgbg = SET_BGCOLOR (colorfgbg, i);
759 } 1073 }
760#endif 1074#endif
761} 1075}
762 1076
763/*----------------------------------------------------------------------*/ 1077/*----------------------------------------------------------------------*/
764/* 1078/*
765 * Colour determination for low colour displays, routine from 1079 * Colour determination for low colour displays, routine from
766 * Hans de Goede <hans@highrise.nl> 1080 * Hans de Goede <hans@highrise.nl>
767 */ 1081 */
768 1082
769/* EXTPROTO */
770int 1083int
771rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 1084rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
772{ 1085{
773 screen_in_out->set(aR_ colour);
774
775 if (!screen_in_out->set(aR_ colour)) { 1086 if (!screen_in_out->set (display, colour))
776 rxvt_print_error("can't allocate colour: %s", colour); 1087 {
1088 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
777 return false; 1089 return false;
778 } 1090 }
779 1091
780 return true; 1092 return true;
781} 1093}
782 1094
783/* -------------------------------------------------------------------- * 1095/* -------------------------------------------------------------------- *
784 * - WINDOW RESIZING - * 1096 * - WINDOW RESIZING - *
785 * -------------------------------------------------------------------- */ 1097 * -------------------------------------------------------------------- */
786/* EXTPROTO */
787void 1098void
788rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 1099rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
789 int ignoreparent)
790{ 1100{
791 int fix_screen; 1101 int fix_screen;
792 1102
793#ifdef SMART_RESIZE 1103#ifdef SMART_RESIZE
794 int old_width = R->szHint.width, old_height = R->szHint.height; 1104 int old_width = szHint.width, old_height = szHint.height;
795#endif 1105#endif
796 1106
797 rxvt_window_calc(aR_ width, height); 1107 window_calc (width, height);
798 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 1108 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
1109
799 if (!ignoreparent) { 1110 if (!ignoreparent)
1111 {
800#ifdef SMART_RESIZE 1112#ifdef SMART_RESIZE
801/* 1113 /*
802 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1114 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
803 * reposition window on resize depending on placement on screen 1115 * reposition window on resize depending on placement on screen
804 */ 1116 */
805 int x, y, x1, y1; 1117 int x, y, x1, y1;
806 int dx, dy; 1118 int dx, dy;
807 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1119 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
808 Window unused_cr; 1120 Window unused_cr;
809 1121
810 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 1122 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
811 0, 0, &x, &y, &unused_cr); 1123 0, 0, &x, &y, &unused_cr);
812 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 1124 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
813 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1125 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
814 /* 1126 /*
815 * if Xroot isn't the parent window, a WM will probably have offset 1127 * if display->root isn't the parent window, a WM will probably have offset
816 * our position for handles and decorations. Counter it 1128 * our position for handles and decorations. Counter it
817 */ 1129 */
818 if (x1 != x || y1 != y) { 1130 if (x1 != x || y1 != y)
1131 {
819 x -= x1; 1132 x -= x1;
820 y -= y1; 1133 y -= y1;
821 } 1134 }
822 1135
823 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 1136 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
824 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 1137 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
825 dx = old_width - R->szHint.width; 1138 dx = old_width - szHint.width;
826 dy = old_height - R->szHint.height; 1139 dy = old_height - szHint.height;
827 1140
828 /* Check position of the center of the window */ 1141 /* Check position of the center of the window */
829 if (x < x1) /* left half */ 1142 if (x < x1) /* left half */
830 dx = 0; 1143 dx = 0;
831 else if (x == x1) /* exact center */ 1144 else if (x == x1) /* exact center */
832 dx /= 2; 1145 dx /= 2;
833 if (y < y1) /* top half */ 1146 if (y < y1) /* top half */
834 dy = 0; 1147 dy = 0;
835 else if (y == y1) /* exact center */ 1148 else if (y == y1) /* exact center */
836 dy /= 2; 1149 dy /= 2;
837 1150
838 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 1151 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
839 R->szHint.width, R->szHint.height); 1152 szHint.width, szHint.height);
840#else 1153#else
841 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 1154 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height);
842 R->szHint.height);
843#endif 1155#endif
844 } 1156 }
845 1157
846 fix_screen = (R->TermWin.ncol != R->prev_ncol 1158 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
847 || R->TermWin.nrow != R->prev_nrow); 1159
848 if (fix_screen || width != R->old_width || height != R->old_height) { 1160 if (fix_screen || width != old_width || height != old_height)
1161 {
849 if (scrollbar_visible(R)) { 1162 if (scrollbar_visible ())
1163 {
850 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 1164 XMoveResizeWindow (display->display, scrollBar.win,
1165 window_sb_x, 0,
851 0, scrollbar_TotalWidth(), R->szHint.height); 1166 scrollbar_TotalWidth (), szHint.height);
852 rxvt_Resize_scrollBar(aR); 1167 resize_scrollbar ();
853 } 1168 }
1169
854 if (menubar_visible(R)) 1170 if (menubar_visible ())
855 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 1171 XMoveResizeWindow (display->display, menuBar.win,
1172 window_vt_x, 0,
856 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 1173 TermWin_TotalWidth (), menuBar_TotalHeight ());
857 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 1174
858 R->window_vt_y, TermWin_TotalWidth(), 1175 XMoveResizeWindow (display->display, TermWin.vt,
1176 window_vt_x, window_vt_y,
859 TermWin_TotalHeight()); 1177 TermWin_TotalWidth (), TermWin_TotalHeight ());
860#ifdef RXVT_GRAPHICS
861 if (R->old_height)
862 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
863 R->old_height - R->szHint.base_height);
864#endif
865 rxvt_scr_clear(aR); 1178 scr_clear ();
866#ifdef XPM_BACKGROUND 1179#ifdef XPM_BACKGROUND
867 rxvt_resize_pixmap(aR); 1180 resize_pixmap ();
868#endif 1181#endif
869 } 1182 }
870 1183
871 if (fix_screen || R->old_height == 0) { 1184 if (fix_screen || old_height == 0)
1185 {
872 int curr_screen = -1; 1186 int curr_screen = -1;
873 uint16_t old_ncol = R->prev_ncol; 1187 int old_ncol = prev_ncol;
874 1188
875 /* scr_reset only works on the primary screen */ 1189 /* scr_reset only works on the primary screen */
876 if (R->old_height) /* this is not the first time through */ 1190 if (old_height) /* this is not the first time through */
1191 {
1192 unsigned int ncol = TermWin.ncol;
1193 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
877 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 1194 curr_screen = scr_change_screen (PRIMARY);
878 rxvt_scr_reset(aR); 1195 TermWin.ncol = ncol;
879 if (curr_screen >= 0) { /* this is not the first time through */
880 rxvt_scr_change_screen(aR_ curr_screen);
881 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
882 } 1196 }
883 }
884 1197
1198 scr_reset ();
1199
1200 if (curr_screen >= 0) /* this is not the first time through */
1201 {
1202 scr_change_screen (curr_screen);
1203 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1204 }
1205 }
1206
885 R->old_width = R->szHint.width; 1207 old_width = szHint.width;
886 R->old_height = R->szHint.height; 1208 old_height = szHint.height;
887 1209
888#ifdef USE_XIM 1210#ifdef USE_XIM
889 rxvt_IMSetStatusPosition(aR); 1211 IMSetStatusPosition ();
890#endif 1212#endif
891} 1213}
892 1214
893/* 1215/*
894 * Set the width/height of the vt window in characters. Units are pixels. 1216 * Set the width/height of the vt window in characters. Units are pixels.
895 * good for toggling 80/132 columns 1217 * good for toggling 80/132 columns
896 */ 1218 */
897/* EXTPROTO */
898void 1219void
899rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1220rxvt_term::set_widthheight (unsigned int width, unsigned int height)
900{ 1221{
901 XWindowAttributes wattr; 1222 XWindowAttributes wattr;
902 1223
903 if (width == 0 || height == 0) { 1224 if (width == 0 || height == 0)
1225 {
904 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1226 XGetWindowAttributes (display->display, display->root, &wattr);
905 if (width == 0) 1227 if (width == 0)
906 width = wattr.width - R->szHint.base_width; 1228 width = wattr.width - szHint.base_width;
907 if (height == 0) 1229 if (height == 0)
908 height = wattr.height - R->szHint.base_height; 1230 height = wattr.height - szHint.base_height;
909 } 1231 }
910 if (width != R->TermWin.width || height != R->TermWin.height) { 1232 if (width != TermWin.width || height != TermWin.height)
1233 {
911 width += R->szHint.base_width; 1234 width += szHint.base_width;
912 height += R->szHint.base_height; 1235 height += szHint.base_height;
913 rxvt_resize_all_windows(aR_ width, height, 0); 1236 resize_all_windows (width, height, 0);
914 } 1237 }
915} 1238}
916 1239
917/* -------------------------------------------------------------------- * 1240/* -------------------------------------------------------------------- *
918 * - X INPUT METHOD ROUTINES - * 1241 * - X INPUT METHOD ROUTINES - *
919 * -------------------------------------------------------------------- */ 1242 * -------------------------------------------------------------------- */
920#ifdef USE_XIM 1243#ifdef USE_XIM
921/* INTPROTO */ 1244
922void 1245void
923rxvt_setSize(pR_ XRectangle * size) 1246rxvt_term::im_set_size (XRectangle *size)
924{ 1247{
925 size->x = R->TermWin.int_bwidth; 1248 size->x = TermWin.int_bwidth;
926 size->y = R->TermWin.int_bwidth; 1249 size->y = TermWin.int_bwidth;
927 size->width = Width2Pixel(R->TermWin.ncol); 1250 size->width = Width2Pixel (TermWin.ncol);
928 size->height = Height2Pixel(R->TermWin.nrow); 1251 size->height = Height2Pixel (TermWin.nrow);
929} 1252}
930 1253
931/* INTPROTO */
932void 1254void
933rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1255rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
934{ 1256{
935 *fg = R->PixColors[Color_fg]; 1257 *fg = PixColors[Color_fg];
936 *bg = R->PixColors[Color_bg]; 1258 *bg = PixColors[Color_bg];
937} 1259}
938 1260
939/* Checking whether input method is running. */ 1261/* Checking whether input method is running. */
940/* INTPROTO */
941Bool 1262bool
942rxvt_IMisRunning(pR) 1263rxvt_term::IMisRunning ()
943{ 1264{
944 char *p; 1265 char *p;
945 Atom atom; 1266 Atom atom;
946 Window win; 1267 Window win;
947 char server[IMBUFSIZ]; 1268 char server[IMBUFSIZ];
948 1269
949/* get current locale modifier */ 1270 /* get current locale modifier */
950 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1271 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1272 {
951 STRCPY(server, "@server="); 1273 STRCPY (server, "@server=");
952 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1274 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
953 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1275 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
954 *p = '\0'; 1276 *p = '\0';
955 1277
956 atom = XInternAtom(R->Xdisplay, server, False); 1278 atom = XInternAtom (display->display, server, False);
957 win = XGetSelectionOwner(R->Xdisplay, atom); 1279 win = XGetSelectionOwner (display->display, atom);
958 if (win != None) 1280 if (win != None)
959 return True; 1281 return True;
960 } 1282 }
961 return False; 1283 return False;
962} 1284}
963 1285
964/* EXTPROTO */
965void 1286void
966rxvt_IMSendSpot(pR) 1287rxvt_term::IMSendSpot ()
967{ 1288{
968 XPoint spot; 1289 XPoint spot;
969 XVaNestedList preedit_attr; 1290 XVaNestedList preedit_attr;
970 1291
971 if (R->Input_Context == NULL 1292 if (Input_Context == NULL
972 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1293 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
973 || !(R->event_type == KeyPress 1294 || ! (event_type == KeyPress
974 || R->event_type == Expose 1295 || event_type == Expose
975 || R->event_type == NoExpose 1296 || event_type == NoExpose
976 || R->event_type == SelectionNotify 1297 || event_type == SelectionNotify
977 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1298 || event_type == ButtonRelease || event_type == FocusIn)
978 || !rxvt_IMisRunning(aR)) 1299 || !IMisRunning ())
979 return; 1300 return;
980 1301
981 rxvt_setPosition(aR_ & spot); 1302 im_set_position (&spot);
982 1303
983 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1304 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
984 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1305 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
985 XFree(preedit_attr); 1306 XFree (preedit_attr);
986} 1307}
987 1308
988/* EXTPROTO */
989void 1309void
990rxvt_setTermFontSet(pR_ int idx)
991{
992 char *string;
993 long length;
994 int success = 0;
995
996 if (idx < 0 || idx >= MAX_NFONTS)
997 return;
998}
999
1000/* INTPROTO */
1001void
1002rxvt_setPreeditArea(pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1310rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1003 XRectangle * needed_rect) 1311 XRectangle * needed_rect)
1004{ 1312{
1005 int mbh, vtx = 0; 1313 int mbh, vtx = 0;
1006 1314
1007 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1315 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1008 vtx = scrollbar_TotalWidth(); 1316 vtx = scrollbar_TotalWidth ();
1317
1009 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1318 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1010 mbh -= R->TermWin.lineSpace; 1319 mbh -= TermWin.lineSpace;
1011 1320
1012 preedit_rect->x = needed_rect->width + vtx; 1321 preedit_rect->x = needed_rect->width + vtx;
1013 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1322 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1014 1323
1015 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1324 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1016 + vtx;
1017 preedit_rect->height = Height2Pixel(1); 1325 preedit_rect->height = Height2Pixel (1);
1018 1326
1019 status_rect->x = vtx; 1327 status_rect->x = vtx;
1020 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1328 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1021 1329
1022 status_rect->width = needed_rect->width ? needed_rect->width 1330 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1023 : Width2Pixel(R->TermWin.ncol + 1);
1024 status_rect->height = Height2Pixel(1); 1331 status_rect->height = Height2Pixel (1);
1025} 1332}
1026 1333
1027/* ARGSUSED */
1028/* INTPROTO */
1029void 1334void
1030rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1335rxvt_term::im_destroy ()
1031 __attribute__ ((unused)), XPointer call_data
1032 __attribute__ ((unused)))
1033{ 1336{
1034 dR; 1337 if (Input_Context)
1035 1338 {
1339 XDestroyIC (Input_Context);
1036 R->Input_Context = NULL; 1340 Input_Context = NULL;
1037/* To avoid Segmentation Fault in C locale: Solaris only? */ 1341 }
1038 if (STRCMP(R->locale, "C"))
1039 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
1040 rxvt_IMInstantiateCallback, NULL);
1041}
1042 1342
1043/* 1343 if (input_method)
1044 * X manual pages and include files don't match on some systems:
1045 * some think this is an XIDProc and others an XIMProc so we can't
1046 * use the first argument - need to update this to be nice for
1047 * both types via some sort of configure detection
1048 */
1049/* ARGSUSED */
1050/* EXTPROTO */
1051void
1052rxvt_IMInstantiateCallback(Display * unused
1053 __attribute__ ((unused)), XPointer client_data
1054 __attribute__ ((unused)), XPointer call_data
1055 __attribute__ ((unused)))
1056{
1057 dR;
1058 int i, found, had_im;
1059 const char *p;
1060 char **s;
1061 char buf[IMBUFSIZ];
1062
1063 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1064 if (R->Input_Context)
1065 return;
1066
1067 found = had_im = 0;
1068 p = R->rs[Rs_inputMethod];
1069 if (p && *p) {
1070 had_im = 1;
1071 s = rxvt_splitcommastring(p);
1072 for (i = 0; s[i]; i++) {
1073 if (*s[i]) {
1074 STRCPY(buf, "@im=");
1075 STRNCAT(buf, s[i], IMBUFSIZ - 5);
1076 if ((p = XSetLocaleModifiers(buf)) != NULL && *p
1077 && (rxvt_IM_get_IC(aR) == True)) {
1078 found = 1;
1079 break;
1080 }
1081 }
1082 }
1083 for (i = 0; s[i]; i++)
1084 free(s[i]);
1085 free(s);
1086 } 1344 {
1087 if (found) 1345 display->put_xim (input_method);
1088 return; 1346 input_method = 0;
1089
1090/* try with XMODIFIERS env. var. */
1091 if ((p = XSetLocaleModifiers("")) != NULL && *p) {
1092 rxvt_IM_get_IC(aR);
1093 return;
1094 } 1347 }
1095
1096/* try with no modifiers base IF the user didn't specify an IM */
1097 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p
1098 && rxvt_IM_get_IC(aR) == True)
1099 return;
1100} 1348}
1101 1349
1102/* 1350/*
1103 * Try to open a XIM with the current modifiers, then see if we can 1351 * Try to open a XIM with the current modifiers, then see if we can
1104 * open a suitable preedit type 1352 * open a suitable preedit type
1105 */ 1353 */
1106/* INTPROTO */
1107Bool 1354bool
1108rxvt_IM_get_IC(pR) 1355rxvt_term::IM_get_IC (const char *modifiers)
1109{ 1356{
1110 int i, j, found; 1357 int i, j, found;
1111 XIM xim; 1358 XIM xim;
1112 XPoint spot; 1359 XPoint spot;
1113 XRectangle rect, status_rect, needed_rect; 1360 XRectangle rect, status_rect, needed_rect;
1114 unsigned long fg, bg; 1361 unsigned long fg, bg;
1115 const char *p; 1362 const char *p;
1116 char **s; 1363 char **s;
1117 XIMStyles *xim_styles; 1364 XIMStyles *xim_styles;
1118 XVaNestedList preedit_attr, status_attr; 1365 XVaNestedList preedit_attr, status_attr;
1119 XIMCallback ximcallback;
1120 1366
1367 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1368 return false;
1369
1121 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1370 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1122 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); 1371 input_method = display->get_xim (locale, modifiers);
1123 if (xim == NULL) 1372 if (input_method == NULL)
1124 return False; 1373 return false;
1125 1374
1375 xim = input_method->xim;
1376
1126 xim_styles = NULL; 1377 xim_styles = NULL;
1127 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) 1378 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1128 || !xim_styles || !xim_styles->count_styles) { 1379 || !xim_styles || !xim_styles->count_styles)
1129 XCloseIM(xim); 1380 {
1381 display->put_xim (input_method);
1130 return False; 1382 return false;
1131 } 1383 }
1132 1384
1133 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] 1385 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1134 : "OverTheSpot,OffTheSpot,Root";
1135 s = rxvt_splitcommastring(p); 1386 s = rxvt_splitcommastring (p);
1136 for (i = found = 0; !found && s[i]; i++) { 1387 for (i = found = 0; !found && s[i]; i++)
1388 {
1137 if (!STRCMP(s[i], "OverTheSpot")) 1389 if (!STRCMP (s[i], "OverTheSpot"))
1138 R->input_style = (XIMPreeditPosition | XIMStatusNothing); 1390 input_style = (XIMPreeditPosition | XIMStatusNothing);
1139 else if (!STRCMP(s[i], "OffTheSpot")) 1391 else if (!STRCMP (s[i], "OffTheSpot"))
1140 R->input_style = (XIMPreeditArea | XIMStatusArea); 1392 input_style = (XIMPreeditArea | XIMStatusArea);
1141 else if (!STRCMP(s[i], "Root")) 1393 else if (!STRCMP (s[i], "Root"))
1142 R->input_style = (XIMPreeditNothing | XIMStatusNothing); 1394 input_style = (XIMPreeditNothing | XIMStatusNothing);
1143 1395
1144 for (j = 0; j < xim_styles->count_styles; j++) 1396 for (j = 0; j < xim_styles->count_styles; j++)
1145 if (R->input_style == xim_styles->supported_styles[j]) { 1397 if (input_style == xim_styles->supported_styles[j])
1398 {
1146 found = 1; 1399 found = 1;
1400 break;
1401 }
1402 }
1403
1404 for (i = 0; s[i]; i++)
1405 free (s[i]);
1406
1407 free (s);
1408 XFree (xim_styles);
1409
1410 if (!found)
1411 {
1412 display->put_xim (input_method);
1413 return false;
1414 }
1415
1416 preedit_attr = status_attr = NULL;
1417
1418 if (input_style & XIMPreeditPosition)
1419 {
1420 im_set_size (&rect);
1421 im_set_position (&spot);
1422 im_set_color (&fg, &bg);
1423
1424 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1425 XNSpotLocation, &spot,
1426 XNForeground, fg, XNBackground, bg,
1427 //XNFontSet, TermWin.fontset,
1428 NULL);
1429 }
1430 else if (input_style & XIMPreeditArea)
1431 {
1432 im_set_color (&fg, &bg);
1433
1434 /*
1435 * The necessary width of preedit area is unknown
1436 * until create input context.
1437 */
1438 needed_rect.width = 0;
1439
1440 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1441
1442 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1443 XNForeground, fg, XNBackground, bg,
1444 //XNFontSet, TermWin.fontset,
1445 NULL);
1446 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1447 XNForeground, fg, XNBackground, bg,
1448 //XNFontSet, TermWin.fontset,
1449 NULL);
1450 }
1451
1452 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1453 XNClientWindow, TermWin.parent[0],
1454 XNFocusWindow, TermWin.parent[0],
1455 preedit_attr ? XNPreeditAttributes : NULL,
1456 preedit_attr,
1457 status_attr ? XNStatusAttributes : NULL,
1458 status_attr, NULL);
1459 if (preedit_attr) XFree (preedit_attr);
1460 if (status_attr) XFree (status_attr);
1461
1462 if (Input_Context == NULL)
1463 {
1464 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1465 display->put_xim (input_method);
1466 return false;
1467 }
1468
1469 if (input_style & XIMPreeditArea)
1470 IMSetStatusPosition ();
1471
1472 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1473 return true;
1474}
1475
1476void
1477rxvt_term::im_cb ()
1478{
1479 int i, found, had_im;
1480 const char *p;
1481 char **s;
1482 char buf[IMBUFSIZ];
1483
1484 im_destroy ();
1485
1486 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1487 if (Input_Context)
1488 return;
1489
1490#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1491 if (rs[Rs_imLocale])
1492 SET_LOCALE (rs[Rs_imLocale]);
1493#endif
1494
1495 p = rs[Rs_inputMethod];
1496 if (p && *p)
1497 {
1498 bool found = false;
1499
1500 s = rxvt_splitcommastring (p);
1501 for (i = 0; s[i]; i++)
1502 {
1503 if (*s[i])
1504 {
1505 STRCPY (buf, "@im=");
1506 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1507 if (IM_get_IC (buf))
1508 {
1509 found = true;
1147 break; 1510 break;
1511 }
1148 } 1512 }
1149 } 1513 }
1150 for (i = 0; s[i]; i++) 1514 for (i = 0; s[i]; i++)
1151 free(s[i]); 1515 free (s[i]);
1152 free(s); 1516 free (s);
1153 XFree(xim_styles);
1154 1517
1155 if (!found) { 1518 if (found)
1156 XCloseIM(xim); 1519 goto done;
1157 return False;
1158 } 1520 }
1159 1521
1160 ximcallback.callback = rxvt_IMDestroyCallback; 1522 /* try with XMODIFIERS env. var. */
1523 if (IM_get_IC (""))
1524 goto done;
1161 1525
1162/* XXX: not sure why we need this (as well as IC one below) */ 1526 /* try with no modifiers base IF the user didn't specify an IM */
1163 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1527 if (IM_get_IC ("@im=none"))
1528 goto done;
1164 1529
1165 preedit_attr = status_attr = NULL; 1530done:
1166 1531#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1167 if (R->input_style & XIMPreeditPosition) { 1532 if (rs[Rs_imLocale])
1168 rxvt_setSize(aR_ & rect); 1533 SET_LOCALE (locale);
1169 rxvt_setPosition(aR_ & spot); 1534#endif
1170 rxvt_setColor(aR_ & fg, &bg);
1171
1172 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1173 XNSpotLocation, &spot,
1174 XNForeground, fg, XNBackground, bg,
1175 //XNFontSet, R->TermWin.fontset,
1176 NULL);
1177 } else if (R->input_style & XIMPreeditArea) {
1178 rxvt_setColor(aR_ & fg, &bg);
1179
1180 /*
1181 * The necessary width of preedit area is unknown
1182 * until create input context.
1183 */
1184 needed_rect.width = 0;
1185
1186 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1187
1188 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1189 XNForeground, fg, XNBackground, bg,
1190 //XNFontSet, R->TermWin.fontset,
1191 NULL);
1192 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1193 XNForeground, fg, XNBackground, bg,
1194 //XNFontSet, R->TermWin.fontset,
1195 NULL);
1196 }
1197 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1198 XNClientWindow, R->TermWin.parent[0],
1199 XNFocusWindow, R->TermWin.parent[0],
1200 XNDestroyCallback, &ximcallback,
1201 preedit_attr ? XNPreeditAttributes : NULL,
1202 preedit_attr,
1203 status_attr ? XNStatusAttributes : NULL,
1204 status_attr, NULL);
1205 if (preedit_attr)
1206 XFree(preedit_attr);
1207 if (status_attr)
1208 XFree(status_attr);
1209 if (R->Input_Context == NULL) {
1210 rxvt_print_error("failed to create input context");
1211 XCloseIM(xim);
1212 return False;
1213 }
1214 if (R->input_style & XIMPreeditArea)
1215 rxvt_IMSetStatusPosition(aR);
1216 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1217 return True;
1218} 1535}
1219 1536
1220/* EXTPROTO */
1221void 1537void
1222rxvt_IMSetStatusPosition(pR) 1538rxvt_term::IMSetStatusPosition ()
1223{ 1539{
1224 XRectangle preedit_rect, status_rect, *needed_rect; 1540 XRectangle preedit_rect, status_rect, *needed_rect;
1225 XVaNestedList preedit_attr, status_attr; 1541 XVaNestedList preedit_attr, status_attr;
1226 1542
1227 if (R->Input_Context == NULL 1543 if (Input_Context == NULL
1228 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1544 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1229 || !rxvt_IMisRunning(aR)) 1545 || !IMisRunning ())
1230 return; 1546 return;
1231 1547
1232/* Getting the necessary width of preedit area */ 1548 /* Getting the necessary width of preedit area */
1233 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1549 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1234 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1550 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1235 XFree(status_attr); 1551 XFree (status_attr);
1236 1552
1237 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1553 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1238 1554
1239 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1555 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1240 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1556 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1241 1557
1242 XSetICValues(R->Input_Context, 1558 XSetICValues (Input_Context,
1243 XNPreeditAttributes, preedit_attr, 1559 XNPreeditAttributes, preedit_attr,
1244 XNStatusAttributes, status_attr, NULL); 1560 XNStatusAttributes, status_attr, NULL);
1245 1561
1246 XFree(preedit_attr); 1562 XFree (preedit_attr);
1247 XFree(status_attr); 1563 XFree (status_attr);
1248} 1564}
1249#endif /* USE_XIM */ 1565#endif /* USE_XIM */
1250 1566
1251/*----------------------------------------------------------------------*/ 1567/*----------------------------------------------------------------------*/
1252rxvt_t rxvt_current_term; 1568rxvt_t rxvt_current_term;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines