* (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, 35 insertions, 24 deletions

diff --git a/ui/tremulous_aliendialogs.menu b/ui/tremulous_aliendialogs.menu
index 1e55ed79..159afb02 100644
--- a/ui/tremulous_aliendialogs.menu
+++ b/ui/tremulous_aliendialogs.menu
@@ -1,13 +1,26 @@
 #include "ui/menudef.h"
 
 {
+
+#define W         280
+#define H         190
+#define BORDER    10
+
+#define BUTT_H    25
+#define BUTT_W    45
+
+#define INFO_W    (W-(2*BORDER))
+#define INFO_H    (H-((4*BORDER)+(2*BUTT_H)))
+#define INFO_X    BORDER
+#define INFO_Y    ((2*BORDER)+BUTT_H)
+
   menuDef
   {
     name "tremulous_alien_dialog"
-    visible 0
-    fullscreen 0
+    visible MENU_FALSE
+    fullscreen MENU_FALSE
     outOfBoundsClick
-    rect 185 140 280 190
+    rect (320-(W/2)) (240-(H/2)) W H
     focusColor 1 .75 0 1
     style WINDOW_STYLE_EMPTY
     popup
@@ -15,17 +28,17 @@
     itemDef
     {
       name window
-      rect 0 0 280 190
+      rect 0 0 W H
       style WINDOW_STYLE_FILLED
       backcolor 0 0 0 1
-      visible 1
+      visible MENU_TRUE
       decoration
 
       border WINDOW_BORDER_FULL
       borderSize 1.0
       borderColor 0.5 0.5 0.5 1
     }
-    
+
     itemDef
     {
       name alien_dialog
@@ -33,51 +46,49 @@
       type ITEM_TYPE_TEXT
       textstyle ITEM_TEXTSTYLE_NORMAL
       style WINDOW_STYLE_EMPTY
-      rect 115 10 50 20   
-      textalign ITEM_ALIGN_LEFT
-      textalignx 5
-      textaligny 18
+      rect BORDER BORDER INFO_W BUTT_H
+      textalign ITEM_ALIGN_CENTER
+      textvalign ITEM_VALIGN_CENTER
       textscale .4
       forecolor 1 1 1 1
       backcolor .5 0 0 .25
-      visible 1 
+      visible MENU_TRUE
       decoration
     }
-    
+
     itemDef
     {
       name alien_dialog
       textstyle ITEM_TEXTSTYLE_NORMAL
       style WINDOW_STYLE_EMPTY
-      rect 10 50 250 80   
+      rect INFO_X INFO_Y INFO_W INFO_H
       cvar "ui_dialog"
-      autowrapped
-      textalignx 5
-      textaligny 18
+      wrapped
+      textalign ITEM_ALIGN_CENTER
+      textvalign ITEM_VALIGN_CENTER
       textscale .33
       forecolor 1 1 1 1
       backcolor .5 0 0 .25
-      visible 1 
+      visible MENU_TRUE
       decoration
     }
-    
+
     itemDef
     {
       name alien_dialog
       text "OK"
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_EMPTY
-      rect 242 150 28 20
-      textalign ITEM_ALIGN_LEFT
-      textalignx 5
-      textaligny 18
+      rect (W-(BORDER+BUTT_W)) (H-(BORDER+BUTT_H)) BUTT_W BUTT_H
+      textalign ITEM_ALIGN_CENTER
+      textvalign ITEM_VALIGN_CENTER
       textscale .4
       forecolor 1 1 1 1
       backcolor .5 0 0 .25
-      visible 1 
+      visible MENU_TRUE
       action
       {
-        play "sound/misc/menu1.wav"; 
+        play "sound/misc/menu1.wav";
         close tremulous_alien_dialog
       }
     }