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

Diff Legend

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