screen: increment group classes to .g1-9

diff --git a/base.css b/base.css
index b89cd1a98a1348ad46d5a716a902949eea4cdbbc..788e992060a3a1b85f7c2d4604e111ad6ff5bbf0 100644 (file)
--- a/base.css
+++ b/base.css
@@ -462,55 +462,55 @@ table.dimap {
 
 .c-sa,
 .ci,
-.g0 {background: #BFE} /* cyan: info */
+.g1 {background: #BFE} /* cyan: info */
 .c-na,
 .pm,
-.g1 {background: #BFB} /* green: motion */
+.g2 {background: #BFB} /* green: motion */
 .po,
-.g2 {background: #DFA} /* greenish: jump (g1+) */
+.g3 {background: #DFA} /* greenish: jump (g2+) */
 .c-af,
 .co,
-.g3 {background: #FFA} /* yellow: command */
+.g4 {background: #FFA} /* yellow: command */
 .c-eu,
 .cp,
-.g4 {background: #FDA} /* orangish: open (g5-) */
+.g5 {background: #FDA} /* orangish: open (g6-) */
 .mi,
-.g5 {background: #FCA} /* orange: insert */
+.g6 {background: #FCA} /* orange: insert */
 .c-as,
 .mo,
-.g6 {background: #FCC} /* red: mode */
+.g7 {background: #FCC} /* red: mode */
 .c-an,
 .mv,
-.g7 {background: #ECE} /* purple: visual (g6+) */
+.g8 {background: #ECE} /* purple: visual (g7+) */
 .c-oc,
 .me,
-.g8 {background: #CCF} /* blue: prefix */
+.g9 {background: #CCF} /* blue: prefix */
 
 .c-sa:hover,
 .ci a:hover, .ci[onclick]:hover,
-.g0 a:hover, .g0[onclick]:hover {background: #5ED}
+.g1 a:hover, .g1[onclick]:hover {background: #5ED}
 .c-na:hover,
 .pm a:hover, .pm[onclick]:hover,
-.g1 a:hover, .g1[onclick]:hover {background: #7E7}
+.g2 a:hover, .g2[onclick]:hover {background: #7E7}
 .po a:hover, .po[onclick]:hover,
-.g2 a:hover, .g2[onclick]:hover {background: #CE6}
+.g3 a:hover, .g3[onclick]:hover {background: #CE6}
 .c-af:hover,
 .co a:hover, .co[onclick]:hover,
-.g3 a:hover, .g3[onclick]:hover {background: #EE4}
+.g4 a:hover, .g4[onclick]:hover {background: #EE4}
 .c-eu:hover,
 .cp a:hover, .cp[onclick]:hover,
-.g4 a:hover, .g4[onclick]:hover {background: #FA6}
+.g5 a:hover, .g5[onclick]:hover {background: #FA6}
 .mi a:hover, .mi[onclick]:hover,
-.g5 a:hover, .g5[onclick]:hover {background: #F97}
+.g6 a:hover, .g6[onclick]:hover {background: #F97}
 .c-as:hover,
 .mo a:hover, .mo[onclick]:hover,
-.g6 a:hover, .g6[onclick]:hover {background: #F88}
+.g7 a:hover, .g7[onclick]:hover {background: #F88}
 .c-an:hover,
 .mv a:hover, .mv[onclick]:hover,
-.g7 a:hover, .g7[onclick]:hover {background: #D9D}
+.g8 a:hover, .g8[onclick]:hover {background: #D9D}
 .c-oc:hover,
 .me a:hover, .me[onclick]:hover,
-.g8 a:hover, .g8[onclick]:hover {background: #99F}
+.g9 a:hover, .g9[onclick]:hover {background: #99F}
 
 .no {
        background: #EEE; /* unassigned */

diff --git a/circus.css b/circus.css
index 276aa45426b1d5ceedf565069dbcb27b78e69834..e444af1669d8e53841c3a87725a10ab881304369 100644 (file)
--- a/circus.css
+++ b/circus.css
@@ -28,57 +28,57 @@
 .Co {background: #DBB} /* private */
 .c-sa,
 .ci,
-.g0 {background: #8FD}
+.g1 {background: #8FD}
 .c-na,
 .pm,
-.g1 {background: #8F8}
+.g2 {background: #8F8}
 .po,
-.g2 {background: #BF6}
+.g3 {background: #BF6}
 .c-af,
 .co,
-.g3 {background: #FF6}
+.g4 {background: #FF6}
 .c-eu,
 .cp,
-.g4 {background: #FC6}
+.g5 {background: #FC6}
 .mi,
-.g5 {background: #F96}
+.g6 {background: #F96}
 .c-as,
 .mo,
-.g6 {background: #F77}
+.g7 {background: #F77}
 .c-an,
 .mv,
-.g7 {background: #E8E}
+.g8 {background: #E8E}
 .c-oc,
 .me,
-.g8 {background: #9AF}
+.g9 {background: #9AF}
 
 .Co:hover                       {background: #000; color: #DBB} /* private */
 
 .c-sa:hover,
 .ci a:hover, .ci[onclick]:hover,
-.g0 a:hover, .g0[onclick]:hover {background: #000; color: #8FD}
+.g1 a:hover, .g1[onclick]:hover {background: #000; color: #8FD}
 .c-na:hover,
 .pm a:hover, .pm[onclick]:hover,
-.g1 a:hover, .g1[onclick]:hover {background: #000; color: #7E7}
+.g2 a:hover, .g2[onclick]:hover {background: #000; color: #7E7}
 .po a:hover, .po[onclick]:hover,
-.g2 a:hover, .g2[onclick]:hover {background: #000; color: #CE6}
+.g3 a:hover, .g3[onclick]:hover {background: #000; color: #CE6}
 .c-af:hover,
 .co a:hover, .co[onclick]:hover,
-.g3 a:hover, .g3[onclick]:hover {background: #000; color: #FF7}
+.g4 a:hover, .g4[onclick]:hover {background: #000; color: #FF7}
 .c-eu:hover,
 .cp a:hover, .cp[onclick]:hover,
-.g4 a:hover, .g4[onclick]:hover {background: #000; color: #FA6}
+.g5 a:hover, .g5[onclick]:hover {background: #000; color: #FA6}
 .mi a:hover, .mi[onclick]:hover,
-.g5 a:hover, .g5[onclick]:hover {background: #000; color: #FFA070}
+.g6 a:hover, .g6[onclick]:hover {background: #000; color: #FFA070}
 .c-as:hover,
 .mo a:hover, .mo[onclick]:hover,
-.g6 a:hover, .g6[onclick]:hover {background: #000; color: #F77}
+.g7 a:hover, .g7[onclick]:hover {background: #000; color: #F77}
 .c-an:hover,
 .mv a:hover, .mv[onclick]:hover,
-.g7 a:hover, .g7[onclick]:hover {background: #000; color: #E8E}
+.g8 a:hover, .g8[onclick]:hover {background: #000; color: #E8E}
 .c-oc:hover,
 .me a:hover, .me[onclick]:hover,
-.g8 a:hover, .g8[onclick]:hover {background: #000; color: #99F}
+.g9 a:hover, .g9[onclick]:hover {background: #000; color: #99F}
 
 dl.legend dt.ext,
 .keys td.ext {

diff --git a/dark.css b/dark.css
index 6c471ba01f16c953d63e39c4b9c1924cefaae435..37436809f59477e75f1235bacc9cc8ab259bff1e 100644 (file)
--- a/dark.css
+++ b/dark.css
@@ -75,29 +75,29 @@ th, td {
 
 .c-sa,
 .ci,
-.g0 {background: #044}
+.g1 {background: #044}
 .c-na,
 .pm,
-.g1 {background: #040}
+.g2 {background: #040}
 .po,
-.g2 {background: #340}
+.g3 {background: #340}
 .c-af,
 .co,
-.g3 {background: #440}
+.g4 {background: #440}
 .c-eu,
 .cp,
-.g4 {background: #530}
+.g5 {background: #530}
 .mi,
-.g5 {background: #520}
+.g6 {background: #520}
 .c-as,
 .mo,
-.g6 {background: #500}
+.g7 {background: #500}
 .c-an,
 .mv,
-.g7 {background: #503}
+.g8 {background: #503}
 .c-oc,
 .me,
-.g8 {background: #205}
+.g9 {background: #205}
 .no {background: #222}
 
 .X:hover,
@@ -110,6 +110,7 @@ th, td {
 .mo a:hover, .mo[onclick]:hover,
 .mv a:hover, .mv[onclick]:hover,
 .me a:hover, .me[onclick]:hover,
+.g9 a:hover, .g9[onclick]:hover,
 .g8 a:hover, .g8[onclick]:hover,
 .g7 a:hover, .g7[onclick]:hover,
 .g6 a:hover, .g6[onclick]:hover,
@@ -117,8 +118,7 @@ th, td {
 .g4 a:hover, .g4[onclick]:hover,
 .g3 a:hover, .g3[onclick]:hover,
 .g2 a:hover, .g2[onclick]:hover,
-.g1 a:hover, .g1[onclick]:hover,
-.g0 a:hover, .g0[onclick]:hover {
+.g1 a:hover, .g1[onclick]:hover {
        color: #000; /* on default (light) background hover */
 }
 .legend .ex:hover {background: #666}

diff --git a/darklite.css b/darklite.css
index d57f249177e6df157fc09173de3d8ed6e47d8894..cdd8caa5b93d9dfefd50e02676a28d4bd075b4fe 100644 (file)
--- a/darklite.css
+++ b/darklite.css
@@ -23,15 +23,15 @@ th, td {
 .Xr {background: #111} /* reverse */
 .Co {background: #181111} /* private */
 
-.me, .c-an  .g8     {background: #102}
-.mv, .c-oc  .g7     {background: #012}
-.mo, .c-as, .g6 .l1 {background: #200}
-.mi         .g5     {}
-.cp, .c-eu, .g4 .l2 {background: #221400}
-.co, .c-af, .g3 .l3 {background: #1C1C00}
-.po         .g2     {}
-.pm, .c-na, .g1 .l4 {background: #002200}
-.ci, .c-sa  .g0     {background: #001A1A}
+.me, .c-an  .g9     {background: #102}
+.mv, .c-oc  .g8     {background: #012}
+.mo, .c-as, .g7 .l1 {background: #200}
+.mi         .g6     {}
+.cp, .c-eu, .g5 .l2 {background: #221400}
+.co, .c-af, .g4 .l3 {background: #1C1C00}
+.po         .g3     {}
+.pm, .c-na, .g2 .l4 {background: #002200}
+.ci, .c-sa  .g1     {background: #001A1A}
 .no                 {}
 .u-invalid          {background: #222}
 

diff --git a/mono.css b/mono.css
index f8c6ae28d784dd4e982d798fe8d3f85fa0e57256..57a5cf427ce5c2f400b6fe3a5a78160394d91dfe 100644 (file)
--- a/mono.css
+++ b/mono.css
@@ -28,15 +28,15 @@ td,
 .p1.p::after,
 .p0.p::after {content: '!'}
 
-.pm, .g1 {background: #FFF}   /* motion */
-.po, .g2 {background: #DDD}   /* window */
-.co, .g3 {background: #AAA}   /* command */
-.ci, .g0 {background: #777}   /* info */
-.cp, .g4 {background: #AAA; color: #FFF}   /* open */
-.mi, .g5 {background: #888; color: #FFF}   /* insert mode */
-.mv, .g6 {background: #444; color: #FFF}   /* visual mode */
-.mo, .g7 {background: #000; color: #FFF}   /* mode */
-.me, .g8 {background: #000; color: #AAA}   /* key mode */
+.ci, .g1 {background: #777}   /* info */
+.pm, .g2 {background: #FFF}   /* motion */
+.po, .g3 {background: #DDD}   /* window */
+.co, .g4 {background: #AAA}   /* command */
+.cp, .g5 {background: #AAA; color: #FFF}   /* open */
+.mi, .g6 {background: #888; color: #FFF}   /* insert mode */
+.mv, .g7 {background: #444; color: #FFF}   /* visual mode */
+.mo, .g8 {background: #000; color: #FFF}   /* mode */
+.me, .g9 {background: #000; color: #AAA}   /* key mode */
 
 .keys td[onclick]:hover,
 .keys td a:hover,
@@ -72,11 +72,11 @@ body .keys td.new {
 .sy-todo       { background-color: #CCC }
 
 /* continents */
-.c-af {background: #000; color: #FFF} /* .g3 */
-.c-eu {background: #333; color: #FFF} /* .g4 */
-.c-as {background: #666; color: #FFF} /* .g6 */
-.c-an {background: #999; color: #FFF} /* .g7 */
-.c-oc {background: #BBB}              /* .g8 */
-.c-sa {background: #999}              /* .g0 */
-.c-na {background: #666}              /* .g1 */
+.c-af {background: #000; color: #FFF} /* .g4 */
+.c-eu {background: #333; color: #FFF} /* .g5 */
+.c-as {background: #666; color: #FFF} /* .g7 */
+.c-an {background: #999; color: #FFF} /* .g8 */
+.c-oc {background: #BBB}              /* .g9 */
+.c-sa {background: #999}              /* .g1 */
+.c-na {background: #666}              /* .g2 */
 

diff --git a/screen.eng.inc.pl b/screen.eng.inc.pl
index 2d4c22e082c605609e28f08ad5de33df40dde226..2ab94ec6629bbed134eff6915bef190701656e79 100644 (file)
--- a/screen.eng.inc.pl
+++ b/screen.eng.inc.pl
@@ -66,14 +66,14 @@ mode => {
 },
 
 flag => {
-       g0 => ["info"],
-       g1 => ["display"],
-       g2 => ["select"],
-       g3 => ["config"],
-       g4 => ["window"],
-       g5 => ["buffer"],
-       g6 => ["contents"],
-       g8 => ["screen"],
+       g1 => ["info"],
+       g2 => ["display"],
+       g3 => ["select"],
+       g4 => ["config"],
+       g5 => ["window"],
+       g6 => ["buffer"],
+       g7 => ["contents"],
+       g9 => ["screen"],
 
        arg => ["key<arg>" => "Commands with a dot need a char argument afterwards."],
 },

diff --git a/screen.inc.pl b/screen.inc.pl
index 50def0d4ed4230275df58c37b0ea0ed089e7826e..52279ded167826e1ff46c650db09557ffb4f5d16 100644 (file)
--- a/screen.inc.pl
+++ b/screen.inc.pl
@@ -4,84 +4,84 @@ use utf8;
 # screen version 4.00.03jw4
 
 '' => {
-       'a' => 'g6',
-       'A' => 'g8 args', # title
+       'a' => 'g7',
+       'A' => 'g9 args', # title
        '^a'=> '',
-       'b' => 'g6', # break
-       'B' => 'g6', # pow_break
+       'b' => 'g7', # break
+       'B' => 'g7', # pow_break
        '^b'=> '=b',
-       'c' => 'g8', # screen
-       'C' => 'g1', # clear
+       'c' => 'g9', # screen
+       'C' => 'g2', # clear
        '^c'=> '=c',
-       'd' => 'g8', # detach
-       'D' => 'g8', # pow_detach
+       'd' => 'g9', # detach
+       'D' => 'g9', # pow_detach
        '^d'=> '=d',
-       'f' => 'g3', # flow
-       'F' => 'g3',
+       'f' => 'g4', # flow
+       'F' => 'g4',
        '^f'=> '=f',
-       '^g'=> 'g3', # vbell
-       'h' => 'g5', # hardcopy
-       'H' => 'g4', # log
+       '^g'=> 'g4', # vbell
+       'h' => 'g6', # hardcopy
+       'H' => 'g5', # log
        '^h'=> '=^p',
-       'i' => 'g0', # info
-       'I' => 'g4', #XXX
-       '^i'=> 'g1', # focus
-       'k' => 'g4', # kill
+       'i' => 'g1', # info
+       'I' => 'g5', #XXX
+       '^i'=> 'g2', # focus
+       'k' => 'g5', # kill
        'K' => '=k',
-       'l' => 'g1', # redisplay
-       'L' => 'g4', # login
+       'l' => 'g2', # redisplay
+       'L' => 'g5', # login
        '^l'=> '=l',
-       'm' => 'g0', # lastmsg
-       'M' => 'g4', # monitor
+       'm' => 'g1', # lastmsg
+       'M' => 'g5', # monitor
        '^m'=> '=m',
-       'n' => 'g2', # next
-       'N' => 'g0', # number
+       'n' => 'g3', # next
+       'N' => 'g1', # number
        '^n'=> '=n',
-       'O' => 'g4', #XXX
-       '^o'=> 'g2', # other
-       'p' => 'g2', # prev
+       'O' => 'g5', #XXX
+       '^o'=> 'g3', # other
+       'p' => 'g3', # prev
        '^p'=> '=p',
-       'q' => 'g3', # xon
-       'Q' => 'g1', # only
+       'q' => 'g4', # xon
+       'Q' => 'g2', # only
        '^q'=> '=q',
-       'r' => 'g3', # wrap
+       'r' => 'g4', # wrap
        '^r'=> '=r',
-       's' => 'g3', # xoff
+       's' => 'g4', # xoff
        '^s'=> '=s',
-       't' => 'g0', # time
+       't' => 'g1', # time
        '^t'=> '=t',
-       'v' => 'g0',
-       '^v'=> 'g6 arg arg linkdigraphs', # digraph
-       'w' => 'g0', # windows
-       'W' => 'g3', # width
+       'v' => 'g1',
+       '^v'=> 'g7 arg arg linkdigraphs', # digraph
+       'w' => 'g1', # windows
+       'W' => 'g4', # width
        '^w'=> '=w',
-       'x' => 'g8', # lockscreen
-       'X' => 'g1', # remove
+       'x' => 'g9', # lockscreen
+       'X' => 'g2', # remove
        '^x'=> '=x',
-       'z' => 'g8', # suspend
-       'Z' => 'g8',
+       'z' => 'g9', # suspend
+       'Z' => 'g9',
        '^z'=> '=z',
 
-       "'" => 'g2 arg', # select
-       '"' => 'g2', # windowlist -b
-       ':' => 'g3', # colon
-       "\e"=> 'g5', # copy
+       "'" => 'g3 arg', # select
+       '"' => 'g3', # windowlist -b
+       ':' => 'g4', # colon
+       "\e"=> 'g6', # copy
        '[' => '=^[',
        '^['=> "=\e",
-       '^]'=> 'g6', # paste .
+       '^]'=> 'g7', # paste .
        ']' => '=^]',
-       '|' => 'g1', # split -v
-       '{' => 'g6', # history
-       '}' => 'g6', # history
-       '=' => 'g5', # removebuf
+       '|' => 'g2', # split -v
+       '{' => 'g7', # history
+       '}' => 'g7', # history
+       '=' => 'g6', # removebuf
        '^?'=> '=^h',
-       '*' => 'g0', # displays
-       '.' => 'g8', # dumptermcap
-       ',' => 'g0', # license
-       '-' => 'g2', # select -
-       '_' => 'g4', # silence
-       '>' => 'g5', # writebuf
-       '<' => 'g5', # readbuf
+       '*' => 'g1', # displays
+       '.' => 'g9', # dumptermcap
+       ',' => 'g1', # license
+       '-' => 'g3', # select -
+       '_' => 'g5', # silence
+       '>' => 'g6', # writebuf
+       '<' => 'g6', # readbuf
        '^@'=> '=n',
 },
 

diff --git a/screen.plp b/screen.plp
index 755dfd13239d42cbd4fb689b00da0f4d2418d3f1..26d6451f51d9e1fc6d04c1f21483e880b41b6459 100644 (file)
--- a/screen.plp
+++ b/screen.plp
@@ -34,7 +34,7 @@ $keys->print_rows($get{rows});
 <div class="help">
        <div class="left">
 <:
-               $keys->print_legend('legend-types', [map { "g$_" } 0 .. 8]);
+               $keys->print_legend('legend-types', [map { "g$_" } 1 .. 9]);
 :>
        </div>