ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtutil.h
(Generate patch)

Comparing rxvt-unicode/src/rxvtutil.h (file contents):
Revision 1.29 by ayin, Wed Oct 31 09:55:24 2007 UTC vs.
Revision 1.32 by ayin, Sun Dec 2 12:31:44 2007 UTC

… …
11#define PP_STRINGIFY_(a) #a 11#define PP_STRINGIFY_(a) #a
12#define PP_STRINGIFY(a) PP_STRINGIFY_(a) 12#define PP_STRINGIFY(a) PP_STRINGIFY_(a)
13 13
14#define HAVE_GCC_BUILTINS (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ == 4)) 14#define HAVE_GCC_BUILTINS (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ == 4))
15 15
16#ifndef __attribute__
17# if __GNUC__ 16#if __GNUC__ >= 4
18# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2) 17# define rxvt_attribute(x) __attribute__(x)
19# define __attribute__(x) 18#else
20# endif
21# endif
22# define __attribute__(x) 19# define rxvt_attribute(x)
23#endif 20#endif
24 21
25#define NORETURN __attribute__ ((noreturn)) 22#define NORETURN rxvt_attribute ((noreturn))
26#define UNUSED __attribute__ ((unused)) 23#define UNUSED rxvt_attribute ((unused))
27#define CONST __attribute__ ((const)) 24#define CONST rxvt_attribute ((const))
28 25
29// increases code size unless -fno-enforce-eh-specs 26// increases code size unless -fno-enforce-eh-specs
30#if __GNUC__ 27#if __GNUC__
31# define NOTHROW 28# define NOTHROW
32# define THROW(x) 29# define THROW(x)
… …
65T lerp (T a, U b, P p) 62T lerp (T a, U b, P p)
66{ 63{
67 return (long(a) * long(100 - p) + long(b) * long(p) + 50) / 100; 64 return (long(a) * long(100 - p) + long(b) * long(p) + 50) / 100;
68} 65}
69 66
67template <typename I, typename T>
68I find (I first, I last, const T& value)
69{
70 while (first != last && *first != value)
71 ++first;
72
73 return first;
74}
75
76// return a very temporary (and never deallocated) buffer. keep small.
77void *rxvt_temp_buf (int len);
78
79template<typename T>
80static inline T *
81rxvt_temp_buf (int len)
82{
83 return (T *)rxvt_temp_buf (len * sizeof (T));
84}
85
70// some bit functions, xft fuck me plenty 86// some bit functions, xft fuck me plenty
71#if HAVE_GCC_BUILTINS 87#if HAVE_GCC_BUILTINS
72static inline int ctz (unsigned int x) CONST { return __builtin_ctz (x); } 88static inline int ctz (unsigned int x) { return __builtin_ctz (x); }
73static inline int popcount (unsigned int x) CONST { return __builtin_popcount (x); } 89static inline int popcount (unsigned int x) { return __builtin_popcount (x); }
74#else 90#else
75// count trailing zero bits and count # of one bits 91// count trailing zero bits and count # of one bits
76int ctz (unsigned int x) CONST; 92int ctz (unsigned int x) CONST;
77int popcount (unsigned int x) CONST; 93int popcount (unsigned int x) CONST;
78#endif 94#endif
… …
348 364
349template<typename T> 365template<typename T>
350struct vector : simplevec<T> 366struct vector : simplevec<T>
351{ }; 367{ };
352 368
369struct stringvec : simplevec<char *>
370{
371 ~stringvec ()
372 {
373 for (char **c = begin (); c != end (); c++)
374 free (*c);
375 }
376};
377
353#if 0 378#if 0
354template<typename T> 379template<typename T>
355struct rxvt_vec : simplevec<void *> { 380struct rxvt_vec : simplevec<void *> {
356 typedef T *iterator; 381 typedef T *iterator;
357 382
… …
362 iterator begin () const { return (iterator)simplevec<void *>::begin (); } 387 iterator begin () const { return (iterator)simplevec<void *>::begin (); }
363 iterator end () const { return (iterator)simplevec<void *>::end (); } 388 iterator end () const { return (iterator)simplevec<void *>::end (); }
364 T &operator [] (int i) { return * (T *) (& ((* (simplevec<void *> *)this)[i])); } 389 T &operator [] (int i) { return * (T *) (& ((* (simplevec<void *> *)this)[i])); }
365 const T &operator [] (int i) const { return * (const T *) (& ((* (const simplevec<void *> *)this)[i])); } 390 const T &operator [] (int i) const { return * (const T *) (& ((* (const simplevec<void *> *)this)[i])); }
366}; 391};
367#endif
368
369template <typename I, typename T>
370I find (I first, I last, const T& value)
371{
372 while (first != last && *first != value)
373 ++first;
374
375 return first;
376}
377 392
378template<typename T> 393template<typename T>
379struct auto_ptr { 394struct auto_ptr {
380 T *p; 395 T *p;
381 396
… …
432 return r; 447 return r;
433 } 448 }
434}; 449};
435 450
436typedef auto_ptr<char> auto_str; 451typedef auto_ptr<char> auto_str;
437
438struct stringvec : simplevec<char *>
439{
440 ~stringvec ()
441 {
442 for (char **c = begin (); c != end (); c++)
443 free (*c);
444 }
445};
446
447// return a very temporary (and never deallocated) buffer. keep small.
448void *rxvt_temp_buf (int len);
449
450template<typename T>
451static inline T *
452rxvt_temp_buf (int len)
453{
454 return (T *)rxvt_temp_buf (len * sizeof (T));
455}
456
457#endif 452#endif
458 453
454#endif
455

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines