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.38 by root, Wed Nov 5 14:43:54 2008 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# define expect(expr,value) __builtin_expect ((expr),(value))
21# endif 19#else
22# endif
23# define __attribute__(x) 20# define rxvt_attribute(x)
21# define expect(expr,value) (expr)
24#endif 22#endif
25 23
24// put into ifs if you are very sure that the expression
25// is mostly true or mosty false. note that these return
26// booleans, not the expression.
27#define expect_false(expr) expect ((expr) != 0, 0)
28#define expect_true(expr) expect ((expr) != 0, 1)
29
26#define NORETURN __attribute__ ((noreturn)) 30#define NORETURN rxvt_attribute ((noreturn))
27#define UNUSED __attribute__ ((unused)) 31#define UNUSED rxvt_attribute ((unused))
28#define CONST __attribute__ ((const)) 32#define CONST rxvt_attribute ((const))
29 33
30// increases code size unless -fno-enforce-eh-specs 34// increases code size unless -fno-enforce-eh-specs
31#if __GNUC__ 35#if __GNUC__
32# define NOTHROW 36# define NOTHROW
33# define THROW(x) 37# define THROW(x)
… …
66T lerp (T a, U b, P p) 70T lerp (T a, U b, P p)
67{ 71{
68 return (long(a) * long(100 - p) + long(b) * long(p) + 50) / 100; 72 return (long(a) * long(100 - p) + long(b) * long(p) + 50) / 100;
69} 73}
70 74
75template <typename I, typename T>
76I find (I first, I last, const T& value)
77{
78 while (first != last && *first != value)
79 ++first;
80
81 return first;
82}
83
84// return a very temporary (and never deallocated) buffer. keep small.
85void *rxvt_temp_buf (int len);
86
87template<typename T>
88static inline T *
89rxvt_temp_buf (int len)
90{
91 return (T *)rxvt_temp_buf (len * sizeof (T));
92}
93
71// some bit functions, xft fuck me plenty 94// some bit functions, xft fuck me plenty
72#if HAVE_GCC_BUILTINS 95#if HAVE_GCC_BUILTINS
73static inline int ctz (unsigned int x) CONST { return __builtin_ctz (x); } 96static inline int ctz (unsigned int x) { return __builtin_ctz (x); }
74static inline int popcount (unsigned int x) CONST { return __builtin_popcount (x); } 97static inline int popcount (unsigned int x) { return __builtin_popcount (x); }
75#else 98#else
76// count trailing zero bits and count # of one bits 99// count trailing zero bits and count # of one bits
77int ctz (unsigned int x) CONST; 100int ctz (unsigned int x) CONST;
78int popcount (unsigned int x) CONST; 101int popcount (unsigned int x) CONST;
79#endif 102#endif
… …
84 107
85// in range excluding end 108// in range excluding end
86#define IN_RANGE_EXC(val,beg,end) \ 109#define IN_RANGE_EXC(val,beg,end) \
87 ((unsigned int)(val) - (unsigned int)(beg) < (unsigned int)(end) - (unsigned int)(beg)) 110 ((unsigned int)(val) - (unsigned int)(beg) < (unsigned int)(end) - (unsigned int)(beg))
88 111
112// for m >= -n, ensure remainder lies between 0..n-1
113#define MOD(m,n) (((m) + (n)) % (n))
114
89// makes dynamically allocated objects zero-initialised 115// makes dynamically allocated objects zero-initialised
90struct zero_initialized { 116struct zero_initialized
117{
91 void *operator new (size_t s); 118 void *operator new (size_t s);
92 void operator delete (void *p, size_t s); 119 void operator delete (void *p, size_t s);
93}; 120};
94 121
95/* simplevec taken (and heavily modified), from: 122/* simplevec taken (and heavily modified), from:
96 * 123 *
97 * MICO --- a free CORBA implementation 124 * MICO --- a free CORBA implementation
98 * Copyright (C) 1997-98 Kay Roemer & Arno Puder 125 * Copyright (C) 1997-98 Kay Roemer & Arno Puder
99 */ 126 */
100template<class T> 127template<class T>
101struct simplevec { 128struct simplevec
129{
102 typedef T* iterator; 130 typedef T* iterator;
103 typedef const T* const_iterator; 131 typedef const T* const_iterator;
104 typedef unsigned long size_type; 132 typedef unsigned long size_type;
105 133
106private: 134private:
… …
347} 375}
348 376
349 377
350template<typename T> 378template<typename T>
351struct vector : simplevec<T> 379struct vector : simplevec<T>
352{ }; 380{
381};
382
383struct stringvec : simplevec<char *>
384{
385 ~stringvec ()
386 {
387 for (char **c = begin (); c != end (); c++)
388 free (*c);
389 }
390};
353 391
354#if 0 392#if 0
355template<typename T> 393template<typename T>
356struct rxvt_vec : simplevec<void *> { 394struct rxvt_vec : simplevec<void *>
395{
357 typedef T *iterator; 396 typedef T *iterator;
358 397
359 void push_back (T d) { simplevec<void *>::push_back ((void *)d); } 398 void push_back (T d) { simplevec<void *>::push_back ((void *)d); }
360 T pop_back () { return (T*)simplevec<void *>::pop_back (); } 399 T pop_back () { return (T*)simplevec<void *>::pop_back (); }
361 void erase (int i) { erase (begin () + i); } 400 void erase (int i) { erase (begin () + i); }
… …
365 T &operator [] (int i) { return * (T *) (& ((* (simplevec<void *> *)this)[i])); } 404 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])); } 405 const T &operator [] (int i) const { return * (const T *) (& ((* (const simplevec<void *> *)this)[i])); }
367}; 406};
368#endif 407#endif
369 408
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> 409template<typename T>
380struct auto_ptr { 410struct auto_ptr
411{
381 T *p; 412 T *p;
382 413
383 auto_ptr () : p (0) { } 414 auto_ptr () : p (0) { }
384 auto_ptr (T *a) : p (a) { } 415 auto_ptr (T *a) : p (a) { }
385 416
… …
434 } 465 }
435}; 466};
436 467
437typedef auto_ptr<char> auto_str; 468typedef auto_ptr<char> auto_str;
438 469
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 470#endif
459 471

Diff Legend

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