Massive coding style change.

Use linux style brackets. Pad operators with spaces. Unpad parenthesis,
except for ‘if’, ‘for’, ‘while’ constructs.

1 files changed, 210 insertions, 188 deletions

diff --git a/src/ui_demos.c b/src/ui_demos.c
index dd322b9..cec1608 100644
--- a/src/ui_demos.c
+++ b/src/ui_demos.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -32,7 +32,7 @@ DEMOS MENU
 
 #define DEMO_EXTENSIONS ".dm2;.dm2.gz;.mvd2;.mvd2.gz"
 
-#define DEMO_EXTRASIZE  q_offsetof( demoEntry_t, name )
+#define DEMO_EXTRASIZE  q_offsetof(demoEntry_t, name)
 
 #define DEMO_MVD_POV    "\x90\xcd\xd6\xc4\x91" // [MVD]
 #define DEMO_DIR_SIZE   "\x90\xc4\xc9\xd2\x91" // [DIR]
@@ -73,7 +73,8 @@ static m_demos_t    m_demos;
 static cvar_t       *ui_sortdemos;
 static cvar_t       *ui_listalldemos;
 
-static void BuildName( const file_info_t *info, char **cache ) {
+static void BuildName(const file_info_t *info, char **cache)
+{
     char buffer[MAX_OSPATH];
     char date[MAX_QPATH];
     demoInfo_t demo;
@@ -81,62 +82,62 @@ static void BuildName( const file_info_t *info, char **cache ) {
     struct tm *tm;
     size_t len;
 
-    memset( &demo, 0, sizeof( demo ) );
-    strcpy( demo.map, "???" );
-    strcpy( demo.pov, "???" );
+    memset(&demo, 0, sizeof(demo));
+    strcpy(demo.map, "???");
+    strcpy(demo.pov, "???");
 
-    if( cache ) {
+    if (cache) {
         char *s = *cache;
-        char *p = strchr( s, '\\' );
-        if( p ) {
+        char *p = strchr(s, '\\');
+        if (p) {
             *p = 0;
-            Q_strlcpy( demo.map, s, sizeof( demo.map ) );
+            Q_strlcpy(demo.map, s, sizeof(demo.map));
             s = p + 1;
-            p = strchr( s, '\\' );
-            if( p ) {
+            p = strchr(s, '\\');
+            if (p) {
                 *p = 0;
-                Q_strlcpy( demo.pov, s, sizeof( demo.pov ) );
+                Q_strlcpy(demo.pov, s, sizeof(demo.pov));
                 s = p + 1;
             }
         }
         *cache = s;
     } else {
-        Q_concat( buffer, sizeof( buffer ), m_demos.browse, "/", info->name, NULL );
-        CL_GetDemoInfo( buffer, &demo );
-        if( demo.mvd ) {
-            strcpy( demo.pov, DEMO_MVD_POV );
+        Q_concat(buffer, sizeof(buffer), m_demos.browse, "/", info->name, NULL);
+        CL_GetDemoInfo(buffer, &demo);
+        if (demo.mvd) {
+            strcpy(demo.pov, DEMO_MVD_POV);
         }
     }
 
     // resize columns
-    len = strlen( demo.map );
-    if( len > 8 ) {
+    len = strlen(demo.map);
+    if (len > 8) {
         len = 8;
     }
-    if( len > m_demos.widest_map ) {
+    if (len > m_demos.widest_map) {
         m_demos.widest_map = len;
     }
 
-    len = strlen( demo.pov );
-    if( len > m_demos.widest_pov ) {
+    len = strlen(demo.pov);
+    if (len > m_demos.widest_pov) {
         m_demos.widest_pov = len;
     }
 
     // format date
-    if( ( tm = localtime( &info->mtime ) ) != NULL ) {
-        if( tm->tm_year == m_demos.year ) {
-            strftime( date, sizeof( date ), "%b %d %H:%M", tm );
+    if ((tm = localtime(&info->mtime)) != NULL) {
+        if (tm->tm_year == m_demos.year) {
+            strftime(date, sizeof(date), "%b %d %H:%M", tm);
         } else {
-            strftime( date, sizeof( date ), "%b %d  %Y", tm );
+            strftime(date, sizeof(date), "%b %d  %Y", tm);
         }
     } else {
-        strcpy( date, "???" );
+        strcpy(date, "???");
     }
 
-    Com_FormatSize( buffer, sizeof( buffer ), info->size );
+    Com_FormatSize(buffer, sizeof(buffer), info->size);
 
-    e = UI_FormatColumns( DEMO_EXTRASIZE,
-        info->name, date, buffer, demo.map, demo.pov, NULL );
+    e = UI_FormatColumns(DEMO_EXTRASIZE,
+                         info->name, date, buffer, demo.map, demo.pov, NULL);
     e->type = ENTRY_DEMO;
     e->size = info->size;
     e->mtime = info->mtime;
@@ -146,8 +147,9 @@ static void BuildName( const file_info_t *info, char **cache ) {
     m_demos.list.items[m_demos.list.numItems++] = e;
 }
 
-static void BuildDir( const char *name, int type ) {
-    demoEntry_t *e = UI_FormatColumns( DEMO_EXTRASIZE, name, "-", DEMO_DIR_SIZE, "-", "-", NULL );
+static void BuildDir(const char *name, int type)
+{
+    demoEntry_t *e = UI_FormatColumns(DEMO_EXTRASIZE, name, "-", DEMO_DIR_SIZE, "-", "-", NULL);
 
     e->type = type;
     e->size = 0;
@@ -156,47 +158,49 @@ static void BuildDir( const char *name, int type ) {
     m_demos.list.items[m_demos.list.numItems++] = e;
 }
 
-static char *LoadCache( void **list ) {
+static char *LoadCache(void **list)
+{
     char buffer[MAX_OSPATH], *cache;
     int i;
     size_t len;
     uint8_t hash[16];
 
-    len = Q_concat( buffer, sizeof( buffer ), m_demos.browse, "/" COM_DEMOCACHE_NAME, NULL );
-    if( len >= sizeof( buffer ) ) {
+    len = Q_concat(buffer, sizeof(buffer), m_demos.browse, "/" COM_DEMOCACHE_NAME, NULL);
+    if (len >= sizeof(buffer)) {
         return NULL;
     }
-    len = FS_LoadFileEx( buffer, ( void ** )&cache, FS_TYPE_REAL | FS_PATH_GAME, TAG_FILESYSTEM );
-    if( !cache ) {
+    len = FS_LoadFileEx(buffer, (void **)&cache, FS_TYPE_REAL | FS_PATH_GAME, TAG_FILESYSTEM);
+    if (!cache) {
         return NULL;
     }
-    if( len < 33 ) {
+    if (len < 33) {
         goto fail;
     }
 
-    for( i = 0; i < 16; i++ ) {
-        int c1 = Q_charhex( cache[i*2+0] );
-        int c2 = Q_charhex( cache[i*2+1] );
-        hash[i] = ( c1 << 4 ) | c2;
+    for (i = 0; i < 16; i++) {
+        int c1 = Q_charhex(cache[i * 2 + 0]);
+        int c2 = Q_charhex(cache[i * 2 + 1]);
+        hash[i] = (c1 << 4) | c2;
     }
 
-    if( cache[32] != '\\' ) {
+    if (cache[32] != '\\') {
         goto fail;
     }
 
-    if( memcmp( hash, m_demos.hash, 16 ) ) {
+    if (memcmp(hash, m_demos.hash, 16)) {
         goto fail;
     }
 
-    Com_DPrintf( "%s: loading from cache\n", __func__ );
+    Com_DPrintf("%s: loading from cache\n", __func__);
     return cache;
 
 fail:
-    FS_FreeFile( cache );
+    FS_FreeFile(cache);
     return NULL;
 }
 
-static void WriteCache( void ) {
+static void WriteCache(void)
+{
     char buffer[MAX_OSPATH];
     qhandle_t f;
     int i;
@@ -204,51 +208,53 @@ static void WriteCache( void ) {
     demoEntry_t *e;
     size_t len;
 
-    if( m_demos.list.numItems == m_demos.numDirs ) {
+    if (m_demos.list.numItems == m_demos.numDirs) {
         return;
     }
 
-    len = Q_concat( buffer, sizeof( buffer ), m_demos.browse, "/" COM_DEMOCACHE_NAME, NULL );
-    if( len >= sizeof( buffer ) ) {
+    len = Q_concat(buffer, sizeof(buffer), m_demos.browse, "/" COM_DEMOCACHE_NAME, NULL);
+    if (len >= sizeof(buffer)) {
         return;
     }
-    FS_FOpenFile( buffer, &f, FS_MODE_WRITE );
-    if( !f ) {
+    FS_FOpenFile(buffer, &f, FS_MODE_WRITE);
+    if (!f) {
         return;
     }
 
-    for( i = 0; i < 16; i++ ) {
-        FS_FPrintf( f, "%02x", m_demos.hash[i] );
+    for (i = 0; i < 16; i++) {
+        FS_FPrintf(f, "%02x", m_demos.hash[i]);
     }
-    FS_FPrintf( f, "\\" );
+    FS_FPrintf(f, "\\");
 
-    for( i = m_demos.numDirs; i < m_demos.list.numItems; i++ ) {
+    for (i = m_demos.numDirs; i < m_demos.list.numItems; i++) {
         e = m_demos.list.items[i];
-        map = UI_GetColumn( e->name, COL_MAP );
-        pov = UI_GetColumn( e->name, COL_POV );
-        FS_FPrintf( f, "%s\\%s\\", map, pov );
+        map = UI_GetColumn(e->name, COL_MAP);
+        pov = UI_GetColumn(e->name, COL_POV);
+        FS_FPrintf(f, "%s\\%s\\", map, pov);
     }
-    FS_FCloseFile( f );
+    FS_FCloseFile(f);
 }
 
-static void CalcHash( void **list ) {
+static void CalcHash(void **list)
+{
     struct mdfour md;
     file_info_t *info;
     size_t len;
 
-    mdfour_begin( &md );
-    while( *list ) {
+    mdfour_begin(&md);
+    while (*list) {
         info = *list++;
-        len = sizeof( *info ) + strlen( info->name ) - 1;
-        mdfour_update( &md, ( uint8_t * )info, len );
+        len = sizeof(*info) + strlen(info->name) - 1;
+        mdfour_update(&md, (uint8_t *)info, len);
     }
-    mdfour_result( &md, m_demos.hash );
+    mdfour_result(&md, m_demos.hash);
 }
 
-static menuSound_t Change( menuCommon_t *self ) {
+static menuSound_t Change(menuCommon_t *self)
+{
     demoEntry_t *e = m_demos.list.items[m_demos.list.curvalue];
 
-    switch( e->type ) {
+    switch (e->type) {
     case ENTRY_DEMO:
         m_demos.menu.status = "Press Enter to play demo";
         break;
@@ -259,7 +265,8 @@ static menuSound_t Change( menuCommon_t *self ) {
     return QMS_SILENT;
 }
 
-static void BuildList( void ) {
+static void BuildList(void)
+{
     int numDirs, numDemos;
     void **dirlist, **demolist;
     char *cache, *p;
@@ -274,13 +281,13 @@ static void BuildList( void ) {
 
     // list files
     flags = ui_listalldemos->integer ? 0 : FS_TYPE_REAL | FS_PATH_GAME;
-    dirlist = FS_ListFiles( m_demos.browse, NULL, flags |
-        FS_SEARCH_DIRSONLY, &numDirs );
-    demolist = FS_ListFiles( m_demos.browse, DEMO_EXTENSIONS, flags |
-        FS_SEARCH_EXTRAINFO, &numDemos );
+    dirlist = FS_ListFiles(m_demos.browse, NULL, flags |
+                           FS_SEARCH_DIRSONLY, &numDirs);
+    demolist = FS_ListFiles(m_demos.browse, DEMO_EXTENSIONS, flags |
+                            FS_SEARCH_EXTRAINFO, &numDemos);
 
     // alloc entries
-    m_demos.list.items = UI_Malloc( sizeof( demoEntry_t * ) * ( numDirs + numDemos + 1 ) );
+    m_demos.list.items = UI_Malloc(sizeof(demoEntry_t *) * (numDirs + numDemos + 1));
     m_demos.list.numItems = 0;
     m_demos.list.curvalue = 0;
     m_demos.list.prestep = 0;
@@ -290,84 +297,86 @@ static void BuildList( void ) {
     m_demos.total_bytes = 0;
 
     // start with minimum size
-    m_demos.menu.size( &m_demos.menu );
+    m_demos.menu.size(&m_demos.menu);
 
-    if( m_demos.browse[0] ) {
-        BuildDir( "..", ENTRY_UP );
+    if (m_demos.browse[0]) {
+        BuildDir("..", ENTRY_UP);
     }
 
     // add directories
-    if( dirlist ) {
-        for( i = 0; i < numDirs; i++ ) {
-            BuildDir( dirlist[i], ENTRY_DN );
+    if (dirlist) {
+        for (i = 0; i < numDirs; i++) {
+            BuildDir(dirlist[i], ENTRY_DN);
         }
-        FS_FreeList( dirlist );
-    }    
+        FS_FreeList(dirlist);
+    }
 
     m_demos.numDirs = m_demos.list.numItems;
 
     // add demos
-    if( demolist ) {
-        CalcHash( demolist );
-        if( ( cache = LoadCache( demolist ) ) != NULL ) {
+    if (demolist) {
+        CalcHash(demolist);
+        if ((cache = LoadCache(demolist)) != NULL) {
             p = cache + 32 + 1;
-            for( i = 0; i < numDemos; i++ ) {
-                BuildName( demolist[i], &p );
+            for (i = 0; i < numDemos; i++) {
+                BuildName(demolist[i], &p);
             }
-            FS_FreeFile( cache );
+            FS_FreeFile(cache);
         } else {
-            for( i = 0; i < numDemos; i++ ) {
-                BuildName( demolist[i], NULL );
-                if( ( i & 7 ) == 0 ) {
-                    m_demos.menu.size( &m_demos.menu );
+            for (i = 0; i < numDemos; i++) {
+                BuildName(demolist[i], NULL);
+                if ((i & 7) == 0) {
+                    m_demos.menu.size(&m_demos.menu);
                     SCR_UpdateScreen();
                 }
             }
         }
         WriteCache();
-        FS_FreeList( demolist );
+        FS_FreeList(demolist);
     }
 
     // update status line and sort
-    if( m_demos.list.numItems ) {
-        Change( &m_demos.list.generic );
-        if( m_demos.list.sortdir ) {
-            m_demos.list.sort( &m_demos.list, m_demos.list.sortcol );
+    if (m_demos.list.numItems) {
+        Change(&m_demos.list.generic);
+        if (m_demos.list.sortdir) {
+            m_demos.list.sort(&m_demos.list, m_demos.list.sortcol);
         }
     }
 
     // resize columns
-    m_demos.menu.size( &m_demos.menu );
+    m_demos.menu.size(&m_demos.menu);
 
     // format our extra status line
     i = m_demos.list.numItems - m_demos.numDirs;
-    len = Q_scnprintf( m_demos.status, sizeof( m_demos.status ),
-        "%d demo%s, ", i, i == 1 ? "" : "s" );
-    Com_FormatSizeLong( m_demos.status + len, sizeof( m_demos.status ) - len,
-        m_demos.total_bytes );
-        
+    len = Q_scnprintf(m_demos.status, sizeof(m_demos.status),
+                      "%d demo%s, ", i, i == 1 ? "" : "s");
+    Com_FormatSizeLong(m_demos.status + len, sizeof(m_demos.status) - len,
+                       m_demos.total_bytes);
+
     SCR_UpdateScreen();
 }
 
-static void FreeList( void ) {
+static void FreeList(void)
+{
     int i;
 
-    if( m_demos.list.items ) {
-        for( i = 0; i < m_demos.list.numItems; i++ ) {
-            Z_Free( m_demos.list.items[i] );
+    if (m_demos.list.items) {
+        for (i = 0; i < m_demos.list.numItems; i++) {
+            Z_Free(m_demos.list.items[i]);
         }
-        Z_Free( m_demos.list.items );
+        Z_Free(m_demos.list.items);
         m_demos.list.items = NULL;
         m_demos.list.numItems = 0;
     }
 }
 
-static void LeaveDirectory( void ) {
+static void LeaveDirectory(void)
+{
     char *s;
     int i;
 
-    s = strrchr( m_demos.browse, '/' );
-    if( !s ) {
+    s = strrchr(m_demos.browse, '/');
+    if (!s) {
         return;
     }
     *s = 0;
@@ -375,188 +384,200 @@ static void LeaveDirectory( void ) {
     // rebuild list
     FreeList();
     BuildList();
-    MenuList_Init( &m_demos.list );
+    MenuList_Init(&m_demos.list);
 
     // move cursor to the previous directory
-    for( i = 0; i < m_demos.numDirs; i++ ) {
+    for (i = 0; i < m_demos.numDirs; i++) {
         demoEntry_t *e = m_demos.list.items[i];
-        if( !strcmp( e->name, s + 1 ) ) {
-            MenuList_SetValue( &m_demos.list, i );
+        if (!strcmp(e->name, s + 1)) {
+            MenuList_SetValue(&m_demos.list, i);
             break;
         }
     }
 
-    if( s == m_demos.browse ) {
+    if (s == m_demos.browse) {
         m_demos.browse[0] = '/';
         m_demos.browse[1] = 0;
     }
 }
 
-static menuSound_t Activate( menuCommon_t *self ) {
+static menuSound_t Activate(menuCommon_t *self)
+{
     size_t len, baselen;
     demoEntry_t *e = m_demos.list.items[m_demos.list.curvalue];
 
-    switch( e->type ) {
+    switch (e->type) {
     case ENTRY_UP:
         LeaveDirectory();
         return QMS_OUT;
 
     case ENTRY_DN:
-        baselen = strlen( m_demos.browse );
-        len = strlen( e->name );
-        if( baselen + 1 + len >= sizeof( m_demos.browse ) ) {
+        baselen = strlen(m_demos.browse);
+        len = strlen(e->name);
+        if (baselen + 1 + len >= sizeof(m_demos.browse)) {
             return QMS_BEEP;
         }
-        if( !baselen || m_demos.browse[ baselen - 1 ] != '/' ) {
-            m_demos.browse[ baselen++ ] = '/';
+        if (!baselen || m_demos.browse[baselen - 1] != '/') {
+            m_demos.browse[baselen++] = '/';
         }
-        memcpy( m_demos.browse + baselen, e->name, len + 1 );
-        
+        memcpy(m_demos.browse + baselen, e->name, len + 1);
+
         // rebuild list
         FreeList();
         BuildList();
-        MenuList_Init( &m_demos.list );
+        MenuList_Init(&m_demos.list);
         return QMS_IN;
 
     case ENTRY_DEMO:
-        Cbuf_AddText( &cmd_buffer, va( "demo \"%s/%s\"\n", m_demos.browse[1] ?
-            m_demos.browse : "", e->name ) );
+        Cbuf_AddText(&cmd_buffer, va("demo \"%s/%s\"\n", m_demos.browse[1] ?
+                                     m_demos.browse : "", e->name));
         return QMS_SILENT;
     }
 
     return QMS_NOTHANDLED;
 }
 
-static int sizecmp( const void *p1, const void *p2 ) {
-    demoEntry_t *e1 = *( demoEntry_t ** )p1;
-    demoEntry_t *e2 = *( demoEntry_t ** )p2;
+static int sizecmp(const void *p1, const void *p2)
+{
+    demoEntry_t *e1 = *(demoEntry_t **)p1;
+    demoEntry_t *e2 = *(demoEntry_t **)p2;
 
-    if( e1->size > e2->size ) {
+    if (e1->size > e2->size) {
         return m_demos.list.sortdir;
     }
-    if( e1->size < e2->size ) {
+    if (e1->size < e2->size) {
         return -m_demos.list.sortdir;
     }
     return 0;
 }
 
-static int timecmp( const void *p1, const void *p2 ) {
-    demoEntry_t *e1 = *( demoEntry_t ** )p1;
-    demoEntry_t *e2 = *( demoEntry_t ** )p2;
+static int timecmp(const void *p1, const void *p2)
+{
+    demoEntry_t *e1 = *(demoEntry_t **)p1;
+    demoEntry_t *e2 = *(demoEntry_t **)p2;
 
-    if( e1->mtime > e2->mtime ) {
+    if (e1->mtime > e2->mtime) {
         return m_demos.list.sortdir;
     }
-    if( e1->mtime < e2->mtime ) {
+    if (e1->mtime < e2->mtime) {
         return -m_demos.list.sortdir;
     }
     return 0;
 }
 
-static int namecmp( const void *p1, const void *p2 ) {
-    demoEntry_t *e1 = *( demoEntry_t ** )p1;
-    demoEntry_t *e2 = *( demoEntry_t ** )p2;
-    char *s1 = UI_GetColumn( e1->name, m_demos.list.sortcol );
-    char *s2 = UI_GetColumn( e2->name, m_demos.list.sortcol );
+static int namecmp(const void *p1, const void *p2)
+{
+    demoEntry_t *e1 = *(demoEntry_t **)p1;
+    demoEntry_t *e2 = *(demoEntry_t **)p2;
+    char *s1 = UI_GetColumn(e1->name, m_demos.list.sortcol);
+    char *s2 = UI_GetColumn(e2->name, m_demos.list.sortcol);
 
-    return Q_stricmp( s1, s2 ) * m_demos.list.sortdir;
+    return Q_stricmp(s1, s2) * m_demos.list.sortdir;
 }
 
-static menuSound_t Sort( menuList_t *self, int column ) {
-    switch( column ) {
+static menuSound_t Sort(menuList_t *self, int column)
+{
+    switch (column) {
     case COL_NAME:
     case COL_MAP:
     case COL_POV:
-        MenuList_Sort( &m_demos.list, m_demos.numDirs, namecmp );
+        MenuList_Sort(&m_demos.list, m_demos.numDirs, namecmp);
         break;
     case COL_DATE:
-        MenuList_Sort( &m_demos.list, m_demos.numDirs, timecmp );
+        MenuList_Sort(&m_demos.list, m_demos.numDirs, timecmp);
         break;
     case COL_SIZE:
-        MenuList_Sort( &m_demos.list, m_demos.numDirs, sizecmp );
+        MenuList_Sort(&m_demos.list, m_demos.numDirs, sizecmp);
         break;
     }
 
     return QMS_SILENT;
 }
 
-static void Size( menuFrameWork_t *self ) {
+static void Size(menuFrameWork_t *self)
+{
     int w1, w2;
 
     m_demos.list.generic.x      = 0;
     m_demos.list.generic.y      = CHAR_HEIGHT;
     m_demos.list.generic.width  = 0;
-    m_demos.list.generic.height = uis.height - CHAR_HEIGHT*2 - 1;
+    m_demos.list.generic.height = uis.height - CHAR_HEIGHT * 2 - 1;
 
     w1 = 17 + m_demos.widest_map + m_demos.widest_pov;
-    w2 = uis.width - ( w1 + 2 ) * CHAR_WIDTH - MLIST_SCROLLBAR_WIDTH;
-    if( w2 > 8 * CHAR_WIDTH ) {
+    w2 = uis.width - (w1 + 2) * CHAR_WIDTH - MLIST_SCROLLBAR_WIDTH;
+    if (w2 > 8 * CHAR_WIDTH) {
         // everything fits
         m_demos.list.columns[0].width = w2;
-        m_demos.list.columns[1].width = 12*CHAR_WIDTH+CHAR_WIDTH/2;
-        m_demos.list.columns[2].width = 5*CHAR_WIDTH+CHAR_WIDTH/2;
-        m_demos.list.columns[3].width = m_demos.widest_map*CHAR_WIDTH+CHAR_WIDTH/2;
-        m_demos.list.columns[4].width = m_demos.widest_pov*CHAR_WIDTH+CHAR_WIDTH/2;
+        m_demos.list.columns[1].width = 12 * CHAR_WIDTH + CHAR_WIDTH / 2;
+        m_demos.list.columns[2].width = 5 * CHAR_WIDTH + CHAR_WIDTH / 2;
+        m_demos.list.columns[3].width = m_demos.widest_map * CHAR_WIDTH + CHAR_WIDTH / 2;
+        m_demos.list.columns[4].width = m_demos.widest_pov * CHAR_WIDTH + CHAR_WIDTH / 2;
         m_demos.list.numcolumns = COL_MAX;
     } else {
         // map and pov don't fit
-        w2 = uis.width - ( 17 + 1 ) * CHAR_WIDTH - MLIST_SCROLLBAR_WIDTH;
+        w2 = uis.width - (17 + 1) * CHAR_WIDTH - MLIST_SCROLLBAR_WIDTH;
         m_demos.list.columns[0].width = w2;
-        m_demos.list.columns[1].width = 12*CHAR_WIDTH+CHAR_WIDTH/2;
-        m_demos.list.columns[2].width = 5*CHAR_WIDTH+CHAR_WIDTH/2;
+        m_demos.list.columns[1].width = 12 * CHAR_WIDTH + CHAR_WIDTH / 2;
+        m_demos.list.columns[2].width = 5 * CHAR_WIDTH + CHAR_WIDTH / 2;
         m_demos.list.columns[3].width = 0;
         m_demos.list.columns[4].width = 0;
         m_demos.list.numcolumns = COL_MAX - 2;
     }
 }
 
-static menuSound_t Keydown( menuFrameWork_t *self, int key ) {
-    if( key == K_BACKSPACE ) {
+static menuSound_t Keydown(menuFrameWork_t *self, int key)
+{
+    if (key == K_BACKSPACE) {
         LeaveDirectory();
         return QMS_OUT;
     }
     return QMS_NOTHANDLED;
 }
 
-static void Draw( menuFrameWork_t *self ) {
-    Menu_Draw( self );
-    if( uis.width >= 640 ) {
-        UI_DrawString( uis.width, uis.height - CHAR_HEIGHT,
-            UI_RIGHT, m_demos.status );
+static void Draw(menuFrameWork_t *self)
+{
+    Menu_Draw(self);
+    if (uis.width >= 640) {
+        UI_DrawString(uis.width, uis.height - CHAR_HEIGHT,
+                      UI_RIGHT, m_demos.status);
     }
 }
 
-static void Pop( menuFrameWork_t *self ) {
+static void Pop(menuFrameWork_t *self)
+{
     // save previous position
     m_demos.selection = m_demos.list.curvalue;
     FreeList();
 }
 
-static void Expose( menuFrameWork_t *self ) {
-    time_t now = time( NULL );
-    struct tm *tm = localtime( &now );
+static void Expose(menuFrameWork_t *self)
+{
+    time_t now = time(NULL);
+    struct tm *tm = localtime(&now);
 
-    if( tm ) {
+    if (tm) {
         m_demos.year = tm->tm_year;
     }
 
     BuildList();
     // move cursor to previous position
-    MenuList_SetValue( &m_demos.list, m_demos.selection );
+    MenuList_SetValue(&m_demos.list, m_demos.selection);
 }
 
-static void Free( menuFrameWork_t *self ) {
-    memset( &m_demos, 0, sizeof( m_demos ) );
+static void Free(menuFrameWork_t *self)
+{
+    memset(&m_demos, 0, sizeof(m_demos));
 }
 
-static void ui_sortdemos_changed( cvar_t *self ) {
-    int i = Cvar_ClampInteger( self, -COL_MAX, COL_MAX );
+static void ui_sortdemos_changed(cvar_t *self)
+{
+    int i = Cvar_ClampInteger(self, -COL_MAX, COL_MAX);
 
-    if( i > 0 ) {
+    if (i > 0) {
         // ascending
         m_demos.list.sortdir = 1;
         m_demos.list.sortcol = i - 1;
-    } else if( i < 0 ) {
+    } else if (i < 0) {
         // descending
         m_demos.list.sortdir = -1;
         m_demos.list.sortcol = -i - 1;
@@ -566,21 +587,22 @@ static void ui_sortdemos_changed( cvar_t *self ) {
         m_demos.list.sortcol = 0;
     }
 
-    if( m_demos.list.items && m_demos.list.sortdir ) {
-        m_demos.list.sort( &m_demos.list, m_demos.list.sortcol );
+    if (m_demos.list.items && m_demos.list.sortdir) {
+        m_demos.list.sort(&m_demos.list, m_demos.list.sortcol);
     }
 }
 
-void M_Menu_Demos( void ) {
-    ui_sortdemos = Cvar_Get( "ui_sortdemos", "1", 0 );
+void M_Menu_Demos(void)
+{
+    ui_sortdemos = Cvar_Get("ui_sortdemos", "1", 0);
     ui_sortdemos->changed = ui_sortdemos_changed;
 
-    ui_listalldemos = Cvar_Get( "ui_listalldemos", "0", 0 );
+    ui_listalldemos = Cvar_Get("ui_listalldemos", "0", 0);
 
     m_demos.menu.name = "demos";
     m_demos.menu.title = "Demo Browser";
 
-    strcpy( m_demos.browse, "/demos" );
+    strcpy(m_demos.browse, "/demos");
 
     m_demos.menu.draw       = Draw;
     m_demos.menu.expose     = Expose;
@@ -612,11 +634,11 @@ void M_Menu_Demos( void ) {
     m_demos.list.columns[4].name    = "POV";
     m_demos.list.columns[4].uiFlags = UI_CENTER;
 
-    ui_sortdemos_changed( ui_sortdemos );
+    ui_sortdemos_changed(ui_sortdemos);
 
-    Menu_AddItem( &m_demos.menu, &m_demos.list );
+    Menu_AddItem(&m_demos.menu, &m_demos.list);
 
-    List_Append( &ui_menus, &m_demos.menu.entry );
+    List_Append(&ui_menus, &m_demos.menu.entry);
 }