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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines