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.185 by root, Tue Jan 17 15:17:39 2006 UTC vs.
Revision 1.264 by root, Sat Nov 24 11:06:13 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * 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>
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
48# include <termios.h> 44# include <termios.h>
49#endif 45#endif
50 46
51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) 47#ifdef HAVE_XSETLOCALE
52static uid_t saved_euid; 48# define X_LOCALE
53static gid_t saved_egid; 49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
54#endif 53# endif
54#endif
55
56vector<rxvt_term *> rxvt_term::termlist;
57
58// used to tell global functions which terminal instance is "active"
59rxvt_t rxvt_current_term;
60
61static char curlocale[128], savelocale[128];
55 62
56bool 63bool
57rxvt_tainted ()
58{
59#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60 return getuid () != saved_euid || getgid () != saved_egid;
61#else
62 return false;
63#endif
64}
65
66vector<rxvt_term *> rxvt_term::termlist;
67
68static char curlocale[128], savelocale[128];
69
70bool
71rxvt_set_locale (const char *locale) 64rxvt_set_locale (const char *locale) NOTHROW
72{ 65{
66 int size = strlen (locale) + 1;
67
68 if (size > sizeof (curlocale))
69 rxvt_fatal ("locale string too long, aborting.\n");
70
73 if (!locale || !strncmp (locale, curlocale, 128)) 71 if (!locale || !memcmp (locale, curlocale, size))
74 return false; 72 return false;
75 73
76 strncpy (curlocale, locale, 128); 74 memcpy (curlocale, locale, size);
77 setlocale (LC_CTYPE, curlocale); 75 setlocale (LC_CTYPE, curlocale);
78 return true; 76 return true;
79} 77}
80 78
81void 79void
82rxvt_push_locale (const char *locale) 80rxvt_push_locale (const char *locale) NOTHROW
83{ 81{
84 strcpy (savelocale, curlocale); 82 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale); 83 rxvt_set_locale (locale);
86} 84}
87 85
88void 86void
89rxvt_pop_locale () 87rxvt_pop_locale () NOTHROW
90{ 88{
91 rxvt_set_locale (savelocale); 89 rxvt_set_locale (savelocale);
92} 90}
93 91
94#if ENABLE_COMBINING 92#if ENABLE_COMBINING
95class rxvt_composite_vec rxvt_composite; 93class rxvt_composite_vec rxvt_composite;
96 94
97text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
98{ 96{
99 compose_char *cc; 97 compose_char *cc;
100 98
101 // break compose chains, as stupid readline really likes to duplicate 99 // break compose chains, as stupid readline really likes to duplicate
102 // composing characters for some reason near the end of a line. 100 // composing characters for some reason near the end of a line.
103 cc = (*this)[c1]; 101 cc = (*this)[c1];
104 while (cc) 102 while (cc)
105 { 103 {
… …
155} 153}
156#endif 154#endif
157 155
158rxvt_term::rxvt_term () 156rxvt_term::rxvt_term ()
159 : 157 :
160#if TRANSPARENT 158#if ENABLE_TRANSPARENCY || ENABLE_PERL
161 rootwin_ev (this, &rxvt_term::rootwin_cb), 159 rootwin_ev (this, &rxvt_term::rootwin_cb),
160#endif
161#if HAVE_BG_PIXMAP
162 update_background_ev(this, &rxvt_term::update_background_cb),
162#endif 163#endif
163#ifdef HAVE_SCROLLBARS 164#ifdef HAVE_SCROLLBARS
164 scrollbar_ev (this, &rxvt_term::x_cb), 165 scrollbar_ev (this, &rxvt_term::x_cb),
165#endif 166#endif
166#ifdef CURSOR_BLINK 167#ifdef CURSOR_BLINK
… …
180#endif 181#endif
181#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
182 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev (this, &rxvt_term::pointer_cb),
183#endif 184#endif
184#ifdef USE_XIM 185#ifdef USE_XIM
185 im_ev (this, &rxvt_term::im_cb), 186 im_ev (this, &rxvt_term::im_cb),
187#endif
188#ifndef NO_BELL
189 bell_ev (this, &rxvt_term::bell_cb),
186#endif 190#endif
187 termwin_ev (this, &rxvt_term::x_cb), 191 termwin_ev (this, &rxvt_term::x_cb),
188 vt_ev (this, &rxvt_term::x_cb), 192 vt_ev (this, &rxvt_term::x_cb),
189 check_ev (this, &rxvt_term::check_cb), 193 child_ev (this, &rxvt_term::child_cb),
194 prepare_ev (this, &rxvt_term::prepare_cb),
190 flush_ev (this, &rxvt_term::flush_cb), 195 flush_ev (this, &rxvt_term::flush_cb),
191 destroy_ev (this, &rxvt_term::destroy_cb), 196 destroy_ev (this, &rxvt_term::destroy_cb),
192 pty_ev (this, &rxvt_term::pty_cb), 197 pty_ev (this, &rxvt_term::pty_cb),
193 incr_ev (this, &rxvt_term::incr_cb) 198 incr_ev (this, &rxvt_term::incr_cb)
194{ 199{
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 201
197 termlist.push_back (this); 202 termlist.push_back (this);
198 203
199#ifdef KEYSYM_RESOURCE 204#ifdef KEYSYM_RESOURCE
200 keyboard = new keyboard_manager; 205 keyboard = new keyboard_manager;
201
202 if (!keyboard)
203 rxvt_fatal ("out of memory, aborting.\n");
204#endif 206#endif
205} 207}
206 208
207// clean up the most important stuff, do *not* call x or free mem etc. 209// clean up the most important stuff, do *not* call x or free mem etc.
208// for use before an emergency exit 210// for use before an emergency exit
211void
209void rxvt_term::emergency_cleanup () 212rxvt_term::emergency_cleanup ()
210{ 213{
211 if (cmd_pid) 214 if (cmd_pid)
212 kill (-cmd_pid, SIGHUP); 215 kill (-cmd_pid, SIGHUP);
213 216
214#ifdef UTMP_SUPPORT 217 pty_ev.stop ();
215 privileged_utmp (RESTORE);
216#endif
217
218 delete pty; pty = 0; 218 delete pty; pty = 0;
219} 219}
220 220
221rxvt_term::~rxvt_term () 221rxvt_term::~rxvt_term ()
222{ 222{
223 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
224
225 termlist.erase (find (termlist.begin (), termlist.end(), this)); 223 termlist.erase (find (termlist.begin (), termlist.end(), this));
226 224
227 emergency_cleanup (); 225 emergency_cleanup ();
228 226
229#if ENABLE_STYLES 227#if ENABLE_STYLES
… …
233#endif 231#endif
234 delete fontset[0]; 232 delete fontset[0];
235 233
236 if (display) 234 if (display)
237 { 235 {
238 dDisp;
239
240 selection_clear (); 236 selection_clear ();
241 237
242#ifdef USE_XIM 238#ifdef USE_XIM
243 im_destroy (); 239 im_destroy ();
244#endif 240#endif
245#ifdef XTERM_SCROLLBAR 241#ifdef XTERM_SCROLLBAR
246 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 242 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
247 if (ShadowGC) XFreeGC (disp, ShadowGC); 243 if (ShadowGC) XFreeGC (dpy, ShadowGC);
248#endif 244#endif
249#ifdef PLAIN_SCROLLBAR 245#ifdef PLAIN_SCROLLBAR
250 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 246 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
251#endif 247#endif
252#ifdef NEXT_SCROLLBAR 248#ifdef NEXT_SCROLLBAR
253 if (blackGC) XFreeGC (disp, blackGC); 249 if (blackGC) XFreeGC (dpy, blackGC);
254 if (whiteGC) XFreeGC (disp, whiteGC); 250 if (whiteGC) XFreeGC (dpy, whiteGC);
255 if (grayGC) XFreeGC (disp, grayGC); 251 if (grayGC) XFreeGC (dpy, grayGC);
256 if (darkGC) XFreeGC (disp, darkGC); 252 if (darkGC) XFreeGC (dpy, darkGC);
257 if (stippleGC) XFreeGC (disp, stippleGC); 253 if (stippleGC) XFreeGC (dpy, stippleGC);
258 if (dimple) XFreePixmap (disp, dimple); 254 if (dimple) XFreePixmap (dpy, dimple);
259 if (upArrow) XFreePixmap (disp, upArrow); 255 if (upArrow) XFreePixmap (dpy, upArrow);
260 if (downArrow) XFreePixmap (disp, downArrow); 256 if (downArrow) XFreePixmap (dpy, downArrow);
261 if (upArrowHi) XFreePixmap (disp, upArrowHi); 257 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
262 if (downArrowHi) XFreePixmap (disp, downArrowHi); 258 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
263#endif 259#endif
264#ifdef RXVT_SCROLLBAR 260#ifdef RXVT_SCROLLBAR
265 if (topShadowGC) XFreeGC (disp, topShadowGC); 261 if (topShadowGC) XFreeGC (dpy, topShadowGC);
266 if (botShadowGC) XFreeGC (disp, botShadowGC); 262 if (botShadowGC) XFreeGC (dpy, botShadowGC);
267 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 263 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
268#endif 264#endif
269 if (gc) XFreeGC (disp, gc); 265 if (gc) XFreeGC (dpy, gc);
270 266
271 delete drawable; 267 delete drawable;
272 // destroy all windows 268 // destroy all windows
273 if (parent[0]) 269 if (parent[0])
274 XDestroyWindow (disp, parent[0]); 270 XDestroyWindow (dpy, parent[0]);
275 }
276 271
277 // TODO: free pixcolours, colours should become part of rxvt_display 272 for (int i = 0; i < TOTAL_COLORS; i++)
278 delete pix_colors_focused; 273 if (ISSET_PIXCOLOR (i))
274 {
275 pix_colors_focused [i].free (this);
279#if OFF_FOCUS_FADING 276#if OFF_FOCUS_FADING
277 pix_colors_unfocused [i].free (this);
278#endif
279 }
280
281 clear ();
282 }
283
284 delete [] pix_colors_focused;
285#if OFF_FOCUS_FADING
280 delete pix_colors_unfocused; 286 delete [] pix_colors_unfocused;
281#endif 287#endif
282 288
289#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy ();
291#endif
283 displays.put (display); 292 displays.put (display);
284 293
285 scr_release (); 294 scr_release ();
286 295
287 /* clear all resources */ 296 /* clear all resources */
288 for (int i = 0; i < allocated.size (); i++) 297 for (int i = 0; i < allocated.size (); i++)
289 free (allocated [i]); 298 free (allocated [i]);
290 299
291 free (selection.text); 300 free (selection.text);
292 // TODO: manage env vars in child only(!) 301 // TODO: manage env vars in child only(!)
293 free (env_windowid);
294 free (env_display); 302 free (env_display);
295 free (env_term); 303 free (env_term);
296 free (env_colorfgbg);
297 free (locale); 304 free (locale);
298 free (v_buffer); 305 free (v_buffer);
299 free (incr_buf); 306 free (incr_buf);
300 307
301 delete envv; 308 delete envv;
302 delete argv; 309 delete argv;
303 310
304#ifdef KEYSYM_RESOURCE 311#ifdef KEYSYM_RESOURCE
305 delete keyboard; 312 delete keyboard;
306#endif 313#endif
314#ifndef NO_RESOURCES
315 XrmDestroyDatabase (option_db);
316#endif
307} 317}
308 318
319// child has exited, usually destroys
309void 320void
310rxvt_term::child_exit () 321rxvt_term::child_cb (ev::child &w, int status)
311{ 322{
323 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
324
312 cmd_pid = 0; 325 cmd_pid = 0;
313 326
314 if (!OPTION (Opt_hold)) 327 if (!option (Opt_hold))
315 destroy (); 328 destroy ();
316} 329}
317 330
318void 331void
319rxvt_term::destroy () 332rxvt_term::destroy ()
320{ 333{
321 if (destroy_ev.active) 334 if (destroy_ev.active)
322 return; 335 return;
323 336
337 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
338
324#if ENABLE_OVERLAY 339#if ENABLE_OVERLAY
325 scr_overlay_off (); 340 scr_overlay_off ();
326#endif 341#endif
327 342
328 if (display) 343 if (display)
… …
331 im_ev.stop (display); 346 im_ev.stop (display);
332#endif 347#endif
333#if HAVE_SCROLLBARS 348#if HAVE_SCROLLBARS
334 scrollbar_ev.stop (display); 349 scrollbar_ev.stop (display);
335#endif 350#endif
336#if TRANSPARENT 351#if ENABLE_TRANSPARENCY || ENABLE_PERL
337 rootwin_ev.stop (display); 352 rootwin_ev.stop (display);
338#endif 353#endif
339 incr_ev.stop (); 354 incr_ev.stop ();
340 termwin_ev.stop (display); 355 termwin_ev.stop (display);
341 vt_ev.stop (display); 356 vt_ev.stop (display);
342 } 357 }
343 358
344 check_ev.stop (); 359 prepare_ev.stop ();
345 pty_ev.stop (); 360 pty_ev.stop ();
346#ifdef CURSOR_BLINK 361#ifdef CURSOR_BLINK
347 cursor_blink_ev.stop (); 362 cursor_blink_ev.stop ();
348#endif 363#endif
349#ifdef TEXT_BLINK 364#ifdef TEXT_BLINK
… …
357#endif 372#endif
358#ifdef POINTER_BLANK 373#ifdef POINTER_BLANK
359 pointer_ev.stop (); 374 pointer_ev.stop ();
360#endif 375#endif
361 376
362 destroy_ev.start (0); 377 destroy_ev.start ();
363} 378}
364 379
365void 380void
366rxvt_term::destroy_cb (time_watcher &w) 381rxvt_term::destroy_cb (ev::idle &w, int revents)
367{ 382{
368 make_current (); 383 make_current ();
369 384
370 delete this; 385 delete this;
371} 386}
… …
382{ 397{
383 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 398 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
384 (*t)->emergency_cleanup (); 399 (*t)->emergency_cleanup ();
385} 400}
386 401
387#if ENABLE_FRILLS 402#if !ENABLE_MINIMAL
388static void 403static void
389print_x_error (Display *dpy, XErrorEvent *event) 404print_x_error (Display *dpy, XErrorEvent *event)
390{ 405{
391 char buffer[BUFSIZ]; 406 char buffer[BUFSIZ];
392 char mesg[BUFSIZ]; 407 char mesg[BUFSIZ];
… …
425 else 440 else
426 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 441 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
427 mesg, BUFSIZ); 442 mesg, BUFSIZ);
428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 443 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
429 } 444 }
430 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 445 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
431 mesg, BUFSIZ); 446 mesg, BUFSIZ);
432 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 447 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
433} 448}
434#endif 449#endif
435 450
… …
440 GET_R->allowedxerror = event->error_code; 455 GET_R->allowedxerror = event->error_code;
441 else 456 else
442 { 457 {
443 // GET_R is most likely not the terminal which caused the error, 458 // GET_R is most likely not the terminal which caused the error,
444 // so just output the error and continue 459 // so just output the error and continue
445#if ENABLE_FRILLS 460#if ENABLE_MINIMAL
461 old_xerror_handler (display, event);
462#else
446 print_x_error (display, event); 463 print_x_error (display, event);
447#else
448 old_xerror_handler (display, event);
449#endif 464#endif
450 } 465 }
451 466
452 return 0; 467 return 0;
453} 468}
… …
461 _exit (EXIT_FAILURE); 476 _exit (EXIT_FAILURE);
462} 477}
463 478
464/*----------------------------------------------------------------------*/ 479/*----------------------------------------------------------------------*/
465bool 480bool
466rxvt_term::init (int argc, const char *const *argv) 481rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
467{ 482{
483 this->envv = envv;
484
468 SET_R (this); 485 SET_R (this);
469 set_locale (""); 486 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :( 487 set_environ (envv); // few things in X do not call setlocale :(
471 488
472 if (!init_vars ()) 489 if (!init_vars ())
… …
479#ifdef KEYSYM_RESOURCE 496#ifdef KEYSYM_RESOURCE
480 keyboard->register_done (); 497 keyboard->register_done ();
481#endif 498#endif
482 499
483#ifdef HAVE_SCROLLBARS 500#ifdef HAVE_SCROLLBARS
484 if (OPTION (Opt_scrollBar)) 501 if (option (Opt_scrollBar))
485 scrollBar.setIdle (); /* set existence for size calculations */ 502 scrollBar.setIdle (); /* set existence for size calculations */
486#endif 503#endif
487 504
505 pty = ptytty::create ();
506
507 create_windows (argc, argv);
508
509 init_xlocale ();
510
511 scr_reset (); // initialize screen
512
513#if 0
514 XSynchronize (dpy, True);
515#endif
516
517#ifdef HAVE_SCROLLBARS
518 if (option (Opt_scrollBar))
519 resize_scrollbar (); /* create and map scrollbar */
520#endif
521#ifdef HAVE_BG_PIXMAP
522 {
523 bgPixmap.set_target (this);
524
525#ifdef ENABLE_TRANSPARENCY
526 if (option (Opt_transparent))
527 {
528 bgPixmap.set_transparent ();
529#ifdef HAVE_AFTERIMAGE
530 if (rs [Rs_blurradius])
531 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
532#endif
533 if (ISSET_PIXCOLOR (Color_tint))
534 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
535 if (rs [Rs_shade])
536 bgPixmap.set_shade (rs [Rs_shade]);
537
538 bgPixmap.set_root_pixmap ();
539 XSelectInput (dpy, display->root, PropertyChangeMask);
540 rootwin_ev.start (display, display->root);
541 }
542#endif
543
544#ifdef BG_IMAGE_FROM_FILE
545 if (rs[Rs_backgroundPixmap] != NULL)
546 {
547 const char *p = rs[Rs_backgroundPixmap];
548
549 if ((p = strchr (p, ';')) != NULL)
550 {
551 p++;
552 bgPixmap.set_geometry (p);
553 }
554 else
555 bgPixmap.set_defaultGeometry ();
556
557 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
558 if (!bgPixmap.window_position_sensitive ())
559 update_background ();
560 }
561#endif
562 }
563#endif
564
488#if ENABLE_PERL 565#if ENABLE_PERL
489 if (!rs[Rs_perl_ext_1])
490 rs[Rs_perl_ext_1] = "default";
491
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 {
496#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
497 // ignore some perl-related arguments if some bozo installed us set[ug]id
498 if (rxvt_tainted ())
499 {
500 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
501 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
502 {
503 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
504 rs[Rs_perl_lib] = 0;
505 rs[Rs_perl_eval] = 0;
506 }
507 }
508#endif
509 rxvt_perl.init (this);
510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
511 }
512#endif
513
514 pty = rxvt_new_ptytty ();
515
516 create_windows (argc, argv);
517
518 dDisp;
519
520 init_xlocale ();
521
522 scr_reset (); // initialize screen
523
524#if 0
525 XSynchronize (disp, True);
526#endif
527
528#ifdef HAVE_SCROLLBARS
529 if (OPTION (Opt_scrollBar))
530 resize_scrollbar (); /* create and map scrollbar */
531#endif
532#ifdef TRANSPARENT
533 if (OPTION (Opt_transparent))
534 {
535 XSelectInput (disp, display->root, PropertyChangeMask);
536 check_our_parents ();
537 rootwin_ev.start (display, display->root); 566 rootwin_ev.start (display, display->root);
538 }
539#endif 567#endif
540
541 XMapWindow (disp, vt);
542 XMapWindow (disp, parent[0]);
543 568
544 set_colorfgbg (); 569 set_colorfgbg ();
545 570
546 init_command (cmd_argv); 571 init_command (cmd_argv);
547 572
548 free (cmd_argv); 573 free (cmd_argv);
549 574
550 if (pty->pty >= 0) 575 if (pty->pty >= 0)
551 pty_ev.start (pty->pty, EVENT_READ); 576 pty_ev.start (pty->pty, ev::READ);
552 577
553 check_ev.start (); 578 prepare_ev.start ();
554 579
555 HOOK_INVOKE ((this, HOOK_START, DT_END)); 580 HOOK_INVOKE ((this, HOOK_START, DT_END));
556 581
582#if ENABLE_XEMBED
583 if (rs[Rs_embed])
584 {
585 long info[2] = { 0, XEMBED_MAPPED };
586
587 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
588 32, PropModeReplace, (unsigned char *)&info, 2);
589 }
590#endif
591
592 XMapWindow (dpy, vt);
593 XMapWindow (dpy, parent[0]);
594
557 return true; 595 return true;
558} 596}
559 597
560static struct sig_handlers 598static struct sig_handlers
561{ 599{
562 sig_watcher sw_chld, sw_term, sw_int; 600 ev::sig sw_term, sw_int;
563
564 void sig_chld (sig_watcher &w)
565 {
566 // we are being called for every SIGCHLD, find the corresponding term
567 int pid;
568
569 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
570 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
571 if (pid == (*t)->cmd_pid)
572 {
573 (*t)->child_exit ();
574 break;
575 }
576 }
577 601
578 /* 602 /*
579 * Catch a fatal signal and tidy up before quitting 603 * Catch a fatal signal and tidy up before quitting
580 */ 604 */
581 void 605 void
582 sig_term (sig_watcher &w) 606 sig_term (ev::sig &w, int revents)
583 { 607 {
584#ifdef DEBUG_CMD
585 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
586#endif
587 rxvt_emergency_cleanup (); 608 rxvt_emergency_cleanup ();
588 signal (w.signum, SIG_DFL); 609 w.stop ();
589 kill (getpid (), w.signum); 610 kill (getpid (), w.signum);
590 } 611 }
591 612
592 sig_handlers () 613 sig_handlers ()
593 : sw_chld (this, &sig_handlers::sig_chld),
594 sw_term (this, &sig_handlers::sig_term), 614 : sw_term (this, &sig_handlers::sig_term),
595 sw_int (this, &sig_handlers::sig_term) 615 sw_int (this, &sig_handlers::sig_term)
596 { 616 {
597 } 617 }
598} sig_handlers; 618} sig_handlers;
599 619
600char **rxvt_environ; // startup environment 620char **rxvt_environ; // startup environment
601 621
602void 622void
603rxvt_init () 623rxvt_init ()
604{ 624{
625 ptytty::init ();
626
627 if (!ev_default_loop (0))
628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
629
605 rxvt_environ = environ; 630 rxvt_environ = environ;
606
607 /*
608 * Save and then give up any super-user privileges
609 * If we need privileges in any area then we must specifically request it.
610 * We should only need to be root in these cases:
611 * 1. write utmp entries on some systems
612 * 2. chown tty on some systems
613 */
614 rxvt_privileges (SAVE);
615 rxvt_privileges (IGNORE);
616 631
617 signal (SIGHUP, SIG_IGN); 632 signal (SIGHUP, SIG_IGN);
618 signal (SIGPIPE, SIG_IGN); 633 signal (SIGPIPE, SIG_IGN);
619 634
620 sig_handlers.sw_chld.start (SIGCHLD);
621 sig_handlers.sw_term.start (SIGTERM); 635 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
622 sig_handlers.sw_int.start (SIGINT); 636 sig_handlers.sw_int.start (SIGINT); ev_unref ();
623 637
624 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 638 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
625 /* signal (SIGURG, SIG_DFL); */ 639 /* signal (SIGURG, SIG_DFL); */
626 640
627 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
654 rxvt_fatal ("memory allocation failure. aborting.\n"); 668 rxvt_fatal ("memory allocation failure. aborting.\n");
655 669
656 return p; 670 return p;
657} 671}
658 672
659void * 673void *
660rxvt_realloc (void *ptr, size_t size) 674rxvt_realloc (void *ptr, size_t size)
661{ 675{
662 void *p = realloc (ptr, size); 676 void *p = realloc (ptr, size);
663 677
664 if (!p) 678 if (!p)
665 rxvt_fatal ("memory allocation failure. aborting.\n"); 679 rxvt_fatal ("memory allocation failure. aborting.\n");
666 680
667 return p; 681 return p;
668} 682}
669 683
670/* ------------------------------------------------------------------------- *
671 * PRIVILEGED OPERATIONS *
672 * ------------------------------------------------------------------------- */
673/* take care of suid/sgid super-user (root) privileges */
674void
675rxvt_privileges (rxvt_privaction action)
676{
677#if ! defined(__CYGWIN32__)
678# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
679 /* setreuid () is the poor man's setuid (), seteuid () */
680# define seteuid(a) setreuid(-1, (a))
681# define setegid(a) setregid(-1, (a))
682# define HAVE_SETEUID
683# endif
684# ifdef HAVE_SETEUID
685 switch (action)
686 {
687 case IGNORE:
688 /*
689 * change effective uid/gid - not real uid/gid - so we can switch
690 * back to root later, as required
691 */
692 setegid (getgid ());
693 seteuid (getuid ());
694 break;
695 case SAVE:
696 saved_egid = getegid ();
697 saved_euid = geteuid ();
698 break;
699 case RESTORE:
700 setegid (saved_egid);
701 seteuid (saved_euid);
702 break;
703 }
704# else
705 switch (action)
706 {
707 case IGNORE:
708 setgid (getgid ());
709 setuid (getuid ());
710 /* FALLTHROUGH */
711 case SAVE:
712 /* FALLTHROUGH */
713 case RESTORE:
714 break;
715 }
716# endif
717#endif
718}
719
720/*----------------------------------------------------------------------*/ 684/*----------------------------------------------------------------------*/
721/* 685/*
722 * window size/position calculcations for XSizeHint and other storage. 686 * window size/position calculations for XSizeHint and other storage.
723 * if width/height are non-zero then override calculated width/height 687 * if width/height are non-zero then override calculated width/height
724 */ 688 */
725void 689void
726rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 690rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
727{ 691{
728 short recalc_x, recalc_y; 692 short recalc_x, recalc_y;
729 int x, y, sb_w, flags; 693 int x, y, sb_w, flags;
730 unsigned int w, h; 694 unsigned int w, h;
731 unsigned int max_width, max_height; 695 unsigned int max_width, max_height;
732 dDisp;
733
734 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
735 ncol, nrow, szHint.width, szHint.height));
736 696
737 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 697 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
738 szHint.win_gravity = NorthWestGravity; 698 szHint.win_gravity = NorthWestGravity;
739 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 699 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
740 700
… …
802 762
803 if (scrollBar.state) 763 if (scrollBar.state)
804 { 764 {
805 sb_w = scrollbar_TotalWidth (); 765 sb_w = scrollbar_TotalWidth ();
806 szHint.base_width += sb_w; 766 szHint.base_width += sb_w;
767
807 if (!OPTION (Opt_scrollBar_right)) 768 if (!option (Opt_scrollBar_right))
808 window_vt_x += sb_w; 769 window_vt_x += sb_w;
809 } 770 }
810 771
811 szHint.width_inc = fwidth; 772 szHint.width_inc = fwidth;
812 szHint.height_inc = fheight; 773 szHint.height_inc = fheight;
813 szHint.min_width = szHint.base_width + szHint.width_inc; 774 szHint.min_width = szHint.base_width + szHint.width_inc;
814 szHint.min_height = szHint.base_height + szHint.height_inc; 775 szHint.min_height = szHint.base_height + szHint.height_inc;
815 776
816 if (newwidth && newwidth - szHint.base_width < max_width) 777 if (newwidth && newwidth - szHint.base_width < max_width)
817 { 778 {
818 szHint.width = newwidth; 779 szHint.width = newwidth;
… …
833 { 794 {
834 min_it (height, max_height); 795 min_it (height, max_height);
835 szHint.height = szHint.base_height + height; 796 szHint.height = szHint.base_height + height;
836 } 797 }
837 798
838 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 799 if (scrollBar.state && option (Opt_scrollBar_right))
839 window_sb_x = szHint.width - sb_w; 800 window_sb_x = szHint.width - sb_w;
840 801
841 if (recalc_x) 802 if (recalc_x)
842 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 803 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
804
843 if (recalc_y) 805 if (recalc_y)
844 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 806 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
845 807
846 ncol = width / fwidth; 808 ncol = width / fwidth;
847 nrow = height / fheight; 809 nrow = height / fheight;
848 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
849 ncol, nrow, szHint.width,
850 szHint.height));
851 return;
852} 810}
853 811
854/*----------------------------------------------------------------------*/ 812/*----------------------------------------------------------------------*/
855/* 813/*
856 * Tell the teletype handler what size the window is. 814 * Tell the teletype handler what size the window is.
… …
908 delete fontset[0]; 866 delete fontset[0];
909 fontset[0] = fs; 867 fontset[0] = fs;
910 868
911 prop = (*fs)[1]->properties (); 869 prop = (*fs)[1]->properties ();
912 prop.height += lineSpace; 870 prop.height += lineSpace;
871
913 fs->set_prop (prop); 872 fs->set_prop (prop, false);
914 873
915 fwidth = prop.width; 874 fwidth = prop.width;
916 fheight = prop.height; 875 fheight = prop.height;
917 fbase = prop.ascent; 876 fbase = prop.ascent;
918 877
… …
927 { 886 {
928 fontset[style] = fs = new rxvt_fontset (this); 887 fontset[style] = fs = new rxvt_fontset (this);
929 rxvt_fontprop prop2 = prop; 888 rxvt_fontprop prop2 = prop;
930 889
931 if (res) 890 if (res)
932 prop2.weight = prop2.slant = rxvt_fontprop::unset; 891 {
892 fs->populate (res);
893 fs->set_prop (prop2, false);
894 }
933 else 895 else
934 { 896 {
935 res = fontset[0]->fontdesc; 897 fs->populate (fontset[0]->fontdesc);
936 898
937 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 899 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
938 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 900 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
901
902 fs->set_prop (prop2, true);
939 } 903 }
940 904
941 fs->populate (res);
942 fs->set_prop (prop2);
943 } 905 }
944#else 906#else
945 fontset[style] = fontset[0]; 907 fontset[style] = fontset[0];
946#endif 908#endif
947 } 909 }
… …
949 if (parent[0]) 911 if (parent[0])
950 { 912 {
951 resize_all_windows (0, 0, 0); 913 resize_all_windows (0, 0, 0);
952 scr_remap_chars (); 914 scr_remap_chars ();
953 scr_touch (true); 915 scr_touch (true);
954 } 916 }
955 917
956 return true; 918 return true;
957} 919}
958 920
921void
959void rxvt_term::set_string_property (Atom prop, const char *str, int len) 922rxvt_term::set_string_property (Atom prop, const char *str, int len)
960{ 923{
961 XChangeProperty (display->display, parent[0], 924 XChangeProperty (dpy, parent[0],
962 prop, XA_STRING, 8, PropModeReplace, 925 prop, XA_STRING, 8, PropModeReplace,
963 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 926 (const unsigned char *)str, len >= 0 ? len : strlen (str));
964} 927}
965 928
929void
966void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 930rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
967{ 931{
968 wchar_t *ws = rxvt_mbstowcs (str, len); 932 wchar_t *ws = rxvt_mbstowcs (str, len);
969 char *s = rxvt_wcstoutf8 (ws); 933 char *s = rxvt_wcstoutf8 (ws);
970 934
971 XChangeProperty (display->display, parent[0], 935 XChangeProperty (dpy, parent[0],
972 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 936 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
973 (const unsigned char *)s, strlen (s)); 937 (const unsigned char *)s, strlen (s));
974 938
975 free (s); 939 free (s);
976 free (ws); 940 free (ws);
… …
995#if ENABLE_EWMH 959#if ENABLE_EWMH
996 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 960 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
997#endif 961#endif
998} 962}
999 963
964void
965rxvt_term::set_window_color (int idx, const char *color)
966{
1000#ifdef XTERM_COLOR_CHANGE 967#ifdef XTERM_COLOR_CHANGE
1001void
1002rxvt_term::set_window_color (int idx, const char *color)
1003{
1004 rxvt_color xcol; 968 rxvt_color xcol;
1005 int i; 969 int i;
1006 970
1007 if (color == NULL || *color == '\0') 971 if (color == NULL || *color == '\0')
1008 return; 972 return;
973
974 color = strdup (color);
975 allocated.push_back ((void *)color);
976 rs[Rs_color + idx] = color;
1009 977
1010 /* handle color aliases */ 978 /* handle color aliases */
1011 if (isdigit (*color)) 979 if (isdigit (*color))
1012 { 980 {
1013 i = atoi (color); 981 i = atoi (color);
1014 982
1015 if (i >= 8 && i <= 15) 983 if (i >= 8 && i <= 15)
1016 { /* bright colors */ 984 { /* bright colors */
1017 i -= 8; 985 i -= 8;
1018 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1019 SET_PIXCOLOR (idx);
1020 goto done; 987 goto done;
1021 } 988 }
1022 989
1023 if (i >= 0 && i <= 7) 990 if (i >= 0 && i <= 7)
1024 { /* normal colors */ 991 { /* normal colors */
1025 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 992 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1026 SET_PIXCOLOR (idx);
1027 goto done; 993 goto done;
1028 } 994 }
1029 } 995 }
1030 996
1031 if (!rXParseAllocColor (&xcol, color)) 997 set_color (xcol, color);
1032 return;
1033
1034 /* XStoreColor (display->display, display->cmap, XColor*); */
1035 998
1036 /* 999 /*
1037 * FIXME: should free colors here, but no idea how to do it so instead, 1000 * FIXME: should free colors here, but no idea how to do it so instead,
1038 * so just keep gobbling up the colormap 1001 * so just keep gobbling up the colormap
1039 */ 1002 */
1040# if 0
1041 for (i = Color_Black; i <= Color_White; i++)
1042 if (pix_colors[idx] == pix_colors[i])
1043 break;
1044 if (i > Color_White)
1045 {
1046 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1047 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1048 DisplayPlanes (display->display, display->screen));
1049 }
1050# endif
1051 1003
1052 pix_colors_focused[idx] = xcol; 1004 pix_colors_focused[idx] = xcol;
1053 SET_PIXCOLOR (idx);
1054 1005
1055 /* XSetWindowAttributes attr; */ 1006 /* XSetWindowAttributes attr; */
1056 /* Cursor cursor; */ 1007 /* Cursor cursor; */
1057done: 1008done:
1058
1059#if OFF_FOCUS_FADING
1060 if (rs[Rs_fade])
1061 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1062#endif
1063
1064 /*TODO: handle Color_BD, scrollbar background, etc. */ 1009 /*TODO: handle Color_BD, scrollbar background, etc. */
1065 1010
1011 update_fade_color (idx);
1066 recolour_cursor (); 1012 recolour_cursor ();
1067 scr_recolour (); 1013 scr_recolour ();
1014#endif /* XTERM_COLOR_CHANGE */
1068} 1015}
1069
1070#else
1071# define set_window_color (idx,color) ((void)0)
1072#endif /* XTERM_COLOR_CHANGE */
1073 1016
1074void 1017void
1075rxvt_term::recolour_cursor () 1018rxvt_term::recolour_cursor ()
1076{ 1019{
1077 XColor xcol[2]; 1020 XColor fg, bg;
1078 1021
1079 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1022 (ISSET_PIXCOLOR (Color_pointer_fg)
1080 ? pix_colors_focused[Color_pointer_fg] 1023 ? pix_colors_focused[Color_pointer_fg]
1081 : pix_colors_focused[Color_fg]; 1024 : pix_colors_focused[Color_fg]).get (fg);
1025
1082 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1026 (ISSET_PIXCOLOR (Color_pointer_bg)
1083 ? pix_colors_focused[Color_pointer_bg] 1027 ? pix_colors_focused[Color_pointer_bg]
1084 : pix_colors_focused[Color_bg]; 1028 : pix_colors_focused[Color_bg]).get (bg);
1085 1029
1086 XQueryColors (display->display, display->cmap, xcol, 2); 1030 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1087 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1088} 1031}
1089 1032
1090/*----------------------------------------------------------------------*/ 1033/*----------------------------------------------------------------------*/
1091/* 1034/*
1092 * find if fg/bg matches any of the normal (low-intensity) colors 1035 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1096{ 1039{
1097 unsigned int i; 1040 unsigned int i;
1098 const char *xpmb = "\0"; 1041 const char *xpmb = "\0";
1099 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1042 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1100 1043
1101 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1102 strcpy (fstr, "default"); 1044 strcpy (fstr, "default");
1103 strcpy (bstr, "default"); 1045 strcpy (bstr, "default");
1104 for (i = Color_Black; i <= Color_White; i++) 1046 for (i = Color_Black; i <= Color_White; i++)
1105 if (pix_colors[Color_fg] == pix_colors[i]) 1047 if (pix_colors[Color_fg] == pix_colors[i])
1106 { 1048 {
… …
1110 1052
1111 for (i = Color_Black; i <= Color_White; i++) 1053 for (i = Color_Black; i <= Color_White; i++)
1112 if (pix_colors[Color_bg] == pix_colors[i]) 1054 if (pix_colors[Color_bg] == pix_colors[i])
1113 { 1055 {
1114 sprintf (bstr, "%d", (i - Color_Black)); 1056 sprintf (bstr, "%d", (i - Color_Black));
1115#ifdef XPM_BACKGROUND 1057#ifdef BG_IMAGE_FROM_FILE
1116 xpmb = "default;"; 1058 xpmb = "default;";
1117#endif 1059#endif
1118 break; 1060 break;
1119 } 1061 }
1120 1062
1121 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1063 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1122} 1064}
1123 1065
1124/*----------------------------------------------------------------------*/ 1066/*----------------------------------------------------------------------*/
1125 1067
1126int 1068bool
1127rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1069rxvt_term::set_color (rxvt_color &color, const char *name)
1128{ 1070{
1129 if (!screen_in_out->set (display, colour)) 1071 if (color.set (this, name))
1130 {
1131 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1132 return false;
1133 }
1134
1135 return true; 1072 return true;
1073
1074 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1075 return false;
1076}
1077
1078void
1079rxvt_term::alias_color (int dst, int src)
1080{
1081 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1136} 1082}
1137 1083
1138/* -------------------------------------------------------------------- * 1084/* -------------------------------------------------------------------- *
1139 * - WINDOW RESIZING - * 1085 * - WINDOW RESIZING - *
1140 * -------------------------------------------------------------------- */ 1086 * -------------------------------------------------------------------- */
1141void 1087void
1142rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1088rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1143{ 1089{
1144 int fix_screen; 1090 int fix_screen;
1145 int old_width = szHint.width, old_height = szHint.height; 1091 int old_width = szHint.width;
1146 dDisp; 1092 int old_height = szHint.height;
1147 1093
1148 window_calc (newwidth, newheight); 1094 window_calc (newwidth, newheight);
1095
1096 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1149 XSetWMNormalHints (disp, parent[0], &szHint); 1097 XSetWMNormalHints (dpy, parent[0], &szHint);
1150 1098
1151 if (!ignoreparent) 1099 if (!ignoreparent)
1152 { 1100 {
1153#ifdef SMART_RESIZE 1101#ifdef SMART_RESIZE
1154 /* 1102 /*
… …
1158 int x, y, x1, y1; 1106 int x, y, x1, y1;
1159 int dx, dy; 1107 int dx, dy;
1160 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1108 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1161 Window unused_cr; 1109 Window unused_cr;
1162 1110
1163 XTranslateCoordinates (disp, parent[0], display->root, 1111 XTranslateCoordinates (dpy, parent[0], display->root,
1164 0, 0, &x, &y, &unused_cr); 1112 0, 0, &x, &y, &unused_cr);
1165 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1113 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1166 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1114 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1167 /* 1115 /*
1168 * if display->root isn't the parent window, a WM will probably have offset 1116 * if display->root isn't the parent window, a WM will probably have offset
1169 * our position for handles and decorations. Counter it 1117 * our position for handles and decorations. Counter it
1170 */ 1118 */
… …
1172 { 1120 {
1173 x -= x1; 1121 x -= x1;
1174 y -= y1; 1122 y -= y1;
1175 } 1123 }
1176 1124
1177 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1125 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1178 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1126 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1179 dx = old_width - szHint.width; 1127 dx = old_width - szHint.width;
1180 dy = old_height - szHint.height; 1128 dy = old_height - szHint.height;
1181 1129
1182 /* Check position of the center of the window */ 1130 /* Check position of the center of the window */
1183 if (x < x1) /* left half */ 1131 if (x < x1) /* left half */
1184 dx = 0; 1132 dx = 0;
… …
1187 if (y < y1) /* top half */ 1135 if (y < y1) /* top half */
1188 dy = 0; 1136 dy = 0;
1189 else if (y == y1) /* exact center */ 1137 else if (y == y1) /* exact center */
1190 dy /= 2; 1138 dy /= 2;
1191 1139
1192 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1140 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1193 szHint.width, szHint.height); 1141 szHint.width, szHint.height);
1194#else 1142#else
1195 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1143 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1196#endif 1144#endif
1197 } 1145 }
1198 1146
1199 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1147 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1200 1148
1201 if (fix_screen || newwidth != old_width || newheight != old_height) 1149 if (fix_screen || newwidth != old_width || newheight != old_height)
1202 { 1150 {
1203 if (scrollBar.state) 1151 if (scrollBar.state)
1204 { 1152 {
1205 XMoveResizeWindow (disp, scrollBar.win, 1153 XMoveResizeWindow (dpy, scrollBar.win,
1206 window_sb_x, 0, 1154 window_sb_x, 0,
1207 scrollbar_TotalWidth (), szHint.height); 1155 scrollbar_TotalWidth (), szHint.height);
1208 resize_scrollbar (); 1156 resize_scrollbar ();
1209 } 1157 }
1210 1158
1211 XMoveResizeWindow (disp, vt, 1159 XMoveResizeWindow (dpy, vt,
1212 window_vt_x, window_vt_y, 1160 window_vt_x, window_vt_y,
1213 width, height); 1161 width, height);
1214 1162
1163#ifdef HAVE_BG_PIXMAP
1164 if (bgPixmap.window_size_sensitive ())
1165 update_background ();
1166#endif
1167
1215 scr_clear (); 1168 scr_clear ();
1216#ifdef XPM_BACKGROUND
1217 resize_pixmap ();
1218#endif
1219 } 1169 }
1220 1170
1221 if (fix_screen || old_height == 0) 1171 if (fix_screen || old_height == 0)
1222 {
1223 int curr_screen = -1;
1224 int old_ncol = prev_ncol;
1225
1226 /* scr_reset only works on the primary screen */
1227 if (old_height) /* this is not the first time through */
1228 {
1229 unsigned int ocol = ncol;
1230 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1231 curr_screen = scr_change_screen (PRIMARY);
1232 ncol = ocol;
1233 }
1234
1235 scr_reset (); 1172 scr_reset ();
1236 1173
1237 if (curr_screen >= 0) /* this is not the first time through */ 1174 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1238 { 1175 //scr_touch (false);
1239 scr_change_screen (curr_screen);
1240 selection_check (old_ncol != ncol ? 4 : 0);
1241 }
1242 }
1243 1176
1244 old_width = szHint.width; 1177#ifdef HAVE_BG_PIXMAP
1245 old_height = szHint.height; 1178// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1246 1179// if (bgPixmap.pixmap)
1247#ifdef XPM_BACKGROUND
1248 if (pixmap)
1249 scr_touch (false); 1180// scr_touch (false);
1250#endif 1181#endif
1251 1182
1252#ifdef USE_XIM 1183#ifdef USE_XIM
1253 IMSetStatusPosition (); 1184 IMSetPosition ();
1254#endif 1185#endif
1255} 1186}
1256 1187
1257/* 1188/*
1258 * Set the width/height of the vt window in characters. Units are pixels. 1189 * Set the width/height of the vt window in characters. Units are pixels.
… …
1263{ 1194{
1264 XWindowAttributes wattr; 1195 XWindowAttributes wattr;
1265 1196
1266 if (newwidth == 0 || newheight == 0) 1197 if (newwidth == 0 || newheight == 0)
1267 { 1198 {
1268 XGetWindowAttributes (display->display, display->root, &wattr); 1199 XGetWindowAttributes (dpy, display->root, &wattr);
1269 1200
1270 if (newwidth == 0) 1201 if (newwidth == 0)
1271 newwidth = wattr.width - szHint.base_width; 1202 newwidth = wattr.width - szHint.base_width;
1272 if (newheight == 0) 1203 if (newheight == 0)
1273 newheight = wattr.height - szHint.base_height; 1204 newheight = wattr.height - szHint.base_height;
… …
1287#ifdef USE_XIM 1218#ifdef USE_XIM
1288 1219
1289void 1220void
1290rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1221rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1291{ 1222{
1292 fg = pix_colors[Color_fg]; 1223 fg = pix_colors [Color_fg];
1293 bg = pix_colors[Color_bg]; 1224 bg = pix_colors [Color_bg];
1294} 1225}
1295 1226
1296void 1227void
1297rxvt_term::im_set_size (XRectangle &size) 1228rxvt_term::im_set_size (XRectangle &size)
1298{ 1229{
… …
1335 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1266 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1336 1267
1337 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1268 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1338 *p = '\0'; 1269 *p = '\0';
1339 1270
1340 atom = XInternAtom (display->display, server, False); 1271 atom = XInternAtom (dpy, server, False);
1341 win = XGetSelectionOwner (display->display, atom); 1272 win = XGetSelectionOwner (dpy, atom);
1342 1273
1343 if (win != None) 1274 if (win != None)
1344 return True; 1275 return True;
1345 } 1276 }
1346 1277
… …
1353 XPoint nspot; 1284 XPoint nspot;
1354 XVaNestedList preedit_attr; 1285 XVaNestedList preedit_attr;
1355 1286
1356 if (!Input_Context 1287 if (!Input_Context
1357 || !focus 1288 || !focus
1358 || !(input_style & XIMPreeditPosition)) 1289 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1359 return; 1290 return;
1360 1291
1361 im_set_position (nspot); 1292 im_set_position (nspot);
1362 1293
1363 if (nspot.x == spot.x && nspot.y == spot.y) 1294 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1382 input_method = 0; 1313 input_method = 0;
1383 } 1314 }
1384 1315
1385 Input_Context = 0; 1316 Input_Context = 0;
1386} 1317}
1318
1319#ifdef ENABLE_XIM_ONTHESPOT
1320
1321static void
1322xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1323{
1324 ((rxvt_term *)client_data)->make_current ();
1325 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1326}
1327
1328static void
1329xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1330{
1331 ((rxvt_term *)client_data)->make_current ();
1332 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1333}
1334
1335static void
1336xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1337{
1338 rxvt_term *term = (rxvt_term *)client_data;
1339 XIMText *text = call_data->text;
1340
1341 term->make_current ();
1342
1343 if (text)
1344 {
1345 void *str;
1346
1347 if (!text->encoding_is_wchar && text->string.multi_byte)
1348 {
1349 // of course, X makes it ugly again
1350 if (term->rs[Rs_imLocale])
1351 SET_LOCALE (term->rs[Rs_imLocale]);
1352
1353 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1354 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1355
1356 if (term->rs[Rs_imLocale])
1357 SET_LOCALE (term->locale);
1358 }
1359 else
1360 str = (void *)text->string.wide_char;
1361
1362 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1363 DT_INT, call_data->caret,
1364 DT_INT, call_data->chg_first,
1365 DT_INT, call_data->chg_length,
1366 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1367 DT_WCS_LEN, str, str ? (int)text->length : 0,
1368 DT_END));
1369 }
1370 else
1371 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1372 DT_INT, call_data->caret,
1373 DT_INT, call_data->chg_first,
1374 DT_INT, call_data->chg_length,
1375 DT_END));
1376}
1377
1378#if 0
1379static void
1380xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1381{
1382 ((rxvt_term *)client_data)->make_current ();
1383 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1384 DT_INT, call_data->position,
1385 DT_INT, call_data->direction,
1386 DT_INT, call_data->style,
1387 DT_END));
1388}
1389#endif
1390
1391#endif
1387 1392
1388/* 1393/*
1389 * Try to open a XIM with the current modifiers, then see if we can 1394 * Try to open a XIM with the current modifiers, then see if we can
1390 * open a suitable preedit type 1395 * open a suitable preedit type
1391 */ 1396 */
… …
1398 XRectangle rect, status_rect, needed_rect; 1403 XRectangle rect, status_rect, needed_rect;
1399 unsigned long fg, bg; 1404 unsigned long fg, bg;
1400 const char *p; 1405 const char *p;
1401 char **s; 1406 char **s;
1402 XIMStyles *xim_styles; 1407 XIMStyles *xim_styles;
1408#ifdef ENABLE_XIM_ONTHESPOT
1409 XIMCallback xcb[4];
1410#endif
1403 1411
1404 set_environ (envv); 1412 set_environ (envv);
1405 1413
1406 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1414 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1407 return false; 1415 return false;
1408 1416
1409 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1410 input_method = display->get_xim (locale, modifiers); 1417 input_method = display->get_xim (locale, modifiers);
1411 if (input_method == NULL) 1418 if (input_method == NULL)
1412 return false; 1419 return false;
1413 1420
1414 xim = input_method->xim; 1421 xim = input_method->xim;
… …
1434 s = rxvt_splitcommastring (p); 1441 s = rxvt_splitcommastring (p);
1435 1442
1436 for (i = found = 0; !found && s[i]; i++) 1443 for (i = found = 0; !found && s[i]; i++)
1437 { 1444 {
1438 if (!strcmp (s[i], "OverTheSpot")) 1445 if (!strcmp (s[i], "OverTheSpot"))
1439 input_style = (XIMPreeditPosition | XIMStatusNothing); 1446 input_style = XIMPreeditPosition | XIMStatusNothing;
1440 else if (!strcmp (s[i], "OffTheSpot")) 1447 else if (!strcmp (s[i], "OffTheSpot"))
1441 input_style = (XIMPreeditArea | XIMStatusArea); 1448 input_style = XIMPreeditArea | XIMStatusArea;
1442 else if (!strcmp (s[i], "Root")) 1449 else if (!strcmp (s[i], "Root"))
1443 input_style = (XIMPreeditNothing | XIMStatusNothing); 1450 input_style = XIMPreeditNothing | XIMStatusNothing;
1444 else if (!strcmp (s[i], "None")) 1451 else if (!strcmp (s[i], "None"))
1445 input_style = (XIMPreeditNone | XIMStatusNone); 1452 input_style = XIMPreeditNone | XIMStatusNone;
1453#ifdef ENABLE_XIM_ONTHESPOT
1454 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1455 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1456#endif
1457 else
1458 input_style = XIMPreeditNothing | XIMStatusNothing;
1446 1459
1447 for (j = 0; j < xim_styles->count_styles; j++) 1460 for (j = 0; j < xim_styles->count_styles; j++)
1448 if (input_style == xim_styles->supported_styles[j]) 1461 if (input_style == xim_styles->supported_styles[j])
1449 { 1462 {
1450 rxvt_freecommastring (s); 1463 rxvt_freecommastring (s);
… …
1488 "*", 1501 "*",
1489 fheight, 1502 fheight,
1490 fheight + 1, fheight - 1, 1503 fheight + 1, fheight - 1,
1491 fheight - 2, fheight + 2); 1504 fheight - 2, fheight + 2);
1492 1505
1493 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1506 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1494 &missing_charset_list, &missing_charset_count, &def_string); 1507 &missing_charset_list, &missing_charset_count, &def_string);
1495 1508
1496 if (missing_charset_list) 1509 if (missing_charset_list)
1497 XFreeStringList (missing_charset_list); 1510 XFreeStringList (missing_charset_list);
1498 1511
… …
1539 XNBackground, bg, 1552 XNBackground, bg,
1540 XNArea, &status_rect, 1553 XNArea, &status_rect,
1541 XNFontSet, fs, 1554 XNFontSet, fs,
1542 NULL); 1555 NULL);
1543 } 1556 }
1557#if ENABLE_XIM_ONTHESPOT
1558 else if (input_style & XIMPreeditCallbacks)
1559 {
1560 im_set_position (spot);
1561
1562 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1563 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1564 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1565# if 0
1566 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1567# endif
1568
1569 preedit_attr = XVaCreateNestedList (0,
1570 XNSpotLocation, &spot,
1571 XNPreeditStartCallback, &xcb[0],
1572 XNPreeditDoneCallback , &xcb[1],
1573 XNPreeditDrawCallback , &xcb[2],
1574# if 0
1575 XNPreeditCaretCallback, &xcb[3],
1576# endif
1577 NULL);
1578 }
1579#endif
1544 1580
1545 Input_Context = XCreateIC (xim, 1581 Input_Context = XCreateIC (xim,
1546 XNInputStyle, input_style, 1582 XNInputStyle, input_style,
1547 XNClientWindow, vt, 1583 XNClientWindow, vt,
1548 XNFocusWindow, parent[0], 1584 XNFocusWindow, parent[0],
… …
1550 preedit_attr, 1586 preedit_attr,
1551 status_attr ? XNStatusAttributes : NULL, 1587 status_attr ? XNStatusAttributes : NULL,
1552 status_attr, NULL); 1588 status_attr, NULL);
1553 1589
1554 if (preedit_attr) XFree (preedit_attr); 1590 if (preedit_attr) XFree (preedit_attr);
1555 if (status_attr) XFree (status_attr); 1591 if (status_attr) XFree (status_attr);
1556 if (fs) XFreeFontSet (display->display, fs); 1592 if (fs) XFreeFontSet (dpy, fs);
1557 1593
1558 if (Input_Context == NULL) 1594 if (Input_Context == NULL)
1559 { 1595 {
1560 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1596 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1561 im_destroy (); 1597 im_destroy ();
1562 return false; 1598 return false;
1563 } 1599 }
1564 1600
1565 if (input_style & XIMPreeditArea) 1601#if 0
1602 // unfortunately, only the focus window is used by XIM, hard to fix
1603 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1604 vt_select_input ();
1605#endif
1606
1566 IMSetStatusPosition (); 1607 IMSetPosition ();
1567 1608
1568 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1569 return true; 1609 return true;
1570} 1610}
1571 1611
1572void 1612void
1573rxvt_term::im_cb () 1613rxvt_term::im_cb ()
… …
1579 1619
1580 make_current (); 1620 make_current ();
1581 1621
1582 im_destroy (); 1622 im_destroy ();
1583 1623
1584 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1585 if (Input_Context) 1624 if (Input_Context)
1586 return; 1625 return;
1587 1626
1588#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1627#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1589 if (rs[Rs_imLocale]) 1628 if (rs[Rs_imLocale])
… …
1631 SET_LOCALE (locale); 1670 SET_LOCALE (locale);
1632#endif 1671#endif
1633} 1672}
1634 1673
1635void 1674void
1636rxvt_term::IMSetStatusPosition () 1675rxvt_term::IMSetPosition ()
1637{ 1676{
1638 XRectangle preedit_rect, status_rect, *needed_rect; 1677 XRectangle preedit_rect, status_rect, *needed_rect;
1639 XVaNestedList preedit_attr, status_attr; 1678 XVaNestedList preedit_attr, status_attr;
1640 1679
1641 if (!Input_Context 1680 if (!Input_Context
1642 || !focus 1681 || !focus
1643 || !(input_style & XIMPreeditArea) 1682 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1644 || !IMisRunning ()) 1683 || !IMisRunning ())
1645 return; 1684 return;
1646 1685
1686 if (input_style & XIMPreeditPosition)
1687 {
1688 im_set_size (preedit_rect);
1689 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1690
1691 XSetICValues (Input_Context,
1692 XNPreeditAttributes, preedit_attr, NULL);
1693 }
1694 else
1695 {
1647 /* Getting the necessary width of preedit area */ 1696 /* Getting the necessary width of preedit area */
1648 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1697 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1649 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1698 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1650 XFree (status_attr); 1699 XFree (status_attr);
1651 1700
1652 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1701 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1653 XFree (needed_rect); 1702 XFree (needed_rect);
1654 1703
1655 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1704 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1656 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1705 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1657 1706
1658 XSetICValues (Input_Context, 1707 XSetICValues (Input_Context,
1659 XNPreeditAttributes, preedit_attr, 1708 XNPreeditAttributes, preedit_attr,
1660 XNStatusAttributes, status_attr, NULL); 1709 XNStatusAttributes, status_attr,
1710 NULL);
1661 1711
1712 XFree (status_attr);
1713 }
1714
1662 XFree (preedit_attr); 1715 XFree (preedit_attr);
1663 XFree (status_attr);
1664} 1716}
1665#endif /* USE_XIM */ 1717#endif /* USE_XIM */
1666 1718
1667/*----------------------------------------------------------------------*/ 1719void
1668rxvt_t rxvt_current_term; 1720rxvt_term::get_window_origin (int &x, int &y)
1721{
1722 Window cr;
1723 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1724/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1725}
1726
1727Pixmap
1728rxvt_term::get_pixmap_property (int prop_id)
1729{
1730 if (prop_id > 0 && prop_id < NUM_XA)
1731 if (xa[prop_id])
1732 {
1733 int aformat;
1734 unsigned long nitems, bytes_after;
1735 Atom atype;
1736 unsigned char *prop = NULL;
1737 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1738 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1739 &nitems, &bytes_after, &prop);
1740 if (result == Success && prop && atype == XA_PIXMAP)
1741 {
1742 return *(Pixmap *)prop;
1743 }
1744 }
1745 return None;
1746}
1747
1748#ifdef HAVE_BG_PIXMAP
1749# if TRACE_PIXMAPS
1750# undef update_background
1751int rxvt_term::trace_update_background (const char* file, int line)
1752{
1753 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1754 update_background ();
1755}
1756# endif
1757int
1758rxvt_term::update_background ()
1759{
1760 bgPixmap.invalidate ();
1761
1762 /* no chance of real time refresh if we are blurring! */
1763 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1764 bgPixmap.render ();
1765 else
1766 {
1767 update_background_ev.stop ();
1768
1769 if (!bgPixmap.need_client_side_rendering())
1770 update_background_ev.start (.05);
1771 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1772 update_background_ev.start (.20); /* very slow !!! */
1773 else
1774 update_background_ev.start (.07);
1775 }
1776
1777 return 0;
1778}
1779
1780void
1781rxvt_term::update_background_cb (ev::timer &w, int revents)
1782{
1783 bgPixmap.render ();
1784}
1785
1786#endif /* HAVE_BG_PIXMAP */
1669 1787
1670/*----------------------- end-of-file (C source) -----------------------*/ 1788/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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