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.286 by root, Mon Jun 5 03:48:49 2006 UTC vs.
Revision 1.375 by root, Mon Jul 16 20:12:19 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
… …
542 return unless $self->{h} && $self->{w}; 606 return unless $self->{h} && $self->{w};
543 607
544 # update screen rectangle 608 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 609 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 610 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 611
550 # skip widgets that are entirely outside the drawing area 612 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 615
… …
576 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
579 glEnd; 641 glEnd;
580 glPopMatrix; 642 glPopMatrix;
581 #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;
582 } 644 }
583 645
584 $self->_draw; 646 $self->_draw;
585 glPopMatrix; 647 glPopMatrix;
586} 648}
… …
589 my ($self) = @_; 651 my ($self) = @_;
590 652
591 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
592} 654}
593 655
656my $cntx;#d#
594sub DESTROY { 657sub DESTROY {
595 my ($self) = @_; 658 my ($self) = @_;
596 659
660 return if CFPlus::in_destruct;
661
662 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
597 delete $WIDGET{$self+0}; 665 delete $WIDGET{$self+0};
598 #$self->deactivate;
599} 666}
600 667
601############################################################################# 668#############################################################################
602 669
603package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
604 671
605our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
606 673
607use strict; 674use strict;
608use CFClient::OpenGL; 675use CFPlus::OpenGL;
609 676
610sub new { 677sub new {
611 my $class = shift; 678 my $class = shift;
612 679
613 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
644 } 711 }
645} 712}
646 713
647############################################################################# 714#############################################################################
648 715
649package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
650 717
651our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
652 719
653sub new { 720sub new {
654 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
655 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
656} 723}
… …
663 730
664sub draw { } 731sub draw { }
665 732
666############################################################################# 733#############################################################################
667 734
668package CFClient::UI::Container; 735package CFPlus::UI::Container;
669 736
670our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
671 738
672sub new { 739sub new {
673 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
674 741
675 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
684 if $children; 751 if $children;
685 752
686 $self 753 $self
687} 754}
688 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
689sub add { 764sub add {
690 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
691 766
692 $_->set_parent ($self) 767 $_->set_parent ($self)
693 for @widgets; 768 for @widgets;
… …
753 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
754} 829}
755 830
756############################################################################# 831#############################################################################
757 832
758package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
759 834
760our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
761 836
762sub new { 837sub new {
763 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
764 839
765 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
766 841
767 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
768} 843}
769 844
770sub add { 845sub add {
771 my ($self, $child) = @_; 846 my ($self, $child) = @_;
772 847
773 $self->{children} = []; 848 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 849 $self->SUPER::add ($child);
776} 850}
777 851
778sub remove { 852sub remove {
779 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
780 854
781 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
782 856
783 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
784 unless @{$self->{children}}; 858 unless @{$self->{children}};
785} 859}
786 860
787sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
788 862
789sub size_request { 863sub size_request {
790 $_[0]{children}[0]->size_request 864 $_[0]{children}[0]->size_request
791} 865}
792 866
793sub size_allocate { 867sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
795 869
796 $self->{children}[0]->configure (0, 0, $w, $h); 870 $self->{children}[0]->configure (0, 0, $w, $h);
871
872 1
797} 873}
798 874
799############################################################################# 875#############################################################################
800 876
801# back-buffered drawing area 877# back-buffered drawing area
802 878
803package CFClient::UI::Window; 879package CFPlus::UI::Window;
804 880
805our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
806 882
807use CFClient::OpenGL; 883use CFPlus::OpenGL;
808 884
809sub new { 885sub new {
810 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
811 887
812 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
817 893
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 894 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 895 $self->SUPER::update;
820} 896}
821 897
822sub size_allocate { 898sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
824 900
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 901 $self->update;
902
903 $self->SUPER::invoke_size_allocate ($w, $h)
827} 904}
828 905
829sub _render { 906sub _render {
830 my ($self) = @_; 907 my ($self) = @_;
831 908
… …
833} 910}
834 911
835sub render_child { 912sub render_child {
836 my ($self) = @_; 913 my ($self) = @_;
837 914
838 $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 {
839 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
840 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
841 918
842 { 919 {
843 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
844 921
845 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
847 } 926 }
848
849 $self->_render;
850 }; 927 };
851} 928}
852 929
853sub _draw { 930sub _draw {
854 my ($self) = @_; 931 my ($self) = @_;
855
856 my ($w, $h) = @$self{qw(w h)};
857 932
858 my $tex = $self->{texture} 933 my $tex = $self->{texture}
859 or return; 934 or return;
860 935
861 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
864 939
865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
866 941
867 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
868} 943}
869 944
870############################################################################# 945#############################################################################
871 946
872package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
873 948
949use List::Util qw(min max);
950
874our @ISA = CFClient::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
875 952
876sub new { 953sub new {
877 my $class = shift; 954 my $class = shift;
878 955
879 $class->SUPER::new ( 956 $class->SUPER::new (
… …
892 $h = 10 if $self->{scroll_y}; 969 $h = 10 if $self->{scroll_y};
893 970
894 ($w, $h) 971 ($w, $h)
895} 972}
896 973
897sub size_allocate { 974sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 975 my ($self, $w, $h) = @_;
899 976
900 my $child = $self->child; 977 my $child = $self->child;
901 978
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 979 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 980 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 981
905 $self->child->configure (0, 0, $w, $h); 982 $self->child->configure (0, 0, $w, $h);
906 $self->update; 983 $self->update;
984
985 1
907} 986}
908 987
909sub set_offset { 988sub set_offset {
910 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
911 990
912 $self->{view_x} = int $x; 991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
913 $self->{view_y} = int $y; 992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
914 993
915 $self->update; 994 $self->update;
916} 995}
917 996
918# hmm, this does not work for topleft of $self... but we should not ask for that 997# hmm, this does not work for topleft of $self... but we should not ask for that
… …
937 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1016 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1017 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
939 ) { 1018 ) {
940 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1019 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941 } else { 1020 } else {
942 $self->CFClient::UI::Base::find_widget ($x, $y) 1021 $self->CFPlus::UI::Base::find_widget ($x, $y)
943 } 1022 }
944} 1023}
945 1024
946sub _render { 1025sub _render {
947 my ($self) = @_; 1026 my ($self) = @_;
948 1027
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1028 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1029 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
951 1030
952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1031 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953 1032
954 $self->SUPER::_render; 1033 $self->SUPER::_render;
955} 1034}
956 1035
957############################################################################# 1036#############################################################################
958 1037
959package CFClient::UI::ScrolledWindow; 1038package CFPlus::UI::ScrolledWindow;
960 1039
961our @ISA = CFClient::UI::HBox::; 1040our @ISA = CFPlus::UI::Table::;
962 1041
963sub new { 1042sub new {
964 my ($class, %arg) = @_; 1043 my ($class, %arg) = @_;
965 1044
966 my $child = delete $arg{child}; 1045 my $child = delete $arg{child};
967 1046
968 my $self; 1047 my $self;
969 1048
970 my $slider = new CFClient::UI::Slider 1049 my $hslider = new CFPlus::UI::Slider
1050 vertical => 0,
1051 range => [0, 0, 1, 0.01], # HACK fix
1052 on_changed => sub {
1053 $self->{hpos} = $_[1];
1054 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1055 },
1056 ;
1057
1058 my $vslider = new CFPlus::UI::Slider
971 vertical => 1, 1059 vertical => 1,
972 range => [0, 0, 1, 0.01], # HACK fix 1060 range => [0, 0, 1, 0.01], # HACK fix
973 on_changed => sub { 1061 on_changed => sub {
974 $self->{vp}->set_offset (0, $_[1]); 1062 $self->{vpos} = $_[1];
1063 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
975 }, 1064 },
976 ; 1065 ;
977 1066
978 $self = $class->SUPER::new ( 1067 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1068 scroll_x => 0,
1069 scroll_y => 1,
1070 can_events => 1,
980 slider => $slider, 1071 hslider => $hslider,
1072 vslider => $vslider,
1073 col_expand => [1, 0],
1074 row_expand => [1, 0],
981 %arg, 1075 %arg,
982 ); 1076 );
983 1077
1078 $self->{vp} = new CFPlus::UI::ViewPort
1079 expand => 1,
1080 scroll_x => $self->{scroll_x},
1081 scroll_y => $self->{scroll_y},
1082 ;
1083
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1084 $self->SUPER::add (0, 0, $self->{vp});
1085
985 $self->add ($child) if $child; 1086 $self->add ($child) if $child;
986 1087
987 $self 1088 $self
988} 1089}
1090
1091#TODO# update range on size_allocate depending on child
989 1092
990sub add { 1093sub add {
991 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
992 1095
993 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
994} 1097}
995 1098
1099sub update_slider {
1100 my ($self) = @_;
1101
1102 my $child = ($self->{vp} or return)->child;
1103
1104 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1105 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1106
1107 my $visible = $w1 > $w2;
1108 if ($visible != $self->{hslider}{visible}) {
1109 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1110 : $self->{hslider}->hide;
1111 }
1112
1113 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1114 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1115
1116 my $visible = $h1 > $h2;
1117 if ($visible != $self->{vslider}{visible}) {
1118 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1119 : $self->{vslider}->hide;
1120 }
1121}
1122
996sub update { 1123sub update {
997 my ($self) = @_; 1124 my ($self) = @_;
998 1125
999 $self->SUPER::update; 1126 $self->SUPER::update;
1000 1127 $self->update_slider;
1001 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1128}
1005 1129
1130sub invoke_mouse_wheel {
1131 my ($self, $ev) = @_;
1132
1133 return 0 unless $ev->{dy}; # only vertical movements for now
1134
1135 $self->{vslider}->emit (mouse_wheel => $ev);
1136
1137 1
1138}
1139
1140sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_;
1142
1143 if ($ev->{button} == 2) {
1144 $self->grab_focus;
1145
1146 $self->{motion} = sub {
1147 my ($ev, $x, $y) = @_;
1148
1149 $self->{vp}->set_offset (
1150 $self->{vp}{view_x} - $ev->{xrel},
1151 $self->{vp}{view_y} - $ev->{yrel},
1152 );
1153 };
1154
1155 return 1;
1156 }
1157
1158 0
1159}
1160
1161sub invoke_button_up {
1162 my ($self, $ev, $x, $y) = @_;
1163
1164 if (delete $self->{motion}) {
1165 return 1;
1166 }
1167
1168 0
1169}
1170
1171sub invoke_mouse_motion {
1172 my ($self, $ev, $x, $y) = @_;
1173
1174 if ($self->{motion}) {
1175 $self->{motion}->($ev, $x, $y);
1176 return 1;
1177 }
1178
1179 0
1180}
1181
1006sub size_allocate { 1182sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1183 my ($self, $w, $h) = @_;
1008 1184
1185 $self->update_slider;
1009 $self->SUPER::size_allocate ($w, $h); 1186 $self->SUPER::invoke_size_allocate ($w, $h)
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013} 1187}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1188
1018############################################################################# 1189#############################################################################
1019 1190
1020package CFClient::UI::Frame; 1191package CFPlus::UI::Frame;
1021 1192
1022our @ISA = CFClient::UI::Bin::; 1193our @ISA = CFPlus::UI::Bin::;
1023 1194
1024use CFClient::OpenGL; 1195use CFPlus::OpenGL;
1025 1196
1026sub new { 1197sub new {
1027 my $class = shift; 1198 my $class = shift;
1028 1199
1029 $class->SUPER::new ( 1200 $class->SUPER::new (
… …
1055 $self->SUPER::_draw; 1226 $self->SUPER::_draw;
1056} 1227}
1057 1228
1058############################################################################# 1229#############################################################################
1059 1230
1060package CFClient::UI::FancyFrame; 1231package CFPlus::UI::FancyFrame;
1061 1232
1062our @ISA = CFClient::UI::Bin::; 1233our @ISA = CFPlus::UI::Bin::;
1063 1234
1064use CFClient::OpenGL; 1235use CFPlus::OpenGL;
1065
1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1236
1074sub new { 1237sub new {
1075 my ($class, %arg) = @_; 1238 my ($class, %arg) = @_;
1076 1239
1077 my $title = delete $arg{title}; 1240 if ((exists $arg{label}) && !ref $arg{label}) {
1241 $arg{label} = new CFPlus::UI::Label
1242 align => 1,
1243 valign => 0,
1244 text => $arg{label},
1245 fontsize => ($arg{border} || 0.8) * 0.75;
1246 }
1247
1248 my $self = $class->SUPER::new (
1249 # label => "",
1250 fg => [0.6, 0.3, 0.1],
1251 border => 0.8,
1252 style => 'single',
1253 %arg,
1254 );
1255
1256 $self
1257}
1258
1259sub add {
1260 my ($self, @widgets) = @_;
1261
1262 $self->SUPER::add (@widgets);
1263 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1264}
1265
1266sub border {
1267 int $_[0]{border} * $::FONTSIZE
1268}
1269
1270sub size_request {
1271 my ($self) = @_;
1272
1273 ($self->{label_w}, undef) = $self->{label}->size_request
1274 if $self->{label};
1275
1276 my ($w, $h) = $self->SUPER::size_request;
1277
1278 (
1279 $w + $self->border * 2,
1280 $h + $self->border * 2,
1281 )
1282}
1283
1284sub invoke_size_allocate {
1285 my ($self, $w, $h) = @_;
1286
1287 my $border = $self->border;
1288
1289 $w -= List::Util::max 0, $border * 2;
1290 $h -= List::Util::max 0, $border * 2;
1291
1292 if (my $label = $self->{label}) {
1293 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1294 $label->{h} = List::Util::min $h, $border;
1295 $label->invoke_size_allocate ($label->{w}, $label->{h});
1296 }
1297
1298 $self->child->configure ($border, $border, $w, $h);
1299
1300 1
1301}
1302
1303sub _draw {
1304 my ($self) = @_;
1305
1306 my $child = $self->{children}[0];
1307
1308 my $border = $self->border;
1309 my ($w, $h) = ($self->{w}, $self->{h});
1310
1311 $child->draw;
1312
1313 glColor @{$self->{fg}};
1314 glBegin GL_LINE_STRIP;
1315 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1316 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1317 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1318 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1319 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1320 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1321 glEnd;
1322
1323 if ($self->{label}) {
1324 glTranslate $border * 2, 0;
1325 $self->{label}->_draw;
1326 }
1327}
1328
1329#############################################################################
1330
1331package CFPlus::UI::Toplevel;
1332
1333our @ISA = CFPlus::UI::Bin::;
1334
1335use CFPlus::OpenGL;
1336
1337my $bg =
1338 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1339 mipmap => 1, wrap => 1;
1340
1341my @border =
1342 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1343 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1344
1345sub new {
1346 my ($class, %arg) = @_;
1078 1347
1079 my $self = $class->SUPER::new ( 1348 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1349 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1350 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1351 border => 0.6,
1083 can_events => 1, 1352 can_events => 1,
1084 min_w => 16, 1353 min_w => 64,
1085 min_h => 16, 1354 min_h => 32,
1086 %arg, 1355 %arg,
1087 ); 1356 );
1088 1357
1089 $self->{title} = new CFClient::UI::Label 1358 $self->{title_widget} = new CFPlus::UI::Label
1090 align => 0, 1359 align => 0,
1091 valign => 1, 1360 valign => 1,
1092 text => $title, 1361 text => $self->{title},
1093 fontsize => $self->{border} 1362 fontsize => $self->{border},
1094 if defined $title; 1363 if exists $self->{title};
1364
1365 if ($self->{has_close_button}) {
1366 $self->{close_button} =
1367 new CFPlus::UI::ImageButton
1368 path => 'x1_close.png',
1369 on_activate => sub { $self->emit ("delete") };
1370
1371 $self->CFPlus::UI::Container::add ($self->{close_button});
1372 }
1095 1373
1096 $self 1374 $self
1097} 1375}
1098 1376
1099sub add { 1377sub add {
1100 my ($self, @widgets) = @_; 1378 my ($self, @widgets) = @_;
1101 1379
1102 $self->SUPER::add (@widgets); 1380 $self->SUPER::add (@widgets);
1381 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1382 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1383}
1105 1384
1106sub border { 1385sub border {
1107 int $_[0]{border} * $::FONTSIZE 1386 int $_[0]{border} * $::FONTSIZE
1108} 1387}
1109 1388
1110sub size_request { 1389sub size_request {
1111 my ($self) = @_; 1390 my ($self) = @_;
1112 1391
1113 $self->{title}->size_request 1392 $self->{title_widget}->size_request
1114 if $self->{title}; 1393 if $self->{title_widget};
1394
1395 $self->{close_button}->size_request
1396 if $self->{close_button};
1115 1397
1116 my ($w, $h) = $self->SUPER::size_request; 1398 my ($w, $h) = $self->SUPER::size_request;
1117 1399
1118 ( 1400 (
1119 $w + $self->border * 2, 1401 $w + $self->border * 2,
1120 $h + $self->border * 2, 1402 $h + $self->border * 2,
1121 ) 1403 )
1122} 1404}
1123 1405
1124sub size_allocate { 1406sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1407 my ($self, $w, $h) = @_;
1126 1408
1127 if ($self->{title}) { 1409 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1410 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1411 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1412 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1413 }
1132 1414
1133 my $border = $self->border; 1415 my $border = $self->border;
1134 1416
1135 $h -= List::Util::max 0, $border * 2; 1417 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1418 $w -= List::Util::max 0, $border * 2;
1419
1420 $self->child->configure ($border, $border, $w, $h);
1421
1422 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1423 if $self->{close_button};
1424
1425 1
1426}
1427
1428sub invoke_delete {
1429 my ($self) = @_;
1430
1431 $self->hide;
1137 1432
1138 $self->child->configure ($border, $border, $w, $h); 1433 1
1139} 1434}
1140 1435
1141sub button_down { 1436sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1437 my ($self, $ev, $x, $y) = @_;
1143 1438
1144 my ($w, $h) = @$self{qw(w h)}; 1439 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1440 my $border = $self->border;
1146 1441
… …
1177 1472
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1473 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1474
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1475 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1476 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1477 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1478 };
1184 } else { 1479 } else {
1185 return 0; 1480 return 0;
1186 } 1481 }
1187 1482
1188 1 1483 1
1189} 1484}
1190 1485
1191sub button_up { 1486sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1487 my ($self, $ev, $x, $y) = @_;
1193 1488
1194 !!delete $self->{motion} 1489 ! ! delete $self->{motion}
1195} 1490}
1196 1491
1197sub mouse_motion { 1492sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1493 my ($self, $ev, $x, $y) = @_;
1199 1494
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1495 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1496
1202 !!$self->{motion} 1497 ! ! $self->{motion}
1498}
1499
1500sub invoke_visibility_change {
1501 my ($self, $visible) = @_;
1502
1503 delete $self->{motion} unless $visible;
1504
1505 0
1203} 1506}
1204 1507
1205sub _draw { 1508sub _draw {
1206 my ($self) = @_; 1509 my ($self) = @_;
1207 1510
… …
1233 1536
1234 glDisable GL_TEXTURE_2D; 1537 glDisable GL_TEXTURE_2D;
1235 1538
1236 $child->draw; 1539 $child->draw;
1237 1540
1238 if ($self->{title}) { 1541 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1542 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1543 $self->{title_widget}->_draw;
1544
1545 glTranslate 0, - ($border - $self->{h});
1241 } 1546 }
1547
1548 $self->{close_button}->draw
1549 if $self->{close_button};
1242} 1550}
1243 1551
1244############################################################################# 1552#############################################################################
1245 1553
1246package CFClient::UI::Table; 1554package CFPlus::UI::Table;
1247 1555
1248our @ISA = CFClient::UI::Base::; 1556our @ISA = CFPlus::UI::Base::;
1249 1557
1250use List::Util qw(max sum); 1558use List::Util qw(max sum);
1251 1559
1252use CFClient::OpenGL; 1560use CFPlus::OpenGL;
1253 1561
1254sub new { 1562sub new {
1255 my $class = shift; 1563 my $class = shift;
1256 1564
1257 $class->SUPER::new ( 1565 $class->SUPER::new (
1566 children => [],
1258 col_expand => [], 1567 col_expand => [],
1568 row_expand => [],
1259 @_, 1569 @_,
1260 ) 1570 )
1261} 1571}
1262 1572
1263sub children { 1573sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1574 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265} 1575}
1266 1576
1577# TODO: store row/col info in child widget and use standard add/del
1267sub add { 1578sub add {
1268 my ($self, $x, $y, $child) = @_; 1579 my ($self) = shift;
1269 1580
1581 while (@_) {
1582 my ($x, $y, $child) = splice @_, 0, 3, ();
1270 $child->set_parent ($self); 1583 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1584 $self->{children}[$y][$x] = $child;
1585 }
1272 1586
1587 $self->{force_realloc} = 1;
1588 $self->{force_size_alloc} = 1;
1273 $self->realloc; 1589 $self->realloc;
1590}
1591
1592sub remove {
1593 my ($self, $child) = @_;
1594
1595 for (@{ $self->{children} }) {
1596 for (@{ $_ || [] }) {
1597 $_ = undef if $_ == $child;
1598 }
1599 }
1274} 1600}
1275 1601
1276# TODO: move to container class maybe? send children a signal on removal? 1602# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1603sub clear {
1278 my ($self) = @_; 1604 my ($self) = @_;
… …
1319 (sum @$ws), 1645 (sum @$ws),
1320 (sum @$hs), 1646 (sum @$hs),
1321 ) 1647 )
1322} 1648}
1323 1649
1324sub size_allocate { 1650sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1651 my ($self, $w, $h) = @_;
1326 1652
1327 my ($ws, $hs) = $self->get_wh; 1653 my ($ws, $hs) = $self->get_wh;
1328 1654
1329 my $req_w = (sum @$ws) || 1; 1655 my $req_w = (sum @$ws) || 1;
1330 my $req_h = (sum @$hs) || 1; 1656 my $req_h = (sum @$hs) || 1;
1331 1657
1332 # TODO: nicer code && do row_expand 1658 # TODO: nicer code
1333 my @col_expand = @{$self->{col_expand}}; 1659 my @col_expand = @{$self->{col_expand}};
1334 @col_expand = (1) x @$ws unless @col_expand; 1660 @col_expand = (1) x @$ws unless @col_expand;
1335 my $col_expand = (sum @col_expand) || 1; 1661 my $col_expand = (sum @col_expand) || 1;
1336 1662
1337 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1663 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1664
1341 CFClient::UI::harmonize $ws; 1665 CFPlus::UI::harmonize $ws;
1666
1667 my @row_expand = @{$self->{row_expand}};
1668 @row_expand = (1) x @$ws unless @row_expand;
1669 my $row_expand = (sum @row_expand) || 1;
1670
1671 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1672
1342 CFClient::UI::harmonize $hs; 1673 CFPlus::UI::harmonize $hs;
1343 1674
1344 my $y; 1675 my $y;
1345 1676
1346 for my $r (0 .. $#{$self->{children}}) { 1677 for my $r (0 .. $#{$self->{children}}) {
1347 my $row = $self->{children}[$r] 1678 my $row = $self->{children}[$r]
… …
1361 } 1692 }
1362 1693
1363 $y += $row_h; 1694 $y += $row_h;
1364 } 1695 }
1365 1696
1697 1
1366} 1698}
1367 1699
1368sub find_widget { 1700sub find_widget {
1369 my ($self, $x, $y) = @_; 1701 my ($self, $x, $y) = @_;
1370 1702
… …
1389 } 1721 }
1390} 1722}
1391 1723
1392############################################################################# 1724#############################################################################
1393 1725
1394package CFClient::UI::Box; 1726package CFPlus::UI::Fixed;
1395 1727
1728use List::Util qw(min max);
1729
1396our @ISA = CFClient::UI::Container::; 1730our @ISA = CFPlus::UI::Container::;
1731
1732sub add {
1733 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1734
1735 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1736 $self->SUPER::add ($child);
1737}
1738
1739sub _scale($$$) {
1740 my ($mode, $val, $max) = @_;
1741
1742 $mode eq "abs" ? $val
1743 : $mode eq "rel" ? $val * $max
1744 : 0
1745}
1746
1747sub size_request {
1748 my ($self) = @_;
1749
1750 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1751
1752 # determine overall size by querying abs widgets
1753 for my $child ($self->visible_children) {
1754 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1755
1756 if ($pos eq "abs") {
1757 $w = _scale $size, $w, $child->{req_w};
1758 $h = _scale $size, $h, $child->{req_h};
1759
1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1762 }
1763 }
1764
1765 my $W = $x2 - $x1;
1766 my $H = $y2 - $y1;
1767
1768 # now layout remaining widgets
1769 for my $child ($self->visible_children) {
1770 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1771
1772 if ($pos ne "abs") {
1773 $x = _scale $pos, $x, $W;
1774 $y = _scale $pos, $x, $H;
1775 $w = _scale $size, $w, $child->{req_w};
1776 $h = _scale $size, $h, $child->{req_h};
1777
1778 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1779 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1780 }
1781 }
1782
1783 my $W = $x2 - $x1;
1784 my $H = $y2 - $y1;
1785
1786 ($W, $H)
1787}
1788
1789sub invoke_size_allocate {
1790 my ($self, $W, $H) = @_;
1791
1792 for my $child ($self->visible_children) {
1793 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1794
1795 $x = _scale $pos, $x, $W;
1796 $y = _scale $pos, $x, $H;
1797 $w = _scale $size, $w, $child->{req_w};
1798 $h = _scale $size, $h, $child->{req_h};
1799
1800 $child->configure ($x, $y, $w, $h);
1801 }
1802
1803 1
1804}
1805
1806#############################################################################
1807
1808package CFPlus::UI::Box;
1809
1810our @ISA = CFPlus::UI::Container::;
1397 1811
1398sub size_request { 1812sub size_request {
1399 my ($self) = @_; 1813 my ($self) = @_;
1400 1814
1401 $self->{vertical} 1815 $self->{vertical}
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1821 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1822 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1823 )
1410} 1824}
1411 1825
1412sub size_allocate { 1826sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1827 my ($self, $w, $h) = @_;
1414 1828
1415 my $space = $self->{vertical} ? $h : $w; 1829 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1830 my @children = $self->visible_children;
1417 1831
1418 my @req; 1832 my @req;
1419 1833
1420 if ($self->{homogeneous}) { 1834 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1835 @req = ($space / (@children || 1)) x @children;
1422 } else { 1836 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1837 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1838 my $req = List::Util::sum @req;
1425 1839
1426 if ($req > $space) { 1840 if ($req > $space) {
1427 # ah well, not enough space 1841 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1842 $_ *= $space / $req for @req;
1429 } else { 1843 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1844 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1845
1432 $space = ($space - $req) / $expand; # remaining space to give away 1846 $space = ($space - $req) / $expand; # remaining space to give away
1433 1847
1434 $req[$_] += $space * $children->[$_]{expand} 1848 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1849 for 0 .. $#children;
1436 } 1850 }
1437 } 1851 }
1438 1852
1439 CFClient::UI::harmonize \@req; 1853 CFPlus::UI::harmonize \@req;
1440 1854
1441 my $pos = 0; 1855 my $pos = 0;
1442 for (0 .. $#$children) { 1856 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1857 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1858 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1859
1446 $pos += $alloc; 1860 $pos += $alloc;
1447 } 1861 }
1448 1862
1449 1 1863 1
1450} 1864}
1451 1865
1452############################################################################# 1866#############################################################################
1453 1867
1454package CFClient::UI::HBox; 1868package CFPlus::UI::HBox;
1455 1869
1456our @ISA = CFClient::UI::Box::; 1870our @ISA = CFPlus::UI::Box::;
1457 1871
1458sub new { 1872sub new {
1459 my $class = shift; 1873 my $class = shift;
1460 1874
1461 $class->SUPER::new ( 1875 $class->SUPER::new (
… …
1464 ) 1878 )
1465} 1879}
1466 1880
1467############################################################################# 1881#############################################################################
1468 1882
1469package CFClient::UI::VBox; 1883package CFPlus::UI::VBox;
1470 1884
1471our @ISA = CFClient::UI::Box::; 1885our @ISA = CFPlus::UI::Box::;
1472 1886
1473sub new { 1887sub new {
1474 my $class = shift; 1888 my $class = shift;
1475 1889
1476 $class->SUPER::new ( 1890 $class->SUPER::new (
… …
1479 ) 1893 )
1480} 1894}
1481 1895
1482############################################################################# 1896#############################################################################
1483 1897
1484package CFClient::UI::Label; 1898package CFPlus::UI::Label;
1485 1899
1486our @ISA = CFClient::UI::DrawBG::; 1900our @ISA = CFPlus::UI::DrawBG::;
1487 1901
1488use CFClient::OpenGL; 1902use CFPlus::OpenGL;
1489 1903
1490sub new { 1904sub new {
1491 my ($class, %arg) = @_; 1905 my ($class, %arg) = @_;
1492 1906
1493 my $self = $class->SUPER::new ( 1907 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1910 #active_bg => none
1497 #font => default_font 1911 #font => default_font
1498 #text => initial text 1912 #text => initial text
1499 #markup => initial narkup 1913 #markup => initial narkup
1500 #max_w => maximum pixel width 1914 #max_w => maximum pixel width
1915 #style => 0, # render flags
1501 ellipsise => 3, # end 1916 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1917 layout => (new CFPlus::Layout),
1503 fontsize => 1, 1918 fontsize => 1,
1504 align => -1, 1919 align => -1,
1505 valign => -1, 1920 valign => -1,
1506 padding_x => 2, 1921 padding_x => 2,
1507 padding_y => 2, 1922 padding_y => 2,
1508 can_events => 0, 1923 can_events => 0,
1509 %arg 1924 %arg
1510 ); 1925 );
1511 1926
1512 if (exists $self->{template}) { 1927 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1928 my $layout = new CFPlus::Layout;
1514 $layout->set_text (delete $self->{template}); 1929 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1930 $self->{template} = $layout;
1516 } 1931 }
1517 1932
1518 if (exists $self->{markup}) { 1933 if (exists $self->{markup}) {
… …
1522 } 1937 }
1523 1938
1524 $self 1939 $self
1525} 1940}
1526 1941
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1942sub update {
1538 my ($self) = @_; 1943 my ($self) = @_;
1539 1944
1540 delete $self->{texture}; 1945 delete $self->{texture};
1541 $self->SUPER::update; 1946 $self->SUPER::update;
… …
1552 my ($self, $text) = @_; 1957 my ($self, $text) = @_;
1553 1958
1554 return if $self->{text} eq "T$text"; 1959 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1960 $self->{text} = "T$text";
1556 1961
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1962 $self->{layout}->set_text ($text);
1963
1559 delete $self->{req_h}; 1964 delete $self->{size_req};
1560
1561 $self->realloc; 1965 $self->realloc;
1562 $self->update; 1966 $self->update;
1563} 1967}
1564 1968
1565sub set_markup { 1969sub set_markup {
… …
1568 return if $self->{text} eq "M$markup"; 1972 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1973 $self->{text} = "M$markup";
1570 1974
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1975 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1976
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1977 $self->{layout}->set_markup ($markup);
1978
1575 delete $self->{req_h}; 1979 delete $self->{size_req};
1576
1577 $self->realloc; 1980 $self->realloc;
1578 $self->update; 1981 $self->update;
1579} 1982}
1580 1983
1581sub size_request { 1984sub size_request {
1582 my ($self) = @_; 1985 my ($self) = @_;
1583 1986
1584 if (exists $self->{req_h}) { 1987 $self->{size_req} ||= do {
1585 @$self{qw(req_w req_h)}
1586 } else {
1587 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1988 $self->{layout}->set_font ($self->{font}) if $self->{font};
1588 $self->{layout}->set_width ($self->{max_w} || -1); 1989 $self->{layout}->set_width ($self->{max_w} || -1);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1990 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1991 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1992 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592 1993
1593 my ($w, $h) = $self->{layout}->size; 1994 my ($w, $h) = $self->{layout}->size;
1594 1995
1595 if (exists $self->{template}) { 1996 if (exists $self->{template}) {
1596 $self->{template}->set_font ($self->{font}) if $self->{font}; 1997 $self->{template}->set_font ($self->{font}) if $self->{font};
1998 $self->{template}->set_width ($self->{max_w} || -1);
1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1999 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 2000
1599 my ($w2, $h2) = $self->{template}->size; 2001 my ($w2, $h2) = $self->{template}->size;
1600 2002
1601 $w = List::Util::max $w, $w2; 2003 $w = List::Util::max $w, $w2;
1602 $h = List::Util::max $h, $h2; 2004 $h = List::Util::max $h, $h2;
1603 } 2005 }
1604 2006
1605 ($w, $h) 2007 [$w, $h]
1606 } 2008 };
1607}
1608 2009
2010 @{ $self->{size_req} }
2011}
2012
2013sub baseline_shift {
2014 $_[0]{layout}->descent
2015}
2016
1609sub size_allocate { 2017sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 2018 my ($self, $w, $h) = @_;
1611 2019
1612 delete $self->{ox}; 2020 delete $self->{ox};
1613 2021
1614 delete $self->{texture} 2022 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2023 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2024
2025 1
1616} 2026}
1617 2027
1618sub set_fontsize { 2028sub set_fontsize {
1619 my ($self, $fontsize) = @_; 2029 my ($self, $fontsize) = @_;
1620 2030
1621 $self->{fontsize} = $fontsize; 2031 $self->{fontsize} = $fontsize;
2032 delete $self->{size_req};
1622 delete $self->{texture}; 2033 delete $self->{texture};
1623 2034
1624 $self->realloc; 2035 $self->realloc;
1625} 2036}
1626 2037
2038sub reconfigure {
2039 my ($self) = @_;
2040
2041 delete $self->{size_req};
2042 delete $self->{texture};
2043
2044 $self->SUPER::reconfigure;
2045}
2046
1627sub _draw { 2047sub _draw {
1628 my ($self) = @_; 2048 my ($self) = @_;
1629 2049
1630 $self->SUPER::_draw; # draw background, if applicable 2050 $self->SUPER::_draw; # draw background, if applicable
1631 2051
1632 my $tex = $self->{texture} ||= do { 2052 my $size = $self->{texture} ||= do {
1633 $self->{layout}->set_foreground (@{$self->{fg}}); 2053 $self->{layout}->set_foreground (@{$self->{fg}});
1634 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2054 $self->{layout}->set_font ($self->{font}) if $self->{font};
1635 $self->{layout}->set_width ($self->{w}); 2055 $self->{layout}->set_width ($self->{w});
1636 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2056 $self->{layout}->set_ellipsise ($self->{ellipsise});
1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2057 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2058 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639 2059
1640 new_from_layout CFClient::Texture $self->{layout} 2060 [$self->{layout}->size]
1641 }; 2061 };
1642 2062
1643 unless (exists $self->{ox}) { 2063 unless (exists $self->{ox}) {
1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2064 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2065 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1646 : ($self->{w} - $tex->{w}) * 0.5); 2066 : ($self->{w} - $size->[0]) * 0.5);
1647 2067
1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2068 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2069 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1650 : ($self->{h} - $tex->{h}) * 0.5); 2070 : ($self->{h} - $size->[1]) * 0.5);
1651 }; 2071 };
1652 2072
1653 glEnable GL_TEXTURE_2D; 2073 my $w = List::Util::min $self->{w} + 4, $size->[0];
1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2074 my $h = List::Util::min $self->{h} + 2, $size->[1];
1655 2075
1656 if ($tex->{format} == GL_ALPHA) { 2076 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1657 glColor @{$self->{fg}};
1658 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1659 } else {
1660 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1661 }
1662
1663 glDisable GL_TEXTURE_2D;
1664} 2077}
1665 2078
1666############################################################################# 2079#############################################################################
1667 2080
1668package CFClient::UI::EntryBase; 2081package CFPlus::UI::EntryBase;
1669 2082
1670our @ISA = CFClient::UI::Label::; 2083our @ISA = CFPlus::UI::Label::;
1671 2084
1672use CFClient::OpenGL; 2085use CFPlus::OpenGL;
1673 2086
1674sub new { 2087sub new {
1675 my $class = shift; 2088 my $class = shift;
1676 2089
1677 $class->SUPER::new ( 2090 $class->SUPER::new (
… …
1681 active_fg => [0, 0, 0], 2094 active_fg => [0, 0, 0],
1682 can_hover => 1, 2095 can_hover => 1,
1683 can_focus => 1, 2096 can_focus => 1,
1684 valign => 0, 2097 valign => 0,
1685 can_events => 1, 2098 can_events => 1,
2099 ellipsise => 0,
1686 #text => ... 2100 #text => ...
2101 #hidden => "*",
1687 @_ 2102 @_
1688 ) 2103 )
1689} 2104}
1690 2105
1691sub _set_text { 2106sub _set_text {
… …
1698 $self->{last_activity} = $::NOW; 2113 $self->{last_activity} = $::NOW;
1699 $self->{text} = $text; 2114 $self->{text} = $text;
1700 2115
1701 $text =~ s/./*/g if $self->{hidden}; 2116 $text =~ s/./*/g if $self->{hidden};
1702 $self->{layout}->set_text ("$text "); 2117 $self->{layout}->set_text ("$text ");
1703 delete $self->{req_h}; 2118 delete $self->{size_req};
1704 2119
1705 $self->_emit (changed => $self->{text}); 2120 $self->emit (changed => $self->{text});
1706 2121
1707 $self->realloc; 2122 $self->realloc;
1708 $self->update; 2123 $self->update;
1709} 2124}
1710 2125
… …
1725 my ($w, $h) = $self->SUPER::size_request; 2140 my ($w, $h) = $self->SUPER::size_request;
1726 2141
1727 ($w + 1, $h) # add 1 for cursor 2142 ($w + 1, $h) # add 1 for cursor
1728} 2143}
1729 2144
1730sub key_down { 2145sub invoke_key_down {
1731 my ($self, $ev) = @_; 2146 my ($self, $ev) = @_;
1732 2147
1733 my $mod = $ev->{mod}; 2148 my $mod = $ev->{mod};
1734 my $sym = $ev->{sym}; 2149 my $sym = $ev->{sym};
1735 my $uni = $ev->{unicode}; 2150 my $uni = $ev->{unicode};
1736 2151
1737 my $text = $self->get_text; 2152 my $text = $self->get_text;
2153
2154 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1738 2155
1739 if ($uni == 8) { 2156 if ($uni == 8) {
1740 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2157 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1741 } elsif ($uni == 127) { 2158 } elsif ($uni == 127) {
1742 substr $text, $self->{cursor}, 1, ""; 2159 substr $text, $self->{cursor}, 1, "";
1743 } elsif ($sym == CFClient::SDLK_LEFT) { 2160 } elsif ($sym == CFPlus::SDLK_LEFT) {
1744 --$self->{cursor} if $self->{cursor}; 2161 --$self->{cursor} if $self->{cursor};
1745 } elsif ($sym == CFClient::SDLK_RIGHT) { 2162 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1746 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2163 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1747 } elsif ($sym == CFClient::SDLK_HOME) { 2164 } elsif ($sym == CFPlus::SDLK_HOME) {
2165 # what a hack
2166 $self->{cursor} =
2167 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2168 ? length $1
2169 : 0;
2170 } elsif ($sym == CFPlus::SDLK_END) {
2171 # uh, again
2172 $self->{cursor} =
2173 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2174 ? $self->{cursor} + length $1
2175 : length $self->{text};
2176 } elsif ($uni == 21) { # ctrl-u
2177 $text = "";
1748 $self->{cursor} = 0; 2178 $self->{cursor} = 0;
1749 } elsif ($sym == CFClient::SDLK_END) {
1750 $self->{cursor} = length $text;
1751 } elsif ($uni == 27) { 2179 } elsif ($uni == 27) {
1752 $self->_emit ('escape'); 2180 $self->emit ('escape');
1753 } elsif ($uni) { 2181 } elsif ($uni == 0x0d) {
2182 substr $text, $self->{cursor}++, 0, "\012";
2183 } elsif ($uni >= 0x20) {
1754 substr $text, $self->{cursor}++, 0, chr $uni; 2184 substr $text, $self->{cursor}++, 0, chr $uni;
1755 } else { 2185 } else {
1756 return 0; 2186 return 0;
1757 } 2187 }
1758 2188
1759 $self->_set_text ($text); 2189 $self->_set_text ($text);
1760 2190
1761 $self->realloc; 2191 $self->realloc;
2192 $self->update;
1762 2193
1763 1 2194 1
1764} 2195}
1765 2196
1766sub focus_in { 2197sub invoke_focus_in {
1767 my ($self) = @_; 2198 my ($self) = @_;
1768 2199
1769 $self->{last_activity} = $::NOW; 2200 $self->{last_activity} = $::NOW;
1770 2201
1771 $self->SUPER::focus_in; 2202 $self->SUPER::invoke_focus_in
1772} 2203}
1773 2204
1774sub button_down { 2205sub invoke_button_down {
1775 my ($self, $ev, $x, $y) = @_; 2206 my ($self, $ev, $x, $y) = @_;
1776 2207
1777 $self->SUPER::button_down ($ev, $x, $y); 2208 $self->SUPER::invoke_button_down ($ev, $x, $y);
1778 2209
1779 my $idx = $self->{layout}->xy_to_index ($x, $y); 2210 my $idx = $self->{layout}->xy_to_index ($x, $y);
1780 2211
1781 # byte-index to char-index 2212 # byte-index to char-index
1782 my $text = $self->{text}; 2213 my $text = $self->{text};
1783 utf8::encode $text; 2214 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1784 $self->{cursor} = length substr $text, 0, $idx; 2215 $self->{cursor} = length $text;
1785 2216
1786 $self->_set_text ($self->{text}); 2217 $self->_set_text ($self->{text});
1787 $self->update; 2218 $self->update;
1788 2219
1789 1 2220 1
1790} 2221}
1791 2222
1792sub mouse_motion { 2223sub invoke_mouse_motion {
1793 my ($self, $ev, $x, $y) = @_; 2224 my ($self, $ev, $x, $y) = @_;
1794# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2225# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1795 2226
1796 0 2227 1
1797} 2228}
1798 2229
1799sub _draw { 2230sub _draw {
1800 my ($self) = @_; 2231 my ($self) = @_;
1801 2232
… …
1828 utf8::encode $text; 2259 utf8::encode $text;
1829 2260
1830 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2261 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1831 } 2262 }
1832 2263
1833 glColor @{$self->{fg}};
1834 glBegin GL_LINES; 2264 glBegin GL_LINES;
1835 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2265 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1836 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2266 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1837 glEnd; 2267 glEnd;
1838 } 2268 }
1839} 2269}
1840 2270
2271#############################################################################
2272
1841package CFClient::UI::Entry; 2273package CFPlus::UI::Entry;
1842 2274
1843our @ISA = CFClient::UI::EntryBase::; 2275our @ISA = CFPlus::UI::EntryBase::;
1844 2276
1845use CFClient::OpenGL; 2277use CFPlus::OpenGL;
1846 2278
1847sub key_down { 2279sub invoke_key_down {
1848 my ($self, $ev) = @_; 2280 my ($self, $ev) = @_;
1849 2281
1850 my $sym = $ev->{sym}; 2282 my $sym = $ev->{sym};
1851 2283
1852 if ($sym == 13) { 2284 if ($ev->{uni} == 0x0d || $sym == 13) {
1853 unshift @{$self->{history}}, 2285 unshift @{$self->{history}},
1854 my $txt = $self->get_text; 2286 my $txt = $self->get_text;
2287
1855 $self->{history_pointer} = -1; 2288 $self->{history_pointer} = -1;
1856 $self->{history_saveback} = ''; 2289 $self->{history_saveback} = '';
1857 $self->_emit (activate => $txt); 2290 $self->emit (activate => $txt);
1858 $self->update; 2291 $self->update;
1859 2292
1860 } elsif ($sym == CFClient::SDLK_UP) { 2293 } elsif ($sym == CFPlus::SDLK_UP) {
1861 if ($self->{history_pointer} < 0) { 2294 if ($self->{history_pointer} < 0) {
1862 $self->{history_saveback} = $self->get_text; 2295 $self->{history_saveback} = $self->get_text;
1863 } 2296 }
1864 if (@{$self->{history} || []} > 0) { 2297 if (@{$self->{history} || []} > 0) {
1865 $self->{history_pointer}++; 2298 $self->{history_pointer}++;
… …
1867 $self->{history_pointer} = @{$self->{history} || []} - 1; 2300 $self->{history_pointer} = @{$self->{history} || []} - 1;
1868 } 2301 }
1869 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2302 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1870 } 2303 }
1871 2304
1872 } elsif ($sym == CFClient::SDLK_DOWN) { 2305 } elsif ($sym == CFPlus::SDLK_DOWN) {
1873 $self->{history_pointer}--; 2306 $self->{history_pointer}--;
1874 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2307 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1875 2308
1876 if ($self->{history_pointer} >= 0) { 2309 if ($self->{history_pointer} >= 0) {
1877 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2310 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1878 } else { 2311 } else {
1879 $self->set_text ($self->{history_saveback}); 2312 $self->set_text ($self->{history_saveback});
1880 } 2313 }
1881 2314
1882 } else { 2315 } else {
1883 return $self->SUPER::key_down ($ev) 2316 return $self->SUPER::invoke_key_down ($ev)
1884 } 2317 }
1885 2318
1886 1 2319 1
1887} 2320}
1888 2321
1889############################################################################# 2322#############################################################################
1890 2323
2324package CFPlus::UI::TextEdit;
2325
2326our @ISA = CFPlus::UI::EntryBase::;
2327
2328use CFPlus::OpenGL;
2329
2330sub move_cursor_ver {
2331 my ($self, $dy) = @_;
2332
2333 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2334
2335 $y += $dy;
2336
2337 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2338 $self->{cursor} = $index;
2339 delete $self->{cur_h};
2340 $self->update;
2341 return;
2342 }
2343}
2344
2345sub invoke_key_down {
2346 my ($self, $ev) = @_;
2347
2348 my $sym = $ev->{sym};
2349
2350 if ($sym == CFPlus::SDLK_UP) {
2351 $self->move_cursor_ver (-1);
2352 } elsif ($sym == CFPlus::SDLK_DOWN) {
2353 $self->move_cursor_ver (+1);
2354 } else {
2355 return $self->SUPER::invoke_key_down ($ev)
2356 }
2357
2358 1
2359}
2360
2361#############################################################################
2362
1891package CFClient::UI::Button; 2363package CFPlus::UI::Button;
1892 2364
1893our @ISA = CFClient::UI::Label::; 2365our @ISA = CFPlus::UI::Label::;
1894 2366
1895use CFClient::OpenGL; 2367use CFPlus::OpenGL;
1896 2368
1897my @tex = 2369my @tex =
1898 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2370 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1899 qw(b1_button_active.png); 2371 qw(b1_button_active.png);
1900 2372
1901sub new { 2373sub new {
1902 my $class = shift; 2374 my $class = shift;
1903 2375
… …
1912 can_events => 1, 2384 can_events => 1,
1913 @_ 2385 @_
1914 ) 2386 )
1915} 2387}
1916 2388
1917sub activate { }
1918
1919sub button_up { 2389sub invoke_button_up {
1920 my ($self, $ev, $x, $y) = @_; 2390 my ($self, $ev, $x, $y) = @_;
1921 2391
1922 $self->emit ("activate") 2392 $self->emit ("activate")
1923 if $x >= 0 && $x < $self->{w} 2393 if $x >= 0 && $x < $self->{w}
1924 && $y >= 0 && $y < $self->{h}; 2394 && $y >= 0 && $y < $self->{h};
… …
1942 $self->SUPER::_draw; 2412 $self->SUPER::_draw;
1943} 2413}
1944 2414
1945############################################################################# 2415#############################################################################
1946 2416
1947package CFClient::UI::CheckBox; 2417package CFPlus::UI::CheckBox;
1948 2418
1949our @ISA = CFClient::UI::DrawBG::; 2419our @ISA = CFPlus::UI::DrawBG::;
1950 2420
1951my @tex = 2421my @tex =
1952 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2422 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1953 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2423 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1954 2424
1955use CFClient::OpenGL; 2425use CFPlus::OpenGL;
1956 2426
1957sub new { 2427sub new {
1958 my $class = shift; 2428 my $class = shift;
1959 2429
1960 $class->SUPER::new ( 2430 $class->SUPER::new (
… …
1974 my ($self) = @_; 2444 my ($self) = @_;
1975 2445
1976 (6) x 2 2446 (6) x 2
1977} 2447}
1978 2448
2449sub toggle {
2450 my ($self) = @_;
2451
2452 $self->{state} = !$self->{state};
2453 $self->emit (changed => $self->{state});
2454 $self->update;
2455}
2456
1979sub button_down { 2457sub invoke_button_down {
1980 my ($self, $ev, $x, $y) = @_; 2458 my ($self, $ev, $x, $y) = @_;
1981 2459
1982 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2460 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1983 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2461 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1984 $self->{state} = !$self->{state}; 2462 $self->toggle;
1985 $self->_emit (changed => $self->{state});
1986 } else { 2463 } else {
1987 return 0 2464 return 0
1988 } 2465 }
1989 2466
1990 1 2467 1
… …
2010 glDisable GL_TEXTURE_2D; 2487 glDisable GL_TEXTURE_2D;
2011} 2488}
2012 2489
2013############################################################################# 2490#############################################################################
2014 2491
2015package CFClient::UI::Image; 2492package CFPlus::UI::Image;
2016 2493
2017our @ISA = CFClient::UI::Base::; 2494our @ISA = CFPlus::UI::Base::;
2018 2495
2019use CFClient::OpenGL; 2496use CFPlus::OpenGL;
2020use Carp qw/confess/;
2021 2497
2022our %loaded_images; 2498our %texture_cache;
2023 2499
2024sub new { 2500sub new {
2025 my $class = shift; 2501 my $class = shift;
2026 2502
2027 my $self = $class->SUPER::new (can_events => 0, @_); 2503 my $self = $class->SUPER::new (
2504 can_events => 0,
2505 @_,
2506 );
2028 2507
2029 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2508 $self->{path} || $self->{tex}
2509 or Carp::croak "'path' or 'tex' attributes required";
2030 2510
2031 $loaded_images{$self->{image}} ||= 2511 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2032 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2512 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2033 2513
2034 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2514 CFPlus::weaken $texture_cache{$self->{path}};
2035 2515
2036 Scalar::Util::weaken $loaded_images{$self->{image}}; 2516 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2037
2038 $self->{aspect} = $tex->{w} / $tex->{h};
2039 2517
2040 $self 2518 $self
2041} 2519}
2042 2520
2521sub STORABLE_freeze {
2522 my ($self, $cloning) = @_;
2523
2524 $self->{path}
2525 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2526
2527 $self->{path}
2528}
2529
2530sub STORABLE_attach {
2531 my ($self, $cloning, $path) = @_;
2532
2533 $self->new (path => $path)
2534}
2535
2043sub size_request { 2536sub size_request {
2044 my ($self) = @_; 2537 my ($self) = @_;
2045 2538
2046 ($self->{tex}->{w}, $self->{tex}->{h}) 2539 ($self->{tex}{w}, $self->{tex}{h})
2047} 2540}
2048 2541
2049sub _draw { 2542sub _draw {
2050 my ($self) = @_; 2543 my ($self) = @_;
2051 2544
… …
2061 } 2554 }
2062 2555
2063 glEnable GL_TEXTURE_2D; 2556 glEnable GL_TEXTURE_2D;
2064 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2557 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2065 2558
2066 $tex->draw_quad_alpha (0, 0, $w, $h); 2559 $tex->draw_quad (0, 0, $w, $h);
2067 2560
2068 glDisable GL_TEXTURE_2D; 2561 glDisable GL_TEXTURE_2D;
2069} 2562}
2070 2563
2071############################################################################# 2564#############################################################################
2072 2565
2566package CFPlus::UI::ImageButton;
2567
2568our @ISA = CFPlus::UI::Image::;
2569
2570use CFPlus::OpenGL;
2571
2572my %textures;
2573
2574sub new {
2575 my $class = shift;
2576
2577 my $self = $class->SUPER::new (
2578 padding_x => 4,
2579 padding_y => 4,
2580 fg => [1, 1, 1],
2581 active_fg => [0, 0, 1],
2582 can_hover => 1,
2583 align => 0,
2584 valign => 0,
2585 can_events => 1,
2586 @_
2587 );
2588}
2589
2590sub invoke_button_up {
2591 my ($self, $ev, $x, $y) = @_;
2592
2593 $self->emit ("activate")
2594 if $x >= 0 && $x < $self->{w}
2595 && $y >= 0 && $y < $self->{h};
2596
2597 1
2598}
2599
2600#############################################################################
2601
2073package CFClient::UI::VGauge; 2602package CFPlus::UI::VGauge;
2074 2603
2075our @ISA = CFClient::UI::Base::; 2604our @ISA = CFPlus::UI::Base::;
2076 2605
2077use List::Util qw(min max); 2606use List::Util qw(min max);
2078 2607
2079use CFClient::OpenGL; 2608use CFPlus::OpenGL;
2080 2609
2081my %tex = ( 2610my %tex = (
2082 food => [ 2611 food => [
2083 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2612 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2084 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2613 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2085 ], 2614 ],
2086 grace => [ 2615 grace => [
2087 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2616 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2088 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2617 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2089 ], 2618 ],
2090 hp => [ 2619 hp => [
2091 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2620 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2092 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2621 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2093 ], 2622 ],
2094 mana => [ 2623 mana => [
2095 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2624 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2096 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2625 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2097 ], 2626 ],
2098); 2627);
2099 2628
2100# eg. VGauge->new (gauge => 'food'), default gauge: food 2629# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2160 my $ycut1 = max 0, min 1, $ycut; 2689 my $ycut1 = max 0, min 1, $ycut;
2161 my $ycut2 = max 0, min 1, $ycut - 1; 2690 my $ycut2 = max 0, min 1, $ycut - 1;
2162 2691
2163 my $h1 = $self->{h} * (1 - $ycut1); 2692 my $h1 = $self->{h} * (1 - $ycut1);
2164 my $h2 = $self->{h} * (1 - $ycut2); 2693 my $h2 = $self->{h} * (1 - $ycut2);
2694 my $h3 = $self->{h};
2695
2696 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2165 2697
2166 glEnable GL_BLEND; 2698 glEnable GL_BLEND;
2167 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2699 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2168 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2700 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2169 glEnable GL_TEXTURE_2D; 2701 glEnable GL_TEXTURE_2D;
… …
2188 2720
2189 if ($t3) { 2721 if ($t3) {
2190 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2722 glBindTexture GL_TEXTURE_2D, $t3->{name};
2191 glBegin GL_QUADS; 2723 glBegin GL_QUADS;
2192 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2724 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2193 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2725 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2194 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2726 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2195 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2727 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2196 glEnd; 2728 glEnd;
2197 } 2729 }
2198 2730
2199 glDisable GL_BLEND; 2731 glDisable GL_BLEND;
2200 glDisable GL_TEXTURE_2D; 2732 glDisable GL_TEXTURE_2D;
2201} 2733}
2202 2734
2203############################################################################# 2735#############################################################################
2204 2736
2205package CFClient::UI::Gauge; 2737package CFPlus::UI::Gauge;
2206 2738
2207our @ISA = CFClient::UI::VBox::; 2739our @ISA = CFPlus::UI::VBox::;
2208 2740
2209sub new { 2741sub new {
2210 my ($class, %arg) = @_; 2742 my ($class, %arg) = @_;
2211 2743
2212 my $self = $class->SUPER::new ( 2744 my $self = $class->SUPER::new (
… …
2214 can_hover => 1, 2746 can_hover => 1,
2215 can_events => 1, 2747 can_events => 1,
2216 %arg, 2748 %arg,
2217 ); 2749 );
2218 2750
2219 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2751 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2220 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2752 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2221 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2753 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2222 2754
2223 $self 2755 $self
2224} 2756}
2225 2757
2226sub set_fontsize { 2758sub set_fontsize {
… …
2247 $self->{value}->set_text ($val); 2779 $self->{value}->set_text ($val);
2248} 2780}
2249 2781
2250############################################################################# 2782#############################################################################
2251 2783
2252package CFClient::UI::Slider; 2784package CFPlus::UI::Slider;
2253 2785
2254use strict; 2786use strict;
2255 2787
2256use CFClient::OpenGL; 2788use CFPlus::OpenGL;
2257 2789
2258our @ISA = CFClient::UI::DrawBG::; 2790our @ISA = CFPlus::UI::DrawBG::;
2259 2791
2260my @tex = 2792my @tex =
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2793 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2262 qw(s1_slider.png s1_slider_bg.png); 2794 qw(s1_slider.png s1_slider_bg.png);
2263 2795
2264sub new { 2796sub new {
2265 my $class = shift; 2797 my $class = shift;
2266 2798
… …
2287 $self->update; 2819 $self->update;
2288 2820
2289 $self 2821 $self
2290} 2822}
2291 2823
2292sub changed { }
2293
2294sub set_range { 2824sub set_range {
2295 my ($self, $range) = @_; 2825 my ($self, $range) = @_;
2296 2826
2297 ($range, $self->{range}) = ($self->{range}, $range); 2827 ($range, $self->{range}) = ($self->{range}, $range);
2298 2828
2299 $self->update
2300 if "@$range" ne "@{$self->{range}}"; 2829 if ("@$range" ne "@{$self->{range}}") {
2830 $self->update;
2831 $self->set_value ($self->{range}[0]);
2832 }
2301} 2833}
2302 2834
2303sub set_value { 2835sub set_value {
2304 my ($self, $value) = @_; 2836 my ($self, $value) = @_;
2305 2837
… …
2316 if $unit; 2848 if $unit;
2317 2849
2318 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2850 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2319 2851
2320 if ($value != $old_value) { 2852 if ($value != $old_value) {
2321 $self->_emit (changed => $value); 2853 $self->emit (changed => $value);
2322 $self->update; 2854 $self->update;
2323 } 2855 }
2324} 2856}
2325 2857
2326sub size_request { 2858sub size_request {
2327 my ($self) = @_; 2859 my ($self) = @_;
2328 2860
2329 ($self->{req_w}, $self->{req_h}) 2861 ($self->{req_w}, $self->{req_h})
2330} 2862}
2331 2863
2332sub button_down { 2864sub invoke_button_down {
2333 my ($self, $ev, $x, $y) = @_; 2865 my ($self, $ev, $x, $y) = @_;
2334 2866
2335 $self->SUPER::button_down ($ev, $x, $y); 2867 $self->SUPER::invoke_button_down ($ev, $x, $y);
2336 2868
2337 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2869 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2338 2870
2339 $self->mouse_motion ($ev, $x, $y) 2871 $self->invoke_mouse_motion ($ev, $x, $y)
2340} 2872}
2341 2873
2342sub mouse_motion { 2874sub invoke_mouse_motion {
2343 my ($self, $ev, $x, $y) = @_; 2875 my ($self, $ev, $x, $y) = @_;
2344 2876
2345 if ($GRAB == $self) { 2877 if ($GRAB == $self) {
2346 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2878 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2347 2879
… …
2353 } else { 2885 } else {
2354 return 0; 2886 return 0;
2355 } 2887 }
2356 2888
2357 1 2889 1
2890}
2891
2892sub invoke_mouse_wheel {
2893 my ($self, $ev) = @_;
2894
2895 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2896
2897 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2898
2899 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2900
2901 ! ! $delta
2358} 2902}
2359 2903
2360sub update { 2904sub update {
2361 my ($self) = @_; 2905 my ($self) = @_;
2362 2906
… …
2411 glDisable GL_TEXTURE_2D; 2955 glDisable GL_TEXTURE_2D;
2412} 2956}
2413 2957
2414############################################################################# 2958#############################################################################
2415 2959
2416package CFClient::UI::ValSlider; 2960package CFPlus::UI::ValSlider;
2417 2961
2418our @ISA = CFClient::UI::HBox::; 2962our @ISA = CFPlus::UI::HBox::;
2419 2963
2420sub new { 2964sub new {
2421 my ($class, %arg) = @_; 2965 my ($class, %arg) = @_;
2422 2966
2423 my $range = delete $arg{range}; 2967 my $range = delete $arg{range};
2424 2968
2425 my $self = $class->SUPER::new ( 2969 my $self = $class->SUPER::new (
2426 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2970 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2427 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2971 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2428 to_value => sub { shift }, 2972 to_value => sub { shift },
2429 from_value => sub { shift }, 2973 from_value => sub { shift },
2430 %arg, 2974 %arg,
2431 ); 2975 );
2432 2976
… …
2452sub set_range { shift->{slider}->set_range (@_) } 2996sub set_range { shift->{slider}->set_range (@_) }
2453sub set_value { shift->{slider}->set_value (@_) } 2997sub set_value { shift->{slider}->set_value (@_) }
2454 2998
2455############################################################################# 2999#############################################################################
2456 3000
2457package CFClient::UI::TextView; 3001package CFPlus::UI::TextScroller;
2458 3002
2459our @ISA = CFClient::UI::HBox::; 3003our @ISA = CFPlus::UI::HBox::;
2460 3004
2461use CFClient::OpenGL; 3005use CFPlus::OpenGL;
2462 3006
2463sub new { 3007sub new {
2464 my $class = shift; 3008 my $class = shift;
2465 3009
2466 my $self = $class->SUPER::new ( 3010 my $self = $class->SUPER::new (
2467 fontsize => 1, 3011 fontsize => 1,
2468 can_events => 0, 3012 can_events => 1,
3013 indent => 0,
2469 #font => default_font 3014 #font => default_font
2470 @_, 3015 @_,
2471 3016
2472 layout => (new CFClient::Layout 1), 3017 layout => (new CFPlus::Layout),
2473 par => [], 3018 par => [],
3019 max_par => 0,
2474 height => 0, 3020 height => 0,
2475 children => [ 3021 children => [
2476 (new CFClient::UI::Empty expand => 1), 3022 (new CFPlus::UI::Empty expand => 1),
2477 (new CFClient::UI::Slider vertical => 1), 3023 (new CFPlus::UI::Slider vertical => 1),
2478 ], 3024 ],
2479 ); 3025 );
2480 3026
2481 $self->{children}[1]->connect (changed => sub { $self->update }); 3027 $self->{children}[1]->connect (changed => sub { $self->update });
2482 3028
… …
2488 3034
2489 $self->{fontsize} = $fontsize; 3035 $self->{fontsize} = $fontsize;
2490 $self->reflow; 3036 $self->reflow;
2491} 3037}
2492 3038
3039sub size_request {
3040 my ($self) = @_;
3041
3042 my ($empty, $slider) = @{ $self->{children} };
3043
3044 local $self->{children} = [$empty, $slider];
3045 $self->SUPER::size_request
3046}
3047
2493sub size_allocate { 3048sub invoke_size_allocate {
2494 my ($self, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2495 3050
2496 $self->SUPER::size_allocate ($w, $h); 3051 my ($empty, $slider, @other) = @{ $self->{children} };
3052 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2497 3053
2498 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3054 $self->{layout}->set_font ($self->{font}) if $self->{font};
2499 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3055 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2500 $self->{layout}->set_width ($self->{children}[0]{w}); 3056 $self->{layout}->set_width ($empty->{w});
3057 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2501 3058
2502 $self->reflow; 3059 $self->reflow;
2503}
2504 3060
2505sub text_size { 3061 local $self->{children} = [$empty, $slider];
3062 $self->SUPER::invoke_size_allocate ($w, $h)
3063}
3064
3065sub invoke_mouse_wheel {
2506 my ($self, $text, $indent) = @_; 3066 my ($self, $ev) = @_;
3067
3068 return 0 unless $ev->{dy}; # only vertical movements
3069
3070 $self->{children}[1]->emit (mouse_wheel => $ev);
3071
3072 1
3073}
3074
3075sub get_layout {
3076 my ($self, $para) = @_;
2507 3077
2508 my $layout = $self->{layout}; 3078 my $layout = $self->{layout};
2509 3079
3080 $layout->set_font ($self->{font}) if $self->{font};
3081 $layout->set_foreground (@{$para->{fg}});
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3082 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511 $layout->set_width ($self->{children}[0]{w} - $indent); 3083 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3084 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2512 $layout->set_markup ($text); 3085 $layout->set_markup ($para->{markup});
3086
3087 $layout->set_shapes (
3088 map
3089 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3090 @{$para->{widget}}
2513 3091 );
3092
2514 $layout->size 3093 $layout
2515} 3094}
2516 3095
2517sub reflow { 3096sub reflow {
2518 my ($self) = @_; 3097 my ($self) = @_;
2519 3098
… …
2526 3105
2527 # todo: base offset on lines or so, not on pixels 3106 # todo: base offset on lines or so, not on pixels
2528 $self->{children}[1]->set_value ($offset); 3107 $self->{children}[1]->set_value ($offset);
2529} 3108}
2530 3109
3110sub current_paragraph {
3111 my ($self) = @_;
3112
3113 $self->{top_paragraph} - 1
3114}
3115
3116sub scroll_to {
3117 my ($self, $para) = @_;
3118
3119 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3120
3121 $self->{scroll_to} = $para;
3122 $self->update;
3123}
3124
2531sub clear { 3125sub clear {
2532 my ($self) = @_; 3126 my ($self) = @_;
3127
3128 my (undef, undef, @other) = @{ $self->{children} };
3129 $self->remove ($_) for @other;
2533 3130
2534 $self->{par} = []; 3131 $self->{par} = [];
2535 $self->{height} = 0; 3132 $self->{height} = 0;
2536 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3133 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2537} 3134}
2538 3135
2539sub add_paragraph { 3136sub add_paragraph {
2540 my ($self, $color, $text, $indent) = @_; 3137 my $self = shift;
2541 3138
2542 for my $line (split /\n/, $text) { 3139 for my $para (@_) {
2543 my ($w, $h) = $self->text_size ($line); 3140 $para = {
3141 fg => [1, 1, 1, 1],
3142 indent => 0,
3143 markup => "",
3144 widget => [],
3145 ref $para ? %$para : (markup => $para),
3146 w => 1e10,
3147 wrapped => 1,
3148 };
3149
3150 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3151 push @{$self->{par}}, $para;
3152 }
3153
3154 if (my $max = $self->{max_par}) {
3155 shift @{$self->{par}} while @{$self->{par}} > $max;
3156 }
3157
3158 $self->{need_reflow}++;
3159 $self->update;
3160}
3161
3162sub scroll_to_bottom {
3163 my ($self) = @_;
3164
3165 $self->{scroll_to} = $#{$self->{par}};
3166 $self->update;
3167}
3168
3169sub force_uptodate {
3170 my ($self) = @_;
3171
3172 if (delete $self->{need_reflow}) {
3173 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3174
3175 my $height = 0;
3176
3177 for my $para (@{$self->{par}}) {
3178 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3179 my $layout = $self->get_layout ($para);
3180 my ($w, $h) = $layout->size;
3181
3182 $para->{w} = $w + $para->{indent};
3183 $para->{h} = $h;
3184 $para->{wrapped} = $layout->has_wrapped;
3185 }
3186
3187 $para->{y} = $height;
3188 $height += $para->{h};
3189 }
3190
2544 $self->{height} += $h; 3191 $self->{height} = $height;
2545 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3192 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2546 }
2547 3193
2548 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3194 delete $self->{texture};
3195 }
3196
3197 if (my $paridx = delete $self->{scroll_to}) {
3198 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3199 }
2549} 3200}
2550 3201
2551sub update { 3202sub update {
2552 my ($self) = @_; 3203 my ($self) = @_;
2553 3204
… …
2555 3206
2556 return unless $self->{h} > 0; 3207 return unless $self->{h} > 0;
2557 3208
2558 delete $self->{texture}; 3209 delete $self->{texture};
2559 3210
2560 $ROOT->on_post_alloc ($self, sub { 3211 $ROOT->on_post_alloc ($self => sub {
3212 $self->force_uptodate;
3213
2561 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3214 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2562 3215
2563 if (delete $self->{need_reflow}) {
2564 my $height = 0;
2565
2566 my $layout = $self->{layout};
2567
2568 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2569
2570 for (@{$self->{par}}) {
2571 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2572 $layout->set_width ($W - $_->[3]);
2573 $layout->set_markup ($_->[4]);
2574 my ($w, $h) = $layout->size;
2575 $_->[0] = $w + $_->[3];
2576 $_->[1] = $h;
2577 }
2578
2579 $height += $_->[1];
2580 }
2581
2582 $self->{height} = $height;
2583
2584 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2585
2586 delete $self->{texture};
2587 }
2588
2589 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3216 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2590 glClearColor 0, 0, 0, 0; 3217 glClearColor 0, 0, 0, 0;
2591 glClear GL_COLOR_BUFFER_BIT; 3218 glClear GL_COLOR_BUFFER_BIT;
2592 3219
3220 package CFPlus::UI::Base;
3221 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3222 (0, 0, $self->{w}, $self->{h});
3223
3224 my $top = int $self->{children}[1]{range}[0];
3225
3226 my $paridx = 0;
3227 my $top_paragraph;
2593 my $top = int $self->{children}[1]{range}[0]; 3228 my $top = int $self->{children}[1]{range}[0];
2594 3229
2595 my $y0 = $top; 3230 my $y0 = $top;
2596 my $y1 = $top + $H; 3231 my $y1 = $top + $H;
2597 3232
2598 my $y = 0;
2599
2600 my $layout = $self->{layout};
2601
2602 $layout->set_font ($self->{font}) if $self->{font};
2603
2604 glEnable GL_BLEND;
2605 #TODO# not correct in windows where rgba is forced off
2606 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2607
2608 for my $par (@{$self->{par}}) { 3233 for my $para (@{$self->{par}}) {
2609 my $h = $par->[1]; 3234 my $h = $para->{h};
3235 my $y = $para->{y};
2610 3236
2611 if ($y0 < $y + $h && $y < $y1) { 3237 if ($y0 < $y + $h && $y < $y1) {
2612 $layout->set_foreground (@{ $par->[2] }); 3238 my $layout = $self->get_layout ($para);
2613 $layout->set_width ($W - $par->[3]);
2614 $layout->set_markup ($par->[4]);
2615 3239
2616 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3240 $layout->render ($para->{indent}, $y - $y0);
2617 3241
2618 glRasterPos $par->[3], $y - $y0; 3242 if (my @w = @{ $para->{widget} }) {
2619 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3243 my @s = $layout->get_shapes;
3244
3245 for (@w) {
3246 my ($dx, $dy) = splice @s, 0, 2, ();
3247
3248 $_->{x} = $dx + $para->{indent};
3249 $_->{y} = $dy + $y - $y0;
3250
3251 $_->draw;
3252 }
3253 }
2620 } 3254 }
2621 3255
2622 $y += $h; 3256 $paridx++;
3257 $top_paragraph ||= $paridx if $y >= $top;
2623 } 3258 }
2624 3259
2625 glDisable GL_BLEND; 3260 $self->{top_paragraph} = $top_paragraph;
2626 }; 3261 };
2627 }); 3262 });
3263}
3264
3265sub reconfigure {
3266 my ($self) = @_;
3267
3268 $self->SUPER::reconfigure;
3269
3270 $_->{w} = 1e10 for @{ $self->{par} };
3271 $self->reflow;
2628} 3272}
2629 3273
2630sub _draw { 3274sub _draw {
2631 my ($self) = @_; 3275 my ($self) = @_;
2632 3276
… …
2635 glColor 0, 0, 0, 1; 3279 glColor 0, 0, 0, 1;
2636 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3280 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2637 glDisable GL_TEXTURE_2D; 3281 glDisable GL_TEXTURE_2D;
2638 3282
2639 $self->{children}[1]->draw; 3283 $self->{children}[1]->draw;
2640
2641} 3284}
2642 3285
2643############################################################################# 3286#############################################################################
2644 3287
2645package CFClient::UI::Animator; 3288package CFPlus::UI::Animator;
2646 3289
2647use CFClient::OpenGL; 3290use CFPlus::OpenGL;
2648 3291
2649our @ISA = CFClient::UI::Bin::; 3292our @ISA = CFPlus::UI::Bin::;
2650 3293
2651sub moveto { 3294sub moveto {
2652 my ($self, $x, $y) = @_; 3295 my ($self, $x, $y) = @_;
2653 3296
2654 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3297 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2682 glPopMatrix; 3325 glPopMatrix;
2683} 3326}
2684 3327
2685############################################################################# 3328#############################################################################
2686 3329
2687package CFClient::UI::Flopper; 3330package CFPlus::UI::Flopper;
2688 3331
2689our @ISA = CFClient::UI::Button::; 3332our @ISA = CFPlus::UI::Button::;
2690 3333
2691sub new { 3334sub new {
2692 my $class = shift; 3335 my $class = shift;
2693 3336
2694 my $self = $class->SUPER::new ( 3337 my $self = $class->SUPER::new (
… …
2706 $self->{other}->toggle_visibility; 3349 $self->{other}->toggle_visibility;
2707} 3350}
2708 3351
2709############################################################################# 3352#############################################################################
2710 3353
2711package CFClient::UI::Tooltip; 3354package CFPlus::UI::Tooltip;
2712 3355
2713our @ISA = CFClient::UI::Bin::; 3356our @ISA = CFPlus::UI::Bin::;
2714 3357
2715use CFClient::OpenGL; 3358use CFPlus::OpenGL;
2716 3359
2717sub new { 3360sub new {
2718 my $class = shift; 3361 my $class = shift;
2719 3362
2720 $class->SUPER::new ( 3363 $class->SUPER::new (
… …
2723 ) 3366 )
2724} 3367}
2725 3368
2726sub set_tooltip_from { 3369sub set_tooltip_from {
2727 my ($self, $widget) = @_; 3370 my ($self, $widget) = @_;
3371
3372 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3373 if $widget->{tooltip} =~ /^#(.*)$/;
2728 3374
2729 my $tooltip = $widget->{tooltip}; 3375 my $tooltip = $widget->{tooltip};
2730 3376
2731 if ($ENV{CFPLUS_DEBUG} & 2) { 3377 if ($ENV{CFPLUS_DEBUG} & 2) {
2732 $tooltip .= "\n\n" . (ref $widget) . "\n" 3378 $tooltip .= "\n\n" . (ref $widget) . "\n"
2733 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3379 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2734 . "req $widget->{req_w} $widget->{req_h}\n" 3380 . "req $widget->{req_w} $widget->{req_h}\n"
2735 . "visible $widget->{visible}"; 3381 . "visible $widget->{visible}";
2736 } 3382 }
2737 3383
3384 $tooltip =~ s/^\n+//;
3385 $tooltip =~ s/\n+$//;
3386
2738 $self->add (new CFClient::UI::Label 3387 $self->add (new CFPlus::UI::Label
2739 markup => $tooltip, 3388 markup => $tooltip,
2740 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3389 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2741 fontsize => 0.8, 3390 fontsize => 0.8,
2742 fg => [0, 0, 0, 1], 3391 style => 1, # FLAG_INVERSE
2743 ellipsise => 0, 3392 ellipsise => 0,
2744 font => ($widget->{tooltip_font} || $::FONT_PROP), 3393 font => ($widget->{tooltip_font} || $::FONT_PROP),
2745 ); 3394 );
2746} 3395}
2747 3396
… …
2751 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3400 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2752 3401
2753 ($w + 4, $h + 4) 3402 ($w + 4, $h + 4)
2754} 3403}
2755 3404
2756sub size_allocate { 3405sub invoke_size_allocate {
2757 my ($self, $w, $h) = @_; 3406 my ($self, $w, $h) = @_;
2758 3407
2759 $self->SUPER::size_allocate ($w - 4, $h - 4); 3408 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2760} 3409}
2761 3410
2762sub visibility_change { 3411sub invoke_visibility_change {
2763 my ($self, $visible) = @_; 3412 my ($self, $visible) = @_;
2764 3413
2765 return unless $visible; 3414 return unless $visible;
2766 3415
2767 $self->{root}->on_post_alloc ("move_$self" => sub { 3416 $self->{root}->on_post_alloc ("move_$self" => sub {
2768 my $widget = $self->{owner} 3417 my $widget = $self->{owner}
2769 or return; 3418 or return;
2770 3419
3420 if ($widget->{visible}) {
2771 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3421 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2772 3422
2773 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3423 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2774 if $x + $self->{w} > $::WIDTH; 3424 if $x + $self->{w} > $self->{root}{w};
2775 3425
2776 $self->move_abs ($x, $y); 3426 $self->move_abs ($x, $y);
3427 } else {
3428 $self->hide;
3429 }
2777 }); 3430 });
2778} 3431}
2779 3432
2780sub _draw { 3433sub _draw {
2781 my ($self) = @_; 3434 my ($self) = @_;
… …
2805 $self->SUPER::_draw; 3458 $self->SUPER::_draw;
2806} 3459}
2807 3460
2808############################################################################# 3461#############################################################################
2809 3462
2810package CFClient::UI::Face; 3463package CFPlus::UI::Face;
2811 3464
2812our @ISA = CFClient::UI::Base::; 3465our @ISA = CFPlus::UI::DrawBG::;
2813 3466
2814use CFClient::OpenGL; 3467use CFPlus::OpenGL;
2815 3468
2816sub new { 3469sub new {
2817 my $class = shift; 3470 my $class = shift;
2818 3471
2819 my $self = $class->SUPER::new ( 3472 my $self = $class->SUPER::new (
3473 size_w => 32,
3474 size_h => 8,
2820 aspect => 1, 3475 aspect => 1,
2821 can_events => 0, 3476 can_events => 0,
2822 @_, 3477 @_,
2823 ); 3478 );
2824 3479
2825 if ($self->{anim} && $self->{animspeed}) { 3480 if ($self->{anim} && $self->{animspeed}) {
2826 Scalar::Util::weaken (my $widget = $self); 3481 CFPlus::weaken (my $widget = $self);
2827 3482
2828 $self->{timer} = Event->timer ( 3483 $self->{timer} = Event->timer (
2829 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3484 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2830 hard => 1, 3485 hard => 1,
2831 interval => $self->{animspeed}, 3486 interval => $self->{animspeed},
2832 cb => sub { 3487 cb => sub {
3488 return unless $::CONN;
3489
2833 ++$widget->{frame}; 3490 ++$widget->{frame};
3491 $self->update_face;
2834 $widget->update; 3492 $self->update;
2835 }, 3493 },
2836 ); 3494 );
3495
3496 $self->update_face;
2837 } 3497 }
2838 3498
2839 $self 3499 $self
2840} 3500}
2841 3501
3502sub update_face {
3503 my ($self) = @_;
3504
3505 return unless $::CONN;
3506
3507 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3508 if ($anim && @$anim) {
3509 delete $self->{wait_face};
3510 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3511 }
3512 }
3513}
3514
2842sub size_request { 3515sub size_request {
2843 (32, 8) 3516 my ($self) = @_;
3517
3518 if ($::CONN) {
3519 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3520 if (my $tex = $::CONN->{texture}[$faceid]) {
3521 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3522 } else {
3523 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3524 $self->realloc;
3525 });
3526 }
3527 }
3528 }
3529
3530 ($self->{size_w} || 8, $self->{size_h} || 8)
2844} 3531}
2845 3532
2846sub update { 3533sub update {
2847 my ($self) = @_; 3534 my ($self) = @_;
2848 3535
… …
2854sub _draw { 3541sub _draw {
2855 my ($self) = @_; 3542 my ($self) = @_;
2856 3543
2857 return unless $::CONN; 3544 return unless $::CONN;
2858 3545
2859 my $face; 3546 $self->SUPER::_draw;
2860 3547
2861 if ($self->{frame}) {
2862 my $anim = $::CONN->{anim}[$self->{anim}]; 3548 my $faceid = $::CONN->{faceid}[$self->{face}]
2863 3549 or return;
2864 $face = $anim->[ $self->{frame} % @$anim ]
2865 if $anim && @$anim;
2866 }
2867 3550
2868 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3551 my $tex = $::CONN->{texture}[$faceid];
2869 3552
2870 if ($tex) { 3553 if ($tex) {
2871 glEnable GL_TEXTURE_2D; 3554 glEnable GL_TEXTURE_2D;
2872 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2873 glColor 0, 0, 0, 1; 3556 glColor 0, 0, 0, 1;
2874 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3557 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2875 glDisable GL_TEXTURE_2D; 3558 glDisable GL_TEXTURE_2D;
2876 } 3559 }
2877} 3560}
2878 3561
2879sub DESTROY { 3562sub destroy {
2880 my ($self) = @_; 3563 my ($self) = @_;
2881 3564
2882 $self->{timer}->cancel 3565 $self->{timer}->cancel
2883 if $self->{timer}; 3566 if $self->{timer};
2884 3567
2885 $self->SUPER::DESTROY; 3568 $self->SUPER::destroy;
2886} 3569}
2887 3570
2888############################################################################# 3571#############################################################################
2889 3572
2890package CFClient::UI::Buttonbar; 3573package CFPlus::UI::Buttonbar;
2891 3574
2892our @ISA = CFClient::UI::HBox::; 3575our @ISA = CFPlus::UI::HBox::;
2893 3576
2894# TODO: should actualyl wrap buttons and other goodies. 3577# TODO: should actually wrap buttons and other goodies.
2895 3578
2896############################################################################# 3579#############################################################################
2897 3580
2898package CFClient::UI::Menu; 3581package CFPlus::UI::Menu;
2899 3582
2900our @ISA = CFClient::UI::FancyFrame::; 3583our @ISA = CFPlus::UI::Toplevel::;
2901 3584
2902use CFClient::OpenGL; 3585use CFPlus::OpenGL;
2903 3586
2904sub new { 3587sub new {
2905 my $class = shift; 3588 my $class = shift;
2906 3589
2907 my $self = $class->SUPER::new ( 3590 my $self = $class->SUPER::new (
2908 items => [], 3591 items => [],
2909 z => 100, 3592 z => 100,
2910 @_, 3593 @_,
2911 ); 3594 );
2912 3595
2913 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3596 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2914 3597
2915 for my $item (@{ $self->{items} }) { 3598 for my $item (@{ $self->{items} }) {
2916 my ($widget, $cb) = @$item; 3599 my ($widget, $cb, $tooltip) = @$item;
2917 3600
2918 # handle various types of items, only text for now 3601 # handle various types of items, only text for now
2919 if (!ref $widget) { 3602 if (!ref $widget) {
3603 if ($widget =~ /\t/) {
3604 my ($left, $right) = split /\t/, $widget, 2;
3605
2920 $widget = new CFClient::UI::Label 3606 $widget = new CFPlus::UI::HBox
2921 can_hover => 1, 3607 can_hover => 1,
2922 can_events => 1, 3608 can_events => 1,
3609 tooltip => $tooltip,
3610 children => [
3611 (new CFPlus::UI::Label markup => $left, expand => 1),
3612 (new CFPlus::UI::Label markup => $right, align => +1),
3613 ],
3614 ;
3615
3616 } else {
3617 $widget = new CFPlus::UI::Label
3618 can_hover => 1,
3619 can_events => 1,
2923 text => $widget; 3620 markup => $widget,
3621 tooltip => $tooltip;
3622 }
2924 } 3623 }
2925 3624
2926 $self->{item}{$widget} = $item; 3625 $self->{item}{$widget} = $item;
2927 3626
2928 $self->{vbox}->add ($widget); 3627 $self->{vbox}->add ($widget);
… …
2933 3632
2934# popup given the event (must be a mouse button down event currently) 3633# popup given the event (must be a mouse button down event currently)
2935sub popup { 3634sub popup {
2936 my ($self, $ev) = @_; 3635 my ($self, $ev) = @_;
2937 3636
2938 $self->_emit ("popdown"); 3637 $self->emit ("popdown");
2939 3638
2940 # maybe save $GRAB? must be careful about events... 3639 # maybe save $GRAB? must be careful about events...
2941 $GRAB = $self; 3640 $GRAB = $self;
2942 $self->{button} = $ev->{button}; 3641 $self->{button} = $ev->{button};
2943 3642
2944 $self->show; 3643 $self->show;
2945 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3644 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2946} 3645}
2947 3646
2948sub mouse_motion { 3647sub invoke_mouse_motion {
2949 my ($self, $ev, $x, $y) = @_; 3648 my ($self, $ev, $x, $y) = @_;
2950 3649
2951 # TODO: should use vbox->find_widget or so 3650 # TODO: should use vbox->find_widget or so
2952 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3651 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2953 $self->{hover} = $self->{item}{$HOVER}; 3652 $self->{hover} = $self->{item}{$HOVER};
2954 3653
2955 0 3654 0
2956} 3655}
2957 3656
2958sub button_up { 3657sub invoke_button_up {
2959 my ($self, $ev, $x, $y) = @_; 3658 my ($self, $ev, $x, $y) = @_;
2960 3659
2961 if ($ev->{button} == $self->{button}) { 3660 if ($ev->{button} == $self->{button}) {
2962 undef $GRAB; 3661 undef $GRAB;
2963 $self->hide; 3662 $self->hide;
2964 3663
2965 $self->_emit ("popdown"); 3664 $self->emit ("popdown");
2966 $self->{hover}[1]->() if $self->{hover}; 3665 $self->{hover}[1]->() if $self->{hover};
2967 } else { 3666 } else {
2968 return 0 3667 return 0
2969 } 3668 }
2970 3669
2971 1 3670 1
2972} 3671}
2973 3672
2974############################################################################# 3673#############################################################################
2975 3674
2976package CFClient::UI::Multiplexer; 3675package CFPlus::UI::Multiplexer;
2977 3676
2978our @ISA = CFClient::UI::Container::; 3677our @ISA = CFPlus::UI::Container::;
2979 3678
2980sub new { 3679sub new {
2981 my $class = shift; 3680 my $class = shift;
2982 3681
2983 my $self = $class->SUPER::new ( 3682 my $self = $class->SUPER::new (
… …
2997 3696
2998 $self->{current} = $self->{children}[0] 3697 $self->{current} = $self->{children}[0]
2999 if @{ $self->{children} }; 3698 if @{ $self->{children} };
3000} 3699}
3001 3700
3701sub get_current_page {
3702 my ($self) = @_;
3703
3704 $self->{current}
3705}
3706
3002sub set_current_page { 3707sub set_current_page {
3003 my ($self, $page_or_widget) = @_; 3708 my ($self, $page_or_widget) = @_;
3004 3709
3005 my $widget = ref $page_or_widget 3710 my $widget = ref $page_or_widget
3006 ? $page_or_widget 3711 ? $page_or_widget
3007 : $self->{children}[$page_or_widget]; 3712 : $self->{children}[$page_or_widget];
3008 3713
3009 $self->{current} = $widget; 3714 $self->{current} = $widget;
3010 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3715 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3011 3716
3012 $self->_emit (page_changed => $self->{current}); 3717 $self->emit (page_changed => $self->{current});
3013 3718
3014 $self->realloc; 3719 $self->realloc;
3015} 3720}
3016 3721
3017sub visible_children { 3722sub visible_children {
… …
3022 my ($self) = @_; 3727 my ($self) = @_;
3023 3728
3024 $self->{current}->size_request 3729 $self->{current}->size_request
3025} 3730}
3026 3731
3027sub size_allocate { 3732sub invoke_size_allocate {
3028 my ($self, $w, $h) = @_; 3733 my ($self, $w, $h) = @_;
3029 3734
3030 $self->{current}->configure (0, 0, $w, $h); 3735 $self->{current}->configure (0, 0, $w, $h);
3736
3737 1
3031} 3738}
3032 3739
3033sub _draw { 3740sub _draw {
3034 my ($self) = @_; 3741 my ($self) = @_;
3035 3742
3036 $self->{current}->draw; 3743 $self->{current}->draw;
3037} 3744}
3038 3745
3039############################################################################# 3746#############################################################################
3040 3747
3041package CFClient::UI::Notebook; 3748package CFPlus::UI::Notebook;
3042 3749
3043our @ISA = CFClient::UI::VBox::; 3750our @ISA = CFPlus::UI::VBox::;
3044 3751
3045sub new { 3752sub new {
3046 my $class = shift; 3753 my $class = shift;
3047 3754
3048 my $self = $class->SUPER::new ( 3755 my $self = $class->SUPER::new (
3049 buttonbar => (new CFClient::UI::Buttonbar), 3756 buttonbar => (new CFPlus::UI::Buttonbar),
3050 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3757 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3051 # filter => # will be put between multiplexer and $self 3758 # filter => # will be put between multiplexer and $self
3052 @_, 3759 @_,
3053 ); 3760 );
3054 3761
3055 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3762 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3059} 3766}
3060 3767
3061sub add { 3768sub add {
3062 my ($self, $title, $widget, $tooltip) = @_; 3769 my ($self, $title, $widget, $tooltip) = @_;
3063 3770
3064 Scalar::Util::weaken $self; 3771 CFPlus::weaken $self;
3065 3772
3066 $self->{buttonbar}->add (new CFClient::UI::Button 3773 $self->{buttonbar}->add (new CFPlus::UI::Button
3067 markup => $title, 3774 markup => $title,
3068 tooltip => $tooltip, 3775 tooltip => $tooltip,
3069 on_activate => sub { $self->set_current_page ($widget) }, 3776 on_activate => sub { $self->set_current_page ($widget) },
3070 ); 3777 );
3071 3778
3072 $self->{multiplexer}->add ($widget); 3779 $self->{multiplexer}->add ($widget);
3073} 3780}
3074 3781
3782sub get_current_page {
3783 my ($self) = @_;
3784
3785 $self->{multiplexer}->get_current_page
3786}
3787
3075sub set_current_page { 3788sub set_current_page {
3076 my ($self, $page) = @_; 3789 my ($self, $page) = @_;
3077 3790
3078 $self->{multiplexer}->set_current_page ($page); 3791 $self->{multiplexer}->set_current_page ($page);
3079 $self->_emit (page_changed => $self->{multiplexer}{current}); 3792 $self->emit (page_changed => $self->{multiplexer}{current});
3080} 3793}
3081 3794
3082############################################################################# 3795#############################################################################
3083 3796
3797package CFPlus::UI::Selector;
3798
3799use utf8;
3800
3801our @ISA = CFPlus::UI::Button::;
3802
3803sub new {
3804 my $class = shift;
3805
3806 my $self = $class->SUPER::new (
3807 options => [], # [value, title, longdesc], ...
3808 value => undef,
3809 @_,
3810 );
3811
3812 $self->_set_value ($self->{value});
3813
3814 $self
3815}
3816
3817sub invoke_button_down {
3818 my ($self, $ev) = @_;
3819
3820 my @menu_items;
3821
3822 for (@{ $self->{options} }) {
3823 my ($value, $title, $tooltip) = @$_;
3824
3825 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3826 }
3827
3828 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3829}
3830
3831sub _set_value {
3832 my ($self, $value) = @_;
3833
3834 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3835 or return;
3836
3837 $self->{value} = $item->[0];
3838 $self->set_markup ("$item->[1] ⇓");
3839 $self->set_tooltip ($item->[2]);
3840}
3841
3842sub set_value {
3843 my ($self, $value) = @_;
3844
3845 return unless $self->{value} ne $value;
3846
3847 $self->_set_value ($value);
3848 $self->emit (changed => $value);
3849}
3850
3851#############################################################################
3852
3084package CFClient::UI::Statusbox; 3853package CFPlus::UI::Statusbox;
3085 3854
3086our @ISA = CFClient::UI::VBox::; 3855our @ISA = CFPlus::UI::VBox::;
3087 3856
3088sub new { 3857sub new {
3089 my $class = shift; 3858 my $class = shift;
3090 3859
3091 my $self = $class->SUPER::new ( 3860 my $self = $class->SUPER::new (
3092 fontsize => 0.8, 3861 fontsize => 0.8,
3093 @_, 3862 @_,
3094 ); 3863 );
3095 3864
3096 Scalar::Util::weaken (my $this = $self); 3865 CFPlus::weaken (my $this = $self);
3097 3866
3098 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3867 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3099 3868
3100 $self 3869 $self
3101} 3870}
… …
3103sub reorder { 3872sub reorder {
3104 my ($self) = @_; 3873 my ($self) = @_;
3105 my $NOW = Time::HiRes::time; 3874 my $NOW = Time::HiRes::time;
3106 3875
3107 # freeze display when hovering over any label 3876 # freeze display when hovering over any label
3108 return if $CFClient::UI::TOOLTIP->{owner} 3877 return if $CFPlus::UI::TOOLTIP->{owner}
3109 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3878 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3110 values %{ $self->{item} }; 3879 values %{ $self->{item} };
3111 3880
3112 while (my ($k, $v) = each %{ $self->{item} }) { 3881 while (my ($k, $v) = each %{ $self->{item} }) {
3113 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3882 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3114 } 3883 }
… …
3135 for ($short) { 3904 for ($short) {
3136 s/^\s+//; 3905 s/^\s+//;
3137 s/\s+/ /g; 3906 s/\s+/ /g;
3138 } 3907 }
3139 3908
3140 new CFClient::UI::Label 3909 new CFPlus::UI::Label
3141 markup => $short, 3910 markup => $short,
3142 tooltip => $item->{tooltip}, 3911 tooltip => $item->{tooltip},
3143 tooltip_font => $::FONT_PROP, 3912 tooltip_font => $::FONT_PROP,
3144 tooltip_width => 0.67, 3913 tooltip_width => 0.67,
3145 fontsize => $item->{fontsize} || $self->{fontsize}, 3914 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3183 $item->{count}++; 3952 $item->{count}++;
3184 } else { 3953 } else {
3185 $item->{count} = 1; 3954 $item->{count} = 1;
3186 $item->{text} = $item->{tooltip} = $text; 3955 $item->{text} = $item->{tooltip} = $text;
3187 } 3956 }
3188 $item->{id} = ++$self->{id}; 3957 $item->{id} += 0.2;#d#
3189 $item->{timeout} = $timeout; 3958 $item->{timeout} = $timeout;
3190 delete $item->{label}; 3959 delete $item->{label};
3191 } else { 3960 } else {
3192 $self->{item}{$group} = { 3961 $self->{item}{$group} = {
3193 id => ++$self->{id}, 3962 id => ++$self->{id},
… …
3199 count => 1, 3968 count => 1,
3200 %arg, 3969 %arg,
3201 }; 3970 };
3202 } 3971 }
3203 3972
3973 $ROOT->on_refresh (reorder => sub {
3204 $self->reorder; 3974 $self->reorder;
3975 });
3205} 3976}
3206 3977
3207sub reconfigure { 3978sub reconfigure {
3208 my ($self) = @_; 3979 my ($self) = @_;
3209 3980
… …
3212 3983
3213 $self->reorder; 3984 $self->reorder;
3214 $self->SUPER::reconfigure; 3985 $self->SUPER::reconfigure;
3215} 3986}
3216 3987
3217sub DESTROY { 3988sub destroy {
3218 my ($self) = @_; 3989 my ($self) = @_;
3219 3990
3220 $self->{timer}->cancel; 3991 $self->{timer}->cancel;
3221 3992
3222 $self->SUPER::DESTROY; 3993 $self->SUPER::destroy;
3223} 3994}
3224 3995
3225############################################################################# 3996#############################################################################
3226 3997
3227package CFClient::UI::Inventory;
3228
3229our @ISA = CFClient::UI::ScrolledWindow::;
3230
3231sub new {
3232 my $class = shift;
3233
3234 my $self = $class->SUPER::new (
3235 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3236 @_,
3237 );
3238
3239 $self
3240}
3241
3242sub set_items {
3243 my ($self, $items) = @_;
3244
3245 $self->{child}->clear;
3246 return unless $items;
3247
3248 my @items = sort {
3249 ($a->{type} <=> $b->{type})
3250 or ($a->{name} cmp $b->{name})
3251 } @$items;
3252
3253 $self->{real_items} = \@items;
3254
3255 my $row = 0;
3256 for my $item (@items) {
3257 CFClient::Item::update_widgets $item;
3258
3259 $self->{child}->add (0, $row, $item->{face_widget});
3260 $self->{child}->add (1, $row, $item->{desc_widget});
3261 $self->{child}->add (2, $row, $item->{weight_widget});
3262
3263 $row++;
3264 }
3265}
3266
3267#############################################################################
3268
3269package CFClient::UI::BindEditor;
3270
3271our @ISA = CFClient::UI::FancyFrame::;
3272
3273sub new {
3274 my $class = shift;
3275
3276 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3277
3278 $self->add (my $vb = new CFClient::UI::VBox);
3279
3280
3281 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3282 text => "start recording",
3283 tooltip => "Start/Stops recording of actions."
3284 ."All subsequent actions after the recording started will be captured."
3285 ."The actions are displayed after the record was stopped."
3286 ."To bind the action you have to click on the 'Bind' button",
3287 on_activate => sub {
3288 unless ($self->{recording}) {
3289 $self->start;
3290 } else {
3291 $self->stop;
3292 }
3293 });
3294
3295 $vb->add (new CFClient::UI::Label text => "Actions:");
3296 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3297
3298 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3299 $vb->add (my $hb = new CFClient::UI::HBox);
3300 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3301 $hb->add (new CFClient::UI::Button
3302 text => "bind",
3303 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3304 on_activate => sub {
3305 $self->ask_for_bind;
3306 });
3307
3308 $vb->add (my $hb = new CFClient::UI::HBox);
3309 $hb->add (new CFClient::UI::Button
3310 text => "ok",
3311 expand => 1,
3312 tooltip => "This closes the binding editor and saves the binding",
3313 on_activate => sub {
3314 $self->hide;
3315 $self->commit;
3316 });
3317
3318 $hb->add (new CFClient::UI::Button
3319 text => "cancel",
3320 expand => 1,
3321 tooltip => "This closes the binding editor without saving",
3322 on_activate => sub {
3323 $self->hide;
3324 $self->{binding_cancel}->()
3325 if $self->{binding_cancel};
3326 });
3327
3328 $self->update_binding_widgets;
3329
3330 $self
3331}
3332
3333sub commit {
3334 my ($self) = @_;
3335 my ($mod, $sym, $cmds) = $self->get_binding;
3336 if ($sym != 0 && @$cmds > 0) {
3337 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3338 ."'. Don't forget 'Save Config'!");
3339 $self->{binding_change}->($mod, $sym, $cmds)
3340 if $self->{binding_change};
3341 } else {
3342 $::STATUSBOX->add ("No action bound, no key or action specified!");
3343 $self->{binding_cancel}->()
3344 if $self->{binding_cancel};
3345 }
3346}
3347
3348sub start {
3349 my ($self) = @_;
3350
3351 $self->{rec_btn}->set_text ("stop recording");
3352 $self->{recording} = 1;
3353 $self->clear_command_list;
3354 $::CONN->start_record if $::CONN;
3355}
3356
3357sub stop {
3358 my ($self) = @_;
3359
3360 $self->{rec_btn}->set_text ("start recording");
3361 $self->{recording} = 0;
3362
3363 my $rec;
3364 $rec = $::CONN->stop_record if $::CONN;
3365 return unless ref $rec eq 'ARRAY';
3366 $self->set_command_list ($rec);
3367}
3368
3369
3370sub ask_for_bind_and_commit {
3371 my ($self) = @_;
3372 $self->ask_for_bind (1);
3373}
3374
3375sub ask_for_bind {
3376 my ($self, $commit) = @_;
3377
3378 CFClient::Binder::open_binding_dialog (sub {
3379 my ($mod, $sym) = @_;
3380 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3381 $self->update_binding_widgets;
3382 $self->commit if $commit;
3383 });
3384}
3385
3386# $mod and $sym are the modifiers and key symbol
3387# $cmds is a array ref of strings (the commands)
3388# $cb is the callback that is executed on OK
3389# $ccb is the callback that is executed on CANCEL and
3390# when the binding was unsuccessful on OK
3391sub set_binding {
3392 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3393
3394 $self->clear_command_list;
3395 $self->{recording} = 0;
3396 $self->{rec_btn}->set_text ("start recording");
3397
3398 $self->{binding} = [$mod, $sym];
3399 $self->{commands} = $cmds;
3400
3401 $self->{binding_change} = $cb;
3402 $self->{binding_cancel} = $ccb;
3403
3404 $self->update_binding_widgets;
3405}
3406
3407# this is a shortcut method that asks for a binding
3408# and then just binds it.
3409sub do_quick_binding {
3410 my ($self, $cmds) = @_;
3411 $self->set_binding (undef, undef, $cmds, sub {
3412 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3413 });
3414 $self->ask_for_bind (1);
3415}
3416
3417sub update_binding_widgets {
3418 my ($self) = @_;
3419 my ($mod, $sym, $cmds) = $self->get_binding;
3420 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3421 $self->set_command_list ($cmds);
3422}
3423
3424sub get_binding {
3425 my ($self) = @_;
3426 return (
3427 $self->{binding}->[0],
3428 $self->{binding}->[1],
3429 [ grep { defined $_ } @{$self->{commands}} ]
3430 );
3431}
3432
3433sub clear_command_list {
3434 my ($self) = @_;
3435 $self->{cmdbox}->clear ();
3436}
3437
3438sub set_command_list {
3439 my ($self, $cmds) = @_;
3440
3441 $self->{cmdbox}->clear ();
3442 $self->{commands} = $cmds;
3443
3444 my $idx = 0;
3445
3446 for (@$cmds) {
3447 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3448
3449 my $i = $idx;
3450 $hb->add (new CFClient::UI::Label text => $_);
3451 $hb->add (new CFClient::UI::Button
3452 text => "delete",
3453 tooltip => "Deletes the action from the record",
3454 on_activate => sub {
3455 $self->{cmdbox}->remove ($hb);
3456 $cmds->[$i] = undef;
3457 });
3458
3459
3460 $idx++
3461 }
3462}
3463
3464#############################################################################
3465
3466package CFClient::UI::SpellList;
3467
3468our @ISA = CFClient::UI::Table::;
3469
3470sub new {
3471 my $class = shift;
3472
3473 my $self = $class->SUPER::new (
3474 binding => [],
3475 commands => [],
3476 @_,
3477 )
3478}
3479
3480# XXX: Do sorting? Argl...
3481sub add_spell {
3482 my ($self, $spell) = @_;
3483 $self->{spells}->{$spell->{name}} = $spell;
3484
3485 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3486 face => $spell->{face},
3487 can_hover => 1,
3488 can_events => 1,
3489 tooltip => $spell->{message});
3490
3491 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3492 text => $spell->{name},
3493 can_hover => 1,
3494 can_events => 1,
3495 tooltip => $spell->{message},
3496 expand => 1);
3497
3498 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3499 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3500 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3501 expand => 1);
3502
3503 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3504 text => "bind to key",
3505 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3506}
3507
3508sub rebuild_spell_list {
3509 my ($self) = @_;
3510 $self->{tbl_idx} = 0;
3511 $self->add_spell ($_) for values %{$self->{spells}};
3512}
3513
3514sub remove_spell {
3515 my ($self, $spell) = @_;
3516 delete $self->{spells}->{$spell->{name}};
3517 $self->rebuild_spell_list;
3518}
3519
3520#############################################################################
3521
3522package CFClient::UI::Root; 3998package CFPlus::UI::Root;
3523 3999
3524our @ISA = CFClient::UI::Container::; 4000our @ISA = CFPlus::UI::Container::;
3525 4001
3526use List::Util qw(min max); 4002use List::Util qw(min max);
3527 4003
3528use CFClient::OpenGL; 4004use CFPlus::OpenGL;
3529 4005
3530sub new { 4006sub new {
3531 my $class = shift; 4007 my $class = shift;
3532 4008
3533 my $self = $class->SUPER::new ( 4009 my $self = $class->SUPER::new (
3534 visible => 1, 4010 visible => 1,
3535 @_, 4011 @_,
3536 ); 4012 );
3537 4013
3538 Scalar::Util::weaken ($self->{root} = $self); 4014 CFPlus::weaken ($self->{root} = $self);
3539 4015
3540 $self 4016 $self
3541} 4017}
3542 4018
3543sub size_request { 4019sub size_request {
… …
3558 $coord = $max - $size if $coord > $max - $size; 4034 $coord = $max - $size if $coord > $max - $size;
3559 4035
3560 int $coord + 0.5 4036 int $coord + 0.5
3561} 4037}
3562 4038
3563sub size_allocate { 4039sub invoke_size_allocate {
3564 my ($self, $w, $h) = @_; 4040 my ($self, $w, $h) = @_;
3565 4041
3566 for my $child ($self->children) { 4042 for my $child ($self->children) {
3567 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4043 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3568 4044
… …
3572 $X = _to_pixel $X, $W, $self->{w}; 4048 $X = _to_pixel $X, $W, $self->{w};
3573 $Y = _to_pixel $Y, $H, $self->{h}; 4049 $Y = _to_pixel $Y, $H, $self->{h};
3574 4050
3575 $child->configure ($X, $Y, $W, $H); 4051 $child->configure ($X, $Y, $W, $H);
3576 } 4052 }
4053
4054 1
3577} 4055}
3578 4056
3579sub coord2local { 4057sub coord2local {
3580 my ($self, $x, $y) = @_; 4058 my ($self, $x, $y) = @_;
3581 4059
… …
3707 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4185 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3708 4186
3709 $w = 0 if $w < 0; 4187 $w = 0 if $w < 0;
3710 $h = 0 if $h < 0; 4188 $h = 0 if $h < 0;
3711 4189
4190 $w = max $widget->{min_w}, $w;
4191 $h = max $widget->{min_h}, $h;
4192
4193# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4194# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4195
4196 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4197 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4198
3712 $w = int $w + 0.5; 4199 $w = int $w + 0.5;
3713 $h = int $h + 0.5; 4200 $h = int $h + 0.5;
3714 4201
3715 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4202 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3716 $widget->{old_w} = $widget->{w}; 4203 $widget->{old_w} = $widget->{w};
… …
3739 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4226 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3740 glMatrixMode GL_MODELVIEW; 4227 glMatrixMode GL_MODELVIEW;
3741 glLoadIdentity; 4228 glLoadIdentity;
3742 4229
3743 { 4230 {
3744 package CFClient::UI::Base; 4231 package CFPlus::UI::Base;
3745 4232
3746 ($draw_x, $draw_y, $draw_w, $draw_h) = 4233 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3747 (0, 0, $self->{w}, $self->{h}); 4234 (0, 0, $self->{w}, $self->{h});
3748 }
3749 4235
3750 $self->_draw; 4236 $self->_draw;
4237 }
3751} 4238}
3752 4239
3753############################################################################# 4240#############################################################################
3754 4241
3755package CFClient::UI; 4242package CFPlus::UI;
3756 4243
3757$ROOT = new CFClient::UI::Root; 4244$ROOT = new CFPlus::UI::Root;
3758$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4245$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3759 4246
37601 42471
3761 4248

Diff Legend

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