ncurses 5.9 - patch 20121026

[ncurses.git] / ncurses / trace / lib_tracemse.c

diff --git a/ncurses/trace/lib_tracemse.c b/ncurses/trace/lib_tracemse.c
index cf7539e80135047edcb6c6abfac45625e3c6a2ab..e062a26af52371c2352287999c89bf35cb890f3a 100644 (file)
--- a/ncurses/trace/lib_tracemse.c
+++ b/ncurses/trace/lib_tracemse.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *

  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -38,23 +38,20 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_tracemse.c,v 1.16 2008/11/16 00:19:59 juergen Exp $")
+MODULE_ID("$Id: lib_tracemse.c,v 1.20 2012/02/22 22:40:24 tom Exp $")

 
 #ifdef TRACE
 
 #define my_buffer sp->tracemse_buf
 
 
 #ifdef TRACE
 
 #define my_buffer sp->tracemse_buf
 

-NCURSES_EXPORT(char *)
-_nc_tracemouse(SCREEN *sp, MEVENT const *ep)
+static char *
+_trace_mmask_t(SCREEN *sp, mmask_t code)

 {
 {

-    (void) sprintf(my_buffer, TRACEMSE_FMT,
-                  ep->id,
-                  ep->x,
-                  ep->y,
-                  ep->z,
-                  (unsigned long) ep->bstate);
-
-#define SHOW(m, s) if ((ep->bstate & m) == m) strcat(strcat(my_buffer, s), ", ")
+#define SHOW(m, s) \
+    if ((code & m) == m) { \
+       _nc_STRCAT(my_buffer, s, sizeof(my_buffer)); \
+       _nc_STRCAT(my_buffer, ", ", sizeof(my_buffer)); \
+    }

 
     SHOW(BUTTON1_RELEASED, "release-1");
     SHOW(BUTTON1_PRESSED, "press-1");
 
     SHOW(BUTTON1_RELEASED, "release-1");
     SHOW(BUTTON1_PRESSED, "press-1");


@@ -110,10 +107,34 @@ _nc_tracemouse(SCREEN *sp, MEVENT const *ep)
 
     if (my_buffer[strlen(my_buffer) - 1] == ' ')
        my_buffer[strlen(my_buffer) - 2] = '\0';
 
     if (my_buffer[strlen(my_buffer) - 1] == ' ')
        my_buffer[strlen(my_buffer) - 2] = '\0';

-    (void) strcat(my_buffer, "}");
+

     return (my_buffer);
 }
 
     return (my_buffer);
 }
 

+NCURSES_EXPORT(char *)
+_nc_tracemouse(SCREEN *sp, MEVENT const *ep)
+{
+    _nc_SPRINTF(my_buffer, _nc_SLIMIT(sizeof(my_buffer))
+               TRACEMSE_FMT,
+               ep->id,
+               ep->x,
+               ep->y,
+               ep->z,
+               (unsigned long) ep->bstate);
+
+    (void) _trace_mmask_t(sp, ep->bstate);
+    _nc_STRCAT(my_buffer, "}", sizeof(my_buffer));
+    return (my_buffer);
+}
+
+NCURSES_EXPORT(mmask_t)
+_nc_retrace_mmask_t(SCREEN *sp, mmask_t code)
+{
+    *my_buffer = '\0';
+    T((T_RETURN("{%s}"), _trace_mmask_t(sp, code)));
+    return code;
+}
+

 NCURSES_EXPORT(char *)
 _tracemouse(MEVENT const *ep)
 {
 NCURSES_EXPORT(char *)
 _tracemouse(MEVENT const *ep)
 {