From 1c9783e59746a002c47942c2c2d804c9948245b7 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Wed, 4 Sep 2024 10:15:58 -0700
Subject: [PATCH] update for 50.14

---
 df.jobs.xml        |  1 +
 df.keybindings.xml | 62 ++++++++++++++++++++++++++++++++++++++++++++++
 df.viewscreen.xml  |  5 ++--
 3 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/df.jobs.xml b/df.jobs.xml
index df0279e51..93de9687e 100644
--- a/df.jobs.xml
+++ b/df.jobs.xml
@@ -302,6 +302,7 @@
         <flag-bit name='woven'/>
         <flag-bit name='gem'/>
         <flag-bit name='empty_or_water'/>
+        <flag-bit name='grown_not_crafted'/>
     </bitfield-type>
 
     <struct-type type-name='job_item' original-name='job_req_elementst'>
diff --git a/df.keybindings.xml b/df.keybindings.xml
index d939f81dd..a7159f914 100644
--- a/df.keybindings.xml
+++ b/df.keybindings.xml
@@ -177,6 +177,68 @@
         <enum-item name='CUSTOM_ALT_X'/>
         <enum-item name='CUSTOM_ALT_Y'/>
         <enum-item name='CUSTOM_ALT_Z'/>
+        <enum-item name='CUSTOM_UP'/>
+        <enum-item name='CUSTOM_DOWN'/>
+        <enum-item name='CUSTOM_LEFT'/>
+        <enum-item name='CUSTOM_RIGHT'/>
+        <enum-item name='CUSTOM_TAB'/>
+        <enum-item name='CUSTOM_HOME'/>
+        <enum-item name='CUSTOM_END'/>
+        <enum-item name='CUSTOM_PGUP'/>
+        <enum-item name='CUSTOM_PGDN'/>
+        <enum-item name='CUSTOM_INSERT'/>
+        <enum-item name='CUSTOM_DELETE'/>
+        <enum-item name='CUSTOM_SHIFT_ENTER'/>
+        <enum-item name='CUSTOM_SHIFT_BACKSPACE'/>
+        <enum-item name='CUSTOM_SHIFT_UP'/>
+        <enum-item name='CUSTOM_SHIFT_DOWN'/>
+        <enum-item name='CUSTOM_SHIFT_LEFT'/>
+        <enum-item name='CUSTOM_SHIFT_RIGHT'/>
+        <enum-item name='CUSTOM_SHIFT_TAB'/>
+        <enum-item name='CUSTOM_SHIFT_HOME'/>
+        <enum-item name='CUSTOM_SHIFT_END'/>
+        <enum-item name='CUSTOM_SHIFT_PGUP'/>
+        <enum-item name='CUSTOM_SHIFT_PGDN'/>
+        <enum-item name='CUSTOM_SHIFT_INSERT'/>
+        <enum-item name='CUSTOM_SHIFT_DELETE'/>
+        <enum-item name='CUSTOM_CTRL_ENTER'/>
+        <enum-item name='CUSTOM_CTRL_BACKSPACE'/>
+        <enum-item name='CUSTOM_CTRL_UP'/>
+        <enum-item name='CUSTOM_CTRL_DOWN'/>
+        <enum-item name='CUSTOM_CTRL_LEFT'/>
+        <enum-item name='CUSTOM_CTRL_RIGHT'/>
+        <enum-item name='CUSTOM_CTRL_TAB'/>
+        <enum-item name='CUSTOM_CTRL_HOME'/>
+        <enum-item name='CUSTOM_CTRL_END'/>
+        <enum-item name='CUSTOM_CTRL_PGUP'/>
+        <enum-item name='CUSTOM_CTRL_PGDN'/>
+        <enum-item name='CUSTOM_CTRL_INSERT'/>
+        <enum-item name='CUSTOM_CTRL_DELETE'/>
+        <enum-item name='CUSTOM_CTRL_SLASH'/>
+        <enum-item name='CUSTOM_CTRL_0'/>
+        <enum-item name='CUSTOM_CTRL_1'/>
+        <enum-item name='CUSTOM_CTRL_2'/>
+        <enum-item name='CUSTOM_CTRL_3'/>
+        <enum-item name='CUSTOM_CTRL_4'/>
+        <enum-item name='CUSTOM_CTRL_5'/>
+        <enum-item name='CUSTOM_CTRL_6'/>
+        <enum-item name='CUSTOM_CTRL_7'/>
+        <enum-item name='CUSTOM_CTRL_8'/>
+        <enum-item name='CUSTOM_CTRL_9'/>
+        <enum-item name='CUSTOM_CTRL_SHIFT_UP'/>
+        <enum-item name='CUSTOM_CTRL_SHIFT_DOWN'/>
+        <enum-item name='CUSTOM_CTRL_SHIFT_LEFT'/>
+        <enum-item name='CUSTOM_CTRL_SHIFT_RIGHT'/>
+        <enum-item name='CUSTOM_ALT_0'/>
+        <enum-item name='CUSTOM_ALT_1'/>
+        <enum-item name='CUSTOM_ALT_2'/>
+        <enum-item name='CUSTOM_ALT_3'/>
+        <enum-item name='CUSTOM_ALT_4'/>
+        <enum-item name='CUSTOM_ALT_5'/>
+        <enum-item name='CUSTOM_ALT_6'/>
+        <enum-item name='CUSTOM_ALT_7'/>
+        <enum-item name='CUSTOM_ALT_8'/>
+        <enum-item name='CUSTOM_ALT_9'/>
         <enum-item comment='WORLDKEY_START'/>
         <enum-item comment='ADVENTUREKEY_START'/>
         <enum-item comment='EMBARKKEY_START'/>
diff --git a/df.viewscreen.xml b/df.viewscreen.xml
index fe08fafef..da79b54a1 100644
--- a/df.viewscreen.xml
+++ b/df.viewscreen.xml
@@ -174,10 +174,11 @@
         <stl-vector name='custom_render'> <stl-function/> </stl-vector>
         <stl-vector name='custom_activated'> <stl-function/> </stl-vector>
         <stl-string name='name'/>
-        <bitfield name='visibility_flags' base-type='int8_t'> bay12: VisibilityFlagType
+        <bitfield name='flag' base-type='int8_t'> bay12: WidgetFlag
             <flag-bit name='WIDGET_VISIBILITY_ACTIVE'/>
             <flag-bit name='WIDGET_VISIBILITY_VISIBLE'/> plus ACTUALLY_VISIBLE for both of the above
-            <flag-bit name='WIDGET_VISIBILITY_CAN_KEY_ACTIVATE'/>
+            <flag-bit name='WIDGET_CAN_KEY_ACTIVATE'/>
+            <flag-bit name='WIDGET_GLOBAL_POSITIONING'/>
         </bitfield>
         <int32_t name='offset_bottom'/>
         <int32_t name='offset_left'/>