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

Diff Legend

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