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

Diff Legend

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