From: NeilBrown Date: Sat, 9 Sep 2023 02:34:47 +0000 (+1000) Subject: Rename Display: commands to window: X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=2de85969dcdea44bb61e2534e131493ac6819e6c;p=edlib.git Rename Display: commands to window: We already have some window:. Having both is confusion. Standardise on window: Signed-off-by: NeilBrown --- diff --git a/DOC/Calls b/DOC/Calls index 548d499b..3a033a89 100644 --- a/DOC/Calls +++ b/DOC/Calls @@ -147,7 +147,7 @@ When a close request is sent to the display, it should call from this display), it should generally refuse, as closing the last display can be awkward. -## Display:close +## window:close This is a request for the display to close - may be rejected if it is the only display left. @@ -156,11 +156,11 @@ the only display left. Set any attribute on the display pane. -The attribute "no-close" affects closing. If a Display:close request +The attribute "no-close" affects closing. If a window:close request arrives when "no-close" attribute is a non-empty string, that string should be reported via a message, and the close should be rejected. -## Display:external-viewer +## window:external-viewer str1 is a filename and str2 is (optionally) a basename template containing "XXXXXX". An external viewer (typically xdg-open) should be @@ -168,12 +168,12 @@ run on the file. If the display is on a different host to where the file is stored, some action might be taken to copy it and provide a local names, based on str2. -## Display:fullscreen +## window:fullscreen If num1 > 0, display should switch to full-screen mode if possible. If num1 <= 0, display should switch away from full-screen mode. -## Display:new +## window:new If it is possible to duplicate the display (e.g. similar window on same output), do that. diff --git a/DOC/Developer/07-displays.md b/DOC/Developer/07-displays.md index 09ce20ba..66ba54ba 100644 --- a/DOC/Developer/07-displays.md +++ b/DOC/Developer/07-displays.md @@ -95,13 +95,13 @@ Draw:text Draw:image-size Draw:image -## Display management commands +## Window management commands -Display:close +window:close window:set:no-close -Display:external-viewer -Display:fullscreen -Display:new +window:external-viewer +window:fullscreen +window:new all-displays diff --git a/DOC/TODO.md b/DOC/TODO.md index 23c87435..93d17f3f 100644 --- a/DOC/TODO.md +++ b/DOC/TODO.md @@ -91,7 +91,7 @@ Core features with the ncurses/replay test approach. - [X] Send global notify before/after refresh. LOG must suspend logging (or notifications at least) during refresh if is visible anywhere -- [ ] Do I want "Display" as in "Display:close", or "window" as in +- [X] Do I want "Display" as in "window:close", or "window" as in "window:notify". Decide, and make everything consistent. - [ ] Do I really need global-multicall- or can I just use notifications. diff --git a/core-window.c b/core-window.c index 41751257..2993c03f 100644 --- a/core-window.c +++ b/core-window.c @@ -177,7 +177,7 @@ void window_setup(struct pane *ed safe) key_add_prefix(window_map, "window:request:", &request_notify); key_add_prefix(window_map, "window:notify:", &send_notify); - key_add(window_map, "Display:close", &window_close); + key_add(window_map, "window:close", &window_close); key_add_prefix(window_map, "window:set:", &window_set); diff --git a/display-ncurses.c b/display-ncurses.c index 0c4aabc2..b3ffe4ff 100644 --- a/display-ncurses.c +++ b/display-ncurses.c @@ -1810,9 +1810,9 @@ void edlib_init(struct pane *ed safe) "attach-display-ncurses"); nc_map = key_alloc(); - key_add(nc_map, "Display:refresh", &force_redraw); - key_add(nc_map, "Display:close", &nc_close_display); - key_add(nc_map, "Display:external-viewer", &nc_external_viewer); + key_add(nc_map, "window:refresh", &force_redraw); + key_add(nc_map, "window:close", &nc_close_display); + key_add(nc_map, "window:external-viewer", &nc_external_viewer); key_add(nc_map, "Close", &nc_close); key_add(nc_map, "Draw:clear", &nc_clear); key_add(nc_map, "Draw:text-size", &nc_text_size); diff --git a/display-x11-xcb.c b/display-x11-xcb.c index 120d6de8..f3b8693f 100644 --- a/display-x11-xcb.c +++ b/display-x11-xcb.c @@ -1584,7 +1584,7 @@ static void handle_client_message(struct pane *home safe, cme->format == 32 && cme->window == xd->win && cme->data.data32[0] == xd->atoms[a_WM_DELETE_WINDOW]) { - call("Display:close", pane_leaf(home)); + call("window:close", pane_leaf(home)); return; } @@ -1684,7 +1684,7 @@ DEF_CMD(xcb_input) xcb_flush(xd->conn); } if (xcb_connection_has_error(xd->conn)) { - call("Display:close", ci->home->parent); + call("window:close", ci->home->parent); pane_close(ci->home); } return ret; @@ -1990,10 +1990,10 @@ void edlib_init(struct pane *ed safe) xcb_map = key_alloc(); - key_add(xcb_map, "Display:close", &xcb_close_display); - 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); + key_add(xcb_map, "window:close", &xcb_close_display); + key_add(xcb_map, "window:external-viewer", &xcb_external_viewer); + key_add(xcb_map, "window:fullscreen", &xcb_fullscreen); + key_add(xcb_map, "window:new", &xcb_new_display); key_add(xcb_map, "Close", &xcb_close); key_add(xcb_map, "Draw:clear", &xcb_clear); diff --git a/lib-menubar.c b/lib-menubar.c index 6af799d0..63265905 100644 --- a/lib-menubar.c +++ b/lib-menubar.c @@ -430,7 +430,7 @@ void edlib_init(struct pane *ed safe) 0, NULL, "attach-menubar"); menubar_map = key_alloc(); - key_add(menubar_map, "Display:border", &menubar_border); + key_add(menubar_map, "window:border", &menubar_border); key_add(menubar_map, "Refresh:size", &menubar_refresh_size); key_add(menubar_map, "Child-Notify", &menubar_child_notify); key_add(menubar_map, "Refresh:view", &menubar_refresh); diff --git a/lib-messageline.c b/lib-messageline.c index df5b9ba0..41e0f23b 100644 --- a/lib-messageline.c +++ b/lib-messageline.c @@ -298,7 +298,7 @@ void edlib_init(struct pane *ed safe) return; messageline_map = key_alloc(); key_add(messageline_map, "Clone", &messageline_clone); - key_add(messageline_map, "Display:border", &messageline_border); + key_add(messageline_map, "window:border", &messageline_border); key_add(messageline_map, "Message", &messageline_msg); key_add(messageline_map, "Message:modal", &messageline_msg); key_add(messageline_map, "Message:default", &messageline_msg); diff --git a/mode-emacs.c b/mode-emacs.c index 2d822618..59c6623b 100644 --- a/mode-emacs.c +++ b/mode-emacs.c @@ -514,7 +514,7 @@ DEF_CMD(emacs_recenter) } else { /* Move point to middle and refresh */ call("Move-View-Line", ci->focus, 0, ci->mark); - call("Display:refresh", ci->focus); + call("window:refresh", ci->focus); } call("Mode:set-num2", ci->focus, N2_recentre | (step << 16)); return 1; @@ -535,8 +535,8 @@ static struct simple_command { {CMD(emacs_simple), "Window:split-x", "K:CX-3"}, {CMD(emacs_simple), "Window:close", "K:CX-0"}, {CMD(emacs_simple), "Window:bury", "K:A-B"}, - {CMD(emacs_simple), "Display:new", "K:CX5-2"}, - {CMD(emacs_simple), "Display:close", "K:CX5-0"}, + {CMD(emacs_simple), "window:new", "K:CX5-2"}, + {CMD(emacs_simple), "window:close", "K:CX5-0"}, {CMD(emacs_simple), "lib-server:done", "K:CX-#"}, {CMD(emacs_simple), "mode-swap-mark", "K:CX:C-X"}, {CMD(emacs_simple), "Abort", "K:C-G"}, diff --git a/python/display-pygtk.py b/python/display-pygtk.py index 3175a5c3..9f8cddb1 100644 --- a/python/display-pygtk.py +++ b/python/display-pygtk.py @@ -72,7 +72,7 @@ class EdDisplay(edlib.Pane): return 1 def handle_close_window(self, key, focus, **a): - "handle:Display:close" + "handle:window:close" nc = self['no-close'] if nc: focus.call("Message", nc) @@ -86,7 +86,7 @@ class EdDisplay(edlib.Pane): return 1 def handle_fullscreen(self, key, num, **a): - "handle:Display:fullscreen" + "handle:window:fullscreen" if num > 0: self.win.fullscreen() else: @@ -94,7 +94,7 @@ class EdDisplay(edlib.Pane): return 1 def handle_new(self, key, focus, **a): - "handle:Display:new" + "handle:window:new" newdisp = EdDisplay(edlib.editor, self['DISPLAY']) p = newdisp.call("editor:activate-display", ret='pane') if p: @@ -102,7 +102,7 @@ class EdDisplay(edlib.Pane): return 1 def handle_external(self, key, str, **a): - "handle:Display:external-viewer" + "handle:window:external-viewer" disp = self['DISPLAY'] if not str or not disp: return edlib.Enoarg @@ -493,11 +493,11 @@ class EdDisplay(edlib.Pane): # This must not happen. What should I do? def close_win(self, *a): - self.call("Display:close") + self.call("window:close") return True def destroy_win(self, *a): - self.parent("Display:close") + self.parent("window:close") return False def create_ui(self): diff --git a/python/lib-server.py b/python/lib-server.py index efdfef00..4b2e03b2 100755 --- a/python/lib-server.py +++ b/python/lib-server.py @@ -51,7 +51,7 @@ if sys.argv[0] == "": if not msg : if self.disp: - self.disp.call("Display:close") + self.disp.call("window:close") if self.sock: self.sock.close() self.sock = None @@ -167,7 +167,7 @@ if sys.argv[0] == "": if cmd == "close": if self.disp: self.disp.call("window:set:no-close") - self.disp.call("Display:close") + self.disp.call("window:close") self.disp = None self.call("event:free", self.read) self.sock.close() @@ -201,7 +201,7 @@ if sys.argv[0] == "": self.doc = None if self.term: self.term.call("window:set:no-close") - self.term.call("Display:close") + self.term.call("window:close") self.sock.send(b"Done") return 1 @@ -210,7 +210,7 @@ if sys.argv[0] == "": if str != "test": if self.term: self.term.call("window:set:no-close") - self.term.call("Display:close") + self.term.call("window:close") self.sock.send(b"Done") return 1 @@ -242,7 +242,7 @@ if sys.argv[0] == "": self.sock.close() self.sock = None if self.disp: - self.disp.call("Display:close") + self.disp.call("window:close") self.disp = None global server_sock diff --git a/python/lib-url.py b/python/lib-url.py index 1b7e0b3b..9eb64013 100644 --- a/python/lib-url.py +++ b/python/lib-url.py @@ -92,7 +92,7 @@ class url_view(edlib.Pane): if url: focus.call("Message", "Url: <%s>" % url) if self.displayed_tag == tag: - focus.call("Display:external-viewer", url) + focus.call("window:external-viewer", url) self.displayed_tag = tag else: focus.call("Message", "URL tag %s not found" % tag) diff --git a/python/module-notmuch.py b/python/module-notmuch.py index 2377e7e8..5be60715 100644 --- a/python/module-notmuch.py +++ b/python/module-notmuch.py @@ -3484,7 +3484,7 @@ class notmuch_message_view(edlib.Pane): fd, path = tempfile.mkstemp(ext, prefix) os.write(fd, content) os.close(fd) - focus.call("Display:external-viewer", path, prefix+"XXXXX"+ext) + focus.call("window:external-viewer", path, prefix+"XXXXX"+ext) return 1 def handle_map_attr(self, key, focus, mark, str, str2, comm2, **a): diff --git a/python/render-present.py b/python/render-present.py index 6d9daa2f..9189a71d 100644 --- a/python/render-present.py +++ b/python/render-present.py @@ -682,13 +682,13 @@ class PresenterPane(edlib.Pane): "handle:K:A-f" if self.borderless: self.call("Window:border", 1) - self.call("Display:border", 1) - self.call("Display:fullscreen", -1) + self.call("window:border", 1) + self.call("window:fullscreen", -1) self.borderless = False else: self.call("Window:border", -1) - self.call("Display:border", -1) - self.call("Display:fullscreen", 1) + self.call("window:border", -1) + self.call("window:fullscreen", 1) self.borderless = True return 1 @@ -719,7 +719,7 @@ class MarkdownPane(edlib.Pane): return 1 def handle_refresh(self, key, focus, mark, **a): - "handle:Display:refresh" + "handle:window:refresh" # Refresh causes presentation page to recenter # page-down just moves down to start of next page. focus.call("doc:notify:doc:Recentre", mark)