use const Rect* not Rect const*
This commit is contained in:
parent
262591ec1a
commit
34178097d5
13 changed files with 34 additions and 32 deletions
|
@ -2043,7 +2043,7 @@ void client_update_strut(ObClient *self)
|
|||
if (!got &&
|
||||
OBT_PROP_GETA32(self->window, NET_WM_STRUT, CARDINAL, &data, &num)) {
|
||||
if (num == 4) {
|
||||
Rect const *a;
|
||||
const Rect *a;
|
||||
|
||||
got = TRUE;
|
||||
|
||||
|
@ -2468,10 +2468,10 @@ gboolean client_has_parent(ObClient *self)
|
|||
return self->parents != NULL;
|
||||
}
|
||||
|
||||
gboolean client_is_oldfullscreen(const ObClient const *self,
|
||||
const Rect const *area)
|
||||
gboolean client_is_oldfullscreen(const ObClient *self,
|
||||
const Rect *area)
|
||||
{
|
||||
Rect const *monitor, *allmonitors;
|
||||
const Rect *monitor, *allmonitors;
|
||||
|
||||
/* No decorations and fills the monitor = oldskool fullscreen.
|
||||
But not for maximized windows.
|
||||
|
@ -2489,7 +2489,7 @@ gboolean client_is_oldfullscreen(const ObClient const *self,
|
|||
static ObStackingLayer calc_layer(ObClient *self)
|
||||
{
|
||||
ObStackingLayer l;
|
||||
Rect const *monitor, *allmonitors;
|
||||
const Rect *monitor, *allmonitors;
|
||||
|
||||
monitor = screen_physical_area_monitor(client_monitor(self));
|
||||
allmonitors = screen_physical_area_all_monitors();
|
||||
|
@ -2842,7 +2842,7 @@ void client_try_configure(ObClient *self, gint *x, gint *y, gint *w, gint *h,
|
|||
|
||||
/* set the size and position if fullscreen */
|
||||
if (self->fullscreen) {
|
||||
Rect const *a;
|
||||
const Rect *a;
|
||||
guint i;
|
||||
|
||||
i = screen_find_monitor(&desired);
|
||||
|
|
|
@ -236,7 +236,7 @@ void dock_configure(void)
|
|||
gint gravity;
|
||||
gint l, r, t, b;
|
||||
gint strw, strh;
|
||||
Rect const *a;
|
||||
const Rect *a;
|
||||
gint hidesize;
|
||||
|
||||
RrMargins(dock->a_frame, &l, &t, &r, &b);
|
||||
|
|
|
@ -392,7 +392,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
|
|||
gint ml, mt, mr, mb;
|
||||
gint l, t, r, b;
|
||||
gint x, y, w, h;
|
||||
Rect const *screen_area = NULL;
|
||||
const Rect *screen_area = NULL;
|
||||
gint i;
|
||||
GList *it;
|
||||
const ObFocusCyclePopupTarget *newtarget;
|
||||
|
@ -759,7 +759,7 @@ void focus_cycle_popup_single_show(struct _ObClient *c,
|
|||
|
||||
/* do this stuff only when the dialog is first showing */
|
||||
if (!popup.mapped) {
|
||||
Rect const *a;
|
||||
const Rect *a;
|
||||
|
||||
popup_setup(&popup, FALSE, FALSE);
|
||||
g_assert(popup.targets == NULL);
|
||||
|
|
|
@ -1677,7 +1677,9 @@ static gboolean frame_animate_iconify(gpointer p)
|
|||
|
||||
if (self->client->icon_geometry.width == 0) {
|
||||
/* there is no icon geometry set so just go straight down */
|
||||
Rect const *a = screen_physical_area_monitor(screen_find_monitor(&self->area));
|
||||
const Rect *a;
|
||||
|
||||
a = screen_physical_area_monitor(screen_find_monitor(&self->area));
|
||||
iconx = self->area.x + self->area.width / 2 + 32;
|
||||
icony = a->y + a->width;
|
||||
iconw = 64;
|
||||
|
|
|
@ -79,7 +79,7 @@ static void set_curpos(KeyBindingTree *newpos)
|
|||
if (curpos != NULL) {
|
||||
gchar *text = NULL;
|
||||
GList *it;
|
||||
Rect const *a;
|
||||
const Rect *a;
|
||||
|
||||
for (it = curpos->keylist; it; it = g_list_next(it)) {
|
||||
gchar *oldtext = text;
|
||||
|
|
|
@ -321,7 +321,7 @@ static void menu_frame_place_submenu(ObMenuFrame *self, gint *x, gint *y)
|
|||
void menu_frame_move_on_screen(ObMenuFrame *self, gint x, gint y,
|
||||
gint *dx, gint *dy)
|
||||
{
|
||||
Rect const *a = NULL;
|
||||
const Rect *a = NULL;
|
||||
gint pos, half;
|
||||
|
||||
*dx = *dy = 0;
|
||||
|
@ -831,7 +831,7 @@ void menu_frame_render(ObMenuFrame *self)
|
|||
static void menu_frame_update(ObMenuFrame *self)
|
||||
{
|
||||
GList *mit, *fit;
|
||||
Rect const *a;
|
||||
const Rect *a;
|
||||
gint h;
|
||||
|
||||
menu_pipe_execute(self->menu);
|
||||
|
|
|
@ -112,7 +112,7 @@ static void popup_coords(ObClient *c, const gchar *format, gint a, gint b)
|
|||
c->frame->area.x + c->frame->area.width / 2,
|
||||
c->frame->area.y + c->frame->area.height / 2);
|
||||
else /* Fixed */ {
|
||||
Rect const *area = screen_physical_area_active();
|
||||
const Rect *area = screen_physical_area_active();
|
||||
gint gravity, x, y;
|
||||
|
||||
x = config_resize_popup_fixed.x.pos;
|
||||
|
@ -554,7 +554,7 @@ static void do_edge_warp(gint x, gint y)
|
|||
dir = -1;
|
||||
|
||||
for (i = 0; i < screen_num_monitors; ++i) {
|
||||
Rect const *a = screen_physical_area_monitor(i);
|
||||
const Rect *a = screen_physical_area_monitor(i);
|
||||
if (x == RECT_LEFT(*a)) dir = OB_DIRECTION_WEST;
|
||||
if (x == RECT_RIGHT(*a)) dir = OB_DIRECTION_EAST;
|
||||
if (y == RECT_TOP(*a)) dir = OB_DIRECTION_NORTH;
|
||||
|
|
|
@ -107,7 +107,7 @@ static Rect **pick_head(ObClient *c)
|
|||
screen_pointer_pos(&px, &py);
|
||||
|
||||
for (i = 0; i < screen_num_monitors; i++) {
|
||||
Rect const *monitor = screen_physical_area_monitor(i);
|
||||
const Rect *monitor = screen_physical_area_monitor(i);
|
||||
gboolean contain = RECT_CONTAINS(*monitor, px, py);
|
||||
if (contain) {
|
||||
add_choice(choice, i);
|
||||
|
|
|
@ -158,7 +158,7 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
|
|||
gint emptyx, emptyy; /* empty space between elements */
|
||||
gint textx, texty, textw, texth;
|
||||
gint iconx, icony, iconw, iconh;
|
||||
Rect const *area;
|
||||
const Rect *area;
|
||||
Rect mon;
|
||||
gboolean hasicon = self->hasicon;
|
||||
|
||||
|
|
|
@ -269,7 +269,7 @@ static void prompt_layout(ObPrompt *self)
|
|||
b += OUTSIDE_MARGIN;
|
||||
|
||||
{
|
||||
Rect const *area = screen_physical_area_all_monitors();
|
||||
const Rect *area = screen_physical_area_all_monitors();
|
||||
maxw = MIN(MAX_WIDTH, area->width*4/5);
|
||||
}
|
||||
|
||||
|
|
|
@ -136,7 +136,7 @@ void resist_move_windows(ObClient *c, gint resist, gint *x, gint *y)
|
|||
void resist_move_monitors(ObClient *c, gint resist, gint *x, gint *y)
|
||||
{
|
||||
Rect *area;
|
||||
Rect const *parea;
|
||||
const Rect *parea;
|
||||
guint i;
|
||||
gint l, t, r, b; /* requested edges */
|
||||
gint al, at, ar, ab; /* screen area edges */
|
||||
|
@ -325,7 +325,7 @@ void resist_size_monitors(ObClient *c, gint resist, gint *w, gint *h,
|
|||
gint l, t, r, b; /* my left, top, right and bottom sides */
|
||||
gint dlt, drb; /* my destination left/top and right/bottom sides */
|
||||
Rect *area;
|
||||
Rect const *parea;
|
||||
const Rect *parea;
|
||||
gint al, at, ar, ab; /* screen boundaries */
|
||||
gint pl, pt, pr, pb; /* physical screen boundaries */
|
||||
guint i;
|
||||
|
|
|
@ -939,7 +939,7 @@ static gboolean hide_desktop_popup_func(gpointer data)
|
|||
|
||||
void screen_show_desktop_popup(guint d, gboolean perm)
|
||||
{
|
||||
Rect const *a;
|
||||
const Rect *a;
|
||||
|
||||
/* 0 means don't show the popup */
|
||||
if (!config_desktop_popup_time) return;
|
||||
|
@ -1617,14 +1617,14 @@ Rect* screen_area(guint desktop, guint head, Rect *search)
|
|||
return a;
|
||||
}
|
||||
|
||||
guint screen_find_monitor(const Rect const *search)
|
||||
guint screen_find_monitor(const Rect *search)
|
||||
{
|
||||
guint i;
|
||||
guint most = screen_num_monitors;
|
||||
guint mostv = 0;
|
||||
|
||||
for (i = 0; i < screen_num_monitors; ++i) {
|
||||
Rect const *area = screen_physical_area_monitor(i);
|
||||
const Rect *area = screen_physical_area_monitor(i);
|
||||
if (RECT_INTERSECTS_RECT(*area, *search)) {
|
||||
Rect r;
|
||||
guint v;
|
||||
|
@ -1641,12 +1641,12 @@ guint screen_find_monitor(const Rect const *search)
|
|||
return most;
|
||||
}
|
||||
|
||||
Rect const* screen_physical_area_all_monitors(void)
|
||||
const Rect* screen_physical_area_all_monitors(void)
|
||||
{
|
||||
return screen_physical_area_monitor(screen_num_monitors);
|
||||
}
|
||||
|
||||
Rect const* screen_physical_area_monitor(guint head)
|
||||
const Rect* screen_physical_area_monitor(guint head)
|
||||
{
|
||||
g_assert(head <= screen_num_monitors);
|
||||
|
||||
|
@ -1670,7 +1670,7 @@ guint screen_monitor_active(void)
|
|||
return screen_monitor_pointer();
|
||||
}
|
||||
|
||||
Rect const* screen_physical_area_active(void)
|
||||
const Rect* screen_physical_area_active(void)
|
||||
{
|
||||
return screen_physical_area_monitor(screen_monitor_active());
|
||||
}
|
||||
|
@ -1691,7 +1691,7 @@ guint screen_monitor_primary(gboolean fixed)
|
|||
return screen_monitor_pointer();
|
||||
}
|
||||
|
||||
Rect const *screen_physical_area_primary(gboolean fixed)
|
||||
const Rect* screen_physical_area_primary(gboolean fixed)
|
||||
{
|
||||
return screen_physical_area_monitor(screen_monitor_primary(fixed));
|
||||
}
|
||||
|
|
|
@ -104,17 +104,17 @@ void screen_install_colormap(struct _ObClient *client, gboolean install);
|
|||
|
||||
void screen_update_areas(void);
|
||||
|
||||
Rect const* screen_physical_area_all_monitors(void);
|
||||
const Rect* screen_physical_area_all_monitors(void);
|
||||
|
||||
/*! Returns a Rect which is owned by the screen code and should not be freed */
|
||||
Rect const* screen_physical_area_monitor(guint head);
|
||||
const Rect* screen_physical_area_monitor(guint head);
|
||||
|
||||
/*! Returns the monitor which contains the active window, or the one
|
||||
containing the pointer otherwise. */
|
||||
guint screen_monitor_active(void);
|
||||
|
||||
/*! Returns a Rect which is owned by the screen code and should not be freed */
|
||||
Rect const* screen_physical_area_active(void);
|
||||
const Rect* screen_physical_area_active(void);
|
||||
|
||||
/*! Returns the primary monitor, as specified by the config.
|
||||
@fixed If TRUE, then this will always return a fixed monitor, otherwise
|
||||
|
@ -128,7 +128,7 @@ guint screen_monitor_primary(gboolean fixed);
|
|||
See screen_monitor_primary().
|
||||
@return A Rect which is owned by the screen code and should not be freed
|
||||
*/
|
||||
Rect const *screen_physical_area_primary(gboolean fixed);
|
||||
const Rect* screen_physical_area_primary(gboolean fixed);
|
||||
|
||||
/* doesn't include struts which the search area is already outside of when
|
||||
'search' is not NULL */
|
||||
|
@ -148,7 +148,7 @@ gboolean screen_physical_area_monitor_contains(guint head, Rect *search);
|
|||
area of the part of the rectable on each monitor. The number of the
|
||||
monitor containing the greatest area of the rectangle is returned.
|
||||
*/
|
||||
guint screen_find_monitor(const Rect const *search);
|
||||
guint screen_find_monitor(const Rect *search);
|
||||
|
||||
/*! Finds the monitor which contains the point @x, @y */
|
||||
guint screen_find_monitor_point(guint x, guint y);
|
||||
|
|
Loading…
Reference in a new issue