aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPo Lu2022-04-13 02:37:54 +0000
committerPo Lu2022-04-13 02:37:54 +0000
commitdb56a69274f7690eea2c8d8a12a9c367bb93c4d1 (patch)
tree723c84d908dcb0bbf0b9fd844a2122f2fc8d2291 /src
parent4cf885a41a9e15a9668862747117e57f31b6146b (diff)
downloademacs-db56a69274f7690eea2c8d8a12a9c367bb93c4d1.tar.gz
emacs-db56a69274f7690eea2c8d8a12a9c367bb93c4d1.zip
Remove unused flag on Haiku
* src/haikufns.c (haiku_create_frame, haiku_create_tip_frame): * src/haikuterm.h (struct haiku_output): Delete mentions of `explicit_parent'.
Diffstat (limited to 'src')
-rw-r--r--src/haikufns.c31
-rw-r--r--src/haikuterm.h1
2 files changed, 12 insertions, 20 deletions
diff --git a/src/haikufns.c b/src/haikufns.c
index ef95d42f0f1..0662410289a 100644
--- a/src/haikufns.c
+++ b/src/haikufns.c
@@ -648,9 +648,6 @@ haiku_create_frame (Lisp_Object parms)
648 /* With FRAME_DISPLAY_INFO set up, this unwind-protect is safe. */ 648 /* With FRAME_DISPLAY_INFO set up, this unwind-protect is safe. */
649 record_unwind_protect (unwind_create_frame, frame); 649 record_unwind_protect (unwind_create_frame, frame);
650 650
651 FRAME_OUTPUT_DATA (f)->parent_desc = NULL;
652 FRAME_OUTPUT_DATA (f)->explicit_parent = 0;
653
654 /* Set the name; the functions to which we pass f expect the name to 651 /* Set the name; the functions to which we pass f expect the name to
655 be set. */ 652 be set. */
656 if (EQ (name, Qunbound) || NILP (name) || ! STRINGP (name)) 653 if (EQ (name, Qunbound) || NILP (name) || ! STRINGP (name))
@@ -860,22 +857,19 @@ haiku_create_frame (Lisp_Object parms)
860 adjust_frame_size (f, FRAME_TEXT_WIDTH (f), FRAME_TEXT_HEIGHT (f), 857 adjust_frame_size (f, FRAME_TEXT_WIDTH (f), FRAME_TEXT_HEIGHT (f),
861 0, true, Qx_create_frame_2); 858 0, true, Qx_create_frame_2);
862 859
863 if (!FRAME_OUTPUT_DATA (f)->explicit_parent) 860 Lisp_Object visibility;
861
862 visibility = gui_display_get_arg (dpyinfo, parms, Qvisibility, 0, 0,
863 RES_TYPE_SYMBOL);
864 if (EQ (visibility, Qunbound))
865 visibility = Qt;
866 if (EQ (visibility, Qicon))
867 haiku_iconify_frame (f);
868 else if (!NILP (visibility))
869 haiku_visualize_frame (f);
870 else /* Qnil */
864 { 871 {
865 Lisp_Object visibility; 872 f->was_invisible = true;
866
867 visibility = gui_display_get_arg (dpyinfo, parms, Qvisibility, 0, 0,
868 RES_TYPE_SYMBOL);
869 if (EQ (visibility, Qunbound))
870 visibility = Qt;
871 if (EQ (visibility, Qicon))
872 haiku_iconify_frame (f);
873 else if (!NILP (visibility))
874 haiku_visualize_frame (f);
875 else /* Qnil */
876 {
877 f->was_invisible = true;
878 }
879 } 873 }
880 874
881 if (FRAME_HAS_MINIBUF_P (f) 875 if (FRAME_HAS_MINIBUF_P (f)
@@ -961,7 +955,6 @@ haiku_create_tip_frame (Lisp_Object parms)
961 FRAME_DISPLAY_INFO (f) = dpyinfo; 955 FRAME_DISPLAY_INFO (f) = dpyinfo;
962 956
963 FRAME_OUTPUT_DATA (f)->parent_desc = NULL; 957 FRAME_OUTPUT_DATA (f)->parent_desc = NULL;
964 FRAME_OUTPUT_DATA (f)->explicit_parent = 0;
965 958
966 /* Set the name; the functions to which we pass f expect the name to 959 /* Set the name; the functions to which we pass f expect the name to
967 be set. */ 960 be set. */
diff --git a/src/haikuterm.h b/src/haikuterm.h
index 586df285751..02bb1ddc6f2 100644
--- a/src/haikuterm.h
+++ b/src/haikuterm.h
@@ -155,7 +155,6 @@ struct haiku_output
155 Emacs_Color cursor_color; 155 Emacs_Color cursor_color;
156 156
157 Window window_desc, parent_desc; 157 Window window_desc, parent_desc;
158 char explicit_parent;
159 158
160 int titlebar_height; 159 int titlebar_height;
161 int toolbar_height; 160 int toolbar_height;