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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.2 by pcg, Mon Nov 24 17:31:27 2003 UTC vs.
Revision 1.3 by pcg, Tue Nov 25 11:52:42 2003 UTC

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

Diff Legend

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