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

Diff Legend

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