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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines