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.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.22 by pcg, Sat Jan 31 00:20:21 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines