takino
/
termite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avoid glib MIN/MAX macros

This commit is contained in:
Daniel Micay 2012-07-20 11:00:49 -04:00
parent fcb10e72e4
commit 76274d59ba
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
termite.cc
View File

@ -1,5 +1,6 @@
#define _POSIX_C_SOURCE 200809L #define _POSIX_C_SOURCE 200809L
#include <algorithm>
#include <cstring> #include <cstring>
#include <set> #include <set>
@ -104,15 +105,15 @@ static void update_selection(VteTerminal *vte, const select_info *select) {
} }
} else if (select->mode == SELECT_VISUAL_LINE) { } else if (select->mode == SELECT_VISUAL_LINE) {
vte_terminal_select_text(vte, 0, vte_terminal_select_text(vte, 0,
MIN(select->begin_row, select->cursor_row), std::min(select->begin_row, select->cursor_row),
n_columns - 1, n_columns - 1,
MAX(select->begin_row, select->cursor_row)); std::max(select->begin_row, select->cursor_row));
} else if (select->mode == SELECT_VISUAL_BLOCK) { } else if (select->mode == SELECT_VISUAL_BLOCK) {
vte_terminal_select_text(vte, vte_terminal_select_text(vte,
MIN(select->begin_col, select->cursor_col), std::min(select->begin_col, select->cursor_col),
MIN(select->begin_row, select->cursor_row), std::min(select->begin_row, select->cursor_row),
MAX(select->begin_col, select->cursor_col), std::max(select->begin_col, select->cursor_col),
MAX(select->begin_row, select->cursor_row)); std::max(select->begin_row, select->cursor_row));
} }
vte_terminal_copy_primary(vte); vte_terminal_copy_primary(vte);
@ -351,8 +352,8 @@ gboolean position_overlay_cb(GtkBin *overlay, GtkWidget *widget, GdkRectangle *a
alloc->x = width - req.width - 40; alloc->x = width - req.width - 40;
alloc->y = 0; alloc->y = 0;
alloc->width = MIN(width, req.width); alloc->width = std::min(width, req.width);
alloc->height = MIN(height, req.height); alloc->height = std::min(height, req.height);
return TRUE; return TRUE;
} }