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.10 by pcg, Wed Dec 3 23:19:44 2003 UTC vs.
Revision 1.27 by pcg, Mon Feb 9 07:11:49 2004 UTC

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

Diff Legend

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