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

Diff Legend

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