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

Diff Legend

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