Commit 5372ee8248e17f10dd36ecc6662ac38e7f753b66
1 parent
dc345aa0
Exists in
master
and in
1 other branch
Updating selection data.
Showing
3 changed files
with
8 additions
and
8 deletions
Show diff stats
src/selection/html.c
@@ -69,7 +69,7 @@ static gchar * get_as_div(v3270 * terminal) | @@ -69,7 +69,7 @@ static gchar * get_as_div(v3270 * terminal) | ||
69 | { | 69 | { |
70 | lib3270_selection * block = ((lib3270_selection *) element->data); | 70 | lib3270_selection * block = ((lib3270_selection *) element->data); |
71 | unsigned int row, col, src = 0; | 71 | unsigned int row, col, src = 0; |
72 | - unsigned short flags = block->contents[0].flags; | 72 | + unsigned short flags = block->contents[0].attribute.visual; |
73 | 73 | ||
74 | get_element_colors(terminal,flags,&fgColor,&bgColor); | 74 | get_element_colors(terminal,flags,&fgColor,&bgColor); |
75 | 75 | ||
@@ -91,9 +91,9 @@ static gchar * get_as_div(v3270 * terminal) | @@ -91,9 +91,9 @@ static gchar * get_as_div(v3270 * terminal) | ||
91 | { | 91 | { |
92 | for(col=0; col<block->bounds.width; col++) | 92 | for(col=0; col<block->bounds.width; col++) |
93 | { | 93 | { |
94 | - if(flags != block->contents[src].flags) | 94 | + if(flags != block->contents[src].attribute.visual) |
95 | { | 95 | { |
96 | - flags = block->contents[src].flags; | 96 | + flags = block->contents[src].attribute.visual; |
97 | 97 | ||
98 | get_element_colors(terminal,flags,&fgColor,&bgColor); | 98 | get_element_colors(terminal,flags,&fgColor,&bgColor); |
99 | 99 | ||
@@ -110,7 +110,7 @@ static gchar * get_as_div(v3270 * terminal) | @@ -110,7 +110,7 @@ static gchar * get_as_div(v3270 * terminal) | ||
110 | 110 | ||
111 | } | 111 | } |
112 | 112 | ||
113 | - if(block->contents[src].flags & LIB3270_ATTR_SELECTED && !isspace(block->contents[src].chr)) | 113 | + if(block->contents[src].attribute.visual & LIB3270_ATTR_SELECTED && !isspace(block->contents[src].chr)) |
114 | { | 114 | { |
115 | g_string_append_c(string,block->contents[src].chr); | 115 | g_string_append_c(string,block->contents[src].chr); |
116 | } | 116 | } |
@@ -170,7 +170,7 @@ static gchar * get_as_table(v3270 * terminal) | @@ -170,7 +170,7 @@ static gchar * get_as_table(v3270 * terminal) | ||
170 | memset(line,' ',width); | 170 | memset(line,' ',width); |
171 | for(col=0; col<block->bounds.width; col++) | 171 | for(col=0; col<block->bounds.width; col++) |
172 | { | 172 | { |
173 | - if(block->contents[src].flags & LIB3270_ATTR_SELECTED) | 173 | + if(block->contents[src].attribute.visual & LIB3270_ATTR_SELECTED) |
174 | { | 174 | { |
175 | line[block->bounds.col+col] = block->contents[src].chr; | 175 | line[block->bounds.col+col] = block->contents[src].chr; |
176 | } | 176 | } |
src/selection/table.c
@@ -49,7 +49,7 @@ static gboolean hasDataOnColumn(v3270 * terminal, unsigned int col) | @@ -49,7 +49,7 @@ static gboolean hasDataOnColumn(v3270 * terminal, unsigned int col) | ||
49 | 49 | ||
50 | for(row = 0; row < block->bounds.height; row++) | 50 | for(row = 0; row < block->bounds.height; row++) |
51 | { | 51 | { |
52 | - if( (block->contents[pos].flags & LIB3270_ATTR_SELECTED) && !isspace(block->contents[pos].chr)) | 52 | + if( (block->contents[pos].attribute.visual & LIB3270_ATTR_SELECTED) && !isspace(block->contents[pos].chr)) |
53 | { | 53 | { |
54 | return TRUE; | 54 | return TRUE; |
55 | } | 55 | } |
@@ -139,7 +139,7 @@ gchar * v3270_get_copy_as_table(v3270 * terminal, const gchar *delimiter) | @@ -139,7 +139,7 @@ gchar * v3270_get_copy_as_table(v3270 * terminal, const gchar *delimiter) | ||
139 | memset(line,' ',width); | 139 | memset(line,' ',width); |
140 | for(col=0; col<block->bounds.width; col++) | 140 | for(col=0; col<block->bounds.width; col++) |
141 | { | 141 | { |
142 | - if(block->contents[src].flags & LIB3270_ATTR_SELECTED) | 142 | + if(block->contents[src].attribute.visual & LIB3270_ATTR_SELECTED) |
143 | { | 143 | { |
144 | line[block->bounds.col+col] = block->contents[src].chr; | 144 | line[block->bounds.col+col] = block->contents[src].chr; |
145 | } | 145 | } |
src/selection/text.c
@@ -47,7 +47,7 @@ static gchar * get_as_text(v3270 * terminal) | @@ -47,7 +47,7 @@ static gchar * get_as_text(v3270 * terminal) | ||
47 | { | 47 | { |
48 | for(col=0; col<block->bounds.width; col++) | 48 | for(col=0; col<block->bounds.width; col++) |
49 | { | 49 | { |
50 | - if(block->contents[src].flags & LIB3270_ATTR_SELECTED) | 50 | + if(block->contents[src].attribute.visual & LIB3270_ATTR_SELECTED) |
51 | g_string_append_c(string,block->contents[src].chr); | 51 | g_string_append_c(string,block->contents[src].chr); |
52 | 52 | ||
53 | src++; | 53 | src++; |