ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.149 by root, Mon Dec 13 06:44:18 2004 UTC vs.
Revision 1.157 by root, Sun Feb 13 08:56:28 2005 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29 29
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 30#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 31
32#include <inttypes.h> 32#include <inttypes.h>
33#include <wchar.h>
34 33
35#include "salloc.C" // HACK, should be a seperate compile! 34#include "salloc.C" // HACK, should be a seperate compile!
36 35
37inline void fill_text (text_t *start, text_t value, int len) 36inline void fill_text (text_t *start, text_t value, int len)
38{ 37{
… …
294 ralloc->free (drawn_rend[p]); 293 ralloc->free (drawn_rend[p]);
295 } 294 }
296 295
297 /* we have fewer rows so fix up cursor position */ 296 /* we have fewer rows so fix up cursor position */
298 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 297 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
299 MIN_IT (swap.cur.row, (int32_t)nrow - 1);
300 298
301 scr_reset_realloc (); /* realloc _last_ */ 299 scr_reset_realloc (); /* realloc _last_ */
302 } 300 }
303 else if (nrow > prev_nrow) 301 else if (nrow > prev_nrow)
304 { 302 {
… …
335 scr_scroll_text (0, (int)nrow - 1, -k, 1); 333 scr_scroll_text (0, (int)nrow - 1, -k, 1);
336 screen.cur.row += k; 334 screen.cur.row += k;
337 screen.s_cur.row += k; 335 screen.s_cur.row += k;
338 TermWin.nscrolled -= k; 336 TermWin.nscrolled -= k;
339 } 337 }
338
340#ifdef DEBUG_STRICT 339#ifdef DEBUG_STRICT
341 assert (screen.cur.row < TermWin.nrow); 340 assert (screen.cur.row < TermWin.nrow);
342 assert (swap.cur.row < TermWin.nrow);
343#else /* drive with your eyes closed */ 341#else /* drive with your eyes closed */
344
345 MIN_IT (screen.cur.row, nrow - 1); 342 MIN_IT (screen.cur.row, nrow - 1);
346 MIN_IT (swap.cur.row, nrow - 1);
347#endif 343#endif
348 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this 344 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
349 } 345 }
350 346
351 /* resize columns */ 347 /* resize columns */
… …
394 } 390 }
395 391
396 } 392 }
397 393
398 MIN_IT (screen.cur.col, (int16_t)ncol - 1); 394 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
399 MIN_IT (swap.cur.col, (int16_t)ncol - 1);
400 395
401 delete talloc; talloc = ta; 396 delete talloc; talloc = ta;
402 delete ralloc; ralloc = ra; 397 delete ralloc; ralloc = ra;
403 } 398 }
404 399
… …
566 if (current_screen == scrn) 561 if (current_screen == scrn)
567 return scrn; 562 return scrn;
568 563
569 selection_check (2); /* check for boundary cross */ 564 selection_check (2); /* check for boundary cross */
570 565
571 SWAP_IT (current_screen, scrn, int); 566 i = current_screen; current_screen = scrn; scrn = i;
572 567
573 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 568 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
574 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 569 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
575# ifdef DEBUG_STRICT
576 assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow);
577 assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol);
578# else /* drive with your eyes closed */
579 MAX_IT (screen.cur.row, 0); 570 MAX_IT (screen.cur.row, 0);
580 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 571 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
581 MAX_IT (screen.cur.col, 0); 572 MAX_IT (screen.cur.col, 0);
582 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); 573 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
583# endif
584 574
585#if NSCREENS 575#if NSCREENS
586 if (options & Opt_secondaryScreen) 576 if (options & Opt_secondaryScreen)
587 { 577 {
588 num_scr = 0; 578 num_scr = 0;
… …
2400 else 2390 else
2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2391 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2402 2392
2403 if (rend & RS_Uline && font->descent > 1 && fore != back) 2393 if (rend & RS_Uline && font->descent > 1 && fore != back)
2404 { 2394 {
2395#if ENABLE_FRILLS
2396 if (ISSET_PIXCOLOR (Color_underline))
2397 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
2398 else
2399#endif
2405 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2400 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2401
2406 XDrawLine (display->display, drawBuffer, TermWin.gc, 2402 XDrawLine (display->display, drawBuffer, TermWin.gc,
2407 xpixel, ypixel + font->ascent + 1, 2403 xpixel, ypixel + font->ascent + 1,
2408 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2404 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2409 } 2405 }
2410 } /* for (col....) */ 2406 } /* for (col....) */
… …
2656/* ------------------------------------------------------------------------- */ 2652/* ------------------------------------------------------------------------- */
2657/* 2653/*
2658 * Paste a selection direct to the command fd 2654 * Paste a selection direct to the command fd
2659 */ 2655 */
2660void 2656void
2661rxvt_term::paste (const unsigned char *data, unsigned int len) 2657rxvt_term::paste (unsigned char *data, unsigned int len)
2662{ 2658{
2663 unsigned int i, j, n;
2664 unsigned char *ds = (unsigned char *)rxvt_malloc (PASTE_SIZE);
2665
2666 /* convert normal newline chars into common keyboard Return key sequence */ 2659 /* convert normal newline chars into common keyboard Return key sequence */
2667 for (i = 0; i < len; i += PASTE_SIZE) 2660 for (unsigned int i = 0; i < len; i++)
2668 {
2669 n = min (len - i, PASTE_SIZE);
2670 memcpy (ds, data + i, n);
2671
2672 for (j = 0; j < n; j++)
2673 if (ds[j] == C0_LF) 2661 if (data[i] == C0_LF)
2674 ds[j] = C0_CR; 2662 data[i] = C0_CR;
2675 2663
2676 tt_write (ds, (int)n); 2664 tt_write (data, len);
2677 }
2678
2679 free (ds);
2680} 2665}
2681 2666
2682/* ------------------------------------------------------------------------- */ 2667/* ------------------------------------------------------------------------- */
2683/* 2668/*
2684 * Respond to a notification that a primary selection has been sent 2669 * Respond to a notification that a primary selection has been sent
… …
3423 selection_delimit_word (DN, &selection.end, &selection.end); 3408 selection_delimit_word (DN, &selection.end, &selection.end);
3424 } 3409 }
3425 else if (selection.clicks == 3) 3410 else if (selection.clicks == 3)
3426 { 3411 {
3427#if ENABLE_FRILLS 3412#if ENABLE_FRILLS
3428 if ((options & Opt_tripleclickwords)) 3413 if (options & Opt_tripleclickwords)
3429 { 3414 {
3430 int end_row; 3415 int end_row;
3431 3416
3432 selection_delimit_word (UP, &selection.beg, &selection.beg); 3417 selection_delimit_word (UP, &selection.beg, &selection.beg);
3433 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3418 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
… …
3451 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3436 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3452 selection.mark.col++; 3437 selection.mark.col++;
3453 3438
3454 selection.beg.col = 0; 3439 selection.beg.col = 0;
3455 selection.end.col = ncol; 3440 selection.end.col = ncol;
3441
3442 // select a complete logical line
3443 while (selection.beg.row > -TermWin.saveLines
3444 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
3445 selection.beg.row--;
3446
3447 while (selection.end.row < TermWin.nrow
3448 && screen.tlen[selection.end.row + TermWin.saveLines] == -1)
3449 selection.end.row++;
3456 } 3450 }
3457 } 3451 }
3458 3452
3459 if (button3 && buttonpress) 3453 if (button3 && buttonpress)
3460 { /* mark may need to be changed */ 3454 { /* mark may need to be changed */
… …
3540 */ 3534 */
3541void 3535void
3542rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3536rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3543{ 3537{
3544 XSelectionEvent ev; 3538 XSelectionEvent ev;
3539 dDisp;
3545 3540
3546 ev.type = SelectionNotify; 3541 ev.type = SelectionNotify;
3547 ev.property = None; 3542 ev.property = None;
3548 ev.display = rq.display; 3543 ev.display = rq.display;
3549 ev.requestor = rq.requestor; 3544 ev.requestor = rq.requestor;
… …
3563 *target++ = xa[XA_COMPOUND_TEXT]; 3558 *target++ = xa[XA_COMPOUND_TEXT];
3564#if X_HAVE_UTF8_STRING 3559#if X_HAVE_UTF8_STRING
3565 *target++ = xa[XA_UTF8_STRING]; 3560 *target++ = xa[XA_UTF8_STRING];
3566#endif 3561#endif
3567 3562
3568 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3563 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3569 32, PropModeReplace, 3564 32, PropModeReplace,
3570 (unsigned char *)target_list, target - target_list); 3565 (unsigned char *)target_list, target - target_list);
3571 ev.property = rq.property; 3566 ev.property = rq.property;
3572 } 3567 }
3573#if TODO // TODO 3568#if TODO // TODO
… …
3576 /* TODO: Handle MULTIPLE */ 3571 /* TODO: Handle MULTIPLE */
3577 } 3572 }
3578#endif 3573#endif
3579 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3574 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3580 { 3575 {
3581 XChangeProperty (display->display, rq.requestor, rq.property, rq.target, 3576 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3582 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3577 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3583 ev.property = rq.property; 3578 ev.property = rq.property;
3584 } 3579 }
3585 else if (rq.target == XA_STRING 3580 else if (rq.target == XA_STRING
3586 || rq.target == xa[XA_TEXT] 3581 || rq.target == xa[XA_TEXT]
… …
3644 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3639 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3645 ct.nitems = strlen ((char *)ct.value); 3640 ct.nitems = strlen ((char *)ct.value);
3646 } 3641 }
3647 else 3642 else
3648#endif 3643#endif
3649 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3644 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3650 freect = 1; 3645 freect = 1;
3651 else 3646 else
3652 { 3647 {
3653 /* if we failed to convert then send it raw */ 3648 /* if we failed to convert then send it raw */
3654 ct.value = (unsigned char *)cl; 3649 ct.value = (unsigned char *)cl;
3655 ct.nitems = selectlen; 3650 ct.nitems = selectlen;
3656 ct.encoding = target; 3651 ct.encoding = target;
3657 } 3652 }
3658 3653
3659 XChangeProperty (display->display, rq.requestor, rq.property, 3654 XChangeProperty (disp, rq.requestor, rq.property,
3660 ct.encoding, 8, PropModeReplace, 3655 ct.encoding, 8, PropModeReplace,
3661 ct.value, (int)ct.nitems); 3656 ct.value, (int)ct.nitems);
3662 ev.property = rq.property; 3657 ev.property = rq.property;
3663 3658
3664 if (freect) 3659 if (freect)
3665 XFree (ct.value); 3660 XFree (ct.value);
3666 } 3661 }
3667 3662
3668 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3663 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3669} 3664}
3670 3665
3671/* ------------------------------------------------------------------------- * 3666/* ------------------------------------------------------------------------- *
3672 * MOUSE ROUTINES * 3667 * MOUSE ROUTINES *
3673 * ------------------------------------------------------------------------- */ 3668 * ------------------------------------------------------------------------- */

Diff Legend

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