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

Diff Legend

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