← Back to branch summary

~ctwm/ctwm/trunk

« back to all changes in this revision

Viewing changes to functions.c

  • Committer: Matthew Fuller
  • Date: 2016-10-29 00:43:19 UTC
  • mto: This revision was merged to the branch mainline in revision 536.
  • Revision ID: fullermd@over-yonder.net-20161029004319-zgsmies5wx7czd84
These sound handling funcs are real, so move them into functions_misc.
This leaves the only static handlers in functions.c being fakeouts for
things that should never get executed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
functions.c
31
31
#include "util.h"
32
32
#include "drawing.h"
33
33
#include "occupation.h"
34
 
#ifdef SOUNDS
35
 
#include "sound.h"
36
 
#endif
37
34
#include "version.h"
38
35
#include "win_iconify.h"
39
36
#include "win_ops.h"
49
46
#include "functions.h"
50
47
#include "functions_internal.h"
51
48
 
52
 
/* Our static implementations in this file (need these before below) */
53
 
#ifdef SOUNDS
54
 
static DFHANDLER(togglesound);
55
 
static DFHANDLER(rereadsounds);
56
 
#endif
57
49
 
58
50
static DFHANDLER(nop);
59
51
static DFHANDLER(separator);
518
510
 
519
511
 
520
512
/*
521
 
 * Some misc function handlers that are small individually and don't
522
 
 * obviously belong to a larger set, so I just stick 'em here.
523
 
 */
524
 
 
525
 
/* Sound-related funcs */
526
 
#ifdef SOUNDS
527
 
static
528
 
DFHANDLER(togglesound)
529
 
{
530
 
        toggle_sound();
531
 
}
532
 
static
533
 
DFHANDLER(rereadsounds)
534
 
{
535
 
        reread_sounds();
536
 
}
537
 
#endif
538
 
 
539
 
 
540
 
 
541
 
/*
542
513
 * Faked up handlers for functions that shouldn't ever really get to
543
514
 * them.  These are handled in various hard-coded ways before we get to
544
515
 * automatic dispatch, so there shouldn't be any way these functions