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