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

Diff Legend

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