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.37 by root, Mon Jul 21 16:51:31 2008 UTC vs.
Revision 1.41 by sf-exg, Sat Dec 18 18:17:39 2010 UTC

… …
3 3
4#include <cstdlib> 4#include <cstdlib>
5#include <cstring> 5#include <cstring>
6 6
7using namespace std; 7using namespace std;
8
9#define ARRAY_LENGTH(v) (sizeof (v) / sizeof ((v)[0]))
8 10
9#define PP_CONCAT_(a, b) a ## b 11#define PP_CONCAT_(a, b) a ## b
10#define PP_CONCAT(a, b) PP_CONCAT_(a, b) 12#define PP_CONCAT(a, b) PP_CONCAT_(a, b)
11#define PP_STRINGIFY_(a) #a 13#define PP_STRINGIFY_(a) #a
12#define PP_STRINGIFY(a) PP_STRINGIFY_(a) 14#define PP_STRINGIFY(a) PP_STRINGIFY_(a)
… …
20# define rxvt_attribute(x) 22# define rxvt_attribute(x)
21# define expect(expr,value) (expr) 23# define expect(expr,value) (expr)
22#endif 24#endif
23 25
24// put into ifs if you are very sure that the expression 26// put into ifs if you are very sure that the expression
25// is mostly true or mosty false. note that these return 27// is mostly true or mostly false. note that these return
26// booleans, not the expression. 28// booleans, not the expression.
27#define expect_false(expr) expect ((expr) != 0, 0) 29#define expect_false(expr) expect ((expr) != 0, 0)
28#define expect_true(expr) expect ((expr) != 0, 1) 30#define expect_true(expr) expect ((expr) != 0, 1)
29 31
30#define NORETURN rxvt_attribute ((noreturn)) 32#define NORETURN rxvt_attribute ((noreturn))
… …
91 return (T *)rxvt_temp_buf (len * sizeof (T)); 93 return (T *)rxvt_temp_buf (len * sizeof (T));
92} 94}
93 95
94// some bit functions, xft fuck me plenty 96// some bit functions, xft fuck me plenty
95#if HAVE_GCC_BUILTINS 97#if HAVE_GCC_BUILTINS
98/* netbsd stupidly defines popcount itself and puts it into string.h */
96static inline int ctz (unsigned int x) { return __builtin_ctz (x); } 99static inline int rxvt_ctz (unsigned int x) { return __builtin_ctz (x); }
97static inline int popcount (unsigned int x) { return __builtin_popcount (x); } 100static inline int rxvt_popcount (unsigned int x) { return __builtin_popcount (x); }
98#else 101#else
99// count trailing zero bits and count # of one bits 102// count trailing zero bits and count # of one bits
100int ctz (unsigned int x) CONST; 103int rxvt_ctz (unsigned int x) CONST;
101int popcount (unsigned int x) CONST; 104int rxvt_popcount (unsigned int x) CONST;
102#endif 105#endif
103 106
104// in range including end 107// in range including end
105#define IN_RANGE_INC(val,beg,end) \ 108#define IN_RANGE_INC(val,beg,end) \
106 ((unsigned int)(val) - (unsigned int)(beg) <= (unsigned int)(end) - (unsigned int)(beg)) 109 ((unsigned int)(val) - (unsigned int)(beg) <= (unsigned int)(end) - (unsigned int)(beg))
… …
111 114
112// for m >= -n, ensure remainder lies between 0..n-1 115// for m >= -n, ensure remainder lies between 0..n-1
113#define MOD(m,n) (((m) + (n)) % (n)) 116#define MOD(m,n) (((m) + (n)) % (n))
114 117
115// makes dynamically allocated objects zero-initialised 118// makes dynamically allocated objects zero-initialised
116struct zero_initialized { 119struct zero_initialized
120{
117 void *operator new (size_t s); 121 void *operator new (size_t s);
118 void operator delete (void *p, size_t s); 122 void operator delete (void *p, size_t s);
119}; 123};
120 124
121/* simplevec taken (and heavily modified), from: 125/* simplevec taken (and heavily modified), from:
122 * 126 *
123 * MICO --- a free CORBA implementation 127 * MICO --- a free CORBA implementation
124 * Copyright (C) 1997-98 Kay Roemer & Arno Puder 128 * Copyright (C) 1997-98 Kay Roemer & Arno Puder
125 */ 129 */
126template<class T> 130template<class T>
127struct simplevec { 131struct simplevec
132{
128 typedef T* iterator; 133 typedef T* iterator;
129 typedef const T* const_iterator; 134 typedef const T* const_iterator;
130 typedef unsigned long size_type; 135 typedef unsigned long size_type;
131 136
132private: 137private:
… …
387 } 392 }
388}; 393};
389 394
390#if 0 395#if 0
391template<typename T> 396template<typename T>
392struct rxvt_vec : simplevec<void *> { 397struct rxvt_vec : simplevec<void *>
398{
393 typedef T *iterator; 399 typedef T *iterator;
394 400
395 void push_back (T d) { simplevec<void *>::push_back ((void *)d); } 401 void push_back (T d) { simplevec<void *>::push_back ((void *)d); }
396 T pop_back () { return (T*)simplevec<void *>::pop_back (); } 402 T pop_back () { return (T*)simplevec<void *>::pop_back (); }
397 void erase (int i) { erase (begin () + i); } 403 void erase (int i) { erase (begin () + i); }
… …
402 const T &operator [] (int i) const { return * (const T *) (& ((* (const simplevec<void *> *)this)[i])); } 408 const T &operator [] (int i) const { return * (const T *) (& ((* (const simplevec<void *> *)this)[i])); }
403}; 409};
404#endif 410#endif
405 411
406template<typename T> 412template<typename T>
407struct auto_ptr { 413struct auto_ptr
414{
408 T *p; 415 T *p;
409 416
410 auto_ptr () : p (0) { } 417 auto_ptr () : p (0) { }
411 auto_ptr (T *a) : p (a) { } 418 auto_ptr (T *a) : p (a) { }
412 419

Diff Legend

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