Ignore:
Timestamp:
Mar 2, 2008, 12:29:06 AM (15 years ago)
Author:
Sam Hocevar
Message:
  • Fix almost 2,000 warnings by using proper "const" keywords where needed.
Location:
abuse/trunk/src/imlib
Files:
27 edited

Legend:

Unmodified
Added
Removed

  • abuse/trunk/src/imlib/filesel.cpp

    r4 r39  
    109109}
    110110
    111 jwindow *file_dialog(window_manager *wm, char *prompt, char *def,
    112                      int ok_id, char *ok_name, int cancel_id, char *cancel_name, char *FILENAME_str, int filename_id)
     111jwindow *file_dialog(window_manager *wm, char const *prompt, char const *def,
     112                     int ok_id, char const *ok_name, int cancel_id,
     113                     char const *cancel_name, char const *FILENAME_str,
     114                     int filename_id)
    113115{
    114116  int wl=WINDOW_FRAME_LEFT,wh=WINDOW_FRAME_TOP;

  • abuse/trunk/src/imlib/fonts.cpp

    r4 r39  
    1717}
    1818
    19 void texture_font::put_string(image *screen, int x, int y, char *st)
     19void texture_font::put_string(image *screen, int x, int y, char const *st)
    2020{ while (*st)
    2121  { put_char(screen,x,y,*st);
    … …  
    2626
    2727
    28 void JCFont::put_string(image *screen, int x, int y, char *st, int color)
     28void JCFont::put_string(image *screen, int x, int y, char const *st, int color)
    2929{ while (*st)
    3030  { put_char(screen,x,y,*st,color);

  • abuse/trunk/src/imlib/guistat.cpp

    r2 r39  
    1313  int last_update;
    1414  time_marker last_time;
    15   gui_status_node(char *Name, visual_object *Show, window_manager *WM, gui_status_node *Next)
     15  gui_status_node(char const *Name, visual_object *Show, window_manager *WM, gui_status_node *Next)
    1616  { name=strcpy((char *)jmalloc(strlen(Name)+1,"status name"),Name);
    1717    show=Show;
    … …  
    6060#endif
    6161
    62 void gui_status_manager::push(char *name, visual_object *show)
     62void gui_status_manager::push(char const *name, visual_object *show)
    6363{
    6464  first=new gui_status_node(name,show,wm,first); 

  • abuse/trunk/src/imlib/image.cpp

    r19 r39  
    1313
    1414extern uint8_t current_background;
    15 char *imerr_messages[]={"No error",
    16                         "Error occured while reading",
    17                         "Incorrect file type",
    18                         "File is corrupted",
    19                         "File not found",
    20                         "Memory allocation trouble",
    21                         "Operation/file type not supported",
    22                         "Error occured while writing, (disk full?)"};
     15
     16char const *imerr_messages[] =
     17{
     18    "No error",
     19    "Error occured while reading",
     20    "Incorrect file type",
     21    "File is corrupted",
     22    "File not found",
     23    "Memory allocation trouble",
     24    "Operation/file type not supported",
     25    "Error occured while writing, (disk full?)"
     26};
    2327                       
    2428                         

  • abuse/trunk/src/imlib/include/filesel.hpp

    r2 r39  
    44#include "jwindow.hpp"
    55
    6 
    7 
    8 jwindow *file_dialog(window_manager *wm, char *prompt, char *def,
    9                      int ok_id, char *ok_name, int cancel_id, char *cancel_name,
    10                      char *FILENAME_str,
     6jwindow *file_dialog(window_manager *wm, char const *prompt, char const *def,
     7                     int ok_id, char const *ok_name, int cancel_id,
     8                     char const *cancel_name, char const *FILENAME_str,
    119                     int filename_id);
    1210

  • abuse/trunk/src/imlib/include/fonts.hpp

    r2 r39  
    1313  texture_font(image *letters, image *font_pattern=NULL);
    1414  void put_char(image *screen,  int x, int y, char ch);
    15   void put_string(image *screen, int x, int y, char *st);
     15  void put_string(image *screen, int x, int y, char const *st);
    1616  int height() { return th; }
    1717  int length() { return tl; }
    … …  
    2929  JCFont(image *letters);
    3030  void put_char(image *screen,  int x, int y, char ch, int color=-1);
    31   void put_string(image *screen, int x, int y, char *st, int color=-1);
     31  void put_string(image *screen, int x, int y, char const *st, int color=-1);
    3232  int height() { return th; }
    3333  int length() { return tl; }

  • abuse/trunk/src/imlib/include/guistat.hpp

    r2 r39  
    1414  gui_status_node *first;
    1515  gui_status_manager(window_manager *WM);
    16   virtual void push(char *name, visual_object *show);
     16  virtual void push(char const *name, visual_object *show);
    1717  virtual void update(int percentage);
    1818  virtual void pop();
    1919  void draw_bar(gui_status_node *whom, int perc);
    20   void set_window_title(char *name) { strncpy(title,name,39); }
     20  void set_window_title(char const *name) { strncpy(title,name,39); }
    2121  virtual void force_display();
    2222} ;

  • abuse/trunk/src/imlib/include/image.hpp

    r19 r39  
    99#define Inew(pointer,type); { make_block(sizeof(type)); pointer=new type; }
    1010
    11 extern char *imerr_messages[];  // correspond to imERRORS
     11extern char const *imerr_messages[];  // correspond to imERRORS
    1212#define imREAD_ERROR           1
    1313#define imINCORRECT_FILETYPE   2

  • abuse/trunk/src/imlib/include/input.hpp

    r2 r39  
    1212  int act_id;
    1313public :
    14   button(int X, int Y, int ID, char *Text, ifield *Next);
     14  button(int X, int Y, int ID, char const *Text, ifield *Next);
    1515  button(int X, int Y, int ID, image *vis, ifield *Next);
    1616  button(int X, int Y, int ID, image *Depressed, image *Pressed, image *active, ifield *Next);
    … …  
    6464  }
    6565public :
    66   text_field(int X, int Y, int ID, char *Prompt, char *Format,
    67                                char *Data, ifield *Next);
    68   text_field(int X, int Y, int ID, char *Prompt, char *Format,
     66  text_field(int X, int Y, int ID, char const *Prompt, char const *Format,
     67                               char const *Data, ifield *Next);
     68  text_field(int X, int Y, int ID, char const *Prompt, char const *Format,
    6969                               double Data, ifield *Next);
    7070
    … …  
    7676  virtual ~text_field() { jfree(prompt); jfree(format); jfree(data); }
    7777  virtual char *read();
    78   void change_data(char *new_data, int new_cursor,       // cursor==-1, does not change it.
     78  void change_data(char const *new_data, int new_cursor,       // cursor==-1, does not change it.
    7979                   int active, image *screen, window_manager *wm);
    8080} ;
    … …  
    8585  char *text;
    8686  int w,h;
    87   void put_para(image *screen, char *st, int dx, int dy, int xspace,
     87  void put_para(image *screen, char const *st, int dx, int dy, int xspace,
    8888                int yspace, JCFont *font, int color);
    8989public :
    90   info_field(int X, int Y, int ID, char *info, ifield *Next);
     90  info_field(int X, int Y, int ID, char const *info, ifield *Next);
    9191  virtual void area(int &x1, int &y1, int &x2, int &y2, window_manager *wm);
    9292  virtual void draw_first(image *screen, window_manager *wm);

  • abuse/trunk/src/imlib/include/jmalloc.hpp

    r17 r39  
    88enum {ALLOC_SPACE_STATIC,ALLOC_SPACE_CACHE};
    99extern int alloc_space;
    10 void *jmalloc(int32_t size, char *what_for);
    11 void *jrealloc(void *ptr, int32_t size, char *what_for);
     10void *jmalloc(int32_t size, char const *what_for);
     11void *jrealloc(void *ptr, int32_t size, char const *what_for);
    1212void jfree(void *ptr);
    13 void mem_report(char *filename);
     13void mem_report(char const *filename);
    1414void jmalloc_init(int32_t min_size);
    1515void jmalloc_uninit();

  • abuse/trunk/src/imlib/include/jwindow.hpp

    r17 r39  
    8484  input_manager *inm;
    8585  void *local_info;     // pointer to info block for local system (may support windows)
    86   jwindow(int X, int Y, int L, int H, window_manager *wm, ifield *fields, char *Name=NULL);
     86  jwindow(int X, int Y, int L, int H, window_manager *wm, ifield *fields, char const *Name=NULL);
    8787  void redraw(int hi, int med, int low, JCFont *fnt);
    8888  void resize(int L, int H);
    … …  
    116116  window_manager(image *Screen, palette *Pal, int Hi, int Med, int Low, JCFont *Font);
    117117
    118   jwindow *new_window(int x, int y, int l, int h, ifield *fields=NULL, char *Name=NULL);
     118  jwindow *new_window(int x, int y, int l, int h, ifield *fields=NULL, char const *Name=NULL);
    119119  void set_frame_font(JCFont *fnt) { wframe_fnt=fnt; }
    120120  JCFont *frame_font() { return wframe_fnt; }

  • abuse/trunk/src/imlib/include/keys.hpp

    r2 r39  
    4343
    4444// returns a value describing a key name
    45 int key_value( char *buffer );
     45int key_value(char const *buffer);
    4646
    4747#endif

  • abuse/trunk/src/imlib/include/pcxread.hpp

    r2 r39  
    88enum PCX_type { not_PCX, PCX_8, PCX_24 };
    99
    10 PCX_type PCX_file_type(char *filename);
    11 image24 *read_PCX24(char *filename);
    12 image *read_PCX(char *filename, palette *&pal);
    13 void write_PCX(image *im, palette *pal,char *filename);
     10PCX_type PCX_file_type(char const *filename);
     11image24 *read_PCX24(char const *filename);
     12image *read_PCX(char const *filename, palette *&pal);
     13void write_PCX(image *im, palette *pal, char const *filename);
    1414
    1515#endif

  • abuse/trunk/src/imlib/include/pmenu.hpp

    r2 r39  
    1111  int hotkey;
    1212public :
    13   char *n,*on_off;
     13  char *n;
     14  char const *on_off;
    1415  psub_menu *sub;
    1516
    1617  int id,xp;
    1718  pmenu_item *next;
    18   pmenu_item(int ID, char *name, char *on_off_flag, int Hotkey, pmenu_item *Next);
    19   pmenu_item(char *Name, psub_menu *Sub, pmenu_item *Next, int xpos=-1);
     19  pmenu_item(int ID, char const *name, char const *on_off_flag, int Hotkey, pmenu_item *Next);
     20  pmenu_item(char const *Name, psub_menu *Sub, pmenu_item *Next, int xpos=-1);
    2021  char *name() { return n; }
    2122  pmenu_item *find_id(int search_id);

  • abuse/trunk/src/imlib/include/sound.hpp

    r2 r39  
    2828  unsigned long song_id;
    2929public :
    30   char *name() { return Name; }
    31   song(char *filename);
     30  char const *name() { return Name; }
     31  song(char const *filename);
    3232  void play(unsigned char volume=127);
    3333  void stop(long fadeout_time=0);                                        // time in ms

  • abuse/trunk/src/imlib/include/specs.hpp

    r17 r39  
    99#include <stdint.h>
    1010
    11 extern char *spec_types[];
     11extern char const *spec_types[];
    1212
    1313#define SPEC_INVALID_TYPE    0
    … …  
    6161*/
    6262
    63 void set_spec_main_file(char *filename, int search_order=SPEC_SEARCH_OUTSIDE_INSIDE);
    64 
    65 void set_filename_prefix(char *prefix);
     63void set_spec_main_file(char const *filename, int search_order=SPEC_SEARCH_OUTSIDE_INSIDE);
     64
     65void set_filename_prefix(char const *prefix);
    6666char *get_filename_prefix();
    67 void set_save_filename_prefix(char *prefix);
     67void set_save_filename_prefix(char const *prefix);
    6868char *get_save_filename_prefix();
    6969#define JFILE_CLONED 1
    … …  
    7878
    7979  virtual int unbuffered_read(void *buf, size_t count)  = 0;
    80   virtual int unbuffered_write(void *buf, size_t count) = 0;
     80  virtual int unbuffered_write(void const *buf, size_t count) = 0;
    8181  virtual int unbuffered_tell()                         = 0;
    8282  virtual int unbuffered_seek(long offset, int whence)  = 0;   // whence=SEEK_SET, SEEK_CUR,
    … …  
    8787  bFILE();
    8888  virtual int open_failure() = 0;
    89   int read(void *buf, size_t count);       // returns number of bytes read, calls unbuffer_read
    90   int write(void *buf, size_t count);      // returns number of bytes written
    91   int seek(long offset, int whence);       // whence=SEEK_SET, SEEK_CUR, SEEK_END, ret=0=success
     89  int read(void *buf, size_t count);        // returns number of bytes read, calls unbuffer_read
     90  int write(void const *buf, size_t count); // returns number of bytes written
     91  int seek(long offset, int whence);        // whence=SEEK_SET, SEEK_CUR, SEEK_END, ret=0=success
    9292  int tell();
    9393  virtual int file_size() = 0;
    … …  
    121121        int get_fd() const { return fd; }
    122122
    123   void open_internal(char *filename, char *mode, int flags);
    124   void open_external(char *filename, char *mode, int flags);
    125 
    126   jFILE(char *filename, char *access_string);      // same as fopen parameters
     123  void open_internal(char const *filename, char const *mode, int flags);
     124  void open_external(char const *filename, char const *mode, int flags);
     125
     126  jFILE(char const *filename, char const *access_string);      // same as fopen parameters
    127127  jFILE(FILE *file_pointer);                      // assumes fp is at begining of file
    128128  virtual int open_failure() { return fd<0; }
    129129  virtual int unbuffered_read(void *buf, size_t count);       // returns number of bytes read
    130   virtual int unbuffered_write(void *buf, size_t count);     // returns number of bytes written
     130  virtual int unbuffered_write(void const *buf, size_t count);     // returns number of bytes written
    131131  virtual int unbuffered_seek(long offset, int whence);      // whence=SEEK_SET, SEEK_CUR,
    132132                                                             // SEEK_END, ret=0=success
    … …  
    144144 
    145145  spec_entry(unsigned char spec_type,
    146              char *object_name,
    147              char *link_filename,
     146             char const *object_name,
     147             char const *link_filename,
    148148             unsigned long data_size,
    149149             unsigned long data_offset)
    … …  
    170170  spec_directory(bFILE *fp);
    171171  spec_directory();
    172   spec_entry *find(char *name);
    173   spec_entry *find(char *name, int type);
     172  spec_entry *find(char const *name);
     173  spec_entry *find(char const *name, int type);
    174174  spec_entry *find(int type);
    175   long find_number(char*name);
     175  long find_number(char const *name);
    176176  long find_number(int type);
    177177  void remove(spec_entry *e);
    … …  
    181181  long data_end_offset();    // this should be the end of the file
    182182  long type_total(int type);
    183   jFILE *write(char *filename);
     183  jFILE *write(char const *filename);
    184184  int    write(bFILE *fp);
    185185  void print();
    … …  
    207207
    208208void set_spec_main_file(char *filename, int Search_order);
    209 void set_file_opener(bFILE *(*open_fun)(char *, char *));
     209void set_file_opener(bFILE *(*open_fun)(char const *, char const *));
    210210void set_no_space_handler(void (*handle_fun)());
    211 bFILE *open_file(char *filename, char *mode);
     211bFILE *open_file(char const *filename, char const *mode);
    212212#endif
    213213

  • abuse/trunk/src/imlib/include/status.hpp

    r14 r39  
    88{
    99  public :
    10   virtual void push(char *name, visual_object *show) = 0;
     10  virtual void push(char const *name, visual_object *show) = 0;
    1111  virtual void update(int percentage) = 0;
    1212  virtual void pop() = 0;
    … …  
    2424  text_status_node *first;
    2525  text_status_manager();
    26   virtual void push(char *name, visual_object *show);
     26  virtual void push(char const *name, visual_object *show);
    2727  virtual void update(int percentage);
    2828  virtual void pop();
    … …  
    3535{
    3636  public :
    37   stack_stat(char *st, visual_object *show=NULL) { if (stat_man) stat_man->push(st,show); }
     37  stack_stat(char const *st, visual_object *show=NULL) { if (stat_man) stat_man->push(st,show); }
    3838  ~stack_stat() { if (stat_man) stat_man->pop(); }
    3939} ;

  • abuse/trunk/src/imlib/include/timage.hpp

    r17 r39  
    2323  short height() { return h; }
    2424  short width() { return w; } 
    25   trans_image(image *im, char *name);  // name has no meaning if MEM_CHECK is off
     25  trans_image(image *im, char const *name);  // name has no meaning if MEM_CHECK is off
    2626  void put_image(image *screen, int x, int y);   // always transparent   
    2727

  • abuse/trunk/src/imlib/input.cpp

    r4 r39  
    198198
    199199
    200 button::button(int X, int Y, int ID, char *Text, ifield *Next)
     200button::button(int X, int Y, int ID, char const *Text, ifield *Next)
    201201{ 
    202202  x=X; y=Y; id=ID;
    … …  
    225225
    226226
    227 void text_field::change_data(char *new_data, int new_cursor, // cursor==-1, does not change it.
     227void text_field::change_data(char const *new_data, int new_cursor, // cursor==-1, does not change it.
    228228                             int active, image *screen, window_manager *wm)
    229229{
    … …  
    317317}
    318318
    319 text_field::text_field(int X, int Y, int ID, char *Prompt, char *Format,
    320                                                      char *Data, ifield *Next)
     319text_field::text_field(int X, int Y, int ID, char const *Prompt,
     320                       char const *Format, char const *Data, ifield *Next)
    321321{
    322322  int slen=(strlen(Format)>strlen(Data) ? strlen(Format) : strlen(Data));
    … …  
    331331}
    332332
    333 text_field::text_field(int X, int Y, int ID, char *Prompt, char *Format,
    334                                double Data, ifield *Next)
     333text_field::text_field(int X, int Y, int ID, char const *Prompt,
     334                       char const *Format, double Data, ifield *Next)
    335335{
    336336  char num[20];
    … …  
    446446
    447447
    448 info_field::info_field(int X, int Y, int ID, char *info, ifield *Next)
    449 {
    450   x=X; y=Y; id=ID; next=Next;
    451   text=strcpy((char *)jmalloc(strlen(info)+1,"info_field"),info);
    452   w=-1;
     448info_field::info_field(int X, int Y, int ID, char const *info, ifield *Next)
     449{
     450  x = X; y = Y; id = ID; next = Next;
     451  text = strcpy((char *)jmalloc(strlen(info)+1,"info_field"), info);
     452  w = -1;
    453453}
    454454
    … …  
    478478}
    479479
    480 void info_field::put_para(image *screen, char *st, int dx, int dy,
     480void info_field::put_para(image *screen, char const *st, int dx, int dy,
    481481                          int xspace, int yspace, JCFont *font, int color)
    482482{

  • abuse/trunk/src/imlib/jmalloc.cpp

    r17 r39  
    6363
    6464  void init(void *block, int32_t Block_size, uint8_t type);
    65   void *static_alloc(int32_t size, char *name);
    66   void *cache_alloc(int32_t size, char *name);
     65  void *static_alloc(int32_t size, char const *name);
     66  void *cache_alloc(int32_t size, char const *name);
    6767  void static_free(void *ptr);
    6868  void cache_free(void *ptr);
    … …  
    325325}
    326326
    327 void *block_manager::static_alloc(int32_t size, char *name)
     327void *block_manager::static_alloc(int32_t size, char const *name)
    328328{
    329329  if (size<JM_SMALL_SIZE)
    … …  
    405405
    406406
    407 void *block_manager::cache_alloc(int32_t size, char *name)
     407void *block_manager::cache_alloc(int32_t size, char const *name)
    408408{
    409409  if (size<JM_SMALL_SIZE)
    … …  
    683683
    684684 
    685 int jmalloc_max_size=3072000;
    686 int jmalloc_min_low_size=0x1000;
    687 char *not_enough_total_memory_message="Memory manager : Sorry you do not have enough memory available to\n"
    688                                        "                 run this program.\n"
    689                                        "    DOS users  : Remove any TSR's and device drivers you can.\n"
    690                                        "    UNIX users : Do you have a swapfile/partition setup?\n";
    691 char *not_enough_low_memory_message="Memory Manager : Not enough low memory available (%d : need %d)\n"
    692                                    "  Suggestions...\n"
    693                                    "    - make a boot disk\n"
    694                                    "    - remove TSR's  & drivers not needed by ABUSE\n"
    695                                    "    - add memory to your system\n";
     685int jmalloc_max_size = 3072000;
     686int jmalloc_min_low_size = 0x1000;
     687static char const *not_enough_total_memory_message =
     688    "Memory manager : Sorry you do not have enough memory available to\n"
     689    "                 run this program.\n"
     690    "    DOS users  : Remove any TSR's and device drivers you can.\n"
     691    "    UNIX users : Do you have a swapfile/partition setup?\n";
     692static char const *not_enough_low_memory_message =
     693    "Memory Manager : Not enough low memory available (%d : need %d)\n"
     694    "  Suggestions...\n"
     695    "    - make a boot disk\n"
     696    "    - remove TSRs & drivers not needed by ABUSE\n"
     697    "    - add memory to your system\n";
    696698
    697699void jmalloc_init(int32_t min_size)
    … …  
    784786
    785787
    786 void *jmalloc(int32_t size, char *name)
     788void *jmalloc(int32_t size, char const *name)
    787789{ 
    788790  if (!bmanage_total)
    … …  
    837839
    838840
    839 void *jrealloc(void *ptr, int32_t size, char *name)
     841void *jrealloc(void *ptr, int32_t size, char const *name)
    840842{ 
    841843  if (!ptr) return jmalloc(size,name);
    … …  
    882884
    883885
    884 void mem_report(char *filename)
     886void mem_report(char const *filename)
    885887{
    886888        char *reportpath;

  • abuse/trunk/src/imlib/jwindow.cpp

    r4 r39  
    258258}
    259259
    260 jwindow *window_manager::new_window(int x, int y, int l, int h, ifield *fields, char *Name)
     260jwindow *window_manager::new_window(int x, int y, int l, int h, ifield *fields, char const *Name)
    261261{
    262262  if (x>screen->width()-4) x=screen->width()-25;
    … …  
    339339}
    340340
    341 jwindow::jwindow(int X, int Y, int L, int H, window_manager *wm, ifield *fields, char *Name)
     341jwindow::jwindow(int X, int Y, int L, int H, window_manager *wm, ifield *fields, char const *Name)
    342342{
    343343  ifield *i;

  • abuse/trunk/src/imlib/keys.cpp

    r4 r39  
    33#include <ctype.h>
    44
    5 char *jk_key_names[]= {"Up Arrow","Down Arrow","Left Arrow","Right Arrow",
    6                     "Left Ctrl","Right Ctrl","Left Alt","Right Alt",
    7                     "Left Shift","Right Shift","Caps Lock","Num Lock",
    8                     "Home","End","Del","F1","F2","F3","F4","F5","F6",
    9                     "F7","F8","F9","F10","Insert","PageUp","PageDown","Command"};
    10 
     5char const *jk_key_names[]=
     6{
     7    "Up Arrow","Down Arrow","Left Arrow","Right Arrow",
     8    "Left Ctrl","Right Ctrl","Left Alt","Right Alt",
     9    "Left Shift","Right Shift","Caps Lock","Num Lock",
     10    "Home","End","Del","F1","F2","F3","F4","F5","F6",
     11    "F7","F8","F9","F10","Insert","PageUp","PageDown","Command"
     12};
    1113
    1214void key_name(int key, char *buffer)
    1315{
    14         //static char sing[2];
    15         if( key > 255 && key <= JK_MAX_KEY )
    16                 strcpy(buffer,jk_key_names[key-256]);
    17         else if( key == JK_BACKSPACE )
    18                 strcpy(buffer,"Backspace");
    19         else if( key == JK_TAB )
    20                 strcpy(buffer,"Tab");
    21         else if( key == JK_ENTER )
    22                 strcpy(buffer,"Enter");
    23         else if( key == JK_ESC )
    24                 strcpy(buffer,"Esc");
    25         else if( key == JK_SPACE )
    26                 strcpy( buffer, "Space" );
    27         else if( isprint(key) )
    28         {
    29                 buffer[0] = key;
    30                 buffer[1] = 0;
    31         }
    32         else
    33         {
    34                 buffer[0] = 0;
    35         }
     16    //static char sing[2];
     17    if( key > 255 && key <= JK_MAX_KEY )
     18        strcpy(buffer,jk_key_names[key-256]);
     19    else if( key == JK_BACKSPACE )
     20        strcpy(buffer,"Backspace");
     21    else if( key == JK_TAB )
     22        strcpy(buffer,"Tab");
     23    else if( key == JK_ENTER )
     24        strcpy(buffer,"Enter");
     25    else if( key == JK_ESC )
     26        strcpy(buffer,"Esc");
     27    else if( key == JK_SPACE )
     28        strcpy( buffer, "Space" );
     29    else if( isprint(key) )
     30    {
     31        buffer[0] = key;
     32        buffer[1] = 0;
     33    }
     34    else
     35    {
     36        buffer[0] = 0;
     37    }
    3638}
    3739
    38 int key_value( char *buffer )
     40int key_value(char const *buffer)
    3941{
    40         if( strcasecmp( buffer, "Backspace" ) == 0 )
    41                 return JK_BACKSPACE;
    42         if( strcasecmp( buffer, "Tab" ) == 0 )
    43                 return JK_TAB;
    44         if( strcasecmp( buffer, "Enter" ) == 0 )
    45                 return JK_ENTER;
    46         if( strcasecmp( buffer, "ESC" ) == 0 )
    47                 return JK_ESC;
    48         if( strcasecmp( buffer, "Space" ) == 0 )
    49                 return JK_SPACE;
    50         if( strcasecmp( buffer, "Up" ) == 0 )
    51                 return JK_UP;
    52         if( strcasecmp( buffer, "Down" ) == 0 )
    53                 return JK_DOWN;
    54         if( strcasecmp( buffer, "Left" ) == 0 )
    55                 return JK_LEFT;
    56         if( strcasecmp( buffer, "Right" ) == 0 )
    57                 return JK_RIGHT;
    58         if( strcasecmp( buffer, "CTRL_L" ) == 0 )
    59                 return JK_CTRL_L;
    60         if( strcasecmp( buffer, "CTRL_R" ) == 0 )
    61                 return JK_CTRL_R;
    62         if( strcasecmp( buffer, "ALT_L" ) == 0 )
    63                 return JK_ALT_L;
    64         if( strcasecmp( buffer, "ALT_R" ) == 0 )
    65                 return JK_ALT_R;
    66         if( strcasecmp( buffer, "SHIFT_L" ) == 0 )
    67                 return JK_SHIFT_L;
    68         if( strcasecmp( buffer, "SHIFT_R" ) == 0 )
    69                 return JK_SHIFT_R;
    70         if( strcasecmp( buffer, "Caps" ) == 0 )
    71                 return JK_CAPS;
    72         if( strcasecmp( buffer, "Num_Lock" ) == 0 )
    73                 return JK_NUM_LOCK;
    74         if( strcasecmp( buffer, "Home" ) == 0 )
    75                 return JK_HOME;
    76         if( strcasecmp( buffer, "End" ) == 0 )
    77                 return JK_END;
    78         if( strcasecmp( buffer, "Del" ) == 0 )
    79                 return JK_DEL;
    80         if( strcasecmp( buffer, "F1" ) == 0 )
    81                 return JK_F1;
    82         if( strcasecmp( buffer, "F2" ) == 0 )
    83                 return JK_F2;
    84         if( strcasecmp( buffer, "F3" ) == 0 )
    85                 return JK_F3;
    86         if( strcasecmp( buffer, "F4" ) == 0 )
    87                 return JK_F4;
    88         if( strcasecmp( buffer, "F5" ) == 0 )
    89                 return JK_F5;
    90         if( strcasecmp( buffer, "F6" ) == 0 )
    91                 return JK_F6;
    92         if( strcasecmp( buffer, "F7" ) == 0 )
    93                 return JK_F7;
    94         if( strcasecmp( buffer, "F8" ) == 0 )
    95                 return JK_F8;
    96         if( strcasecmp( buffer, "F9" ) == 0 )
    97                 return JK_F9;
    98         if( strcasecmp( buffer, "F10" ) == 0 )
    99                 return JK_F10;
    100         if( strcasecmp( buffer, "Insert" ) == 0 )
    101                 return JK_INSERT;
    102         if( strcasecmp( buffer, "PageUp" ) == 0 )
    103                 return JK_PAGEUP;
    104         if( strcasecmp( buffer, "PageDown" ) == 0 )
    105                 return JK_PAGEDOWN;
     42    if( strcasecmp( buffer, "Backspace" ) == 0 )
     43        return JK_BACKSPACE;
     44    if( strcasecmp( buffer, "Tab" ) == 0 )
     45        return JK_TAB;
     46    if( strcasecmp( buffer, "Enter" ) == 0 )
     47        return JK_ENTER;
     48    if( strcasecmp( buffer, "ESC" ) == 0 )
     49        return JK_ESC;
     50    if( strcasecmp( buffer, "Space" ) == 0 )
     51        return JK_SPACE;
     52    if( strcasecmp( buffer, "Up" ) == 0 )
     53        return JK_UP;
     54    if( strcasecmp( buffer, "Down" ) == 0 )
     55        return JK_DOWN;
     56    if( strcasecmp( buffer, "Left" ) == 0 )
     57        return JK_LEFT;
     58    if( strcasecmp( buffer, "Right" ) == 0 )
     59        return JK_RIGHT;
     60    if( strcasecmp( buffer, "CTRL_L" ) == 0 )
     61        return JK_CTRL_L;
     62    if( strcasecmp( buffer, "CTRL_R" ) == 0 )
     63        return JK_CTRL_R;
     64    if( strcasecmp( buffer, "ALT_L" ) == 0 )
     65        return JK_ALT_L;
     66    if( strcasecmp( buffer, "ALT_R" ) == 0 )
     67        return JK_ALT_R;
     68    if( strcasecmp( buffer, "SHIFT_L" ) == 0 )
     69        return JK_SHIFT_L;
     70    if( strcasecmp( buffer, "SHIFT_R" ) == 0 )
     71        return JK_SHIFT_R;
     72    if( strcasecmp( buffer, "Caps" ) == 0 )
     73        return JK_CAPS;
     74    if( strcasecmp( buffer, "Num_Lock" ) == 0 )
     75        return JK_NUM_LOCK;
     76    if( strcasecmp( buffer, "Home" ) == 0 )
     77        return JK_HOME;
     78    if( strcasecmp( buffer, "End" ) == 0 )
     79        return JK_END;
     80    if( strcasecmp( buffer, "Del" ) == 0 )
     81        return JK_DEL;
     82    if( strcasecmp( buffer, "F1" ) == 0 )
     83        return JK_F1;
     84    if( strcasecmp( buffer, "F2" ) == 0 )
     85        return JK_F2;
     86    if( strcasecmp( buffer, "F3" ) == 0 )
     87        return JK_F3;
     88    if( strcasecmp( buffer, "F4" ) == 0 )
     89        return JK_F4;
     90    if( strcasecmp( buffer, "F5" ) == 0 )
     91        return JK_F5;
     92    if( strcasecmp( buffer, "F6" ) == 0 )
     93        return JK_F6;
     94    if( strcasecmp( buffer, "F7" ) == 0 )
     95        return JK_F7;
     96    if( strcasecmp( buffer, "F8" ) == 0 )
     97        return JK_F8;
     98    if( strcasecmp( buffer, "F9" ) == 0 )
     99        return JK_F9;
     100    if( strcasecmp( buffer, "F10" ) == 0 )
     101        return JK_F10;
     102    if( strcasecmp( buffer, "Insert" ) == 0 )
     103        return JK_INSERT;
     104    if( strcasecmp( buffer, "PageUp" ) == 0 )
     105        return JK_PAGEUP;
     106    if( strcasecmp( buffer, "PageDown" ) == 0 )
     107        return JK_PAGEDOWN;
    106108
    107         // Assume they are asking for a normal key, so convert the first
    108         // character to an integer and return that
    109         return (int)buffer[0];
     109    // Assume they are asking for a normal key, so convert the first
     110    // character to an integer and return that
     111    return (int)buffer[0];
    110112}
    111113
    112 

  • abuse/trunk/src/imlib/pcxread.cpp

    r17 r39  
    5656
    5757
    58 PCX_type PCX_file_type(char *filename)
     58PCX_type PCX_file_type(char const *filename)
    5959{
    6060  FILE *fp=fopen(filename,"rb"); 
    … …  
    108108
    109109
    110 image24 *read_PCX24(char *filename)
     110image24 *read_PCX24(char const *filename)
    111111{
    112112  if (PCX_file_type(filename)!=PCX_24) return NULL; 
    … …  
    126126}
    127127
    128 image *read_PCX(char *filename, palette *&pal)
     128image *read_PCX(char const *filename, palette *&pal)
    129129{
    130130  if (PCX_file_type(filename)!=PCX_8) return NULL; 
    … …  
    152152} 
    153153
    154 void write_PCX(image *im, palette *pal, char *filename)
     154void write_PCX(image *im, palette *pal, char const *filename)
    155155{
    156156  FILE *fp=fopen(filename,"wb");

  • abuse/trunk/src/imlib/pmenu.cpp

    r4 r39  
    4545}
    4646
    47 pmenu_item::pmenu_item(int ID, char *Name, char *on_off_flag, int Hotkey, pmenu_item *Next)
     47pmenu_item::pmenu_item(int ID, char const *Name, char const *on_off_flag, int Hotkey, pmenu_item *Next)
    4848{
    4949  xp=-1;
    … …  
    5858}
    5959
    60 pmenu_item::pmenu_item(char *Name, psub_menu *Sub, pmenu_item *Next, int xpos)
     60pmenu_item::pmenu_item(char const *Name, psub_menu *Sub, pmenu_item *Next, int xpos)
    6161{
    6262  xp=xpos;

  • abuse/trunk/src/imlib/specs.cpp

    r17 r39  
    2020#endif
    2121
    22 char *spec_types[]={"Invalid type",             // 0
    23                     "Color table",              // 1
    24                     "Palette",                  // 2
    25                     "Invalid Type",             // 3
    26                     "Image",                    // 4
    27                     "Fore Tile",
    28                     "Back Tile",
    29                     "Character",
    30                     "8 Morph",
    31                     "16 Morph",
    32                     "Grue objs",
    33                     "Extern WAV",
    34                     "DMX MUS",
    35                     "Patched morph",
    36                     "Normal file",
    37                     "Compress1 file",
    38                     "Vector Image",
    39                     "Light list",
    40                     "Grue fgmap",
    41                     "Grue bgmap",
    42                     "Data array",
    43                     "Character2",
    44                     "Particle",
    45                     "Extern lcache"
     22char const *spec_types[] =
     23{
     24    "Invalid type", // 0
     25    "Color table",  // 1
     26    "Palette",      // 2
     27    "Invalid Type", // 3
     28    "Image",        // 4
     29    "Fore Tile",
     30    "Back Tile",
     31    "Character",
     32    "8 Morph",
     33    "16 Morph",
     34    "Grue objs",
     35    "Extern WAV",
     36    "DMX MUS",
     37    "Patched morph",
     38    "Normal file",
     39    "Compress1 file",
     40    "Vector Image",
     41    "Light list",
     42    "Grue fgmap",
     43    "Grue bgmap",
     44    "Data array",
     45    "Character2",
     46    "Particle",
     47    "Extern lcache"
    4648};
    4749
    … …  
    6163static int fast_load_mode = 0;
    6264
    63 void set_filename_prefix(char *prefix)
     65void set_filename_prefix(char const *prefix)
    6466{
    6567        if( spec_prefix )
    … …  
    9092
    9193
    92 void set_save_filename_prefix(char *save_prefix)
     94void set_save_filename_prefix(char const *save_prefix)
    9395{
    9496        if( save_spec_prefix )
    … …  
    197199
    198200
    199 int bFILE::write(void *buf, size_t count)      // returns number of bytes written
     201int bFILE::write(void const *buf, size_t count)      // returns number of bytes written
    200202{
    201203  if (allow_write_buffering())
    … …  
    263265}
    264266
    265 void set_spec_main_file(char *filename, int Search_order)
     267void set_spec_main_file(char const *filename, int Search_order)
    266268{
    267269  dprintf("Specs : main file set to %s\n",filename);
    … …  
    319321}
    320322
    321 void jFILE::open_external(char *filename, char *mode, int flags)
     323void jFILE::open_external(char const *filename, char const *mode, int flags)
    322324{
    323325  int skip_size=0;
    … …  
    376378  virtual int open_failure() { return 1; }
    377379  virtual int unbuffered_read(void *buf, size_t count)   { return 0; }
    378   virtual int unbuffered_write(void *buf, size_t count)  { return 0; }
     380  virtual int unbuffered_write(void const *buf, size_t count)  { return 0; }
    379381  virtual int unbuffered_seek(long offset, int whence)   { return 0; }
    380382
    … …  
    385387
    386388
    387 static bFILE *(*open_file_fun)(char *,char *)=NULL;
    388 int (*verify_file_fun)(char *,char *)=NULL;
    389 
    390 void set_file_opener(bFILE *(*open_fun)(char *, char *))
     389static bFILE *(*open_file_fun)(char const *,char const *)=NULL;
     390int (*verify_file_fun)(char const *,char const *)=NULL;
     391
     392void set_file_opener(bFILE *(*open_fun)(char const *, char const *))
    391393{
    392394  open_file_fun=open_fun;
    393395}
    394396
    395 bFILE *open_file(char *filename, char *mode)
     397bFILE *open_file(char const *filename, char const *mode)
    396398{
    397399  if (!verify_file_fun || verify_file_fun(filename,mode))
    … …  
    403405}
    404406
    405 void jFILE::open_internal(char *filename, char *mode, int flags)
     407void jFILE::open_internal(char const *filename, char const *mode, int flags)
    406408{
    407409  int wr=0;
    408   for (char *s=mode;*s;s++)
     410  for (char const *s=mode;*s;s++)
    409411    if (toupper(*s)=='A' || toupper(*s)=='W')
    410412      wr=1;
    … …  
    434436}
    435437
    436 jFILE::jFILE(char *filename, char *access_string)      // same as fopen parameters
     438jFILE::jFILE(char const *filename, char const *access_string)      // same as fopen parameters
    437439{
    438440 flags=access=0; 
    439  char *s=access_string;
     441 char const *s=access_string;
    440442  for (;*s;s++)
    441443    if (toupper(*s)=='R') access=O_RDONLY;
    … …  
    540542}
    541543
    542 int jFILE::unbuffered_write(void *buf, size_t count)
     544int jFILE::unbuffered_write(void const *buf, size_t count)
    543545{
    544546  long ret = ::write(fd,(char*)buf,count);
    … …  
    684686}
    685687
    686 spec_entry *spec_directory::find(char *name, int type)
     688spec_entry *spec_directory::find(char const *name, int type)
    687689{
    688690  int i;
    … …  
    694696}
    695697
    696 spec_entry *spec_directory::find(char *name)
     698spec_entry *spec_directory::find(char const *name)
    697699{
    698700  int i;
    … …  
    704706}
    705707
    706 long spec_directory::find_number(char *name)
     708long spec_directory::find_number(char const *name)
    707709{
    708710  int i;
    … …  
    842844}*/
    843845
    844 int write_string(bFILE *fp, char *st)
     846int write_string(bFILE *fp, char const *st)
    845847{
    846848  unsigned char length=strlen(st)+1;
    … …  
    900902}
    901903
    902 jFILE *spec_directory::write(char *filename)
     904jFILE *spec_directory::write(char const *filename)
    903905{
    904906  jFILE *fp;
    … …  
    10051007
    10061008
    1007 void note_open_fd(int fd, char *str)
     1009void note_open_fd(int fd, char const *str)
    10081010{
    10091011  total_files_open++;

  • abuse/trunk/src/imlib/status.cpp

    r2 r39  
    1212  visual_object *show;
    1313  int last_update;
    14   text_status_node(char *Name, visual_object *Show, text_status_node *Next)
     14  text_status_node(char const *Name, visual_object *Show, text_status_node *Next)
    1515  { name=strcpy((char *)jmalloc(strlen(Name)+1,"status name"),Name);
    1616    show=Show;
    … …  
    2929}
    3030
    31 void text_status_manager::push(char *name, visual_object *show)
     31void text_status_manager::push(char const *name, visual_object *show)
    3232{
    3333  level++;

  • abuse/trunk/src/imlib/timage.cpp

    r17 r39  
    5151}
    5252
    53 trans_image::trans_image(image *im, char *name)
     53trans_image::trans_image(image *im, char const *name)
    5454{
    5555  int size=0,x,y;
Note: See TracChangeset for help on using the changeset viewer.