← Back to branch summary

~ctwm/ctwm/trunk

« back to all changes in this revision

Viewing changes to util.c

  • Committer: Matthew Fuller
  • Date: 2014-07-23 19:21:29 UTC
  • mto: This revision was merged to the branch mainline in revision 327.
  • Revision ID: fullermd@over-yonder.net-20140723192129-nxktqxfxmu3w03vk
Kill off the list of the XmuCompare's.

Show diffs side-by-side

added added

removed removed

Lines of Context:
util.c
86
86
#include "cursor.h"
87
87
#include "resize.h"
88
88
#include <stdio.h>
 
89
#include <string.h>
 
90
#include <strings.h>
89
91
 
90
92
/*
91
93
 * Need this for the fixed-size uint_*'s used below.  stdint.h would be
101
103
#include <decw$include/Xatom.h>
102
104
#include <decw$include/Xutil.h>
103
105
#include <X11Xmu/Drawing.h>
104
 
#include <X11Xmu/CharSet.h>
105
106
#include <X11Xmu/WinUtil.h>
106
107
#ifdef HAVE_XWDFILE_H
107
108
#include "XWDFile.h"            /* We do some tricks, since the original
132
133
#include <X11/Xos.h>
133
134
#include <X11/Xatom.h>
134
135
#include <X11/Xmu/Drawing.h>
135
 
#include <X11/Xmu/CharSet.h>
136
136
#include <X11/Xmu/WinUtil.h>
137
137
#include <X11/XWDFile.h>
138
138
#endif /* VMS */
624
624
                };
625
625
 
626
626
                for(i = 0; i < (sizeof pmtab) / (sizeof pmtab[0]); i++) {
627
 
                        if(XmuCompareISOLatin1(pmtab[i].name, name) == 0) {
 
627
                        if(strcasecmp(pmtab[i].name, name) == 0) {
628
628
                                return (*pmtab[i].proc)(widthp, heightp);
629
629
                        }
630
630
                }
3681
3681
                sprintf(fullname, "%s%dx%d", name, (int) cp.fore, (int) cp.back);
3682
3682
                if((image = (Image *) LookInNameList(*list, fullname)) == None) {
3683
3683
                        for(i = 0; i < (sizeof pmtab) / (sizeof pmtab[0]); i++) {
3684
 
                                if(XmuCompareISOLatin1(pmtab[i].name, name) == 0) {
 
3684
                                if(strcasecmp(pmtab[i].name, name) == 0) {
3685
3685
                                        image = (*pmtab[i].proc)(cp);
3686
3686
                                        if(image == None) {
3687
3687
                                                fprintf(stderr,
3721
3721
                sprintf(fullname, "%s%dx%d", name, (int) cp.fore, (int) cp.back);
3722
3722
                if((image = (Image *) LookInNameList(*list, fullname)) == None) {
3723
3723
                        for(i = 0; i < (sizeof pmtab) / (sizeof pmtab[0]); i++) {
3724
 
                                if(XmuCompareISOLatin1(pmtab[i].name, name) == 0) {
 
3724
                                if(strcasecmp(pmtab[i].name, name) == 0) {
3725
3725
                                        image = (*pmtab[i].proc)(cp);
3726
3726
                                        if(image == None) {
3727
3727
                                                fprintf(stderr,
3759
3759
                sprintf(fullname, "%s%dx%d", name, (int) cp.fore, (int) cp.back);
3760
3760
                if((image = (Image *) LookInNameList(*list, fullname)) == None) {
3761
3761
                        for(i = 0; i < (sizeof pmtab) / (sizeof pmtab[0]); i++) {
3762
 
                                if(XmuCompareISOLatin1(pmtab[i].name, name) == 0) {
 
3762
                                if(strcasecmp(pmtab[i].name, name) == 0) {
3763
3763
                                        pm = (*pmtab[i].proc)(&width, &height);
3764
3764
                                        if(pm == None) {
3765
3765
                                                fprintf(stderr,