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.26 by root, Wed Feb 16 20:32:05 2005 UTC vs.
Revision 1.37 by root, Sat Jan 21 23:50:33 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
172/* INTPROTO */
173char *
174rxvt_r_basename (const char *str) 168rxvt_r_basename (const char *str) NOTHROW
175{ 169{
176 char *base = strrchr (str, '/'); 170 char *base = strrchr (str, '/');
177 171
178 return (char *) (base ? base + 1 : str); 172 return (char *) (base ? base + 1 : str);
179} 173}
180 174
181/* 175/*
182 * Print an error message 176 * Print an error message
183 */ 177 */
184/* INTPROTO */
185void 178void
186rxvt_vlog (const char *fmt, va_list arg_ptr) 179rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW
187{ 180{
188 char msg[1024]; 181 char msg[1024];
189 182
190 vsnprintf (msg, sizeof msg, fmt, arg_ptr); 183 vsnprintf (msg, sizeof msg, fmt, arg_ptr);
191 184
… …
193 (*GET_R->log_hook) (msg); 186 (*GET_R->log_hook) (msg);
194 else 187 else
195 write (STDOUT_FILENO, msg, strlen (msg)); 188 write (STDOUT_FILENO, msg, strlen (msg));
196} 189}
197 190
198/* INTPROTO */
199void 191void
200rxvt_log (const char *fmt,...) 192rxvt_log (const char *fmt,...) NOTHROW
201{ 193{
202 va_list arg_ptr; 194 va_list arg_ptr;
203 195
204 va_start (arg_ptr, fmt); 196 va_start (arg_ptr, fmt);
205 rxvt_vlog (fmt, arg_ptr); 197 rxvt_vlog (fmt, arg_ptr);
… …
207} 199}
208 200
209/* 201/*
210 * Print an error message 202 * Print an error message
211 */ 203 */
212/* INTPROTO */
213void 204void
214rxvt_warn (const char *fmt,...) 205rxvt_warn (const char *fmt,...) NOTHROW
215{ 206{
216 va_list arg_ptr; 207 va_list arg_ptr;
217 208
218 rxvt_log ("%s: ", RESNAME); 209 rxvt_log ("%s: ", RESNAME);
219 210
220 va_start (arg_ptr, fmt); 211 va_start (arg_ptr, fmt);
221 rxvt_vlog (fmt, arg_ptr); 212 rxvt_vlog (fmt, arg_ptr);
222 va_end (arg_ptr); 213 va_end (arg_ptr);
223} 214}
224 215
225/* INTPROTO */
226void 216void
227rxvt_fatal (const char *fmt,...) 217rxvt_fatal (const char *fmt,...) THROW ((class rxvt_failure_exception))
228{ 218{
229 va_list arg_ptr; 219 va_list arg_ptr;
230 220
231 rxvt_log ("%s: ", RESNAME); 221 rxvt_log ("%s: ", RESNAME);
232 222
… …
235 va_end (arg_ptr); 225 va_end (arg_ptr);
236 226
237 rxvt_exit_failure (); 227 rxvt_exit_failure ();
238} 228}
239 229
240class rxvt_failure_exception rxvt_failure_exception;
241
242/* INTPROTO */
243void 230void
244rxvt_exit_failure () 231rxvt_exit_failure () THROW ((class rxvt_failure_exception))
245{ 232{
233 static class rxvt_failure_exception rxvt_failure_exception;
246 throw (rxvt_failure_exception); 234 throw (rxvt_failure_exception);
247} 235}
248 236
249/* 237/*
250 * check that the first characters of S1 match S2 238 * check that the first characters of S1 match S2
… …
252 * No Match 240 * No Match
253 * return: 0 241 * return: 0
254 * Match 242 * Match
255 * return: strlen (S2) 243 * return: strlen (S2)
256 */ 244 */
257/* INTPROTO */
258int 245int
259rxvt_Str_match (const char *s1, const char *s2) 246rxvt_Str_match (const char *s1, const char *s2) NOTHROW
260{ 247{
261 int n = strlen (s2); 248 int n = strlen (s2);
262 249
263 return ((strncmp (s1, s2, n) == 0) ? n : 0); 250 return ((strncmp (s1, s2, n) == 0) ? n : 0);
264} 251}
265 252
266/* INTPROTO */
267const char * 253const char *
268rxvt_Str_skip_space (const char *str) 254rxvt_Str_skip_space (const char *str) NOTHROW
269{ 255{
270 if (str) 256 if (str)
271 while (*str && isspace (*str)) 257 while (*str && isspace (*str))
272 str++; 258 str++;
273 259
… …
276 262
277/* 263/*
278 * remove leading/trailing space and strip-off leading/trailing quotes. 264 * remove leading/trailing space and strip-off leading/trailing quotes.
279 * in place. 265 * in place.
280 */ 266 */
281/* INTPROTO */
282char * 267char *
283rxvt_Str_trim (char *str) 268rxvt_Str_trim (char *str) NOTHROW
284{ 269{
285 char *r, *s; 270 char *r, *s;
286 271
287 if (!str || !*str) /* shortcut */ 272 if (!str || !*str) /* shortcut */
288 return str; 273 return str;
… …
324 * "M-x" prefixed strings, append "\r" if needed 309 * "M-x" prefixed strings, append "\r" if needed
325 * "\E]" prefixed strings (XTerm escape sequence) append ST if needed 310 * "\E]" prefixed strings (XTerm escape sequence) append ST if needed
326 * 311 *
327 * returns the converted string length 312 * returns the converted string length
328 */ 313 */
329/* INTPROTO */
330int 314int
331rxvt_Str_escaped (char *str) 315rxvt_Str_escaped (char *str) NOTHROW
332{ 316{
333 char ch, *s, *d; 317 char ch, *s, *d;
334 int i, num, append = 0; 318 int i, num, append = 0;
335 319
336 if (!str || !*str) 320 if (!str || !*str)
… …
401/* 385/*
402 * Split a comma-separated string into an array, stripping leading and 386 * Split a comma-separated string into an array, stripping leading and
403 * trailing spaces from each entry. Empty strings are properly returned 387 * trailing spaces from each entry. Empty strings are properly returned
404 * Caller should free each entry and array when done 388 * Caller should free each entry and array when done
405 */ 389 */
406/* INTPROTO */
407char ** 390char **
408rxvt_splitcommastring (const char *cs) 391rxvt_splitcommastring (const char *cs) NOTHROW
409{ 392{
410 int l, n, p; 393 int l, n, p;
411 const char *s, *t; 394 const char *s, *t;
412 char **ret; 395 char **ret;
413 396
… …
434 417
435 return ret; 418 return ret;
436} 419}
437 420
438void 421void
439rxvt_freecommastring (char **cs) 422rxvt_freecommastring (char **cs) NOTHROW
440{ 423{
441 for (int i = 0; cs[i]; ++i) 424 for (int i = 0; cs[i]; ++i)
442 free (cs[i]); 425 free (cs[i]);
443 426
444 free (cs); 427 free (cs);
… …
448 * file searching 431 * file searching
449 */ 432 */
450 433
451/* #define DEBUG_SEARCH_PATH */ 434/* #define DEBUG_SEARCH_PATH */
452 435
453#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 436#ifdef XPM_BACKGROUND
454/* 437/*
455 * search for FILE in the current working directory, and within the 438 * search for FILE in the current working directory, and within the
456 * colon-delimited PATHLIST, adding the file extension EXT if required. 439 * colon-delimited PATHLIST, adding the file extension EXT if required.
457 * 440 *
458 * FILE is either semi-colon or zero terminated 441 * FILE is either semi-colon or zero terminated
459 */ 442 */
460/* INTPROTO */
461char * 443char *
462rxvt_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
463{ 445{
464 int maxpath, len; 446 int maxpath, len;
465 const char *p, *path; 447 const char *p, *path;
466 char name[256]; 448 char name[256];
467 449
… …
528 } 510 }
529 } 511 }
530 return NULL; 512 return NULL;
531} 513}
532 514
533/* INTPROTO */
534char * 515char *
535rxvt_File_find (const char *file, const char *ext, const char *path) 516rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW
536{ 517{
537 char *f; 518 char *f;
538 519
539 if (file == NULL || *file == '\0') 520 if (file == NULL || *file == '\0')
540 return NULL; 521 return NULL;
541 522
542 /* search environment variables here too */
543 if ((f = rxvt_File_search_path (path, file, ext)) == NULL) 523 f = rxvt_File_search_path (path, file, ext);
544#ifdef PATH_ENV
545 if ((f = rxvt_File_search_path (getenv (PATH_ENV), file, ext)) == NULL)
546#endif
547 f = rxvt_File_search_path (getenv ("PATH"), file, ext);
548 524
549#ifdef DEBUG_SEARCH_PATH 525#ifdef DEBUG_SEARCH_PATH
550 if (f) 526 if (f)
551 fprintf (stderr, "found: \"%s\"\n", f); 527 fprintf (stderr, "found: \"%s\"\n", f);
552#endif 528#endif
553 529
554 return f; 530 return f;
555} 531}
556#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
557
558/*----------------------------------------------------------------------*
559 * miscellaneous drawing routines
560 */
561
562/*
563 * Draw top/left and bottom/right border shadows around windows
564 */
565#if defined(RXVT_SCROLLBAR) || defined(MENUBAR)
566/* INTPROTO */
567void
568rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h)
569{
570 int shadow;
571
572 shadow = (w == 0 || h == 0) ? 1 : SHADOW;
573 w += x - 1;
574 h += y - 1;
575 for (; shadow-- > 0; x++, y++, w--, h--)
576 {
577 XDrawLine (display, win, topShadow, x, y, w, y);
578 XDrawLine (display, win, topShadow, x, y, x, h);
579 XDrawLine (display, win, botShadow, w, h, w, y + 1);
580 XDrawLine (display, win, botShadow, w, h, x + 1, h);
581 }
582}
583#endif 532#endif
584 533
585/* button shapes */
586#ifdef MENUBAR
587/* INTPROTO */
588void
589rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type)
590{
591 switch (type)
592 {
593 case 'r': /* right triangle */
594 XDrawLine (display, win, topShadow, x, y, x, y + w);
595 XDrawLine (display, win, topShadow, x, y, x + w, y + w / 2);
596 XDrawLine (display, win, botShadow, x, y + w, x + w, y + w / 2);
597 break;
598 534
599 case 'l': /* left triangle */
600 XDrawLine (display, win, botShadow, x + w, y + w, x + w, y);
601 XDrawLine (display, win, botShadow, x + w, y + w, x, y + w / 2);
602 XDrawLine (display, win, topShadow, x, y + w / 2, x + w, y);
603 break;
604
605 case 'd': /* down triangle */
606 XDrawLine (display, win, topShadow, x, y, x + w / 2, y + w);
607 XDrawLine (display, win, topShadow, x, y, x + w, y);
608 XDrawLine (display, win, botShadow, x + w, y, x + w / 2, y + w);
609 break;
610
611 case 'u': /* up triangle */
612 XDrawLine (display, win, botShadow, x + w, y + w, x + w / 2, y);
613 XDrawLine (display, win, botShadow, x + w, y + w, x, y + w);
614 XDrawLine (display, win, topShadow, x, y + w, x + w / 2, y);
615 break;
616#if 0
617 case 's': /* square */
618 XDrawLine (display, win, topShadow, x + w, y, x, y);
619 XDrawLine (display, win, topShadow, x, y, x, y + w);
620 XDrawLine (display, win, botShadow, x, y + w, x + w, y + w);
621 XDrawLine (display, win, botShadow, x + w, y + w, x + w, y);
622 break;
623#endif
624
625 }
626}
627#endif
628/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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