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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.288 by root, Mon Jun 5 21:14:40 2006 UTC vs.
Revision 1.371 by root, Sun Jul 15 22:07:48 2007 UTC

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

Diff Legend

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