diff --git a/src/conio/bitmap_con.c b/src/conio/bitmap_con.c index 1a4b989104f65787f073c43e58ad2cf7f9cbc675..41385d1c9b826bca205dd9901ccbcf1d4faf29cf 100644 --- a/src/conio/bitmap_con.c +++ b/src/conio/bitmap_con.c @@ -342,7 +342,7 @@ static int bitmap_attr2palette_locked(uint8_t attr, uint32_t *fgp, uint32_t *bgp * the are both rows from the top of the cell. * If vstat.curs_start > vstat.curs_end, the cursor is not shown. * 3) If vstat.curs_visible is false, the cursor is not shown. - * 4) If vstat.curs_blink is false, the cursor does not blink. + * 4) If vstat.curs_blinks is false, the cursor does not blink. * 5) When blinking, the cursor is shown when vstat.blink is true. * 6) The *ONLY* thing that should be changing vstat.curs_col or * vstat.curs_row is bitmap_gotoxy(). @@ -362,7 +362,7 @@ static BOOL bitmap_draw_cursor(void) if(!bitmap_initialized) return ret; if(vstat.curs_visible) { - if(vstat.blink || (!vstat.curs_blink)) { + if(vstat.blink || (!vstat.curs_blinks)) { if(vstat.curs_start<=vstat.curs_end) { xoffset=(vstat.curs_col-1)*vstat.charwidth; yoffset=(vstat.curs_row-1)*vstat.charheight; @@ -697,7 +697,7 @@ static int update_from_vmem(int force) /* Redraw cursor? */ if(vstat.curs_visible // Visible && vstat.curs_start <= vstat.curs_end // Should be drawn - && vstat.curs_blink // Is blinking + && vstat.curs_blinks // Is blinking && vstat.blink != vs.blink) // Blink has changed redraw_cursor=1; @@ -1189,7 +1189,7 @@ void bitmap_getcustomcursor(int *s, int *e, int *r, int *b, int *v) if(r) *r=vstat.charheight; if(b) - *b=vstat.curs_blink; + *b=vstat.curs_blinks; if(v) *v=vstat.curs_visible; pthread_mutex_unlock(&vstatlock); @@ -1201,7 +1201,7 @@ void bitmap_setcustomcursor(int s, int e, int r, int b, int v) double ratio; int oldstart = vstat.curs_start; int oldend = vstat.curs_end; - int oldblink = vstat.curs_blink; + int oldblink = vstat.curs_blinks; int oldvisible = vstat.curs_visible; pthread_mutex_lock(&blinker_lock); @@ -1215,13 +1215,13 @@ void bitmap_setcustomcursor(int s, int e, int r, int b, int v) if(e>=0) vstat.curs_end=e*ratio; if(b>=0) - vstat.curs_blink=b; + vstat.curs_blinks=b; if(v>=0) vstat.curs_visible=v; /* Did anything actually change? */ if (oldstart != vstat.curs_start || oldend != vstat.curs_end - || oldblink != vstat.curs_blink + || oldblink != vstat.curs_blinks || oldvisible != vstat.curs_visible) { /* Erase the current cursor */ if (oldvisible && oldstart <= oldend) diff --git a/src/conio/vidmodes.c b/src/conio/vidmodes.c index 071e3990e7e92806cbc04130c82b2f335fe11b0e..dd74752a672bc0f78a4bb1ea87ba1d62af987c5a 100644 --- a/src/conio/vidmodes.c +++ b/src/conio/vidmodes.c @@ -304,7 +304,7 @@ int load_vmode(struct video_stats *vs, int mode) vs->curs_end=vparams[i].curs_end; vs->default_curs_start=vparams[i].curs_start; vs->default_curs_end=vparams[i].curs_end; - vs->curs_blink=1; + vs->curs_blinks=1; vs->curs_visible=1; vs->curs_row=1; vs->curs_col=1; diff --git a/src/conio/vidmodes.h b/src/conio/vidmodes.h index a777d20b2d2754f8632a3db4825a4ba7649947fe..6bb421df892d7636ea56216896090d7f99fe4771 100644 --- a/src/conio/vidmodes.h +++ b/src/conio/vidmodes.h @@ -76,7 +76,7 @@ struct video_stats { int curs_col; int curs_start; int curs_end; - int curs_blink; + int curs_blinks; int curs_visible; int default_curs_start; int default_curs_end;