← Back to branch summary

~compiz-team/compiz-core/oneiric.fix_uwd_menus

« back to all changes in this revision

Viewing changes to gtk/window-decorator/gtk-window-decorator.c

  • Committer: Sam Spilsbury
  • Date: 2011-07-29 15:38:07 UTC
  • Revision ID: sam.spilsbury@canonical.com-20110729153807-0ex9ozst6qgq8619
Revert the decorator

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk/window-decorator/gtk-window-decorator.c
82
82
    { 6, 2, 16, 16,   0, 0, 0, 0, 0, 0 }
83
83
};
84
84
 
85
 
#define WINDOW_TYPE_FRAMES_NUM 5
86
 
struct _default_frame_references default_frames[WINDOW_TYPE_FRAMES_NUM  * 2] = {
87
 
    /* active */
88
 
    {"normal", NULL },
89
 
    {"dialog", NULL },
90
 
    {"modal_dialog", NULL },
91
 
    {"menu", NULL },
92
 
    {"utility", NULL},
93
 
    /* inactive */
94
 
    {"normal", NULL },
95
 
    {"dialog", NULL },
96
 
    {"modal_dialog", NULL },
97
 
    {"menu", NULL },
98
 
    {"utility", NULL}
 
85
const gchar * window_type_frames[WINDOW_TYPE_FRAMES_NUM] = {
 
86
    "normal", "dialog", "menu", "utility"
99
87
};
100
88
 
101
89
char *program_name;
124
112
 
125
113
decor_settings_t *settings;
126
114
 
127
 
const gchar * window_type_frames[WINDOW_TYPE_FRAMES_NUM] = {
128
 
    "normal", "modal_dialog", "dialog", "menu", "utility"
129
 
};
130
 
 
131
115
int
132
116
main (int argc, char *argv[])
133
117
{
141
125
    Window        root_ret, parent_ret;
142
126
    Window        *children = NULL;
143
127
    GList         *windows, *win;
144
 
    decor_frame_t *bare_p, *switcher_p;
 
128
    decor_frame_t *default_p, *bare_p, *switcher_p;
145
129
 
146
130
#ifdef USE_METACITY
147
131
    char       *meta_theme = NULL;
292
276
                     FALSE);
293
277
 
294
278
    net_wm_state_atom = XInternAtom (xdisplay,"_NET_WM_STATE", 0);
295
 
    net_wm_state_modal_atom = XInternAtom (xdisplay, "_NET_WM_STATE_MODAL", 0);
 
279
    net_wm_state_modal_atom = XInternAtom (xdisplay, "_NET_MW_STATE_MODAL", 0);
296
280
 
297
281
    status = decor_acquire_dm_session (xdisplay,
298
282
                                       gdk_screen_get_number (gdkscreen),
426
410
    /* Keep the default, bare and switcher decorations around
427
411
     * since otherwise they will be spuriously recreated */
428
412
 
 
413
    default_p = gwd_get_decor_frame ("default");
429
414
    bare_p = gwd_get_decor_frame ("bare");
430
415
    switcher_p = gwd_get_decor_frame ("switcher");
431
416
 
456
441
    if (tip_window)
457
442
        gtk_widget_destroy (GTK_WIDGET (tip_window));
458
443
 
 
444
    gwd_decor_frame_unref (default_p);
459
445
    gwd_decor_frame_unref (bare_p);
460
446
    gwd_decor_frame_unref (switcher_p);
461
447