Skip to content

Commit 83f2da9

Browse files
jtanxjtanx
committed
Fix some typos and standardise define prefixes
1 parent 5aadb27 commit 83f2da9

9 files changed

+86
-88
lines changed

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if ((APPLE OR LIBCLIPBOARD_FORCE_COCOA) AND NOT (LIBCLIPBOARD_FORCE_WIN32 OR LIB
3737
endif()
3838

3939
if (NOT (LIBCLIPBOARD_BUILD_WIN32 OR LIBCLIPBOARD_BUILD_X11 OR LIBCLIPBOARD_BUILD_COCOA))
40-
message(FATAL_ERROR "Invalid build options. Can only specify one backen to be built.")
40+
message(FATAL_ERROR "Invalid build options. Can only specify one backend to be built.")
4141
endif()
4242

4343
# Set compiler flags

‎include/libclipboard.h

+10-10
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,21 @@ extern "C" {
5555
#endif
5656

5757
/** Default action timeout of 1500ms **/
58-
#define LC_X11_ACTION_TIMEOUT_DEFAULT 1500
58+
#define LCB_X11_ACTION_TIMEOUT_DEFAULT 1500
5959
/** Default transfer size (X11 only), default 1MB (must be multiple of 4) **/
60-
#define LC_X11_TRANSFER_SIZE_DEFAULT 1048576
60+
#define LCB_X11_TRANSFER_SIZE_DEFAULT 1048576
6161
/** Default max number of retries to try to obtain clipboard lock **/
62-
#define LC_WIN32_MAX_RETRIES_DEFAULT 5
62+
#define LCB_WIN32_MAX_RETRIES_DEFAULT 5
6363
/** Default delay in ms between retries to obtain clipboard lock **/
64-
#define LC_WIN32_RETRY_DELAY_DEFAULT 5
64+
#define LCB_WIN32_RETRY_DELAY_DEFAULT 5
6565

6666
/**
6767
* \brief For internal use only. Initialises custom allocators.
6868
*
6969
* \param [out] cb Clipboard context
7070
* \param [in] opts Clipboard options
7171
*/
72-
#define LC_SET_ALLOCATORS(cb, opts) do { \
72+
#define LCB_SET_ALLOCATORS(cb, opts) do { \
7373
(cb)->malloc = (opts) && (opts)->user_malloc_fn ? (opts)->user_malloc_fn : malloc; \
7474
(cb)->calloc = (opts) && (opts)->user_calloc_fn ? (opts)->user_calloc_fn : calloc; \
7575
(cb)->realloc = (opts) && (opts)->user_realloc_fn ? (opts)->user_realloc_fn : realloc; \
@@ -90,11 +90,11 @@ typedef void (*clipboard_free_fn)(void *ptr);
9090
*/
9191
typedef enum clipboard_mode {
9292
/** The primary (global) clipboard **/
93-
LC_CLIPBOARD = 0,
93+
LCB_CLIPBOARD = 0,
9494
/** The (global) mouse selection clipboard **/
95-
LC_SELECTION,
95+
LCB_SELECTION,
9696
/** Sentinel value for end of clipboard modes **/
97-
LC_MODE_END
97+
LCB_MODE_END
9898
} clipboard_mode;
9999

100100
/**
@@ -193,7 +193,7 @@ LCB_API char *LCB_CC clipboard_text_ex(clipboard_c *cb, int *length, clipboard_m
193193
* \param [in] cb The clipboard to retrieve from
194194
* \return As per clipboard_text_ex.
195195
*
196-
* \details This function assumes LC_CLIPBOARD as the clipboard mode.
196+
* \details This function assumes LCB_CLIPBOARD as the clipboard mode.
197197
*/
198198
LCB_API char *LCB_CC clipboard_text(clipboard_c *cb);
199199

@@ -219,7 +219,7 @@ LCB_API bool LCB_CC clipboard_set_text_ex(clipboard_c *cb, const char *src, int
219219
* \param [in] src The UTF-8 encoded NULL terminated string to be set.
220220
* \return true iff the clipboard was set (false on error)
221221
*
222-
* \details This function assumes LC_CLIPBOARD as the clipboard mode.
222+
* \details This function assumes LCB_CLIPBOARD as the clipboard mode.
223223
*/
224224
LCB_API bool LCB_CC clipboard_set_text(clipboard_c *cb, const char *src);
225225

‎samples/clipboard_sample1.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ bool parse_mode(const char *name, const char *arg, app_opts *opts) {
141141
if (arg[2] == '\0') {
142142
return true;
143143
} else if (!strcmp(arg + 2, "=CLIPBOARD")) {
144-
opts->mode = LC_CLIPBOARD;
144+
opts->mode = LCB_CLIPBOARD;
145145
} else if (!strcmp(arg + 2, "=SELECTION")) {
146-
opts->mode = LC_SELECTION;
146+
opts->mode = LCB_SELECTION;
147147
} else {
148148
printf("Error: Unknown mode: %s\n", arg);
149149
help(name, true);

‎src/clipboard_cocoa.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ LCB_API clipboard_c *LCB_CC clipboard_new(clipboard_opts *cb_opts) {
3939
if (cb == NULL) {
4040
return NULL;
4141
}
42-
LC_SET_ALLOCATORS(cb, cb_opts);
42+
LCB_SET_ALLOCATORS(cb, cb_opts);
4343
cb->pb = [NSPasteboard generalPasteboard];
4444
return cb;
4545
}

‎src/clipboard_common.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
#include <stdlib.h>
88

99
LCB_API char *LCB_CC clipboard_text(clipboard_c *cb) {
10-
return clipboard_text_ex(cb, NULL, LC_CLIPBOARD);
10+
return clipboard_text_ex(cb, NULL, LCB_CLIPBOARD);
1111
}
1212

1313
LCB_API bool LCB_CC clipboard_set_text(clipboard_c *cb, const char *src) {
14-
return clipboard_set_text_ex(cb, src, -1, LC_CLIPBOARD);
14+
return clipboard_set_text_ex(cb, src, -1, LCB_CLIPBOARD);
1515
}

‎src/clipboard_win32.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ LCB_API clipboard_c *LCB_CC clipboard_new(clipboard_opts *cb_opts) {
8585
if (ret == NULL) {
8686
return NULL;
8787
}
88-
LC_SET_ALLOCATORS(ret, cb_opts);
88+
LCB_SET_ALLOCATORS(ret, cb_opts);
8989

90-
ret->max_retries = LC_WIN32_MAX_RETRIES_DEFAULT;
91-
ret->retry_delay = LC_WIN32_RETRY_DELAY_DEFAULT;
90+
ret->max_retries = LCB_WIN32_MAX_RETRIES_DEFAULT;
91+
ret->retry_delay = LCB_WIN32_RETRY_DELAY_DEFAULT;
9292

9393
if (cb_opts) {
9494
if (cb_opts->win32.max_retries > 0) {

‎src/clipboard_x11.c

+17-17
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ struct clipboard_c {
101101
bool cond_initted;
102102

103103
/** Selection data **/
104-
selection_c selections[LC_MODE_END];
104+
selection_c selections[LCB_MODE_END];
105105

106106
/** malloc **/
107107
clipboard_malloc_fn malloc;
@@ -184,7 +184,7 @@ static void x11_clear_selection(clipboard_c *cb, xcb_selection_clear_event_t *e)
184184
return;
185185
}
186186

187-
for (int i = 0; i < LC_MODE_END; i++) {
187+
for (int i = 0; i < LCB_MODE_END; i++) {
188188
if (cb->selections[i].xmode == e->selection && (pthread_mutex_lock(&cb->mu) == 0)) {
189189
xcb_atom_t xmode = cb->selections[i].xmode;
190190
cb->free(cb->selections[i].data);
@@ -263,7 +263,7 @@ static void x11_retrieve_selection(clipboard_c *cb, xcb_selection_notify_event_t
263263

264264
if (buf != NULL && (pthread_mutex_lock(&cb->mu) == 0)) {
265265
selection_c *sel = NULL;
266-
for (int i = 0; i < LC_MODE_END; i++) {
266+
for (int i = 0; i < LCB_MODE_END; i++) {
267267
if (cb->selections[i].xmode == e->property) {
268268
sel = &cb->selections[i];
269269
break;
@@ -322,7 +322,7 @@ static bool x11_transmit_selection(clipboard_c *cb, xcb_selection_request_event_
322322
return false;
323323
}
324324

325-
for (int i = 0; i < LC_MODE_END; i++) {
325+
for (int i = 0; i < LCB_MODE_END; i++) {
326326
if (cb->selections[i].xmode == e->selection) {
327327
sel = &cb->selections[i];
328328
break;
@@ -413,8 +413,8 @@ static void *x11_event_loop(void *arg) {
413413
LCB_API clipboard_c *LCB_CC clipboard_new(clipboard_opts *cb_opts) {
414414
clipboard_opts defaults = {
415415
.x11.display_name = NULL,
416-
.x11.action_timeout = LC_X11_ACTION_TIMEOUT_DEFAULT,
417-
.x11.transfer_size = LC_X11_TRANSFER_SIZE_DEFAULT,
416+
.x11.action_timeout = LCB_X11_ACTION_TIMEOUT_DEFAULT,
417+
.x11.transfer_size = LCB_X11_TRANSFER_SIZE_DEFAULT,
418418
};
419419

420420
if (cb_opts == NULL) {
@@ -426,14 +426,14 @@ LCB_API clipboard_c *LCB_CC clipboard_new(clipboard_opts *cb_opts) {
426426
if (cb == NULL) {
427427
return NULL;
428428
}
429-
LC_SET_ALLOCATORS(cb, cb_opts);
429+
LCB_SET_ALLOCATORS(cb, cb_opts);
430430

431431
cb->action_timeout = cb_opts->x11.action_timeout > 0 ?
432-
cb_opts->x11.action_timeout : LC_X11_ACTION_TIMEOUT_DEFAULT;
432+
cb_opts->x11.action_timeout : LCB_X11_ACTION_TIMEOUT_DEFAULT;
433433
/* Round down to nearest multiple of 4 */
434434
cb->transfer_size = (cb_opts->x11.transfer_size / 4) * 4;
435435
if (cb->transfer_size == 0) {
436-
cb->transfer_size = LC_X11_TRANSFER_SIZE_DEFAULT;
436+
cb->transfer_size = LCB_X11_TRANSFER_SIZE_DEFAULT;
437437
}
438438

439439
cb->mu_initted = pthread_mutex_init(&cb->mu, NULL) == 0;
@@ -463,8 +463,8 @@ LCB_API clipboard_c *LCB_CC clipboard_new(clipboard_opts *cb_opts) {
463463
return NULL;
464464
}
465465

466-
cb->selections[LC_CLIPBOARD].xmode = cb->std_atoms[X_ATOM_CLIPBOARD].atom;
467-
cb->selections[LC_SELECTION].xmode = XCB_ATOM_PRIMARY;
466+
cb->selections[LCB_CLIPBOARD].xmode = cb->std_atoms[X_ATOM_CLIPBOARD].atom;
467+
cb->selections[LCB_SELECTION].xmode = XCB_ATOM_PRIMARY;
468468

469469
/* Structure notify mask to get DestroyNotify messages */
470470
/* Property change mask for PropertyChange messages */
@@ -520,7 +520,7 @@ LCB_API void LCB_CC clipboard_free(clipboard_c *cb) {
520520
}
521521

522522
/* Free selection data */
523-
for (int i = 0; i < LC_MODE_END; i++) {
523+
for (int i = 0; i < LCB_MODE_END; i++) {
524524
if (cb->selections[i].data != NULL) {
525525
cb->free(cb->selections[i].data);
526526
}
@@ -537,10 +537,10 @@ LCB_API void LCB_CC clipboard_clear(clipboard_c *cb, clipboard_mode mode) {
537537
xcb_atom_t sel;
538538

539539
switch (mode) {
540-
case LC_CLIPBOARD:
540+
case LCB_CLIPBOARD:
541541
sel = cb->std_atoms[X_ATOM_CLIPBOARD].atom;
542542
break;
543-
case LC_SELECTION:
543+
case LCB_SELECTION:
544544
sel = XCB_ATOM_PRIMARY;
545545
break;
546546
default:
@@ -554,7 +554,7 @@ LCB_API void LCB_CC clipboard_clear(clipboard_c *cb, clipboard_mode mode) {
554554
LCB_API bool LCB_CC clipboard_has_ownership(clipboard_c *cb, clipboard_mode mode) {
555555
bool ret = false;
556556

557-
if (mode != LC_CLIPBOARD && mode != LC_SELECTION) {
557+
if (mode != LCB_CLIPBOARD && mode != LCB_SELECTION) {
558558
return false;
559559
}
560560

@@ -590,7 +590,7 @@ static void retrieve_text_selection(clipboard_c *cb, selection_c *sel, char **re
590590
LCB_API char LCB_CC *clipboard_text_ex(clipboard_c *cb, int *length, clipboard_mode mode) {
591591
char *ret = NULL;
592592

593-
if (cb == NULL || (mode != LC_CLIPBOARD && mode != LC_SELECTION)) {
593+
if (cb == NULL || (mode != LCB_CLIPBOARD && mode != LCB_SELECTION)) {
594594
return NULL;
595595
}
596596

@@ -649,7 +649,7 @@ LCB_API char LCB_CC *clipboard_text_ex(clipboard_c *cb, int *length, clipboard_m
649649
LCB_API bool LCB_CC clipboard_set_text_ex(clipboard_c *cb, const char *src, int length, clipboard_mode mode) {
650650
bool ret = false;
651651

652-
if (cb == NULL || src == NULL || length == 0 || (mode != LC_CLIPBOARD && mode != LC_SELECTION)) {
652+
if (cb == NULL || src == NULL || length == 0 || (mode != LCB_CLIPBOARD && mode != LCB_SELECTION)) {
653653
return false;
654654
}
655655

‎test/libclipboard-test-private.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,14 @@
2222
#ifdef LIBCLIPBOARD_BUILD_X11
2323
# include <thread>
2424
# include <chrono>
25-
using std::this_thread::sleep_for;
26-
using std::chrono::milliseconds;
25+
# include <iostream>
2726

2827
# define TRY_RUN(fn, ev, ret, oper) do { \
2928
ret = fn; \
3029
for (int i = 0; i < 10 && oper(ret, ev); i++) { \
31-
std::cout << "Warning(test_basics.cpp:" TO_STRING(__LINE__) "): " TO_STRING(fn) " returned '" << \
30+
std::cout << "Warning(at line:" TO_STRING(__LINE__) "): " TO_STRING(fn) " returned '" << \
3231
ret << "' trying again!" << std::endl; \
33-
sleep_for(milliseconds(50)); \
32+
std::this_thread::sleep_for(std::chrono::milliseconds(50)); \
3433
ret = fn; \
3534
} \
3635
} while (0)

0 commit comments

Comments
 (0)