… | |
… | |
71 | #define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ |
71 | #define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ |
72 | (((A) == (C)) && ((B) <= (D))) |
72 | (((A) == (C)) && ((B) <= (D))) |
73 | |
73 | |
74 | /* these must be row_col_t */ |
74 | /* these must be row_col_t */ |
75 | #define ROWCOL_IS_AFTER(X, Y) \ |
75 | #define ROWCOL_IS_AFTER(X, Y) \ |
76 | ROW_AND_COL_IS_AFTER((X).row, (X).col, (Y).row, (Y).col) |
76 | ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
77 | #define ROWCOL_IS_BEFORE(X, Y) \ |
77 | #define ROWCOL_IS_BEFORE(X, Y) \ |
78 | ROW_AND_COL_IS_BEFORE((X).row, (X).col, (Y).row, (Y).col) |
78 | ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
79 | #define ROWCOL_IN_ROW_AFTER(X, Y) \ |
79 | #define ROWCOL_IN_ROW_AFTER(X, Y) \ |
80 | ROW_AND_COL_IN_ROW_AFTER((X).row, (X).col, (Y).row, (Y).col) |
80 | ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
81 | #define ROWCOL_IN_ROW_BEFORE(X, Y) \ |
81 | #define ROWCOL_IN_ROW_BEFORE(X, Y) \ |
82 | ROW_AND_COL_IN_ROW_BEFORE((X).row, (X).col, (Y).row, (Y).col) |
82 | ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
83 | #define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ |
83 | #define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ |
84 | ROW_AND_COL_IN_ROW_AT_OR_AFTER((X).row, (X).col, (Y).row, (Y).col) |
84 | ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
85 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
85 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
86 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE((X).row, (X).col, (Y).row, (Y).col) |
86 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
87 | |
87 | |
88 | /* |
88 | /* |
89 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
89 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
90 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
90 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
91 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
91 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
… | |
… | |
93 | #define drawBuffer TermWin.vt |
93 | #define drawBuffer TermWin.vt |
94 | |
94 | |
95 | #define CLEAR_ROWS(row, num) \ |
95 | #define CLEAR_ROWS(row, num) \ |
96 | if (TermWin.mapped) \ |
96 | if (TermWin.mapped) \ |
97 | XClearArea (display->display, drawBuffer, TermWin.int_bwidth, \ |
97 | XClearArea (display->display, drawBuffer, TermWin.int_bwidth, \ |
98 | Row2Pixel(row), (unsigned int)TermWin.width, \ |
98 | Row2Pixel (row), (unsigned int)TermWin.width, \ |
99 | (unsigned int)Height2Pixel(num), False) |
99 | (unsigned int)Height2Pixel (num), False) |
100 | |
100 | |
101 | #define CLEAR_CHARS(x, y, num) \ |
101 | #define CLEAR_CHARS(x, y, num) \ |
102 | if (TermWin.mapped) \ |
102 | if (TermWin.mapped) \ |
103 | XClearArea (display->display, drawBuffer, x, y, \ |
103 | XClearArea (display->display, drawBuffer, x, y, \ |
104 | (unsigned int)Width2Pixel(num), \ |
104 | (unsigned int)Width2Pixel (num), \ |
105 | (unsigned int)Height2Pixel(1), False) |
105 | (unsigned int)Height2Pixel (1), False) |
106 | |
106 | |
107 | #define ERASE_ROWS(row, num) \ |
107 | #define ERASE_ROWS(row, num) \ |
108 | XFillRectangle (display->display, drawBuffer, TermWin.gc, \ |
108 | XFillRectangle (display->display, drawBuffer, TermWin.gc, \ |
109 | TermWin.int_bwidth, Row2Pixel(row), \ |
109 | TermWin.int_bwidth, Row2Pixel (row), \ |
110 | (unsigned int)TermWin.width, \ |
110 | (unsigned int)TermWin.width, \ |
111 | (unsigned int)Height2Pixel(num)) |
111 | (unsigned int)Height2Pixel (num)) |
112 | |
112 | |
113 | /* ------------------------------------------------------------------------- * |
113 | /* ------------------------------------------------------------------------- * |
114 | * SCREEN `COMMON' ROUTINES * |
114 | * SCREEN `COMMON' ROUTINES * |
115 | * ------------------------------------------------------------------------- */ |
115 | * ------------------------------------------------------------------------- */ |
116 | /* Fill part/all of a line with blanks. */ |
116 | /* Fill part/all of a line with blanks. */ |
… | |
… | |
131 | /* Fill a full line with blanks - make sure it is allocated first */ |
131 | /* Fill a full line with blanks - make sure it is allocated first */ |
132 | void |
132 | void |
133 | rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) |
133 | rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) |
134 | { |
134 | { |
135 | #ifdef DEBUG_STRICT |
135 | #ifdef DEBUG_STRICT |
136 | assert((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL)); |
136 | assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL)); |
137 | #endif |
137 | #endif |
138 | if (tp[row] == NULL) |
138 | if (tp[row] == NULL) |
139 | { |
139 | { |
140 | tp[row] = (text_t *)talloc->alloc (); |
140 | tp[row] = (text_t *)talloc->alloc (); |
141 | rp[row] = (rend_t *)ralloc->alloc (); |
141 | rp[row] = (rend_t *)ralloc->alloc (); |
… | |
… | |
153 | unsigned int ncol, nrow, total_rows, prev_total_rows; |
153 | unsigned int ncol, nrow, total_rows, prev_total_rows; |
154 | unsigned int p, q; |
154 | unsigned int p, q; |
155 | int k; |
155 | int k; |
156 | rend_t setrstyle; |
156 | rend_t setrstyle; |
157 | |
157 | |
158 | D_SCREEN((stderr, "rxvt_scr_reset()")); |
158 | D_SCREEN ((stderr, "rxvt_scr_reset ()")); |
159 | |
159 | |
160 | TermWin.view_start = 0; |
160 | TermWin.view_start = 0; |
161 | num_scr = 0; |
161 | num_scr = 0; |
162 | |
162 | |
163 | if (TermWin.ncol == 0) |
163 | if (TermWin.ncol == 0) |
… | |
… | |
190 | { |
190 | { |
191 | /* |
191 | /* |
192 | * first time called so just malloc everything : don't rely on realloc |
192 | * first time called so just malloc everything : don't rely on realloc |
193 | * Note: this is still needed so that all the scrollback lines are NULL |
193 | * Note: this is still needed so that all the scrollback lines are NULL |
194 | */ |
194 | */ |
195 | screen.text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *)); |
195 | screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
196 | buf_text = (text_t **)rxvt_calloc(total_rows, sizeof(text_t *)); |
196 | buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
197 | drawn_text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *)); |
197 | drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
198 | swap.text = (text_t **)rxvt_calloc(nrow, sizeof(text_t *)); |
198 | swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
199 | |
199 | |
200 | screen.tlen = (int16_t *)rxvt_calloc(total_rows, sizeof(int16_t)); |
200 | screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); |
201 | swap.tlen = (int16_t *)rxvt_calloc(nrow, sizeof(int16_t)); |
201 | swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); |
202 | |
202 | |
203 | screen.rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *)); |
203 | screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
204 | buf_rend = (rend_t **)rxvt_calloc(total_rows, sizeof(rend_t *)); |
204 | buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
205 | drawn_rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *)); |
205 | drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); |
206 | swap.rend = (rend_t **)rxvt_calloc(nrow, sizeof(rend_t *)); |
206 | swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); |
207 | |
207 | |
208 | for (p = 0; p < nrow; p++) |
208 | for (p = 0; p < nrow; p++) |
209 | { |
209 | { |
210 | q = p + TermWin.saveLines; |
210 | q = p + TermWin.saveLines; |
211 | scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); |
211 | scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); |
212 | scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); |
212 | scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); |
213 | screen.tlen[q] = swap.tlen[p] = 0; |
213 | screen.tlen[q] = swap.tlen[p] = 0; |
214 | scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); |
214 | scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); |
215 | } |
215 | } |
216 | |
216 | |
217 | MEMSET(charsets, 'B', sizeof(charsets)); |
217 | MEMSET (charsets, 'B', sizeof (charsets)); |
218 | TermWin.nscrolled = 0; /* no saved lines */ |
218 | TermWin.nscrolled = 0; /* no saved lines */ |
219 | rstyle = DEFAULT_RSTYLE; |
219 | rstyle = DEFAULT_RSTYLE; |
220 | screen.flags = Screen_DefaultFlags; |
220 | screen.flags = Screen_DefaultFlags; |
221 | screen.cur.row = screen.cur.col = 0; |
221 | screen.cur.row = screen.cur.col = 0; |
222 | screen.charset = 0; |
222 | screen.charset = 0; |
… | |
… | |
321 | screen.cur.row += k; |
321 | screen.cur.row += k; |
322 | screen.s_cur.row += k; |
322 | screen.s_cur.row += k; |
323 | TermWin.nscrolled -= k; |
323 | TermWin.nscrolled -= k; |
324 | } |
324 | } |
325 | #ifdef DEBUG_STRICT |
325 | #ifdef DEBUG_STRICT |
326 | assert(screen.cur.row < TermWin.nrow); |
326 | assert (screen.cur.row < TermWin.nrow); |
327 | assert(swap.cur.row < TermWin.nrow); |
327 | assert (swap.cur.row < TermWin.nrow); |
328 | #else /* drive with your eyes closed */ |
328 | #else /* drive with your eyes closed */ |
329 | |
329 | |
330 | MIN_IT(screen.cur.row, nrow - 1); |
330 | MIN_IT (screen.cur.row, nrow - 1); |
331 | MIN_IT(swap.cur.row, nrow - 1); |
331 | MIN_IT (swap.cur.row, nrow - 1); |
332 | #endif |
332 | #endif |
333 | TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this |
333 | TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this |
334 | } |
334 | } |
335 | |
335 | |
336 | /* resize columns */ |
336 | /* resize columns */ |
… | |
… | |
345 | if (screen.text[p]) |
345 | if (screen.text[p]) |
346 | { |
346 | { |
347 | text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t; |
347 | text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t; |
348 | rend_t *r = (rend_t *)ra->alloc (); memcpy (r, screen.rend[p], common * sizeof (rend_t)); screen.rend[p] = r; |
348 | rend_t *r = (rend_t *)ra->alloc (); memcpy (r, screen.rend[p], common * sizeof (rend_t)); screen.rend[p] = r; |
349 | |
349 | |
350 | MIN_IT(screen.tlen[p], (int16_t)ncol); |
350 | MIN_IT (screen.tlen[p], (int16_t)ncol); |
351 | |
351 | |
352 | if (ncol > prev_ncol) |
352 | if (ncol > prev_ncol) |
353 | scr_blank_line (&(screen.text[p][prev_ncol]), |
353 | scr_blank_line (& (screen.text[p][prev_ncol]), |
354 | &(screen.rend[p][prev_ncol]), |
354 | & (screen.rend[p][prev_ncol]), |
355 | ncol - prev_ncol, |
355 | ncol - prev_ncol, |
356 | setrstyle); |
356 | setrstyle); |
357 | } |
357 | } |
358 | } |
358 | } |
359 | |
359 | |
… | |
… | |
361 | { |
361 | { |
362 | text_t *t = (text_t *)ta->alloc (); memcpy (t, drawn_text[p], common * sizeof (text_t)); drawn_text[p] = t; |
362 | text_t *t = (text_t *)ta->alloc (); memcpy (t, drawn_text[p], common * sizeof (text_t)); drawn_text[p] = t; |
363 | rend_t *r = (rend_t *)ra->alloc (); memcpy (r, drawn_rend[p], common * sizeof (rend_t)); drawn_rend[p] = r; |
363 | rend_t *r = (rend_t *)ra->alloc (); memcpy (r, drawn_rend[p], common * sizeof (rend_t)); drawn_rend[p] = r; |
364 | |
364 | |
365 | if (ncol > prev_ncol) |
365 | if (ncol > prev_ncol) |
366 | scr_blank_line (&(drawn_text[p][prev_ncol]), |
366 | scr_blank_line (& (drawn_text[p][prev_ncol]), |
367 | &(drawn_rend[p][prev_ncol]), |
367 | & (drawn_rend[p][prev_ncol]), |
368 | ncol - prev_ncol, setrstyle); |
368 | ncol - prev_ncol, setrstyle); |
369 | |
369 | |
370 | if (swap.text[p]) |
370 | if (swap.text[p]) |
371 | { |
371 | { |
372 | text_t *t = (text_t *)ta->alloc (); memcpy (t, swap.text[p], common * sizeof (text_t)); swap.text[p] = t; |
372 | text_t *t = (text_t *)ta->alloc (); memcpy (t, swap.text[p], common * sizeof (text_t)); swap.text[p] = t; |
373 | rend_t *r = (rend_t *)ra->alloc (); memcpy (r, swap.rend[p], common * sizeof (rend_t)); swap.rend[p] = r; |
373 | rend_t *r = (rend_t *)ra->alloc (); memcpy (r, swap.rend[p], common * sizeof (rend_t)); swap.rend[p] = r; |
374 | |
374 | |
375 | MIN_IT(swap.tlen[p], (int16_t)ncol); |
375 | MIN_IT (swap.tlen[p], (int16_t)ncol); |
376 | |
376 | |
377 | if (ncol > prev_ncol) |
377 | if (ncol > prev_ncol) |
378 | scr_blank_line (&(swap.text[p][prev_ncol]), |
378 | scr_blank_line (& (swap.text[p][prev_ncol]), |
379 | &(swap.rend[p][prev_ncol]), |
379 | & (swap.rend[p][prev_ncol]), |
380 | ncol - prev_ncol, setrstyle); |
380 | ncol - prev_ncol, setrstyle); |
381 | } |
381 | } |
382 | |
382 | |
383 | } |
383 | } |
384 | |
384 | |
… | |
… | |
388 | delete talloc; talloc = ta; |
388 | delete talloc; talloc = ta; |
389 | delete ralloc; ralloc = ra; |
389 | delete ralloc; ralloc = ra; |
390 | } |
390 | } |
391 | |
391 | |
392 | if (tabs) |
392 | if (tabs) |
393 | free(tabs); |
393 | free (tabs); |
394 | } |
394 | } |
395 | |
395 | |
396 | prev_nrow = nrow; |
396 | prev_nrow = nrow; |
397 | prev_ncol = ncol; |
397 | prev_ncol = ncol; |
398 | |
398 | |
399 | tabs = (char *)rxvt_malloc (ncol * sizeof(char)); |
399 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
400 | |
400 | |
401 | for (p = 0; p < ncol; p++) |
401 | for (p = 0; p < ncol; p++) |
402 | tabs[p] = (p % TABSIZE == 0) ? 1 : 0; |
402 | tabs[p] = (p % TABSIZE == 0) ? 1 : 0; |
403 | |
403 | |
404 | tt_winch (); |
404 | tt_winch (); |
405 | } |
405 | } |
406 | |
406 | |
407 | void |
407 | void |
408 | rxvt_term::scr_reset_realloc() |
408 | rxvt_term::scr_reset_realloc () |
409 | { |
409 | { |
410 | uint16_t total_rows, nrow; |
410 | uint16_t total_rows, nrow; |
411 | |
411 | |
412 | nrow = TermWin.nrow; |
412 | nrow = TermWin.nrow; |
413 | total_rows = nrow + TermWin.saveLines; |
413 | total_rows = nrow + TermWin.saveLines; |
414 | /* *INDENT-OFF* */ |
414 | /* *INDENT-OFF* */ |
415 | screen.text = (text_t **)rxvt_realloc(screen.text, total_rows * sizeof(text_t *)); |
415 | screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); |
416 | buf_text = (text_t **)rxvt_realloc(buf_text , total_rows * sizeof(text_t *)); |
416 | buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *)); |
417 | drawn_text = (text_t **)rxvt_realloc(drawn_text , nrow * sizeof(text_t *)); |
417 | drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *)); |
418 | swap.text = (text_t **)rxvt_realloc(swap.text , nrow * sizeof(text_t *)); |
418 | swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *)); |
419 | |
419 | |
420 | screen.tlen = (int16_t *)rxvt_realloc(screen.tlen, total_rows * sizeof(int16_t)); |
420 | screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t)); |
421 | swap.tlen = (int16_t *)rxvt_realloc(swap.tlen , total_rows * sizeof(int16_t)); |
421 | swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t)); |
422 | |
422 | |
423 | screen.rend = (rend_t **)rxvt_realloc(screen.rend, total_rows * sizeof(rend_t *)); |
423 | screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *)); |
424 | buf_rend = (rend_t **)rxvt_realloc(buf_rend , total_rows * sizeof(rend_t *)); |
424 | buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *)); |
425 | drawn_rend = (rend_t **)rxvt_realloc(drawn_rend , nrow * sizeof(rend_t *)); |
425 | drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *)); |
426 | swap.rend = (rend_t **)rxvt_realloc(swap.rend , nrow * sizeof(rend_t *)); |
426 | swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *)); |
427 | /* *INDENT-ON* */ |
427 | /* *INDENT-ON* */ |
428 | } |
428 | } |
429 | |
429 | |
430 | /* ------------------------------------------------------------------------- */ |
430 | /* ------------------------------------------------------------------------- */ |
431 | /* |
431 | /* |
432 | * Free everything. That way malloc debugging can find leakage. |
432 | * Free everything. That way malloc debugging can find leakage. |
433 | */ |
433 | */ |
434 | void |
434 | void |
435 | rxvt_term::scr_release() |
435 | rxvt_term::scr_release () |
436 | { |
436 | { |
437 | uint16_t total_rows; |
437 | uint16_t total_rows; |
438 | int i; |
438 | int i; |
439 | |
439 | |
440 | total_rows = TermWin.nrow + TermWin.saveLines; |
440 | total_rows = TermWin.nrow + TermWin.saveLines; |
… | |
… | |
442 | #ifdef DEBUG_STRICT |
442 | #ifdef DEBUG_STRICT |
443 | for (i = 0; i < total_rows; i++) |
443 | for (i = 0; i < total_rows; i++) |
444 | { |
444 | { |
445 | if (screen.text[i]) |
445 | if (screen.text[i]) |
446 | /* then so is screen.rend[i] */ |
446 | /* then so is screen.rend[i] */ |
447 | assert(screen.rend[i]); |
447 | assert (screen.rend[i]); |
448 | } |
448 | } |
449 | #endif |
449 | #endif |
450 | |
450 | |
451 | delete talloc; talloc = 0; |
451 | delete talloc; talloc = 0; |
452 | delete ralloc; ralloc = 0; |
452 | delete ralloc; ralloc = 0; |
… | |
… | |
477 | * Hard reset |
477 | * Hard reset |
478 | */ |
478 | */ |
479 | void |
479 | void |
480 | rxvt_term::scr_poweron () |
480 | rxvt_term::scr_poweron () |
481 | { |
481 | { |
482 | D_SCREEN((stderr, "rxvt_scr_poweron()")); |
482 | D_SCREEN ((stderr, "rxvt_scr_poweron ()")); |
483 | |
483 | |
484 | scr_release (); |
484 | scr_release (); |
485 | prev_nrow = prev_ncol = 0; |
485 | prev_nrow = prev_ncol = 0; |
486 | scr_reset (); |
486 | scr_reset (); |
487 | |
487 | |
488 | scr_clear (); |
488 | scr_clear (); |
489 | scr_refresh (SLOW_REFRESH); |
489 | scr_refresh (SLOW_REFRESH); |
490 | #ifdef RXVT_GRAPHICS |
|
|
491 | Gr_reset (); |
|
|
492 | #endif |
|
|
493 | } |
490 | } |
494 | |
491 | |
495 | /* ------------------------------------------------------------------------- * |
492 | /* ------------------------------------------------------------------------- * |
496 | * PROCESS SCREEN COMMANDS * |
493 | * PROCESS SCREEN COMMANDS * |
497 | * ------------------------------------------------------------------------- */ |
494 | * ------------------------------------------------------------------------- */ |
… | |
… | |
503 | void |
500 | void |
504 | rxvt_term::scr_cursor (int mode) |
501 | rxvt_term::scr_cursor (int mode) |
505 | { |
502 | { |
506 | screen_t *s; |
503 | screen_t *s; |
507 | |
504 | |
508 | D_SCREEN((stderr, "rxvt_scr_cursor(%c)", mode)); |
505 | D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); |
509 | |
506 | |
510 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
507 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
511 | if (current_screen == SECONDARY) |
508 | if (current_screen == SECONDARY) |
512 | s = &(swap); |
509 | s = & (swap); |
513 | else |
510 | else |
514 | #endif |
511 | #endif |
515 | s = &(screen); |
512 | s = & (screen); |
516 | switch (mode) |
513 | switch (mode) |
517 | { |
514 | { |
518 | case SAVE: |
515 | case SAVE: |
519 | s->s_cur.row = s->cur.row; |
516 | s->s_cur.row = s->cur.row; |
520 | s->s_cur.col = s->cur.col; |
517 | s->s_cur.col = s->cur.col; |
… | |
… | |
532 | charsets[s->charset] = s->s_charset_char; |
529 | charsets[s->charset] = s->s_charset_char; |
533 | set_font_style (); |
530 | set_font_style (); |
534 | break; |
531 | break; |
535 | } |
532 | } |
536 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
533 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
537 | MIN_IT(s->cur.row, TermWin.nrow - 1); |
534 | MIN_IT (s->cur.row, TermWin.nrow - 1); |
538 | MIN_IT(s->cur.col, TermWin.ncol - 1); |
535 | MIN_IT (s->cur.col, TermWin.ncol - 1); |
539 | #ifdef DEBUG_STRICT |
536 | #ifdef DEBUG_STRICT |
540 | assert(s->cur.row >= 0); |
537 | assert (s->cur.row >= 0); |
541 | assert(s->cur.col >= 0); |
538 | assert (s->cur.col >= 0); |
542 | #else /* drive with your eyes closed */ |
539 | #else /* drive with your eyes closed */ |
543 | MAX_IT(s->cur.row, 0); |
540 | MAX_IT (s->cur.row, 0); |
544 | MAX_IT(s->cur.col, 0); |
541 | MAX_IT (s->cur.col, 0); |
545 | #endif |
542 | #endif |
546 | } |
543 | } |
547 | |
544 | |
548 | /* ------------------------------------------------------------------------- */ |
545 | /* ------------------------------------------------------------------------- */ |
549 | /* |
546 | /* |
… | |
… | |
559 | int offset; |
556 | int offset; |
560 | #endif |
557 | #endif |
561 | |
558 | |
562 | want_refresh = 1; |
559 | want_refresh = 1; |
563 | |
560 | |
564 | D_SCREEN((stderr, "rxvt_scr_change_screen(%d)", scrn)); |
561 | D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); |
565 | |
562 | |
566 | TermWin.view_start = 0; |
563 | TermWin.view_start = 0; |
567 | |
564 | |
568 | if (current_screen == scrn) |
565 | if (current_screen == scrn) |
569 | return current_screen; |
566 | return current_screen; |
570 | |
567 | |
571 | selection_check (2); /* check for boundary cross */ |
568 | selection_check (2); /* check for boundary cross */ |
572 | |
569 | |
573 | SWAP_IT(current_screen, scrn, int); |
570 | SWAP_IT (current_screen, scrn, int); |
574 | #if NSCREENS |
571 | #if NSCREENS |
575 | num_scr = 0; |
572 | num_scr = 0; |
576 | offset = TermWin.saveLines; |
573 | offset = TermWin.saveLines; |
577 | for (i = prev_nrow; i--;) |
574 | for (i = prev_nrow; i--;) |
578 | { |
575 | { |
579 | SWAP_IT(screen.text[i + offset], swap.text[i], text_t *); |
576 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
580 | SWAP_IT(screen.tlen[i + offset], swap.tlen[i], int16_t); |
577 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
581 | SWAP_IT(screen.rend[i + offset], swap.rend[i], rend_t *); |
578 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
582 | } |
579 | } |
583 | SWAP_IT(screen.cur.row, swap.cur.row, int16_t); |
580 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
584 | SWAP_IT(screen.cur.col, swap.cur.col, int16_t); |
581 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
585 | # ifdef DEBUG_STRICT |
582 | # ifdef DEBUG_STRICT |
586 | assert((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); |
583 | assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); |
587 | assert((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); |
584 | assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); |
588 | # else /* drive with your eyes closed */ |
585 | # else /* drive with your eyes closed */ |
589 | MAX_IT(screen.cur.row, 0); |
586 | MAX_IT (screen.cur.row, 0); |
590 | MIN_IT(screen.cur.row, (int32_t)prev_nrow - 1); |
587 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
591 | MAX_IT(screen.cur.col, 0); |
588 | MAX_IT (screen.cur.col, 0); |
592 | MIN_IT(screen.cur.col, (int32_t)prev_ncol - 1); |
589 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
593 | # endif |
590 | # endif |
594 | SWAP_IT(screen.charset, swap.charset, int16_t); |
591 | SWAP_IT (screen.charset, swap.charset, int16_t); |
595 | SWAP_IT(screen.flags, swap.flags, int); |
592 | SWAP_IT (screen.flags, swap.flags, int); |
596 | screen.flags |= Screen_VisibleCursor; |
593 | screen.flags |= Screen_VisibleCursor; |
597 | swap.flags |= Screen_VisibleCursor; |
594 | swap.flags |= Screen_VisibleCursor; |
598 | |
|
|
599 | # ifdef RXVT_GRAPHICS |
|
|
600 | |
|
|
601 | if (Gr_Displayed ()) |
|
|
602 | { |
|
|
603 | Gr_scroll (0); |
|
|
604 | Gr_ChangeScreen (); |
|
|
605 | } |
|
|
606 | # endif |
|
|
607 | #else |
595 | #else |
608 | # ifdef SCROLL_ON_NO_SECONDARY |
596 | # ifdef SCROLL_ON_NO_SECONDARY |
609 | # ifdef RXVT_GRAPHICS |
|
|
610 | if (Gr_Displayed ()) |
|
|
611 | Gr_ClearScreen (); |
|
|
612 | # endif |
|
|
613 | if (current_screen == PRIMARY |
597 | if (current_screen == PRIMARY) |
614 | # ifdef RXVT_GRAPHICS |
|
|
615 | && !Gr_Displayed () |
|
|
616 | # endif |
|
|
617 | ) |
|
|
618 | scr_scroll_text(0, (prev_nrow - 1), prev_nrow, 0); |
598 | scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); |
619 | # endif |
599 | # endif |
620 | #endif |
600 | #endif |
621 | return scrn; |
601 | return scrn; |
622 | } |
602 | } |
623 | |
603 | |
… | |
… | |
628 | void |
608 | void |
629 | rxvt_term::scr_color (unsigned int color, int fgbg) |
609 | rxvt_term::scr_color (unsigned int color, int fgbg) |
630 | { |
610 | { |
631 | color &= RS_fgMask; |
611 | color &= RS_fgMask; |
632 | if (fgbg == Color_fg) |
612 | if (fgbg == Color_fg) |
633 | rstyle = SET_FGCOLOR(rstyle, color); |
613 | rstyle = SET_FGCOLOR (rstyle, color); |
634 | else |
614 | else |
635 | rstyle = SET_BGCOLOR(rstyle, color); |
615 | rstyle = SET_BGCOLOR (rstyle, color); |
636 | } |
616 | } |
637 | |
617 | |
638 | /* ------------------------------------------------------------------------- */ |
618 | /* ------------------------------------------------------------------------- */ |
639 | /* |
619 | /* |
640 | * Change the rendition style for following text |
620 | * Change the rendition style for following text |
… | |
… | |
665 | |
645 | |
666 | if (count == 0 || (row1 > row2)) |
646 | if (count == 0 || (row1 > row2)) |
667 | return 0; |
647 | return 0; |
668 | |
648 | |
669 | want_refresh = 1; |
649 | want_refresh = 1; |
670 | D_SCREEN((stderr, "rxvt_scroll_text(%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); |
650 | D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); |
671 | |
651 | |
672 | if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) |
652 | if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) |
673 | { |
653 | { |
674 | nscrolled = (long)TermWin.nscrolled + (long)count; |
654 | nscrolled = (long)TermWin.nscrolled + (long)count; |
675 | |
655 | |
… | |
… | |
718 | |
698 | |
719 | if (count < 0) |
699 | if (count < 0) |
720 | count = -count; |
700 | count = -count; |
721 | |
701 | |
722 | i = row2 - row1 + 1; |
702 | i = row2 - row1 + 1; |
723 | MIN_IT(count, i); |
703 | MIN_IT (count, i); |
724 | |
704 | |
725 | if (j > 0) |
705 | if (j > 0) |
726 | { |
706 | { |
727 | /* A: scroll up */ |
707 | /* A: scroll up */ |
728 | |
708 | |
… | |
… | |
771 | |
751 | |
772 | if (!spec) /* line length may not equal TermWin.ncol */ |
752 | if (!spec) /* line length may not equal TermWin.ncol */ |
773 | scr_blank_screen_mem (screen.text, screen.rend, |
753 | scr_blank_screen_mem (screen.text, screen.rend, |
774 | (unsigned int)j, rstyle); |
754 | (unsigned int)j, rstyle); |
775 | } |
755 | } |
776 | |
|
|
777 | #ifdef RXVT_GRAPHICS |
|
|
778 | if (Gr_Displayed ()) |
|
|
779 | Gr_scroll (count); |
|
|
780 | #endif |
|
|
781 | |
756 | |
782 | return count; |
757 | return count; |
783 | } |
758 | } |
784 | |
759 | |
785 | /* ------------------------------------------------------------------------- */ |
760 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
799 | return; |
774 | return; |
800 | |
775 | |
801 | want_refresh = 1; |
776 | want_refresh = 1; |
802 | last_col = TermWin.ncol; |
777 | last_col = TermWin.ncol; |
803 | |
778 | |
804 | D_SCREEN((stderr, "rxvt_scr_add_lines(%d,%d)", nlines, len)); |
779 | D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len)); |
805 | ZERO_SCROLLBACK(); |
780 | ZERO_SCROLLBACK (); |
806 | if (nlines > 0) |
781 | if (nlines > 0) |
807 | { |
782 | { |
808 | nlines += (screen.cur.row - screen.bscroll); |
783 | nlines += (screen.cur.row - screen.bscroll); |
809 | if ((nlines > 0) |
784 | if ((nlines > 0) |
810 | && (screen.tscroll == 0) |
785 | && (screen.tscroll == 0) |
811 | && (screen.bscroll == (TermWin.nrow - 1))) |
786 | && (screen.bscroll == (TermWin.nrow - 1))) |
812 | { |
787 | { |
813 | /* _at least_ this many lines need to be scrolled */ |
788 | /* _at least_ this many lines need to be scrolled */ |
814 | scr_scroll_text(screen.tscroll, screen.bscroll, nlines, 0); |
789 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); |
815 | screen.cur.row -= nlines; |
790 | screen.cur.row -= nlines; |
816 | } |
791 | } |
817 | } |
792 | } |
818 | #ifdef DEBUG_STRICT |
793 | #ifdef DEBUG_STRICT |
819 | assert(screen.cur.col < last_col); |
794 | assert (screen.cur.col < last_col); |
820 | assert((screen.cur.row < TermWin.nrow) |
795 | assert ((screen.cur.row < TermWin.nrow) |
821 | && (screen.cur.row >= -(int32_t)TermWin.nscrolled)); |
796 | && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); |
822 | #else /* drive with your eyes closed */ |
797 | #else /* drive with your eyes closed */ |
823 | MIN_IT(screen.cur.col, last_col - 1); |
798 | MIN_IT (screen.cur.col, last_col - 1); |
824 | MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1); |
799 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
825 | MAX_IT(screen.cur.row, -(int32_t)TermWin.nscrolled); |
800 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
826 | #endif |
801 | #endif |
827 | row = screen.cur.row + TermWin.saveLines; |
802 | row = screen.cur.row + TermWin.saveLines; |
828 | |
803 | |
829 | checksel = (selection.op |
804 | checksel = (selection.op |
830 | && current_screen == selection.screen) ? 1 : 0; |
805 | && current_screen == selection.screen) ? 1 : 0; |
… | |
… | |
841 | case '\t': |
816 | case '\t': |
842 | scr_tab (1); |
817 | scr_tab (1); |
843 | continue; |
818 | continue; |
844 | case '\n': |
819 | case '\n': |
845 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
820 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
846 | MAX_IT(screen.tlen[row], screen.cur.col); |
821 | MAX_IT (screen.tlen[row], screen.cur.col); |
847 | screen.flags &= ~Screen_WrapNext; |
822 | screen.flags &= ~Screen_WrapNext; |
848 | if (screen.cur.row == screen.bscroll) |
823 | if (screen.cur.row == screen.bscroll) |
849 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
824 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
850 | else if (screen.cur.row < (TermWin.nrow - 1)) |
825 | else if (screen.cur.row < (TermWin.nrow - 1)) |
851 | row = (++screen.cur.row) + TermWin.saveLines; |
826 | row = (++screen.cur.row) + TermWin.saveLines; |
852 | stp = screen.text[row]; /* _must_ refresh */ |
827 | stp = screen.text[row]; /* _must_ refresh */ |
853 | srp = screen.rend[row]; /* _must_ refresh */ |
828 | srp = screen.rend[row]; /* _must_ refresh */ |
854 | continue; |
829 | continue; |
855 | case '\r': |
830 | case '\r': |
856 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
831 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
857 | MAX_IT(screen.tlen[row], screen.cur.col); |
832 | MAX_IT (screen.tlen[row], screen.cur.col); |
858 | screen.flags &= ~Screen_WrapNext; |
833 | screen.flags &= ~Screen_WrapNext; |
859 | screen.cur.col = 0; |
834 | screen.cur.col = 0; |
860 | continue; |
835 | continue; |
861 | default: |
836 | default: |
862 | if (c == 127) |
837 | if (c == 127) |
863 | continue; /* yummmm..... */ |
838 | continue; /* yummmm..... */ |
864 | break; |
839 | break; |
865 | } |
840 | } |
866 | |
841 | |
867 | if (checksel /* see if we're writing within selection */ |
842 | if (checksel /* see if we're writing within selection */ |
868 | && !ROWCOL_IS_BEFORE(screen.cur, selection.beg) |
843 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
869 | && ROWCOL_IS_BEFORE(screen.cur, selection.end)) |
844 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
870 | { |
845 | { |
871 | checksel = 0; |
846 | checksel = 0; |
872 | clearsel = 1; |
847 | clearsel = 1; |
873 | } |
848 | } |
874 | if (screen.flags & Screen_WrapNext) |
849 | if (screen.flags & Screen_WrapNext) |
875 | { |
850 | { |
876 | screen.tlen[row] = -1; |
851 | screen.tlen[row] = -1; |
877 | if (screen.cur.row == screen.bscroll) |
852 | if (screen.cur.row == screen.bscroll) |
878 | scr_scroll_text(screen.tscroll, screen.bscroll, 1, 0); |
853 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
879 | else if (screen.cur.row < (TermWin.nrow - 1)) |
854 | else if (screen.cur.row < (TermWin.nrow - 1)) |
880 | row = (++screen.cur.row) + TermWin.saveLines; |
855 | row = (++screen.cur.row) + TermWin.saveLines; |
881 | stp = screen.text[row]; /* _must_ refresh */ |
856 | stp = screen.text[row]; /* _must_ refresh */ |
882 | srp = screen.rend[row]; /* _must_ refresh */ |
857 | srp = screen.rend[row]; /* _must_ refresh */ |
883 | screen.cur.col = 0; |
858 | screen.cur.col = 0; |
… | |
… | |
929 | else |
904 | else |
930 | (void)0; /* handle combining character etc. here. */ |
905 | (void)0; /* handle combining character etc. here. */ |
931 | } |
906 | } |
932 | |
907 | |
933 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
908 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
934 | MAX_IT(screen.tlen[row], screen.cur.col); |
909 | MAX_IT (screen.tlen[row], screen.cur.col); |
935 | |
910 | |
936 | /* |
911 | /* |
937 | * If we wrote anywhere in the selected area, kill the selection |
912 | * If we wrote anywhere in the selected area, kill the selection |
938 | * XXX: should we kill the mark too? Possibly, but maybe that |
913 | * XXX: should we kill the mark too? Possibly, but maybe that |
939 | * should be a similar check. |
914 | * should be a similar check. |
940 | */ |
915 | */ |
941 | if (clearsel) |
916 | if (clearsel) |
942 | CLEAR_SELECTION(); |
917 | CLEAR_SELECTION (); |
943 | |
918 | |
944 | #ifdef DEBUG_STRICT |
919 | #ifdef DEBUG_STRICT |
945 | assert(screen.cur.row >= 0); |
920 | assert (screen.cur.row >= 0); |
946 | #else /* drive with your eyes closed */ |
921 | #else /* drive with your eyes closed */ |
947 | MAX_IT(screen.cur.row, 0); |
922 | MAX_IT (screen.cur.row, 0); |
948 | #endif |
923 | #endif |
949 | } |
924 | } |
950 | |
925 | |
951 | /* ------------------------------------------------------------------------- */ |
926 | /* ------------------------------------------------------------------------- */ |
952 | /* |
927 | /* |
… | |
… | |
983 | void |
958 | void |
984 | rxvt_term::scr_tab (int count) |
959 | rxvt_term::scr_tab (int count) |
985 | { |
960 | { |
986 | int i, x; |
961 | int i, x; |
987 | |
962 | |
988 | D_SCREEN((stderr, "rxvt_scr_tab(%d)", count)); |
963 | D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); |
989 | want_refresh = 1; |
964 | want_refresh = 1; |
990 | i = x = screen.cur.col; |
965 | i = x = screen.cur.col; |
991 | if (count == 0) |
966 | if (count == 0) |
992 | return; |
967 | return; |
993 | else if (count > 0) |
968 | else if (count > 0) |
… | |
… | |
1074 | */ |
1049 | */ |
1075 | void |
1050 | void |
1076 | rxvt_term::scr_gotorc (int row, int col, int relative) |
1051 | rxvt_term::scr_gotorc (int row, int col, int relative) |
1077 | { |
1052 | { |
1078 | want_refresh = 1; |
1053 | want_refresh = 1; |
1079 | ZERO_SCROLLBACK(); |
1054 | ZERO_SCROLLBACK (); |
1080 | #ifdef RXVT_GRAPHICS |
|
|
1081 | if (Gr_Displayed ()) |
|
|
1082 | Gr_scroll (0); |
|
|
1083 | #endif |
|
|
1084 | |
1055 | |
1085 | D_SCREEN((stderr, "rxvt_scr_gotorc(r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); |
1056 | D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); |
1086 | |
1057 | |
1087 | screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) |
1058 | screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) |
1088 | : col); |
1059 | : col); |
1089 | MAX_IT(screen.cur.col, 0); |
1060 | MAX_IT (screen.cur.col, 0); |
1090 | MIN_IT(screen.cur.col, (int32_t)TermWin.ncol - 1); |
1061 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1091 | |
1062 | |
1092 | screen.flags &= ~Screen_WrapNext; |
1063 | screen.flags &= ~Screen_WrapNext; |
1093 | if (relative & R_RELATIVE) |
1064 | if (relative & R_RELATIVE) |
1094 | { |
1065 | { |
1095 | if (row > 0) |
1066 | if (row > 0) |
… | |
… | |
1112 | else |
1083 | else |
1113 | { |
1084 | { |
1114 | if (screen.flags & Screen_Relative) |
1085 | if (screen.flags & Screen_Relative) |
1115 | { /* relative origin mode */ |
1086 | { /* relative origin mode */ |
1116 | screen.cur.row = row + screen.tscroll; |
1087 | screen.cur.row = row + screen.tscroll; |
1117 | MIN_IT(screen.cur.row, screen.bscroll); |
1088 | MIN_IT (screen.cur.row, screen.bscroll); |
1118 | } |
1089 | } |
1119 | else |
1090 | else |
1120 | screen.cur.row = row; |
1091 | screen.cur.row = row; |
1121 | } |
1092 | } |
1122 | MAX_IT(screen.cur.row, 0); |
1093 | MAX_IT (screen.cur.row, 0); |
1123 | MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1); |
1094 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1124 | } |
1095 | } |
1125 | |
1096 | |
1126 | /* ------------------------------------------------------------------------- */ |
1097 | /* ------------------------------------------------------------------------- */ |
1127 | /* |
1098 | /* |
1128 | * direction should be UP or DN |
1099 | * direction should be UP or DN |
… | |
… | |
1132 | { |
1103 | { |
1133 | int dirn; |
1104 | int dirn; |
1134 | |
1105 | |
1135 | want_refresh = 1; |
1106 | want_refresh = 1; |
1136 | dirn = ((direction == UP) ? 1 : -1); |
1107 | dirn = ((direction == UP) ? 1 : -1); |
1137 | D_SCREEN((stderr, "rxvt_scr_index(%d)", dirn)); |
1108 | D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); |
1138 | |
1109 | |
1139 | ZERO_SCROLLBACK(); |
1110 | ZERO_SCROLLBACK (); |
1140 | |
|
|
1141 | #ifdef RXVT_GRAPHICS |
|
|
1142 | if (Gr_Displayed ()) |
|
|
1143 | Gr_scroll (0); |
|
|
1144 | #endif |
|
|
1145 | |
1111 | |
1146 | screen.flags &= ~Screen_WrapNext; |
1112 | screen.flags &= ~Screen_WrapNext; |
1147 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1113 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1148 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1114 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1149 | scr_scroll_text(screen.tscroll, screen.bscroll, dirn, 0); |
1115 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); |
1150 | else |
1116 | else |
1151 | screen.cur.row += dirn; |
1117 | screen.cur.row += dirn; |
1152 | MAX_IT(screen.cur.row, 0); |
1118 | MAX_IT (screen.cur.row, 0); |
1153 | MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1); |
1119 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1154 | selection_check (0); |
1120 | selection_check (0); |
1155 | } |
1121 | } |
1156 | |
1122 | |
1157 | /* ------------------------------------------------------------------------- */ |
1123 | /* ------------------------------------------------------------------------- */ |
1158 | /* |
1124 | /* |
… | |
… | |
1165 | rxvt_term::scr_erase_line (int mode) |
1131 | rxvt_term::scr_erase_line (int mode) |
1166 | { |
1132 | { |
1167 | unsigned int row, col, num; |
1133 | unsigned int row, col, num; |
1168 | |
1134 | |
1169 | want_refresh = 1; |
1135 | want_refresh = 1; |
1170 | D_SCREEN((stderr, "rxvt_scr_erase_line(%d) at screen row: %d", mode, screen.cur.row)); |
1136 | D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row)); |
1171 | ZERO_SCROLLBACK (); |
1137 | ZERO_SCROLLBACK (); |
1172 | |
|
|
1173 | #ifdef RXVT_GRAPHICS |
|
|
1174 | if (Gr_Displayed ()) |
|
|
1175 | Gr_scroll (0); |
|
|
1176 | #endif |
|
|
1177 | |
1138 | |
1178 | selection_check (1); |
1139 | selection_check (1); |
1179 | |
1140 | |
1180 | screen.flags &= ~Screen_WrapNext; |
1141 | screen.flags &= ~Screen_WrapNext; |
1181 | |
1142 | |
… | |
… | |
1183 | switch (mode) |
1144 | switch (mode) |
1184 | { |
1145 | { |
1185 | case 0: /* erase to end of line */ |
1146 | case 0: /* erase to end of line */ |
1186 | col = screen.cur.col; |
1147 | col = screen.cur.col; |
1187 | num = TermWin.ncol - col; |
1148 | num = TermWin.ncol - col; |
1188 | MIN_IT(screen.tlen[row], (int16_t)col); |
1149 | MIN_IT (screen.tlen[row], (int16_t)col); |
1189 | if (ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur) |
1150 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1190 | || ROWCOL_IN_ROW_AT_OR_AFTER(selection.end, screen.cur)) |
1151 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1191 | CLEAR_SELECTION(); |
1152 | CLEAR_SELECTION (); |
1192 | break; |
1153 | break; |
1193 | case 1: /* erase to beginning of line */ |
1154 | case 1: /* erase to beginning of line */ |
1194 | col = 0; |
1155 | col = 0; |
1195 | num = screen.cur.col + 1; |
1156 | num = screen.cur.col + 1; |
1196 | if (ROWCOL_IN_ROW_AT_OR_BEFORE(selection.beg, screen.cur) |
1157 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1197 | || ROWCOL_IN_ROW_AT_OR_BEFORE(selection.end, screen.cur)) |
1158 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1198 | CLEAR_SELECTION(); |
1159 | CLEAR_SELECTION (); |
1199 | break; |
1160 | break; |
1200 | case 2: /* erase whole line */ |
1161 | case 2: /* erase whole line */ |
1201 | col = 0; |
1162 | col = 0; |
1202 | num = TermWin.ncol; |
1163 | num = TermWin.ncol; |
1203 | screen.tlen[row] = 0; |
1164 | screen.tlen[row] = 0; |
1204 | if (selection.beg.row <= screen.cur.row |
1165 | if (selection.beg.row <= screen.cur.row |
1205 | && selection.end.row >= screen.cur.row) |
1166 | && selection.end.row >= screen.cur.row) |
1206 | CLEAR_SELECTION(); |
1167 | CLEAR_SELECTION (); |
1207 | break; |
1168 | break; |
1208 | default: |
1169 | default: |
1209 | return; |
1170 | return; |
1210 | } |
1171 | } |
1211 | |
1172 | |
1212 | if (screen.text[row]) |
1173 | if (screen.text[row]) |
1213 | scr_blank_line (&(screen.text[row][col]), |
1174 | scr_blank_line (& (screen.text[row][col]), |
1214 | &(screen.rend[row][col]), num, rstyle); |
1175 | & (screen.rend[row][col]), num, rstyle); |
1215 | else |
1176 | else |
1216 | scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); |
1177 | scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); |
1217 | } |
1178 | } |
1218 | |
1179 | |
1219 | /* ------------------------------------------------------------------------- */ |
1180 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1230 | int32_t row, row_offset; |
1191 | int32_t row, row_offset; |
1231 | rend_t ren; |
1192 | rend_t ren; |
1232 | XGCValues gcvalue; |
1193 | XGCValues gcvalue; |
1233 | |
1194 | |
1234 | want_refresh = 1; |
1195 | want_refresh = 1; |
1235 | D_SCREEN((stderr, "rxvt_scr_erase_screen(%d) at screen row: %d", mode, screen.cur.row)); |
1196 | D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); |
1236 | ZERO_SCROLLBACK (); |
1197 | ZERO_SCROLLBACK (); |
1237 | row_offset = (int32_t)TermWin.saveLines; |
1198 | row_offset = (int32_t)TermWin.saveLines; |
1238 | |
1199 | |
1239 | switch (mode) |
1200 | switch (mode) |
1240 | { |
1201 | { |
… | |
… | |
1250 | row = 0; |
1211 | row = 0; |
1251 | num = screen.cur.row; |
1212 | num = screen.cur.row; |
1252 | break; |
1213 | break; |
1253 | case 2: /* erase whole screen */ |
1214 | case 2: /* erase whole screen */ |
1254 | selection_check (3); |
1215 | selection_check (3); |
1255 | #ifdef RXVT_GRAPHICS |
|
|
1256 | Gr_ClearScreen (); |
|
|
1257 | #endif |
|
|
1258 | row = 0; |
1216 | row = 0; |
1259 | num = TermWin.nrow; |
1217 | num = TermWin.nrow; |
1260 | break; |
1218 | break; |
1261 | default: |
1219 | default: |
1262 | return; |
1220 | return; |
… | |
… | |
1267 | || (selection.end.row >= row |
1225 | || (selection.end.row >= row |
1268 | && selection.end.row <= row + num))) |
1226 | && selection.end.row <= row + num))) |
1269 | CLEAR_SELECTION (); |
1227 | CLEAR_SELECTION (); |
1270 | if (row >= TermWin.nrow) /* Out Of Bounds */ |
1228 | if (row >= TermWin.nrow) /* Out Of Bounds */ |
1271 | return; |
1229 | return; |
1272 | MIN_IT(num, (TermWin.nrow - row)); |
1230 | MIN_IT (num, (TermWin.nrow - row)); |
1273 | if (rstyle & (RS_RVid | RS_Uline)) |
1231 | if (rstyle & (RS_RVid | RS_Uline)) |
1274 | ren = (rend_t) ~RS_None; |
1232 | ren = (rend_t) ~RS_None; |
1275 | else if (GET_BASEBG(rstyle) == Color_bg) |
1233 | else if (GET_BASEBG (rstyle) == Color_bg) |
1276 | { |
1234 | { |
1277 | ren = DEFAULT_RSTYLE; |
1235 | ren = DEFAULT_RSTYLE; |
1278 | CLEAR_ROWS(row, num); |
1236 | CLEAR_ROWS (row, num); |
1279 | } |
1237 | } |
1280 | else |
1238 | else |
1281 | { |
1239 | { |
1282 | ren = (rstyle & (RS_fgMask | RS_bgMask)); |
1240 | ren = (rstyle & (RS_fgMask | RS_bgMask)); |
1283 | gcvalue.foreground = PixColors[GET_BGCOLOR(rstyle)]; |
1241 | gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; |
1284 | XChangeGC(display->display, TermWin.gc, GCForeground, &gcvalue); |
1242 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1285 | ERASE_ROWS(row, num); |
1243 | ERASE_ROWS (row, num); |
1286 | gcvalue.foreground = PixColors[Color_fg]; |
1244 | gcvalue.foreground = PixColors[Color_fg]; |
1287 | XChangeGC(display->display, TermWin.gc, GCForeground, &gcvalue); |
1245 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1288 | } |
1246 | } |
1289 | for (; num--; row++) |
1247 | for (; num--; row++) |
1290 | { |
1248 | { |
1291 | scr_blank_screen_mem (screen.text, screen.rend, |
1249 | scr_blank_screen_mem (screen.text, screen.rend, |
1292 | (unsigned int)(row + row_offset), rstyle); |
1250 | (unsigned int) (row + row_offset), rstyle); |
1293 | screen.tlen[row + row_offset] = 0; |
1251 | screen.tlen[row + row_offset] = 0; |
1294 | scr_blank_line (drawn_text[row], drawn_rend[row], |
1252 | scr_blank_line (drawn_text[row], drawn_rend[row], |
1295 | (unsigned int)TermWin.ncol, ren); |
1253 | (unsigned int)TermWin.ncol, ren); |
1296 | } |
1254 | } |
1297 | } |
1255 | } |
… | |
… | |
1307 | int i, j, k; |
1265 | int i, j, k; |
1308 | rend_t *r1, fs; |
1266 | rend_t *r1, fs; |
1309 | |
1267 | |
1310 | want_refresh = 1; |
1268 | want_refresh = 1; |
1311 | num_scr_allow = 0; |
1269 | num_scr_allow = 0; |
1312 | ZERO_SCROLLBACK(); |
1270 | ZERO_SCROLLBACK (); |
1313 | selection_check (3); |
1271 | selection_check (3); |
1314 | |
1272 | |
1315 | fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); |
1273 | fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); |
1316 | for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) |
1274 | for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) |
1317 | { |
1275 | { |
… | |
… | |
1329 | void |
1287 | void |
1330 | rxvt_term::scr_insdel_lines (int count, int insdel) |
1288 | rxvt_term::scr_insdel_lines (int count, int insdel) |
1331 | { |
1289 | { |
1332 | int end; |
1290 | int end; |
1333 | |
1291 | |
1334 | ZERO_SCROLLBACK(); |
1292 | ZERO_SCROLLBACK (); |
1335 | |
|
|
1336 | #ifdef RXVT_GRAPHICS |
|
|
1337 | if (Gr_Displayed ()) |
|
|
1338 | Gr_scroll (0); |
|
|
1339 | #endif |
|
|
1340 | |
1293 | |
1341 | selection_check (1); |
1294 | selection_check (1); |
1342 | |
1295 | |
1343 | if (screen.cur.row > screen.bscroll) |
1296 | if (screen.cur.row > screen.bscroll) |
1344 | return; |
1297 | return; |
… | |
… | |
1351 | else if (insdel == INSERT) |
1304 | else if (insdel == INSERT) |
1352 | count = end; |
1305 | count = end; |
1353 | } |
1306 | } |
1354 | screen.flags &= ~Screen_WrapNext; |
1307 | screen.flags &= ~Screen_WrapNext; |
1355 | |
1308 | |
1356 | scr_scroll_text(screen.cur.row, screen.bscroll, insdel * count, 0); |
1309 | scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); |
1357 | } |
1310 | } |
1358 | |
1311 | |
1359 | /* ------------------------------------------------------------------------- */ |
1312 | /* ------------------------------------------------------------------------- */ |
1360 | /* |
1313 | /* |
1361 | * Insert/Delete <count> characters from the current position |
1314 | * Insert/Delete <count> characters from the current position |
… | |
… | |
1368 | text_t *stp; |
1321 | text_t *stp; |
1369 | rend_t *srp; |
1322 | rend_t *srp; |
1370 | int16_t *slp; |
1323 | int16_t *slp; |
1371 | |
1324 | |
1372 | want_refresh = 1; |
1325 | want_refresh = 1; |
1373 | ZERO_SCROLLBACK(); |
1326 | ZERO_SCROLLBACK (); |
1374 | |
|
|
1375 | #ifdef RXVT_GRAPHICS |
|
|
1376 | if (Gr_Displayed ()) |
|
|
1377 | Gr_scroll (0); |
|
|
1378 | #endif |
|
|
1379 | |
1327 | |
1380 | if (count <= 0) |
1328 | if (count <= 0) |
1381 | return; |
1329 | return; |
1382 | |
1330 | |
1383 | selection_check (1); |
1331 | selection_check (1); |
1384 | MIN_IT(count, (TermWin.ncol - screen.cur.col)); |
1332 | MIN_IT (count, (TermWin.ncol - screen.cur.col)); |
1385 | |
1333 | |
1386 | row = screen.cur.row + TermWin.saveLines; |
1334 | row = screen.cur.row + TermWin.saveLines; |
1387 | screen.flags &= ~Screen_WrapNext; |
1335 | screen.flags &= ~Screen_WrapNext; |
1388 | |
1336 | |
1389 | stp = screen.text[row]; |
1337 | stp = screen.text[row]; |
1390 | srp = screen.rend[row]; |
1338 | srp = screen.rend[row]; |
1391 | slp = &(screen.tlen[row]); |
1339 | slp = & (screen.tlen[row]); |
1392 | switch (insdel) |
1340 | switch (insdel) |
1393 | { |
1341 | { |
1394 | case INSERT: |
1342 | case INSERT: |
1395 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
1343 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
1396 | col--) |
1344 | col--) |
… | |
… | |
1399 | srp[col] = srp[col - count]; |
1347 | srp[col] = srp[col - count]; |
1400 | } |
1348 | } |
1401 | if (*slp != -1) |
1349 | if (*slp != -1) |
1402 | { |
1350 | { |
1403 | *slp += count; |
1351 | *slp += count; |
1404 | MIN_IT(*slp, TermWin.ncol); |
1352 | MIN_IT (*slp, TermWin.ncol); |
1405 | } |
1353 | } |
1406 | if (selection.op && current_screen == selection.screen |
1354 | if (selection.op && current_screen == selection.screen |
1407 | && ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur)) |
1355 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1408 | { |
1356 | { |
1409 | if (selection.end.row != screen.cur.row |
1357 | if (selection.end.row != screen.cur.row |
1410 | || (selection.end.col + count >= TermWin.ncol)) |
1358 | || (selection.end.col + count >= TermWin.ncol)) |
1411 | CLEAR_SELECTION(); |
1359 | CLEAR_SELECTION (); |
1412 | else |
1360 | else |
1413 | { /* shift selection */ |
1361 | { /* shift selection */ |
1414 | selection.beg.col += count; |
1362 | selection.beg.col += count; |
1415 | selection.mark.col += count; /* XXX: yes? */ |
1363 | selection.mark.col += count; /* XXX: yes? */ |
1416 | selection.end.col += count; |
1364 | selection.end.col += count; |
1417 | } |
1365 | } |
1418 | } |
1366 | } |
1419 | scr_blank_line (&(stp[screen.cur.col]), &(srp[screen.cur.col]), |
1367 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1420 | (unsigned int)count, rstyle); |
1368 | (unsigned int)count, rstyle); |
1421 | break; |
1369 | break; |
1422 | case ERASE: |
1370 | case ERASE: |
1423 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1371 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1424 | selection_check (1); |
1372 | selection_check (1); |
1425 | screen.cur.col -= count; |
1373 | screen.cur.col -= count; |
1426 | scr_blank_line (&(stp[screen.cur.col]), &(srp[screen.cur.col]), |
1374 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1427 | (unsigned int)count, rstyle); |
1375 | (unsigned int)count, rstyle); |
1428 | break; |
1376 | break; |
1429 | case DELETE: |
1377 | case DELETE: |
1430 | tr = srp[TermWin.ncol - 1] |
1378 | tr = srp[TermWin.ncol - 1] |
1431 | & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1379 | & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1432 | for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) |
1380 | for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) |
1433 | { |
1381 | { |
1434 | stp[col] = stp[col + count]; |
1382 | stp[col] = stp[col + count]; |
1435 | srp[col] = srp[col + count]; |
1383 | srp[col] = srp[col + count]; |
1436 | } |
1384 | } |
1437 | scr_blank_line (&(stp[TermWin.ncol - count]), |
1385 | scr_blank_line (& (stp[TermWin.ncol - count]), |
1438 | &(srp[TermWin.ncol - count]), |
1386 | & (srp[TermWin.ncol - count]), |
1439 | (unsigned int)count, tr); |
1387 | (unsigned int)count, tr); |
1440 | if (*slp == -1) /* break line continuation */ |
1388 | if (*slp == -1) /* break line continuation */ |
1441 | *slp = TermWin.ncol; |
1389 | *slp = TermWin.ncol; |
1442 | *slp -= count; |
1390 | *slp -= count; |
1443 | MAX_IT(*slp, 0); |
1391 | MAX_IT (*slp, 0); |
1444 | if (selection.op && current_screen == selection.screen |
1392 | if (selection.op && current_screen == selection.screen |
1445 | && ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur)) |
1393 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1446 | { |
1394 | { |
1447 | if (selection.end.row != screen.cur.row |
1395 | if (selection.end.row != screen.cur.row |
1448 | || (screen.cur.col >= selection.beg.col - count) |
1396 | || (screen.cur.col >= selection.beg.col - count) |
1449 | || selection.end.col >= TermWin.ncol) |
1397 | || selection.end.col >= TermWin.ncol) |
1450 | CLEAR_SELECTION(); |
1398 | CLEAR_SELECTION (); |
1451 | else |
1399 | else |
1452 | { |
1400 | { |
1453 | /* shift selection */ |
1401 | /* shift selection */ |
1454 | selection.beg.col -= count; |
1402 | selection.beg.col -= count; |
1455 | selection.mark.col -= count; /* XXX: yes? */ |
1403 | selection.mark.col -= count; /* XXX: yes? */ |
… | |
… | |
1466 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1414 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1467 | */ |
1415 | */ |
1468 | void |
1416 | void |
1469 | rxvt_term::scr_scroll_region (int top, int bot) |
1417 | rxvt_term::scr_scroll_region (int top, int bot) |
1470 | { |
1418 | { |
1471 | MAX_IT(top, 0); |
1419 | MAX_IT (top, 0); |
1472 | MIN_IT(bot, (int)TermWin.nrow - 1); |
1420 | MIN_IT (bot, (int)TermWin.nrow - 1); |
1473 | if (top > bot) |
1421 | if (top > bot) |
1474 | return; |
1422 | return; |
1475 | screen.tscroll = top; |
1423 | screen.tscroll = top; |
1476 | screen.bscroll = bot; |
1424 | screen.bscroll = bot; |
1477 | scr_gotorc (0, 0, 0); |
1425 | scr_gotorc (0, 0, 0); |
… | |
… | |
1503 | rxvt_term::scr_autowrap (int mode) |
1451 | rxvt_term::scr_autowrap (int mode) |
1504 | { |
1452 | { |
1505 | if (mode) |
1453 | if (mode) |
1506 | screen.flags |= Screen_Autowrap; |
1454 | screen.flags |= Screen_Autowrap; |
1507 | else |
1455 | else |
1508 | screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); |
1456 | screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); |
1509 | } |
1457 | } |
1510 | |
1458 | |
1511 | /* ------------------------------------------------------------------------- */ |
1459 | /* ------------------------------------------------------------------------- */ |
1512 | /* |
1460 | /* |
1513 | * Set/unset margin origin mode |
1461 | * Set/unset margin origin mode |
… | |
… | |
1552 | */ |
1500 | */ |
1553 | void |
1501 | void |
1554 | rxvt_term::scr_set_tab (int mode) |
1502 | rxvt_term::scr_set_tab (int mode) |
1555 | { |
1503 | { |
1556 | if (mode < 0) |
1504 | if (mode < 0) |
1557 | MEMSET(tabs, 0, TermWin.ncol * sizeof(char)); |
1505 | MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); |
1558 | else if (screen.cur.col < TermWin.ncol) |
1506 | else if (screen.cur.col < TermWin.ncol) |
1559 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1507 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1560 | } |
1508 | } |
1561 | |
1509 | |
1562 | /* ------------------------------------------------------------------------- */ |
1510 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1571 | XGCValues gcvalue; |
1519 | XGCValues gcvalue; |
1572 | |
1520 | |
1573 | if (rvideo != mode) |
1521 | if (rvideo != mode) |
1574 | { |
1522 | { |
1575 | rvideo = mode; |
1523 | rvideo = mode; |
1576 | SWAP_IT(PixColors[Color_fg], PixColors[Color_bg], rxvt_color); |
1524 | SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); |
1577 | #if defined(XPM_BACKGROUND) |
1525 | #if defined(XPM_BACKGROUND) |
1578 | if (bgPixmap.pixmap == None) |
1526 | if (bgPixmap.pixmap == None) |
1579 | #endif |
1527 | #endif |
1580 | #if defined(TRANSPARENT) |
1528 | #if defined(TRANSPARENT) |
1581 | if (!(Options & Opt_transparent) || am_transparent == 0) |
1529 | if (! (Options & Opt_transparent) || am_transparent == 0) |
1582 | #endif |
1530 | #endif |
1583 | XSetWindowBackground(display->display, TermWin.vt, |
1531 | XSetWindowBackground (display->display, TermWin.vt, |
1584 | PixColors[Color_bg]); |
1532 | PixColors[Color_bg]); |
1585 | |
1533 | |
1586 | gcvalue.foreground = PixColors[Color_fg]; |
1534 | gcvalue.foreground = PixColors[Color_fg]; |
1587 | gcvalue.background = PixColors[Color_bg]; |
1535 | gcvalue.background = PixColors[Color_bg]; |
1588 | XChangeGC(display->display, TermWin.gc, GCBackground | GCForeground, |
1536 | XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, |
1589 | &gcvalue); |
1537 | &gcvalue); |
1590 | scr_clear (); |
1538 | scr_clear (); |
1591 | scr_touch (true); |
1539 | scr_touch (true); |
1592 | } |
1540 | } |
1593 | } |
1541 | } |
… | |
… | |
1598 | * XTERM_SEQ: Report position: ESC [ 6 n |
1546 | * XTERM_SEQ: Report position: ESC [ 6 n |
1599 | */ |
1547 | */ |
1600 | void |
1548 | void |
1601 | rxvt_term::scr_report_position () |
1549 | rxvt_term::scr_report_position () |
1602 | { |
1550 | { |
1603 | tt_printf("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1551 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1604 | } |
1552 | } |
1605 | |
1553 | |
1606 | /* ------------------------------------------------------------------------- * |
1554 | /* ------------------------------------------------------------------------- * |
1607 | * FONTS * |
1555 | * FONTS * |
1608 | * ------------------------------------------------------------------------- */ |
1556 | * ------------------------------------------------------------------------- */ |
… | |
… | |
1709 | |
1657 | |
1710 | if (drawn_text == NULL) /* sanity check */ |
1658 | if (drawn_text == NULL) /* sanity check */ |
1711 | return; |
1659 | return; |
1712 | |
1660 | |
1713 | #ifdef DEBUG_STRICT |
1661 | #ifdef DEBUG_STRICT |
1714 | x = max(x, (int)TermWin.int_bwidth); |
1662 | x = max (x, (int)TermWin.int_bwidth); |
1715 | x = min(x, (int)TermWin.width); |
1663 | x = min (x, (int)TermWin.width); |
1716 | y = max(y, (int)TermWin.int_bwidth); |
1664 | y = max (y, (int)TermWin.int_bwidth); |
1717 | y = min(y, (int)TermWin.height); |
1665 | y = min (y, (int)TermWin.height); |
1718 | #endif |
1666 | #endif |
1719 | |
1667 | |
1720 | /* round down */ |
1668 | /* round down */ |
1721 | rc[PART_BEG].col = Pixel2Col(x); |
1669 | rc[PART_BEG].col = Pixel2Col (x); |
1722 | rc[PART_BEG].row = Pixel2Row(y); |
1670 | rc[PART_BEG].row = Pixel2Row (y); |
1723 | /* round up */ |
1671 | /* round up */ |
1724 | rc[PART_END].col = Pixel2Width(x + width + TermWin.fwidth - 1); |
1672 | rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); |
1725 | rc[PART_END].row = Pixel2Row(y + height + TermWin.fheight - 1); |
1673 | rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); |
1726 | |
1674 | |
1727 | /* sanity checks */ |
1675 | /* sanity checks */ |
1728 | for (i = PART_BEG; i < RC_COUNT; i++) |
1676 | for (i = PART_BEG; i < RC_COUNT; i++) |
1729 | { |
1677 | { |
1730 | MIN_IT(rc[i].col, TermWin.ncol - 1); |
1678 | MIN_IT (rc[i].col, TermWin.ncol - 1); |
1731 | MIN_IT(rc[i].row, TermWin.nrow - 1); |
1679 | MIN_IT (rc[i].row, TermWin.nrow - 1); |
1732 | } |
1680 | } |
1733 | |
1681 | |
1734 | D_SCREEN((stderr, "rxvt_scr_expose(x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)-(c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row)); |
1682 | D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row)); |
1735 | |
1683 | |
1736 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1684 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1737 | fill_text (&(drawn_text[i][rc[PART_BEG].col]), 0, |
1685 | fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, |
1738 | (rc[PART_END].col - rc[PART_BEG].col + 1)); |
1686 | (rc[PART_END].col - rc[PART_BEG].col + 1)); |
1739 | |
1687 | |
1740 | if (refresh) |
1688 | if (refresh) |
1741 | scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); |
1689 | scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); |
1742 | } |
1690 | } |
… | |
… | |
1764 | |
1712 | |
1765 | oldviewstart = TermWin.view_start; |
1713 | oldviewstart = TermWin.view_start; |
1766 | if (y < len) |
1714 | if (y < len) |
1767 | { |
1715 | { |
1768 | p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; |
1716 | p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; |
1769 | p -= (long)(TermWin.nrow - 1); |
1717 | p -= (long) (TermWin.nrow - 1); |
1770 | p = max(p, 0); |
1718 | p = max (p, 0); |
1771 | } |
1719 | } |
1772 | TermWin.view_start = (uint16_t)min(p, TermWin.nscrolled); |
1720 | TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); |
1773 | D_SCREEN((stderr, "rxvt_scr_move_to(%d, %d) view_start:%d", y, len, TermWin.view_start)); |
1721 | D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start)); |
1774 | |
1722 | |
1775 | return scr_changeview (oldviewstart); |
1723 | return scr_changeview (oldviewstart); |
1776 | } |
1724 | } |
1777 | |
1725 | |
1778 | /* ------------------------------------------------------------------------- */ |
1726 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1784 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1732 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1785 | { |
1733 | { |
1786 | int n; |
1734 | int n; |
1787 | uint16_t oldviewstart; |
1735 | uint16_t oldviewstart; |
1788 | |
1736 | |
1789 | D_SCREEN((stderr, "rxvt_scr_page(%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); |
1737 | D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); |
1790 | #ifdef DEBUG_STRICT |
1738 | #ifdef DEBUG_STRICT |
1791 | assert((nlines >= 0) && (nlines <= TermWin.nrow)); |
1739 | assert ((nlines >= 0) && (nlines <= TermWin.nrow)); |
1792 | #endif |
1740 | #endif |
1793 | oldviewstart = TermWin.view_start; |
1741 | oldviewstart = TermWin.view_start; |
1794 | if (direction == UP) |
1742 | if (direction == UP) |
1795 | { |
1743 | { |
1796 | n = TermWin.view_start + nlines; |
1744 | n = TermWin.view_start + nlines; |
1797 | TermWin.view_start = min(n, TermWin.nscrolled); |
1745 | TermWin.view_start = min (n, TermWin.nscrolled); |
1798 | } |
1746 | } |
1799 | else |
1747 | else |
1800 | { |
1748 | { |
1801 | n = TermWin.view_start - nlines; |
1749 | n = TermWin.view_start - nlines; |
1802 | TermWin.view_start = max(n, 0); |
1750 | TermWin.view_start = max (n, 0); |
1803 | } |
1751 | } |
1804 | return scr_changeview (oldviewstart); |
1752 | return scr_changeview (oldviewstart); |
1805 | } |
1753 | } |
1806 | |
1754 | |
1807 | int |
1755 | int |
1808 | rxvt_term::scr_changeview (uint16_t oldviewstart) |
1756 | rxvt_term::scr_changeview (uint16_t oldviewstart) |
1809 | { |
1757 | { |
1810 | if (TermWin.view_start != oldviewstart) |
1758 | if (TermWin.view_start != oldviewstart) |
1811 | { |
1759 | { |
1812 | want_refresh = 1; |
1760 | want_refresh = 1; |
1813 | #ifdef RXVT_GRAPHICS |
|
|
1814 | if (Gr_Displayed ()) |
|
|
1815 | Gr_scroll (0); |
|
|
1816 | #endif |
|
|
1817 | num_scr -= (TermWin.view_start - oldviewstart); |
1761 | num_scr -= (TermWin.view_start - oldviewstart); |
1818 | } |
1762 | } |
1819 | return (int)(TermWin.view_start - oldviewstart); |
1763 | return (int) (TermWin.view_start - oldviewstart); |
1820 | } |
1764 | } |
1821 | |
1765 | |
1822 | /* ------------------------------------------------------------------------- */ |
1766 | /* ------------------------------------------------------------------------- */ |
1823 | void |
1767 | void |
1824 | rxvt_term::scr_bell () |
1768 | rxvt_term::scr_bell () |
… | |
… | |
1826 | #ifndef NO_BELL |
1770 | #ifndef NO_BELL |
1827 | # ifndef NO_MAPALERT |
1771 | # ifndef NO_MAPALERT |
1828 | # ifdef MAPALERT_OPTION |
1772 | # ifdef MAPALERT_OPTION |
1829 | if (Options & Opt_mapAlert) |
1773 | if (Options & Opt_mapAlert) |
1830 | # endif |
1774 | # endif |
1831 | XMapWindow(display->display, TermWin.parent[0]); |
1775 | XMapWindow (display->display, TermWin.parent[0]); |
1832 | # endif |
1776 | # endif |
1833 | if (Options & Opt_visualBell) |
1777 | if (Options & Opt_visualBell) |
1834 | { |
1778 | { |
1835 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1779 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1836 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1780 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1837 | } |
1781 | } |
1838 | else |
1782 | else |
1839 | XBell(display->display, 0); |
1783 | XBell (display->display, 0); |
1840 | #endif |
1784 | #endif |
1841 | } |
1785 | } |
1842 | |
1786 | |
1843 | /* ------------------------------------------------------------------------- */ |
1787 | /* ------------------------------------------------------------------------- */ |
1844 | /* ARGSUSED */ |
1788 | /* ARGSUSED */ |
… | |
… | |
1864 | |
1808 | |
1865 | for (r1 = 0; r1 < nrows; r1++) |
1809 | for (r1 = 0; r1 < nrows; r1++) |
1866 | { |
1810 | { |
1867 | t = screen.text[r1 + row_offset]; |
1811 | t = screen.text[r1 + row_offset]; |
1868 | for (i = TermWin.ncol - 1; i >= 0; i--) |
1812 | for (i = TermWin.ncol - 1; i >= 0; i--) |
1869 | if (!isspace(t[i])) |
1813 | if (!isspace (t[i])) |
1870 | break; |
1814 | break; |
1871 | fprintf(fd, "%.*s\n", (i + 1), t); |
1815 | fprintf (fd, "%.*s\n", (i + 1), t); |
1872 | } |
1816 | } |
1873 | pclose_printer (fd); |
1817 | pclose_printer (fd); |
1874 | #endif |
1818 | #endif |
1875 | } |
1819 | } |
1876 | |
1820 | |
… | |
… | |
1880 | * drawn_text/drawn_rend contain the screen information before the update. |
1824 | * drawn_text/drawn_rend contain the screen information before the update. |
1881 | * screen.text/screen.rend contain what the screen will change to. |
1825 | * screen.text/screen.rend contain what the screen will change to. |
1882 | */ |
1826 | */ |
1883 | |
1827 | |
1884 | #define FONT_WIDTH(X, Y) \ |
1828 | #define FONT_WIDTH(X, Y) \ |
1885 | (X)->per_char[(Y) - (X)->min_char_or_byte2].width |
1829 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].width |
1886 | #define FONT_RBEAR(X, Y) \ |
1830 | #define FONT_RBEAR(X, Y) \ |
1887 | (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing |
1831 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing |
1888 | #define FONT_LBEAR(X, Y) \ |
1832 | #define FONT_LBEAR(X, Y) \ |
1889 | (X)->per_char[(Y) - (X)->min_char_or_byte2].lbearing |
1833 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing |
1890 | #define IS_FONT_CHAR(X, Y) \ |
1834 | #define IS_FONT_CHAR(X, Y) \ |
1891 | ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) |
1835 | ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) |
1892 | |
1836 | |
1893 | void |
1837 | void |
1894 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1838 | rxvt_term::scr_refresh (unsigned char refresh_type) |
… | |
… | |
1902 | ocrow; /* old cursor row */ |
1846 | ocrow; /* old cursor row */ |
1903 | int cursorwidth; |
1847 | int cursorwidth; |
1904 | int i, /* tmp */ |
1848 | int i, /* tmp */ |
1905 | row_offset; /* basic offset in screen structure */ |
1849 | row_offset; /* basic offset in screen structure */ |
1906 | #ifndef NO_CURSORCOLOR |
1850 | #ifndef NO_CURSORCOLOR |
1907 | rend_t cc1; /* store colours at cursor position(s) */ |
1851 | rend_t cc1; /* store colours at cursor position (s) */ |
1908 | #endif |
1852 | #endif |
1909 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
1853 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
1910 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
1854 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
1911 | |
1855 | |
1912 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
1856 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
… | |
… | |
1939 | * B: reverse any characters which are selected |
1883 | * B: reverse any characters which are selected |
1940 | */ |
1884 | */ |
1941 | scr_reverse_selection (); |
1885 | scr_reverse_selection (); |
1942 | |
1886 | |
1943 | /* |
1887 | /* |
1944 | * C: set the cursor character(s) |
1888 | * C: set the cursor character (s) |
1945 | */ |
1889 | */ |
1946 | { |
1890 | { |
1947 | unsigned char setoldcursor; |
1891 | unsigned char setoldcursor; |
1948 | rend_t ccol1, /* Cursor colour */ |
1892 | rend_t ccol1, /* Cursor colour */ |
1949 | ccol2; /* Cursor colour2 */ |
1893 | ccol2; /* Cursor colour2 */ |
… | |
… | |
1959 | |
1903 | |
1960 | if (showcursor) |
1904 | if (showcursor) |
1961 | { |
1905 | { |
1962 | cursorwidth++; |
1906 | cursorwidth++; |
1963 | |
1907 | |
1964 | srp = &(screen.rend[screen.cur.row + TermWin.saveLines] |
1908 | srp = & (screen.rend[screen.cur.row + TermWin.saveLines] |
1965 | [screen.cur.col]); |
1909 | [screen.cur.col]); |
1966 | |
1910 | |
1967 | if (showcursor && TermWin.focus) |
1911 | if (showcursor && TermWin.focus) |
1968 | { |
1912 | { |
1969 | *srp ^= RS_RVid; |
1913 | *srp ^= RS_RVid; |
… | |
… | |
1971 | cc1 = *srp & (RS_fgMask | RS_bgMask); |
1915 | cc1 = *srp & (RS_fgMask | RS_bgMask); |
1972 | if (ISSET_PIXCOLOR (Color_cursor)) |
1916 | if (ISSET_PIXCOLOR (Color_cursor)) |
1973 | ccol1 = Color_cursor; |
1917 | ccol1 = Color_cursor; |
1974 | else |
1918 | else |
1975 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1919 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1976 | ccol1 = GET_FGCOLOR(rstyle); |
1920 | ccol1 = GET_FGCOLOR (rstyle); |
1977 | #else |
1921 | #else |
1978 | ccol1 = Color_fg; |
1922 | ccol1 = Color_fg; |
1979 | #endif |
1923 | #endif |
1980 | if (ISSET_PIXCOLOR (Color_cursor2)) |
1924 | if (ISSET_PIXCOLOR (Color_cursor2)) |
1981 | ccol2 = Color_cursor2; |
1925 | ccol2 = Color_cursor2; |
1982 | else |
1926 | else |
1983 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1927 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1984 | ccol2 = GET_BGCOLOR(rstyle); |
1928 | ccol2 = GET_BGCOLOR (rstyle); |
1985 | #else |
1929 | #else |
1986 | ccol2 = Color_bg; |
1930 | ccol2 = Color_bg; |
1987 | #endif |
1931 | #endif |
1988 | *srp = SET_FGCOLOR(*srp, ccol1); |
1932 | *srp = SET_FGCOLOR (*srp, ccol1); |
1989 | *srp = SET_BGCOLOR(*srp, ccol2); |
1933 | *srp = SET_BGCOLOR (*srp, ccol2); |
1990 | #endif |
1934 | #endif |
1991 | |
1935 | |
1992 | } |
1936 | } |
1993 | } |
1937 | } |
1994 | |
1938 | |
… | |
… | |
2029 | * D: CopyArea pass - very useful for slower links |
1973 | * D: CopyArea pass - very useful for slower links |
2030 | * This has been deliberately kept simple. |
1974 | * This has been deliberately kept simple. |
2031 | */ |
1975 | */ |
2032 | i = num_scr; |
1976 | i = num_scr; |
2033 | if (refresh_type == FAST_REFRESH && num_scr_allow && i |
1977 | if (refresh_type == FAST_REFRESH && num_scr_allow && i |
2034 | && abs(i) < TermWin.nrow && !must_clear) |
1978 | && abs (i) < TermWin.nrow && !must_clear) |
2035 | { |
1979 | { |
2036 | int16_t nits; |
1980 | int16_t nits; |
2037 | int j; |
1981 | int j; |
2038 | rend_t *drp2; |
1982 | rend_t *drp2; |
2039 | text_t *dtp2; |
1983 | text_t *dtp2; |
… | |
… | |
2077 | |
2021 | |
2078 | if (len != -1) |
2022 | if (len != -1) |
2079 | { |
2023 | { |
2080 | /* also comes here at end if needed because of >= above */ |
2024 | /* also comes here at end if needed because of >= above */ |
2081 | if (wlen < len) |
2025 | if (wlen < len) |
2082 | SWAP_IT(wlen, len, int); |
2026 | SWAP_IT (wlen, len, int); |
2083 | |
2027 | |
2084 | D_SCREEN((stderr, "rxvt_scr_refresh(): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); |
2028 | D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); |
2085 | XCopyArea (display->display, TermWin.vt, TermWin.vt, |
2029 | XCopyArea (display->display, TermWin.vt, TermWin.vt, |
2086 | TermWin.gc, 0, Row2Pixel (len + i), |
2030 | TermWin.gc, 0, Row2Pixel (len + i), |
2087 | (unsigned int)TermWin_TotalWidth (), |
2031 | (unsigned int)TermWin_TotalWidth (), |
2088 | (unsigned int)Height2Pixel (wlen - len + 1), |
2032 | (unsigned int)Height2Pixel (wlen - len + 1), |
2089 | 0, Row2Pixel (len)); |
2033 | 0, Row2Pixel (len)); |
… | |
… | |
2104 | drp = drawn_rend[row]; |
2048 | drp = drawn_rend[row]; |
2105 | |
2049 | |
2106 | /* |
2050 | /* |
2107 | * E2: OK, now the real pass |
2051 | * E2: OK, now the real pass |
2108 | */ |
2052 | */ |
2109 | int ypixel = (int)Row2Pixel(row); |
2053 | int ypixel = (int)Row2Pixel (row); |
2110 | |
2054 | |
2111 | for (col = 0; col < TermWin.ncol; col++) |
2055 | for (col = 0; col < TermWin.ncol; col++) |
2112 | { |
2056 | { |
2113 | /* compare new text with old - if exactly the same then continue */ |
2057 | /* compare new text with old - if exactly the same then continue */ |
2114 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2058 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2115 | |
2059 | |
2116 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2060 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2117 | && (rend == drp[col] /* Either rendition the same or */ |
2061 | && (rend == drp[col] /* Either rendition the same or */ |
2118 | || (stp[col] == ' ' /* space w/ no background change */ |
2062 | || (stp[col] == ' ' /* space w/ no background change */ |
2119 | && GET_BGATTR(rend) == GET_BGATTR(drp[col])))) |
2063 | && GET_BGATTR (rend) == GET_BGATTR (drp[col])))) |
2120 | continue; |
2064 | continue; |
2121 | |
2065 | |
2122 | text_t *text = stp + col; |
2066 | text_t *text = stp + col; |
2123 | int count = 1; |
2067 | int count = 1; |
2124 | |
2068 | |
… | |
… | |
2128 | drp[col] = rend; |
2072 | drp[col] = rend; |
2129 | |
2073 | |
2130 | if (*text == NOCHAR) // never start redrawing at invisible characters. */ |
2074 | if (*text == NOCHAR) // never start redrawing at invisible characters. */ |
2131 | continue; |
2075 | continue; |
2132 | |
2076 | |
2133 | int xpixel = Col2Pixel(col); |
2077 | int xpixel = Col2Pixel (col); |
2134 | |
2078 | |
2135 | // this loop looks very messy, it can probably be optimized |
2079 | // this loop looks very messy, it can probably be optimized |
2136 | // and cleaned a bit by you? |
2080 | // and cleaned a bit by you? |
2137 | for (i = 0; ++col < TermWin.ncol; ) |
2081 | for (i = 0; ++col < TermWin.ncol; ) |
2138 | { |
2082 | { |
… | |
… | |
2177 | int fore = GET_FGCOLOR (rend); // desired foreground |
2121 | int fore = GET_FGCOLOR (rend); // desired foreground |
2178 | int back = GET_BGCOLOR (rend); // desired background |
2122 | int back = GET_BGCOLOR (rend); // desired background |
2179 | |
2123 | |
2180 | rend = GET_ATTR (rend); |
2124 | rend = GET_ATTR (rend); |
2181 | |
2125 | |
2182 | rvid = !!(rend & RS_RVid); |
2126 | rvid = !! (rend & RS_RVid); |
2183 | if (rvid) |
2127 | if (rvid) |
2184 | { |
2128 | { |
2185 | SWAP_IT(fore, back, int); |
2129 | SWAP_IT (fore, back, int); |
2186 | |
2130 | |
2187 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2131 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2188 | if (ISSET_PIXCOLOR (Color_RV) |
2132 | if (ISSET_PIXCOLOR (Color_RV) |
2189 | # ifndef NO_CURSORCOLOR |
2133 | # ifndef NO_CURSORCOLOR |
2190 | && !ISSET_PIXCOLOR (Color_cursor) |
2134 | && !ISSET_PIXCOLOR (Color_cursor) |
… | |
… | |
2225 | * Actually do the drawing of the string here |
2169 | * Actually do the drawing of the string here |
2226 | */ |
2170 | */ |
2227 | rxvt_font *font = (*TermWin.fontset)[fid]; |
2171 | rxvt_font *font = (*TermWin.fontset)[fid]; |
2228 | |
2172 | |
2229 | if (back == fore) |
2173 | if (back == fore) |
2230 | font->clear_rect (xpixel, ypixel, |
2174 | font->clear_rect (*TermWin.drawable, xpixel, ypixel, |
2231 | TermWin.fwidth * count, TermWin.fheight, |
2175 | TermWin.fwidth * count, TermWin.fheight, |
2232 | back); |
2176 | back); |
2233 | else if (back == Color_bg) |
2177 | else if (back == Color_bg) |
2234 | { |
2178 | { |
2235 | if (must_clear) |
2179 | if (must_clear) |
… | |
… | |
2237 | CLEAR_CHARS (xpixel, ypixel, count); |
2181 | CLEAR_CHARS (xpixel, ypixel, count); |
2238 | |
2182 | |
2239 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2183 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2240 | if (text[i] != ' ') |
2184 | if (text[i] != ' ') |
2241 | { |
2185 | { |
2242 | font->draw (xpixel, ypixel, text, count, fore, -1); |
2186 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); |
2243 | break; |
2187 | break; |
2244 | } |
2188 | } |
2245 | } |
2189 | } |
2246 | else |
2190 | else |
2247 | font->draw (xpixel, ypixel, text, count, fore, Color_bg); |
2191 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2248 | } |
2192 | } |
2249 | else |
2193 | else |
2250 | font->draw (xpixel, ypixel, text, count, fore, back); |
2194 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2251 | |
2195 | |
2252 | if ((rend & RS_Uline) && (font->descent > 1)) |
2196 | if ((rend & RS_Uline) && (font->descent > 1)) |
2253 | XDrawLine(display->display, drawBuffer, TermWin.gc, |
2197 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2254 | xpixel, ypixel + font->ascent + 1, |
2198 | xpixel, ypixel + font->ascent + 1, |
2255 | xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1); |
2199 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2256 | } /* for (col....) */ |
2200 | } /* for (col....) */ |
2257 | } /* for (row....) */ |
2201 | } /* for (row....) */ |
2258 | |
2202 | |
2259 | /* |
2203 | /* |
2260 | * G: cleanup cursor and display outline cursor if necessary |
2204 | * G: cleanup cursor and display outline cursor if necessary |
2261 | */ |
2205 | */ |
2262 | if (showcursor) |
2206 | if (showcursor) |
2263 | { |
2207 | { |
2264 | if (TermWin.focus) |
2208 | if (TermWin.focus) |
2265 | { |
2209 | { |
2266 | srp = &(screen.rend[screen.cur.row + TermWin.saveLines] |
2210 | srp = & (screen.rend[screen.cur.row + TermWin.saveLines] |
2267 | [screen.cur.col]); |
2211 | [screen.cur.col]); |
2268 | *srp ^= RS_RVid; |
2212 | *srp ^= RS_RVid; |
2269 | #ifndef NO_CURSORCOLOR |
2213 | #ifndef NO_CURSORCOLOR |
2270 | *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1; |
2214 | *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2271 | #endif |
2215 | #endif |
2272 | |
2216 | |
2273 | } |
2217 | } |
2274 | else if (oldcursor.row >= 0) |
2218 | else if (oldcursor.row >= 0) |
2275 | { |
2219 | { |
2276 | #ifndef NO_CURSORCOLOR |
2220 | #ifndef NO_CURSORCOLOR |
2277 | if (ISSET_PIXCOLOR (Color_cursor)) |
2221 | if (ISSET_PIXCOLOR (Color_cursor)) |
2278 | XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); |
2222 | XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); |
2279 | #endif |
2223 | #endif |
2280 | XDrawRectangle(display->display, drawBuffer, TermWin.gc, |
2224 | XDrawRectangle (display->display, drawBuffer, TermWin.gc, |
2281 | Col2Pixel(oldcursor.col), |
2225 | Col2Pixel (oldcursor.col), |
2282 | Row2Pixel(oldcursor.row), |
2226 | Row2Pixel (oldcursor.row), |
2283 | (unsigned int)(Width2Pixel(cursorwidth) - 1), |
2227 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2284 | (unsigned int)(Height2Pixel(1) - TermWin.lineSpace - 1)); |
2228 | (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); |
2285 | } |
2229 | } |
2286 | } |
2230 | } |
2287 | |
2231 | |
2288 | /* |
2232 | /* |
2289 | * H: cleanup selection |
2233 | * H: cleanup selection |
… | |
… | |
2296 | if (clearfirst && TermWin.int_bwidth) |
2240 | if (clearfirst && TermWin.int_bwidth) |
2297 | /* |
2241 | /* |
2298 | * clear the whole screen height, note that width == 0 is treated |
2242 | * clear the whole screen height, note that width == 0 is treated |
2299 | * specially by XClearArea |
2243 | * specially by XClearArea |
2300 | */ |
2244 | */ |
2301 | XClearArea(display->display, TermWin.vt, 0, 0, |
2245 | XClearArea (display->display, TermWin.vt, 0, 0, |
2302 | (unsigned int)TermWin.int_bwidth, |
2246 | (unsigned int)TermWin.int_bwidth, |
2303 | (unsigned int)TermWin_TotalHeight(), False); |
2247 | (unsigned int)TermWin_TotalHeight (), False); |
2304 | if (clearlast && TermWin.int_bwidth) |
2248 | if (clearlast && TermWin.int_bwidth) |
2305 | /* |
2249 | /* |
2306 | * clear the whole screen height, note that width == 0 is treated |
2250 | * clear the whole screen height, note that width == 0 is treated |
2307 | * specially by XClearArea |
2251 | * specially by XClearArea |
2308 | */ |
2252 | */ |
2309 | XClearArea(display->display, TermWin.vt, |
2253 | XClearArea (display->display, TermWin.vt, |
2310 | TermWin.width + TermWin.int_bwidth, 0, |
2254 | TermWin.width + TermWin.int_bwidth, 0, |
2311 | (unsigned int)TermWin.int_bwidth, |
2255 | (unsigned int)TermWin.int_bwidth, |
2312 | (unsigned int)TermWin_TotalHeight(), False); |
2256 | (unsigned int)TermWin_TotalHeight (), False); |
2313 | if (refresh_type & SMOOTH_REFRESH) |
2257 | if (refresh_type & SMOOTH_REFRESH) |
2314 | XSync(display->display, False); |
2258 | XSync (display->display, False); |
2315 | |
2259 | |
2316 | num_scr = 0; |
2260 | num_scr = 0; |
2317 | num_scr_allow = 1; |
2261 | num_scr_allow = 1; |
2318 | want_refresh = 0; /* screen is current */ |
2262 | want_refresh = 0; /* screen is current */ |
2319 | } |
2263 | } |
2320 | |
2264 | |
2321 | /* ------------------------------------------------------------------------- */ |
|
|
2322 | void |
2265 | void |
|
|
2266 | rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) |
|
|
2267 | { |
|
|
2268 | if (!rp || !tp) |
|
|
2269 | return; |
|
|
2270 | |
|
|
2271 | for (int i = TermWin.ncol; i; i--, rp++, tp++) |
|
|
2272 | *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); |
|
|
2273 | } |
|
|
2274 | |
|
|
2275 | void |
|
|
2276 | rxvt_term::scr_remap_chars () |
|
|
2277 | { |
|
|
2278 | for (int i = TermWin.nrow + TermWin.saveLines; i--; ) |
|
|
2279 | scr_remap_chars (screen.text[i], screen.rend[i]); |
|
|
2280 | |
|
|
2281 | for (int i = TermWin.nrow; i--; ) |
|
|
2282 | { |
|
|
2283 | scr_remap_chars (drawn_text[i], drawn_rend[i]); |
|
|
2284 | scr_remap_chars (swap.text[i], swap.rend[i]); |
|
|
2285 | } |
|
|
2286 | } |
|
|
2287 | |
|
|
2288 | /* ------------------------------------------------------------------------- */ |
|
|
2289 | void |
2323 | rxvt_term::scr_clear() |
2290 | rxvt_term::scr_clear () |
2324 | { |
2291 | { |
2325 | if (!TermWin.mapped) |
2292 | if (!TermWin.mapped) |
2326 | return; |
2293 | return; |
2327 | |
2294 | |
2328 | num_scr_allow = 0; |
2295 | num_scr_allow = 0; |
… | |
… | |
2330 | #ifdef TRANSPARENT |
2297 | #ifdef TRANSPARENT |
2331 | if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) |
2298 | if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) |
2332 | { |
2299 | { |
2333 | int i; |
2300 | int i; |
2334 | |
2301 | |
2335 | if (!(Options & Opt_transparent_all)) |
2302 | if (! (Options & Opt_transparent_all)) |
2336 | i = 0; |
2303 | i = 0; |
2337 | else |
2304 | else |
2338 | i = (int)(sizeof(TermWin.parent) / sizeof(Window)); |
2305 | i = (int) (sizeof (TermWin.parent) / sizeof (Window)); |
2339 | |
2306 | |
2340 | while (i--) |
2307 | while (i--) |
2341 | if (TermWin.parent[i] != None) |
2308 | if (TermWin.parent[i] != None) |
2342 | XClearWindow(display->display, TermWin.parent[i]); |
2309 | XClearWindow (display->display, TermWin.parent[i]); |
2343 | } |
2310 | } |
2344 | #endif |
2311 | #endif |
2345 | |
2312 | |
2346 | XClearWindow (display->display, TermWin.vt); |
2313 | XClearWindow (display->display, TermWin.vt); |
2347 | } |
2314 | } |
… | |
… | |
2393 | { |
2360 | { |
2394 | width = screen.tlen[row] >= 0 ? screen.tlen[row] |
2361 | width = screen.tlen[row] >= 0 ? screen.tlen[row] |
2395 | : TermWin.ncol; |
2362 | : TermWin.ncol; |
2396 | for (towrite = width; towrite; towrite -= wrote) |
2363 | for (towrite = width; towrite; towrite -= wrote) |
2397 | { |
2364 | { |
2398 | wrote = write(fd, &(screen.text[row][width - towrite]), |
2365 | wrote = write (fd, & (screen.text[row][width - towrite]), |
2399 | towrite); |
2366 | towrite); |
2400 | if (wrote < 0) |
2367 | if (wrote < 0) |
2401 | return; /* XXX: death, no report */ |
2368 | return; /* XXX: death, no report */ |
2402 | } |
2369 | } |
2403 | if (screen.tlen[row] >= 0) |
2370 | if (screen.tlen[row] >= 0) |
2404 | if (write(fd, r1, 1) <= 0) |
2371 | if (write (fd, r1, 1) <= 0) |
2405 | return; /* XXX: death, no report */ |
2372 | return; /* XXX: death, no report */ |
2406 | } |
2373 | } |
2407 | } |
2374 | } |
2408 | #endif |
2375 | #endif |
2409 | |
2376 | |
… | |
… | |
2421 | |
2388 | |
2422 | if (!selection.op) |
2389 | if (!selection.op) |
2423 | return; |
2390 | return; |
2424 | |
2391 | |
2425 | pos.row = pos.col = 0; |
2392 | pos.row = pos.col = 0; |
2426 | if ((selection.beg.row < -(int32_t)TermWin.nscrolled) |
2393 | if ((selection.beg.row < - (int32_t)TermWin.nscrolled) |
2427 | || (selection.beg.row >= TermWin.nrow) |
2394 | || (selection.beg.row >= TermWin.nrow) |
2428 | || (selection.mark.row < -(int32_t)TermWin.nscrolled) |
2395 | || (selection.mark.row < - (int32_t)TermWin.nscrolled) |
2429 | || (selection.mark.row >= TermWin.nrow) |
2396 | || (selection.mark.row >= TermWin.nrow) |
2430 | || (selection.end.row < -(int32_t)TermWin.nscrolled) |
2397 | || (selection.end.row < - (int32_t)TermWin.nscrolled) |
2431 | || (selection.end.row >= TermWin.nrow) |
2398 | || (selection.end.row >= TermWin.nrow) |
2432 | || (check_more == 1 |
2399 | || (check_more == 1 |
2433 | && current_screen == selection.screen |
2400 | && current_screen == selection.screen |
2434 | && !ROWCOL_IS_BEFORE(screen.cur, selection.beg) |
2401 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2435 | && ROWCOL_IS_BEFORE(screen.cur, selection.end)) |
2402 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2436 | || (check_more == 2 |
2403 | || (check_more == 2 |
2437 | && ROWCOL_IS_BEFORE(selection.beg, pos) |
2404 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
2438 | && ROWCOL_IS_AFTER(selection.end, pos)) |
2405 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2439 | || (check_more == 3 |
2406 | || (check_more == 3 |
2440 | && ROWCOL_IS_AFTER(selection.end, pos)) |
2407 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2441 | || (check_more == 4 /* screen width change */ |
2408 | || (check_more == 4 /* screen width change */ |
2442 | && (selection.beg.row != selection.end.row |
2409 | && (selection.beg.row != selection.end.row |
2443 | || selection.end.col > TermWin.ncol))) |
2410 | || selection.end.col > TermWin.ncol))) |
2444 | CLEAR_SELECTION(); |
2411 | CLEAR_SELECTION (); |
2445 | } |
2412 | } |
2446 | |
2413 | |
2447 | /* ------------------------------------------------------------------------- */ |
2414 | /* ------------------------------------------------------------------------- */ |
2448 | /* |
2415 | /* |
2449 | * Paste a selection direct to the command fd |
2416 | * Paste a selection direct to the command fd |
… | |
… | |
2470 | ds[j] = '\r'; |
2437 | ds[j] = '\r'; |
2471 | |
2438 | |
2472 | tt_write (ds, (int)n); |
2439 | tt_write (ds, (int)n); |
2473 | } |
2440 | } |
2474 | |
2441 | |
2475 | free(ds); |
2442 | free (ds); |
2476 | } |
2443 | } |
2477 | |
2444 | |
2478 | /* ------------------------------------------------------------------------- */ |
2445 | /* ------------------------------------------------------------------------- */ |
2479 | /* |
2446 | /* |
2480 | * Respond to a notification that a primary selection has been sent |
2447 | * Respond to a notification that a primary selection has been sent |
… | |
… | |
2485 | { |
2452 | { |
2486 | long nread = 0; |
2453 | long nread = 0; |
2487 | unsigned long bytes_after; |
2454 | unsigned long bytes_after; |
2488 | XTextProperty ct; |
2455 | XTextProperty ct; |
2489 | |
2456 | |
2490 | D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait)); |
2457 | D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait)); |
2491 | |
2458 | |
2492 | if (prop == None) /* check for failed XConvertSelection */ |
2459 | if (prop == None) /* check for failed XConvertSelection */ |
2493 | { |
2460 | { |
2494 | if ((selection_type & Sel_CompoundText)) |
2461 | if ((selection_type & Sel_CompoundText)) |
2495 | { |
2462 | { |
… | |
… | |
2514 | return 0; |
2481 | return 0; |
2515 | } |
2482 | } |
2516 | |
2483 | |
2517 | for (;;) |
2484 | for (;;) |
2518 | { |
2485 | { |
2519 | if (XGetWindowProperty(display->display, win, prop, (long)(nread / 4), |
2486 | if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), |
2520 | (long)(PROP_SIZE / 4), delete_prop, |
2487 | (long) (PROP_SIZE / 4), delete_prop, |
2521 | AnyPropertyType, &ct.encoding, &ct.format, |
2488 | AnyPropertyType, &ct.encoding, &ct.format, |
2522 | &ct.nitems, &bytes_after, |
2489 | &ct.nitems, &bytes_after, |
2523 | &ct.value) != Success) |
2490 | &ct.value) != Success) |
2524 | break; |
2491 | break; |
2525 | |
2492 | |
2526 | if (ct.encoding == 0) |
2493 | if (ct.encoding == 0) |
2527 | { |
2494 | { |
2528 | D_SELECT((stderr, "rxvt_selection_paste: property didn't exist!")); |
2495 | D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); |
2529 | break; |
2496 | break; |
2530 | } |
2497 | } |
2531 | |
2498 | |
2532 | if (ct.value == NULL) |
2499 | if (ct.value == NULL) |
2533 | { |
2500 | { |
2534 | D_SELECT((stderr, "rxvt_selection_paste: property shooting blanks!")); |
2501 | D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!")); |
2535 | continue; |
2502 | continue; |
2536 | } |
2503 | } |
2537 | |
2504 | |
2538 | if (ct.nitems == 0) |
2505 | if (ct.nitems == 0) |
2539 | { |
2506 | { |
2540 | D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end")); |
2507 | D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); |
2541 | if (selection_wait == Sel_normal && nread == 0) |
2508 | if (selection_wait == Sel_normal && nread == 0) |
2542 | { |
2509 | { |
2543 | /* |
2510 | /* |
2544 | * pass through again trying CUT_BUFFER0 if we've come from |
2511 | * pass through again trying CUT_BUFFER0 if we've come from |
2545 | * XConvertSelection() but nothing was presented |
2512 | * XConvertSelection () but nothing was presented |
2546 | */ |
2513 | */ |
2547 | D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
2514 | D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
2548 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2515 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2549 | } |
2516 | } |
2550 | |
2517 | |
2551 | nread = -1; /* discount any previous stuff */ |
2518 | nread = -1; /* discount any previous stuff */ |
2552 | break; |
2519 | break; |
… | |
… | |
2577 | XFree (ct.value); |
2544 | XFree (ct.value); |
2578 | |
2545 | |
2579 | if (selection_wait == Sel_normal) |
2546 | if (selection_wait == Sel_normal) |
2580 | selection_wait = Sel_none; |
2547 | selection_wait = Sel_none; |
2581 | |
2548 | |
2582 | D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); |
2549 | D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); |
2583 | return (int)nread; |
2550 | return (int)nread; |
2584 | } |
2551 | } |
2585 | |
2552 | |
2586 | void |
2553 | void |
2587 | rxvt_term::incr_cb (time_watcher &w) |
2554 | rxvt_term::incr_cb (time_watcher &w) |
… | |
… | |
2599 | { |
2566 | { |
2600 | int reget_time = 0; |
2567 | int reget_time = 0; |
2601 | |
2568 | |
2602 | if (prop == None) |
2569 | if (prop == None) |
2603 | return; |
2570 | return; |
2604 | D_SELECT((stderr, "rxvt_selection_property(%08lx, %lu)", win, (unsigned long)prop)); |
2571 | D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); |
2605 | if (selection_wait == Sel_normal) |
2572 | if (selection_wait == Sel_normal) |
2606 | { |
2573 | { |
2607 | int a, afmt; |
2574 | int a, afmt; |
2608 | Atom atype; |
2575 | Atom atype; |
2609 | unsigned long bytes_after, nitems; |
2576 | unsigned long bytes_after, nitems; |
2610 | unsigned char *s = NULL; |
2577 | unsigned char *s = NULL; |
2611 | |
2578 | |
2612 | a = XGetWindowProperty(display->display, win, prop, 0L, 1L, False, |
2579 | a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, |
2613 | xa[XA_INCR], &atype, &afmt, &nitems, |
2580 | xa[XA_INCR], &atype, &afmt, &nitems, |
2614 | &bytes_after, &s); |
2581 | &bytes_after, &s); |
2615 | if (s) |
2582 | if (s) |
2616 | XFree(s); |
2583 | XFree (s); |
2617 | if (a != Success) |
2584 | if (a != Success) |
2618 | return; |
2585 | return; |
2619 | #ifndef __CYGWIN32__ |
2586 | #ifndef __CYGWIN32__ |
2620 | if (atype == xa[XA_INCR]) |
2587 | if (atype == xa[XA_INCR]) |
2621 | { /* start an INCR transfer */ |
2588 | { /* start an INCR transfer */ |
2622 | D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer")); |
2589 | D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); |
2623 | XDeleteProperty(display->display, win, prop); |
2590 | XDeleteProperty (display->display, win, prop); |
2624 | XFlush(display->display); |
2591 | XFlush (display->display); |
2625 | reget_time = 1; |
2592 | reget_time = 1; |
2626 | selection_wait = Sel_incr; |
2593 | selection_wait = Sel_incr; |
2627 | } |
2594 | } |
2628 | #endif |
2595 | #endif |
2629 | |
2596 | |
… | |
… | |
2631 | else if (selection_wait == Sel_incr) |
2598 | else if (selection_wait == Sel_incr) |
2632 | { |
2599 | { |
2633 | reget_time = 1; |
2600 | reget_time = 1; |
2634 | if (selection_paste (win, prop, True) == -1) |
2601 | if (selection_paste (win, prop, True) == -1) |
2635 | { |
2602 | { |
2636 | D_SELECT((stderr, "rxvt_selection_property: INCR: clean end")); |
2603 | D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); |
2637 | selection_wait = Sel_none; |
2604 | selection_wait = Sel_none; |
2638 | incr_ev.stop (); |
2605 | incr_ev.stop (); |
2639 | } |
2606 | } |
2640 | } |
2607 | } |
2641 | if (reget_time) /* received more data so reget time */ |
2608 | if (reget_time) /* received more data so reget time */ |
… | |
… | |
2645 | /* |
2612 | /* |
2646 | * Request the current selection: |
2613 | * Request the current selection: |
2647 | * Order: > internal selection if available |
2614 | * Order: > internal selection if available |
2648 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2615 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2649 | * > CUT_BUFFER0 |
2616 | * > CUT_BUFFER0 |
2650 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste() |
2617 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2651 | * will auto fallback to CUT_BUFFER0 |
2618 | * will auto fallback to CUT_BUFFER0 |
2652 | * EXT: button 2 release |
2619 | * EXT: button 2 release |
2653 | */ |
2620 | */ |
2654 | void |
2621 | void |
2655 | rxvt_term::selection_request (Time tm, int x, int y) |
2622 | rxvt_term::selection_request (Time tm, int x, int y) |
2656 | { |
2623 | { |
2657 | D_SELECT((stderr, "rxvt_selection_request(%lu, %d, %d)", tm, x, y)); |
2624 | D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); |
2658 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2625 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2659 | return; /* outside window */ |
2626 | return; /* outside window */ |
2660 | |
2627 | |
2661 | if (selection.text != NULL) |
2628 | if (selection.text != NULL) |
2662 | { /* internal selection */ |
2629 | { /* internal selection */ |
2663 | D_SELECT((stderr, "rxvt_selection_request: pasting internal")); |
2630 | D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); |
2664 | paste (selection.text, selection.len); |
2631 | paste (selection.text, selection.len); |
2665 | return; |
2632 | return; |
2666 | } |
2633 | } |
2667 | else |
2634 | else |
2668 | { |
2635 | { |
… | |
… | |
2682 | return; |
2649 | return; |
2683 | #endif |
2650 | #endif |
2684 | |
2651 | |
2685 | } |
2652 | } |
2686 | } |
2653 | } |
2687 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ |
2654 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ |
2688 | D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
2655 | D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
2689 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2656 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2690 | } |
2657 | } |
2691 | |
2658 | |
2692 | int |
2659 | int |
2693 | rxvt_term::selection_request_other (Atom target, int selnum) |
2660 | rxvt_term::selection_request_other (Atom target, int selnum) |
… | |
… | |
2702 | sel = XA_PRIMARY; |
2669 | sel = XA_PRIMARY; |
2703 | else if (selnum == Sel_Secondary) |
2670 | else if (selnum == Sel_Secondary) |
2704 | sel = XA_SECONDARY; |
2671 | sel = XA_SECONDARY; |
2705 | else |
2672 | else |
2706 | sel = xa[XA_CLIPBOARD]; |
2673 | sel = xa[XA_CLIPBOARD]; |
2707 | if (XGetSelectionOwner(display->display, sel) != None) |
2674 | if (XGetSelectionOwner (display->display, sel) != None) |
2708 | { |
2675 | { |
2709 | D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); |
2676 | D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); |
2710 | XConvertSelection(display->display, sel, target, xa[XA_VT_SELECTION], |
2677 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2711 | TermWin.vt, selection_request_time); |
2678 | TermWin.vt, selection_request_time); |
2712 | return 1; |
2679 | return 1; |
2713 | } |
2680 | } |
2714 | return 0; |
2681 | return 0; |
2715 | } |
2682 | } |
… | |
… | |
2720 | * EXT: SelectionClear |
2687 | * EXT: SelectionClear |
2721 | */ |
2688 | */ |
2722 | void |
2689 | void |
2723 | rxvt_term::selection_clear () |
2690 | rxvt_term::selection_clear () |
2724 | { |
2691 | { |
2725 | D_SELECT((stderr, "rxvt_selection_clear()")); |
2692 | D_SELECT ((stderr, "rxvt_selection_clear ()")); |
2726 | |
2693 | |
2727 | want_refresh = 1; |
2694 | want_refresh = 1; |
2728 | if (selection.text) |
|
|
2729 | free(selection.text); |
2695 | free (selection.text); |
2730 | selection.text = NULL; |
2696 | selection.text = NULL; |
2731 | selection.len = 0; |
2697 | selection.len = 0; |
2732 | CLEAR_SELECTION(); |
2698 | CLEAR_SELECTION (); |
2733 | } |
2699 | } |
2734 | |
2700 | |
2735 | /* ------------------------------------------------------------------------- */ |
2701 | /* ------------------------------------------------------------------------- */ |
2736 | /* |
2702 | /* |
2737 | * Copy a selection into the cut buffer |
2703 | * Copy a selection into the cut buffer |
… | |
… | |
2746 | text_t *t; |
2712 | text_t *t; |
2747 | #ifdef ACS_ASCII |
2713 | #ifdef ACS_ASCII |
2748 | rend_t *re; |
2714 | rend_t *re; |
2749 | #endif |
2715 | #endif |
2750 | |
2716 | |
2751 | D_SELECT((stderr, "rxvt_selection_make(): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); |
2717 | D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); |
2752 | switch (selection.op) |
2718 | switch (selection.op) |
2753 | { |
2719 | { |
2754 | case SELECTION_CONT: |
2720 | case SELECTION_CONT: |
2755 | break; |
2721 | break; |
2756 | case SELECTION_INIT: |
2722 | case SELECTION_INIT: |
2757 | CLEAR_SELECTION(); |
2723 | CLEAR_SELECTION (); |
2758 | /* FALLTHROUGH */ |
2724 | /* FALLTHROUGH */ |
2759 | case SELECTION_BEGIN: |
2725 | case SELECTION_BEGIN: |
2760 | selection.op = SELECTION_DONE; |
2726 | selection.op = SELECTION_DONE; |
2761 | /* FALLTHROUGH */ |
2727 | /* FALLTHROUGH */ |
2762 | default: |
2728 | default: |
… | |
… | |
2766 | |
2732 | |
2767 | if (selection.clicks == 4) |
2733 | if (selection.clicks == 4) |
2768 | return; /* nothing selected, go away */ |
2734 | return; /* nothing selected, go away */ |
2769 | |
2735 | |
2770 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; |
2736 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; |
2771 | str = (char *)rxvt_malloc(i * MB_CUR_MAX + 1); |
2737 | str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); |
2772 | |
2738 | |
2773 | new_selection_text = (unsigned char *)str; |
2739 | new_selection_text = (unsigned char *)str; |
2774 | |
2740 | |
2775 | col = selection.beg.col; |
2741 | col = selection.beg.col; |
2776 | MAX_IT(col, 0); |
2742 | MAX_IT (col, 0); |
2777 | row = selection.beg.row + TermWin.saveLines; |
2743 | row = selection.beg.row + TermWin.saveLines; |
2778 | end_row = selection.end.row + TermWin.saveLines; |
2744 | end_row = selection.end.row + TermWin.saveLines; |
2779 | |
2745 | |
2780 | for (; row <= end_row; row++, col = 0) |
2746 | for (; row <= end_row; row++, col = 0) |
2781 | { |
2747 | { |
2782 | t = &(screen.text[row][col]); |
2748 | t = & (screen.text[row][col]); |
2783 | |
2749 | |
2784 | end_col = screen.tlen[row]; |
2750 | end_col = screen.tlen[row]; |
2785 | |
2751 | |
2786 | if (end_col == -1) |
2752 | if (end_col == -1) |
2787 | end_col = TermWin.ncol; |
2753 | end_col = TermWin.ncol; |
… | |
… | |
2831 | if (selection.text) |
2797 | if (selection.text) |
2832 | free (selection.text); |
2798 | free (selection.text); |
2833 | |
2799 | |
2834 | selection.text = new_selection_text; |
2800 | selection.text = new_selection_text; |
2835 | |
2801 | |
2836 | XSetSelectionOwner(display->display, XA_PRIMARY, TermWin.vt, tm); |
2802 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
2837 | if (XGetSelectionOwner(display->display, XA_PRIMARY) != TermWin.vt) |
2803 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
|
|
2804 | display->set_selection_owner (this); |
|
|
2805 | else |
2838 | rxvt_print_error("can't get primary selection"); |
2806 | rxvt_print_error ("can't get primary selection"); |
2839 | |
|
|
2840 | |
2807 | |
2841 | { |
2808 | { |
2842 | XTextProperty ct; |
2809 | XTextProperty ct; |
2843 | char *cl = (char *)selection.text; |
2810 | char *cl = (char *)selection.text; |
2844 | |
2811 | |
2845 | if (XmbTextListToTextProperty(display->display, &cl, 1, XStringStyle, &ct) >= 0) |
2812 | if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) |
2846 | { |
2813 | { |
2847 | XChangeProperty(display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, |
2814 | XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, |
2848 | PropModeReplace, ct.value, ct.nitems); |
2815 | PropModeReplace, ct.value, ct.nitems); |
2849 | XFree (ct.value); |
2816 | XFree (ct.value); |
2850 | } |
2817 | } |
2851 | else |
2818 | else |
2852 | XChangeProperty(display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, |
2819 | XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, |
2853 | PropModeReplace, selection.text, (int)selection.len); |
2820 | PropModeReplace, selection.text, (int)selection.len); |
2854 | } |
2821 | } |
2855 | |
2822 | |
2856 | selection_time = tm; |
2823 | selection_time = tm; |
2857 | D_SELECT((stderr, "rxvt_selection_make(): selection.len=%d", selection.len)); |
2824 | D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); |
2858 | } |
2825 | } |
2859 | |
2826 | |
2860 | /* ------------------------------------------------------------------------- */ |
2827 | /* ------------------------------------------------------------------------- */ |
2861 | /* |
2828 | /* |
2862 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2829 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2863 | * EXT: button 1 press |
2830 | * EXT: button 1 press |
2864 | */ |
2831 | */ |
2865 | void |
2832 | void |
2866 | rxvt_term::selection_click (int clicks, int x, int y) |
2833 | rxvt_term::selection_click (int clicks, int x, int y) |
2867 | { |
2834 | { |
2868 | D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y)); |
2835 | D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y)); |
2869 | |
2836 | |
2870 | clicks = ((clicks - 1) % 3) + 1; |
2837 | clicks = ((clicks - 1) % 3) + 1; |
2871 | selection.clicks = clicks; /* save clicks so extend will work */ |
2838 | selection.clicks = clicks; /* save clicks so extend will work */ |
2872 | |
2839 | |
2873 | selection_start_colrow (Pixel2Col(x), Pixel2Row(y)); |
2840 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
2874 | |
2841 | |
2875 | if (clicks == 2 || clicks == 3) |
2842 | if (clicks == 2 || clicks == 3) |
2876 | selection_extend_colrow (selection.mark.col, |
2843 | selection_extend_colrow (selection.mark.col, |
2877 | selection.mark.row + TermWin.view_start, |
2844 | selection.mark.row + TermWin.view_start, |
2878 | 0, /* button 3 */ |
2845 | 0, /* button 3 */ |
… | |
… | |
2888 | rxvt_term::selection_start_colrow (int col, int row) |
2855 | rxvt_term::selection_start_colrow (int col, int row) |
2889 | { |
2856 | { |
2890 | want_refresh = 1; |
2857 | want_refresh = 1; |
2891 | selection.mark.col = col; |
2858 | selection.mark.col = col; |
2892 | selection.mark.row = row - TermWin.view_start; |
2859 | selection.mark.row = row - TermWin.view_start; |
2893 | MAX_IT(selection.mark.row, -(int32_t)TermWin.nscrolled); |
2860 | MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); |
2894 | MIN_IT(selection.mark.row, (int32_t)TermWin.nrow - 1); |
2861 | MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); |
2895 | MAX_IT(selection.mark.col, 0); |
2862 | MAX_IT (selection.mark.col, 0); |
2896 | MIN_IT(selection.mark.col, (int32_t)TermWin.ncol - 1); |
2863 | MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); |
2897 | |
2864 | |
2898 | if (selection.op) |
2865 | if (selection.op) |
2899 | { /* clear the old selection */ |
2866 | { /* clear the old selection */ |
2900 | selection.beg.row = selection.end.row = selection.mark.row; |
2867 | selection.beg.row = selection.end.row = selection.mark.row; |
2901 | selection.beg.col = selection.end.col = selection.mark.col; |
2868 | selection.beg.col = selection.end.col = selection.mark.col; |
… | |
… | |
2910 | * We now only find out the boundary in one direction |
2877 | * We now only find out the boundary in one direction |
2911 | */ |
2878 | */ |
2912 | |
2879 | |
2913 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
2880 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
2914 | #define DELIMIT_TEXT(x) \ |
2881 | #define DELIMIT_TEXT(x) \ |
2915 | (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(rs[Rs_cutchars], (x)) != NULL)) |
2882 | (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) |
2916 | #define DELIMIT_REND(x) 1 |
2883 | #define DELIMIT_REND(x) 1 |
2917 | |
2884 | |
2918 | void |
2885 | void |
2919 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
2886 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
2920 | { |
2887 | { |
… | |
… | |
2935 | bound.col = TermWin.ncol - 1; |
2902 | bound.col = TermWin.ncol - 1; |
2936 | dirnadd = 1; |
2903 | dirnadd = 1; |
2937 | } |
2904 | } |
2938 | row = mark->row + TermWin.saveLines; |
2905 | row = mark->row + TermWin.saveLines; |
2939 | col = mark->col; |
2906 | col = mark->col; |
2940 | MAX_IT(col, 0); |
2907 | MAX_IT (col, 0); |
2941 | /* find the edge of a word */ |
2908 | /* find the edge of a word */ |
2942 | stp = &(screen.text[row][col]); |
2909 | stp = & (screen.text[row][col]); |
2943 | w1 = DELIMIT_TEXT(*stp); |
2910 | w1 = DELIMIT_TEXT (*stp); |
2944 | |
2911 | |
2945 | if (selection_style != NEW_SELECT) |
2912 | if (selection_style != NEW_SELECT) |
2946 | { |
2913 | { |
2947 | if (w1 == 1) |
2914 | if (w1 == 1) |
2948 | { |
2915 | { |
2949 | stp += dirnadd; |
2916 | stp += dirnadd; |
2950 | if (DELIMIT_TEXT(*stp) == 1) |
2917 | if (DELIMIT_TEXT (*stp) == 1) |
2951 | goto Old_Word_Selection_You_Die; |
2918 | goto Old_Word_Selection_You_Die; |
2952 | col += dirnadd; |
2919 | col += dirnadd; |
2953 | } |
2920 | } |
2954 | w1 = 0; |
2921 | w1 = 0; |
2955 | } |
2922 | } |
2956 | srp = (&screen.rend[row][col]); |
2923 | srp = (&screen.rend[row][col]); |
2957 | w2 = DELIMIT_REND(*srp); |
2924 | w2 = DELIMIT_REND (*srp); |
2958 | |
2925 | |
2959 | for (;;) |
2926 | for (;;) |
2960 | { |
2927 | { |
2961 | for (; col != bound.col; col += dirnadd) |
2928 | for (; col != bound.col; col += dirnadd) |
2962 | { |
2929 | { |
2963 | stp += dirnadd; |
2930 | stp += dirnadd; |
2964 | if (DELIMIT_TEXT(*stp) != w1) |
2931 | if (DELIMIT_TEXT (*stp) != w1) |
2965 | break; |
2932 | break; |
2966 | srp += dirnadd; |
2933 | srp += dirnadd; |
2967 | if (DELIMIT_REND(*srp) != w2) |
2934 | if (DELIMIT_REND (*srp) != w2) |
2968 | break; |
2935 | break; |
2969 | } |
2936 | } |
2970 | if ((col == bound.col) && (row != bound.row)) |
2937 | if ((col == bound.col) && (row != bound.row)) |
2971 | { |
2938 | { |
2972 | if (screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1) |
2939 | if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) |
2973 | { |
2940 | { |
2974 | trow = row + dirnadd; |
2941 | trow = row + dirnadd; |
2975 | tcol = dirn == UP ? TermWin.ncol - 1 : 0; |
2942 | tcol = dirn == UP ? TermWin.ncol - 1 : 0; |
2976 | if (screen.text[trow] == NULL) |
2943 | if (screen.text[trow] == NULL) |
2977 | break; |
2944 | break; |
2978 | stp = &(screen.text[trow][tcol]); |
2945 | stp = & (screen.text[trow][tcol]); |
2979 | srp = &(screen.rend[trow][tcol]); |
2946 | srp = & (screen.rend[trow][tcol]); |
2980 | if (DELIMIT_TEXT(*stp) != w1 || DELIMIT_REND(*srp) != w2) |
2947 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
2981 | break; |
2948 | break; |
2982 | row = trow; |
2949 | row = trow; |
2983 | col = tcol; |
2950 | col = tcol; |
2984 | continue; |
2951 | continue; |
2985 | } |
2952 | } |
2986 | } |
2953 | } |
2987 | break; |
2954 | break; |
2988 | } |
2955 | } |
2989 | Old_Word_Selection_You_Die: |
2956 | Old_Word_Selection_You_Die: |
2990 | D_SELECT((stderr, "rxvt_selection_delimit_word(%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); |
2957 | D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); |
2991 | |
2958 | |
2992 | if (dirn == DN) |
2959 | if (dirn == DN) |
2993 | col++; /* put us on one past the end */ |
2960 | col++; /* put us on one past the end */ |
2994 | |
2961 | |
2995 | /* Poke the values back in */ |
2962 | /* Poke the values back in */ |
… | |
… | |
3008 | void |
2975 | void |
3009 | rxvt_term::selection_extend (int x, int y, int flag) |
2976 | rxvt_term::selection_extend (int x, int y, int flag) |
3010 | { |
2977 | { |
3011 | int col, row; |
2978 | int col, row; |
3012 | |
2979 | |
3013 | col = Pixel2Col(x); |
2980 | col = Pixel2Col (x); |
3014 | row = Pixel2Row(y); |
2981 | row = Pixel2Row (y); |
3015 | MAX_IT(row, 0); |
2982 | MAX_IT (row, 0); |
3016 | MIN_IT(row, (int)TermWin.nrow - 1); |
2983 | MIN_IT (row, (int)TermWin.nrow - 1); |
3017 | MAX_IT(col, 0); |
2984 | MAX_IT (col, 0); |
3018 | MIN_IT(col, (int)TermWin.ncol); |
2985 | MIN_IT (col, (int)TermWin.ncol); |
3019 | |
2986 | |
3020 | #ifndef NO_NEW_SELECTION |
2987 | #ifndef NO_NEW_SELECTION |
3021 | /* |
2988 | /* |
3022 | * If we're selecting characters (single click) then we must check first |
2989 | * If we're selecting characters (single click) then we must check first |
3023 | * if we are at the same place as the original mark. If we are then |
2990 | * if we are at the same place as the original mark. If we are then |
… | |
… | |
3033 | /* select nothing */ |
3000 | /* select nothing */ |
3034 | selection.beg.row = selection.end.row = 0; |
3001 | selection.beg.row = selection.end.row = 0; |
3035 | selection.beg.col = selection.end.col = 0; |
3002 | selection.beg.col = selection.end.col = 0; |
3036 | selection.clicks = 4; |
3003 | selection.clicks = 4; |
3037 | want_refresh = 1; |
3004 | want_refresh = 1; |
3038 | D_SELECT((stderr, "rxvt_selection_extend() selection.clicks = 4")); |
3005 | D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); |
3039 | return; |
3006 | return; |
3040 | } |
3007 | } |
3041 | } |
3008 | } |
3042 | #endif |
3009 | #endif |
3043 | if (selection.clicks == 4) |
3010 | if (selection.clicks == 4) |
… | |
… | |
3060 | row_col_t pos; |
3027 | row_col_t pos; |
3061 | enum { |
3028 | enum { |
3062 | LEFT, RIGHT |
3029 | LEFT, RIGHT |
3063 | } closeto = RIGHT; |
3030 | } closeto = RIGHT; |
3064 | |
3031 | |
3065 | D_SELECT((stderr, "rxvt_selection_extend_colrow(c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); |
3032 | D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); |
3066 | D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
3033 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
3067 | |
3034 | |
3068 | want_refresh = 1; |
3035 | want_refresh = 1; |
3069 | switch (selection.op) |
3036 | switch (selection.op) |
3070 | { |
3037 | { |
3071 | case SELECTION_INIT: |
3038 | case SELECTION_INIT: |
3072 | CLEAR_SELECTION(); |
3039 | CLEAR_SELECTION (); |
3073 | selection.op = SELECTION_BEGIN; |
3040 | selection.op = SELECTION_BEGIN; |
3074 | /* FALLTHROUGH */ |
3041 | /* FALLTHROUGH */ |
3075 | case SELECTION_BEGIN: |
3042 | case SELECTION_BEGIN: |
3076 | if (row != selection.mark.row || col != selection.mark.col |
3043 | if (row != selection.mark.row || col != selection.mark.col |
3077 | || (!button3 && buttonpress)) |
3044 | || (!button3 && buttonpress)) |
… | |
… | |
3093 | && selection.beg.row == selection.end.row |
3060 | && selection.beg.row == selection.end.row |
3094 | && selection.beg.row != selection.mark.row) |
3061 | && selection.beg.row != selection.mark.row) |
3095 | { |
3062 | { |
3096 | selection.beg.col = selection.end.col = selection.mark.col; |
3063 | selection.beg.col = selection.end.col = selection.mark.col; |
3097 | selection.beg.row = selection.end.row = selection.mark.row; |
3064 | selection.beg.row = selection.end.row = selection.mark.row; |
3098 | D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT2 b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
3065 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT2 b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
3099 | } |
3066 | } |
3100 | |
3067 | |
3101 | pos.col = col; |
3068 | pos.col = col; |
3102 | pos.row = row; |
3069 | pos.row = row; |
3103 | |
3070 | |
… | |
… | |
3126 | { |
3093 | { |
3127 | selection.mark.row = selection.beg.row; |
3094 | selection.mark.row = selection.beg.row; |
3128 | selection.mark.col = selection.beg.col; |
3095 | selection.mark.col = selection.beg.col; |
3129 | } |
3096 | } |
3130 | } |
3097 | } |
3131 | if (ROWCOL_IS_BEFORE(pos, selection.mark)) |
3098 | if (ROWCOL_IS_BEFORE (pos, selection.mark)) |
3132 | { |
3099 | { |
3133 | selection.end.row = selection.mark.row; |
3100 | selection.end.row = selection.mark.row; |
3134 | selection.end.col = selection.mark.col + 1; |
3101 | selection.end.col = selection.mark.col + 1; |
3135 | selection.beg.row = pos.row; |
3102 | selection.beg.row = pos.row; |
3136 | selection.beg.col = pos.col; |
3103 | selection.beg.col = pos.col; |
… | |
… | |
3143 | selection.end.col = pos.col + 1; |
3110 | selection.end.col = pos.col + 1; |
3144 | } |
3111 | } |
3145 | } |
3112 | } |
3146 | else if (selection.clicks == 2) |
3113 | else if (selection.clicks == 2) |
3147 | { |
3114 | { |
3148 | selection_delimit_word (UP, &(selection.mark), |
3115 | selection_delimit_word (UP, & (selection.mark), |
3149 | &(selection.beg)); |
3116 | & (selection.beg)); |
3150 | selection_delimit_word (DN, &(selection.mark), |
3117 | selection_delimit_word (DN, & (selection.mark), |
3151 | &(selection.end)); |
3118 | & (selection.end)); |
3152 | hate_those_clicks = 1; |
3119 | hate_those_clicks = 1; |
3153 | } |
3120 | } |
3154 | else if (selection.clicks == 3) |
3121 | else if (selection.clicks == 3) |
3155 | { |
3122 | { |
3156 | selection.beg.row = selection.end.row = selection.mark.row; |
3123 | selection.beg.row = selection.end.row = selection.mark.row; |
3157 | selection.beg.col = 0; |
3124 | selection.beg.col = 0; |
3158 | selection.end.col = ncol; |
3125 | selection.end.col = ncol; |
3159 | hate_those_clicks = 1; |
3126 | hate_those_clicks = 1; |
3160 | } |
3127 | } |
3161 | D_SELECT((stderr, "rxvt_selection_extend_colrow() EXIT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
3128 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
3162 | return; |
3129 | return; |
3163 | } |
3130 | } |
3164 | #endif /* ! NO_OLD_SELECTION */ |
3131 | #endif /* ! NO_OLD_SELECTION */ |
3165 | #ifndef NO_NEW_SELECTION |
3132 | #ifndef NO_NEW_SELECTION |
3166 | /* selection_style must not be OLD_SELECT to get here */ |
3133 | /* selection_style must not be OLD_SELECT to get here */ |
… | |
… | |
3180 | if (button3 && buttonpress) |
3147 | if (button3 && buttonpress) |
3181 | { /* button3 press */ |
3148 | { /* button3 press */ |
3182 | /* |
3149 | /* |
3183 | * first determine which edge of the selection we are closest to |
3150 | * first determine which edge of the selection we are closest to |
3184 | */ |
3151 | */ |
3185 | if (ROWCOL_IS_BEFORE(pos, selection.beg) |
3152 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3186 | || (!ROWCOL_IS_AFTER(pos, selection.end) |
3153 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3187 | && (((pos.col - selection.beg.col) |
3154 | && (((pos.col - selection.beg.col) |
3188 | + ((pos.row - selection.beg.row) * ncol)) |
3155 | + ((pos.row - selection.beg.row) * ncol)) |
3189 | < ((selection.end.col - pos.col) |
3156 | < ((selection.end.col - pos.col) |
3190 | + ((selection.end.row - pos.row) * ncol))))) |
3157 | + ((selection.end.row - pos.row) * ncol))))) |
3191 | closeto = LEFT; |
3158 | closeto = LEFT; |
… | |
… | |
3205 | selection.mark.col = selection.beg.col; |
3172 | selection.mark.col = selection.beg.col; |
3206 | } |
3173 | } |
3207 | } |
3174 | } |
3208 | else |
3175 | else |
3209 | { /* button1 drag or button3 drag */ |
3176 | { /* button1 drag or button3 drag */ |
3210 | if (ROWCOL_IS_AFTER(selection.mark, pos)) |
3177 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3211 | { |
3178 | { |
3212 | if ((selection.mark.row == selection.end.row) |
3179 | if ((selection.mark.row == selection.end.row) |
3213 | && (selection.mark.col == selection.end.col) |
3180 | && (selection.mark.col == selection.end.col) |
3214 | && clickchange && selection.clicks == 2) |
3181 | && clickchange && selection.clicks == 2) |
3215 | selection.mark.col--; |
3182 | selection.mark.col--; |
… | |
… | |
3248 | selection.end.col = ncol; |
3215 | selection.end.col = ncol; |
3249 | |
3216 | |
3250 | } |
3217 | } |
3251 | else if (selection.clicks == 2) |
3218 | else if (selection.clicks == 2) |
3252 | { |
3219 | { |
3253 | if (ROWCOL_IS_AFTER(selection.end, selection.beg)) |
3220 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3254 | selection.end.col--; |
3221 | selection.end.col--; |
3255 | selection_delimit_word (UP, &(selection.beg), |
3222 | selection_delimit_word (UP, & (selection.beg), |
3256 | &(selection.beg)); |
3223 | & (selection.beg)); |
3257 | selection_delimit_word (DN, &(selection.end), |
3224 | selection_delimit_word (DN, & (selection.end), |
3258 | &(selection.end)); |
3225 | & (selection.end)); |
3259 | } |
3226 | } |
3260 | else if (selection.clicks == 3) |
3227 | else if (selection.clicks == 3) |
3261 | { |
3228 | { |
3262 | #ifndef NO_FRILLS |
3229 | #ifndef NO_FRILLS |
3263 | if ((Options & Opt_tripleclickwords)) |
3230 | if ((Options & Opt_tripleclickwords)) |
3264 | { |
3231 | { |
3265 | int end_row; |
3232 | int end_row; |
3266 | |
3233 | |
3267 | selection_delimit_word (UP, &(selection.beg), |
3234 | selection_delimit_word (UP, & (selection.beg), |
3268 | &(selection.beg)); |
3235 | & (selection.beg)); |
3269 | end_row = screen.tlen[selection.mark.row |
3236 | end_row = screen.tlen[selection.mark.row |
3270 | + TermWin.saveLines]; |
3237 | + TermWin.saveLines]; |
3271 | for (end_row = selection.mark.row; end_row < TermWin.nrow; |
3238 | for (end_row = selection.mark.row; end_row < TermWin.nrow; |
3272 | end_row++) |
3239 | end_row++) |
3273 | { |
3240 | { |
… | |
… | |
3283 | } |
3250 | } |
3284 | else |
3251 | else |
3285 | #endif |
3252 | #endif |
3286 | |
3253 | |
3287 | { |
3254 | { |
3288 | if (ROWCOL_IS_AFTER(selection.mark, selection.beg)) |
3255 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3289 | selection.mark.col++; |
3256 | selection.mark.col++; |
3290 | selection.beg.col = 0; |
3257 | selection.beg.col = 0; |
3291 | selection.end.col = ncol; |
3258 | selection.end.col = ncol; |
3292 | } |
3259 | } |
3293 | } |
3260 | } |
… | |
… | |
3303 | { |
3270 | { |
3304 | selection.mark.row = selection.beg.row; |
3271 | selection.mark.row = selection.beg.row; |
3305 | selection.mark.col = selection.beg.col; |
3272 | selection.mark.col = selection.beg.col; |
3306 | } |
3273 | } |
3307 | } |
3274 | } |
3308 | D_SELECT((stderr, "rxvt_selection_extend_colrow() EXIT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
3275 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
3309 | #endif /* ! NO_NEW_SELECTION */ |
3276 | #endif /* ! NO_NEW_SELECTION */ |
3310 | } |
3277 | } |
3311 | |
3278 | |
3312 | #ifndef NO_FRILLS |
3279 | #ifndef NO_FRILLS |
3313 | void |
3280 | void |
… | |
… | |
3354 | */ |
3321 | */ |
3355 | void |
3322 | void |
3356 | rxvt_term::selection_rotate (int x, int y) |
3323 | rxvt_term::selection_rotate (int x, int y) |
3357 | { |
3324 | { |
3358 | selection.clicks = selection.clicks % 3 + 1; |
3325 | selection.clicks = selection.clicks % 3 + 1; |
3359 | selection_extend_colrow (Pixel2Col(x), Pixel2Row(y), 1, 0, 1); |
3326 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3360 | } |
3327 | } |
3361 | |
3328 | |
3362 | /* ------------------------------------------------------------------------- */ |
3329 | /* ------------------------------------------------------------------------- */ |
3363 | /* |
3330 | /* |
3364 | * On some systems, the Atom typedef is 64 bits wide. We need to have a type |
3331 | * On some systems, the Atom typedef is 64 bits wide. We need to have a type |
… | |
… | |
3398 | *target++ = (Atom32) xa[XA_TEXT]; |
3365 | *target++ = (Atom32) xa[XA_TEXT]; |
3399 | *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; |
3366 | *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; |
3400 | #if X_HAVE_UTF8_STRING |
3367 | #if X_HAVE_UTF8_STRING |
3401 | *target++ = (Atom32) xa[XA_UTF8_STRING]; |
3368 | *target++ = (Atom32) xa[XA_UTF8_STRING]; |
3402 | #endif |
3369 | #endif |
3403 | XChangeProperty(display->display, rq.requestor, rq.property, XA_ATOM, |
3370 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3404 | (8 * sizeof(target_list[0])), PropModeReplace, |
3371 | (8 * sizeof (target_list[0])), PropModeReplace, |
3405 | (unsigned char *)target_list, |
3372 | (unsigned char *)target_list, |
3406 | target - target_list); |
3373 | target - target_list); |
3407 | ev.property = rq.property; |
3374 | ev.property = rq.property; |
3408 | } |
3375 | } |
3409 | else if (rq.target == xa[XA_MULTIPLE]) |
3376 | else if (rq.target == xa[XA_MULTIPLE]) |
3410 | { |
3377 | { |
3411 | /* TODO: Handle MULTIPLE */ |
3378 | /* TODO: Handle MULTIPLE */ |
3412 | } |
3379 | } |
3413 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3380 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3414 | { |
3381 | { |
3415 | XChangeProperty(display->display, rq.requestor, rq.property, XA_INTEGER, |
3382 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3416 | (8 * sizeof(Time)), PropModeReplace, |
3383 | (8 * sizeof (Time)), PropModeReplace, |
3417 | (unsigned char *)&selection_time, 1); |
3384 | (unsigned char *)&selection_time, 1); |
3418 | ev.property = rq.property; |
3385 | ev.property = rq.property; |
3419 | } |
3386 | } |
3420 | else if (rq.target == XA_STRING |
3387 | else if (rq.target == XA_STRING |
3421 | || rq.target == xa[XA_TEXT] |
3388 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3456 | { |
3423 | { |
3457 | cl = ""; |
3424 | cl = ""; |
3458 | selectlen = 0; |
3425 | selectlen = 0; |
3459 | } |
3426 | } |
3460 | |
3427 | |
3461 | if (XmbTextListToTextProperty(display->display, &cl, 1, style, &ct) >= 0) |
3428 | if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) |
3462 | freect = 1; |
3429 | freect = 1; |
3463 | else |
3430 | else |
3464 | { |
3431 | { |
3465 | /* if we failed to convert then send it raw */ |
3432 | /* if we failed to convert then send it raw */ |
3466 | ct.value = (unsigned char *)cl; |
3433 | ct.value = (unsigned char *)cl; |
… | |
… | |
3486 | * return col/row values corresponding to x/y pixel values |
3453 | * return col/row values corresponding to x/y pixel values |
3487 | */ |
3454 | */ |
3488 | void |
3455 | void |
3489 | rxvt_term::pixel_position (int *x, int *y) |
3456 | rxvt_term::pixel_position (int *x, int *y) |
3490 | { |
3457 | { |
3491 | *x = Pixel2Col(*x); |
3458 | *x = Pixel2Col (*x); |
3492 | /* MAX_IT(*x, 0); MIN_IT(*x, (int)TermWin.ncol - 1); */ |
3459 | /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ |
3493 | *y = Pixel2Row(*y); |
3460 | *y = Pixel2Row (*y); |
3494 | /* MAX_IT(*y, 0); MIN_IT(*y, (int)TermWin.nrow - 1); */ |
3461 | /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ |
3495 | } |
3462 | } |
3496 | |
3463 | |
3497 | /* ------------------------------------------------------------------------- */ |
3464 | /* ------------------------------------------------------------------------- */ |
3498 | #ifdef USE_XIM |
3465 | #ifdef USE_XIM |
3499 | void |
3466 | void |
3500 | rxvt_term::set_position (XPoint *pos) |
3467 | rxvt_term::im_set_position (XPoint *pos) |
3501 | { |
3468 | { |
3502 | XWindowAttributes xwa; |
3469 | XWindowAttributes xwa; |
3503 | |
3470 | |
3504 | XGetWindowAttributes (display->display, TermWin.vt, &xwa); |
3471 | XGetWindowAttributes (display->display, TermWin.vt, &xwa); |
3505 | pos->x = Col2Pixel (screen.cur.col) + xwa.x; |
3472 | pos->x = Col2Pixel (screen.cur.col) + xwa.x; |
… | |
… | |
3512 | /* ------------------------------------------------------------------------- * |
3479 | /* ------------------------------------------------------------------------- * |
3513 | * DEBUG ROUTINES * |
3480 | * DEBUG ROUTINES * |
3514 | * ------------------------------------------------------------------------- */ |
3481 | * ------------------------------------------------------------------------- */ |
3515 | #if 0 |
3482 | #if 0 |
3516 | void |
3483 | void |
3517 | rxvt_debug_colors(void) |
3484 | rxvt_debug_colors (void) |
3518 | { |
3485 | { |
3519 | int color; |
3486 | int color; |
3520 | const char *name[] = |
3487 | const char *name[] = |
3521 | { |
3488 | { |
3522 | "fg", "bg", |
3489 | "fg", "bg", |
3523 | "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" |
3490 | "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" |
3524 | }; |
3491 | }; |
3525 | |
3492 | |
3526 | fprintf(stderr, "Color ( "); |
3493 | fprintf (stderr, "Color ( "); |
3527 | if (rstyle & RS_RVid) |
3494 | if (rstyle & RS_RVid) |
3528 | fprintf(stderr, "rvid "); |
3495 | fprintf (stderr, "rvid "); |
3529 | if (rstyle & RS_Bold) |
3496 | if (rstyle & RS_Bold) |
3530 | fprintf(stderr, "bold "); |
3497 | fprintf (stderr, "bold "); |
3531 | if (rstyle & RS_Blink) |
3498 | if (rstyle & RS_Blink) |
3532 | fprintf(stderr, "blink "); |
3499 | fprintf (stderr, "blink "); |
3533 | if (rstyle & RS_Uline) |
3500 | if (rstyle & RS_Uline) |
3534 | fprintf(stderr, "uline "); |
3501 | fprintf (stderr, "uline "); |
3535 | fprintf(stderr, "): "); |
3502 | fprintf (stderr, "): "); |
3536 | |
3503 | |
3537 | color = GET_FGCOLOR(rstyle); |
3504 | color = GET_FGCOLOR (rstyle); |
3538 | #ifndef NO_BRIGHTCOLOR |
3505 | #ifndef NO_BRIGHTCOLOR |
3539 | if (color >= minBrightCOLOR && color <= maxBrightCOLOR) |
3506 | if (color >= minBrightCOLOR && color <= maxBrightCOLOR) |
3540 | { |
3507 | { |
3541 | color -= (minBrightCOLOR - minCOLOR); |
3508 | color -= (minBrightCOLOR - minCOLOR); |
3542 | fprintf(stderr, "bright "); |
3509 | fprintf (stderr, "bright "); |
3543 | } |
3510 | } |
3544 | #endif |
3511 | #endif |
3545 | fprintf(stderr, "%s on ", name[color]); |
3512 | fprintf (stderr, "%s on ", name[color]); |
3546 | |
3513 | |
3547 | color = GET_BGCOLOR(rstyle); |
3514 | color = GET_BGCOLOR (rstyle); |
3548 | #ifndef NO_BRIGHTCOLOR |
3515 | #ifndef NO_BRIGHTCOLOR |
3549 | if (color >= minBrightCOLOR && color <= maxBrightCOLOR) |
3516 | if (color >= minBrightCOLOR && color <= maxBrightCOLOR) |
3550 | { |
3517 | { |
3551 | color -= (minBrightCOLOR - minCOLOR); |
3518 | color -= (minBrightCOLOR - minCOLOR); |
3552 | fprintf(stderr, "bright "); |
3519 | fprintf (stderr, "bright "); |
3553 | } |
3520 | } |
3554 | #endif |
3521 | #endif |
3555 | fprintf(stderr, "%s\n", name[color]); |
3522 | fprintf (stderr, "%s\n", name[color]); |
3556 | } |
3523 | } |
3557 | #endif |
3524 | #endif |