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

Comparing rxvt-unicode/src/misc.C (file contents):
Revision 1.28 by root, Fri Aug 5 16:42:44 2005 UTC vs.
Revision 1.36 by root, Fri Jan 20 10:27:08 2006 UTC

… …
36 36
37 char *dst = r; 37 char *dst = r;
38 while (len--) 38 while (len--)
39 { 39 {
40 ssize_t l = wcrtomb (dst, *str++, mbs); 40 ssize_t l = wcrtomb (dst, *str++, mbs);
41
41 if (l < 0) 42 if (l < 0)
42 *dst++ = '?'; 43 *dst++ = '?';
43 else 44 else
44 dst += l; 45 dst += l;
45 } 46 }
… …
162 163
163 return r; 164 return r;
164} 165}
165 166
166char * 167char *
167rxvt_strdup (const char *str)
168{
169 return str ? strdup (str) : 0;
170}
171
172char *
173rxvt_r_basename (const char *str) 168rxvt_r_basename (const char *str) NOTHROW
174{ 169{
175 char *base = strrchr (str, '/'); 170 char *base = strrchr (str, '/');
176 171
177 return (char *) (base ? base + 1 : str); 172 return (char *) (base ? base + 1 : str);
178} 173}
179 174
180/* 175/*
181 * Print an error message 176 * Print an error message
182 */ 177 */
183void 178void
184rxvt_vlog (const char *fmt, va_list arg_ptr) 179rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW
185{ 180{
186 char msg[1024]; 181 char msg[1024];
187 182
188 vsnprintf (msg, sizeof msg, fmt, arg_ptr); 183 vsnprintf (msg, sizeof msg, fmt, arg_ptr);
189 184
… …
192 else 187 else
193 write (STDOUT_FILENO, msg, strlen (msg)); 188 write (STDOUT_FILENO, msg, strlen (msg));
194} 189}
195 190
196void 191void
197rxvt_log (const char *fmt,...) 192rxvt_log (const char *fmt,...) NOTHROW
198{ 193{
199 va_list arg_ptr; 194 va_list arg_ptr;
200 195
201 va_start (arg_ptr, fmt); 196 va_start (arg_ptr, fmt);
202 rxvt_vlog (fmt, arg_ptr); 197 rxvt_vlog (fmt, arg_ptr);
… …
205 200
206/* 201/*
207 * Print an error message 202 * Print an error message
208 */ 203 */
209void 204void
210rxvt_warn (const char *fmt,...) 205rxvt_warn (const char *fmt,...) NOTHROW
211{ 206{
212 va_list arg_ptr; 207 va_list arg_ptr;
213 208
214 rxvt_log ("%s: ", RESNAME); 209 rxvt_log ("%s: ", RESNAME);
215 210
… …
217 rxvt_vlog (fmt, arg_ptr); 212 rxvt_vlog (fmt, arg_ptr);
218 va_end (arg_ptr); 213 va_end (arg_ptr);
219} 214}
220 215
221void 216void
222rxvt_fatal (const char *fmt,...) 217rxvt_fatal (const char *fmt,...) THROW ((class rxvt_failure_exception))
223{ 218{
224 va_list arg_ptr; 219 va_list arg_ptr;
225 220
226 rxvt_log ("%s: ", RESNAME); 221 rxvt_log ("%s: ", RESNAME);
227 222
… …
230 va_end (arg_ptr); 225 va_end (arg_ptr);
231 226
232 rxvt_exit_failure (); 227 rxvt_exit_failure ();
233} 228}
234 229
235class rxvt_failure_exception rxvt_failure_exception;
236
237void 230void
238rxvt_exit_failure () 231rxvt_exit_failure () THROW ((class rxvt_failure_exception))
239{ 232{
233 static class rxvt_failure_exception rxvt_failure_exception;
240 throw (rxvt_failure_exception); 234 throw (rxvt_failure_exception);
241} 235}
242 236
243/* 237/*
244 * check that the first characters of S1 match S2 238 * check that the first characters of S1 match S2
… …
247 * return: 0 241 * return: 0
248 * Match 242 * Match
249 * return: strlen (S2) 243 * return: strlen (S2)
250 */ 244 */
251int 245int
252rxvt_Str_match (const char *s1, const char *s2) 246rxvt_Str_match (const char *s1, const char *s2) NOTHROW
253{ 247{
254 int n = strlen (s2); 248 int n = strlen (s2);
255 249
256 return ((strncmp (s1, s2, n) == 0) ? n : 0); 250 return ((strncmp (s1, s2, n) == 0) ? n : 0);
257} 251}
258 252
259const char * 253const char *
260rxvt_Str_skip_space (const char *str) 254rxvt_Str_skip_space (const char *str) NOTHROW
261{ 255{
262 if (str) 256 if (str)
263 while (*str && isspace (*str)) 257 while (*str && isspace (*str))
264 str++; 258 str++;
265 259
… …
269/* 263/*
270 * remove leading/trailing space and strip-off leading/trailing quotes. 264 * remove leading/trailing space and strip-off leading/trailing quotes.
271 * in place. 265 * in place.
272 */ 266 */
273char * 267char *
274rxvt_Str_trim (char *str) 268rxvt_Str_trim (char *str) NOTHROW
275{ 269{
276 char *r, *s; 270 char *r, *s;
277 271
278 if (!str || !*str) /* shortcut */ 272 if (!str || !*str) /* shortcut */
279 return str; 273 return str;
… …
316 * "\E]" prefixed strings (XTerm escape sequence) append ST if needed 310 * "\E]" prefixed strings (XTerm escape sequence) append ST if needed
317 * 311 *
318 * returns the converted string length 312 * returns the converted string length
319 */ 313 */
320int 314int
321rxvt_Str_escaped (char *str) 315rxvt_Str_escaped (char *str) NOTHROW
322{ 316{
323 char ch, *s, *d; 317 char ch, *s, *d;
324 int i, num, append = 0; 318 int i, num, append = 0;
325 319
326 if (!str || !*str) 320 if (!str || !*str)
… …
392 * Split a comma-separated string into an array, stripping leading and 386 * Split a comma-separated string into an array, stripping leading and
393 * trailing spaces from each entry. Empty strings are properly returned 387 * trailing spaces from each entry. Empty strings are properly returned
394 * Caller should free each entry and array when done 388 * Caller should free each entry and array when done
395 */ 389 */
396char ** 390char **
397rxvt_splitcommastring (const char *cs) 391rxvt_splitcommastring (const char *cs) NOTHROW
398{ 392{
399 int l, n, p; 393 int l, n, p;
400 const char *s, *t; 394 const char *s, *t;
401 char **ret; 395 char **ret;
402 396
… …
423 417
424 return ret; 418 return ret;
425} 419}
426 420
427void 421void
428rxvt_freecommastring (char **cs) 422rxvt_freecommastring (char **cs) NOTHROW
429{ 423{
430 for (int i = 0; cs[i]; ++i) 424 for (int i = 0; cs[i]; ++i)
431 free (cs[i]); 425 free (cs[i]);
432 426
433 free (cs); 427 free (cs);
… …
437 * file searching 431 * file searching
438 */ 432 */
439 433
440/* #define DEBUG_SEARCH_PATH */ 434/* #define DEBUG_SEARCH_PATH */
441 435
442#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 436#ifdef XPM_BACKGROUND
443/* 437/*
444 * search for FILE in the current working directory, and within the 438 * search for FILE in the current working directory, and within the
445 * colon-delimited PATHLIST, adding the file extension EXT if required. 439 * colon-delimited PATHLIST, adding the file extension EXT if required.
446 * 440 *
447 * FILE is either semi-colon or zero terminated 441 * FILE is either semi-colon or zero terminated
448 */ 442 */
449char * 443char *
450rxvt_File_search_path (const char *pathlist, const char *file, const char *ext) 444rxvt_File_search_path (const char *pathlist, const char *file, const char *ext) NOTHROW
451{ 445{
452 int maxpath, len; 446 int maxpath, len;
453 const char *p, *path; 447 const char *p, *path;
454 char name[256]; 448 char name[256];
455 449
… …
517 } 511 }
518 return NULL; 512 return NULL;
519} 513}
520 514
521char * 515char *
522rxvt_File_find (const char *file, const char *ext, const char *path) 516rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW
523{ 517{
524 char *f; 518 char *f;
525 519
526 if (file == NULL || *file == '\0') 520 if (file == NULL || *file == '\0')
527 return NULL; 521 return NULL;
528 522
529 /* search environment variables here too */
530 if ((f = rxvt_File_search_path (path, file, ext)) == NULL) 523 f = rxvt_File_search_path (path, file, ext);
531#ifdef PATH_ENV
532 if ((f = rxvt_File_search_path (getenv (PATH_ENV), file, ext)) == NULL)
533#endif
534 f = rxvt_File_search_path (getenv ("PATH"), file, ext);
535 524
536#ifdef DEBUG_SEARCH_PATH 525#ifdef DEBUG_SEARCH_PATH
537 if (f) 526 if (f)
538 fprintf (stderr, "found: \"%s\"\n", f); 527 fprintf (stderr, "found: \"%s\"\n", f);
539#endif 528#endif
540 529
541 return f; 530 return f;
542} 531}
543#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
544
545/*----------------------------------------------------------------------*
546 * miscellaneous drawing routines
547 */
548
549/*
550 * Draw top/left and bottom/right border shadows around windows
551 */
552#if defined(RXVT_SCROLLBAR) || defined(MENUBAR)
553void
554rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h)
555{
556 int shadow;
557
558 shadow = (w == 0 || h == 0) ? 1 : SHADOW;
559 w += x - 1;
560 h += y - 1;
561 for (; shadow-- > 0; x++, y++, w--, h--)
562 {
563 XDrawLine (display, win, topShadow, x, y, w, y);
564 XDrawLine (display, win, topShadow, x, y, x, h);
565 XDrawLine (display, win, botShadow, w, h, w, y + 1);
566 XDrawLine (display, win, botShadow, w, h, x + 1, h);
567 }
568}
569#endif 532#endif
570 533
571/* button shapes */
572#ifdef MENUBAR
573void
574rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type)
575{
576 switch (type)
577 {
578 case 'r': /* right triangle */
579 XDrawLine (display, win, topShadow, x, y, x, y + w);
580 XDrawLine (display, win, topShadow, x, y, x + w, y + w / 2);
581 XDrawLine (display, win, botShadow, x, y + w, x + w, y + w / 2);
582 break;
583
584 case 'l': /* left triangle */
585 XDrawLine (display, win, botShadow, x + w, y + w, x + w, y);
586 XDrawLine (display, win, botShadow, x + w, y + w, x, y + w / 2);
587 XDrawLine (display, win, topShadow, x, y + w / 2, x + w, y);
588 break;
589
590 case 'd': /* down triangle */
591 XDrawLine (display, win, topShadow, x, y, x + w / 2, y + w);
592 XDrawLine (display, win, topShadow, x, y, x + w, y);
593 XDrawLine (display, win, botShadow, x + w, y, x + w / 2, y + w);
594 break;
595
596 case 'u': /* up triangle */
597 XDrawLine (display, win, botShadow, x + w, y + w, x + w / 2, y);
598 XDrawLine (display, win, botShadow, x + w, y + w, x, y + w);
599 XDrawLine (display, win, topShadow, x, y + w, x + w / 2, y);
600 break;
601#if 0
602 case 's': /* square */
603 XDrawLine (display, win, topShadow, x + w, y, x, y);
604 XDrawLine (display, win, topShadow, x, y, x, y + w);
605 XDrawLine (display, win, botShadow, x, y + w, x + w, y + w);
606 XDrawLine (display, win, botShadow, x + w, y + w, x + w, y);
607 break;
608#endif
609
610 }
611}
612#endif
613
614// should nto be use din interactive programs, for obvious reasons 534// should not be used in interactive programs, for obvious reasons
615void rxvt_usleep (int usecs) 535void rxvt_usleep (int usecs) NOTHROW
616{ 536{
617#if HAVE_NANOSLEEP 537#if HAVE_NANOSLEEP
618 struct timespec ts; 538 struct timespec ts;
619 539
620 ts.tv_sec = 0; 540 ts.tv_sec = 0;

Diff Legend

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