ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.216 by root, Fri May 19 16:43:57 2006 UTC vs.
Revision 1.414 by root, Mon Jul 23 17:54:14 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFPlus::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide;
29
25 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32
33 return if $ENV{CFPLUS_DEBUG} & 8;
26 34
27 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
28 36
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 37 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 38
31 $TOOLTIP->set_tooltip_from ($widget); 39 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 40 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 41 }
43 42
44 return; 43 return;
45 } 44 }
46 } 45 }
47 } 46 }
48 47
49 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
51});
52
53sub get_layout {
54 my $layout;
55
56 for (grep { $_->{name} } values %WIDGET) {
57 my $win = $layout->{$_->{name}} = { };
58
59 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
60 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
61 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
62 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
63
64 $win->{show} = $_->{visible} && $_->{is_toplevel};
65 }
66
67 $layout
68}
69
70sub set_layout {
71 my ($layout) = @_;
72
73 $LAYOUT = $layout;
51} 74}
52 75
53# class methods for events 76# class methods for events
54sub feed_sdl_key_down_event { 77sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 78 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 79 if $FOCUS;
57} 80}
58 81
59sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 83 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 84 if $FOCUS;
85}
86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
62} 98}
63 99
64sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
65 my ($ev) = @_; 101 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
67 103
68 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
69 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
70 108
71 $GRAB = $widget; 109 $GRAB = $widget;
72 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
73 111
74 check_tooltip; 112 $TOOLTIP_WATCHER->cb->();
75 } 113 }
76
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 114
79 if ($GRAB) { 115 if ($GRAB) {
80 ($x, $y) = $GRAB->coord2local ($x, $y); 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y); 117 # mousewheel
118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
124 $GRAB->emit (mouse_wheel => $ev);
125 } else {
126 $GRAB->emit (button_down => $ev)
127 }
82 } 128 }
83} 129}
84 130
85sub feed_sdl_button_up_event { 131sub feed_sdl_button_up_event {
86 my ($ev) = @_; 132 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y});
88 133
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 134 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
90 135
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 136 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 137
93 if ($GRAB) { 138 $GRAB->emit (button_up => $ev)
94 ($x, $y) = $GRAB->coord2local ($x, $y); 139 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 140
98 if (!$BUTTON_STATE) { 141 unless ($BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 142 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 143 $grab->update if $grab;
101 $GRAB->update if $GRAB; 144 $GRAB->update if $GRAB;
102 145
103 check_tooltip; 146 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->();
104 } 148 }
105} 149}
106 150
107sub feed_sdl_motion_event { 151sub feed_sdl_motion_event {
108 my ($ev) = @_; 152 my ($ev) = @_;
109 my ($x, $y) = ($ev->{x}, $ev->{y}); 153 my ($x, $y) = ($ev->{x}, $ev->{y});
110 154
111 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 155 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
112 156
113 if ($widget != $HOVER) { 157 check_hover $widget;
114 my $hover = $HOVER; $HOVER = $widget;
115 158
116 $hover->update if $hover && $hover->{can_hover}; 159 $HOVER->emit (mouse_motion => $ev)
117 $HOVER->update if $HOVER && $HOVER->{can_hover};
118
119 check_tooltip;
120 }
121
122 if ($HOVER) { 160 if $HOVER;
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
125 }
126} 161}
127 162
128# convert position array to integers 163# convert position array to integers
129sub harmonize { 164sub harmonize {
130 my ($vals) = @_; 165 my ($vals) = @_;
… …
136 $rem += $_ - $i; 171 $rem += $_ - $i;
137 $_ = $i; 172 $_ = $i;
138 } 173 }
139} 174}
140 175
176sub full_refresh {
177 # make a copy, otherwise for complains about freed values.
178 my @widgets = values %WIDGET;
179
180 $_->update
181 for @widgets;
182}
183
184sub reconfigure_widgets {
185 # make a copy, otherwise C<for> complains about freed values.
186 my @widgets = values %WIDGET;
187
188 $_->reconfigure
189 for @widgets;
190}
191
141# call when resolution changes etc. 192# call when resolution changes etc.
142sub rescale_widgets { 193sub rescale_widgets {
143 my ($sx, $sy) = @_; 194 my ($sx, $sy) = @_;
144 195
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 196 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) { 197 if ($widget->{is_toplevel}) {
198 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
199 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
200
150 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 201 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
151 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 202 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 203 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 204 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
155 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 205 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 206 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
157 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 207
208 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
209 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
210
158 } 211 }
159
160 $widget->reconfigure;
161 } 212 }
213
214 reconfigure_widgets;
162} 215}
163 216
164############################################################################# 217#############################################################################
165 218
219package CFPlus::UI::Event;
220
221sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223}
224
225#############################################################################
226
166package CFClient::UI::Base; 227package CFPlus::UI::Base;
167 228
168use strict; 229use strict;
169 230
170use CFClient::OpenGL; 231use CFPlus::OpenGL;
171 232
172sub new { 233sub new {
173 my $class = shift; 234 my $class = shift;
174 235
175 my $self = bless { 236 my $self = bless {
176 x => 0, 237 x => "center",
177 y => 0, 238 y => "center",
178 z => 0, 239 z => 0,
240 w => undef,
241 h => undef,
179 can_events => 1, 242 can_events => 1,
180 @_ 243 @_
181 }, $class; 244 }, $class;
182 245
246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
247
183 for (keys %$self) { 248 for (keys %$self) {
184 if (/^connect_(.*)$/) { 249 if (/^on_(.*)$/) {
185 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
186 } 251 }
187 } 252 }
188 253
189 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
259
260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
262
263 $self->show if $layout->{show};
264 }
190 265
191 $self 266 $self
192} 267}
193 268
194sub destroy { 269sub destroy {
195 my ($self) = @_; 270 my ($self) = @_;
196 271
197 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
198 %$self = (); 274 %$self = ();
199} 275}
200 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
201sub show { 281sub show {
202 my ($self) = @_; 282 my ($self) = @_;
203 283
204 return if $self->{parent}; 284 return if $self->{parent};
205 285
206 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
207} 287}
208 288
209sub hide { 289sub set_visible {
210 my ($self) = @_; 290 my ($self) = @_;
291
292 return if $self->{visible};
293
294 $self->{root} = $self->{parent}{root};
295 $self->{visible} = $self->{parent}{visible} + 1;
296
297 $self->emit (visibility_change => 1);
298
299 $self->realloc if !exists $self->{req_w};
300
301 $_->set_visible for $self->children;
302}
303
304sub set_invisible {
305 my ($self) = @_;
306
307 return unless $self->{visible};
308
309 $_->set_invisible for $self->children;
310
311 delete $self->{visible};
312 delete $self->{root};
211 313
212 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
214 316
317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
318 if $TOOLTIP->{owner} == $self;
319
320 $self->emit ("focus_out");
321 $self->emit (visibility_change => 0);
322}
323
324sub set_visibility {
325 my ($self, $visible) = @_;
326
327 return if $self->{visible} == $visible;
328
329 $visible ? $self->show
330 : $self->hide;
331}
332
333sub toggle_visibility {
334 my ($self) = @_;
335
336 $self->{visible}
337 ? $self->hide
338 : $self->show;
339}
340
341sub hide {
342 my ($self) = @_;
343
344 $self->set_invisible;
345
215 $self->{parent}->remove ($self) 346 $self->{parent}->remove ($self)
216 if $self->{parent}; 347 if $self->{parent};
217} 348}
218 349
219sub move { 350sub move_abs {
220 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
221 352
222 $self->{x} = int $x; 353 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
223 $self->{y} = int $y; 354 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
224 $self->{z} = $z if defined $z; 355 $self->{z} = $z if defined $z;
225 356
226 $self->update; 357 $self->update;
227} 358}
228 359
229sub set_size { 360sub set_size {
230 my ($self, $w, $h) = @_; 361 my ($self, $w, $h) = @_;
231 362
232 $self->{user_w} = $w; 363 $self->{force_w} = $w;
233 $self->{user_h} = $h; 364 $self->{force_h} = $h;
234 365
235 $self->check_size; 366 $self->realloc;
236} 367}
237 368
238sub size_request { 369sub size_request {
239 require Carp; 370 require Carp;
240 Carp::confess "size_request is abstract"; 371 Carp::confess "size_request is abstract";
241} 372}
242 373
374sub baseline_shift {
375 0
376}
377
243sub configure { 378sub configure {
244 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
245 380
246 if ($self->{aspect}) { 381 if ($self->{aspect}) {
382 my ($ow, $oh) = ($w, $h);
383
247 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
248 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
249 386
250 # use alignment to adjust x, y 387 # use alignment to adjust x, y
251 388
252 $x += int +($w - $w2) * 0.5; 389 $x += int 0.5 * ($ow - $w);
253 $y += int +($h - $h2) * 0.5; 390 $y += int 0.5 * ($oh - $h);
254
255 ($w, $h) = ($w2, $h2);
256 } 391 }
257 392
258 if ($self->{x} != $x || $self->{y} != $y) { 393 if ($self->{x} ne $x || $self->{y} ne $y) {
259 $self->{x} = $x; 394 $self->{x} = $x;
260 $self->{y} = $y; 395 $self->{y} = $y;
261 $self->update; 396 $self->update;
262 } 397 }
263 398
264 if ($self->{w} != $w || $self->{h} != $h) { 399 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
265 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 400 return unless $self->{visible};
266 }
267}
268 401
269sub size_allocate { 402 $self->{alloc_w} = $w;
270 # nothing to be done 403 $self->{alloc_h} = $h;
271}
272 404
273sub reconfigure { 405 $self->{root}{size_alloc}{$self+0} = $self;
274 my ($self) = @_; 406 }
275
276 $self->check_size (1);
277 $self->update;
278} 407}
279 408
280sub children { 409sub children {
410 # nop
411}
412
413sub visible_children {
414 $_[0]->children
281} 415}
282 416
283sub set_max_size { 417sub set_max_size {
284 my ($self, $w, $h) = @_; 418 my ($self, $w, $h) = @_;
285 419
286 delete $self->{max_w}; $self->{max_w} = $w if $w; 420 $self->{max_w} = int $w if defined $w;
287 delete $self->{max_h}; $self->{max_h} = $h if $h; 421 $self->{max_h} = int $h if defined $h;
422
423 $self->realloc;
288} 424}
289 425
290sub set_tooltip { 426sub set_tooltip {
291 my ($self, $tooltip) = @_; 427 my ($self, $tooltip) = @_;
292 428
429 $tooltip =~ s/^\s+//;
430 $tooltip =~ s/\s+$//;
431
432 return if $self->{tooltip} eq $tooltip;
433
293 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
294 435
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip; 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
298 } 439 }
299} 440}
300 441
301# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
302sub coord2local { 443sub coord2local {
303 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
304 445
446 Carp::confess unless $self->{parent};#d#
447
305 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
306} 449}
307 450
308# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
309sub coord2global { 452sub coord2global {
310 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
311 454
455 Carp::confess unless $self->{parent};#d#
456
312 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
313} 458}
314 459
315sub focus_in { 460sub invoke_focus_in {
316 my ($self) = @_; 461 my ($self) = @_;
317 462
318 return if $FOCUS == $self; 463 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 464 return unless $self->{can_focus};
320 465
321 my $focus = $FOCUS; $FOCUS = $self; 466 $FOCUS = $self;
322 467
323 $self->emit (focus_in => $focus); 468 $self->update;
324 469
325 $focus->update if $focus; 470 0
326 $FOCUS->update;
327} 471}
328 472
329sub focus_out { 473sub invoke_focus_out {
330 my ($self) = @_; 474 my ($self) = @_;
331 475
332 return unless $FOCUS == $self; 476 return unless $FOCUS == $self;
333 477
334 my $focus = $FOCUS; undef $FOCUS; 478 undef $FOCUS;
335 479
336 $self->emit (focus_out => $focus); 480 $self->update;
337 481
338 $focus->update if $focus; #? 482 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
339} 483 unless $FOCUS;
340 484
485 0
486}
487
488sub grab_focus {
489 my ($self) = @_;
490
491 $FOCUS->emit ("focus_out") if $FOCUS;
492 $self->emit ("focus_in");
493}
494
341sub mouse_motion { } 495sub invoke_mouse_motion { 0 }
342sub button_up { } 496sub invoke_button_up { 0 }
343sub key_down { } 497sub invoke_key_down { 0 }
344sub key_up { } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
345 500
346sub button_down { 501sub invoke_button_down {
347 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
348 503
349 $self->focus_in; 504 $self->grab_focus;
350}
351 505
352sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 506 0
353sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 507}
354sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
355sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
356sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
357 508
358sub draw { 509sub connect {
510 my ($self, $signal, $cb) = @_;
511
512 push @{ $self->{signal_cb}{$signal} }, $cb;
513
514 defined wantarray and CFPlus::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} };
517 }
518}
519
520sub disconnect_all {
359 my ($self) = @_; 521 my ($self, $signal) = @_;
360 522
361 return unless $self->{h} && $self->{w}; 523 delete $self->{signal_cb}{$signal};
362
363 glPushMatrix;
364 glTranslate $self->{x}, $self->{y}, 0;
365 $self->_draw;
366 glPopMatrix;
367
368 if ($self == $HOVER && $self->{can_hover}) {
369 my ($x, $y) = @$self{qw(x y)};
370
371 glColor 1, 0.8, 0.5, 0.2;
372 glEnable GL_BLEND;
373 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
374 glBegin GL_QUADS;
375 glVertex $x , $y;
376 glVertex $x + $self->{w}, $y;
377 glVertex $x + $self->{w}, $y + $self->{h};
378 glVertex $x , $y + $self->{h};
379 glEnd;
380 glDisable GL_BLEND;
381 }
382
383 if ($ENV{PCLIENT_DEBUG}) {
384 glPushMatrix;
385 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0;
389 glVertex $self->{w}, 0;
390 glVertex $self->{w}, $self->{h};
391 glVertex 0 , $self->{h};
392 glEnd;
393 glPopMatrix;
394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
395 }
396} 524}
397 525
398sub _draw { 526my %has_coords = (
399 my ($self) = @_; 527 button_down => 1,
528 button_up => 1,
529 mouse_motion => 1,
530 mouse_wheel => 1,
531);
400 532
401 warn "no draw defined for $self\n"; 533sub emit {
402} 534 my ($self, $signal, @args) = @_;
403 535
536 # I do not really like this solution, but I do not like duplication
537 # and needlessly verbose code, either.
538 my @append
539 = $has_coords{$signal}
540 ? $args[0]->xy ($self)
541 : ();
542
543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
544
545 for my $cb (
546 @{$self->{signal_cb}{$signal} || []}, # before
547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
553 $self->{parent} && $self->{parent}->emit ($signal, @args)
554}
555
404sub find_widget { 556#sub find_widget {
405 my ($self, $x, $y) = @_; 557# in .xs
406
407 return () unless $self->{can_events};
408
409 return $self
410 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
411 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
412
413 ()
414}
415 558
416sub set_parent { 559sub set_parent {
417 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
418 561
419 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
420 563 $self->set_visible if $parent->{visible};
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
424} 564}
425 565
426sub check_size { 566sub realloc {
427 my ($self, $forced) = @_; 567 my ($self) = @_;
428 568
429 $self->{force_alloc} = 1 if $forced; 569 if ($self->{visible}) {
430 $CFClient::UI::ROOT->{check_size}{$self} = $self; 570 return if $self->{root}{realloc}{$self+0};
571
572 $self->{root}{realloc}{$self+0} = $self;
573 $self->{root}->update;
574 } else {
575 delete $self->{req_w};
576 delete $self->{req_h};
577 }
431} 578}
432 579
433sub update { 580sub update {
434 my ($self) = @_; 581 my ($self) = @_;
435 582
436 $self->{parent}->update 583 $self->{parent}->update
437 if $self->{parent}; 584 if $self->{parent};
438} 585}
439 586
440sub connect { 587sub reconfigure {
441 my ($self, $signal, $cb) = @_; 588 my ($self) = @_;
442 589
443 push @{ $self->{signal_cb}{$signal} }, $cb; 590 $self->realloc;
591 $self->update;
444} 592}
445 593
446sub emit { 594# using global variables seems a bit hacky, but passing through all drawing
447 my ($self, $signal, @args) = @_; 595# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
448 597
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 598#sub draw {
599#CFPlus.xs
600
601sub _draw {
602 my ($self) = @_;
603
604 warn "no draw defined for $self\n";
450} 605}
451 606
452sub DESTROY { 607sub DESTROY {
453 my ($self) = @_; 608 my ($self) = @_;
454 609
610 return if CFPlus::in_destruct;
611
612 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614
455 delete $WIDGET{$self+0}; 615 delete $WIDGET{$self+0};
456 #$self->deactivate;
457} 616}
458 617
459############################################################################# 618#############################################################################
460 619
461package CFClient::UI::DrawBG; 620package CFPlus::UI::DrawBG;
462 621
463our @ISA = CFClient::UI::Base::; 622our @ISA = CFPlus::UI::Base::;
464 623
465use strict; 624use strict;
466use CFClient::OpenGL; 625use CFPlus::OpenGL;
467 626
468sub new { 627sub new {
469 my $class = shift; 628 my $class = shift;
470 629
471 # range [value, low, high, page] 630 # range [value, low, high, page]
… …
486 645
487 if ($color && (@$color < 4 || $color->[3])) { 646 if ($color && (@$color < 4 || $color->[3])) {
488 my ($w, $h) = @$self{qw(w h)}; 647 my ($w, $h) = @$self{qw(w h)};
489 648
490 glEnable GL_BLEND; 649 glEnable GL_BLEND;
491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
492 glColor @$color; 651 glColor_premultiply @$color;
493 652
494 glBegin GL_QUADS; 653 glBegin GL_QUADS;
495 glVertex 0 , 0; 654 glVertex 0 , 0;
496 glVertex 0 , $h; 655 glVertex 0 , $h;
497 glVertex $w, $h; 656 glVertex $w, $h;
… …
502 } 661 }
503} 662}
504 663
505############################################################################# 664#############################################################################
506 665
507package CFClient::UI::Empty; 666package CFPlus::UI::Empty;
508 667
509our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
510 669
511sub new { 670sub new {
512 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
513 $class->SUPER::new (can_events => 0, %arg); 672 $class->SUPER::new (can_events => 0, %arg);
514} 673}
515 674
516sub size_request { 675sub size_request {
517 (0, 0) 676 my ($self) = @_;
677
678 ($self->{w} + 0, $self->{h} + 0)
518} 679}
519 680
520sub draw { } 681sub draw { }
521 682
522############################################################################# 683#############################################################################
523 684
524package CFClient::UI::Container; 685package CFPlus::UI::Container;
525 686
526our @ISA = CFClient::UI::Base::; 687our @ISA = CFPlus::UI::Base::;
527 688
528sub new { 689sub new {
529 my ($class, %arg) = @_; 690 my ($class, %arg) = @_;
530 691
531 my $children = delete $arg{children} || []; 692 my $children = delete $arg{children};
532 693
533 my $self = $class->SUPER::new ( 694 my $self = $class->SUPER::new (
534 children => [], 695 children => [],
535 can_events => 0, 696 can_events => 0,
536 %arg, 697 %arg,
537 ); 698 );
699
538 $self->add ($_) for @$children; 700 $self->add (@$children)
701 if $children && @$children;
539 702
540 $self 703 $self
704}
705
706sub realloc {
707 my ($self) = @_;
708
709 $self->{force_realloc} = 1;
710 $self->{force_size_alloc} = 1;
711 $self->SUPER::realloc;
541} 712}
542 713
543sub add { 714sub add {
544 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
545 716
546 $_->set_parent ($self) 717 $_->set_parent ($self)
547 for @widgets; 718 for @widgets;
548 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
549 use sort 'stable'; 721 use sort 'stable';
550 722
551 $self->{children} = [ 723 $self->{children} = [
552 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
553 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
554 ]; 726 ];
555 727
556 $self->check_size (1); 728 $self->realloc;
557 $self->update; 729
730 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
558} 733}
559 734
560sub children { 735sub children {
561 @{ $_[0]{children} } 736 @{ $_[0]{children} }
562} 737}
563 738
564sub remove { 739sub remove {
565 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
566 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
567 delete $child->{parent}; 745 delete $child->{parent};
568 $child->hide; 746 $child->hide;
569
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
571 749
572 $self->check_size; 750 $self->realloc;
573 $self->update;
574} 751}
575 752
576sub clear { 753sub clear {
577 my ($self) = @_; 754 my ($self) = @_;
578 755
579 my $children = delete $self->{children}; 756 my $children = $self->{children};
580 $self->{children} = []; 757 $self->{children} = [];
581 758
582 for (@$children) { 759 for (@$children) {
583 delete $_->{parent}; 760 delete $_->{parent};
584 $_->hide; 761 $_->hide;
585 } 762 }
586 763
587 $self->check_size; 764 $self->realloc;
588 $self->update;
589} 765}
590 766
591sub find_widget { 767sub find_widget {
592 my ($self, $x, $y) = @_; 768 my ($self, $x, $y) = @_;
593 769
594 $x -= $self->{x}; 770 $x -= $self->{x};
595 $y -= $self->{y}; 771 $y -= $self->{y};
596 772
597 my $res; 773 my $res;
598 774
599 for (reverse @{ $self->{children} }) { 775 for (reverse $self->visible_children) {
600 $res = $_->find_widget ($x, $y) 776 $res = $_->find_widget ($x, $y)
601 and return $res; 777 and return $res;
602 } 778 }
603 779
604 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 780 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
605} 781}
606 782
607sub _draw { 783sub _draw {
608 my ($self) = @_; 784 my ($self) = @_;
609 785
610 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
611} 787}
612 788
613############################################################################# 789#############################################################################
614 790
615package CFClient::UI::Bin; 791package CFPlus::UI::Bin;
616 792
617our @ISA = CFClient::UI::Container::; 793our @ISA = CFPlus::UI::Container::;
618 794
619sub new { 795sub new {
620 my ($class, %arg) = @_; 796 my ($class, %arg) = @_;
621 797
622 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 798 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
623 799
624 $class->SUPER::new (children => [$child], %arg) 800 $class->SUPER::new (children => [$child], %arg)
625} 801}
626 802
627sub add { 803sub add {
628 my ($self, $child) = @_; 804 my ($self, $child) = @_;
629 805
630 $self->{children} = []; 806 $self->clear;
631
632 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
633} 808}
634 809
635sub remove { 810sub remove {
636 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
637 812
638 $self->SUPER::remove ($widget); 813 $self->SUPER::remove ($widget);
639 814
640 $self->{children} = [new CFClient::UI::Empty] 815 $self->{children} = [new CFPlus::UI::Empty]
641 unless @{$self->{children}}; 816 unless @{$self->{children}};
642} 817}
643 818
644sub child { $_[0]->{children}[0] } 819sub child { $_[0]->{children}[0] }
645 820
646sub size_request { 821sub size_request {
647 $_[0]{children}[0]->size_request 822 $_[0]{children}[0]->size_request
648} 823}
649 824
650sub size_allocate { 825sub invoke_size_allocate {
651 my ($self, $w, $h) = @_; 826 my ($self, $w, $h) = @_;
652 827
653 $self->{children}[0]->configure (0, 0, $w, $h); 828 $self->{children}[0]->configure (0, 0, $w, $h);
829
830 1
654} 831}
655 832
656############################################################################# 833#############################################################################
657 834
835# back-buffered drawing area
836
658package CFClient::UI::Window; 837package CFPlus::UI::Window;
659 838
660our @ISA = CFClient::UI::Bin::; 839our @ISA = CFPlus::UI::Bin::;
661 840
662use CFClient::OpenGL; 841use CFPlus::OpenGL;
663 842
664sub new { 843sub new {
665 my ($class, %arg) = @_; 844 my ($class, %arg) = @_;
666 845
667 my $self = $class->SUPER::new (%arg); 846 my $self = $class->SUPER::new (%arg);
… …
672 851
673 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 852 $ROOT->on_post_alloc ($self => sub { $self->render_child });
674 $self->SUPER::update; 853 $self->SUPER::update;
675} 854}
676 855
677sub size_allocate { 856sub invoke_size_allocate {
678 my ($self, $w, $h) = @_; 857 my ($self, $w, $h) = @_;
679 858
680 $self->SUPER::size_allocate ($w, $h);
681 $self->update; 859 $self->update;
860
861 $self->SUPER::invoke_size_allocate ($w, $h)
682} 862}
683 863
684sub _render { 864sub _render {
865 my ($self) = @_;
866
685 $_[0]{children}[0]->draw; 867 $self->{children}[0]->draw;
686} 868}
687 869
688sub render_child { 870sub render_child {
689 my ($self) = @_; 871 my ($self) = @_;
690 872
691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 873 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
692 glClearColor 0, 0, 0, 0; 874 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT; 875 glClear GL_COLOR_BUFFER_BIT;
694 876
877 {
878 package CFPlus::UI::Base;
879
880 local ($draw_x, $draw_y, $draw_w, $draw_h) =
881 (0, 0, $self->{w}, $self->{h});
882
695 $self->_render; 883 $self->_render;
884 }
696 }; 885 };
697} 886}
698 887
699sub _draw { 888sub _draw {
700 my ($self) = @_; 889 my ($self) = @_;
701
702 my ($w, $h) = ($self->w, $self->h);
703 890
704 my $tex = $self->{texture} 891 my $tex = $self->{texture}
705 or return; 892 or return;
706 893
707 glEnable GL_TEXTURE_2D; 894 glEnable GL_TEXTURE_2D;
708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 895 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
709 glColor 1, 1, 1, 1; 896 glColor 0, 0, 0, 1;
710 897
711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 898 $tex->draw_quad_alpha_premultiplied (0, 0);
712 899
713 glDisable GL_TEXTURE_2D; 900 glDisable GL_TEXTURE_2D;
714} 901}
715 902
716############################################################################# 903#############################################################################
717 904
718package CFClient::UI::ViewPort; 905package CFPlus::UI::ViewPort;
719 906
907use List::Util qw(min max);
908
720our @ISA = CFClient::UI::Window::; 909our @ISA = CFPlus::UI::Window::;
910
911sub new {
912 my $class = shift;
913
914 $class->SUPER::new (
915 scroll_x => 0,
916 scroll_y => 1,
917 @_,
918 )
919}
721 920
722sub size_request { 921sub size_request {
723 my ($self) = @_; 922 my ($self) = @_;
724 923
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 925
728 @$self{qw(child_w child_h)} 926 $w = 1 if $self->{scroll_x};
729} 927 $h = 1 if $self->{scroll_y};
730 928
929 ($w, $h)
930}
931
731sub size_allocate { 932sub invoke_size_allocate {
732 my ($self, $w, $h) = @_; 933 my ($self, $w, $h) = @_;
733 934
935 my $child = $self->child;
936
937 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
938 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
939
940 $self->child->configure (0, 0, $w, $h);
734 $self->update; 941 $self->update;
942
943 1
735} 944}
736 945
737sub set_offset { 946sub set_offset {
738 my ($self, $x, $y) = @_; 947 my ($self, $x, $y) = @_;
739 948
949 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
950 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
951
952 if ($x != $self->{view_x} or $y != $self->{view_y}) {
740 $self->{view_x} = int $x; 953 $self->{view_x} = $x;
741 $self->{view_y} = int $y; 954 $self->{view_y} = $y;
742 955
956 $self->emit (changed => $x, $y);
743 $self->update; 957 $self->update;
958 }
959}
960
961sub set_center {
962 my ($self, $x, $y) = @_;
963
964 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
965}
966
967sub make_visible {
968 my ($self, $x, $y, $border) = @_;
969
970 if ( $x < $self->{view_x} + $self->{w} * $border
971 || $x > $self->{view_x} + $self->{w} * (1 - $border)
972 || $y < $self->{view_y} + $self->{h} * $border
973 || $y > $self->{view_y} + $self->{h} * (1 - $border)
974 ) {
975 $self->set_center ($x, $y);
976 }
744} 977}
745 978
746# hmm, this does not work for topleft of $self... but we should not ask for that 979# hmm, this does not work for topleft of $self... but we should not ask for that
747sub coord2local { 980sub coord2local {
748 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
… …
763 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
764 997
765 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
766 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 999 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
767 ) { 1000 ) {
768 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1001 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
769 } else { 1002 } else {
770 $self->CFClient::UI::Base::find_widget ($x, $y) 1003 $self->CFPlus::UI::Base::find_widget ($x, $y)
771 } 1004 }
772} 1005}
773 1006
774sub _render { 1007sub _render {
775 my ($self) = @_; 1008 my ($self) = @_;
776 1009
1010 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1011 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1012
777 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1013 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
778 1014
779 $self->SUPER::_render; 1015 $self->SUPER::_render;
780} 1016}
781 1017
782############################################################################# 1018#############################################################################
783 1019
784package CFClient::UI::ScrolledWindow; 1020package CFPlus::UI::ScrolledWindow;
785 1021
786our @ISA = CFClient::UI::HBox::; 1022our @ISA = CFPlus::UI::Table::;
787 1023
788sub new { 1024sub new {
789 my $class = shift; 1025 my ($class, %arg) = @_;
1026
1027 my $child = delete $arg{child};
790 1028
791 my $self; 1029 my $self;
792 1030
793 my $slider = new CFClient::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1032 col => 0,
1033 row => 1,
794 vertical => 1, 1034 vertical => 0,
795 range => [0, 0, 1, 0.01], # HACK fix 1035 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 1036 on_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 1037 $self->{hpos} = $_[1];
1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
798 }, 1039 },
799 ; 1040 ;
800 1041
1042 my $vslider = new CFPlus::UI::Slider
1043 col => 1,
1044 row => 0,
1045 vertical => 1,
1046 range => [0, 0, 1, 0.01], # HACK fix
1047 on_changed => sub {
1048 $self->{vpos} = $_[1];
1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1050 },
1051 ;
1052
801 $self = $class->SUPER::new ( 1053 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort), 1054 scroll_x => 0,
1055 scroll_y => 1,
1056 can_events => 1,
803 slider => $slider, 1057 hslider => $hslider,
804 @_, 1058 vslider => $vslider,
1059 col_expand => [1, 0],
1060 row_expand => [1, 0],
1061 %arg,
805 ); 1062 );
806 1063
807 $self->{vp}->add ($self->{scrolled}); 1064 $self->{vp} = new CFPlus::UI::ViewPort
1065 col => 0,
1066 row => 0,
1067 expand => 1,
1068 scroll_x => $self->{scroll_x},
1069 scroll_y => $self->{scroll_y},
1070 on_changed => sub {
1071 my ($vp, $x, $y) = @_;
1072
1073 $vp->{parent}{hslider}->set_value ($x);
1074 $vp->{parent}{vslider}->set_value ($y);
1075
1076 0
1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1083 ;
1084
808 $self->add ($self->{vp}); 1085 $self->SUPER::add ($self->{vp});
809 $self->add ($self->{slider}); 1086
1087 $self->add ($child) if $child;
810 1088
811 $self 1089 $self
812} 1090}
813 1091
814#TODO# update range on size_allocate depending on child 1092sub add {
815# update viewport offset on scroll 1093 my ($self, $widget) = @_;
1094
1095 $self->{vp}->add ($self->{child} = $widget);
1096}
1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1102sub update_slider {
1103 my ($self) = @_;
1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 if ($self->{scroll_x}) {
1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1109 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1110
1111 my $visible = $w1 > $w2;
1112 if ($visible != $self->{hslider_visible}) {
1113 $self->{hslider_visible} = $visible;
1114 $visible ? $self->SUPER::add ($self->{hslider})
1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1117 }
1118
1119 if ($self->{scroll_y}) {
1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1121 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1122
1123 my $visible = $h1 > $h2;
1124 if ($visible != $self->{vslider_visible}) {
1125 $self->{vslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{vslider})
1127 : $self->SUPER::remove ($self->{vslider});
1128 }
1129 }
1130}
1131
1132sub start_dragging {
1133 my ($self, $ev) = @_;
1134
1135 $self->grab_focus;
1136
1137 my $ox = $self->{vp}{view_x};
1138 my $oy = $self->{vp}{view_y};
1139
1140 $self->{motion} = sub {
1141 my ($ev, $x, $y) = @_;
1142
1143 $ox -= $ev->{xrel};
1144 $oy -= $ev->{yrel};
1145
1146 $self->{vp}->set_offset ($ox, $oy);
1147 };
1148}
1149
1150sub invoke_mouse_wheel {
1151 my ($self, $ev) = @_;
1152
1153 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1154 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1155
1156 1
1157}
1158
1159sub invoke_button_down {
1160 my ($self, $ev, $x, $y) = @_;
1161
1162 if ($ev->{button} == 2) {
1163 $self->start_dragging ($ev);
1164 return 1;
1165 }
1166
1167 0
1168}
1169
1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1172
1173 if (delete $self->{motion}) {
1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_mouse_motion {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if ($self->{motion}) {
1184 $self->{motion}->($ev, $x, $y);
1185 return 1;
1186 }
1187
1188 0
1189}
1190
1191sub invoke_size_allocate {
1192 my ($self, $w, $h) = @_;
1193
1194 $self->update_slider;
1195 $self->SUPER::invoke_size_allocate ($w, $h)
1196}
816 1197
817############################################################################# 1198#############################################################################
818 1199
819package CFClient::UI::Frame; 1200package CFPlus::UI::Frame;
820 1201
821our @ISA = CFClient::UI::Bin::; 1202our @ISA = CFPlus::UI::Bin::;
822 1203
823use CFClient::OpenGL; 1204use CFPlus::OpenGL;
824 1205
825sub new { 1206sub new {
826 my $class = shift; 1207 my $class = shift;
827 1208
828 $class->SUPER::new ( 1209 $class->SUPER::new (
… …
836 1217
837 if ($self->{bg}) { 1218 if ($self->{bg}) {
838 my ($w, $h) = @$self{qw(w h)}; 1219 my ($w, $h) = @$self{qw(w h)};
839 1220
840 glEnable GL_BLEND; 1221 glEnable GL_BLEND;
841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
842 glColor @{ $self->{bg} }; 1223 glColor_premultiply @{ $self->{bg} };
843 1224
844 glBegin GL_QUADS; 1225 glBegin GL_QUADS;
845 glVertex 0 , 0; 1226 glVertex 0 , 0;
846 glVertex 0 , $h; 1227 glVertex 0 , $h;
847 glVertex $w, $h; 1228 glVertex $w, $h;
… …
854 $self->SUPER::_draw; 1235 $self->SUPER::_draw;
855} 1236}
856 1237
857############################################################################# 1238#############################################################################
858 1239
859package CFClient::UI::FancyFrame; 1240package CFPlus::UI::FancyFrame;
860 1241
861our @ISA = CFClient::UI::Bin::; 1242our @ISA = CFPlus::UI::Bin::;
862 1243
863use CFClient::OpenGL; 1244use CFPlus::OpenGL;
864
865my @tex =
866 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
867 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
868 1245
869sub new { 1246sub new {
870 my $class = shift; 1247 my ($class, %arg) = @_;
871 1248
872 # TODO: user_x, user_y, overwrite moveto? 1249 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label
1251 align => 1,
1252 valign => 0,
1253 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75;
1255 }
873 1256
874 my $self = $class->SUPER::new ( 1257 my $self = $class->SUPER::new (
1258 # label => "",
875 bg => [1, 1, 1, 1], 1259 fg => [0.6, 0.3, 0.1],
876 border_bg => [1, 1, 1, 1],
877 border => 0.6, 1260 border => 0.8,
878 toplevel => 1, 1261 style => 'single',
879 can_events => 1, 1262 %arg,
880 @_
881 ); 1263 );
882 1264
883 $self->{title} &&= new CFClient::UI::Label
884 align => 0,
885 valign => 1,
886 text => $self->{title},
887 fontsize => $self->{border};
888
889 $self 1265 $self
1266}
1267
1268sub add {
1269 my ($self, @widgets) = @_;
1270
1271 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
890} 1273}
891 1274
892sub border { 1275sub border {
893 int $_[0]{border} * $::FONTSIZE 1276 int $_[0]{border} * $::FONTSIZE
894} 1277}
895 1278
896sub size_request { 1279sub size_request {
897 my ($self) = @_; 1280 my ($self) = @_;
1281
1282 ($self->{label_w}, undef) = $self->{label}->size_request
1283 if $self->{label};
898 1284
899 my ($w, $h) = $self->SUPER::size_request; 1285 my ($w, $h) = $self->SUPER::size_request;
900 1286
901 ( 1287 (
902 $w + $self->border * 2, 1288 $w + $self->border * 2,
903 $h + $self->border * 2, 1289 $h + $self->border * 2,
904 ) 1290 )
905} 1291}
906 1292
907sub size_allocate { 1293sub invoke_size_allocate {
908 my ($self, $w, $h) = @_; 1294 my ($self, $w, $h) = @_;
909 1295
910 $h -= List::Util::max 0, $self->border * 2; 1296 my $border = $self->border;
1297
911 $w -= List::Util::max 0, $self->border * 2; 1298 $w -= List::Util::max 0, $border * 2;
1299 $h -= List::Util::max 0, $border * 2;
912 1300
913 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1301 if (my $label = $self->{label}) {
914 if $self->{title}; 1302 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1303 $label->{h} = List::Util::min $h, $border;
1304 $label->invoke_size_allocate ($label->{w}, $label->{h});
1305 }
915 1306
916 $self->child->configure ($self->border, $self->border, $w, $h); 1307 $self->child->configure ($border, $border, $w, $h);
917}
918 1308
1309 1
1310}
1311
1312sub _draw {
1313 my ($self) = @_;
1314
1315 my $child = $self->{children}[0];
1316
1317 my $border = $self->border;
1318 my ($w, $h) = ($self->{w}, $self->{h});
1319
1320 $child->draw;
1321
1322 glColor @{$self->{fg}};
1323 glBegin GL_LINE_STRIP;
1324 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1327 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1328 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1330 glEnd;
1331
1332 if ($self->{label}) {
1333 glTranslate $border * 2, 0;
1334 $self->{label}->_draw;
1335 }
1336}
1337
1338#############################################################################
1339
1340package CFPlus::UI::Toplevel;
1341
1342our @ISA = CFPlus::UI::Bin::;
1343
1344use CFPlus::OpenGL;
1345
1346my $bg =
1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1348 mipmap => 1, wrap => 1;
1349
1350my @border =
1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1353
1354my @icon =
1355 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1356 qw(x1_move.png x1_resize.png);
1357
1358sub new {
1359 my ($class, %arg) = @_;
1360
1361 my $self = $class->SUPER::new (
1362 bg => [1, 1, 1, 1],
1363 border_bg => [1, 1, 1, 1],
1364 border => 0.6,
1365 can_events => 1,
1366 min_w => 64,
1367 min_h => 32,
1368 %arg,
1369 );
1370
1371 $self->{title_widget} = new CFPlus::UI::Label
1372 align => 0,
1373 valign => 1,
1374 text => $self->{title},
1375 fontsize => $self->{border},
1376 if exists $self->{title};
1377
1378 if ($self->{has_close_button}) {
1379 $self->{close_button} =
1380 new CFPlus::UI::ImageButton
1381 path => 'x1_close.png',
1382 on_activate => sub { $self->emit ("delete") };
1383
1384 $self->CFPlus::UI::Container::add ($self->{close_button});
1385 }
1386
1387 $self
1388}
1389
1390sub add {
1391 my ($self, @widgets) = @_;
1392
1393 $self->SUPER::add (@widgets);
1394 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1395 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1396}
1397
1398sub border {
1399 int $_[0]{border} * $::FONTSIZE
1400}
1401
1402sub size_request {
1403 my ($self) = @_;
1404
1405 $self->{title_widget}->size_request
1406 if $self->{title_widget};
1407
1408 $self->{close_button}->size_request
1409 if $self->{close_button};
1410
1411 my ($w, $h) = $self->SUPER::size_request;
1412
1413 (
1414 $w + $self->border * 2,
1415 $h + $self->border * 2,
1416 )
1417}
1418
1419sub invoke_size_allocate {
1420 my ($self, $w, $h) = @_;
1421
1422 if ($self->{title_widget}) {
1423 $self->{title_widget}{w} = $w;
1424 $self->{title_widget}{h} = $h;
1425 $self->{title_widget}->invoke_size_allocate ($w, $h);
1426 }
1427
1428 my $border = $self->border;
1429
1430 $h -= List::Util::max 0, $border * 2;
1431 $w -= List::Util::max 0, $border * 2;
1432
1433 $self->child->configure ($border, $border, $w, $h);
1434
1435 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1436 if $self->{close_button};
1437
1438 1
1439}
1440
1441sub invoke_delete {
1442 my ($self) = @_;
1443
1444 $self->hide;
1445
1446 1
1447}
1448
919sub button_down { 1449sub invoke_button_down {
920 my ($self, $ev, $x, $y) = @_; 1450 my ($self, $ev, $x, $y) = @_;
921 1451
922 my ($w, $h) = @$self{qw(w h)}; 1452 my ($w, $h) = @$self{qw(w h)};
923 my $border = $self->border; 1453 my $border = $self->border;
924 1454
… …
937 my ($ev, $x, $y) = @_; 1467 my ($ev, $x, $y) = @_;
938 1468
939 my $dx = $ev->{x} - $ox; 1469 my $dx = $ev->{x} - $ox;
940 my $dy = $ev->{y} - $oy; 1470 my $dy = $ev->{y} - $oy;
941 1471
942 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1472 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
943 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1473 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1474
944 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1475 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
945 $self->check_size; 1476 $self->realloc;
946 }; 1477 };
947 1478
948 } elsif ($lr ^ $td) { 1479 } elsif ($lr ^ $td) {
949 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1480 my ($ox, $oy) = ($ev->{x}, $ev->{y});
950 my ($bx, $by) = ($self->{x}, $self->{y}); 1481 my ($bx, $by) = ($self->{x}, $self->{y});
… …
952 $self->{motion} = sub { 1483 $self->{motion} = sub {
953 my ($ev, $x, $y) = @_; 1484 my ($ev, $x, $y) = @_;
954 1485
955 ($x, $y) = ($ev->{x}, $ev->{y}); 1486 ($x, $y) = ($ev->{x}, $ev->{y});
956 1487
957 $self->move ($bx + $x - $ox, $by + $y - $oy); 1488 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
958 $self->update; 1489 # HACK: the next line is required to enforce placement
1490 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
959 }; 1491 };
1492 } else {
1493 return 0;
1494 }
1495
960 } 1496 1
961} 1497}
962 1498
963sub button_up { 1499sub invoke_button_up {
964 my ($self, $ev, $x, $y) = @_; 1500 my ($self, $ev, $x, $y) = @_;
965 1501
966 delete $self->{motion}; 1502 ! ! delete $self->{motion}
967} 1503}
968 1504
969sub mouse_motion { 1505sub invoke_mouse_motion {
970 my ($self, $ev, $x, $y) = @_; 1506 my ($self, $ev, $x, $y) = @_;
971 1507
972 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1508 $self->{motion}->($ev, $x, $y) if $self->{motion};
1509
1510 ! ! $self->{motion}
1511}
1512
1513sub invoke_visibility_change {
1514 my ($self, $visible) = @_;
1515
1516 delete $self->{motion} unless $visible;
1517
1518 0
973} 1519}
974 1520
975sub _draw { 1521sub _draw {
976 my ($self) = @_; 1522 my ($self) = @_;
977 1523
1524 my $child = $self->{children}[0];
1525
978 my ($w, $h ) = ($self->{w}, $self->{h}); 1526 my ($w, $h ) = ($self->{w}, $self->{h});
979 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1527 my ($cw, $ch) = ($child->{w}, $child->{h});
980 1528
981 glEnable GL_TEXTURE_2D; 1529 glEnable GL_TEXTURE_2D;
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 1531
984 my $border = $self->border; 1532 my $border = $self->border;
985 1533
986 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1538 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1539
1540 # move
1541 my $w2 = ($w - $border) * .5;
1542 my $h2 = ($h - $border) * .5;
1543 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1545 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1546
1547 # resize
1548 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1550 unless $self->{has_close_button};
1551 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
991 1553
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 1555 glColor @{ $self->{bg} };
994 1556
995 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
1558 # solve this better(?)
996 my $rep_x = $cw / $bg->{w}; 1559 $bg->{s} = $cw / $bg->{w};
997 my $rep_y = $ch / $bg->{h}; 1560 $bg->{t} = $ch / $bg->{h};
998
999 glColor @{ $self->{bg} };
1000
1001 $bg->{s} = $rep_x;
1002 $bg->{t} = $rep_y;
1003 $bg->{wrap_mode} = 1;
1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1561 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 } 1562 }
1006 1563
1007 glDisable GL_TEXTURE_2D; 1564 glDisable GL_TEXTURE_2D;
1008 1565
1009 $self->{title}->draw if $self->{title};
1010
1011 $self->child->draw; 1566 $child->draw;
1567
1568 if ($self->{title_widget}) {
1569 glTranslate 0, $border - $self->{h};
1570 $self->{title_widget}->_draw;
1571
1572 glTranslate 0, - ($border - $self->{h});
1573 }
1574
1575 $self->{close_button}->draw
1576 if $self->{close_button};
1012} 1577}
1013 1578
1014############################################################################# 1579#############################################################################
1015 1580
1016package CFClient::UI::Table; 1581package CFPlus::UI::Table;
1017 1582
1018our @ISA = CFClient::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1019 1584
1020use List::Util qw(max sum); 1585use List::Util qw(max sum);
1021 1586
1022use CFClient::OpenGL; 1587use CFPlus::OpenGL;
1023 1588
1024sub new { 1589sub new {
1025 my $class = shift; 1590 my $class = shift;
1026 1591
1027 $class->SUPER::new ( 1592 $class->SUPER::new (
1028 col_expand => [], 1593 col_expand => [],
1594 row_expand => [],
1029 @_ 1595 @_,
1030 ) 1596 )
1031} 1597}
1032 1598
1033sub add { 1599sub add {
1034 my ($self, $x, $y, $child) = @_;
1035
1036 $child->set_parent ($self);
1037 $self->{children}[$y][$x] = $child;
1038
1039 $child->check_size;
1040}
1041
1042sub children {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044}
1045
1046# TODO: move to container class maybe? send childs a signal on removal?
1047sub clear {
1048 my ($self) = @_; 1600 my ($self, @widgets) = @_;
1601
1602 for my $child (@widgets) {
1603 $child->{rowspan} ||= 1;
1604 $child->{colspan} ||= 1;
1605 }
1606
1607 $self->SUPER::add (@widgets);
1608}
1609
1610sub add_at {
1611 my $self = shift;
1612
1613 my @widgets;
1614
1615 while (@_) {
1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1617
1618 $child->{row} = $row;
1619 $child->{col} = $col;
1620
1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1628 my ($self) = @_;
1629
1630 my (@w, @h);
1049 1631
1050 my @children = $self->children; 1632 my @children = $self->children;
1051 delete $self->{children}; 1633
1634 # first pass, columns
1635 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1637
1638 my $sw = sum @w[$c .. $c + $cs - 1];
1639
1640 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 }
1052 1643 }
1053 for (@children) {
1054 delete $_->{parent};
1055 $_->hide;
1056 }
1057 1644
1058 $self->update; 1645 # second pass, rows
1059} 1646 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1060
1061sub get_wh {
1062 my ($self) = @_;
1063
1064 my (@w, @h);
1065
1066 for my $y (0 .. $#{$self->{children}}) {
1067 my $row = $self->{children}[$y]
1068 or next;
1069
1070 for my $x (0 .. $#$row) {
1071 my $widget = $row->[$x]
1072 or next;
1073 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1074 1648
1075 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1076 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1077 } 1653 }
1078 } 1654 }
1079 1655
1080 (\@w, \@h) 1656 (\@w, \@h)
1081} 1657}
… …
1089 (sum @$ws), 1665 (sum @$ws),
1090 (sum @$hs), 1666 (sum @$hs),
1091 ) 1667 )
1092} 1668}
1093 1669
1094sub size_allocate { 1670sub invoke_size_allocate {
1095 my ($self, $w, $h) = @_; 1671 my ($self, $w, $h) = @_;
1096 1672
1097 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1098 1674
1099 my $req_w = sum @$ws; 1675 my $req_w = (sum @$ws) || 1;
1100 my $req_h = sum @$hs; 1676 my $req_h = (sum @$hs) || 1;
1101 1677
1102 # TODO: nicer code && do row_expand 1678 # now linearly scale the rows/columns to the allocated size
1103 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1104 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1105 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1106 1682
1107 # linearly scale sizes
1108 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1109 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1110 1684
1111 CFClient::UI::harmonize $ws; 1685 CFPlus::UI::harmonize $ws;
1686
1687 my @row_expand = @{$self->{row_expand}};
1688 @row_expand = (1) x @$ws unless @row_expand;
1689 my $row_expand = (sum @row_expand) || 1;
1690
1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1692
1112 CFClient::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1113 1694
1114 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1115 1697
1116 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1117 my $row = $self->{children}[$r] 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1118 or next;
1119 1700
1120 my $x = 0; 1701 $widget->configure (
1121 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1122 1704 );
1123 for my $c (0 .. $#$row) { 1705 }
1124 my $col_w = $ws->[$c];
1125 1706
1126 if (my $widget = $row->[$c]) { 1707 1
1127 $widget->configure ($x, $y, $col_w, $row_h); 1708}
1128 }
1129 1709
1130 $x += $col_w; 1710#############################################################################
1711
1712package CFPlus::UI::Fixed;
1713
1714use List::Util qw(min max);
1715
1716our @ISA = CFPlus::UI::Container::;
1717
1718sub _scale($$$) {
1719 my ($rel, $val, $max) = @_;
1720
1721 $rel ? $val * $max : $val
1722}
1723
1724sub size_request {
1725 my ($self) = @_;
1726
1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1728
1729 # determine overall size by querying abs widgets
1730 for my $child ($self->visible_children) {
1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1734
1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1131 } 1737 }
1132
1133 $y += $row_h;
1134 } 1738 }
1135 1739
1136} 1740 my $W = $x2 - $x1;
1741 my $H = $y2 - $y1;
1137 1742
1138sub find_widget { 1743 # now layout remaining widgets
1744 for my $child ($self->visible_children) {
1745 if ($child->{c_rel}) {
1746 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1747 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1751 }
1752 }
1753
1754 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1;
1756
1757 ($W, $H)
1758}
1759
1760sub invoke_size_allocate {
1139 my ($self, $x, $y) = @_; 1761 my ($self, $W, $H) = @_;
1140 1762
1141 $x -= $self->{x}; 1763 for my $child ($self->visible_children) {
1142 $y -= $self->{y}; 1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1143 1766
1144 my $res; 1767 $x += $child->{c_halign} * $child->{req_w};
1768 $y += $child->{c_valign} * $child->{req_h};
1145 1769
1146 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1147 $res = $_->find_widget ($x, $y) 1771 }
1148 and return $res; 1772
1149 } 1773 1
1150
1151 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1152}
1153
1154sub _draw {
1155 my ($self) = @_;
1156
1157 for (grep $_, @{$self->{children}}) {
1158 $_->draw for grep $_, @$_;
1159 }
1160} 1774}
1161 1775
1162############################################################################# 1776#############################################################################
1163 1777
1164package CFClient::UI::HBox; 1778package CFPlus::UI::Box;
1165 1779
1166# TODO: wrap into common Box base class
1167
1168our @ISA = CFClient::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1169 1781
1170sub size_request { 1782sub size_request {
1171 my ($self) = @_; 1783 my ($self) = @_;
1172 1784
1173 my @alloc = map [$_->size_request], @{$self->{children}}; 1785 my @children = $self->visible_children;
1174 1786
1787 $self->{vertical}
1788 ? (
1789 (List::Util::max map $_->{req_w}, @children),
1790 (List::Util::sum map $_->{req_h}, @children),
1791 )
1792 : (
1793 (List::Util::sum map $_->{req_w}, @children),
1794 (List::Util::max map $_->{req_h}, @children),
1795 )
1796}
1797
1798sub invoke_size_allocate {
1799 my ($self, $w, $h) = @_;
1800
1801 my $space = $self->{vertical} ? $h : $w;
1802 my @children = $self->visible_children;
1803
1804 my @req;
1805
1806 if ($self->{homogeneous}) {
1807 @req = ($space / (@children || 1)) x @children;
1808 } else {
1809 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1810 my $req = List::Util::sum @req;
1811
1812 if ($req > $space) {
1813 # ah well, not enough space
1814 $_ *= $space / $req for @req;
1815 } else {
1816 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1817
1818 $space = ($space - $req) / $expand; # remaining space to give away
1819
1820 $req[$_] += $space * $children[$_]{expand}
1821 for 0 .. $#children;
1822 }
1175 ( 1823 }
1176 (List::Util::sum map $_->[0], @alloc), 1824
1177 (List::Util::max map $_->[1], @alloc), 1825 CFPlus::UI::harmonize \@req;
1826
1827 my $pos = 0;
1828 for (0 .. $#children) {
1829 my $alloc = $req[$_];
1830 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1831
1832 $pos += $alloc;
1833 }
1834
1835 1
1836}
1837
1838#############################################################################
1839
1840package CFPlus::UI::HBox;
1841
1842our @ISA = CFPlus::UI::Box::;
1843
1844sub new {
1845 my $class = shift;
1846
1847 $class->SUPER::new (
1848 vertical => 0,
1849 @_,
1178 ) 1850 )
1179} 1851}
1180 1852
1181sub size_allocate {
1182 my ($self, $w, $h) = @_;
1183
1184 ($h, $w) = ($w, $h);
1185
1186 my $children = $self->{children};
1187
1188 my @h = map $_->{req_w}, @$children;
1189
1190 my $req_h = List::Util::sum @h;
1191
1192 if ($req_h > $h) {
1193 # ah well, not enough space
1194 $_ *= $h / $req_h for @h;
1195 } else {
1196 my $exp = List::Util::sum map $_->{expand}, @$children;
1197 $exp ||= 1;
1198
1199 for (0 .. $#$children) {
1200 my $child = $children->[$_];
1201
1202 my $alloc_h = $h[$_];
1203 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1204 $h[$_] = $alloc_h;
1205 }
1206 }
1207
1208 CFClient::UI::harmonize \@h;
1209
1210 my $y = 0;
1211 for (0 .. $#$children) {
1212 my $child = $children->[$_];
1213 my $h = $h[$_];
1214 $child->configure ($y, 0, $h, $w);
1215
1216 $y += $h;
1217 }
1218
1219 1
1220}
1221
1222############################################################################# 1853#############################################################################
1223 1854
1224package CFClient::UI::VBox; 1855package CFPlus::UI::VBox;
1225 1856
1226# TODO: wrap into common Box base class 1857our @ISA = CFPlus::UI::Box::;
1227 1858
1228our @ISA = CFClient::UI::Container::; 1859sub new {
1860 my $class = shift;
1229 1861
1230sub size_request { 1862 $class->SUPER::new (
1231 my ($self) = @_; 1863 vertical => 1,
1232 1864 @_,
1233 my @alloc = map [$_->size_request], @{$self->{children}};
1234
1235 (
1236 (List::Util::max map $_->[0], @alloc),
1237 (List::Util::sum map $_->[1], @alloc),
1238 ) 1865 )
1239} 1866}
1240 1867
1241sub size_allocate {
1242 my ($self, $w, $h) = @_;
1243
1244 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1246 my $children = $self->{children};
1247
1248 my @h = map $_->{req_h}, @$children;
1249
1250 my $req_h = List::Util::sum @h;
1251
1252 if ($req_h > $h) {
1253 # ah well, not enough space
1254 $_ *= $h / $req_h for @h;
1255 } else {
1256 my $exp = List::Util::sum map $_->{expand}, @$children;
1257 $exp ||= 1;
1258
1259 for (0 .. $#$children) {
1260 my $child = $children->[$_];
1261
1262 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1263 }
1264 }
1265
1266 CFClient::UI::harmonize \@h;
1267
1268 my $y = 0;
1269 for (0 .. $#$children) {
1270 my $child = $children->[$_];
1271 my $h = $h[$_];
1272 $child->configure (0, $y, $w, $h);
1273
1274 $y += $h;
1275 }
1276
1277 1
1278}
1279
1280############################################################################# 1868#############################################################################
1281 1869
1282package CFClient::UI::Label; 1870package CFPlus::UI::Label;
1283 1871
1284our @ISA = CFClient::UI::DrawBG::; 1872our @ISA = CFPlus::UI::DrawBG::;
1285 1873
1286use CFClient::OpenGL; 1874use CFPlus::OpenGL;
1287 1875
1288sub new { 1876sub new {
1289 my ($class, %arg) = @_; 1877 my ($class, %arg) = @_;
1290 1878
1291 my $self = $class->SUPER::new ( 1879 my $self = $class->SUPER::new (
… …
1294 #active_bg => none 1882 #active_bg => none
1295 #font => default_font 1883 #font => default_font
1296 #text => initial text 1884 #text => initial text
1297 #markup => initial narkup 1885 #markup => initial narkup
1298 #max_w => maximum pixel width 1886 #max_w => maximum pixel width
1887 #style => 0, # render flags
1299 ellipsise => 3, # end 1888 ellipsise => 3, # end
1300 layout => (new CFClient::Layout), 1889 layout => (new CFPlus::Layout),
1301 fontsize => 1, 1890 fontsize => 1,
1302 align => -1, 1891 align => -1,
1303 valign => -1, 1892 valign => -1,
1304 padding => 2, 1893 padding_x => 2,
1894 padding_y => 2,
1305 can_events => 0, 1895 can_events => 0,
1306 %arg 1896 %arg
1307 ); 1897 );
1308 1898
1309 if (exists $self->{template}) { 1899 if (exists $self->{template}) {
1310 my $layout = new CFClient::Layout; 1900 my $layout = new CFPlus::Layout;
1311 $layout->set_text (delete $self->{template}); 1901 $layout->set_text (delete $self->{template});
1312 $self->{template} = $layout; 1902 $self->{template} = $layout;
1313 } 1903 }
1314 1904
1315 if (exists $self->{markup}) { 1905 if (exists $self->{markup}) {
… …
1319 } 1909 }
1320 1910
1321 $self 1911 $self
1322} 1912}
1323 1913
1324sub escape($) {
1325 local $_ = $_[0];
1326
1327 s/&/&amp;/g;
1328 s/>/&gt;/g;
1329 s/</&lt;/g;
1330
1331 $_
1332}
1333
1334sub update { 1914sub update {
1335 my ($self) = @_; 1915 my ($self) = @_;
1336 1916
1337 delete $self->{texture}; 1917 delete $self->{texture};
1338 $self->SUPER::update; 1918 $self->SUPER::update;
1339} 1919}
1340 1920
1921sub realloc {
1922 my ($self) = @_;
1923
1924 delete $self->{ox};
1925 $self->SUPER::realloc;
1926}
1927
1341sub set_text { 1928sub set_text {
1342 my ($self, $text) = @_; 1929 my ($self, $text) = @_;
1343 1930
1344 return if $self->{text} eq "T$text"; 1931 return if $self->{text} eq "T$text";
1345 $self->{text} = "T$text"; 1932 $self->{text} = "T$text";
1346 1933
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1348 $self->{layout}->set_text ($text); 1934 $self->{layout}->set_text ($text);
1349 1935
1936 delete $self->{size_req};
1937 $self->realloc;
1350 $self->update; 1938 $self->update;
1351 $self->check_size;
1352} 1939}
1353 1940
1354sub set_markup { 1941sub set_markup {
1355 my ($self, $markup) = @_; 1942 my ($self, $markup) = @_;
1356 1943
1357 return if $self->{text} eq "M$markup"; 1944 return if $self->{text} eq "M$markup";
1358 $self->{text} = "M$markup"; 1945 $self->{text} = "M$markup";
1359 1946
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1947 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361 1948
1362 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1363 $self->{layout}->set_markup ($markup); 1949 $self->{layout}->set_markup ($markup);
1364 1950
1951 delete $self->{size_req};
1952 $self->realloc;
1365 $self->update; 1953 $self->update;
1366 $self->check_size;
1367} 1954}
1368 1955
1369sub size_request { 1956sub size_request {
1370 my ($self) = @_; 1957 my ($self) = @_;
1371 1958
1959 $self->{size_req} ||= do {
1372 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1960 $self->{layout}->set_font ($self->{font}) if $self->{font};
1373 $self->{layout}->set_width ($self->{max_w} || -1); 1961 $self->{layout}->set_width ($self->{max_w} || -1);
1374 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1962 $self->{layout}->set_ellipsise ($self->{ellipsise});
1375 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1963 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1964 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1965
1378 my ($w, $h) = $self->{layout}->size; 1966 my ($w, $h) = $self->{layout}->size;
1379 1967
1380 if (exists $self->{template}) { 1968 if (exists $self->{template}) {
1381 $self->{template}->set_font ($self->{font}) if $self->{font}; 1969 $self->{template}->set_font ($self->{font}) if $self->{font};
1970 $self->{template}->set_width ($self->{max_w} || -1);
1382 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1971 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1383 1972
1384 my ($w2, $h2) = $self->{template}->size; 1973 my ($w2, $h2) = $self->{template}->size;
1385 1974
1386 $w = List::Util::max $w, $w2; 1975 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1976 $h = List::Util::max $h, $h2;
1977 }
1978
1979 [$w, $h]
1388 } 1980 };
1389 1981
1390 ( 1982 @{ $self->{size_req} }
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1983}
1395 1984
1985sub baseline_shift {
1986 $_[0]{layout}->descent
1987}
1988
1396sub size_allocate { 1989sub invoke_size_allocate {
1397 my ($self, $w, $h) = @_; 1990 my ($self, $w, $h) = @_;
1398 1991
1992 delete $self->{ox};
1993
1399 delete $self->{texture}; 1994 delete $self->{texture}
1995 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1996
1997 1
1400} 1998}
1401 1999
1402sub set_fontsize { 2000sub set_fontsize {
1403 my ($self, $fontsize) = @_; 2001 my ($self, $fontsize) = @_;
1404 2002
1405 $self->{fontsize} = $fontsize; 2003 $self->{fontsize} = $fontsize;
2004 delete $self->{size_req};
1406 delete $self->{texture}; 2005 delete $self->{texture};
1407 2006
1408 $self->update; 2007 $self->realloc;
1409 $self->check_size; 2008}
2009
2010sub reconfigure {
2011 my ($self) = @_;
2012
2013 delete $self->{size_req};
2014 delete $self->{texture};
2015
2016 $self->SUPER::reconfigure;
1410} 2017}
1411 2018
1412sub _draw { 2019sub _draw {
1413 my ($self) = @_; 2020 my ($self) = @_;
1414 2021
1415 $self->SUPER::_draw; # draw background, if applicable 2022 $self->SUPER::_draw; # draw background, if applicable
1416 2023
1417 my $tex = $self->{texture} ||= do { 2024 my $size = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 2025 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2026 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 2027 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2028 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2029 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2030 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424 2031
1425 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2032 [$self->{layout}->size]
1426
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1429 : ($self->{w} - $tex->{w}) * 0.5);
1430
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1433 : ($self->{h} - $tex->{h}) * 0.5);
1434
1435 $tex
1436 }; 2033 };
1437 2034
1438 glEnable GL_TEXTURE_2D; 2035 unless (exists $self->{ox}) {
1439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2036 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
2037 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
2038 : ($self->{w} - $size->[0]) * 0.5);
1440 2039
1441 if ($tex->{format} == GL_ALPHA) { 2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1442 glColor @{$self->{fg}}; 2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1443 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 2042 : ($self->{h} - $size->[1]) * 0.5);
1444 } else {
1445 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1446 } 2043 };
1447 2044
1448 glDisable GL_TEXTURE_2D; 2045# unless ($self->{list}) {
2046# $self->{list} = CFPlus::OpenGL::glGenList;
2047# CFPlus::OpenGL::glNewList $self->{list};
2048# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2049# CFPlus::OpenGL::glEndList;
2050# }
2051#
2052# CFPlus::OpenGL::glCallList $self->{list};
2053
2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1449} 2055}
2056
2057#sub destroy {
2058# my ($self) = @_;
2059#
2060# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2061#
2062# $self->SUPER::destroy;
2063#}
1450 2064
1451############################################################################# 2065#############################################################################
1452 2066
1453package CFClient::UI::EntryBase; 2067package CFPlus::UI::EntryBase;
1454 2068
1455our @ISA = CFClient::UI::Label::; 2069our @ISA = CFPlus::UI::Label::;
1456 2070
1457use CFClient::OpenGL; 2071use CFPlus::OpenGL;
1458 2072
1459sub new { 2073sub new {
1460 my $class = shift; 2074 my $class = shift;
1461 2075
1462 $class->SUPER::new ( 2076 $class->SUPER::new (
… …
1466 active_fg => [0, 0, 0], 2080 active_fg => [0, 0, 0],
1467 can_hover => 1, 2081 can_hover => 1,
1468 can_focus => 1, 2082 can_focus => 1,
1469 valign => 0, 2083 valign => 0,
1470 can_events => 1, 2084 can_events => 1,
2085 ellipsise => 0,
2086 #text => ...
2087 #hidden => "*",
1471 @_ 2088 @_
1472 ) 2089 )
1473} 2090}
1474 2091
1475sub _set_text { 2092sub _set_text {
… …
1477 2094
1478 delete $self->{cur_h}; 2095 delete $self->{cur_h};
1479 2096
1480 return if $self->{text} eq $text; 2097 return if $self->{text} eq $text;
1481 2098
1482 delete $self->{texture};
1483
1484 $self->{last_activity} = $::NOW; 2099 $self->{last_activity} = $::NOW;
1485 $self->{text} = $text; 2100 $self->{text} = $text;
1486 2101
1487 $text =~ s/./*/g if $self->{hidden}; 2102 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 2103 $self->{layout}->set_text ("$text ");
2104 delete $self->{size_req};
1489 2105
1490 $self->emit (changed => $self->{text}); 2106 $self->emit (changed => $self->{text});
2107
2108 $self->realloc;
2109 $self->update;
1491} 2110}
1492 2111
1493sub set_text { 2112sub set_text {
1494 my ($self, $text) = @_; 2113 my ($self, $text) = @_;
1495 2114
1496 $self->{cursor} = length $text; 2115 $self->{cursor} = length $text;
1497 $self->_set_text ($text); 2116 $self->_set_text ($text);
1498 $self->update;
1499 $self->check_size;
1500} 2117}
1501 2118
1502sub get_text { 2119sub get_text {
1503 $_[0]{text} 2120 $_[0]{text}
1504} 2121}
… …
1509 my ($w, $h) = $self->SUPER::size_request; 2126 my ($w, $h) = $self->SUPER::size_request;
1510 2127
1511 ($w + 1, $h) # add 1 for cursor 2128 ($w + 1, $h) # add 1 for cursor
1512} 2129}
1513 2130
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518}
1519
1520sub key_down { 2131sub invoke_key_down {
1521 my ($self, $ev) = @_; 2132 my ($self, $ev) = @_;
1522 2133
1523 my $mod = $ev->{mod}; 2134 my $mod = $ev->{mod};
1524 my $sym = $ev->{sym}; 2135 my $sym = $ev->{sym};
1525 my $uni = $ev->{unicode}; 2136 my $uni = $ev->{unicode};
1526 2137
1527 my $text = $self->get_text; 2138 my $text = $self->get_text;
2139
2140 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1528 2141
1529 if ($uni == 8) { 2142 if ($uni == 8) {
1530 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2143 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1531 } elsif ($uni == 127) { 2144 } elsif ($uni == 127) {
1532 substr $text, $self->{cursor}, 1, ""; 2145 substr $text, $self->{cursor}, 1, "";
1533 } elsif ($sym == CFClient::SDLK_LEFT) { 2146 } elsif ($sym == CFPlus::SDLK_LEFT) {
1534 --$self->{cursor} if $self->{cursor}; 2147 --$self->{cursor} if $self->{cursor};
1535 } elsif ($sym == CFClient::SDLK_RIGHT) { 2148 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1536 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2149 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1537 } elsif ($sym == CFClient::SDLK_HOME) { 2150 } elsif ($sym == CFPlus::SDLK_HOME) {
2151 # what a hack
2152 $self->{cursor} =
2153 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2154 ? length $1
2155 : 0;
2156 } elsif ($sym == CFPlus::SDLK_END) {
2157 # uh, again
2158 $self->{cursor} =
2159 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2160 ? $self->{cursor} + length $1
2161 : length $self->{text};
2162 } elsif ($uni == 21) { # ctrl-u
2163 $text = "";
1538 $self->{cursor} = 0; 2164 $self->{cursor} = 0;
1539 } elsif ($sym == CFClient::SDLK_END) {
1540 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 2165 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 2166 $self->emit ('escape');
1543 } elsif ($uni) { 2167 } elsif ($uni == 0x0d) {
2168 substr $text, $self->{cursor}++, 0, "\012";
2169 } elsif ($uni >= 0x20) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 2170 substr $text, $self->{cursor}++, 0, chr $uni;
2171 } else {
2172 return 0;
1545 } 2173 }
1546 2174
1547 $self->_set_text ($text); 2175 $self->_set_text ($text);
2176
2177 $self->realloc;
1548 $self->update; 2178 $self->update;
1549 $self->check_size;
1550}
1551 2179
2180 1
2181}
2182
1552sub focus_in { 2183sub invoke_focus_in {
1553 my ($self) = @_; 2184 my ($self) = @_;
1554 2185
1555 $self->{last_activity} = $::NOW; 2186 $self->{last_activity} = $::NOW;
1556 2187
1557 $self->SUPER::focus_in; 2188 $self->SUPER::invoke_focus_in
1558} 2189}
1559 2190
1560sub button_down { 2191sub invoke_button_down {
1561 my ($self, $ev, $x, $y) = @_; 2192 my ($self, $ev, $x, $y) = @_;
1562 2193
1563 $self->SUPER::button_down ($ev, $x, $y); 2194 $self->SUPER::invoke_button_down ($ev, $x, $y);
1564 2195
1565 my $idx = $self->{layout}->xy_to_index ($x, $y); 2196 my $idx = $self->{layout}->xy_to_index ($x, $y);
1566 2197
1567 # byte-index to char-index 2198 # byte-index to char-index
1568 my $text = $self->{text}; 2199 my $text = $self->{text};
1569 utf8::encode $text; 2200 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1570 $self->{cursor} = length substr $text, 0, $idx; 2201 $self->{cursor} = length $text;
1571 2202
1572 $self->_set_text ($self->{text}); 2203 $self->_set_text ($self->{text});
1573 $self->update; 2204 $self->update;
2205
2206 1
1574} 2207}
1575 2208
1576sub mouse_motion { 2209sub invoke_mouse_motion {
1577 my ($self, $ev, $x, $y) = @_; 2210 my ($self, $ev, $x, $y) = @_;
1578# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2211# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2212
2213 1
1579} 2214}
1580 2215
1581sub _draw { 2216sub _draw {
1582 my ($self) = @_; 2217 my ($self) = @_;
1583 2218
1584 local $self->{fg} = $self->{fg}; 2219 local $self->{fg} = $self->{fg};
1585 2220
1586 if ($FOCUS == $self) { 2221 if ($FOCUS == $self) {
1587 glColor @{$self->{active_bg}}; 2222 glColor_premultiply @{$self->{active_bg}};
1588 $self->{fg} = $self->{active_fg}; 2223 $self->{fg} = $self->{active_fg};
1589 } else { 2224 } else {
1590 glColor @{$self->{bg}}; 2225 glColor_premultiply @{$self->{bg}};
1591 } 2226 }
1592 2227
1593 glEnable GL_BLEND; 2228 glEnable GL_BLEND;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2229 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1595 glBegin GL_QUADS; 2230 glBegin GL_QUADS;
1596 glVertex 0 , 0; 2231 glVertex 0 , 0;
1597 glVertex 0 , $self->{h}; 2232 glVertex 0 , $self->{h};
1598 glVertex $self->{w}, $self->{h}; 2233 glVertex $self->{w}, $self->{h};
1599 glVertex $self->{w}, 0; 2234 glVertex $self->{w}, 0;
… …
1610 utf8::encode $text; 2245 utf8::encode $text;
1611 2246
1612 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2247 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1613 } 2248 }
1614 2249
1615 glColor @{$self->{fg}};
1616 glBegin GL_LINES; 2250 glBegin GL_LINES;
1617 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2251 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1618 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2252 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1619 glEnd; 2253 glEnd;
1620 } 2254 }
1621} 2255}
1622 2256
2257#############################################################################
2258
1623package CFClient::UI::Entry; 2259package CFPlus::UI::Entry;
1624 2260
1625our @ISA = CFClient::UI::EntryBase::; 2261our @ISA = CFPlus::UI::EntryBase::;
1626 2262
1627use CFClient::OpenGL; 2263use CFPlus::OpenGL;
1628 2264
1629sub key_down { 2265sub invoke_key_down {
1630 my ($self, $ev) = @_; 2266 my ($self, $ev) = @_;
1631 2267
1632 my $sym = $ev->{sym}; 2268 my $sym = $ev->{sym};
1633 2269
1634 if ($sym == 13) { 2270 if ($ev->{uni} == 0x0d || $sym == 13) {
1635 unshift @{$self->{history}}, 2271 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 2272 my $txt = $self->get_text;
2273
1637 $self->{history_pointer} = -1; 2274 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 2275 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 2276 $self->emit (activate => $txt);
1640 $self->update; 2277 $self->update;
1641 2278
1642 } elsif ($sym == CFClient::SDLK_UP) { 2279 } elsif ($sym == CFPlus::SDLK_UP) {
1643 if ($self->{history_pointer} < 0) { 2280 if ($self->{history_pointer} < 0) {
1644 $self->{history_saveback} = $self->get_text; 2281 $self->{history_saveback} = $self->get_text;
1645 } 2282 }
1646 if (@{$self->{history} || []} > 0) { 2283 if (@{$self->{history} || []} > 0) {
1647 $self->{history_pointer}++; 2284 $self->{history_pointer}++;
… …
1649 $self->{history_pointer} = @{$self->{history} || []} - 1; 2286 $self->{history_pointer} = @{$self->{history} || []} - 1;
1650 } 2287 }
1651 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2288 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1652 } 2289 }
1653 2290
1654 } elsif ($sym == CFClient::SDLK_DOWN) { 2291 } elsif ($sym == CFPlus::SDLK_DOWN) {
1655 $self->{history_pointer}--; 2292 $self->{history_pointer}--;
1656 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2293 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1657 2294
1658 if ($self->{history_pointer} >= 0) { 2295 if ($self->{history_pointer} >= 0) {
1659 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2296 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1660 } else { 2297 } else {
1661 $self->set_text ($self->{history_saveback}); 2298 $self->set_text ($self->{history_saveback});
1662 } 2299 }
1663 2300
1664 } else { 2301 } else {
1665 $self->SUPER::key_down ($ev); 2302 return $self->SUPER::invoke_key_down ($ev)
2303 }
2304
1666 } 2305 1
1667
1668} 2306}
1669 2307
1670############################################################################# 2308#############################################################################
1671 2309
2310package CFPlus::UI::TextEdit;
2311
2312our @ISA = CFPlus::UI::EntryBase::;
2313
2314use CFPlus::OpenGL;
2315
2316sub move_cursor_ver {
2317 my ($self, $dy) = @_;
2318
2319 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2320
2321 $y += $dy;
2322
2323 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2324 $self->{cursor} = $index;
2325 delete $self->{cur_h};
2326 $self->update;
2327 return;
2328 }
2329}
2330
2331sub invoke_key_down {
2332 my ($self, $ev) = @_;
2333
2334 my $sym = $ev->{sym};
2335
2336 if ($sym == CFPlus::SDLK_UP) {
2337 $self->move_cursor_ver (-1);
2338 } elsif ($sym == CFPlus::SDLK_DOWN) {
2339 $self->move_cursor_ver (+1);
2340 } else {
2341 return $self->SUPER::invoke_key_down ($ev)
2342 }
2343
2344 1
2345}
2346
2347#############################################################################
2348
1672package CFClient::UI::Button; 2349package CFPlus::UI::Button;
1673 2350
1674our @ISA = CFClient::UI::Label::; 2351our @ISA = CFPlus::UI::Label::;
1675 2352
1676use CFClient::OpenGL; 2353use CFPlus::OpenGL;
1677 2354
1678my @tex = 2355my @tex =
1679 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2356 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1680 qw(b1_button_active.png); 2357 qw(b1_button_inactive.png b1_button_active.png);
1681 2358
1682sub new { 2359sub new {
1683 my $class = shift; 2360 my $class = shift;
1684 2361
1685 $class->SUPER::new ( 2362 $class->SUPER::new (
1686 padding => 4, 2363 padding_x => 4,
2364 padding_y => 4,
1687 fg => [1, 1, 1], 2365 fg => [1.0, 1.0, 1.0],
1688 active_fg => [0, 0, 1], 2366 active_fg => [0.8, 0.8, 0.8],
1689 can_hover => 1, 2367 can_hover => 1,
1690 align => 0, 2368 align => 0,
1691 valign => 0, 2369 valign => 0,
1692 can_events => 1, 2370 can_events => 1,
1693 @_ 2371 @_
1694 ) 2372 )
1695} 2373}
1696 2374
1697sub button_up { 2375sub invoke_button_up {
1698 my ($self, $ev, $x, $y) = @_; 2376 my ($self, $ev, $x, $y) = @_;
1699 2377
2378 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 2379 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 2380 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate"); 2381
1703 } 2382 1
1704} 2383}
1705 2384
1706sub _draw { 2385sub _draw {
1707 my ($self) = @_; 2386 my ($self) = @_;
1708 2387
1709 local $self->{fg} = $self->{fg}; 2388 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1710
1711 if ($GRAB == $self) {
1712 $self->{fg} = $self->{active_fg};
1713 }
1714 2389
1715 glEnable GL_TEXTURE_2D; 2390 glEnable GL_TEXTURE_2D;
1716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1717 glColor 0, 0, 0, 1; 2392 glColor 0, 0, 0, 1;
1718 2393
2394 my $tex = $tex[$GRAB == $self];
1719 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2395 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1720 2396
1721 glDisable GL_TEXTURE_2D; 2397 glDisable GL_TEXTURE_2D;
1722 2398
1723 $self->SUPER::_draw; 2399 $self->SUPER::_draw;
1724} 2400}
1725 2401
1726############################################################################# 2402#############################################################################
1727 2403
1728package CFClient::UI::CheckBox; 2404package CFPlus::UI::CheckBox;
1729 2405
1730our @ISA = CFClient::UI::DrawBG::; 2406our @ISA = CFPlus::UI::DrawBG::;
1731 2407
1732my @tex = 2408my @tex =
1733 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2409 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1734 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2410 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1735 2411
1736use CFClient::OpenGL; 2412use CFPlus::OpenGL;
1737 2413
1738sub new { 2414sub new {
1739 my $class = shift; 2415 my $class = shift;
1740 2416
1741 $class->SUPER::new ( 2417 $class->SUPER::new (
1742 padding => 2, 2418 padding_x => 2,
2419 padding_y => 2,
1743 fg => [1, 1, 1], 2420 fg => [1, 1, 1],
1744 active_fg => [1, 1, 0], 2421 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2], 2422 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5], 2423 active_bg => [1, 1, 1, 0.5],
1747 state => 0, 2424 state => 0,
… …
1751} 2428}
1752 2429
1753sub size_request { 2430sub size_request {
1754 my ($self) = @_; 2431 my ($self) = @_;
1755 2432
1756 ($self->{padding} * 2 + 6) x 2 2433 (6) x 2
1757} 2434}
1758 2435
2436sub toggle {
2437 my ($self) = @_;
2438
2439 $self->{state} = !$self->{state};
2440 $self->emit (changed => $self->{state});
2441 $self->update;
2442}
2443
1759sub button_down { 2444sub invoke_button_down {
1760 my ($self, $ev, $x, $y) = @_; 2445 my ($self, $ev, $x, $y) = @_;
1761 2446
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2447 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2448 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1764 $self->{state} = !$self->{state}; 2449 $self->toggle;
1765 $self->emit (changed => $self->{state}); 2450 } else {
2451 return 0
2452 }
2453
1766 } 2454 1
1767} 2455}
1768 2456
1769sub _draw { 2457sub _draw {
1770 my ($self) = @_; 2458 my ($self) = @_;
1771 2459
1772 $self->SUPER::_draw; 2460 $self->SUPER::_draw;
1773 2461
1774 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2462 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1775 2463
1776 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2464 my ($w, $h) = @$self{qw(w h)};
2465
2466 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1777 2467
1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2468 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1779 2469
1780 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2470 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781 2471
… …
1784 glDisable GL_TEXTURE_2D; 2474 glDisable GL_TEXTURE_2D;
1785} 2475}
1786 2476
1787############################################################################# 2477#############################################################################
1788 2478
1789package CFClient::UI::Image; 2479package CFPlus::UI::Image;
1790 2480
1791our @ISA = CFClient::UI::Base::; 2481our @ISA = CFPlus::UI::Base::;
1792 2482
1793use CFClient::OpenGL; 2483use CFPlus::OpenGL;
1794use Carp qw/confess/;
1795 2484
1796our %loaded_images; 2485our %texture_cache;
1797 2486
1798sub new { 2487sub new {
1799 my $class = shift; 2488 my $class = shift;
1800 2489
1801 my $self = $class->SUPER::new (can_events => 0, @_); 2490 my $self = $class->SUPER::new (
2491 can_events => 0,
2492 @_,
2493 );
1802 2494
1803 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2495 $self->{path} || $self->{tex}
2496 or Carp::croak "'path' or 'tex' attributes required";
1804 2497
1805 $loaded_images{$self->{image}} ||= 2498 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1806 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2499 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1807 2500
1808 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2501 CFPlus::weaken $texture_cache{$self->{path}};
1809 2502
1810 Scalar::Util::weaken $loaded_images{$self->{image}}; 2503 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1811
1812 $self->{aspect} = $tex->{w} / $tex->{h};
1813 2504
1814 $self 2505 $self
1815} 2506}
1816 2507
2508sub STORABLE_freeze {
2509 my ($self, $cloning) = @_;
2510
2511 $self->{path}
2512 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2513
2514 $self->{path}
2515}
2516
2517sub STORABLE_attach {
2518 my ($self, $cloning, $path) = @_;
2519
2520 $self->new (path => $path)
2521}
2522
1817sub size_request { 2523sub size_request {
1818 my ($self) = @_; 2524 my ($self) = @_;
1819 2525
1820 ($self->{tex}->{w}, $self->{tex}->{h}) 2526 ($self->{tex}{w}, $self->{tex}{h})
1821} 2527}
1822 2528
1823sub _draw { 2529sub _draw {
1824 my ($self) = @_; 2530 my ($self) = @_;
1825 2531
… …
1835 } 2541 }
1836 2542
1837 glEnable GL_TEXTURE_2D; 2543 glEnable GL_TEXTURE_2D;
1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2544 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1839 2545
1840 $tex->draw_quad_alpha (0, 0, $w, $h); 2546 $tex->draw_quad (0, 0, $w, $h);
1841 2547
1842 glDisable GL_TEXTURE_2D; 2548 glDisable GL_TEXTURE_2D;
1843} 2549}
1844 2550
1845############################################################################# 2551#############################################################################
1846 2552
2553package CFPlus::UI::ImageButton;
2554
2555our @ISA = CFPlus::UI::Image::;
2556
2557use CFPlus::OpenGL;
2558
2559my %textures;
2560
2561sub new {
2562 my $class = shift;
2563
2564 my $self = $class->SUPER::new (
2565 padding_x => 4,
2566 padding_y => 4,
2567 fg => [1, 1, 1],
2568 active_fg => [0, 0, 1],
2569 can_hover => 1,
2570 align => 0,
2571 valign => 0,
2572 can_events => 1,
2573 @_
2574 );
2575}
2576
2577sub invoke_button_up {
2578 my ($self, $ev, $x, $y) = @_;
2579
2580 $self->emit ("activate")
2581 if $x >= 0 && $x < $self->{w}
2582 && $y >= 0 && $y < $self->{h};
2583
2584 1
2585}
2586
2587#############################################################################
2588
1847package CFClient::UI::VGauge; 2589package CFPlus::UI::VGauge;
1848 2590
1849our @ISA = CFClient::UI::Base::; 2591our @ISA = CFPlus::UI::Base::;
1850 2592
1851use List::Util qw(min max); 2593use List::Util qw(min max);
1852 2594
1853use CFClient::OpenGL; 2595use CFPlus::OpenGL;
1854 2596
1855my %tex = ( 2597my %tex = (
1856 food => [ 2598 food => [
1857 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2599 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1858 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2600 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1859 ], 2601 ],
1860 grace => [ 2602 grace => [
1861 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2603 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1862 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2604 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1863 ], 2605 ],
1864 hp => [ 2606 hp => [
1865 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2607 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1866 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2608 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1867 ], 2609 ],
1868 mana => [ 2610 mana => [
1869 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2611 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1870 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2612 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1871 ], 2613 ],
1872); 2614);
1873 2615
1874# eg. VGauge->new (gauge => 'food'), default gauge: food 2616# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
1934 my $ycut1 = max 0, min 1, $ycut; 2676 my $ycut1 = max 0, min 1, $ycut;
1935 my $ycut2 = max 0, min 1, $ycut - 1; 2677 my $ycut2 = max 0, min 1, $ycut - 1;
1936 2678
1937 my $h1 = $self->{h} * (1 - $ycut1); 2679 my $h1 = $self->{h} * (1 - $ycut1);
1938 my $h2 = $self->{h} * (1 - $ycut2); 2680 my $h2 = $self->{h} * (1 - $ycut2);
2681 my $h3 = $self->{h};
2682
2683 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1939 2684
1940 glEnable GL_BLEND; 2685 glEnable GL_BLEND;
1941 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2686 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2687 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1942 glEnable GL_TEXTURE_2D; 2688 glEnable GL_TEXTURE_2D;
1943 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2689 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1944 2690
1945 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2691 glBindTexture GL_TEXTURE_2D, $t1->{name};
1946 glBegin GL_QUADS; 2692 glBegin GL_QUADS;
… …
1961 2707
1962 if ($t3) { 2708 if ($t3) {
1963 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2709 glBindTexture GL_TEXTURE_2D, $t3->{name};
1964 glBegin GL_QUADS; 2710 glBegin GL_QUADS;
1965 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2711 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1966 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2712 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1967 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2713 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1968 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2714 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1969 glEnd; 2715 glEnd;
1970 } 2716 }
1971 2717
1972 glDisable GL_BLEND; 2718 glDisable GL_BLEND;
1973 glDisable GL_TEXTURE_2D; 2719 glDisable GL_TEXTURE_2D;
1974} 2720}
1975 2721
1976############################################################################# 2722#############################################################################
1977 2723
1978package CFClient::UI::Gauge; 2724package CFPlus::UI::Gauge;
1979 2725
1980our @ISA = CFClient::UI::VBox::; 2726our @ISA = CFPlus::UI::VBox::;
1981 2727
1982sub new { 2728sub new {
1983 my ($class, %arg) = @_; 2729 my ($class, %arg) = @_;
1984 2730
1985 my $self = $class->SUPER::new ( 2731 my $self = $class->SUPER::new (
… …
1987 can_hover => 1, 2733 can_hover => 1,
1988 can_events => 1, 2734 can_events => 1,
1989 %arg, 2735 %arg,
1990 ); 2736 );
1991 2737
1992 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2738 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
1993 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2739 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1994 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2740 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
1995 2741
1996 $self 2742 $self
1997} 2743}
1998 2744
1999sub set_fontsize { 2745sub set_fontsize {
… …
2020 $self->{value}->set_text ($val); 2766 $self->{value}->set_text ($val);
2021} 2767}
2022 2768
2023############################################################################# 2769#############################################################################
2024 2770
2025package CFClient::UI::Slider; 2771package CFPlus::UI::Slider;
2026 2772
2027use strict; 2773use strict;
2028 2774
2029use CFClient::OpenGL; 2775use CFPlus::OpenGL;
2030 2776
2031our @ISA = CFClient::UI::DrawBG::; 2777our @ISA = CFPlus::UI::DrawBG::;
2032 2778
2033my @tex = 2779my @tex =
2034 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2780 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2035 qw(s1_slider.png s1_slider_bg.png); 2781 qw(s1_slider.png s1_slider_bg.png);
2036 2782
2037sub new { 2783sub new {
2038 my $class = shift; 2784 my $class = shift;
2039 2785
… …
2045 my $self = $class->SUPER::new ( 2791 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2792 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2793 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2794 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2795 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2796 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2797 min_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2798 min_h => $::WIDTH / 80,
2053 vertical => 0, 2799 vertical => 0,
2054 can_hover => 1, 2800 can_hover => 1,
2055 inner_pad => .05, 2801 inner_pad => 0.02,
2056 @_ 2802 @_
2057 ); 2803 );
2058 2804
2059 $self->set_value ($self->{range}[0]); 2805 $self->set_value ($self->{range}[0]);
2060 $self->update; 2806 $self->update;
2061 2807
2062 $self 2808 $self
2063} 2809}
2064 2810
2811sub set_range {
2812 my ($self, $range) = @_;
2813
2814 ($range, $self->{range}) = ($self->{range}, $range);
2815
2816 if ("@$range" ne "@{$self->{range}}") {
2817 $self->update;
2818 $self->set_value ($self->{range}[0]);
2819 }
2820}
2821
2065sub set_value { 2822sub set_value {
2066 my ($self, $value) = @_; 2823 my ($self, $value) = @_;
2067 2824
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2825 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2826
2070 $hi = $lo + 1 if $hi <= $lo; 2827 $hi = $lo + 1 if $hi <= $lo;
2071 2828
2829 $page = $hi - $lo if $page > $hi - $lo;
2830
2072 $value = $lo if $value < $lo; 2831 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2832 $value = $hi - $page if $value > $hi - $page;
2074 2833
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2834 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2835 if $unit;
2077
2078 $page = $hi - $lo if $page > $hi - $lo;
2079 2836
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2837 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2838
2082 if ($value != $old_value) { 2839 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2840 $self->emit (changed => $value);
… …
2086} 2843}
2087 2844
2088sub size_request { 2845sub size_request {
2089 my ($self) = @_; 2846 my ($self) = @_;
2090 2847
2091 my $w = $self->{req_w}; 2848 ($self->{req_w}, $self->{req_h})
2092 my $h = $self->{req_h};
2093
2094 $self->{vertical} ? ($h, $w) : ($w, $h)
2095} 2849}
2096 2850
2097sub button_down { 2851sub invoke_button_down {
2098 my ($self, $ev, $x, $y) = @_; 2852 my ($self, $ev, $x, $y) = @_;
2099 2853
2100 $self->SUPER::button_down ($ev, $x, $y); 2854 $self->SUPER::invoke_button_down ($ev, $x, $y);
2855
2856 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2857
2101 $self->mouse_motion ($ev, $x, $y); 2858 $self->invoke_mouse_motion ($ev, $x, $y);
2102}
2103 2859
2860 1
2861}
2862
2104sub mouse_motion { 2863sub invoke_mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2864 my ($self, $ev, $x, $y) = @_;
2106 2865
2107 if ($GRAB == $self) { 2866 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2867 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2868
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2869 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2870
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2871 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2872
2114 $self->set_value ($x * ($hi - $lo) + $lo); 2873 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2874 } else {
2875 return 0;
2876 }
2877
2115 } 2878 1
2879}
2880
2881sub invoke_mouse_wheel {
2882 my ($self, $ev) = @_;
2883
2884 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2885
2886 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2887
2888 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2889
2890 1
2116} 2891}
2117 2892
2118sub update { 2893sub update {
2119 my ($self) = @_; 2894 my ($self) = @_;
2120 2895
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2896 delete $self->{knob_w};
2897 $self->SUPER::update;
2898}
2899
2900sub _draw {
2901 my ($self) = @_;
2902
2903 unless ($self->{knob_w}) {
2122 $self->set_value ($self->{range}[0]); 2904 $self->set_value ($self->{range}[0]);
2123 2905
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2906 my ($value, $lo, $hi, $page) = @{$self->{range}};
2907 my $range = ($hi - $page - $lo) || 1e-100;
2125 2908
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2909 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2910
2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2911 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2912 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2129 2913
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2914 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2915 $value = $value * $self->{scale} + $self->{offset};
2132 2916
2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value; 2917 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2918 $self->{knob_w} = $knob_w;
2140 }); 2919 }
2141
2142 $self->SUPER::update;
2143}
2144
2145sub _draw {
2146 my ($self) = @_;
2147 2920
2148 $self->SUPER::_draw (); 2921 $self->SUPER::_draw ();
2149 2922
2150 glScale $self->{w}, $self->{h}; 2923 glScale $self->{w}, $self->{h};
2151 2924
… …
2171 glDisable GL_TEXTURE_2D; 2944 glDisable GL_TEXTURE_2D;
2172} 2945}
2173 2946
2174############################################################################# 2947#############################################################################
2175 2948
2176package CFClient::UI::TextView; 2949package CFPlus::UI::ValSlider;
2177 2950
2178our @ISA = CFClient::UI::HBox::; 2951our @ISA = CFPlus::UI::HBox::;
2179 2952
2953sub new {
2954 my ($class, %arg) = @_;
2955
2956 my $range = delete $arg{range};
2957
2958 my $self = $class->SUPER::new (
2959 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2960 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2961 to_value => sub { shift },
2962 from_value => sub { shift },
2963 %arg,
2964 );
2965
2966 $self->{slider}->connect (changed => sub {
2967 my ($self, $value) = @_;
2968 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2969 $self->{parent}->emit (changed => $value);
2970 });
2971
2972# $self->{entry}->connect (changed => sub {
2973# my ($self, $value) = @_;
2974# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2975# $self->{parent}->emit (changed => $value);
2976# });
2977
2978 $self->add ($self->{slider}, $self->{entry});
2979
2980 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2981
2982 $self
2983}
2984
2985sub set_range { shift->{slider}->set_range (@_) }
2986sub set_value { shift->{slider}->set_value (@_) }
2987
2988#############################################################################
2989
2990package CFPlus::UI::TextScroller;
2991
2992our @ISA = CFPlus::UI::HBox::;
2993
2180use CFClient::OpenGL; 2994use CFPlus::OpenGL;
2181 2995
2182sub new { 2996sub new {
2183 my $class = shift; 2997 my $class = shift;
2184 2998
2185 my $self = $class->SUPER::new ( 2999 my $self = $class->SUPER::new (
2186 fontsize => 1, 3000 fontsize => 1,
2187 can_events => 0, 3001 can_events => 1,
3002 indent => 0,
2188 #font => default_font 3003 #font => default_font
2189 @_, 3004 @_,
2190 3005
2191 layout => (new CFClient::Layout 1), 3006 layout => (new CFPlus::Layout),
2192 par => [], 3007 par => [],
3008 max_par => 0,
2193 height => 0, 3009 height => 0,
2194 children => [ 3010 children => [
2195 (new CFClient::UI::Empty expand => 1), 3011 (new CFPlus::UI::Empty expand => 1),
2196 (new CFClient::UI::Slider vertical => 1), 3012 (new CFPlus::UI::Slider vertical => 1),
2197 ], 3013 ],
2198 ); 3014 );
2199 3015
2200 $self->{children}[1]->connect (changed => sub { $self->update }); 3016 $self->{children}[1]->connect (changed => sub { $self->update });
2201 3017
… …
2207 3023
2208 $self->{fontsize} = $fontsize; 3024 $self->{fontsize} = $fontsize;
2209 $self->reflow; 3025 $self->reflow;
2210} 3026}
2211 3027
2212sub text_height { 3028sub size_request {
3029 my ($self) = @_;
3030
3031 my ($empty, $slider) = $self->visible_children;
3032
3033 local $self->{children} = [$empty, $slider];
3034 $self->SUPER::size_request
3035}
3036
3037sub invoke_size_allocate {
3038 my ($self, $w, $h) = @_;
3039
3040 my ($empty, $slider, @other) = @{ $self->{children} };
3041 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
3042
3043 $self->{layout}->set_font ($self->{font}) if $self->{font};
3044 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
3045 $self->{layout}->set_width ($empty->{w});
3046 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3047
3048 $self->reflow;
3049
3050 local $self->{children} = [$empty, $slider];
3051 $self->SUPER::invoke_size_allocate ($w, $h)
3052}
3053
3054sub invoke_mouse_wheel {
2213 my ($self, $text) = @_; 3055 my ($self, $ev) = @_;
3056
3057 return 0 unless $ev->{dy}; # only vertical movements
3058
3059 $self->{children}[1]->emit (mouse_wheel => $ev);
3060
3061 1
3062}
3063
3064sub get_layout {
3065 my ($self, $para) = @_;
2214 3066
2215 my $layout = $self->{layout}; 3067 my $layout = $self->{layout};
2216 3068
3069 $layout->set_font ($self->{font}) if $self->{font};
3070 $layout->set_foreground (@{$para->{fg}});
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3071 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w}); 3072 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3073 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2219 $layout->set_markup ($text); 3074 $layout->set_markup ($para->{markup});
3075
3076 $layout->set_shapes (
3077 map
3078 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3079 @{$para->{widget}}
2220 3080 );
2221 ($layout->size)[1] 3081
3082 $layout
2222} 3083}
2223 3084
2224sub reflow { 3085sub reflow {
2225 my ($self) = @_; 3086 my ($self) = @_;
2226 3087
2227 $self->{need_reflow}++; 3088 $self->{need_reflow}++;
2228 $self->update; 3089 $self->update;
2229} 3090}
2230 3091
2231sub size_allocate { 3092sub set_offset {
3093 my ($self, $offset) = @_;
3094
3095 # todo: base offset on lines or so, not on pixels
3096 $self->{children}[1]->set_value ($offset);
3097}
3098
3099sub current_paragraph {
3100 my ($self) = @_;
3101
3102 $self->{top_paragraph} - 1
3103}
3104
3105sub scroll_to {
2232 my ($self, $w, $h) = @_; 3106 my ($self, $para) = @_;
2233 3107
2234 $self->SUPER::size_allocate ($w, $h); 3108 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2235 3109
2236 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3110 $self->{scroll_to} = $para;
2237 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3111 $self->update;
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 3112}
2239 3113
2240 $self->reflow; 3114sub clear {
3115 my ($self) = @_;
3116
3117 my (undef, undef, @other) = @{ $self->{children} };
3118 $self->remove ($_) for @other;
3119
3120 $self->{par} = [];
3121 $self->{height} = 0;
3122 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2241} 3123}
2242 3124
2243sub add_paragraph { 3125sub add_paragraph {
2244 my ($self, $color, $text) = @_; 3126 my $self = shift;
2245 3127
2246 #TODO: intelligently "reformat" paragraph 3128 for my $para (@_) {
3129 $para = {
3130 fg => [1, 1, 1, 1],
3131 indent => 0,
3132 markup => "",
3133 widget => [],
3134 ref $para ? %$para : (markup => $para),
3135 w => 1e10,
3136 wrapped => 1,
3137 };
2247 3138
2248 my $height = $self->text_height ($text); 3139 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3140 push @{$self->{par}}, $para;
3141 }
2249 3142
3143 if (my $max = $self->{max_par}) {
3144 shift @{$self->{par}} while @{$self->{par}} > $max;
3145 }
3146
3147 $self->{need_reflow}++;
3148 $self->update;
3149}
3150
3151sub scroll_to_bottom {
3152 my ($self) = @_;
3153
3154 $self->{scroll_to} = $#{$self->{par}};
3155 $self->update;
3156}
3157
3158sub force_uptodate {
3159 my ($self) = @_;
3160
3161 if (delete $self->{need_reflow}) {
3162 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3163
3164 my $height = 0;
3165
3166 for my $para (@{$self->{par}}) {
3167 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3168 my $layout = $self->get_layout ($para);
3169 my ($w, $h) = $layout->size;
3170
3171 $para->{w} = $w + $para->{indent};
3172 $para->{h} = $h;
3173 $para->{wrapped} = $layout->has_wrapped;
3174 }
3175
3176 $para->{y} = $height;
3177 $height += $para->{h};
3178 }
3179
2250 $self->{height} += $height; 3180 $self->{height} = $height;
3181 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2251 3182
2252 push @{$self->{par}}, [$height, $color, $text]; 3183 delete $self->{texture};
3184 }
2253 3185
2254 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 3186 if (my $paridx = delete $self->{scroll_to}) {
2255 $self->{children}[1]->update; 3187 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3188 }
2256} 3189}
2257 3190
2258sub update { 3191sub update {
2259 my ($self) = @_; 3192 my ($self) = @_;
2260 3193
… …
2262 3195
2263 return unless $self->{h} > 0; 3196 return unless $self->{h} > 0;
2264 3197
2265 delete $self->{texture}; 3198 delete $self->{texture};
2266 3199
2267 $ROOT->on_post_alloc ($self, sub { 3200 $ROOT->on_post_alloc ($self => sub {
2268 if (delete $self->{need_reflow}) { 3201 $self->force_uptodate;
2269 my $height = 0;
2270 3202
2271 $height += $_->[0] = $self->text_height ($_->[2]) 3203 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2272 for @{$self->{par}};
2273 3204
2274 $self->{height} = $height; 3205 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2275
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2277
2278 delete $self->{texture};
2279 }
2280
2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2282 glClearColor 0.5, 0.5, 0.5, 0; 3206 glClearColor 0, 0, 0, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 3207 glClear GL_COLOR_BUFFER_BIT;
2284 3208
2285 glEnable GL_TEXTURE_2D; 3209 package CFPlus::UI::Base;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3210 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3211 (0, 0, $self->{w}, $self->{h});
2287 3212
2288 my $top = int $self->{children}[1]{range}[0]; 3213 my $top = int $self->{children}[1]{range}[0];
2289 3214
3215 my $paridx = 0;
3216 my $top_paragraph;
3217 my $top = int $self->{children}[1]{range}[0];
3218
2290 my $y0 = $top; 3219 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 3220 my $y1 = $top + $H;
2292 3221
2293 my $y = 0;
2294
2295 my $layout = $self->{layout};
2296
2297 $layout->set_font ($self->{font}) if $self->{font};
2298
2299 for my $par (@{$self->{par}}) { 3222 for my $para (@{$self->{par}}) {
2300 my $h = $par->[0]; 3223 my $h = $para->{h};
3224 my $y = $para->{y};
2301 3225
2302 if ($y0 < $y + $h && $y < $y1) { 3226 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 3227 my $layout = $self->get_layout ($para);
2304 $layout->set_markup ($par->[2]);
2305 3228
2306 my ($W, $H) = $layout->size; 3229 $layout->render ($para->{indent}, $y - $y0);
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 3230
3231 if (my @w = @{ $para->{widget} }) {
3232 my @s = $layout->get_shapes;
3233
3234 for (@w) {
3235 my ($dx, $dy) = splice @s, 0, 2, ();
3236
3237 $_->{x} = $dx + $para->{indent};
3238 $_->{y} = $dy + $y - $y0;
3239
3240 $_->draw;
3241 }
3242 }
2308 } 3243 }
2309 3244
2310 $y += $h; 3245 $paridx++;
3246 $top_paragraph ||= $paridx if $y >= $top;
2311 } 3247 }
2312 3248
2313 glDisable GL_TEXTURE_2D; 3249 $self->{top_paragraph} = $top_paragraph;
2314 }; 3250 };
2315 }); 3251 });
2316} 3252}
2317 3253
3254sub reconfigure {
3255 my ($self) = @_;
3256
3257 $self->SUPER::reconfigure;
3258
3259 $_->{w} = 1e10 for @{ $self->{par} };
3260 $self->reflow;
3261}
3262
2318sub _draw { 3263sub _draw {
2319 my ($self) = @_; 3264 my ($self) = @_;
2320 3265
2321 glEnable GL_TEXTURE_2D; 3266 glEnable GL_TEXTURE_2D;
2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3267 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2323 glColor 1, 1, 1, 1; 3268 glColor 0, 0, 0, 1;
2324 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3269 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2325 glDisable GL_TEXTURE_2D; 3270 glDisable GL_TEXTURE_2D;
2326 3271
2327 $self->{children}[1]->draw; 3272 $self->{children}[1]->draw;
2328
2329} 3273}
2330 3274
2331############################################################################# 3275#############################################################################
2332 3276
2333package CFClient::UI::Animator; 3277package CFPlus::UI::Animator;
2334 3278
2335use CFClient::OpenGL; 3279use CFPlus::OpenGL;
2336 3280
2337our @ISA = CFClient::UI::Bin::; 3281our @ISA = CFPlus::UI::Bin::;
2338 3282
2339sub moveto { 3283sub moveto {
2340 my ($self, $x, $y) = @_; 3284 my ($self, $x, $y) = @_;
2341 3285
2342 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3286 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2370 glPopMatrix; 3314 glPopMatrix;
2371} 3315}
2372 3316
2373############################################################################# 3317#############################################################################
2374 3318
2375package CFClient::UI::Flopper; 3319package CFPlus::UI::Flopper;
2376 3320
2377our @ISA = CFClient::UI::Button::; 3321our @ISA = CFPlus::UI::Button::;
2378 3322
2379sub new { 3323sub new {
2380 my $class = shift; 3324 my $class = shift;
2381 3325
2382 my $self = $class->SUPER::new ( 3326 my $self = $class->SUPER::new (
2383 state => 0, 3327 state => 0,
2384 connect_activate => \&toggle_flopper, 3328 on_activate => \&toggle_flopper,
2385 @_ 3329 @_
2386 ); 3330 );
2387 3331
2388 if ($self->{state}) {
2389 $self->{state} = 0;
2390 $self->toggle_flopper;
2391 }
2392
2393 $self 3332 $self
2394} 3333}
2395 3334
2396sub toggle_flopper { 3335sub toggle_flopper {
2397 my ($self) = @_; 3336 my ($self) = @_;
2398 3337
2399 # TODO: use animation 3338 $self->{other}->toggle_visibility;
2400 if ($self->{state} = !$self->{state}) {
2401 $CFClient::UI::ROOT->add ($self->{other});
2402 $self->{other}->move ($self->coord2global (0, $self->{h}));
2403 $self->emit ("open");
2404 } else {
2405 $CFClient::UI::ROOT->remove ($self->{other});
2406 $self->emit ("close");
2407 }
2408
2409 $self->emit (changed => $self->{state});
2410} 3339}
2411 3340
2412############################################################################# 3341#############################################################################
2413 3342
2414package CFClient::UI::Tooltip; 3343package CFPlus::UI::Tooltip;
2415 3344
2416our @ISA = CFClient::UI::Bin::; 3345our @ISA = CFPlus::UI::Bin::;
2417 3346
2418use CFClient::OpenGL; 3347use CFPlus::OpenGL;
2419 3348
2420sub new { 3349sub new {
2421 my $class = shift; 3350 my $class = shift;
2422 3351
2423 $class->SUPER::new ( 3352 $class->SUPER::new (
… …
2427} 3356}
2428 3357
2429sub set_tooltip_from { 3358sub set_tooltip_from {
2430 my ($self, $widget) = @_; 3359 my ($self, $widget) = @_;
2431 3360
3361 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3362 if $widget->{tooltip} =~ /^#(.*)$/;
3363
3364 my $tooltip = $widget->{tooltip};
3365
3366 if ($ENV{CFPLUS_DEBUG} & 2) {
3367 $tooltip .= "\n\n" . (ref $widget) . "\n"
3368 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3369 . "req $widget->{req_w} $widget->{req_h}\n"
3370 . "visible $widget->{visible}";
3371 }
3372
3373 $tooltip =~ s/^\n+//;
3374 $tooltip =~ s/\n+$//;
3375
2432 $self->add (new CFClient::UI::Label 3376 $self->add (new CFPlus::UI::Label
2433 markup => $widget->{tooltip}, 3377 markup => $tooltip,
2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3378 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8, 3379 fontsize => 0.8,
2436 fg => [0, 0, 0, 1], 3380 style => 1, # FLAG_INVERSE
2437 ellipsise => 0, 3381 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP), 3382 font => ($widget->{tooltip_font} || $::FONT_PROP),
2439 ); 3383 );
2440} 3384}
2441 3385
… …
2445 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3389 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2446 3390
2447 ($w + 4, $h + 4) 3391 ($w + 4, $h + 4)
2448} 3392}
2449 3393
2450sub size_allocate { 3394sub invoke_size_allocate {
2451 my ($self, $w, $h) = @_; 3395 my ($self, $w, $h) = @_;
2452 3396
2453 $self->SUPER::size_allocate ($w - 4, $h - 4); 3397 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3398}
3399
3400sub invoke_visibility_change {
3401 my ($self, $visible) = @_;
3402
3403 return unless $visible;
3404
3405 $self->{root}->on_post_alloc ("move_$self" => sub {
3406 my $widget = $self->{owner}
3407 or return;
3408
3409 if ($widget->{visible}) {
3410 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3411
3412 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3413 if $x + $self->{w} > $self->{root}{w};
3414
3415 $self->move_abs ($x, $y);
3416 } else {
3417 $self->hide;
3418 }
3419 });
2454} 3420}
2455 3421
2456sub _draw { 3422sub _draw {
2457 my ($self) = @_; 3423 my ($self) = @_;
2458 3424
… …
2475 glVertex $w, $h; 3441 glVertex $w, $h;
2476 glVertex $w, 0; 3442 glVertex $w, 0;
2477 glEnd; 3443 glEnd;
2478 3444
2479 glTranslate 2 - 0.375, 2 - 0.375; 3445 glTranslate 2 - 0.375, 2 - 0.375;
3446
2480 $self->SUPER::_draw; 3447 $self->SUPER::_draw;
2481} 3448}
2482 3449
2483############################################################################# 3450#############################################################################
2484 3451
2485package CFClient::UI::Face; 3452package CFPlus::UI::Face;
2486 3453
2487our @ISA = CFClient::UI::Base::; 3454our @ISA = CFPlus::UI::DrawBG::;
2488 3455
2489use CFClient::OpenGL; 3456use CFPlus::OpenGL;
2490 3457
2491sub new { 3458sub new {
2492 my $class = shift; 3459 my $class = shift;
2493 3460
2494 $class->SUPER::new ( 3461 my $self = $class->SUPER::new (
3462 size_w => 32,
3463 size_h => 8,
2495 aspect => 1, 3464 aspect => 1,
3465 can_events => 0,
2496 @_, 3466 @_,
2497 ) 3467 );
3468
3469 if ($self->{anim} && $self->{animspeed}) {
3470 CFPlus::weaken (my $widget = $self);
3471
3472 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3473 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3474 $self->{timer} = Event->timer (
3475 parked => 1,
3476 cb => sub {
3477 return unless $::CONN && $widget;
3478
3479 ++$widget->{frame};
3480 $widget->update_face;
3481 $widget->update;
3482
3483 $widget->update_timer;
3484 },
3485 );
3486
3487 $self->update_face;
3488 $self->update_timer;
3489 }
3490
3491 $self
3492}
3493
3494sub update_timer {
3495 my ($self) = @_;
3496
3497 return unless $self->{timer};
3498
3499 if ($self->{visible}) {
3500 $self->{timer}->at (
3501 $self->{anim_start}
3502 + $self->{animspeed}
3503 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3504 );
3505 $self->{timer}->start;
3506 } else {
3507 $self->{timer}->stop;
3508 }
3509}
3510
3511sub update_face {
3512 my ($self) = @_;
3513
3514 return unless $::CONN;
3515
3516 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3517 if ($anim && @$anim) {
3518 delete $self->{wait_face};
3519 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3520 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3521 }
3522 }
2498} 3523}
2499 3524
2500sub size_request { 3525sub size_request {
2501 (32, 8) 3526 my ($self) = @_;
3527
3528 if ($::CONN) {
3529 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3530 if (my $tex = $::CONN->{texture}[$faceid]) {
3531 $self->{tex} = $tex;
3532 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3533 } else {
3534 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3535 $self->realloc;
3536 });
3537 }
3538 }
3539 }
3540
3541 ($self->{size_w} || 8, $self->{size_h} || 8)
3542}
3543
3544sub update {
3545 my ($self) = @_;
3546
3547 return unless $self->{visible};
3548
3549 $self->SUPER::update;
3550}
3551
3552sub invoke_visibility_change {
3553 my ($self) = @_;
3554
3555 $self->update_timer;
3556
3557 0
2502} 3558}
2503 3559
2504sub _draw { 3560sub _draw {
2505 my ($self) = @_; 3561 my ($self) = @_;
2506 3562
2507 return unless $::CONN;#d# manage and cache textures differently 3563 $self->SUPER::_draw;
2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2509 3564
2510 # TODO animation 3565 if (my $tex = $self->{tex}) {
2511 if ($tex) {
2512 glEnable GL_TEXTURE_2D; 3566 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 3568 glColor 0, 0, 0, 1;
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3569 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516 glDisable GL_TEXTURE_2D; 3570 glDisable GL_TEXTURE_2D;
2517 } 3571 }
2518} 3572}
2519 3573
3574sub destroy {
3575 my ($self) = @_;
3576
3577 (delete $self->{timer})->cancel
3578 if $self->{timer};
3579
3580 $self->SUPER::destroy;
3581}
3582
2520############################################################################# 3583#############################################################################
2521 3584
2522package CFClient::UI::InventoryItem; 3585package CFPlus::UI::Buttonbar;
2523 3586
2524our @ISA = CFClient::UI::HBox::; 3587our @ISA = CFPlus::UI::HBox::;
2525 3588
2526sub _item_to_desc { 3589# TODO: should actually wrap buttons and other goodies.
2527 my ($item) = @_;
2528
2529 my $desc =
2530 $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 $desc
2550}
2551
2552sub new {
2553 my $class = shift;
2554
2555 my %args = @_;
2556
2557 my $item = delete $args{item};
2558
2559 my $desc = _item_to_desc ($item);
2560
2561 my $self = $class->SUPER::new (
2562 can_hover => 1,
2563 can_events => 1,
2564 tooltip => ((CFClient::UI::Label::escape $desc)
2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2566 connect_button_down => sub {
2567 my ($self, $ev, $x, $y) = @_;
2568
2569 # todo: maybe put examine on 1? but should just be a tooltip :(
2570 if ($ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag};
2572
2573 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT;
2575 }
2576
2577 $::CONN->send ("move $targ $item->{tag} 0");
2578 } elsif ($ev->{button} == 2) {
2579 $::CONN->send ("apply $item->{tag}");
2580 } elsif ($ev->{button} == 3) {
2581 my @menu_items = (
2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586 [
2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588 sub { $::CONN->send ("lock $item->{tag}") },
2589 ],
2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593 }
2594
2595 1
2596 },
2597 %args
2598 );
2599
2600
2601 $self->add (new CFClient::UI::Face
2602 can_events => 0,
2603 face => $item->{face},
2604 anim => $item->{anim},
2605 animspeed => $item->{animspeed},
2606 );
2607
2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2609
2610 $self->{item} = $item;
2611
2612 $self->update_item;
2613
2614 $self
2615}
2616
2617sub update_item {
2618 my ($self) = @_;
2619
2620 my $desc = _item_to_desc ($self->{item});
2621
2622 $self->{name_lbl}->set_text ($desc);
2623}
2624 3590
2625############################################################################# 3591#############################################################################
2626 3592
2627package CFClient::UI::Inventory;
2628
2629our @ISA = CFClient::UI::ScrolledWindow::;
2630
2631sub new {
2632 my $class = shift;
2633
2634 my $self = $class->SUPER::new (
2635 scrolled => (new CFClient::UI::VBox),
2636 @_,
2637 );
2638
2639 $self
2640}
2641
2642sub set_items {
2643 my ($self, $items) = @_;
2644
2645 $self->{scrolled}->clear;
2646 return unless $items;
2647
2648 my @items = sort {
2649 ($a->{type} <=> $b->{type})
2650 or ($a->{name} cmp $b->{name})
2651 } @$items;
2652
2653 $self->{real_items} = \@items;
2654
2655 for my $item (@items) {
2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2657 $item->update_item ();
2658 }
2659
2660 $self->{scrolled}->add (@items);
2661
2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2663}
2664
2665sub size_request {
2666 my ($self) = @_;
2667 ($self->{req_w}, $self->{req_h});
2668}
2669
2670#############################################################################
2671
2672package CFClient::UI::Menu; 3593package CFPlus::UI::Menu;
2673 3594
2674our @ISA = CFClient::UI::FancyFrame::; 3595our @ISA = CFPlus::UI::Toplevel::;
2675 3596
2676use CFClient::OpenGL; 3597use CFPlus::OpenGL;
2677 3598
2678sub new { 3599sub new {
2679 my $class = shift; 3600 my $class = shift;
2680 3601
2681 my $self = $class->SUPER::new ( 3602 my $self = $class->SUPER::new (
2682 items => [], 3603 items => [],
2683 z => 100, 3604 z => 100,
2684 @_, 3605 @_,
2685 ); 3606 );
2686 3607
2687 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3608 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2688 3609
2689 for my $item (@{ $self->{items} }) { 3610 for my $item (@{ $self->{items} }) {
2690 my ($widget, $cb) = @$item; 3611 my ($widget, $cb, $tooltip) = @$item;
2691 3612
2692 # handle various types of items, only text for now 3613 # handle various types of items, only text for now
2693 if (!ref $widget) { 3614 if (!ref $widget) {
3615 if ($widget =~ /\t/) {
3616 my ($left, $right) = split /\t/, $widget, 2;
3617
2694 $widget = new CFClient::UI::Label 3618 $widget = new CFPlus::UI::HBox
2695 can_hover => 1, 3619 can_hover => 1,
2696 can_events => 1, 3620 can_events => 1,
3621 tooltip => $tooltip,
3622 children => [
3623 (new CFPlus::UI::Label markup => $left, expand => 1),
3624 (new CFPlus::UI::Label markup => $right, align => +1),
3625 ],
3626 ;
3627
3628 } else {
3629 $widget = new CFPlus::UI::Label
3630 can_hover => 1,
3631 can_events => 1,
2697 text => $widget; 3632 markup => $widget,
3633 tooltip => $tooltip;
3634 }
2698 } 3635 }
2699 3636
2700 $self->{item}{$widget} = $item; 3637 $self->{item}{$widget} = $item;
2701 3638
2702 $self->{vbox}->add ($widget); 3639 $self->{vbox}->add ($widget);
… …
2714 # maybe save $GRAB? must be careful about events... 3651 # maybe save $GRAB? must be careful about events...
2715 $GRAB = $self; 3652 $GRAB = $self;
2716 $self->{button} = $ev->{button}; 3653 $self->{button} = $ev->{button};
2717 3654
2718 $self->show; 3655 $self->show;
2719 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3656 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2720} 3657}
2721 3658
2722sub mouse_motion { 3659sub invoke_mouse_motion {
2723 my ($self, $ev, $x, $y) = @_; 3660 my ($self, $ev, $x, $y) = @_;
2724 3661
2725 # TODO: should use vbox->find_widget or so 3662 # TODO: should use vbox->find_widget or so
2726 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3663 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2727 $self->{hover} = $self->{item}{$HOVER}; 3664 $self->{hover} = $self->{item}{$HOVER};
2728}
2729 3665
3666 0
3667}
3668
2730sub button_up { 3669sub invoke_button_up {
2731 my ($self, $ev, $x, $y) = @_; 3670 my ($self, $ev, $x, $y) = @_;
2732 3671
2733 if ($ev->{button} == $self->{button}) { 3672 if ($ev->{button} == $self->{button}) {
2734 undef $GRAB; 3673 undef $GRAB;
2735 $self->hide; 3674 $self->hide;
2736 3675
2737 $self->emit ("popdown"); 3676 $self->emit ("popdown");
2738 $self->{hover}[1]->() if $self->{hover}; 3677 $self->{hover}[1]->() if $self->{hover};
3678 } else {
3679 return 0
3680 }
3681
2739 } 3682 1
2740} 3683}
2741 3684
2742############################################################################# 3685#############################################################################
2743 3686
2744package CFClient::UI::Statusbox; 3687package CFPlus::UI::Multiplexer;
2745 3688
2746our @ISA = CFClient::UI::VBox::; 3689our @ISA = CFPlus::UI::Container::;
2747 3690
2748sub new { 3691sub new {
2749 my $class = shift; 3692 my $class = shift;
2750 3693
2751 $class->SUPER::new ( 3694 my $self = $class->SUPER::new (
3695 @_,
3696 );
3697
3698 $self->{current} = $self->{children}[0]
3699 if @{ $self->{children} };
3700
3701 $self
3702}
3703
3704sub add {
3705 my ($self, @widgets) = @_;
3706
3707 $self->SUPER::add (@widgets);
3708
3709 $self->{current} = $self->{children}[0]
3710 if @{ $self->{children} };
3711}
3712
3713sub get_current_page {
3714 my ($self) = @_;
3715
3716 $self->{current}
3717}
3718
3719sub set_current_page {
3720 my ($self, $page_or_widget) = @_;
3721
3722 my $widget = ref $page_or_widget
3723 ? $page_or_widget
3724 : $self->{children}[$page_or_widget];
3725
3726 $self->{current} = $widget;
3727 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3728
3729 $self->emit (page_changed => $self->{current});
3730
3731 $self->realloc;
3732}
3733
3734sub visible_children {
3735 $_[0]{current}
3736}
3737
3738sub size_request {
3739 my ($self) = @_;
3740
3741 $self->{current}->size_request
3742}
3743
3744sub invoke_size_allocate {
3745 my ($self, $w, $h) = @_;
3746
3747 $self->{current}->configure (0, 0, $w, $h);
3748
3749 1
3750}
3751
3752sub _draw {
3753 my ($self) = @_;
3754
3755 $self->{current}->draw;
3756}
3757
3758#############################################################################
3759
3760package CFPlus::UI::Notebook;
3761
3762our @ISA = CFPlus::UI::VBox::;
3763
3764sub new {
3765 my $class = shift;
3766
3767 my $self = $class->SUPER::new (
3768 buttonbar => (new CFPlus::UI::Buttonbar),
3769 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3770 # filter => # will be put between multiplexer and $self
3771 @_,
3772 );
3773
3774 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3775 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3776
3777 {
3778 Scalar::Util::weaken (my $wself = $self);
3779
3780 $self->{multiplexer}->connect (c_add => sub {
3781 my ($mplex, $widgets) = @_;
3782
3783 for my $child (@$widgets) {
3784 Scalar::Util::weaken $child;
3785 $child->{c_tab_} ||= do {
3786 my $tab =
3787 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3788 ? $child->{c_tab}
3789 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3790
3791 $tab->connect (activate => sub {
3792 $wself->set_current_page ($child);
3793 });
3794
3795 $tab
3796 };
3797
3798 $self->{buttonbar}->add ($child->{c_tab_});
3799 }
3800 });
3801
3802 $self->{multiplexer}->connect (c_remove => sub {
3803 my ($mplex, $widgets) = @_;
3804
3805 for my $child (@$widgets) {
3806 $wself->{buttonbar}->remove ($child->{c_tab_});
3807 }
3808 });
3809 }
3810
3811 $self
3812}
3813
3814sub add {
3815 my ($self, @widgets) = @_;
3816
3817 $self->{multiplexer}->add (@widgets)
3818}
3819
3820sub remove {
3821 my ($self, @widgets) = @_;
3822
3823 $self->{multiplexer}->remove (@widgets)
3824}
3825
3826sub add_tab {
3827 my ($self, $title, $widget, $tooltip) = @_;
3828
3829 $title = [$title, $tooltip] unless ref $title;
3830 $widget->{c_tab} = $title;
3831
3832 $self->add ($widget);
3833}
3834
3835sub get_current_page {
3836 my ($self) = @_;
3837
3838 $self->{multiplexer}->get_current_page
3839}
3840
3841sub set_current_page {
3842 my ($self, $page) = @_;
3843
3844 $self->{multiplexer}->set_current_page ($page);
3845 $self->emit (page_changed => $self->{multiplexer}{current});
3846}
3847
3848#############################################################################
3849
3850package CFPlus::UI::Selector;
3851
3852use utf8;
3853
3854our @ISA = CFPlus::UI::Button::;
3855
3856sub new {
3857 my $class = shift;
3858
3859 my $self = $class->SUPER::new (
3860 options => [], # [value, title, longdesc], ...
3861 value => undef,
3862 @_,
3863 );
3864
3865 $self->_set_value ($self->{value});
3866
3867 $self
3868}
3869
3870sub invoke_button_down {
3871 my ($self, $ev) = @_;
3872
3873 my @menu_items;
3874
3875 for (@{ $self->{options} }) {
3876 my ($value, $title, $tooltip) = @$_;
3877
3878 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3879 }
3880
3881 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3882}
3883
3884sub _set_value {
3885 my ($self, $value) = @_;
3886
3887 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3888 or return;
3889
3890 $self->{value} = $item->[0];
3891 $self->set_markup ("$item->[1] ⇓");
3892 $self->set_tooltip ($item->[2]);
3893}
3894
3895sub set_value {
3896 my ($self, $value) = @_;
3897
3898 return unless $self->{value} ne $value;
3899
3900 $self->_set_value ($value);
3901 $self->emit (changed => $value);
3902}
3903
3904#############################################################################
3905
3906package CFPlus::UI::Statusbox;
3907
3908our @ISA = CFPlus::UI::VBox::;
3909
3910sub new {
3911 my $class = shift;
3912
3913 my $self = $class->SUPER::new (
2752 fontsize => 0.8, 3914 fontsize => 0.8,
2753 @_, 3915 @_,
2754 ) 3916 );
3917
3918 CFPlus::weaken (my $this = $self);
3919
3920 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3921
3922 $self
2755} 3923}
2756 3924
2757sub reorder { 3925sub reorder {
2758 my ($self) = @_; 3926 my ($self) = @_;
2759 my $NOW = time; 3927 my $NOW = Time::HiRes::time;
3928
3929 # freeze display when hovering over any label
3930 return if $CFPlus::UI::TOOLTIP->{owner}
3931 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3932 values %{ $self->{item} };
2760 3933
2761 while (my ($k, $v) = each %{ $self->{item} }) { 3934 while (my ($k, $v) = each %{ $self->{item} }) {
2762 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3935 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2763 } 3936 }
2764 3937
… …
2767 my @items = sort { 3940 my @items = sort {
2768 $a->{pri} <=> $b->{pri} 3941 $a->{pri} <=> $b->{pri}
2769 or $b->{id} <=> $a->{id} 3942 or $b->{id} <=> $a->{id}
2770 } values %{ $self->{item} }; 3943 } values %{ $self->{item} };
2771 3944
3945 $self->{timer}->interval (1);
3946
2772 my $count = 10 + 1; 3947 my $count = 10 + 1;
2773 for my $item (@items) { 3948 for my $item (@items) {
2774 last unless --$count; 3949 last unless --$count;
2775 3950
2776 push @widgets, $item->{label} ||= do { 3951 my $label = $item->{label} ||= do {
2777 # TODO: doesn't handle markup well (read as: at all) 3952 # TODO: doesn't handle markup well (read as: at all)
2778 my $short = $item->{count} > 1 3953 my $short = $item->{count} > 1
2779 ? "<b>$item->{count} ×</b> $item->{text}" 3954 ? "<b>$item->{count} ×</b> $item->{text}"
2780 : $item->{text}; 3955 : $item->{text};
2781 3956
2782 for ($short) { 3957 for ($short) {
2783 s/^\s+//; 3958 s/^\s+//;
2784 s/\s+/ /g; 3959 s/\s+/ /g;
2785 } 3960 }
2786 3961
2787 new CFClient::UI::Label 3962 new CFPlus::UI::Label
2788 markup => $short, 3963 markup => $short,
2789 tooltip => $item->{tooltip}, 3964 tooltip => $item->{tooltip},
2790 tooltip_font => $::FONT_PROP, 3965 tooltip_font => $::FONT_PROP,
2791 tooltip_width => 0.67, 3966 tooltip_width => 0.67,
2792 fontsize => $item->{fontsize} || $self->{fontsize}, 3967 fontsize => $item->{fontsize} || $self->{fontsize},
2793 max_w => $::WIDTH * 0.44, 3968 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg}, 3969 fg => [@{ $item->{fg} }],
2795 can_events => 1, 3970 can_events => 1,
2796 can_hover => 1 3971 can_hover => 1
2797 }; 3972 };
3973
3974 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3975 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3976 $label->update;
3977 $label->set_max_size (undef, $label->{req_h} * $diff)
3978 if $diff < 1;
3979 $self->{timer}->interval (1/30);
3980 } else {
3981 $label->{fg}[3] = $item->{fg}[3] || 1;
3982 }
3983
3984 push @widgets, $label;
2798 } 3985 }
2799 3986
2800 $self->clear; 3987 $self->clear;
2801 $self->SUPER::add (reverse @widgets); 3988 $self->SUPER::add (reverse @widgets);
2802} 3989}
… …
2805 my ($self, $text, %arg) = @_; 3992 my ($self, $text, %arg) = @_;
2806 3993
2807 $text =~ s/^\s+//; 3994 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 3995 $text =~ s/\s+$//;
2809 3996
3997 return unless $text;
3998
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 3999 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2811 4000
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4001 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 4002
2814 if (my $item = $self->{item}{$group}) { 4003 if (my $item = $self->{item}{$group}) {
2815 if ($item->{text} eq $text) { 4004 if ($item->{text} eq $text) {
2816 $item->{count}++; 4005 $item->{count}++;
2817 } else { 4006 } else {
2818 $item->{count} = 1; 4007 $item->{count} = 1;
2819 $item->{text} = $item->{tooltip} = $text; 4008 $item->{text} = $item->{tooltip} = $text;
2820 } 4009 }
2821 $item->{id} = ++$self->{id}; 4010 $item->{id} += 0.2;#d#
2822 $item->{timeout} = $timeout; 4011 $item->{timeout} = $timeout;
2823 delete $item->{label}; 4012 delete $item->{label};
2824 } else { 4013 } else {
2825 $self->{item}{$group} = { 4014 $self->{item}{$group} = {
2826 id => ++$self->{id}, 4015 id => ++$self->{id},
… …
2832 count => 1, 4021 count => 1,
2833 %arg, 4022 %arg,
2834 }; 4023 };
2835 } 4024 }
2836 4025
4026 $ROOT->on_refresh (reorder => sub {
2837 $self->reorder; 4027 $self->reorder;
4028 });
2838} 4029}
2839 4030
2840sub reconfigure { 4031sub reconfigure {
2841 my ($self) = @_; 4032 my ($self) = @_;
2842 4033
… …
2845 4036
2846 $self->reorder; 4037 $self->reorder;
2847 $self->SUPER::reconfigure; 4038 $self->SUPER::reconfigure;
2848} 4039}
2849 4040
4041sub destroy {
4042 my ($self) = @_;
4043
4044 $self->{timer}->cancel;
4045
4046 $self->SUPER::destroy;
4047}
4048
2850############################################################################# 4049#############################################################################
2851 4050
2852package CFClient::UI::Root; 4051package CFPlus::UI::Root;
2853 4052
2854our @ISA = CFClient::UI::Container::; 4053our @ISA = CFPlus::UI::Container::;
2855 4054
4055use List::Util qw(min max);
4056
2856use CFClient::OpenGL; 4057use CFPlus::OpenGL;
2857 4058
2858sub new { 4059sub new {
2859 my $class = shift; 4060 my $class = shift;
2860 4061
2861 $class->SUPER::new ( 4062 my $self = $class->SUPER::new (
4063 visible => 1,
2862 @_, 4064 @_,
2863 ) 4065 );
2864}
2865 4066
2866sub configure { 4067 CFPlus::weaken ($self->{root} = $self);
2867 my ($self, $x, $y, $w, $h) = @_;
2868 4068
2869 $self->{w} = $w; 4069 $self
2870 $self->{h} = $h;
2871}
2872
2873sub check_size {
2874 my ($self) = @_;
2875
2876 $self->size_allocate ($self->{w}, $self->{h})
2877 if $self->{w};
2878} 4070}
2879 4071
2880sub size_request { 4072sub size_request {
2881 my ($self) = @_; 4073 my ($self) = @_;
2882 4074
2883 ($self->{w}, $self->{h}) 4075 ($self->{w}, $self->{h})
2884} 4076}
2885 4077
4078sub _to_pixel {
4079 my ($coord, $size, $max) = @_;
4080
4081 $coord =
4082 $coord eq "center" ? ($max - $size) * 0.5
4083 : $coord eq "max" ? $max
4084 : $coord;
4085
4086 $coord = 0 if $coord < 0;
4087 $coord = $max - $size if $coord > $max - $size;
4088
4089 int $coord + 0.5
4090}
4091
2886sub size_allocate { 4092sub invoke_size_allocate {
2887 my ($self, $w, $h) = @_; 4093 my ($self, $w, $h) = @_;
2888
2889 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2890 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2891
2892 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2893 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2894 4094
2895 for my $child ($self->children) { 4095 for my $child ($self->children) {
2896 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4096 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2897 4097
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 4098 $X = $child->{force_x} if exists $child->{force_x};
2899 if exists $child->{req_x}; 4099 $Y = $child->{force_y} if exists $child->{force_y};
2900 4100
2901 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 4101 $X = _to_pixel $X, $W, $self->{w};
2902 if exists $child->{req_y}; 4102 $Y = _to_pixel $Y, $H, $self->{h};
2903
2904 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2905 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906 4103
2907 $child->configure ($X, $Y, $W, $H); 4104 $child->configure ($X, $Y, $W, $H);
2908 } 4105 }
4106
4107 1
2909} 4108}
2910 4109
2911sub coord2local { 4110sub coord2local {
2912 my ($self, $x, $y) = @_; 4111 my ($self, $x, $y) = @_;
2913 4112
… …
2921} 4120}
2922 4121
2923sub update { 4122sub update {
2924 my ($self) = @_; 4123 my ($self) = @_;
2925 4124
2926 $self->check_size;
2927 $::WANT_REFRESH++; 4125 $::WANT_REFRESH++;
2928} 4126}
2929 4127
2930sub add { 4128sub add {
2931 my ($self, @children) = @_; 4129 my ($self, @children) = @_;
2932 4130
2933 for my $child (@children) {
2934 $child->{toplevel} = 1; 4131 $_->{is_toplevel} = 1
2935 4132 for @children;
2936 # integerise window positions
2937 $child->{x} = int $child->{x};
2938 $child->{y} = int $child->{y};
2939 }
2940 4133
2941 $self->SUPER::add (@children); 4134 $self->SUPER::add (@children);
4135}
4136
4137sub remove {
4138 my ($self, @children) = @_;
4139
4140 $self->SUPER::remove (@children);
4141
4142 delete $self->{is_toplevel}
4143 for @children;
4144
4145 while (@children) {
4146 my $w = pop @children;
4147 push @children, $w->children;
4148 $w->set_invisible;
4149 }
2942} 4150}
2943 4151
2944sub on_refresh { 4152sub on_refresh {
2945 my ($self, $id, $cb) = @_; 4153 my ($self, $id, $cb) = @_;
2946 4154
… …
2959 while ($self->{refresh_hook}) { 4167 while ($self->{refresh_hook}) {
2960 $_->() 4168 $_->()
2961 for values %{delete $self->{refresh_hook}}; 4169 for values %{delete $self->{refresh_hook}};
2962 } 4170 }
2963 4171
2964 if ($self->{check_size}) { 4172 while ($self->{realloc}) {
2965 my @queue = ([], []); 4173 my %queue;
4174 my @queue;
4175 my $widget;
2966 4176
2967 for (;;) { 4177 outer:
2968 if ($self->{check_size}) { 4178 while () {
2969 # heuristic: check containers last 4179 if (my $realloc = delete $self->{realloc}) {
2970 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 4180 for $widget (values %$realloc) {
2971 for values %{delete $self->{check_size}} 4181 $widget->{visible} or next; # do not resize invisible widgets
4182
4183 $queue{$widget+0}++ and next; # duplicates are common
4184
4185 push @{ $queue[$widget->{visible}] }, $widget;
4186 }
2972 } 4187 }
2973 4188
2974 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 4189 while () {
4190 @queue or last outer;
2975 4191
2976 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 4192 $widget = pop @{ $queue[-1] || [] }
2977 ? @$widget{qw(user_w user_h)} 4193 and last;
2978 : $widget->size_request;
2979
2980 if (delete $widget->{force_alloc}
2981 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2982 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2983 4194
4195 pop @queue;
4196 }
4197
4198 delete $queue{$widget+0};
4199
4200 my ($w, $h) = $widget->size_request;
4201
4202 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
4203 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4204
4205 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4206 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4207
4208 $w = $widget->{force_w} if exists $widget->{force_w};
4209 $h = $widget->{force_h} if exists $widget->{force_h};
4210
4211 if ($widget->{req_w} != $w || $widget->{req_h} != $h
4212 || delete $widget->{force_realloc}) {
2984 $widget->{req_w} = $w; 4213 $widget->{req_w} = $w;
2985 $widget->{req_h} = $h; 4214 $widget->{req_h} = $h;
2986 4215
2987 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 4216 $self->{size_alloc}{$widget+0} = $widget;
2988 4217
2989 $widget->{parent}->check_size
2990 if $widget->{parent}; 4218 if (my $parent = $widget->{parent}) {
4219 $self->{realloc}{$parent+0} = $parent
4220 unless $queue{$parent+0};
4221
4222 $parent->{force_size_alloc} = 1;
4223 $self->{size_alloc}{$parent+0} = $parent;
4224 }
2991 } 4225 }
4226
4227 delete $self->{realloc}{$widget+0};
2992 } 4228 }
2993 }
2994 4229
2995 while ($self->{size_alloc}) { 4230 while (my $size_alloc = delete $self->{size_alloc}) {
2996 for (values %{delete $self->{size_alloc}}) { 4231 my @queue = sort { $a->{visible} <=> $b->{visible} }
2997 my ($widget, $w, $h) = @$_; 4232 values %$size_alloc;
2998 4233
4234 while () {
4235 my $widget = pop @queue || last;
4236
4237 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4238
4239 $w = max $widget->{min_w}, $w;
4240 $h = max $widget->{min_h}, $h;
4241
4242# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4243# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4244
4245 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4246 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4247
2999 $w = 0 if $w < 0; 4248 $w = int $w + 0.5;
3000 $h = 0 if $h < 0; 4249 $h = int $h + 0.5;
3001 4250
4251 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4252 $widget->{old_w} = $widget->{w};
4253 $widget->{old_h} = $widget->{h};
4254
3002 $widget->{w} = $w; 4255 $widget->{w} = $w;
3003 $widget->{h} = $h; 4256 $widget->{h} = $h;
3004 $widget->size_allocate ($w, $h); 4257
3005 $widget->emit (size_allocate => $w, $h); 4258 $widget->emit (size_allocate => $w, $h);
4259 }
4260 }
3006 } 4261 }
3007 } 4262 }
3008 4263
3009 while ($self->{post_alloc_hook}) { 4264 while ($self->{post_alloc_hook}) {
3010 $_->() 4265 $_->()
… …
3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4270 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016 glClear GL_COLOR_BUFFER_BIT; 4271 glClear GL_COLOR_BUFFER_BIT;
3017 4272
3018 glMatrixMode GL_PROJECTION; 4273 glMatrixMode GL_PROJECTION;
3019 glLoadIdentity; 4274 glLoadIdentity;
3020 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4275 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021 glMatrixMode GL_MODELVIEW; 4276 glMatrixMode GL_MODELVIEW;
3022 glLoadIdentity; 4277 glLoadIdentity;
3023 4278
4279 {
4280 package CFPlus::UI::Base;
4281
4282 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4283 (0, 0, $self->{w}, $self->{h});
4284
3024 $self->_draw; 4285 $self->_draw;
4286 }
3025} 4287}
3026 4288
3027############################################################################# 4289#############################################################################
3028 4290
3029package CFClient::UI; 4291package CFPlus::UI;
3030 4292
3031$ROOT = new CFClient::UI::Root; 4293$ROOT = new CFPlus::UI::Root;
3032$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4294$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3033 4295
30341 42961
3035 4297

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines