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.27 by root, Fri Jun 23 14:31:38 2006 UTC vs.
Revision 1.34 by root, Sun Dec 2 22:37:14 2007 UTC

… …
9#define PP_CONCAT_(a, b) a ## b 9#define PP_CONCAT_(a, b) a ## b
10#define PP_CONCAT(a, b) PP_CONCAT_(a, b) 10#define PP_CONCAT(a, b) PP_CONCAT_(a, b)
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// actually, some gcc-3.x versions work, too 14#define HAVE_GCC_BUILTINS (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ == 4))
15#define HAVE_GCC_BUILTINS (__GNUC__ >= 4)
16 15
17#ifndef __attribute__
18# if __GNUC__ 16#if __GNUC__ >= 4
19# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2) 17# define rxvt_attribute(x) __attribute__(x)
20# define __attribute__(x) 18#else
21# endif
22# endif
23# define __attribute__(x) 19# define rxvt_attribute(x)
24#endif 20#endif
25 21
26#define NORETURN __attribute__ ((noreturn)) 22#define NORETURN rxvt_attribute ((noreturn))
27#define UNUSED __attribute__ ((unused)) 23#define UNUSED rxvt_attribute ((unused))
28#define CONST __attribute__ ((const)) 24#define CONST rxvt_attribute ((const))
29 25
30// increases code size unless -fno-enforce-eh-specs 26// increases code size unless -fno-enforce-eh-specs
31#if __GNUC__ 27#if __GNUC__
32# define NOTHROW 28# define NOTHROW
33# define THROW(x) 29# define THROW(x)
… …
66T lerp (T a, U b, P p) 62T lerp (T a, U b, P p)
67{ 63{
68 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;
69} 65}
70 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
71// some bit functions, xft fuck me plenty 86// some bit functions, xft fuck me plenty
72#if HAVE_GCC_BUILTINS 87#if HAVE_GCC_BUILTINS
73static inline int ctz (unsigned int x) CONST { return __builtin_ctz (x); } 88static inline int ctz (unsigned int x) { return __builtin_ctz (x); }
74static inline int popcount (unsigned int x) CONST { return __builtin_popcount (x); } 89static inline int popcount (unsigned int x) { return __builtin_popcount (x); }
75#else 90#else
76// count trailing zero bits and count # of one bits 91// count trailing zero bits and count # of one bits
77int ctz (unsigned int x) CONST; 92int ctz (unsigned int x) CONST;
78int popcount (unsigned int x) CONST; 93int popcount (unsigned int x) CONST;
79#endif 94#endif
… …
91 void *operator new (size_t s); 106 void *operator new (size_t s);
92 void operator delete (void *p, size_t s); 107 void operator delete (void *p, size_t s);
93}; 108};
94 109
95/* simplevec taken (and heavily modified), from: 110/* simplevec taken (and heavily modified), from:
96 * 111 *
97 * MICO --- a free CORBA implementation 112 * MICO --- a free CORBA implementation
98 * Copyright (C) 1997-98 Kay Roemer & Arno Puder 113 * Copyright (C) 1997-98 Kay Roemer & Arno Puder
99 */ 114 */
100template<class T> 115template<class T>
101struct simplevec { 116struct simplevec {
… …
349 364
350template<typename T> 365template<typename T>
351struct vector : simplevec<T> 366struct vector : simplevec<T>
352{ }; 367{ };
353 368
369struct stringvec : simplevec<char *>
370{
371 ~stringvec ()
372 {
373 for (char **c = begin (); c != end (); c++)
374 free (*c);
375 }
376};
377
354#if 0 378#if 0
355template<typename T> 379template<typename T>
356struct rxvt_vec : simplevec<void *> { 380struct rxvt_vec : simplevec<void *> {
357 typedef T *iterator; 381 typedef T *iterator;
358 382
… …
365 T &operator [] (int i) { return * (T *) (& ((* (simplevec<void *> *)this)[i])); } 389 T &operator [] (int i) { return * (T *) (& ((* (simplevec<void *> *)this)[i])); }
366 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])); }
367}; 391};
368#endif 392#endif
369 393
370template <typename I, typename T>
371I find (I first, I last, const T& value)
372{
373 while (first != last && *first != value)
374 ++first;
375
376 return first;
377}
378
379template<typename T> 394template<typename T>
380struct auto_ptr { 395struct auto_ptr {
381 T *p; 396 T *p;
382 397
383 auto_ptr () : p (0) { } 398 auto_ptr () : p (0) { }
… …
434 } 449 }
435}; 450};
436 451
437typedef auto_ptr<char> auto_str; 452typedef auto_ptr<char> auto_str;
438 453
439struct stringvec : simplevec<char *>
440{
441 ~stringvec ()
442 {
443 for (char **c = begin (); c != end (); c++)
444 free (*c);
445 }
446};
447
448// return a very temporary (and never deallocated) buffer. keep small.
449void *rxvt_temp_buf (int len);
450
451template<typename T>
452static inline T *
453rxvt_temp_buf (int len)
454{
455 return (T *)rxvt_temp_buf (len * sizeof (T));
456}
457
458#endif 454#endif
459 455

Diff Legend

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