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.2 by pcg, Mon Nov 24 17:31:27 2003 UTC vs.
Revision 1.60 by pcg, Sun Mar 28 02:07:08 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines