X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fprompt.c;h=50d09037a23e34ec293029255c06ce43dc8a38ef;hb=171e476ba3faaa3dbd95e9e95f4121fae2db6564;hp=b10d8a18e91844349a7a2d9e78060ea0cea957cb;hpb=096dad0c6c027100494ede811b33cb8558d32e25;p=chaz%2Fopenbox diff --git a/openbox/prompt.c b/openbox/prompt.c index b10d8a18..50d09037 100644 --- a/openbox/prompt.c +++ b/openbox/prompt.c @@ -152,7 +152,7 @@ ObPrompt* prompt_new(const gchar *msg, const gchar *title, attrib.override_redirect = FALSE; - self = g_new0(ObPrompt, 1); + self = g_slice_new0(ObPrompt); self->ref = 1; self->func = func; self->cleanup = cleanup; @@ -250,7 +250,7 @@ void prompt_unref(ObPrompt *self) XDestroyWindow(obt_display, self->msg.window); XDestroyWindow(obt_display, self->super.window); - g_free(self); + g_slice_free(ObPrompt, self); } } @@ -269,9 +269,8 @@ static void prompt_layout(ObPrompt *self) b += OUTSIDE_MARGIN; { - Rect *area = screen_physical_area_all_monitors(); + const Rect *area = screen_physical_area_all_monitors(); maxw = MIN(MAX_WIDTH, area->width*4/5); - g_free(area); } /* find the button sizes and how much space we need for them */ @@ -541,7 +540,7 @@ gboolean prompt_key_event(ObPrompt *self, XEvent *e) if (sym == XK_Escape) prompt_cancel(self); - else if (sym == XK_Return || sym == XK_space) + else if (sym == XK_Return || sym == XK_KP_Enter || sym == XK_space) prompt_run_callback(self, self->focus->result); else if (sym == XK_Tab || sym == XK_Left || sym == XK_Right) { gint i;