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.269 by root, Tue Dec 4 14:50:42 2007 UTC vs.
Revision 1.332 by sf-exg, Wed Jul 28 17:56:16 2010 UTC

11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <cassert>
40#include <csignal> 42#include <csignal>
41#include <cstring> 43#include <cstring>
42 44
43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 45#include <termios.h>
45#endif
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE 51# ifdef HAVE_SETLOCALE
52# include <clocale> 52# include <clocale>
53# endif 53# endif
54#endif 54#endif
55 55
56struct termios rxvt_term::def_tio;
56vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
57 58
58// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
59rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
60 61
103 { 104 {
104 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
105 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
106 } 107 }
107 108
108 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
109 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
110 { 111 {
111 if (cc->c1 == c1 && cc->c2 == c2) 112 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 113 return COMPOSE_LO + (cc - v.begin ());
113 } 114 }
152 153
153} 154}
154#endif 155#endif
155 156
156rxvt_term::rxvt_term () 157rxvt_term::rxvt_term ()
157 : 158{
158#if HAVE_BG_PIXMAP 159#if HAVE_BG_PIXMAP
159 update_background_ev(this, &rxvt_term::update_background_cb), 160 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
160#endif 161#endif
161#ifdef CURSOR_BLINK 162#ifdef CURSOR_BLINK
162 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 163 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
163#endif 164#endif
164#ifdef TEXT_BLINK 165#ifdef TEXT_BLINK
165 text_blink_ev (this, &rxvt_term::text_blink_cb), 166 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
166#endif 167#endif
167#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 168#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
168 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 169 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
169#endif 170#endif
170#ifdef SELECTION_SCROLLING 171#ifdef SELECTION_SCROLLING
171 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 172 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
172#endif 173#endif
173#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
174 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 175 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
176#endif
177#if ENABLE_TRANSPARENCY || ENABLE_PERL
178 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
179#endif
180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
181#ifdef USE_XIM
182 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
175#endif 183#endif
176#ifdef POINTER_BLANK 184#ifdef POINTER_BLANK
177 pointer_ev (this, &rxvt_term::pointer_cb), 185 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
178#endif 186#endif
179#ifndef NO_BELL 187#ifndef NO_BELL
180 bell_ev (this, &rxvt_term::bell_cb), 188 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
181#endif 189#endif
182 child_ev (this, &rxvt_term::child_cb), 190 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
183 prepare_ev (this, &rxvt_term::prepare_cb), 191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
184 flush_ev (this, &rxvt_term::flush_cb), 192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
185 destroy_ev (this, &rxvt_term::destroy_cb), 193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
186 pty_ev (this, &rxvt_term::pty_cb), 194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
187 incr_ev (this, &rxvt_term::incr_cb) 195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
188{ 196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
189#if ENABLE_TRANSPARENCY || ENABLE_PERL
190 callback_set (rootwin_ev , this, rxvt_term, rootwin_cb);
191#endif
192#ifdef HAVE_SCROLLBARS
193 callback_set (scrollbar_ev, this, rxvt_term, x_cb);
194#endif
195#ifdef USE_XIM
196 callback_set (im_ev , this, rxvt_term, im_cb);
197#endif
198 callback_set (termwin_ev , this, rxvt_term, x_cb);
199 callback_set (vt_ev , this, rxvt_term, x_cb);
200 197
201 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
202 199
203 termlist.push_back (this); 200 termlist.push_back (this);
204 201
230 if (fontset[i] != fontset[0]) 227 if (fontset[i] != fontset[0])
231 delete fontset[i]; 228 delete fontset[i];
232#endif 229#endif
233 delete fontset[0]; 230 delete fontset[0];
234 231
232#ifdef HAVE_BG_PIXMAP
233 bgPixmap.destroy ();
234#endif
235#ifdef HAVE_AFTERIMAGE
236 if (asv)
237 destroy_asvisual (asv, 0);
238 if (asimman)
239 destroy_image_manager (asimman, 0);
240#endif
241
235 if (display) 242 if (display)
236 { 243 {
237 selection_clear (); 244 selection_clear ();
245 selection_clear (true);
238 246
239#ifdef USE_XIM 247#ifdef USE_XIM
240 im_destroy (); 248 im_destroy ();
241#endif 249#endif
242#ifdef XTERM_SCROLLBAR 250 scrollBar.destroy ();
243 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
244 if (ShadowGC) XFreeGC (dpy, ShadowGC);
245#endif
246#ifdef PLAIN_SCROLLBAR
247 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
248#endif
249#ifdef NEXT_SCROLLBAR
250 if (blackGC) XFreeGC (dpy, blackGC);
251 if (whiteGC) XFreeGC (dpy, whiteGC);
252 if (grayGC) XFreeGC (dpy, grayGC);
253 if (darkGC) XFreeGC (dpy, darkGC);
254 if (stippleGC) XFreeGC (dpy, stippleGC);
255 if (dimple) XFreePixmap (dpy, dimple);
256 if (upArrow) XFreePixmap (dpy, upArrow);
257 if (downArrow) XFreePixmap (dpy, downArrow);
258 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
259 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
260#endif
261#ifdef RXVT_SCROLLBAR
262 if (topShadowGC) XFreeGC (dpy, topShadowGC);
263 if (botShadowGC) XFreeGC (dpy, botShadowGC);
264 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
265#endif
266 if (gc) XFreeGC (dpy, gc); 251 if (gc) XFreeGC (dpy, gc);
267 252
268 delete drawable; 253 delete drawable;
269 // destroy all windows 254 // destroy all windows
270 if (parent[0]) 255 if (parent[0])
278 pix_colors_unfocused [i].free (this); 263 pix_colors_unfocused [i].free (this);
279#endif 264#endif
280 } 265 }
281 266
282 clear (); 267 clear ();
283 }
284 268
285 delete [] pix_colors_focused; 269 display->flush (); /* ideally .put should do this */
286#if OFF_FOCUS_FADING
287 delete [] pix_colors_unfocused;
288#endif
289
290#ifdef HAVE_BG_PIXMAP
291 bgPixmap.destroy ();
292#endif
293 displays.put (display); 270 displays.put (display);
271 }
294 272
295 scr_release (); 273 scr_release ();
296 274
297 /* clear all resources */ 275 /* clear all resources */
298 for (int i = 0; i < allocated.size (); i++) 276 for (int i = 0; i < allocated.size (); i++)
299 free (allocated [i]); 277 free (allocated [i]);
300 278
301 free (selection.text); 279 free (selection.text);
280 free (selection.clip_text);
302 // TODO: manage env vars in child only(!) 281 // TODO: manage env vars in child only(!)
303 free (env_display); 282 free (env_display);
304 free (env_term); 283 free (env_term);
305 free (locale); 284 free (locale);
306 free (v_buffer); 285 free (v_buffer);
330} 309}
331 310
332void 311void
333rxvt_term::destroy () 312rxvt_term::destroy ()
334{ 313{
335 if (destroy_ev.active) 314 if (destroy_ev.is_active ())
336 return; 315 return;
337 316
338 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
339 318
340#if ENABLE_OVERLAY 319#if ENABLE_OVERLAY
344 if (display) 323 if (display)
345 { 324 {
346#if USE_XIM 325#if USE_XIM
347 im_ev.stop (display); 326 im_ev.stop (display);
348#endif 327#endif
349#if HAVE_SCROLLBARS
350 scrollbar_ev.stop (display); 328 scrollbar_ev.stop (display);
351#endif
352#if ENABLE_TRANSPARENCY || ENABLE_PERL 329#if ENABLE_TRANSPARENCY || ENABLE_PERL
353 rootwin_ev.stop (display); 330 rootwin_ev.stop (display);
354#endif 331#endif
355 incr_ev.stop (); 332 incr_ev.stop ();
356 termwin_ev.stop (display); 333 termwin_ev.stop (display);
357 vt_ev.stop (display); 334 vt_ev.stop (display);
358 } 335 }
359 336
360 prepare_ev.stop (); 337 flush_ev.stop ();
361 pty_ev.stop (); 338 pty_ev.stop ();
362#ifdef CURSOR_BLINK 339#ifdef CURSOR_BLINK
363 cursor_blink_ev.stop (); 340 cursor_blink_ev.stop ();
364#endif 341#endif
365#ifdef TEXT_BLINK 342#ifdef TEXT_BLINK
408 char mesg[BUFSIZ]; 385 char mesg[BUFSIZ];
409 char number[32]; 386 char number[32];
410 char *mtype = "XlibMessage"; 387 char *mtype = "XlibMessage";
411 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
412 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
413 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 390 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
414 rxvt_warn ("%s: %s\n", mesg, buffer); 391 rxvt_warn ("%s: %s\n", mesg, buffer);
415 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
417 sprintf(number, "%d", event->request_code); 394 sprintf(number, "%d", event->request_code);
418 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
419 rxvt_warn ("(which is %s)\n", buffer); 396 rxvt_warn ("(which is %s)\n", buffer);
420 if (event->request_code >= 128) { 397 if (event->request_code >= 128) {
421 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
422 mesg, BUFSIZ); 399 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
424 } 401 }
425 if ((event->error_code == BadWindow) || 402 if ((event->error_code == BadWindow) ||
426 (event->error_code == BadPixmap) || 403 (event->error_code == BadPixmap) ||
427 (event->error_code == BadCursor) || 404 (event->error_code == BadCursor) ||
428 (event->error_code == BadFont) || 405 (event->error_code == BadFont) ||
429 (event->error_code == BadDrawable) || 406 (event->error_code == BadDrawable) ||
430 (event->error_code == BadColor) || 407 (event->error_code == BadColor) ||
431 (event->error_code == BadGC) || 408 (event->error_code == BadGC) ||
432 (event->error_code == BadIDChoice) || 409 (event->error_code == BadIDChoice) ||
433 (event->error_code == BadValue) || 410 (event->error_code == BadValue) ||
434 (event->error_code == BadAtom)) { 411 (event->error_code == BadAtom)) {
435 if (event->error_code == BadValue) 412 if (event->error_code == BadValue)
436 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
437 mesg, BUFSIZ); 414 mesg, BUFSIZ);
438 else if (event->error_code == BadAtom) 415 else if (event->error_code == BadAtom)
439 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
440 mesg, BUFSIZ); 417 mesg, BUFSIZ);
441 else 418 else
442 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
443 mesg, BUFSIZ); 420 mesg, BUFSIZ);
444 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
445 } 422 }
446 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
447 mesg, BUFSIZ); 424 mesg, BUFSIZ);
448 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
449} 426}
450#endif 427#endif
451 428
452int 429int
475 DisplayString (display)); 452 DisplayString (display));
476 rxvt_emergency_cleanup (); 453 rxvt_emergency_cleanup ();
477 _exit (EXIT_FAILURE); 454 _exit (EXIT_FAILURE);
478} 455}
479 456
480/*----------------------------------------------------------------------*/
481bool
482rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
483{
484 this->envv = envv;
485
486 SET_R (this);
487 set_locale ("");
488 set_environ (envv); // few things in X do not call setlocale :(
489
490 if (!init_vars ())
491 return false;
492
493 init_secondary ();
494
495 const char **cmd_argv = init_resources (argc, argv);
496
497#ifdef KEYSYM_RESOURCE
498 keyboard->register_done ();
499#endif
500
501#ifdef HAVE_SCROLLBARS
502 if (option (Opt_scrollBar))
503 scrollBar.setIdle (); /* set existence for size calculations */
504#endif
505
506 pty = ptytty::create ();
507
508 create_windows (argc, argv);
509
510 init_xlocale ();
511
512 scr_reset (); // initialize screen
513
514#if 0
515 XSynchronize (dpy, True);
516#endif
517
518#ifdef HAVE_SCROLLBARS
519 if (option (Opt_scrollBar))
520 resize_scrollbar (); /* create and map scrollbar */
521#endif
522#ifdef HAVE_BG_PIXMAP
523 {
524 bgPixmap.set_target (this);
525
526#ifdef ENABLE_TRANSPARENCY
527 if (option (Opt_transparent))
528 {
529 bgPixmap.set_transparent ();
530#ifdef HAVE_AFTERIMAGE
531 if (rs [Rs_blurradius])
532 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
533#endif
534 if (ISSET_PIXCOLOR (Color_tint))
535 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
536 if (rs [Rs_shade])
537 bgPixmap.set_shade (rs [Rs_shade]);
538
539 bgPixmap.set_root_pixmap ();
540 XSelectInput (dpy, display->root, PropertyChangeMask);
541 rootwin_ev.start (display, display->root);
542 }
543#endif
544
545#ifdef BG_IMAGE_FROM_FILE
546 if (rs[Rs_backgroundPixmap] != NULL)
547 {
548 const char *p = rs[Rs_backgroundPixmap];
549
550 if ((p = strchr (p, ';')) != NULL)
551 {
552 p++;
553 bgPixmap.set_geometry (p);
554 }
555 else
556 bgPixmap.set_defaultGeometry ();
557
558 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
559 if (!bgPixmap.window_position_sensitive ())
560 update_background ();
561 }
562#endif
563 }
564#endif
565
566#if ENABLE_PERL
567 rootwin_ev.start (display, display->root);
568#endif
569
570 set_colorfgbg ();
571
572 init_command (cmd_argv);
573
574 free (cmd_argv);
575
576 if (pty->pty >= 0)
577 pty_ev.start (pty->pty, ev::READ);
578
579 prepare_ev.start ();
580
581 HOOK_INVOKE ((this, HOOK_START, DT_END));
582
583#if ENABLE_XEMBED
584 if (rs[Rs_embed])
585 {
586 long info[2] = { 0, XEMBED_MAPPED };
587
588 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
589 32, PropModeReplace, (unsigned char *)&info, 2);
590 }
591#endif
592
593 XMapWindow (dpy, vt);
594 XMapWindow (dpy, parent[0]);
595
596 return true;
597}
598
599static struct sig_handlers 457static struct sig_handlers
600{ 458{
601 ev::sig sw_term, sw_int; 459 ev::sig sw_term, sw_int;
602 460
603 /* 461 /*
604 * Catch a fatal signal and tidy up before quitting 462 * Catch a fatal signal and tidy up before quitting
605 */ 463 */
606 void
607 sig_term (ev::sig &w, int revents) 464 void sig_term (ev::sig &w, int revents);
465
466 sig_handlers ()
608 { 467 {
609 rxvt_emergency_cleanup (); 468 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
610 w.stop ();
611 kill (getpid (), w.signum);
612 }
613
614 sig_handlers ()
615 : sw_term (this, &sig_handlers::sig_term),
616 sw_int (this, &sig_handlers::sig_term) 469 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
617 {
618 } 470 }
619} sig_handlers; 471} sig_handlers;
620 472
473void
474sig_handlers::sig_term (ev::sig &w, int revents)
475{
476 rxvt_emergency_cleanup ();
477 w.stop ();
478 kill (getpid (), w.signum);
479}
480
481static void
482rxvt_get_ttymode (struct termios *tio)
483{
484 if (tcgetattr (STDIN_FILENO, tio) < 0)
485 memset (tio, 0, sizeof (struct termios));
486
487 for (int i = 0; i < NCCS; i++)
488 tio->c_cc[i] = VDISABLE;
489
490 tio->c_cc[VINTR] = CINTR;
491 tio->c_cc[VQUIT] = CQUIT;
492 tio->c_cc[VERASE] = CERASE;
493#ifdef VERASE2
494 tio->c_cc[VERASE2] = CERASE2;
495#endif
496 tio->c_cc[VKILL] = CKILL;
497 tio->c_cc[VEOF] = CEOF;
498 tio->c_cc[VSTART] = CSTART;
499 tio->c_cc[VSTOP] = CSTOP;
500 tio->c_cc[VSUSP] = CSUSP;
501# ifdef VDSUSP
502 tio->c_cc[VDSUSP] = CDSUSP;
503# endif
504# ifdef VREPRINT
505 tio->c_cc[VREPRINT] = CRPRNT;
506# endif
507# ifdef VDISCRD
508 tio->c_cc[VDISCRD] = CFLUSH;
509# endif
510# ifdef VWERSE
511 tio->c_cc[VWERSE] = CWERASE;
512# endif
513# ifdef VLNEXT
514 tio->c_cc[VLNEXT] = CLNEXT;
515# endif
516
517# if VMIN != VEOF
518 tio->c_cc[VMIN] = 1;
519# endif
520# if VTIME != VEOL
521 tio->c_cc[VTIME] = 0;
522# endif
523
524 /* input modes */
525 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
526# ifdef IMAXBEL
527 | IMAXBEL
528# endif
529 | IXON);
530
531 /* output modes */
532 tio->c_oflag = (OPOST | ONLCR);
533
534 /* control modes */
535 tio->c_cflag = (CS8 | CREAD);
536
537 /* local modes */
538 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
539# if defined (ECHOCTL) && defined (ECHOKE)
540 | ECHOCTL | ECHOKE
541# endif
542 | ECHOE | ECHOK);
543}
544
621char **rxvt_environ; // startup environment 545char **rxvt_environ; // startup environment
622 546
623void 547void
624rxvt_init () 548rxvt_init ()
625{ 549{
550 assert (("fontMask must not overlap other RS masks",
551 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
552
553 rxvt_get_ttymode (&rxvt_term::def_tio);
554
555 // get rid of stdin/stdout as we don't need them, to free resources
556 dup2 (STDERR_FILENO, STDIN_FILENO);
557 dup2 (STDERR_FILENO, STDOUT_FILENO);
558
626 ptytty::init (); 559 ptytty::init ();
627 560
628 if (!ev_default_loop (0)) 561 if (!ev_default_loop (0))
629 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 562 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
630 563
633 signal (SIGHUP, SIG_IGN); 566 signal (SIGHUP, SIG_IGN);
634 signal (SIGPIPE, SIG_IGN); 567 signal (SIGPIPE, SIG_IGN);
635 568
636 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 569 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
637 sig_handlers.sw_int.start (SIGINT); ev_unref (); 570 sig_handlers.sw_int.start (SIGINT); ev_unref ();
638
639 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
640 /* signal (SIGURG, SIG_DFL); */
641 571
642 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 572 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
643 // TODO: handle this with exceptions and tolerate the memory loss 573 // TODO: handle this with exceptions and tolerate the memory loss
644 XSetIOErrorHandler (rxvt_xioerror_handler); 574 XSetIOErrorHandler (rxvt_xioerror_handler);
645 575
646 XrmInitialize (); 576 XrmInitialize ();
647}
648
649/* ------------------------------------------------------------------------- *
650 * MEMORY ALLOCATION WRAPPERS *
651 * ------------------------------------------------------------------------- */
652void *
653rxvt_malloc (size_t size)
654{
655 void *p = malloc (size);
656
657 if (!p)
658 rxvt_fatal ("memory allocation failure. aborting.\n");
659
660 return p;
661}
662
663void *
664rxvt_calloc (size_t number, size_t size)
665{
666 void *p = calloc (number, size);
667
668 if (!p)
669 rxvt_fatal ("memory allocation failure. aborting.\n");
670
671 return p;
672}
673
674void *
675rxvt_realloc (void *ptr, size_t size)
676{
677 void *p = realloc (ptr, size);
678
679 if (!p)
680 rxvt_fatal ("memory allocation failure. aborting.\n");
681
682 return p;
683} 577}
684 578
685/*----------------------------------------------------------------------*/ 579/*----------------------------------------------------------------------*/
686/* 580/*
687 * window size/position calculations for XSizeHint and other storage. 581 * window size/position calculations for XSizeHint and other storage.
689 */ 583 */
690void 584void
691rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 585rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
692{ 586{
693 short recalc_x, recalc_y; 587 short recalc_x, recalc_y;
694 int x, y, sb_w, flags; 588 int x, y, flags;
695 unsigned int w, h; 589 unsigned int w, h;
696 unsigned int max_width, max_height; 590 unsigned int max_width, max_height;
697 591
698 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 592 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
699 szHint.win_gravity = NorthWestGravity; 593 szHint.win_gravity = NorthWestGravity;
709 if (rs[Rs_geometry]) 603 if (rs[Rs_geometry])
710 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 604 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
711 605
712 if (flags & WidthValue) 606 if (flags & WidthValue)
713 { 607 {
608 if (!w)
609 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
610
714 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 611 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
715 szHint.flags |= USSize; 612 szHint.flags |= USSize;
716 } 613 }
717 614
718 if (flags & HeightValue) 615 if (flags & HeightValue)
719 { 616 {
617 if (!h)
618 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
619
720 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 620 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
721 szHint.flags |= USSize; 621 szHint.flags |= USSize;
722 } 622 }
723 623
724 if (flags & XValue) 624 if (flags & XValue)
725 { 625 {
756 max_width = MAX_COLS * fwidth; 656 max_width = MAX_COLS * fwidth;
757 max_height = MAX_ROWS * fheight; 657 max_height = MAX_ROWS * fheight;
758 658
759 szHint.base_width = szHint.base_height = 2 * int_bwidth; 659 szHint.base_width = szHint.base_height = 2 * int_bwidth;
760 660
761 sb_w = 0;
762 window_vt_x = window_vt_y = int_bwidth; 661 window_vt_x = window_vt_y = int_bwidth;
763 662
764 if (scrollBar.state) 663 if (scrollBar.state)
765 { 664 {
766 sb_w = scrollbar_TotalWidth (); 665 int sb_w = scrollBar.total_width ();
767 szHint.base_width += sb_w; 666 szHint.base_width += sb_w;
768 667
769 if (!option (Opt_scrollBar_right)) 668 if (!option (Opt_scrollBar_right))
770 window_vt_x += sb_w; 669 window_vt_x += sb_w;
771 } 670 }
795 { 694 {
796 min_it (height, max_height); 695 min_it (height, max_height);
797 szHint.height = szHint.base_height + height; 696 szHint.height = szHint.base_height + height;
798 } 697 }
799 698
800 if (scrollBar.state && option (Opt_scrollBar_right))
801 window_sb_x = szHint.width - sb_w;
802
803 if (recalc_x) 699 if (recalc_x)
804 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 700 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
805 701
806 if (recalc_y) 702 if (recalc_y)
807 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 703 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
808 704
809 ncol = width / fwidth; 705 ncol = width / fwidth;
810 nrow = height / fheight; 706 nrow = height / fheight;
811} 707}
812 708
813/*----------------------------------------------------------------------*/ 709/*----------------------------------------------------------------------*/
814/* 710/*
825 721
826 ws.ws_col = ncol; 722 ws.ws_col = ncol;
827 ws.ws_row = nrow; 723 ws.ws_row = nrow;
828 ws.ws_xpixel = width; 724 ws.ws_xpixel = width;
829 ws.ws_ypixel = height; 725 ws.ws_ypixel = height;
830 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 726 ioctl (pty->pty, TIOCSWINSZ, &ws);
831 727
832#if 0 728#if 0
833 // TIOCSWINSZ is supposed to do this automatically and correctly 729 // TIOCSWINSZ is supposed to do this automatically and correctly
834 if (cmd_pid) /* force through to the command */ 730 if (cmd_pid) /* force through to the command */
835 kill (-cmd_pid, SIGWINCH); 731 kill (-cmd_pid, SIGWINCH);
836#endif 732#endif
837} 733}
838 734
865#endif 761#endif
866 762
867 delete fontset[0]; 763 delete fontset[0];
868 fontset[0] = fs; 764 fontset[0] = fs;
869 765
870 prop = (*fs)[1]->properties (); 766 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
871 prop.height += lineSpace; 767 prop.height += lineSpace;
768 prop.width += letterSpace;
872 769
873 fs->set_prop (prop, false); 770 fs->set_prop (prop, false);
874 771
875 fwidth = prop.width; 772 fwidth = prop.width;
876 fheight = prop.height; 773 fheight = prop.height;
926 prop, XA_STRING, 8, PropModeReplace, 823 prop, XA_STRING, 8, PropModeReplace,
927 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 824 (const unsigned char *)str, len >= 0 ? len : strlen (str));
928} 825}
929 826
930void 827void
828rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
829{
830 XTextProperty ct;
831
832 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
833 {
834 XSetTextProperty (dpy, parent[0], &ct, prop);
835 XFree (ct.value);
836 }
837}
838
839void
931rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 840rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
932{ 841{
933 wchar_t *ws = rxvt_mbstowcs (str, len); 842 wchar_t *ws = rxvt_mbstowcs (str, len);
934 char *s = rxvt_wcstoutf8 (ws); 843 char *s = rxvt_wcstoutf8 (ws);
935 844
945/*----------------------------------------------------------------------*/ 854/*----------------------------------------------------------------------*/
946/* xterm sequences - title, iconName, color (exptl) */ 855/* xterm sequences - title, iconName, color (exptl) */
947void 856void
948rxvt_term::set_title (const char *str) 857rxvt_term::set_title (const char *str)
949{ 858{
950 set_string_property (XA_WM_NAME, str); 859 set_mbstring_property (XA_WM_NAME, str);
951#if ENABLE_EWMH 860#if ENABLE_EWMH
952 set_utf8_property (xa[XA_NET_WM_NAME], str); 861 set_utf8_property (xa[XA_NET_WM_NAME], str);
953#endif 862#endif
954} 863}
955 864
956void 865void
957rxvt_term::set_icon_name (const char *str) 866rxvt_term::set_icon_name (const char *str)
958{ 867{
959 set_string_property (XA_WM_ICON_NAME, str); 868 set_mbstring_property (XA_WM_ICON_NAME, str);
960#if ENABLE_EWMH 869#if ENABLE_EWMH
961 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 870 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
962#endif 871#endif
963} 872}
964 873
965void 874void
966rxvt_term::set_window_color (int idx, const char *color) 875rxvt_term::set_window_color (int idx, const char *color)
967{ 876{
968#ifdef XTERM_COLOR_CHANGE 877#ifdef XTERM_COLOR_CHANGE
969 rxvt_color xcol; 878 rxvt_color xcol;
970 int i;
971 879
972 if (color == NULL || *color == '\0') 880 if (color == NULL || *color == '\0')
973 return; 881 return;
974 882
975 color = strdup (color); 883 color = strdup (color);
977 rs[Rs_color + idx] = color; 885 rs[Rs_color + idx] = color;
978 886
979 /* handle color aliases */ 887 /* handle color aliases */
980 if (isdigit (*color)) 888 if (isdigit (*color))
981 { 889 {
982 i = atoi (color); 890 int i = atoi (color);
983 891
984 if (i >= 8 && i <= 15) 892 if (i >= 8 && i <= 15)
985 { 893 {
986 /* bright colors */ 894 /* bright colors */
987 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 895 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
1091 int old_width = szHint.width; 999 int old_width = szHint.width;
1092 int old_height = szHint.height; 1000 int old_height = szHint.height;
1093 1001
1094 window_calc (newwidth, newheight); 1002 window_calc (newwidth, newheight);
1095 1003
1096 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1004 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1005
1006 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1007 if (set_hint)
1008 {
1009 szHint.flags &= ~(PBaseSize | PResizeInc);
1097 XSetWMNormalHints (dpy, parent[0], &szHint); 1010 XSetWMNormalHints (dpy, parent[0], &szHint);
1011 szHint.flags |= PBaseSize | PResizeInc;
1012 }
1098 1013
1099 if (!ignoreparent) 1014 if (!ignoreparent)
1100 { 1015 {
1101#ifdef SMART_RESIZE 1016#ifdef SMART_RESIZE
1102 /* 1017 /*
1142#else 1057#else
1143 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1058 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1144#endif 1059#endif
1145 } 1060 }
1146 1061
1062 if (set_hint)
1063 XSetWMNormalHints (dpy, parent[0], &szHint);
1064
1147 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1065 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1148 1066
1149 if (fix_screen || newwidth != old_width || newheight != old_height) 1067 if (fix_screen || newwidth != old_width || newheight != old_height)
1150 { 1068 {
1151 if (scrollBar.state) 1069 if (scrollBar.state)
1152 { 1070 scrollBar.resize ();
1153 XMoveResizeWindow (dpy, scrollBar.win,
1154 window_sb_x, 0,
1155 scrollbar_TotalWidth (), szHint.height);
1156 resize_scrollbar ();
1157 }
1158 1071
1159 XMoveResizeWindow (dpy, vt, 1072 XMoveResizeWindow (dpy, vt,
1160 window_vt_x, window_vt_y, 1073 window_vt_x, window_vt_y,
1161 width, height); 1074 width, height);
1162 1075
1163#ifdef HAVE_BG_PIXMAP 1076#ifdef HAVE_BG_PIXMAP
1164 if (bgPixmap.window_size_sensitive ()) 1077 if (bgPixmap.window_size_sensitive ())
1165 update_background (); 1078 update_background ();
1166#endif 1079#endif
1167
1168 scr_clear ();
1169 } 1080 }
1170 1081
1171 if (fix_screen || old_height == 0) 1082 if (fix_screen || old_height == 0)
1172 scr_reset (); 1083 scr_reset ();
1173
1174 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1175 //scr_touch (false);
1176 1084
1177#ifdef HAVE_BG_PIXMAP 1085#ifdef HAVE_BG_PIXMAP
1178// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1086// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1179// if (bgPixmap.pixmap) 1087// if (bgPixmap.pixmap)
1180// scr_touch (false); 1088// scr_touch (false);
1252 1160
1253/* Checking whether input method is running. */ 1161/* Checking whether input method is running. */
1254bool 1162bool
1255rxvt_term::IMisRunning () 1163rxvt_term::IMisRunning ()
1256{ 1164{
1257 char *p;
1258 Atom atom; 1165 Atom atom;
1259 Window win; 1166 Window win;
1260 char server[IMBUFSIZ]; 1167 char server[IMBUFSIZ];
1261 1168
1262 /* get current locale modifier */ 1169 /* get current locale modifier */
1263 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1170 if (char *p = XSetLocaleModifiers (0))
1264 { 1171 {
1265 strcpy (server, "@server="); 1172 strcpy (server, "@server=");
1266 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1173 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1267 1174
1268 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1175 if (p = strchr (server + 1, '@')) /* first one only */
1269 *p = '\0'; 1176 *p = '\0';
1270 1177
1271 atom = XInternAtom (dpy, server, False); 1178 atom = XInternAtom (dpy, server, False);
1272 win = XGetSelectionOwner (dpy, atom); 1179 win = XGetSelectionOwner (dpy, atom);
1273 1180
1340 1247
1341 term->make_current (); 1248 term->make_current ();
1342 1249
1343 if (text) 1250 if (text)
1344 { 1251 {
1345 void *str; 1252 wchar_t *str;
1346 1253
1347 if (!text->encoding_is_wchar && text->string.multi_byte) 1254 if (!text->encoding_is_wchar && text->string.multi_byte)
1348 { 1255 {
1349 // of course, X makes it ugly again 1256 // of course, X makes it ugly again
1350 if (term->rs[Rs_imLocale]) 1257 if (term->rs[Rs_imLocale])
1351 SET_LOCALE (term->rs[Rs_imLocale]); 1258 SET_LOCALE (term->rs[Rs_imLocale]);
1352 1259
1353 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1260 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1354 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1261 mbstowcs (str, text->string.multi_byte, text->length + 1);
1355 1262
1356 if (term->rs[Rs_imLocale]) 1263 if (term->rs[Rs_imLocale])
1357 SET_LOCALE (term->locale); 1264 SET_LOCALE (term->locale);
1358 } 1265 }
1359 else 1266 else
1360 str = (void *)text->string.wide_char; 1267 str = text->string.wide_char;
1361 1268
1362 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1269 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1363 DT_INT, call_data->caret, 1270 DT_INT, call_data->caret,
1364 DT_INT, call_data->chg_first, 1271 DT_INT, call_data->chg_first,
1365 DT_INT, call_data->chg_length, 1272 DT_INT, call_data->chg_length,
1719void 1626void
1720rxvt_term::get_window_origin (int &x, int &y) 1627rxvt_term::get_window_origin (int &x, int &y)
1721{ 1628{
1722 Window cr; 1629 Window cr;
1723 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1630 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1724/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1631/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1725} 1632}
1726 1633
1727Pixmap 1634Pixmap
1728rxvt_term::get_pixmap_property (int prop_id) 1635rxvt_term::get_pixmap_property (int prop_id)
1729{ 1636{
1736 unsigned char *prop = NULL; 1643 unsigned char *prop = NULL;
1737 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1644 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1738 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1645 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1739 &nitems, &bytes_after, &prop); 1646 &nitems, &bytes_after, &prop);
1740 if (result == Success && prop && atype == XA_PIXMAP) 1647 if (result == Success && prop && atype == XA_PIXMAP)
1741 {
1742 return *(Pixmap *)prop; 1648 return *(Pixmap *)prop;
1743 }
1744 } 1649 }
1650
1745 return None; 1651 return None;
1746} 1652}
1747 1653
1748#ifdef HAVE_BG_PIXMAP 1654#ifdef HAVE_BG_PIXMAP
1749# if TRACE_PIXMAPS 1655# if TRACE_PIXMAPS
1750# undef update_background 1656# undef update_background
1657void
1751int rxvt_term::trace_update_background (const char *file, int line) 1658rxvt_term::trace_update_background (const char *file, int line)
1752{ 1659{
1753 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1660 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1754 update_background (); 1661 update_background ();
1755} 1662}
1756# endif 1663# endif
1757 1664
1758int 1665void
1759rxvt_term::update_background () 1666rxvt_term::update_background ()
1760{ 1667{
1668 if (update_background_ev.is_active ())
1669 return;
1670
1761 bgPixmap.invalidate (); 1671 bgPixmap.invalidate ();
1762 1672
1763 /* no chance of real time refresh if we are blurring! */ 1673 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1764 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1674
1675 if (to_wait <= 0.)
1765 bgPixmap.render (); 1676 bgPixmap.render ();
1766 else 1677 else
1767 {
1768 update_background_ev.stop ();
1769
1770 if (!bgPixmap.need_client_side_rendering())
1771 update_background_ev.start (.05); 1678 update_background_ev.start (to_wait);
1772 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1773 update_background_ev.start (.20); /* very slow !!! */
1774 else
1775 update_background_ev.start (.07);
1776 }
1777
1778 return 0;
1779} 1679}
1780 1680
1781void 1681void
1782rxvt_term::update_background_cb (ev::timer &w, int revents) 1682rxvt_term::update_background_cb (ev::timer &w, int revents)
1783{ 1683{
1684 make_current ();
1685
1686 update_background_ev.stop ();
1784 bgPixmap.render (); 1687 bgPixmap.render ();
1688 refresh_check ();
1785} 1689}
1786 1690
1787#endif /* HAVE_BG_PIXMAP */ 1691#endif /* HAVE_BG_PIXMAP */
1788 1692
1789/*----------------------- end-of-file (C source) -----------------------*/ 1693/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines