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

Diff Legend

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