* (bug 3384) Remove server side armoury refresh and replace with UI side

  refresh
* Add trap_Key_SetOverstrikeMode and trap_Key_GetOverstrikeMode to cgame
* Change Text_[Width|Height] to return floats
* Add Text_Em[Width|Height]
* Add CG_AlignText to cut down on code duplication
* Add itemDef_t::textvalignment for vertical text alignment
* Add UI_DrawTextBlock to replace a lot of duplicate code
* Rewrite text wrapping code from scratch so that it actually works
* Add UI_OwnerDrawText
* Add expression evaluator to .menu parser
* Split off Border_Paint from Window_Paint
* Scale slider items to fit their rect
* Rework edit field widgets to behave somewhat more correctly
* Fix a few listbox widget layout issues
* Don't display scrollbars in "notselectable" listbox widgets
* Make scoreboard team labels ownerdrawn
* Menu script rework
  + Use the expression evaluator to replace lots and lots of absolute
    coords with relative ones, hopefully easing future maintenance
  + Remove lots and lots of textalign[xy] that were present to work
    around broken text alignment routines
  + Replace a bunch of numeric constants with ones from menudef.h
  + Compose the huds from tremulous_common_hud.h
  + Generally neaten things up
  + Lots of whitespace fixes

1 files changed, 322 insertions, 313 deletions

diff --git a/ui/joinserver.menu b/ui/joinserver.menu
index 499348dd..e169183e 100644
--- a/ui/joinserver.menu
+++ b/ui/joinserver.menu
@@ -4,83 +4,74 @@
 
   \\ Server Join \\
 
+#define W           640
+#define H           480
+#define BORDER      10
+
+#define PREVIEW_W   112
+#define PREVIEW_H   84
+#define TOP_W       (W-((2*BORDER)+PREVIEW_W))
+#define TOP_H       PREVIEW_H
+#define TOP_X       BORDER
+#define TOP_Y       BORDER
+#define TOPBUTT_W   (TOP_W/3)
+#define TOPBUTT_H   (TOP_H/2)
+#define TOP_TOFF_X  20
+#define TOP_TOFF_Y  10
+
+#define BCJ_W       (W-(2*BORDER))
+#define BCJ_H       50
+#define BCJ_X       BORDER
+#define BCJ_Y       (H-(BCJ_H+BORDER))
+#define ARROW_W     50
+#define ARROW_H     BCJ_H
+
+#define BOT_W       (W-(2*BORDER))
+#define BOT_H       45
+#define BOT_X       BORDER
+#define BOT_Y       (BCJ_Y-BOT_H)
+#define BOTBUTT_W   (BOT_W/5)
+#define BOTBUTT_H   BOT_H
+
+#define SERVER_C    0.6
+#define MAP_C       0.2
+#define PLAYERS_C   0.1
+#define PING_C      0.1
+#define LIST_W      (W-(2*BORDER))
+#define LIST_H      (H-((2*BORDER)+TOP_H+BOT_H+BCJ_H))
+#define LIST_X      BORDER
+#define LIST_Y      (BORDER+TOP_H)
+#define LIST_TOFF   5
+#define HEADFOOT_H  25
+
   menuDef
   {
     name "joinserver"
-    visible 0
-    fullscreen 1
-    rect 0 0 640 480
+    visible MENU_FALSE
+    fullscreen MENU_TRUE
+    rect 0 0 W H
     focusColor 1 .75 0 1
-    outOfBoundsClick  
-    style 0
+    outOfBoundsClick
+    style WINDOW_STYLE_EMPTY
     onOpen
     {
       uiScript InitServerList 3;
-      hide accept_alt; 
+      hide accept_alt;
       show accept;
       hide back_alt;
       show back;
       uiScript UpdateFilter
     }
-    
+
     onEsc { uiScript closeJoin }
 
     itemDef
     {
       name background
-      rect 0 0 640 480
+      rect 0 0 W H
       style WINDOW_STYLE_FILLED
       backcolor 0 0 0 1
-      visible 1
-      decoration
-    }
-
-    // DATE AND MESSAGE OF THE DAY  //
-
-    itemDef
-    {
-      name datewindow
-      rect 10 365 265 25
-      style WINDOW_STYLE_FILLED 
-      border 1
-      bordercolor .5 .5 .5 1
-      backcolor 0 0 0 .15
-      visible 1
-    }
-    
-    itemDef
-    {
-      name messagewindow
-      rect 275 365 355 25
-      style WINDOW_STYLE_FILLED 
-      border 1
-      bordercolor .5 .5 .5 1
-      backcolor 0 0 0 .15
-      visible 1
-    }
-
-    itemDef
-    {
-      name refreshdate
-      ownerdraw UI_SERVERREFRESHDATE
-      textscale .33
-      rect 10 365 265 25
-      textalign 0
-      textalignx 10   
-      textaligny 20
-      forecolor 1 1 1 1
-      visible 1
-      decoration 
-    }
-    
-    itemDef
-    {
-      name messageoftheday
-      ownerdraw UI_SERVERMOTD
-      textscale .33
-      rect 280 365 345 25
-      forecolor 1 1 1 1
-      visible 1 
+      visible MENU_TRUE
       decoration
     }
 
@@ -90,16 +81,18 @@
     itemDef
     {
       name gametypefield
+      text "Source:"
       style WINDOW_STYLE_EMPTY
       ownerdraw UI_NETSOURCE
-      rect 26 20 128 26
-      textalign ITEM_ALIGN_LEFT   
-      textalignx 10    
-      textaligny 22    
+      rect TOP_X TOP_Y TOPBUTT_W TOPBUTT_H
+      textalign ITEM_ALIGN_LEFT
+      textvalign ITEM_VALIGN_TOP
+      textalignx TOP_TOFF_X
+      textaligny TOP_TOFF_Y
       textscale .4
       forecolor 1 1 1 1
       backcolor .5 .5 .5 .5
-      visible 1 
+      visible MENU_TRUE
       action
       {
         play "sound/misc/menu1.wav"
@@ -115,18 +108,19 @@
       type ITEM_TYPE_BUTTON
       textscale .4
       style WINDOW_STYLE_EMPTY
-      rect 190 20 128 26
+      rect (TOP_X+TOPBUTT_W) TOP_Y TOPBUTT_W TOPBUTT_H
       textalign ITEM_ALIGN_LEFT
-      textalignx 10
-      textaligny 22
+      textvalign ITEM_VALIGN_TOP
+      textalignx TOP_TOFF_X
+      textaligny TOP_TOFF_Y
       backcolor .5 .5 .5 .5
       forecolor 1 1 1 1
-      visible 1 
+      visible MENU_TRUE
       action
       {
         play "sound/misc/menu1.wav";
         uiScript RefreshServers
-      }       
+      }
     }
 
     itemDef
@@ -136,18 +130,19 @@
       textscale .4
       style WINDOW_STYLE_EMPTY
       type ITEM_TYPE_BUTTON
-      rect 354 20 128 26
+      rect (TOP_X+(2*TOPBUTT_W)) TOP_Y TOPBUTT_W TOPBUTT_H
       textalign ITEM_ALIGN_LEFT
-      textalignx 10
-      textaligny 22
+      textvalign ITEM_VALIGN_TOP
+      textalignx TOP_TOFF_X
+      textaligny TOP_TOFF_Y
       backcolor .5 .5 .5 .5
       forecolor 1 1 1 1
-      visible 1 
+      visible MENU_TRUE
       action
       {
         play "sound/misc/menu1.wav";
         uiScript RefreshFilter
-      }        
+      }
     }
 
     itemDef
@@ -158,20 +153,21 @@
       text "View Empty:"
       cvar "ui_browserShowEmpty"
       textscale .4
-      rect 26 50 128 26
+      rect TOP_X (TOP_Y+TOPBUTT_H) TOPBUTT_W TOPBUTT_H
       textalign ITEM_ALIGN_LEFT
-      textalignx 10    
-      textaligny 22
+      textvalign ITEM_VALIGN_TOP
+      textalignx TOP_TOFF_X
+      textaligny TOP_TOFF_Y
       forecolor 1 1 1 1
       backcolor .5 .5 .5 .5
-      visible 1 
+      visible MENU_TRUE
       action
       {
         play "sound/misc/menu1.wav";
         uiScript RefreshFilter
       }
     }
-    
+
     itemDef
     {
       name viewFull
@@ -180,13 +176,14 @@
       text "View Full:"
       cvar "ui_browserShowFull"
       textscale .4
-      rect 190 50 128 26
+      rect (TOP_X+TOPBUTT_W) (TOP_Y+TOPBUTT_H) TOPBUTT_W TOPBUTT_H
       textalign ITEM_ALIGN_LEFT
-      textalignx 10    
-      textaligny 22
+      textvalign ITEM_VALIGN_TOP
+      textalignx TOP_TOFF_X
+      textaligny TOP_TOFF_Y
       forecolor 1 1 1 1
       backcolor .5 .5 .5 .5
-      visible 1 
+      visible MENU_TRUE
       action
       {
         play "sound/misc/menu1.wav";
@@ -195,115 +192,21 @@
     }
 
 
-    // map selection
+    // MAP PREVIEW //
 
     itemDef
     {
       name mappreview
-      style 0 
+      style WINDOW_STYLE_EMPTY
       ownerdraw UI_NETMAPCINEMATIC
-      rect 502 5 128 96
-      border 1
-      bordercolor 0 .5 0 .5
-      visible 1 
-    }
-
-    itemDef
-    {
-      name mappreview
-      style WINDOW_STYLE_FILLED 
-      rect 502 5 128 96 
-      border 1
-      bordercolor .5 .5 .5 .5
-      visible 1 
-    }
-
-    //  COLUMNS //
-
-    itemDef
-    {
-      name serverColumn
-      group grpColumn
-      rect 10 130 365 232
-      style WINDOW_STYLE_FILLED
-      border 1
-      backcolor 0 0 0 0
-      bordersize 1
-      bordercolor .5 .5 .5 1
-      visible 1
-      decoration
-    }
-    
-    itemDef
-    {
-      name mapColumn
-      group grpColumn
-      rect 375 130 125 232
-      style WINDOW_STYLE_FILLED
-      border 1
-      backcolor 0 0 0 0
-      bordersize 1
-      bordercolor .5 .5 .5 1
-      visible 1
-      decoration
-    }
-    
-    itemDef
-    {
-      name playerColumn
-      group grpColumn
-      rect 500 130 60 232
-      style WINDOW_STYLE_FILLED
-      border 1
-      backcolor 0 0 0 0
-      bordersize 1
+      rect (W-(PREVIEW_W+BORDER)) BORDER PREVIEW_W PREVIEW_H
+      border WINDOW_BORDER_FULL
       bordercolor .5 .5 .5 1
-      visible 1
-      decoration
-    }
-    
-    itemDef
-    {
-      name pingColumn
-      group grpColumn
-      rect 560 130 52 232
-      style WINDOW_STYLE_FILLED
-      border 1
-      backcolor 0 0 0 0
-      bordersize 1
-      bordercolor .5 .5 .5 1
-      visible 1
-      decoration
+      visible MENU_TRUE
     }
 
-    itemDef
-    {
-      name serverlist
-      rect 10 130 620 232
-      type ITEM_TYPE_LISTBOX
-      style WINDOW_STYLE_EMPTY
-      elementwidth 120
-      elementheight 20
-      textscale .33
-      elementtype LISTBOX_TEXT
-      feeder FEEDER_SERVERS
-      border 1
-      bordercolor   0.5 0.5 0.5 1
-      forecolor     1   1   1   1
-      backcolor     0.2 0.2 0.2 1
-      outlinecolor  0.1 0.1 0.1 0.5
-      visible 1
-      columns 4
-        2   355 ITEM_ALIGN_LEFT
-        375 100 ITEM_ALIGN_LEFT
-        500 40  ITEM_ALIGN_LEFT
-        560 30  ITEM_ALIGN_LEFT
-
-      doubleClick { uiScript JoinServer }
-    }
 
-
-    //  SORT TABS //
+    // COLUMNS //
 
     itemDef
     {
@@ -313,82 +216,123 @@
       type ITEM_TYPE_BUTTON
       textscale .33
       style WINDOW_STYLE_EMPTY
-      rect 10 103 365 26 
+      rect LIST_X LIST_Y (SERVER_C*LIST_W) HEADFOOT_H
       textalign ITEM_ALIGN_LEFT
-      textalignx 10
-      textaligny 18
-      border 1
+      textvalign ITEM_VALIGN_CENTER
+      textalignx LIST_TOFF
+      border WINDOW_BORDER_FULL
       bordercolor   0.5 0.5 0.5 1
       forecolor     1   1   1   1
       backcolor     0.2 0.2 0.2 1
       outlinecolor  0.1 0.1 0.1 0.5
-      visible 1 
+      visible MENU_TRUE
       action
       {
-        play "sound/misc/menu1.wav"; 
-        uiScript ServerSort 0; 
-      
-        setitemcolor grpColumn backcolor 0 0 0 0; 
+        play "sound/misc/menu1.wav";
+        uiScript ServerSort 0;
+
+        setitemcolor grpColumn backcolor 0 0 0 0;
         setitemcolor serverColumn backcolor 0.3 1 1 0.5
       }
     }
 
     itemDef
     {
+      name serverColumn
+      group grpColumn
+      rect LIST_X (LIST_Y+HEADFOOT_H) (SERVER_C*LIST_W) (LIST_H-(2*HEADFOOT_H))
+      style WINDOW_STYLE_FILLED
+      border WINDOW_BORDER_FULL
+      backcolor 0 0 0 0
+      bordersize 1
+      bordercolor .5 .5 .5 1
+      visible MENU_TRUE
+      decoration
+    }
+
+    itemDef
+    {
       name map
       group grpTabs
       type ITEM_TYPE_BUTTON
       text "Map Name"
       textscale .33
       style WINDOW_STYLE_EMPTY
-      rect 375 103 125 26
+      rect (LIST_X+(SERVER_C*LIST_W)) LIST_Y (MAP_C*LIST_W) HEADFOOT_H
       textalign ITEM_ALIGN_LEFT
-      textalignx 10
-      textaligny 18
-      border 1
+      textvalign ITEM_VALIGN_CENTER
+      textalignx LIST_TOFF
+      border WINDOW_BORDER_FULL
       bordercolor   0.5 0.5 0.5 1
       forecolor     1   1   1   1
       backcolor     0.2 0.2 0.2 1
       outlinecolor  0.1 0.1 0.1 0.5
-      visible 1 
+      visible MENU_TRUE
       action
       {
-        play "sound/misc/menu1.wav"; 
-        uiScript ServerSort 1; 
-      
-        setitemcolor grpColumn backcolor 0 0 0 0; 
+        play "sound/misc/menu1.wav";
+        uiScript ServerSort 1;
+
+        setitemcolor grpColumn backcolor 0 0 0 0;
         setitemcolor mapColumn backcolor 0.3 1 1 0.5
       }
     }
 
     itemDef
     {
+      name mapColumn
+      group grpColumn
+      rect (LIST_X+(SERVER_C*LIST_W)) (LIST_Y+HEADFOOT_H) (MAP_C*LIST_W) (LIST_H-(2*HEADFOOT_H))
+      style WINDOW_STYLE_FILLED
+      border WINDOW_BORDER_FULL
+      backcolor 0 0 0 0
+      bordersize 1
+      bordercolor .5 .5 .5 1
+      visible MENU_TRUE
+      decoration
+    }
+
+    itemDef
+    {
       name Players
       group grpTabs
       text "Players"
       type ITEM_TYPE_BUTTON
       textscale .33
       style WINDOW_STYLE_EMPTY
-      rect 500 103 60 26
+      rect (LIST_X+((SERVER_C+MAP_C)*LIST_W)) LIST_Y (PLAYERS_C*LIST_W) HEADFOOT_H
       textalign ITEM_ALIGN_LEFT
-      textalignx 10
-      textaligny 18
-      border 1
+      textvalign ITEM_VALIGN_CENTER
+      textalignx LIST_TOFF
+      border WINDOW_BORDER_FULL
       bordercolor   0.5 0.5 0.5 1
       forecolor     1   1   1   1
       backcolor     0.2 0.2 0.2 1
       outlinecolor  0.1 0.1 0.1 0.5
-      visible 1 
+      visible MENU_TRUE
       action
       {
-        play "sound/misc/menu1.wav"; 
-        uiScript ServerSort 2; 
-      
-        setitemcolor grpColumn backcolor 0 0 0 0; 
+        play "sound/misc/menu1.wav";
+        uiScript ServerSort 2;
+
+        setitemcolor grpColumn backcolor 0 0 0 0;
         setitemcolor playerColumn backcolor 0.3 1 1 0.5
       }
     }
 
+    itemDef
+    {
+      name playerColumn
+      group grpColumn
+      rect (LIST_X+((SERVER_C+MAP_C)*LIST_W)) (LIST_Y+HEADFOOT_H) (PLAYERS_C*LIST_W) (LIST_H-(2*HEADFOOT_H))
+      style WINDOW_STYLE_FILLED
+      border WINDOW_BORDER_FULL
+      backcolor 0 0 0 0
+      bordersize 1
+      bordercolor .5 .5 .5 1
+      visible MENU_TRUE
+      decoration
+    }
 
     itemDef
     {
@@ -398,44 +342,121 @@
       type ITEM_TYPE_BUTTON
       textscale .33
       style WINDOW_STYLE_EMPTY
-      rect 560 103 70 26
+      rect (LIST_X+((SERVER_C+MAP_C+PLAYERS_C)*LIST_W)) LIST_Y (PING_C*LIST_W) HEADFOOT_H
       textalign ITEM_ALIGN_LEFT
-      textalignx 10
-      textaligny 18
-      border 1
+      textvalign ITEM_VALIGN_CENTER
+      textalignx LIST_TOFF
+      border WINDOW_BORDER_FULL
       bordercolor   0.5 0.5 0.5 1
       forecolor     1   1   1   1
       backcolor     0.2 0.2 0.2 1
       outlinecolor  0.1 0.1 0.1 0.5
-      visible 1 
+      visible MENU_TRUE
       action
       {
-        play "sound/misc/menu1.wav"; 
-        uiScript ServerSort 3; 
-      
-        setitemcolor grpColumn backcolor 0 0 0 0; 
+        play "sound/misc/menu1.wav";
+        uiScript ServerSort 3;
+
+        setitemcolor grpColumn backcolor 0 0 0 0;
         setitemcolor pingColumn backcolor 0.3 1 1 0.5
       }
     }
 
+    itemDef
+    {
+      name pingColumn
+      group grpColumn
+      rect (LIST_X+((SERVER_C+MAP_C+PLAYERS_C)*LIST_W)) (LIST_Y+HEADFOOT_H) (PING_C*LIST_W) (LIST_H-(2*HEADFOOT_H))
+      style WINDOW_STYLE_FILLED
+      border WINDOW_BORDER_FULL
+      backcolor 0 0 0 0
+      bordersize 1
+      bordercolor .5 .5 .5 1
+      visible MENU_TRUE
+      decoration
+    }
+
+    // SERVER LIST //
+
+    itemDef
+    {
+      name serverlist
+      rect LIST_X (LIST_Y+HEADFOOT_H) LIST_W (LIST_H-(2*HEADFOOT_H))
+      type ITEM_TYPE_LISTBOX
+      style WINDOW_STYLE_EMPTY
+      elementwidth 120
+      elementheight 20
+      textscale .33
+      elementtype LISTBOX_TEXT
+      feeder FEEDER_SERVERS
+      border WINDOW_BORDER_FULL
+      bordercolor   0.5 0.5 0.5 1
+      forecolor     1   1   1   1
+      backcolor     0.2 0.2 0.2 1
+      outlinecolor  0.1 0.1 0.1 0.5
+      visible MENU_TRUE
+      columns 4
+        LIST_TOFF                                       ((SERVER_C*LIST_W)-(3*LIST_TOFF))   ITEM_ALIGN_LEFT
+        (LIST_TOFF+((SERVER_C)*LIST_W))                 ((MAP_C*LIST_W)-(3*LIST_TOFF))      ITEM_ALIGN_LEFT
+        (LIST_TOFF+((SERVER_C+MAP_C)*LIST_W))           ((PLAYERS_C*LIST_W)-(3*LIST_TOFF))  ITEM_ALIGN_LEFT
+        (LIST_TOFF+((SERVER_C+MAP_C+PLAYERS_C)*LIST_W)) ((PING_C*LIST_W)-(3*LIST_TOFF))     ITEM_ALIGN_LEFT
+
+      doubleClick { uiScript JoinServer }
+    }
+
+
+    // DATE AND MESSAGE OF THE DAY  //
+
+    itemDef
+    {
+      name refreshdate
+      ownerdraw UI_SERVERREFRESHDATE
+      textscale .33
+      rect LIST_X (LIST_Y+(LIST_H-HEADFOOT_H)) (LIST_W/2) HEADFOOT_H
+      textalign ITEM_ALIGN_LEFT
+      textvalign ITEM_VALIGN_CENTER
+      textalignx LIST_TOFF
+      forecolor 1 1 1 1
+      border WINDOW_BORDER_FULL
+      bordercolor .5 .5 .5 1
+      visible MENU_TRUE
+      decoration
+    }
+
+    itemDef
+    {
+      name messageoftheday
+      ownerdraw UI_SERVERMOTD
+      textscale .33
+      rect (LIST_X+(LIST_W/2)) (LIST_Y+(LIST_H-HEADFOOT_H)) (LIST_W/2) HEADFOOT_H
+      textalign ITEM_ALIGN_LEFT
+      textvalign ITEM_VALIGN_CENTER
+      textalignx LIST_TOFF
+      forecolor 1 1 1 1
+      border WINDOW_BORDER_FULL
+      bordercolor .5 .5 .5 1
+      visible MENU_TRUE
+      decoration
+    }
+
+
+    // BOTTOM BUTTONS //
 
     itemDef
     {
       name password
-      text "Password"
+      text "Set Password"
       type ITEM_TYPE_BUTTON
       textscale .4
-      style WINDOW_STYLE_FILLED
-      rect 20 395 92 26
-      textalign 1
-      textalignx 46   // center
-      textaligny 22
-      backcolor 0 0 0 1
+      style WINDOW_STYLE_EMPTY
+      rect BOT_X BOT_Y BOTBUTT_W BOTBUTT_H
+      textalign ITEM_ALIGN_CENTER
+      textvalign ITEM_VALIGN_CENTER
       forecolor 1 1 1 1
-      visible 1 
+      visible MENU_TRUE
       action
       {
-        play "sound/misc/menu1.wav"; 
+        play "sound/misc/menu1.wav";
         open password_popmenu
       }
     }
@@ -443,113 +464,105 @@
     itemDef
     {
       name createFavorite
-      text "New Favorite"
+      text "Create Favorite"
       type ITEM_TYPE_BUTTON
       textscale .4
-      style WINDOW_STYLE_FILLED
-      rect 148 395 92 26
-      textalign 1
-      textalignx 46   // center
-      textaligny 22
-      backcolor 0 0 0 1
+      style WINDOW_STYLE_EMPTY
+      rect (BOT_X+BOTBUTT_W) BOT_Y BOTBUTT_W BOTBUTT_H
+      textalign ITEM_ALIGN_CENTER
+      textvalign ITEM_VALIGN_CENTER
       forecolor 1 1 1 1
-      visible 1 
+      visible MENU_TRUE
       action
       {
-        play "sound/misc/menu1.wav"; 
+        play "sound/misc/menu1.wav";
         open createfavorite_popmenu
       }
     }
-    
+
     itemDef
     {
       name addFavorite
       text "Add Favorite"
       type ITEM_TYPE_BUTTON
       textscale .4
-      style WINDOW_STYLE_FILLED
+      style WINDOW_STYLE_EMPTY
       ownerdrawFlag UI_SHOW_NOTFAVORITESERVERS
-      rect 276 395 92 26
-      textalign 1
-      textalignx 46   // center
-      textaligny 22
-      backcolor 0 0 0 1
+      rect (BOT_X+(2*BOTBUTT_W)) BOT_Y BOTBUTT_W BOTBUTT_H
+      textalign ITEM_ALIGN_CENTER
+      textvalign ITEM_VALIGN_CENTER
       forecolor 1 1 1 1
-      visible 1 
+      visible MENU_TRUE
       action
       {
-        play "sound/misc/menu1.wav"; 
-        uiScript addFavorite 
+        play "sound/misc/menu1.wav";
+        uiScript addFavorite
       }
     }
 
     itemDef
     {
       name delfavorite
-      text "Del. Favorite"
+      text "Delete Favorite"
       type ITEM_TYPE_BUTTON
       textscale .4
-      style WINDOW_STYLE_FILLED
+      style WINDOW_STYLE_EMPTY
       ownerdrawFlag UI_SHOW_FAVORITESERVERS
-      rect 276 395 92 26
-      textalign 1
-      textalignx 46   // center
-      textaligny 22
-      backcolor 0 0 0 1
+      rect (BOT_X+(2*BOTBUTT_W)) BOT_Y BOTBUTT_W BOTBUTT_H
+      textalign ITEM_ALIGN_CENTER
+      textvalign ITEM_VALIGN_CENTER
       forecolor 1 1 1 1
-      visible 1 
+      visible MENU_TRUE
       action
       {
-        play "sound/misc/menu1.wav"; 
+        play "sound/misc/menu1.wav";
         uiScript DeleteFavorite;
         uiScript UpdateFilter
       }
     }
-    
+
     itemDef
     {
       name serverinfo
       text "Server Info"
       type ITEM_TYPE_BUTTON
       textscale .4
-      style WINDOW_STYLE_FILLED
-      rect 404 395 92 26
-      textalign 1
-      textalignx 46   // center
-      textaligny 22
-      backcolor 0 0 0 1
+      style WINDOW_STYLE_EMPTY
+      rect (BOT_X+(3*BOTBUTT_W)) BOT_Y BOTBUTT_W BOTBUTT_H
+      textalign ITEM_ALIGN_CENTER
+      textvalign ITEM_VALIGN_CENTER
       forecolor 1 1 1 1
-      visible 1 
+      visible MENU_TRUE
       action
       {
         play "sound/misc/menu1.wav";
         open serverinfo_popmenu
       }
     }
-    
+
     itemDef
     {
       name findplayer
-      text "Find Friend"
+      text "Find a Friend"
       type ITEM_TYPE_BUTTON
       textscale .4
-      style WINDOW_STYLE_FILLED
-      rect 532 395 92 26
-      textalign 1
-      textalignx 46   // center
-      textaligny 22
-      backcolor 0 0 0 1
+      style WINDOW_STYLE_EMPTY
+      rect (BOT_X+(4*BOTBUTT_W)) BOT_Y BOTBUTT_W BOTBUTT_H
+      textalign ITEM_ALIGN_CENTER
+      textvalign ITEM_VALIGN_CENTER
       forecolor 1 1 1 1
-      visible 1 
+      visible MENU_TRUE
       action
       {
-        play "sound/misc/menu1.wav"; 
+        play "sound/misc/menu1.wav";
         open findplayer_popmenu
       }
     }
-    
 
 
+
+    // BACK CREATE JOIN //
+
     itemDef
     {
       name createServer
@@ -557,36 +570,32 @@
       textscale .5
       style WINDOW_STYLE_EMPTY
       type ITEM_TYPE_BUTTON
-      rect 254 436 128 26
-      textalign ITEM_ALIGN_LEFT
-      textalignx 10
-      textaligny 24 
-      backcolor .5 .5 .5 .5
+      rect (BCJ_X+ARROW_W) BCJ_Y (BCJ_W-(2*ARROW_W)) BCJ_H
+      textalign ITEM_ALIGN_CENTER
+      textvalign ITEM_VALIGN_CENTER
       forecolor 1 1 1 1
-      visible 1 
+      visible MENU_TRUE
       action
       {
-        play "sound/misc/menu1.wav"; 
+        play "sound/misc/menu1.wav";
         open createserver
-      }        
+      }
     }
 
 
-    // BACK BAR //
-
     itemDef
     {
       name back
-      style 3
+      style WINDOW_STYLE_SHADER
       background "ui/assets/backarrow.tga"
-      rect 16 424 50 50 
-      visible 1 
+      rect BCJ_X BCJ_Y ARROW_H ARROW_W
+      visible MENU_TRUE
       action
       {
-        play "sound/misc/menu4.wav"; 
+        play "sound/misc/menu4.wav";
         close joinserver
       }
-      
+
       mouseEnter
       {
         hide back;
@@ -599,29 +608,29 @@
       name back_alt
       style WINDOW_STYLE_SHADER
       background "ui/assets/backarrow_alt.tga"
-      rect 16 424 50 50
+      rect BCJ_X BCJ_Y ARROW_H ARROW_W
       backcolor 0 0 0 0
       forecolor 1 1 1 1
-      visible 0
+      visible MENU_FALSE
       type ITEM_TYPE_BUTTON
-      
+
       text "Back"
       textalign ITEM_ALIGN_LEFT
-      textaligny 36
-      textalignx 60
+      textvalign ITEM_VALIGN_CENTER
+      textalignx ARROW_W
       textscale .6
-      
+
       mouseExit
       {
         hide back_alt;
         show back
       }
-      
+
       action
       {
-        play "sound/misc/menu4.wav"; 
+        play "sound/misc/menu4.wav";
         close joinserver
-      }   
+      }
     }
 
 
@@ -630,21 +639,21 @@
     itemDef
     {
       name accept
-      style 3 
-      rect 574 424 50 50 
+      style WINDOW_STYLE_SHADER
+      rect ((BCJ_X+BCJ_W)-ARROW_W) BCJ_Y ARROW_H ARROW_W
       background "ui/assets/forwardarrow.tga"
       backcolor 0 0 0 0
       forecolor 1 1 1 1
-      visible 1 
+      visible MENU_TRUE
       mouseEnter
       {
         hide accept;
         show accept_alt
       }
-      
+
       action
       {
-        play "sound/misc/menu1.wav"; 
+        play "sound/misc/menu1.wav";
         uiScript JoinServer
       }
     }
@@ -653,29 +662,29 @@
     {
       name accept_alt
       style WINDOW_STYLE_SHADER
-      rect 574 424 50 50
+      rect ((BCJ_X+BCJ_W)-ARROW_W) BCJ_Y ARROW_H ARROW_W
       background "ui/assets/forwardarrow_alt.tga"
       backcolor 0 0 0 0
       type ITEM_TYPE_BUTTON
       forecolor 1 1 1 1
-      visible 0  
-      type ITEM_TYPE_BUTTON 
-      
+      visible MENU_FALSE
+      type ITEM_TYPE_BUTTON
+
       text "Join"
-      textalign ITEM_ALIGN_LEFT
-      textaligny 36
-      textalignx -55
+      textalign ITEM_ALIGN_RIGHT
+      textvalign ITEM_VALIGN_CENTER
+      textalignx -ARROW_W
       textscale .6
-      
+
       mouseExit
       {
         hide accept_alt;
         show accept
       }
-      
+
       action
       {
-        play "sound/misc/menu1.wav"; 
+        play "sound/misc/menu1.wav";
         uiScript JoinServer
       }
     }