zsh-workers/7477

11 files changed, 76 insertions, 16 deletions

diff --git a/Completion/User/_xterm b/Completion/User/_xterm
index 074061d5f..460921193 100644
--- a/Completion/User/_xterm
+++ b/Completion/User/_xterm
@@ -1,6 +1,6 @@
 #compdef xterm
 
-_arguments \
+_xt_arguments \
   '-version' \
   '-help' \
   '-132' \
@@ -16,13 +16,13 @@ _arguments \
   '-cc:character class:' \
   '-cm' '+cm' \
   '-cn' '+cn' \
-  '-cr:text cursor color:_color' \
+  '-cr:text cursor color:_colors' \
   '-cu' '+cu' \
   '-dc' '+dc' \
   '-e:program: _command_names -e:*::program arguments: _normal' \
   '-fb:bold font:' \
   '-fi:icon font:' \
-  '-hc:background color for highlighted text:_color' \
+  '-hc:background color for highlighted text:_colors' \
   '-hf' '+hf' \
   '-ie' '+ie' \
   '-im' '+im' \
@@ -31,7 +31,7 @@ _arguments \
   '-ls' '+ls' \
   '-mb' '+mb' \
   '-mc:multi-click threshold (milliseconds):' \
-  '-ms:pointer cursor color:_color' \
+  '-ms:pointer cursor color:_colors' \
   '-nb:margin bell number:' \
   '-nul' '+nul' \
   '-pc' '+pc' \
@@ -58,15 +58,3 @@ _arguments \
   '-ziconbeep:iconbeep (percent):' \
   '-C' \
   '-S-:pseudo-terminal and file descriptor:' \
-  '-bd:border color:_color' \
-  '-bg:background color:_color' \
-  '-bw:border width:' \
-  '-display:display:_x_display' \
-  '-fg:foreground color:_color' \
-  '-fn:font:' \
-  '-geometry:geometry:' \
-  '-iconic' \
-  '-name:name:' \
-  '-rv' \
-  '-title:title:' \
-  '-xrm:resource:'
diff --git a/Completion/X/_x_borderwidth b/Completion/X/_x_borderwidth
new file mode 100644
index 000000000..10a5d6dc4
--- /dev/null
+++ b/Completion/X/_x_borderwidth
@@ -0,0 +1,3 @@
+#autoload
+
+_message 'border width'
diff --git a/Completion/X/_x_font b/Completion/X/_x_font
new file mode 100644
index 000000000..e0acb4014
--- /dev/null
+++ b/Completion/X/_x_font
@@ -0,0 +1,3 @@
+#autoload
+
+_message 'font'
diff --git a/Completion/X/_x_geometry b/Completion/X/_x_geometry
new file mode 100644
index 000000000..4f978b053
--- /dev/null
+++ b/Completion/X/_x_geometry
@@ -0,0 +1,3 @@
+#autoload
+
+_message 'geometry'
diff --git a/Completion/X/_x_locale b/Completion/X/_x_locale
new file mode 100644
index 000000000..418868f13
--- /dev/null
+++ b/Completion/X/_x_locale
@@ -0,0 +1,3 @@
+#autoload
+
+_message 'locale'
diff --git a/Completion/X/_x_name b/Completion/X/_x_name
new file mode 100644
index 000000000..674c62a94
--- /dev/null
+++ b/Completion/X/_x_name
@@ -0,0 +1,3 @@
+#autoload
+
+_message 'name'
diff --git a/Completion/X/_x_resource b/Completion/X/_x_resource
new file mode 100644
index 000000000..8dad60916
--- /dev/null
+++ b/Completion/X/_x_resource
@@ -0,0 +1,3 @@
+#autoload
+
+_message 'resource'
diff --git a/Completion/X/_x_selection_timeout b/Completion/X/_x_selection_timeout
new file mode 100644
index 000000000..7d219a41c
--- /dev/null
+++ b/Completion/X/_x_selection_timeout
@@ -0,0 +1,3 @@
+#autoload
+
+_message 'selection timeout'
diff --git a/Completion/X/_x_title b/Completion/X/_x_title
new file mode 100644
index 000000000..b072d5b9d
--- /dev/null
+++ b/Completion/X/_x_title
@@ -0,0 +1,3 @@
+#autoload
+
+_message 'title'
diff --git a/Completion/X/_xt_arguments b/Completion/X/_xt_arguments
new file mode 100644
index 000000000..02f11e226
--- /dev/null
+++ b/Completion/X/_xt_arguments
@@ -0,0 +1,45 @@
+#autoload
+
+# How to convert XrmOptionDescRec:
+
+# XrmOptionDescRec optionDescList[] = {
+#   ...
+#   {option, specifier, argKind, value},
+#   ...
+# };
+
+#  argKind		argument for _xt_arguments
+#  XrmoptionNoArg	option
+#  XrmoptionIsArg	option
+#  XrmoptionStickyArg	option-:message:action
+#  XrmoptionSepArg	option:message:action
+#  XrmoptionResArg	option:message:_x_resource
+#  XrmoptionSkipArg	option:message:action
+#  XrmoptionSkipLine	option:*::message:action
+#  XrmoptionSkipNArgs	option:message[1]:action[1]:...:message[value]:action[value]
+
+# cf. XrmParseCommand(3X11), X11R6.4/xc/lib/Xt/Initialize.c, X(5)
+
+_arguments \
+  '+rv' '-rv' '-reverse' \
+  '+synchronous' '-synchronous' \
+  '-background:background color:_colors' \
+  '-background:background color:_colors' \
+  '-bd:border color:_colors' \
+  '-bg:background color:_colors' \
+  '-bordercolor:border color:_colors' \
+  '-borderwidth:border width:_x_borderwidth' \
+  '-bw:border width:_x_borderwidth' \
+  '-display:display:_x_display' \
+  '-fg:foreground color:_colors' \
+  '-fn:font:_x_font' \
+  '-foreground:foreground color:_colors' \
+  '-geometry:geometry:_x_geometry' \
+  '-iconic' \
+  '-name:name:_x_name' \
+  '-selectionTimeout:selection timeout (milliseconds):_x_selection_timeout' \
+  '-title:title:_x_title' \
+  '-xnllanguage:locale:_x_locale' \
+  '-xrm:resource:_x_resource' \
+  '-xtsessionID:session ID:_xt_session_id' \
+  "$@"
diff --git a/Completion/X/_xt_session_id b/Completion/X/_xt_session_id
new file mode 100644
index 000000000..fcb0192ef
--- /dev/null
+++ b/Completion/X/_xt_session_id
@@ -0,0 +1,3 @@
+#autoload
+
+_message 'session ID'