From: NeilBrown Date: Sat, 9 Sep 2023 02:33:32 +0000 (+1000) Subject: Discard Display:set: in favour of window:set: X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=a391f64ea999089a3d1f8a216507d42fa24457de;p=edlib.git Discard Display:set: in favour of window:set: Display:set: and window:set: to essentially the same thing. We only need one. Signed-off-by: NeilBrown --- diff --git a/DOC/Calls b/DOC/Calls index a9400513..548d499b 100644 --- a/DOC/Calls +++ b/DOC/Calls @@ -152,7 +152,7 @@ display can be awkward. This is a request for the display to close - may be rejected if it is the only display left. -## Display:set:ATTR +## window:set:ATTR Set any attribute on the display pane. diff --git a/DOC/Developer/07-displays.md b/DOC/Developer/07-displays.md index 606eb0ac..09ce20ba 100644 --- a/DOC/Developer/07-displays.md +++ b/DOC/Developer/07-displays.md @@ -98,7 +98,7 @@ Draw:image ## Display management commands Display:close -Display:set:no-close +window:set:no-close Display:external-viewer Display:fullscreen Display:new diff --git a/core-window.c b/core-window.c index 517d190f..41751257 100644 --- a/core-window.c +++ b/core-window.c @@ -84,8 +84,7 @@ DEF_CMD(window_set) if (!val) return Enoarg; - if (ci->str) - attr_set_str(&ci->home->attrs, val, ci->str); + attr_set_str(&ci->home->attrs, val, ci->str); return 1; } diff --git a/display-ncurses.c b/display-ncurses.c index 90c7e8f7..0c4aabc2 100644 --- a/display-ncurses.c +++ b/display-ncurses.c @@ -441,7 +441,7 @@ DEF_CMD(nc_close_display) { /* If this is only display, then refuse to close this one */ struct call_return cr; - char *nc = attr_find(ci->home->attrs, "no-close"); + char *nc = pane_attr_get(ci->home, "no-close"); if (nc) { call("Message", ci->focus, 0, NULL, nc); @@ -463,16 +463,6 @@ DEF_CMD(nc_close_display) return 1; } -DEF_CMD(nc_set_attr) -{ - const char *attr = ci->str2; - - if (!attr) - attr = ksuffix(ci, "Display:set:"); - attr_set_str(&ci->home->attrs, attr, ci->str); - return 1; -} - static int nc_putc(int ch) { if (current_dd) @@ -1822,7 +1812,6 @@ void edlib_init(struct pane *ed safe) nc_map = key_alloc(); key_add(nc_map, "Display:refresh", &force_redraw); key_add(nc_map, "Display:close", &nc_close_display); - key_add_prefix(nc_map, "Display:set:", &nc_set_attr); key_add(nc_map, "Display:external-viewer", &nc_external_viewer); key_add(nc_map, "Close", &nc_close); key_add(nc_map, "Draw:clear", &nc_clear); diff --git a/display-x11-xcb.c b/display-x11-xcb.c index d21260af..120d6de8 100644 --- a/display-x11-xcb.c +++ b/display-x11-xcb.c @@ -446,7 +446,7 @@ DEF_CMD(xcb_close_display) { /* If this is only display, then refuse to close this one */ struct call_return cr; - char *nc = attr_find(ci->home->attrs, "no-close"); + char *nc = pane_attr_get(ci->home, "no-close"); if (nc) { call("Message", ci->focus, 0, NULL, nc); @@ -463,16 +463,6 @@ DEF_CMD(xcb_close_display) return 1; } -DEF_CMD(xcb_set_attr) -{ - const char *attr = ci->str2; - - if (!attr) - attr = ksuffix(ci, "Display:set:"); - attr_set_str(&ci->home->attrs, attr, ci->str); - return 1; -} - static void wait_for(struct xcb_data *xd safe) { struct pids **pp = &xd->pids; @@ -2001,7 +1991,6 @@ void edlib_init(struct pane *ed safe) xcb_map = key_alloc(); key_add(xcb_map, "Display:close", &xcb_close_display); - key_add_prefix(xcb_map, "Display:set:", &xcb_set_attr); key_add(xcb_map, "Display:external-viewer", &xcb_external_viewer); key_add(xcb_map, "Display:fullscreen", &xcb_fullscreen); key_add(xcb_map, "Display:new", &xcb_new_display); diff --git a/edlib.c b/edlib.c index ee70bab5..0cae4d16 100644 --- a/edlib.c +++ b/edlib.c @@ -126,7 +126,7 @@ int main(int argc, char *argv[]) 0, NULL, getenv("XAUTHORITY")); if (!first_window) first_window = p; - call("Display:set:no-close", p, 1, NULL, + call("window:set:no-close", p, 1, NULL, "Cannot close primary display"); } } diff --git a/mode-emacs.c b/mode-emacs.c index 90f12f68..2d822618 100644 --- a/mode-emacs.c +++ b/mode-emacs.c @@ -2825,7 +2825,7 @@ DEF_CMD(emacs_scale_relative) else scale = 12 * scale / 10; snprintf(num, sizeof(num)-1, "%d", scale); - call("Display:set:scale", p, 0, NULL, num); + call("window:set:scale", p, 0, NULL, num); return 1; } diff --git a/python/display-pygtk.py b/python/display-pygtk.py index bb09ca96..3175a5c3 100644 --- a/python/display-pygtk.py +++ b/python/display-pygtk.py @@ -85,14 +85,6 @@ class EdDisplay(edlib.Pane): focus.call("Message", "Cannot close only window.") return 1 - def handle_set_noclose(self, key, str1, str2, **a): - "handle-prefix:Display:set:" - attr = str2 - if not attr: - attr = key[12:] - self[attr] = str1 - return 1 - def handle_fullscreen(self, key, num, **a): "handle:Display:fullscreen" if num > 0: diff --git a/python/lib-server.py b/python/lib-server.py index c1f9294d..efdfef00 100755 --- a/python/lib-server.py +++ b/python/lib-server.py @@ -123,7 +123,7 @@ if sys.argv[0] == "": self.add_notify(d, "Notify:Close") self.doc = d if self.term: - self.term.call("Display:set:no-close", + self.term.call("window:set:no-close", "Cannot close display until document done - use 'C-x #'") self.sock.send(b"OK") return 1 @@ -166,7 +166,7 @@ if sys.argv[0] == "": return 1 if cmd == "close": if self.disp: - self.disp.call("Display:set:no-close") + self.disp.call("window:set:no-close") self.disp.call("Display:close") self.disp = None self.call("event:free", self.read) @@ -200,7 +200,7 @@ if sys.argv[0] == "": # same as doc:done self.doc = None if self.term: - self.term.call("Display:set:no-close") + self.term.call("window:set:no-close") self.term.call("Display:close") self.sock.send(b"Done") return 1 @@ -209,7 +209,7 @@ if sys.argv[0] == "": "handle:doc:done" if str != "test": if self.term: - self.term.call("Display:set:no-close") + self.term.call("window:set:no-close") self.term.call("Display:close") self.sock.send(b"Done") return 1