diff options
Diffstat (limited to 'lib/libX11/src/xlibi18n')
| -rw-r--r-- | lib/libX11/src/xlibi18n/XimintP.h | 20 | ||||
| -rw-r--r-- | lib/libX11/src/xlibi18n/lcFile.c | 12 |
2 files changed, 26 insertions, 6 deletions
diff --git a/lib/libX11/src/xlibi18n/XimintP.h b/lib/libX11/src/xlibi18n/XimintP.h index 674da0295..1afa3c75f 100644 --- a/lib/libX11/src/xlibi18n/XimintP.h +++ b/lib/libX11/src/xlibi18n/XimintP.h @@ -149,6 +149,10 @@ typedef struct _XimProtoPrivateRec { XimTransRegDispatcher register_dispatcher; XimTransCallDispatcher call_dispatcher; XPointer spec; + + unsigned long fabricated_serial; + Time fabricated_time; + Bool enable_fabricated_order; } XimProtoPrivateRec; /* @@ -307,4 +311,20 @@ typedef struct _XicProtoPrivateRec { #define XIM_MAXIMNAMELEN 64 #define XIM_MAXLCNAMELEN 64 +Bool +_XimFabricateSerial( + Xim im, + XKeyEvent *event); + +Bool +_XimUnfabricateSerial( + Xim im, + Xic ic, + XKeyEvent *event); + +Bool +_XimIsFabricatedSerial( + Xim im, + XKeyEvent *event); + #endif /* _XIMINTP_H */ diff --git a/lib/libX11/src/xlibi18n/lcFile.c b/lib/libX11/src/xlibi18n/lcFile.c index b6cf93f26..060cd83f3 100644 --- a/lib/libX11/src/xlibi18n/lcFile.c +++ b/lib/libX11/src/xlibi18n/lcFile.c @@ -626,9 +626,9 @@ _XlcLocaleDirName(char *dir_name, size_t dir_len, const char *lc_name) Xfree (last_dir_name); Xfree (last_lc_name); - last_dir_len = strlen (dir_name) + 1; - last_dir_name = Xmalloc (last_dir_len); - strcpy (last_dir_name, dir_name); + last_dir_name = strdup (dir_name); + last_dir_len = (last_dir_name != NULL) ? strlen (last_dir_name) + 1 : 0; + last_lc_name = strdup (lc_name); return dir_name; @@ -703,9 +703,9 @@ _XlcLocaleLibDirName(char *dir_name, size_t dir_len, const char *lc_name) Xfree (last_dir_name); Xfree (last_lc_name); - last_dir_len = strlen (dir_name) + 1; - last_dir_name = Xmalloc (last_dir_len); - strcpy (last_dir_name, dir_name); + last_dir_name = strdup (dir_name); + last_dir_len = (last_dir_name != NULL) ? strlen (last_dir_name) + 1 : 0; + last_lc_name = strdup (lc_name); return dir_name; |