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.7 by pcg, Wed Nov 26 10:42:34 2003 UTC vs.
Revision 1.26 by pcg, Sun Feb 1 01:34:41 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines