Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset a9b6bec in mainline for uspace/lib/clui/tinput.c


Ignore:
Timestamp:
2010-12-14T20:19:41Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
11658b64
Parents:
37f7cfe (diff), 228e490 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes

Extra changes: ipcarg_t is sysarg_t and
IPC_GET_METHOD is IPC_GET_IMETHOD.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/clui/tinput.c

    r37f7cfe ra9b6bec  
    140140static void tinput_update_origin(tinput_t *ti)
    141141{
    142         ipcarg_t width = ti->col0 + ti->nc;
    143         ipcarg_t rows = (width / ti->con_cols) + 1;
     142        sysarg_t width = ti->col0 + ti->nc;
     143        sysarg_t rows = (width / ti->con_cols) + 1;
    144144       
    145145        /* Update row0 if the screen scrolled. */
     
    153153                return;
    154154       
    155         ipcarg_t new_width = ti->col0 + ti->nc + 1;
     155        sysarg_t new_width = ti->col0 + ti->nc + 1;
    156156        if (new_width % ti->con_cols == 0) {
    157157                /* Advancing to new line. */
    158                 ipcarg_t new_height = (new_width / ti->con_cols) + 1;
     158                sysarg_t new_height = (new_width / ti->con_cols) + 1;
    159159                if (new_height >= ti->con_rows) {
    160160                        /* Disallow text longer than 1 page for now. */
     
    184184                return;
    185185       
    186         ipcarg_t new_width = ti->col0 + ti->nc + ilen;
    187         ipcarg_t new_height = (new_width / ti->con_cols) + 1;
     186        sysarg_t new_width = ti->col0 + ti->nc + ilen;
     187        sysarg_t new_height = (new_width / ti->con_cols) + 1;
    188188        if (new_height >= ti->con_rows) {
    189189                /* Disallow text longer than 1 page for now. */
Note: See TracChangeset for help on using the changeset viewer.