From: Po Lu Date: Wed, 13 Apr 2022 02:37:54 +0000 (+0000) Subject: Remove unused flag on Haiku X-Git-Tag: emacs-29.0.90~1931^2~616 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=db56a69274f7690eea2c8d8a12a9c367bb93c4d1;p=emacs.git 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'. --- 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) /* With FRAME_DISPLAY_INFO set up, this unwind-protect is safe. */ record_unwind_protect (unwind_create_frame, frame); - FRAME_OUTPUT_DATA (f)->parent_desc = NULL; - FRAME_OUTPUT_DATA (f)->explicit_parent = 0; - /* Set the name; the functions to which we pass f expect the name to be set. */ if (EQ (name, Qunbound) || NILP (name) || ! STRINGP (name)) @@ -860,22 +857,19 @@ haiku_create_frame (Lisp_Object parms) adjust_frame_size (f, FRAME_TEXT_WIDTH (f), FRAME_TEXT_HEIGHT (f), 0, true, Qx_create_frame_2); - if (!FRAME_OUTPUT_DATA (f)->explicit_parent) + Lisp_Object visibility; + + visibility = gui_display_get_arg (dpyinfo, parms, Qvisibility, 0, 0, + RES_TYPE_SYMBOL); + if (EQ (visibility, Qunbound)) + visibility = Qt; + if (EQ (visibility, Qicon)) + haiku_iconify_frame (f); + else if (!NILP (visibility)) + haiku_visualize_frame (f); + else /* Qnil */ { - Lisp_Object visibility; - - visibility = gui_display_get_arg (dpyinfo, parms, Qvisibility, 0, 0, - RES_TYPE_SYMBOL); - if (EQ (visibility, Qunbound)) - visibility = Qt; - if (EQ (visibility, Qicon)) - haiku_iconify_frame (f); - else if (!NILP (visibility)) - haiku_visualize_frame (f); - else /* Qnil */ - { - f->was_invisible = true; - } + f->was_invisible = true; } if (FRAME_HAS_MINIBUF_P (f) @@ -961,7 +955,6 @@ haiku_create_tip_frame (Lisp_Object parms) FRAME_DISPLAY_INFO (f) = dpyinfo; FRAME_OUTPUT_DATA (f)->parent_desc = NULL; - FRAME_OUTPUT_DATA (f)->explicit_parent = 0; /* Set the name; the functions to which we pass f expect the name to 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 Emacs_Color cursor_color; Window window_desc, parent_desc; - char explicit_parent; int titlebar_height; int toolbar_height;