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

Diff Legend

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