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

Diff Legend

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