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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines