ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.9 by pcg, Tue Dec 2 21:49:46 2003 UTC

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

Diff Legend

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