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

Diff Legend

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