← Back to branch summary

~ctwm/ctwm/trunk

« back to all changes in this revision

Viewing changes to menus.c

  • Committer: Matthew Fuller
  • Date: 2018-11-10 22:21:54 UTC
  • mfrom: (614.3.8 randr_merge)
  • mto: This revision was merged to the branch mainline in revision 644.
  • Revision ID: fullermd@over-yonder.net-20181110222154-5ug1e2esi7rnb0wc
Merge up with trunk.

Because trnk has done a lot of reworking of the startup codepath, and
there are a few randr/layout related changes, this involved a lot of
conflicts, so I multi-stepped a lot of the merges.

Show diffs side-by-side

added added

removed removed

Lines of Context:
menus.c
85
85
/***********************************************************************
86
86
 *
87
87
 *  Procedure:
88
 
 *      InitMenus - initialize menu roots
89
 
 *
90
 
 ***********************************************************************
91
 
 */
92
 
 
93
 
void InitMenus(void)
94
 
{
95
 
        Scr->DefaultFunction.func = 0;
96
 
        Scr->WindowFunction.func  = 0;
97
 
        Scr->ChangeWorkspaceFunction.func  = 0;
98
 
        Scr->DeIconifyFunction.func  = 0;
99
 
        Scr->IconifyFunction.func  = 0;
100
 
 
101
 
        Scr->FuncKeyRoot.next = NULL;
102
 
        Scr->FuncButtonRoot.next = NULL;
103
 
}
104
 
 
105
 
 
106
 
/***********************************************************************
107
 
 *
108
 
 *  Procedure:
109
88
 *      AddFuncKey - add a function key to the list
110
89
 *
111
90
 *  Inputs:
805
784
        tmp->separated = false;
806
785
 
807
786
        if(!Scr->HaveFonts) {
808
 
                CreateFonts();
 
787
                CreateFonts(Scr);
809
788
        }
810
789
 
811
790
        XmbTextExtents(Scr->MenuFont.font_set,