Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 270452 | Differences between
and this patch

Collapse All | Expand All

(-)minicom-2.3.orig/src/minicom.c (-14 / +14 lines)
Lines 167-173 Link Here
167
#endif /*SIGTSTP*/
167
#endif /*SIGTSTP*/
168
168
169
/* Get a line from either window or scroll back buffer. */
169
/* Get a line from either window or scroll back buffer. */
170
static ELM *getline(WIN *w, int no)
170
static ELM *_getline(WIN *w, int no)
171
{
171
{
172
  int i;
172
  int i;
173
  static ELM outofrange[MAXCOLS] = {{0,0,0}};
173
  static ELM outofrange[MAXCOLS] = {{0,0,0}};
Lines 205-211 Link Here
205
205
206
  w->direct = 0;
206
  w->direct = 0;
207
  for (f = 0; f < w->ys; f++)
207
  for (f = 0; f < w->ys; f++)
208
    mc_wdrawelm(w, f, getline(w, y++));
208
    mc_wdrawelm(w, f, _getline(w, y++));
209
  if (r)
209
  if (r)
210
    mc_wredraw(w, 1);
210
    mc_wredraw(w, 1);
211
  w->direct = 1;
211
  w->direct = 1;
Lines 227-233 Link Here
227
  tmp_line[0]='\0';
227
  tmp_line[0]='\0';
228
  w->direct = 0;
228
  w->direct = 0;
229
  for (f = 0; f < w->ys; f++) {
229
  for (f = 0; f < w->ys; f++) {
230
    tmp_e = getline(w, y++);
230
    tmp_e = _getline(w, y++);
231
231
232
    /* First we "accumulate" the line into a variable */
232
    /* First we "accumulate" the line into a variable */
233
    mc_wdrawelm_var(w, tmp_e, tmp_line);
233
    mc_wdrawelm_var(w, tmp_e, tmp_line);
Lines 324-330 Link Here
324
324
325
  for (next_line = hit_line; next_line <= all_lines; next_line++) {
325
  for (next_line = hit_line; next_line <= all_lines; next_line++) {
326
    /* we do 'something' here... :-) */
326
    /* we do 'something' here... :-) */
327
    tmp_e = getline(w_hist, next_line);
327
    tmp_e = _getline(w_hist, next_line);
328
328
329
    /*
329
    /*
330
     * First we "accumulate" the line into a variable.
330
     * First we "accumulate" the line into a variable.
Lines 379-387 Link Here
379
static void drawcite(WIN *w, int y, int citey, int start, int end)
379
static void drawcite(WIN *w, int y, int citey, int start, int end)
380
{
380
{
381
  if (y+citey >= start && y+citey <= end)
381
  if (y+citey >= start && y+citey <= end)
382
    mc_wdrawelm_inverse(w, y, getline(w, y+citey));
382
    mc_wdrawelm_inverse(w, y, _getline(w, y+citey));
383
  else
383
  else
384
    mc_wdrawelm(w, y, getline(w, y+citey));
384
    mc_wdrawelm(w, y, _getline(w, y+citey));
385
}
385
}
386
386
387
static void drawcite_whole(WIN *w, int y, int start, int end)
387
static void drawcite_whole(WIN *w, int y, int start, int end)
Lines 400-406 Link Here
400
  for (y=start; y<=end; y++) {
400
  for (y=start; y<=end; y++) {
401
    vt_send('>');
401
    vt_send('>');
402
    vt_send(' ');
402
    vt_send(' ');
403
    tmp_e = getline(w, y);
403
    tmp_e = _getline(w, y);
404
    mc_wdrawelm_var(w, tmp_e, tmp_line);
404
    mc_wdrawelm_var(w, tmp_e, tmp_line);
405
    tmp_line[w->xs] = 0;
405
    tmp_line[w->xs] = 0;
406
    for (x = w->xs-1; x >= 0; x--) {
406
    for (x = w->xs-1; x >= 0; x--) {
Lines 600-606 Link Here
600
        if (citemode) {
600
        if (citemode) {
601
          inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend);
601
          inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend);
602
        } else {
602
        } else {
603
          tmp_e = getline(b_us, y);
603
          tmp_e = _getline(b_us, y);
604
          if (wcslen(look_for) > 1) {
604
          if (wcslen(look_for) > 1) {
605
            /* quick scan for pattern match */
605
            /* quick scan for pattern match */
606
            mc_wdrawelm_var(b_us, tmp_e, tmp_line);
606
            mc_wdrawelm_var(b_us, tmp_e, tmp_line);
Lines 611-619 Link Here
611
        }
611
        }
612
612
613
        if (inverse)
613
        if (inverse)
614
          mc_wdrawelm_inverse(b_us, 0, getline(b_us, y));
614
          mc_wdrawelm_inverse(b_us, 0, _getline(b_us, y));
615
        else
615
        else
616
          mc_wdrawelm(b_us, 0, getline(b_us, y));
616
          mc_wdrawelm(b_us, 0, _getline(b_us, y));
617
        if (citemode)
617
        if (citemode)
618
          mc_wlocate(b_us, 0, cite_y);
618
          mc_wlocate(b_us, 0, cite_y);
619
        mc_wflush();
619
        mc_wflush();
Lines 648-654 Link Here
648
        if (citemode) {
648
        if (citemode) {
649
          inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend);
649
          inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend);
650
        } else {
650
        } else {
651
          tmp_e = getline(b_us, y + b_us->ys - 1);
651
          tmp_e = _getline(b_us, y + b_us->ys - 1);
652
          if (wcslen(look_for) > 1) {
652
          if (wcslen(look_for) > 1) {
653
            /* quick scan for pattern match */
653
            /* quick scan for pattern match */
654
            mc_wdrawelm_var(b_us, tmp_e, tmp_line);
654
            mc_wdrawelm_var(b_us, tmp_e, tmp_line);
Lines 660-669 Link Here
660
660
661
        if (inverse)
661
        if (inverse)
662
          mc_wdrawelm_inverse(b_us, b_us->ys - 1,
662
          mc_wdrawelm_inverse(b_us, b_us->ys - 1,
663
                           getline(b_us, y + b_us->ys - 1));
663
                           _getline(b_us, y + b_us->ys - 1));
664
        else
664
        else
665
          mc_wdrawelm(b_us, b_us->ys - 1,
665
          mc_wdrawelm(b_us, b_us->ys - 1,
666
                   getline(b_us, y + b_us->ys - 1));
666
                   _getline(b_us, y + b_us->ys - 1));
667
        if (citemode)
667
        if (citemode)
668
          mc_wlocate(b_us, 0, cite_y);
668
          mc_wlocate(b_us, 0, cite_y);
669
        mc_wflush();
669
        mc_wflush();
Lines 753-759 Link Here
753
        mc_wlocate(b_st, 0, 0);
753
        mc_wlocate(b_st, 0, 0);
754
        mc_wprintf(b_st, hline);
754
        mc_wprintf(b_st, hline);
755
        mc_wredraw(b_st, 1);
755
        mc_wredraw(b_st, 1);
756
        mc_wdrawelm_inverse(b_us, cite_y, getline(b_us, cite_ystart));
756
        mc_wdrawelm_inverse(b_us, cite_y, _getline(b_us, cite_ystart));
757
        mc_wlocate(b_us, 0, cite_y);
757
        mc_wlocate(b_us, 0, cite_y);
758
        break;
758
        break;
759
      case K_ESC:
759
      case K_ESC:

Return to bug 270452