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.273 by root, Sat Jun 3 02:32:35 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
874# back-buffered drawing area
875
799package CFClient::UI::Window; 876package CFPlus::UI::Window;
800 877
801our @ISA = CFClient::UI::Bin::; 878our @ISA = CFPlus::UI::Bin::;
802 879
803use CFClient::OpenGL; 880use CFPlus::OpenGL;
804 881
805sub new { 882sub new {
806 my ($class, %arg) = @_; 883 my ($class, %arg) = @_;
807 884
808 my $self = $class->SUPER::new (%arg); 885 my $self = $class->SUPER::new (%arg);
… …
813 890
814 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 891 $ROOT->on_post_alloc ($self => sub { $self->render_child });
815 $self->SUPER::update; 892 $self->SUPER::update;
816} 893}
817 894
818sub size_allocate { 895sub invoke_size_allocate {
819 my ($self, $w, $h) = @_; 896 my ($self, $w, $h) = @_;
820 897
821 $self->SUPER::size_allocate ($w, $h);
822 $self->update; 898 $self->update;
899
900 $self->SUPER::invoke_size_allocate ($w, $h)
823} 901}
824 902
825sub _render { 903sub _render {
826 my ($self) = @_; 904 my ($self) = @_;
827 905
… …
829} 907}
830 908
831sub render_child { 909sub render_child {
832 my ($self) = @_; 910 my ($self) = @_;
833 911
834 $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 {
835 glClearColor 0, 0, 0, 0; 913 glClearColor 0, 0, 0, 0;
836 glClear GL_COLOR_BUFFER_BIT; 914 glClear GL_COLOR_BUFFER_BIT;
837 915
838 { 916 {
839 package CFClient::UI::Base; 917 package CFPlus::UI::Base;
840 918
841 ($draw_x, $draw_y, $draw_w, $draw_h) = 919 local ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h}); 920 (0, 0, $self->{w}, $self->{h});
921
922 $self->_render;
843 } 923 }
844
845 $self->_render;
846 }; 924 };
847} 925}
848 926
849sub _draw { 927sub _draw {
850 my ($self) = @_; 928 my ($self) = @_;
851
852 my ($w, $h) = @$self{qw(w h)};
853 929
854 my $tex = $self->{texture} 930 my $tex = $self->{texture}
855 or return; 931 or return;
856 932
857 glEnable GL_TEXTURE_2D; 933 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 935 glColor 0, 0, 0, 1;
860 936
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 937 $tex->draw_quad_alpha_premultiplied (0, 0);
862 938
863 glDisable GL_TEXTURE_2D; 939 glDisable GL_TEXTURE_2D;
864} 940}
865 941
866############################################################################# 942#############################################################################
867 943
868package CFClient::UI::ViewPort; 944package CFPlus::UI::ViewPort;
869 945
946use List::Util qw(min max);
947
870our @ISA = CFClient::UI::Window::; 948our @ISA = CFPlus::UI::Window::;
871 949
872sub new { 950sub new {
873 my $class = shift; 951 my $class = shift;
874 952
875 $class->SUPER::new ( 953 $class->SUPER::new (
… …
882sub size_request { 960sub size_request {
883 my ($self) = @_; 961 my ($self) = @_;
884 962
885 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 963 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
886 964
887 $w = 10 if $self->{scroll_x}; 965 $w = 1 if $self->{scroll_x};
888 $h = 10 if $self->{scroll_y}; 966 $h = 1 if $self->{scroll_y};
889 967
890 ($w, $h) 968 ($w, $h)
891} 969}
892 970
893sub size_allocate { 971sub invoke_size_allocate {
894 my ($self, $w, $h) = @_; 972 my ($self, $w, $h) = @_;
895 973
896 my $child = $self->child; 974 my $child = $self->child;
897 975
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 976 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 977 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900 978
901 $self->child->configure (0, 0, $w, $h); 979 $self->child->configure (0, 0, $w, $h);
902 $self->update; 980 $self->update;
981
982 1
903} 983}
904 984
905sub set_offset { 985sub set_offset {
906 my ($self, $x, $y) = @_; 986 my ($self, $x, $y) = @_;
907 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}) {
908 $self->{view_x} = int $x; 992 $self->{view_x} = $x;
909 $self->{view_y} = int $y; 993 $self->{view_y} = $y;
910 994
995 $self->emit (changed => $x, $y);
911 $self->update; 996 $self->update;
997 }
912} 998}
913 999
914# 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
915sub coord2local { 1001sub coord2local {
916 my ($self, $x, $y) = @_; 1002 my ($self, $x, $y) = @_;
… …
931 my ($self, $x, $y) = @_; 1017 my ($self, $x, $y) = @_;
932 1018
933 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
934 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
935 ) { 1021 ) {
936 $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})
937 } else { 1023 } else {
938 $self->CFClient::UI::Base::find_widget ($x, $y) 1024 $self->CFPlus::UI::Base::find_widget ($x, $y)
939 } 1025 }
940} 1026}
941 1027
942sub _render { 1028sub _render {
943 my ($self) = @_; 1029 my ($self) = @_;
944 1030
945 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};
946 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};
947 1033
948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1034 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
949 1035
950 $self->SUPER::_render; 1036 $self->SUPER::_render;
951} 1037}
952 1038
953############################################################################# 1039#############################################################################
954 1040
955package CFClient::UI::ScrolledWindow; 1041package CFPlus::UI::ScrolledWindow;
956 1042
957our @ISA = CFClient::UI::HBox::; 1043our @ISA = CFPlus::UI::Table::;
958 1044
959sub new { 1045sub new {
960 my ($class, %arg) = @_; 1046 my ($class, %arg) = @_;
961 1047
962 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
963 1049
964 my $self; 1050 my $self;
965 1051
966 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,
967 vertical => 1, 1066 vertical => 1,
968 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
969 on_changed => sub { 1068 on_changed => sub {
970 $self->{vp}->set_offset (0, $_[1]); 1069 $self->{vpos} = $_[1];
1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
971 }, 1071 },
972 ; 1072 ;
973 1073
974 $self = $class->SUPER::new ( 1074 $self = $class->SUPER::new (
975 vp => (new CFClient::UI::ViewPort expand => 1), 1075 scroll_x => 0,
1076 scroll_y => 1,
1077 can_events => 1,
976 slider => $slider, 1078 hslider => $hslider,
1079 vslider => $vslider,
1080 col_expand => [1, 0],
1081 row_expand => [1, 0],
977 %arg, 1082 %arg,
978 ); 1083 );
979 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
980 $self->SUPER::add ($self->{vp}, $self->{slider}); 1101 $self->SUPER::add ($self->{vp});
1102
981 $self->add ($child) if $child; 1103 $self->add ($child) if $child;
982 1104
983 $self 1105 $self
984} 1106}
985 1107
… …
987 my ($self, $widget) = @_; 1109 my ($self, $widget) = @_;
988 1110
989 $self->{vp}->add ($self->{child} = $widget); 1111 $self->{vp}->add ($self->{child} = $widget);
990} 1112}
991 1113
992sub 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 {
993 my ($self) = @_; 1141 my ($self, $ev) = @_;
994 1142
995 $self->SUPER::update; 1143 $self->grab_focus;
996 1144
997 # todo: overwrite size_allocate of child 1145 my $ox = $self->{vp}{view_x};
998 my $child = $self->{vp}->child; 1146 my $oy = $self->{vp}{view_y};
999 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1147
1000} 1148 $self->{motion} = sub {
1149 my ($ev, $x, $y) = @_;
1001 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
1002sub size_allocate { 1199sub invoke_size_allocate {
1003 my ($self, $w, $h) = @_; 1200 my ($self, $w, $h) = @_;
1004 1201
1202 $self->update_slider;
1005 $self->SUPER::size_allocate ($w, $h); 1203 $self->SUPER::invoke_size_allocate ($w, $h)
1006
1007 my $child = $self->{vp}->child;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009} 1204}
1010
1011#TODO# update range on size_allocate depending on child
1012# update viewport offset on scroll
1013 1205
1014############################################################################# 1206#############################################################################
1015 1207
1016package CFClient::UI::Frame; 1208package CFPlus::UI::Frame;
1017 1209
1018our @ISA = CFClient::UI::Bin::; 1210our @ISA = CFPlus::UI::Bin::;
1019 1211
1020use CFClient::OpenGL; 1212use CFPlus::OpenGL;
1021 1213
1022sub new { 1214sub new {
1023 my $class = shift; 1215 my $class = shift;
1024 1216
1025 $class->SUPER::new ( 1217 $class->SUPER::new (
… …
1033 1225
1034 if ($self->{bg}) { 1226 if ($self->{bg}) {
1035 my ($w, $h) = @$self{qw(w h)}; 1227 my ($w, $h) = @$self{qw(w h)};
1036 1228
1037 glEnable GL_BLEND; 1229 glEnable GL_BLEND;
1038 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1230 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1039 glColor @{ $self->{bg} }; 1231 glColor_premultiply @{ $self->{bg} };
1040 1232
1041 glBegin GL_QUADS; 1233 glBegin GL_QUADS;
1042 glVertex 0 , 0; 1234 glVertex 0 , 0;
1043 glVertex 0 , $h; 1235 glVertex 0 , $h;
1044 glVertex $w, $h; 1236 glVertex $w, $h;
… …
1051 $self->SUPER::_draw; 1243 $self->SUPER::_draw;
1052} 1244}
1053 1245
1054############################################################################# 1246#############################################################################
1055 1247
1056package CFClient::UI::FancyFrame; 1248package CFPlus::UI::FancyFrame;
1057 1249
1058our @ISA = CFClient::UI::Bin::; 1250our @ISA = CFPlus::UI::Bin::;
1059 1251
1060use CFClient::OpenGL; 1252use CFPlus::OpenGL;
1061
1062my $bg =
1063 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1064 mipmap => 1, wrap => 1;
1065
1066my @border =
1067 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1068 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1069 1253
1070sub new { 1254sub new {
1071 my ($class, %arg) = @_; 1255 my ($class, %arg) = @_;
1072 1256
1073 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) = @_;
1074 1368
1075 my $self = $class->SUPER::new ( 1369 my $self = $class->SUPER::new (
1076 bg => [1, 1, 1, 1], 1370 bg => [1, 1, 1, 1],
1077 border_bg => [1, 1, 1, 1], 1371 border_bg => [1, 1, 1, 1],
1078 border => 0.6, 1372 border => 0.6,
1079 can_events => 1, 1373 can_events => 1,
1080 min_w => 16, 1374 min_w => 64,
1081 min_h => 16, 1375 min_h => 32,
1082 %arg, 1376 %arg,
1083 ); 1377 );
1084 1378
1085 $self->{title} = new CFClient::UI::Label 1379 $self->{title_widget} = new CFPlus::UI::Label
1086 align => 0, 1380 align => 0,
1087 valign => 1, 1381 valign => 1,
1088 text => $title, 1382 text => $self->{title},
1089 fontsize => $self->{border} 1383 fontsize => $self->{border},
1090 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 }
1091 1394
1092 $self 1395 $self
1093} 1396}
1094 1397
1095sub add { 1398sub add {
1096 my ($self, @widgets) = @_; 1399 my ($self, @widgets) = @_;
1097 1400
1098 $self->SUPER::add (@widgets); 1401 $self->SUPER::add (@widgets);
1402 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1099 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1403 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1100} 1404}
1101 1405
1102sub border { 1406sub border {
1103 int $_[0]{border} * $::FONTSIZE 1407 int $_[0]{border} * $::FONTSIZE
1104} 1408}
1105 1409
1106sub size_request { 1410sub size_request {
1107 my ($self) = @_; 1411 my ($self) = @_;
1108 1412
1109 $self->{title}->size_request 1413 $self->{title_widget}->size_request
1110 if $self->{title}; 1414 if $self->{title_widget};
1415
1416 $self->{close_button}->size_request
1417 if $self->{close_button};
1111 1418
1112 my ($w, $h) = $self->SUPER::size_request; 1419 my ($w, $h) = $self->SUPER::size_request;
1113 1420
1114 ( 1421 (
1115 $w + $self->border * 2, 1422 $w + $self->border * 2,
1116 $h + $self->border * 2, 1423 $h + $self->border * 2,
1117 ) 1424 )
1118} 1425}
1119 1426
1120sub size_allocate { 1427sub invoke_size_allocate {
1121 my ($self, $w, $h) = @_; 1428 my ($self, $w, $h) = @_;
1122 1429
1123 if ($self->{title}) { 1430 if ($self->{title_widget}) {
1124 $self->{title}{w} = $w; 1431 $self->{title_widget}{w} = $w;
1125 $self->{title}{h} = $h; 1432 $self->{title_widget}{h} = $h;
1126 $self->{title}->size_allocate ($w, $h); 1433 $self->{title_widget}->invoke_size_allocate ($w, $h);
1127 } 1434 }
1128 1435
1129 my $border = $self->border; 1436 my $border = $self->border;
1130 1437
1131 $h -= List::Util::max 0, $border * 2; 1438 $h -= List::Util::max 0, $border * 2;
1132 $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;
1133 1453
1134 $self->child->configure ($border, $border, $w, $h); 1454 1
1135} 1455}
1136 1456
1137sub button_down { 1457sub invoke_button_down {
1138 my ($self, $ev, $x, $y) = @_; 1458 my ($self, $ev, $x, $y) = @_;
1139 1459
1140 my ($w, $h) = @$self{qw(w h)}; 1460 my ($w, $h) = @$self{qw(w h)};
1141 my $border = $self->border; 1461 my $border = $self->border;
1142 1462
… …
1158 my $dy = $ev->{y} - $oy; 1478 my $dy = $ev->{y} - $oy;
1159 1479
1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1480 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1481 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162 1482
1483 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1163 $self->realloc; 1484 $self->realloc;
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 }; 1485 };
1166 1486
1167 } elsif ($lr ^ $td) { 1487 } elsif ($lr ^ $td) {
1168 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1488 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1169 my ($bx, $by) = ($self->{x}, $self->{y}); 1489 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1172 my ($ev, $x, $y) = @_; 1492 my ($ev, $x, $y) = @_;
1173 1493
1174 ($x, $y) = ($ev->{x}, $ev->{y}); 1494 ($x, $y) = ($ev->{x}, $ev->{y});
1175 1495
1176 $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});
1177 }; 1499 };
1178 } else { 1500 } else {
1179 return 0; 1501 return 0;
1180 } 1502 }
1181 1503
1182 1 1504 1
1183} 1505}
1184 1506
1185sub button_up { 1507sub invoke_button_up {
1186 my ($self, $ev, $x, $y) = @_; 1508 my ($self, $ev, $x, $y) = @_;
1187 1509
1188 !!delete $self->{motion} 1510 ! ! delete $self->{motion}
1189} 1511}
1190 1512
1191sub mouse_motion { 1513sub invoke_mouse_motion {
1192 my ($self, $ev, $x, $y) = @_; 1514 my ($self, $ev, $x, $y) = @_;
1193 1515
1194 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1516 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195 1517
1196 !!$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
1197} 1527}
1198 1528
1199sub _draw { 1529sub _draw {
1200 my ($self) = @_; 1530 my ($self) = @_;
1201 1531
… …
1208 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1209 1539
1210 my $border = $self->border; 1540 my $border = $self->border;
1211 1541
1212 glColor @{ $self->{border_bg} }; 1542 glColor @{ $self->{border_bg} };
1213 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1543 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1214 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1544 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1215 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1545 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1216 $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);
1217 1561
1218 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1562 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1219 glColor @{ $self->{bg} }; 1563 glColor @{ $self->{bg} };
1220 1564
1221 # TODO: repeat texture not scale 1565 # TODO: repeat texture not scale
… …
1227 1571
1228 glDisable GL_TEXTURE_2D; 1572 glDisable GL_TEXTURE_2D;
1229 1573
1230 $child->draw; 1574 $child->draw;
1231 1575
1232 if ($self->{title}) { 1576 if ($self->{title_widget}) {
1233 glTranslate 0, $border - $self->{h}; 1577 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw; 1578 $self->{title_widget}->_draw;
1579
1580 glTranslate 0, - ($border - $self->{h});
1235 } 1581 }
1582
1583 $self->{close_button}->draw
1584 if $self->{close_button};
1236} 1585}
1237 1586
1238############################################################################# 1587#############################################################################
1239 1588
1240package CFClient::UI::Table; 1589package CFPlus::UI::Table;
1241 1590
1242our @ISA = CFClient::UI::Base::; 1591our @ISA = CFPlus::UI::Container::;
1243 1592
1244use List::Util qw(max sum); 1593use List::Util qw(max sum);
1245 1594
1246use CFClient::OpenGL; 1595use CFPlus::OpenGL;
1247 1596
1248sub new { 1597sub new {
1249 my $class = shift; 1598 my $class = shift;
1250 1599
1251 $class->SUPER::new ( 1600 $class->SUPER::new (
1252 col_expand => [], 1601 col_expand => [],
1602 row_expand => [],
1253 @_, 1603 @_,
1254 ) 1604 )
1255} 1605}
1256 1606
1257sub children {
1258 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1259}
1260
1261sub add { 1607sub add {
1262 my ($self, $x, $y, $child) = @_;
1263
1264 $child->set_parent ($self);
1265 $self->{children}[$y][$x] = $child;
1266
1267 $self->realloc;
1268}
1269
1270# TODO: move to container class maybe? send children a signal on removal?
1271sub clear {
1272 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);
1273 1639
1274 my @children = $self->children; 1640 my @children = $self->children;
1275 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 }
1276 1651 }
1277 for (@children) {
1278 delete $_->{parent};
1279 $_->hide;
1280 }
1281 1652
1282 $self->realloc; 1653 # second pass, rows
1283} 1654 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1284
1285sub get_wh {
1286 my ($self) = @_;
1287
1288 my (@w, @h);
1289
1290 for my $y (0 .. $#{$self->{children}}) {
1291 my $row = $self->{children}[$y]
1292 or next;
1293
1294 for my $x (0 .. $#$row) {
1295 my $widget = $row->[$x]
1296 or next;
1297 my ($w, $h) = @$widget{qw(req_w req_h)}; 1655 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1298 1656
1299 $w[$x] = max $w[$x], $w; 1657 my $sh = sum @h[$r .. $r + $rs - 1];
1300 $h[$y] = max $h[$y], $h; 1658
1659 if ($h > $sh) {
1660 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1301 } 1661 }
1302 } 1662 }
1303 1663
1304 (\@w, \@h) 1664 (\@w, \@h)
1305} 1665}
… …
1313 (sum @$ws), 1673 (sum @$ws),
1314 (sum @$hs), 1674 (sum @$hs),
1315 ) 1675 )
1316} 1676}
1317 1677
1318sub size_allocate { 1678sub invoke_size_allocate {
1319 my ($self, $w, $h) = @_; 1679 my ($self, $w, $h) = @_;
1320 1680
1321 my ($ws, $hs) = $self->get_wh; 1681 my ($ws, $hs) = $self->get_wh;
1322 1682
1323 my $req_w = (sum @$ws) || 1; 1683 my $req_w = (sum @$ws) || 1;
1324 my $req_h = (sum @$hs) || 1; 1684 my $req_h = (sum @$hs) || 1;
1325 1685
1326 # TODO: nicer code && do row_expand 1686 # now linearly scale the rows/columns to the allocated size
1327 my @col_expand = @{$self->{col_expand}}; 1687 my @col_expand = @{$self->{col_expand}};
1328 @col_expand = (1) x @$ws unless @col_expand; 1688 @col_expand = (1) x @$ws unless @col_expand;
1329 my $col_expand = (sum @col_expand) || 1; 1689 my $col_expand = (sum @col_expand) || 1;
1330 1690
1331 # linearly scale sizes
1332 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1691 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1333 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1334 1692
1335 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
1336 CFClient::UI::harmonize $hs; 1701 CFPlus::UI::harmonize $hs;
1337 1702
1338 my $y; 1703 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1704 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1339 1705
1340 for my $r (0 .. $#{$self->{children}}) { 1706 for my $widget ($self->children) {
1341 my $row = $self->{children}[$r] 1707 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1342 or next;
1343 1708
1344 my $x = 0; 1709 $widget->configure (
1345 my $row_h = $hs->[$r]; 1710 $x[$c], $y[$r],
1711 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1346 1712 );
1347 for my $c (0 .. $#$row) { 1713 }
1348 my $col_w = $ws->[$c];
1349 1714
1350 if (my $widget = $row->[$c]) { 1715 1
1351 $widget->configure ($x, $y, $col_w, $row_h); 1716}
1352 }
1353 1717
1354 $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;
1355 } 1756 }
1356
1357 $y += $row_h;
1358 } 1757 }
1359 1758
1360} 1759 my $W = $x2 - $x1;
1760 my $H = $y2 - $y1;
1361 1761
1362sub 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 {
1363 my ($self, $x, $y) = @_; 1784 my ($self, $W, $H) = @_;
1364 1785
1365 $x -= $self->{x}; 1786 for my $child ($self->visible_children) {
1366 $y -= $self->{y}; 1787 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1367 1788
1368 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};
1369 1793
1370 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1794 $child->configure ($x, $y, $w, $h);
1371 $res = $_->find_widget ($x, $y) 1795 }
1372 and return $res; 1796
1373 } 1797 1
1374
1375 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1376}
1377
1378sub _draw {
1379 my ($self) = @_;
1380
1381 for (grep $_, @{$self->{children}}) {
1382 $_->draw for grep $_, @$_;
1383 }
1384} 1798}
1385 1799
1386############################################################################# 1800#############################################################################
1387 1801
1388package CFClient::UI::Box; 1802package CFPlus::UI::Box;
1389 1803
1390our @ISA = CFClient::UI::Container::; 1804our @ISA = CFPlus::UI::Container::;
1391 1805
1392sub size_request { 1806sub size_request {
1393 my ($self) = @_; 1807 my ($self) = @_;
1394 1808
1395 $self->{vertical} 1809 $self->{vertical}
… …
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1815 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1816 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1403 ) 1817 )
1404} 1818}
1405 1819
1406sub size_allocate { 1820sub invoke_size_allocate {
1407 my ($self, $w, $h) = @_; 1821 my ($self, $w, $h) = @_;
1408 1822
1409 my $space = $self->{vertical} ? $h : $w; 1823 my $space = $self->{vertical} ? $h : $w;
1410 my $children = $self->{children}; 1824 my @children = $self->visible_children;
1411 1825
1412 my @req; 1826 my @req;
1413 1827
1414 if ($self->{homogeneous}) { 1828 if ($self->{homogeneous}) {
1415 @req = ($space / (@$children || 1)) x @$children; 1829 @req = ($space / (@children || 1)) x @children;
1416 } else { 1830 } else {
1417 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1831 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1418 my $req = List::Util::sum @req; 1832 my $req = List::Util::sum @req;
1419 1833
1420 if ($req > $space) { 1834 if ($req > $space) {
1421 # ah well, not enough space 1835 # ah well, not enough space
1422 $_ *= $space / $req for @req; 1836 $_ *= $space / $req for @req;
1423 } else { 1837 } else {
1424 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1838 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1425 1839
1426 $space = ($space - $req) / $expand; # remaining space to give away 1840 $space = ($space - $req) / $expand; # remaining space to give away
1427 1841
1428 $req[$_] += $space * $children->[$_]{expand} 1842 $req[$_] += $space * $children[$_]{expand}
1429 for 0 .. $#$children; 1843 for 0 .. $#children;
1430 } 1844 }
1431 } 1845 }
1432 1846
1433 CFClient::UI::harmonize \@req; 1847 CFPlus::UI::harmonize \@req;
1434 1848
1435 my $pos = 0; 1849 my $pos = 0;
1436 for (0 .. $#$children) { 1850 for (0 .. $#children) {
1437 my $alloc = $req[$_]; 1851 my $alloc = $req[$_];
1438 $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));
1439 1853
1440 $pos += $alloc; 1854 $pos += $alloc;
1441 } 1855 }
1442 1856
1443 1 1857 1
1444} 1858}
1445 1859
1446############################################################################# 1860#############################################################################
1447 1861
1448package CFClient::UI::HBox; 1862package CFPlus::UI::HBox;
1449 1863
1450our @ISA = CFClient::UI::Box::; 1864our @ISA = CFPlus::UI::Box::;
1451 1865
1452sub new { 1866sub new {
1453 my $class = shift; 1867 my $class = shift;
1454 1868
1455 $class->SUPER::new ( 1869 $class->SUPER::new (
… …
1458 ) 1872 )
1459} 1873}
1460 1874
1461############################################################################# 1875#############################################################################
1462 1876
1463package CFClient::UI::VBox; 1877package CFPlus::UI::VBox;
1464 1878
1465our @ISA = CFClient::UI::Box::; 1879our @ISA = CFPlus::UI::Box::;
1466 1880
1467sub new { 1881sub new {
1468 my $class = shift; 1882 my $class = shift;
1469 1883
1470 $class->SUPER::new ( 1884 $class->SUPER::new (
… …
1473 ) 1887 )
1474} 1888}
1475 1889
1476############################################################################# 1890#############################################################################
1477 1891
1478package CFClient::UI::Label; 1892package CFPlus::UI::Label;
1479 1893
1480our @ISA = CFClient::UI::DrawBG::; 1894our @ISA = CFPlus::UI::DrawBG::;
1481 1895
1482use CFClient::OpenGL; 1896use CFPlus::OpenGL;
1483 1897
1484sub new { 1898sub new {
1485 my ($class, %arg) = @_; 1899 my ($class, %arg) = @_;
1486 1900
1487 my $self = $class->SUPER::new ( 1901 my $self = $class->SUPER::new (
… …
1490 #active_bg => none 1904 #active_bg => none
1491 #font => default_font 1905 #font => default_font
1492 #text => initial text 1906 #text => initial text
1493 #markup => initial narkup 1907 #markup => initial narkup
1494 #max_w => maximum pixel width 1908 #max_w => maximum pixel width
1909 #style => 0, # render flags
1495 ellipsise => 3, # end 1910 ellipsise => 3, # end
1496 layout => (new CFClient::Layout), 1911 layout => (new CFPlus::Layout),
1497 fontsize => 1, 1912 fontsize => 1,
1498 align => -1, 1913 align => -1,
1499 valign => -1, 1914 valign => -1,
1500 padding_x => 2, 1915 padding_x => 2,
1501 padding_y => 2, 1916 padding_y => 2,
1502 can_events => 0, 1917 can_events => 0,
1503 %arg 1918 %arg
1504 ); 1919 );
1505 1920
1506 if (exists $self->{template}) { 1921 if (exists $self->{template}) {
1507 my $layout = new CFClient::Layout; 1922 my $layout = new CFPlus::Layout;
1508 $layout->set_text (delete $self->{template}); 1923 $layout->set_text (delete $self->{template});
1509 $self->{template} = $layout; 1924 $self->{template} = $layout;
1510 } 1925 }
1511 1926
1512 if (exists $self->{markup}) { 1927 if (exists $self->{markup}) {
… …
1516 } 1931 }
1517 1932
1518 $self 1933 $self
1519} 1934}
1520 1935
1521sub escape($) {
1522 local $_ = $_[0];
1523
1524 s/&/&amp;/g;
1525 s/>/&gt;/g;
1526 s/</&lt;/g;
1527
1528 $_
1529}
1530
1531sub update { 1936sub update {
1532 my ($self) = @_; 1937 my ($self) = @_;
1533 1938
1534 delete $self->{texture}; 1939 delete $self->{texture};
1535 $self->SUPER::update; 1940 $self->SUPER::update;
1536} 1941}
1537 1942
1943sub realloc {
1944 my ($self) = @_;
1945
1946 delete $self->{ox};
1947 $self->SUPER::realloc;
1948}
1949
1538sub set_text { 1950sub set_text {
1539 my ($self, $text) = @_; 1951 my ($self, $text) = @_;
1540 1952
1541 return if $self->{text} eq "T$text"; 1953 return if $self->{text} eq "T$text";
1542 $self->{text} = "T$text"; 1954 $self->{text} = "T$text";
1543 1955
1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1545 $self->{layout}->set_text ($text); 1956 $self->{layout}->set_text ($text);
1546 1957
1958 delete $self->{size_req};
1547 $self->realloc; 1959 $self->realloc;
1548 $self->update; 1960 $self->update;
1549} 1961}
1550 1962
1551sub set_markup { 1963sub set_markup {
… …
1554 return if $self->{text} eq "M$markup"; 1966 return if $self->{text} eq "M$markup";
1555 $self->{text} = "M$markup"; 1967 $self->{text} = "M$markup";
1556 1968
1557 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1969 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1558 1970
1559 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1560 $self->{layout}->set_markup ($markup); 1971 $self->{layout}->set_markup ($markup);
1561 1972
1973 delete $self->{size_req};
1562 $self->realloc; 1974 $self->realloc;
1563 $self->update; 1975 $self->update;
1564} 1976}
1565 1977
1566sub size_request { 1978sub size_request {
1567 my ($self) = @_; 1979 my ($self) = @_;
1568 1980
1981 $self->{size_req} ||= do {
1569 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1982 $self->{layout}->set_font ($self->{font}) if $self->{font};
1570 $self->{layout}->set_width ($self->{max_w} || -1); 1983 $self->{layout}->set_width ($self->{max_w} || -1);
1571 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1984 $self->{layout}->set_ellipsise ($self->{ellipsise});
1572 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1985 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1986 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1574 1987
1575 my ($w, $h) = $self->{layout}->size; 1988 my ($w, $h) = $self->{layout}->size;
1576 1989
1577 if (exists $self->{template}) { 1990 if (exists $self->{template}) {
1578 $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);
1579 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1993 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1994
1581 my ($w2, $h2) = $self->{template}->size; 1995 my ($w2, $h2) = $self->{template}->size;
1582 1996
1583 $w = List::Util::max $w, $w2; 1997 $w = List::Util::max $w, $w2;
1584 $h = List::Util::max $h, $h2; 1998 $h = List::Util::max $h, $h2;
1999 }
2000
2001 [$w, $h]
1585 } 2002 };
1586 2003
1587 ($w, $h) 2004 @{ $self->{size_req} }
1588} 2005}
1589 2006
2007sub baseline_shift {
2008 $_[0]{layout}->descent
2009}
2010
1590sub size_allocate { 2011sub invoke_size_allocate {
1591 my ($self, $w, $h) = @_; 2012 my ($self, $w, $h) = @_;
1592 2013
1593 delete $self->{ox}; 2014 delete $self->{ox};
1594 2015
1595 delete $self->{texture} 2016 delete $self->{texture}
1596 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
1597} 2020}
1598 2021
1599sub set_fontsize { 2022sub set_fontsize {
1600 my ($self, $fontsize) = @_; 2023 my ($self, $fontsize) = @_;
1601 2024
1602 $self->{fontsize} = $fontsize; 2025 $self->{fontsize} = $fontsize;
2026 delete $self->{size_req};
1603 delete $self->{texture}; 2027 delete $self->{texture};
1604 2028
1605 $self->realloc; 2029 $self->realloc;
1606} 2030}
1607 2031
2032sub reconfigure {
2033 my ($self) = @_;
2034
2035 delete $self->{size_req};
2036 delete $self->{texture};
2037
2038 $self->SUPER::reconfigure;
2039}
2040
1608sub _draw { 2041sub _draw {
1609 my ($self) = @_; 2042 my ($self) = @_;
1610 2043
1611 $self->SUPER::_draw; # draw background, if applicable 2044 $self->SUPER::_draw; # draw background, if applicable
1612 2045
1613 my $tex = $self->{texture} ||= do { 2046 my $size = $self->{texture} ||= do {
1614 $self->{layout}->set_foreground (@{$self->{fg}}); 2047 $self->{layout}->set_foreground (@{$self->{fg}});
1615 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2048 $self->{layout}->set_font ($self->{font}) if $self->{font};
1616 $self->{layout}->set_width ($self->{w}); 2049 $self->{layout}->set_width ($self->{w});
1617 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2050 $self->{layout}->set_ellipsise ($self->{ellipsise});
1618 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2051 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1619 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2052 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1620 2053
1621 new_from_layout CFClient::Texture $self->{layout} 2054 [$self->{layout}->size]
1622 }; 2055 };
1623 2056
1624 unless (exists $self->{ox}) { 2057 unless (exists $self->{ox}) {
1625 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2058 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1626 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2059 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1627 : ($self->{w} - $tex->{w}) * 0.5); 2060 : ($self->{w} - $size->[0]) * 0.5);
1628 2061
1629 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2062 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2063 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1631 : ($self->{h} - $tex->{h}) * 0.5); 2064 : ($self->{h} - $size->[1]) * 0.5);
1632 }; 2065 };
1633 2066
1634 glEnable GL_TEXTURE_2D; 2067 my $w = List::Util::min $self->{w} + 4, $size->[0];
1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2068 my $h = List::Util::min $self->{h} + 2, $size->[1];
1636 2069
1637 if ($tex->{format} == GL_ALPHA) { 2070 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1638 glColor @{$self->{fg}};
1639 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1640 } else {
1641 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1642 }
1643
1644 glDisable GL_TEXTURE_2D;
1645} 2071}
1646 2072
1647############################################################################# 2073#############################################################################
1648 2074
1649package CFClient::UI::EntryBase; 2075package CFPlus::UI::EntryBase;
1650 2076
1651our @ISA = CFClient::UI::Label::; 2077our @ISA = CFPlus::UI::Label::;
1652 2078
1653use CFClient::OpenGL; 2079use CFPlus::OpenGL;
1654 2080
1655sub new { 2081sub new {
1656 my $class = shift; 2082 my $class = shift;
1657 2083
1658 $class->SUPER::new ( 2084 $class->SUPER::new (
… …
1662 active_fg => [0, 0, 0], 2088 active_fg => [0, 0, 0],
1663 can_hover => 1, 2089 can_hover => 1,
1664 can_focus => 1, 2090 can_focus => 1,
1665 valign => 0, 2091 valign => 0,
1666 can_events => 1, 2092 can_events => 1,
2093 ellipsise => 0,
1667 #text => ... 2094 #text => ...
2095 #hidden => "*",
1668 @_ 2096 @_
1669 ) 2097 )
1670} 2098}
1671 2099
1672sub _set_text { 2100sub _set_text {
… …
1674 2102
1675 delete $self->{cur_h}; 2103 delete $self->{cur_h};
1676 2104
1677 return if $self->{text} eq $text; 2105 return if $self->{text} eq $text;
1678 2106
1679 delete $self->{texture};
1680
1681 $self->{last_activity} = $::NOW; 2107 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 2108 $self->{text} = $text;
1683 2109
1684 $text =~ s/./*/g if $self->{hidden}; 2110 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 2111 $self->{layout}->set_text ("$text ");
2112 delete $self->{size_req};
1686 2113
1687 $self->_emit (changed => $self->{text}); 2114 $self->emit (changed => $self->{text});
2115
2116 $self->realloc;
2117 $self->update;
1688} 2118}
1689 2119
1690sub set_text { 2120sub set_text {
1691 my ($self, $text) = @_; 2121 my ($self, $text) = @_;
1692 2122
1693 $self->{cursor} = length $text; 2123 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 2124 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 2125}
1698 2126
1699sub get_text { 2127sub get_text {
1700 $_[0]{text} 2128 $_[0]{text}
1701} 2129}
… …
1706 my ($w, $h) = $self->SUPER::size_request; 2134 my ($w, $h) = $self->SUPER::size_request;
1707 2135
1708 ($w + 1, $h) # add 1 for cursor 2136 ($w + 1, $h) # add 1 for cursor
1709} 2137}
1710 2138
1711sub key_down { 2139sub invoke_key_down {
1712 my ($self, $ev) = @_; 2140 my ($self, $ev) = @_;
1713 2141
1714 my $mod = $ev->{mod}; 2142 my $mod = $ev->{mod};
1715 my $sym = $ev->{sym}; 2143 my $sym = $ev->{sym};
1716 my $uni = $ev->{unicode}; 2144 my $uni = $ev->{unicode};
1717 2145
1718 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;
1719 2149
1720 if ($uni == 8) { 2150 if ($uni == 8) {
1721 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2151 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1722 } elsif ($uni == 127) { 2152 } elsif ($uni == 127) {
1723 substr $text, $self->{cursor}, 1, ""; 2153 substr $text, $self->{cursor}, 1, "";
1724 } elsif ($sym == CFClient::SDLK_LEFT) { 2154 } elsif ($sym == CFPlus::SDLK_LEFT) {
1725 --$self->{cursor} if $self->{cursor}; 2155 --$self->{cursor} if $self->{cursor};
1726 } elsif ($sym == CFClient::SDLK_RIGHT) { 2156 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1727 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2157 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1728 } 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 = "";
1729 $self->{cursor} = 0; 2172 $self->{cursor} = 0;
1730 } elsif ($sym == CFClient::SDLK_END) {
1731 $self->{cursor} = length $text;
1732 } elsif ($uni == 27) { 2173 } elsif ($uni == 27) {
1733 $self->_emit ('escape'); 2174 $self->emit ('escape');
1734 } elsif ($uni) { 2175 } elsif ($uni == 0x0d) {
2176 substr $text, $self->{cursor}++, 0, "\012";
2177 } elsif ($uni >= 0x20) {
1735 substr $text, $self->{cursor}++, 0, chr $uni; 2178 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else { 2179 } else {
1737 return 0; 2180 return 0;
1738 } 2181 }
1739 2182
1740 $self->_set_text ($text); 2183 $self->_set_text ($text);
1741 2184
1742 $self->realloc; 2185 $self->realloc;
2186 $self->update;
1743 2187
1744 1 2188 1
1745} 2189}
1746 2190
1747sub focus_in { 2191sub invoke_focus_in {
1748 my ($self) = @_; 2192 my ($self) = @_;
1749 2193
1750 $self->{last_activity} = $::NOW; 2194 $self->{last_activity} = $::NOW;
1751 2195
1752 $self->SUPER::focus_in; 2196 $self->SUPER::invoke_focus_in
1753} 2197}
1754 2198
1755sub button_down { 2199sub invoke_button_down {
1756 my ($self, $ev, $x, $y) = @_; 2200 my ($self, $ev, $x, $y) = @_;
1757 2201
1758 $self->SUPER::button_down ($ev, $x, $y); 2202 $self->SUPER::invoke_button_down ($ev, $x, $y);
1759 2203
1760 my $idx = $self->{layout}->xy_to_index ($x, $y); 2204 my $idx = $self->{layout}->xy_to_index ($x, $y);
1761 2205
1762 # byte-index to char-index 2206 # byte-index to char-index
1763 my $text = $self->{text}; 2207 my $text = $self->{text};
1764 utf8::encode $text; 2208 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1765 $self->{cursor} = length substr $text, 0, $idx; 2209 $self->{cursor} = length $text;
1766 2210
1767 $self->_set_text ($self->{text}); 2211 $self->_set_text ($self->{text});
1768 $self->update; 2212 $self->update;
1769 2213
1770 1 2214 1
1771} 2215}
1772 2216
1773sub mouse_motion { 2217sub invoke_mouse_motion {
1774 my ($self, $ev, $x, $y) = @_; 2218 my ($self, $ev, $x, $y) = @_;
1775# 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#
1776 2220
1777 0 2221 1
1778} 2222}
1779 2223
1780sub _draw { 2224sub _draw {
1781 my ($self) = @_; 2225 my ($self) = @_;
1782 2226
1783 local $self->{fg} = $self->{fg}; 2227 local $self->{fg} = $self->{fg};
1784 2228
1785 if ($FOCUS == $self) { 2229 if ($FOCUS == $self) {
1786 glColor @{$self->{active_bg}}; 2230 glColor_premultiply @{$self->{active_bg}};
1787 $self->{fg} = $self->{active_fg}; 2231 $self->{fg} = $self->{active_fg};
1788 } else { 2232 } else {
1789 glColor @{$self->{bg}}; 2233 glColor_premultiply @{$self->{bg}};
1790 } 2234 }
1791 2235
1792 glEnable GL_BLEND; 2236 glEnable GL_BLEND;
1793 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2237 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1794 glBegin GL_QUADS; 2238 glBegin GL_QUADS;
1795 glVertex 0 , 0; 2239 glVertex 0 , 0;
1796 glVertex 0 , $self->{h}; 2240 glVertex 0 , $self->{h};
1797 glVertex $self->{w}, $self->{h}; 2241 glVertex $self->{w}, $self->{h};
1798 glVertex $self->{w}, 0; 2242 glVertex $self->{w}, 0;
… …
1809 utf8::encode $text; 2253 utf8::encode $text;
1810 2254
1811 @$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)
1812 } 2256 }
1813 2257
1814 glColor @{$self->{fg}};
1815 glBegin GL_LINES; 2258 glBegin GL_LINES;
1816 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};
1817 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};
1818 glEnd; 2261 glEnd;
1819 } 2262 }
1820} 2263}
1821 2264
2265#############################################################################
2266
1822package CFClient::UI::Entry; 2267package CFPlus::UI::Entry;
1823 2268
1824our @ISA = CFClient::UI::EntryBase::; 2269our @ISA = CFPlus::UI::EntryBase::;
1825 2270
1826use CFClient::OpenGL; 2271use CFPlus::OpenGL;
1827 2272
1828sub key_down { 2273sub invoke_key_down {
1829 my ($self, $ev) = @_; 2274 my ($self, $ev) = @_;
1830 2275
1831 my $sym = $ev->{sym}; 2276 my $sym = $ev->{sym};
1832 2277
1833 if ($sym == 13) { 2278 if ($ev->{uni} == 0x0d || $sym == 13) {
1834 unshift @{$self->{history}}, 2279 unshift @{$self->{history}},
1835 my $txt = $self->get_text; 2280 my $txt = $self->get_text;
2281
1836 $self->{history_pointer} = -1; 2282 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = ''; 2283 $self->{history_saveback} = '';
1838 $self->_emit (activate => $txt); 2284 $self->emit (activate => $txt);
1839 $self->update; 2285 $self->update;
1840 2286
1841 } elsif ($sym == CFClient::SDLK_UP) { 2287 } elsif ($sym == CFPlus::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) { 2288 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text; 2289 $self->{history_saveback} = $self->get_text;
1844 } 2290 }
1845 if (@{$self->{history} || []} > 0) { 2291 if (@{$self->{history} || []} > 0) {
1846 $self->{history_pointer}++; 2292 $self->{history_pointer}++;
… …
1848 $self->{history_pointer} = @{$self->{history} || []} - 1; 2294 $self->{history_pointer} = @{$self->{history} || []} - 1;
1849 } 2295 }
1850 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2296 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1851 } 2297 }
1852 2298
1853 } elsif ($sym == CFClient::SDLK_DOWN) { 2299 } elsif ($sym == CFPlus::SDLK_DOWN) {
1854 $self->{history_pointer}--; 2300 $self->{history_pointer}--;
1855 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2301 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1856 2302
1857 if ($self->{history_pointer} >= 0) { 2303 if ($self->{history_pointer} >= 0) {
1858 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2304 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1859 } else { 2305 } else {
1860 $self->set_text ($self->{history_saveback}); 2306 $self->set_text ($self->{history_saveback});
1861 } 2307 }
1862 2308
1863 } else { 2309 } else {
1864 return $self->SUPER::key_down ($ev) 2310 return $self->SUPER::invoke_key_down ($ev)
1865 } 2311 }
1866 2312
1867 1 2313 1
1868} 2314}
1869 2315
1870############################################################################# 2316#############################################################################
1871 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
1872package CFClient::UI::Button; 2357package CFPlus::UI::Button;
1873 2358
1874our @ISA = CFClient::UI::Label::; 2359our @ISA = CFPlus::UI::Label::;
1875 2360
1876use CFClient::OpenGL; 2361use CFPlus::OpenGL;
1877 2362
1878my @tex = 2363my @tex =
1879 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2364 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1880 qw(b1_button_active.png); 2365 qw(b1_button_inactive.png b1_button_active.png);
1881 2366
1882sub new { 2367sub new {
1883 my $class = shift; 2368 my $class = shift;
1884 2369
1885 $class->SUPER::new ( 2370 $class->SUPER::new (
1886 padding_x => 4, 2371 padding_x => 4,
1887 padding_y => 4, 2372 padding_y => 4,
1888 fg => [1, 1, 1], 2373 fg => [1.0, 1.0, 1.0],
1889 active_fg => [0, 0, 1], 2374 active_fg => [0.8, 0.8, 0.8],
1890 can_hover => 1, 2375 can_hover => 1,
1891 align => 0, 2376 align => 0,
1892 valign => 0, 2377 valign => 0,
1893 can_events => 1, 2378 can_events => 1,
1894 @_ 2379 @_
1895 ) 2380 )
1896} 2381}
1897 2382
1898sub activate { }
1899
1900sub button_up { 2383sub invoke_button_up {
1901 my ($self, $ev, $x, $y) = @_; 2384 my ($self, $ev, $x, $y) = @_;
1902 2385
1903 $self->emit ("activate") 2386 $self->emit ("activate")
1904 if $x >= 0 && $x < $self->{w} 2387 if $x >= 0 && $x < $self->{w}
1905 && $y >= 0 && $y < $self->{h}; 2388 && $y >= 0 && $y < $self->{h};
… …
1908} 2391}
1909 2392
1910sub _draw { 2393sub _draw {
1911 my ($self) = @_; 2394 my ($self) = @_;
1912 2395
1913 local $self->{fg} = $self->{fg}; 2396 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1914
1915 if ($GRAB == $self) {
1916 $self->{fg} = $self->{active_fg};
1917 }
1918 2397
1919 glEnable GL_TEXTURE_2D; 2398 glEnable GL_TEXTURE_2D;
1920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2399 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1921 glColor 0, 0, 0, 1; 2400 glColor 0, 0, 0, 1;
1922 2401
2402 my $tex = $tex[$GRAB == $self];
1923 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2403 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1924 2404
1925 glDisable GL_TEXTURE_2D; 2405 glDisable GL_TEXTURE_2D;
1926 2406
1927 $self->SUPER::_draw; 2407 $self->SUPER::_draw;
1928} 2408}
1929 2409
1930############################################################################# 2410#############################################################################
1931 2411
1932package CFClient::UI::CheckBox; 2412package CFPlus::UI::CheckBox;
1933 2413
1934our @ISA = CFClient::UI::DrawBG::; 2414our @ISA = CFPlus::UI::DrawBG::;
1935 2415
1936my @tex = 2416my @tex =
1937 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2417 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1938 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2418 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1939 2419
1940use CFClient::OpenGL; 2420use CFPlus::OpenGL;
1941 2421
1942sub new { 2422sub new {
1943 my $class = shift; 2423 my $class = shift;
1944 2424
1945 $class->SUPER::new ( 2425 $class->SUPER::new (
… …
1959 my ($self) = @_; 2439 my ($self) = @_;
1960 2440
1961 (6) x 2 2441 (6) x 2
1962} 2442}
1963 2443
2444sub toggle {
2445 my ($self) = @_;
2446
2447 $self->{state} = !$self->{state};
2448 $self->emit (changed => $self->{state});
2449 $self->update;
2450}
2451
1964sub button_down { 2452sub invoke_button_down {
1965 my ($self, $ev, $x, $y) = @_; 2453 my ($self, $ev, $x, $y) = @_;
1966 2454
1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2455 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2456 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1969 $self->{state} = !$self->{state}; 2457 $self->toggle;
1970 $self->_emit (changed => $self->{state});
1971 } else { 2458 } else {
1972 return 0 2459 return 0
1973 } 2460 }
1974 2461
1975 1 2462 1
… …
1995 glDisable GL_TEXTURE_2D; 2482 glDisable GL_TEXTURE_2D;
1996} 2483}
1997 2484
1998############################################################################# 2485#############################################################################
1999 2486
2000package CFClient::UI::Image; 2487package CFPlus::UI::Image;
2001 2488
2002our @ISA = CFClient::UI::Base::; 2489our @ISA = CFPlus::UI::Base::;
2003 2490
2004use CFClient::OpenGL; 2491use CFPlus::OpenGL;
2005use Carp qw/confess/;
2006 2492
2007our %loaded_images; 2493our %texture_cache;
2008 2494
2009sub new { 2495sub new {
2010 my $class = shift; 2496 my $class = shift;
2011 2497
2012 my $self = $class->SUPER::new (can_events => 0, @_); 2498 my $self = $class->SUPER::new (
2499 can_events => 0,
2500 @_,
2501 );
2013 2502
2014 $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";
2015 2505
2016 $loaded_images{$self->{image}} ||= 2506 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2017 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;
2018 2508
2019 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2509 CFPlus::weaken $texture_cache{$self->{path}};
2020 2510
2021 Scalar::Util::weaken $loaded_images{$self->{image}}; 2511 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2022
2023 $self->{aspect} = $tex->{w} / $tex->{h};
2024 2512
2025 $self 2513 $self
2026} 2514}
2027 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
2028sub size_request { 2531sub size_request {
2029 my ($self) = @_; 2532 my ($self) = @_;
2030 2533
2031 ($self->{tex}->{w}, $self->{tex}->{h}) 2534 ($self->{tex}{w}, $self->{tex}{h})
2032} 2535}
2033 2536
2034sub _draw { 2537sub _draw {
2035 my ($self) = @_; 2538 my ($self) = @_;
2036 2539
… …
2046 } 2549 }
2047 2550
2048 glEnable GL_TEXTURE_2D; 2551 glEnable GL_TEXTURE_2D;
2049 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2050 2553
2051 $tex->draw_quad_alpha (0, 0, $w, $h); 2554 $tex->draw_quad (0, 0, $w, $h);
2052 2555
2053 glDisable GL_TEXTURE_2D; 2556 glDisable GL_TEXTURE_2D;
2054} 2557}
2055 2558
2056############################################################################# 2559#############################################################################
2057 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
2058package CFClient::UI::VGauge; 2597package CFPlus::UI::VGauge;
2059 2598
2060our @ISA = CFClient::UI::Base::; 2599our @ISA = CFPlus::UI::Base::;
2061 2600
2062use List::Util qw(min max); 2601use List::Util qw(min max);
2063 2602
2064use CFClient::OpenGL; 2603use CFPlus::OpenGL;
2065 2604
2066my %tex = ( 2605my %tex = (
2067 food => [ 2606 food => [
2068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2607 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2069 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2608 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2070 ], 2609 ],
2071 grace => [ 2610 grace => [
2072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2611 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2073 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/
2074 ], 2613 ],
2075 hp => [ 2614 hp => [
2076 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2615 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2077 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2616 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2078 ], 2617 ],
2079 mana => [ 2618 mana => [
2080 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2619 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2081 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/
2082 ], 2621 ],
2083); 2622);
2084 2623
2085# eg. VGauge->new (gauge => 'food'), default gauge: food 2624# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2145 my $ycut1 = max 0, min 1, $ycut; 2684 my $ycut1 = max 0, min 1, $ycut;
2146 my $ycut2 = max 0, min 1, $ycut - 1; 2685 my $ycut2 = max 0, min 1, $ycut - 1;
2147 2686
2148 my $h1 = $self->{h} * (1 - $ycut1); 2687 my $h1 = $self->{h} * (1 - $ycut1);
2149 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);
2150 2692
2151 glEnable GL_BLEND; 2693 glEnable GL_BLEND;
2152 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;
2153 glEnable GL_TEXTURE_2D; 2696 glEnable GL_TEXTURE_2D;
2154 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155 2698
2156 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2699 glBindTexture GL_TEXTURE_2D, $t1->{name};
2157 glBegin GL_QUADS; 2700 glBegin GL_QUADS;
… …
2172 2715
2173 if ($t3) { 2716 if ($t3) {
2174 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2717 glBindTexture GL_TEXTURE_2D, $t3->{name};
2175 glBegin GL_QUADS; 2718 glBegin GL_QUADS;
2176 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2719 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2177 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2720 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2178 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2721 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2179 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2722 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2180 glEnd; 2723 glEnd;
2181 } 2724 }
2182 2725
2183 glDisable GL_BLEND; 2726 glDisable GL_BLEND;
2184 glDisable GL_TEXTURE_2D; 2727 glDisable GL_TEXTURE_2D;
2185} 2728}
2186 2729
2187############################################################################# 2730#############################################################################
2188 2731
2189package CFClient::UI::Gauge; 2732package CFPlus::UI::Gauge;
2190 2733
2191our @ISA = CFClient::UI::VBox::; 2734our @ISA = CFPlus::UI::VBox::;
2192 2735
2193sub new { 2736sub new {
2194 my ($class, %arg) = @_; 2737 my ($class, %arg) = @_;
2195 2738
2196 my $self = $class->SUPER::new ( 2739 my $self = $class->SUPER::new (
… …
2198 can_hover => 1, 2741 can_hover => 1,
2199 can_events => 1, 2742 can_events => 1,
2200 %arg, 2743 %arg,
2201 ); 2744 );
2202 2745
2203 $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");
2204 $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);
2205 $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");
2206 2749
2207 $self 2750 $self
2208} 2751}
2209 2752
2210sub set_fontsize { 2753sub set_fontsize {
… …
2231 $self->{value}->set_text ($val); 2774 $self->{value}->set_text ($val);
2232} 2775}
2233 2776
2234############################################################################# 2777#############################################################################
2235 2778
2236package CFClient::UI::Slider; 2779package CFPlus::UI::Slider;
2237 2780
2238use strict; 2781use strict;
2239 2782
2240use CFClient::OpenGL; 2783use CFPlus::OpenGL;
2241 2784
2242our @ISA = CFClient::UI::DrawBG::; 2785our @ISA = CFPlus::UI::DrawBG::;
2243 2786
2244my @tex = 2787my @tex =
2245 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2788 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2246 qw(s1_slider.png s1_slider_bg.png); 2789 qw(s1_slider.png s1_slider_bg.png);
2247 2790
2248sub new { 2791sub new {
2249 my $class = shift; 2792 my $class = shift;
2250 2793
… …
2271 $self->update; 2814 $self->update;
2272 2815
2273 $self 2816 $self
2274} 2817}
2275 2818
2276sub changed { }
2277
2278sub set_range { 2819sub set_range {
2279 my ($self, $range) = @_; 2820 my ($self, $range) = @_;
2280 2821
2281 ($range, $self->{range}) = ($self->{range}, $range); 2822 ($range, $self->{range}) = ($self->{range}, $range);
2282 2823
2283 $self->update
2284 if "@$range" ne "@{$self->{range}}"; 2824 if ("@$range" ne "@{$self->{range}}") {
2825 $self->update;
2826 $self->set_value ($self->{range}[0]);
2827 }
2285} 2828}
2286 2829
2287sub set_value { 2830sub set_value {
2288 my ($self, $value) = @_; 2831 my ($self, $value) = @_;
2289 2832
… …
2300 if $unit; 2843 if $unit;
2301 2844
2302 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2845 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2303 2846
2304 if ($value != $old_value) { 2847 if ($value != $old_value) {
2305 $self->_emit (changed => $value); 2848 $self->emit (changed => $value);
2306 $self->update; 2849 $self->update;
2307 } 2850 }
2308} 2851}
2309 2852
2310sub size_request { 2853sub size_request {
2311 my ($self) = @_; 2854 my ($self) = @_;
2312 2855
2313 ($self->{req_w}, $self->{req_h}) 2856 ($self->{req_w}, $self->{req_h})
2314} 2857}
2315 2858
2316sub button_down { 2859sub invoke_button_down {
2317 my ($self, $ev, $x, $y) = @_; 2860 my ($self, $ev, $x, $y) = @_;
2318 2861
2319 $self->SUPER::button_down ($ev, $x, $y); 2862 $self->SUPER::invoke_button_down ($ev, $x, $y);
2320 2863
2321 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2864 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2322 2865
2323 $self->mouse_motion ($ev, $x, $y) 2866 $self->invoke_mouse_motion ($ev, $x, $y)
2324} 2867}
2325 2868
2326sub mouse_motion { 2869sub invoke_mouse_motion {
2327 my ($self, $ev, $x, $y) = @_; 2870 my ($self, $ev, $x, $y) = @_;
2328 2871
2329 if ($GRAB == $self) { 2872 if ($GRAB == $self) {
2330 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2873 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2331 2874
… …
2339 } 2882 }
2340 2883
2341 1 2884 1
2342} 2885}
2343 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
2897}
2898
2344sub update { 2899sub update {
2345 my ($self) = @_; 2900 my ($self) = @_;
2346 2901
2347 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2902 delete $self->{knob_w};
2903 $self->SUPER::update;
2904}
2905
2906sub _draw {
2907 my ($self) = @_;
2908
2909 unless ($self->{knob_w}) {
2348 $self->set_value ($self->{range}[0]); 2910 $self->set_value ($self->{range}[0]);
2349 2911
2350 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2912 my ($value, $lo, $hi, $page) = @{$self->{range}};
2351 my $range = ($hi - $page - $lo) || 1e-100; 2913 my $range = ($hi - $page - $lo) || 1e-100;
2352 2914
… …
2358 $value = ($value - $lo) / $range; 2920 $value = ($value - $lo) / $range;
2359 $value = $value * $self->{scale} + $self->{offset}; 2921 $value = $value * $self->{scale} + $self->{offset};
2360 2922
2361 $self->{knob_x} = $value - $knob_w * 0.5; 2923 $self->{knob_x} = $value - $knob_w * 0.5;
2362 $self->{knob_w} = $knob_w; 2924 $self->{knob_w} = $knob_w;
2363 }); 2925 }
2364
2365 $self->SUPER::update;
2366}
2367
2368sub _draw {
2369 my ($self) = @_;
2370 2926
2371 $self->SUPER::_draw (); 2927 $self->SUPER::_draw ();
2372 2928
2373 glScale $self->{w}, $self->{h}; 2929 glScale $self->{w}, $self->{h};
2374 2930
… …
2394 glDisable GL_TEXTURE_2D; 2950 glDisable GL_TEXTURE_2D;
2395} 2951}
2396 2952
2397############################################################################# 2953#############################################################################
2398 2954
2399package CFClient::UI::ValSlider; 2955package CFPlus::UI::ValSlider;
2400 2956
2401our @ISA = CFClient::UI::HBox::; 2957our @ISA = CFPlus::UI::HBox::;
2402 2958
2403sub new { 2959sub new {
2404 my ($class, %arg) = @_; 2960 my ($class, %arg) = @_;
2405 2961
2406 my $range = delete $arg{range}; 2962 my $range = delete $arg{range};
2407 2963
2408 my $self = $class->SUPER::new ( 2964 my $self = $class->SUPER::new (
2409 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2965 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2410 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2966 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2411 to_value => sub { shift }, 2967 to_value => sub { shift },
2412 from_value => sub { shift }, 2968 from_value => sub { shift },
2413 %arg, 2969 %arg,
2414 ); 2970 );
2415 2971
… …
2435sub set_range { shift->{slider}->set_range (@_) } 2991sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) } 2992sub set_value { shift->{slider}->set_value (@_) }
2437 2993
2438############################################################################# 2994#############################################################################
2439 2995
2440package CFClient::UI::TextView; 2996package CFPlus::UI::TextScroller;
2441 2997
2442our @ISA = CFClient::UI::HBox::; 2998our @ISA = CFPlus::UI::HBox::;
2443 2999
2444use CFClient::OpenGL; 3000use CFPlus::OpenGL;
2445 3001
2446sub new { 3002sub new {
2447 my $class = shift; 3003 my $class = shift;
2448 3004
2449 my $self = $class->SUPER::new ( 3005 my $self = $class->SUPER::new (
2450 fontsize => 1, 3006 fontsize => 1,
2451 can_events => 0, 3007 can_events => 1,
3008 indent => 0,
2452 #font => default_font 3009 #font => default_font
2453 @_, 3010 @_,
2454 3011
2455 layout => (new CFClient::Layout 1), 3012 layout => (new CFPlus::Layout),
2456 par => [], 3013 par => [],
3014 max_par => 0,
2457 height => 0, 3015 height => 0,
2458 children => [ 3016 children => [
2459 (new CFClient::UI::Empty expand => 1), 3017 (new CFPlus::UI::Empty expand => 1),
2460 (new CFClient::UI::Slider vertical => 1), 3018 (new CFPlus::UI::Slider vertical => 1),
2461 ], 3019 ],
2462 ); 3020 );
2463 3021
2464 $self->{children}[1]->connect (changed => sub { $self->update }); 3022 $self->{children}[1]->connect (changed => sub { $self->update });
2465 3023
… …
2471 3029
2472 $self->{fontsize} = $fontsize; 3030 $self->{fontsize} = $fontsize;
2473 $self->reflow; 3031 $self->reflow;
2474} 3032}
2475 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
2476sub size_allocate { 3043sub invoke_size_allocate {
2477 my ($self, $w, $h) = @_; 3044 my ($self, $w, $h) = @_;
2478 3045
2479 $self->SUPER::size_allocate ($w, $h); 3046 my ($empty, $slider, @other) = @{ $self->{children} };
3047 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2480 3048
2481 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3049 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3050 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $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});
2484 3053
2485 $self->reflow; 3054 $self->reflow;
2486}
2487 3055
2488sub text_size { 3056 local $self->{children} = [$empty, $slider];
3057 $self->SUPER::invoke_size_allocate ($w, $h)
3058}
3059
3060sub invoke_mouse_wheel {
2489 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) = @_;
2490 3072
2491 my $layout = $self->{layout}; 3073 my $layout = $self->{layout};
2492 3074
3075 $layout->set_font ($self->{font}) if $self->{font};
3076 $layout->set_foreground (@{$para->{fg}});
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3077 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $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});
2495 $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}}
2496 3086 );
3087
2497 $layout->size 3088 $layout
2498} 3089}
2499 3090
2500sub reflow { 3091sub reflow {
2501 my ($self) = @_; 3092 my ($self) = @_;
2502 3093
… …
2509 3100
2510 # todo: base offset on lines or so, not on pixels 3101 # todo: base offset on lines or so, not on pixels
2511 $self->{children}[1]->set_value ($offset); 3102 $self->{children}[1]->set_value ($offset);
2512} 3103}
2513 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
2514sub clear { 3120sub clear {
2515 my ($self) = @_; 3121 my ($self) = @_;
3122
3123 my (undef, undef, @other) = @{ $self->{children} };
3124 $self->remove ($_) for @other;
2516 3125
2517 $self->{par} = []; 3126 $self->{par} = [];
2518 $self->{height} = 0; 3127 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3128 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520} 3129}
2521 3130
2522sub add_paragraph { 3131sub add_paragraph {
2523 my ($self, $color, $text, $indent) = @_; 3132 my $self = shift;
2524 3133
2525 for my $line (split /\n/, $text) { 3134 for my $para (@_) {
2526 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
2527 $self->{height} += $h; 3186 $self->{height} = $height;
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3187 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2529 }
2530 3188
2531 $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 }
2532} 3195}
2533 3196
2534sub update { 3197sub update {
2535 my ($self) = @_; 3198 my ($self) = @_;
2536 3199
… …
2538 3201
2539 return unless $self->{h} > 0; 3202 return unless $self->{h} > 0;
2540 3203
2541 delete $self->{texture}; 3204 delete $self->{texture};
2542 3205
2543 $ROOT->on_post_alloc ($self, sub { 3206 $ROOT->on_post_alloc ($self => sub {
3207 $self->force_uptodate;
3208
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3209 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545 3210
2546 if (delete $self->{need_reflow}) {
2547 my $height = 0;
2548
2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2553 for (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2555 $layout->set_width ($W - $_->[3]);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3];
2559 $_->[1] = $h;
2560 }
2561
2562 $height += $_->[1];
2563 }
2564
2565 $self->{height} = $height;
2566
2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2568
2569 delete $self->{texture};
2570 }
2571
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3211 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2573 glClearColor 0.5, 0.5, 0.5, 0; 3212 glClearColor 0, 0, 0, 0;
2574 glClear GL_COLOR_BUFFER_BIT; 3213 glClear GL_COLOR_BUFFER_BIT;
2575 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;
2576 my $top = int $self->{children}[1]{range}[0]; 3223 my $top = int $self->{children}[1]{range}[0];
2577 3224
2578 my $y0 = $top; 3225 my $y0 = $top;
2579 my $y1 = $top + $H; 3226 my $y1 = $top + $H;
2580 3227
2581 my $y = 0;
2582
2583 my $layout = $self->{layout};
2584
2585 $layout->set_font ($self->{font}) if $self->{font};
2586
2587 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off
2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2590
2591 for my $par (@{$self->{par}}) { 3228 for my $para (@{$self->{par}}) {
2592 my $h = $par->[1]; 3229 my $h = $para->{h};
3230 my $y = $para->{y};
2593 3231
2594 if ($y0 < $y + $h && $y < $y1) { 3232 if ($y0 < $y + $h && $y < $y1) {
2595 $layout->set_foreground (@{ $par->[2] }); 3233 my $layout = $self->get_layout ($para);
2596 $layout->set_width ($W - $par->[3]);
2597 $layout->set_markup ($par->[4]);
2598 3234
2599 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3235 $layout->render ($para->{indent}, $y - $y0);
2600 3236
2601 glRasterPos $par->[3], $y - $y0; 3237 if (my @w = @{ $para->{widget} }) {
2602 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 }
2603 } 3249 }
2604 3250
2605 $y += $h; 3251 $paridx++;
3252 $top_paragraph ||= $paridx if $y >= $top;
2606 } 3253 }
2607 3254
2608 glDisable GL_BLEND; 3255 $self->{top_paragraph} = $top_paragraph;
2609 }; 3256 };
2610 }); 3257 });
2611} 3258}
2612 3259
3260sub reconfigure {
3261 my ($self) = @_;
3262
3263 $self->SUPER::reconfigure;
3264
3265 $_->{w} = 1e10 for @{ $self->{par} };
3266 $self->reflow;
3267}
3268
2613sub _draw { 3269sub _draw {
2614 my ($self) = @_; 3270 my ($self) = @_;
2615 3271
2616 glEnable GL_TEXTURE_2D; 3272 glEnable GL_TEXTURE_2D;
2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2618 glColor 1, 1, 1, 1; 3274 glColor 0, 0, 0, 1;
2619 $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});
2620 glDisable GL_TEXTURE_2D; 3276 glDisable GL_TEXTURE_2D;
2621 3277
2622 $self->{children}[1]->draw; 3278 $self->{children}[1]->draw;
2623
2624} 3279}
2625 3280
2626############################################################################# 3281#############################################################################
2627 3282
2628package CFClient::UI::Animator; 3283package CFPlus::UI::Animator;
2629 3284
2630use CFClient::OpenGL; 3285use CFPlus::OpenGL;
2631 3286
2632our @ISA = CFClient::UI::Bin::; 3287our @ISA = CFPlus::UI::Bin::;
2633 3288
2634sub moveto { 3289sub moveto {
2635 my ($self, $x, $y) = @_; 3290 my ($self, $x, $y) = @_;
2636 3291
2637 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3292 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2665 glPopMatrix; 3320 glPopMatrix;
2666} 3321}
2667 3322
2668############################################################################# 3323#############################################################################
2669 3324
2670package CFClient::UI::Flopper; 3325package CFPlus::UI::Flopper;
2671 3326
2672our @ISA = CFClient::UI::Button::; 3327our @ISA = CFPlus::UI::Button::;
2673 3328
2674sub new { 3329sub new {
2675 my $class = shift; 3330 my $class = shift;
2676 3331
2677 my $self = $class->SUPER::new ( 3332 my $self = $class->SUPER::new (
… …
2689 $self->{other}->toggle_visibility; 3344 $self->{other}->toggle_visibility;
2690} 3345}
2691 3346
2692############################################################################# 3347#############################################################################
2693 3348
2694package CFClient::UI::Tooltip; 3349package CFPlus::UI::Tooltip;
2695 3350
2696our @ISA = CFClient::UI::Bin::; 3351our @ISA = CFPlus::UI::Bin::;
2697 3352
2698use CFClient::OpenGL; 3353use CFPlus::OpenGL;
2699 3354
2700sub new { 3355sub new {
2701 my $class = shift; 3356 my $class = shift;
2702 3357
2703 $class->SUPER::new ( 3358 $class->SUPER::new (
… …
2706 ) 3361 )
2707} 3362}
2708 3363
2709sub set_tooltip_from { 3364sub set_tooltip_from {
2710 my ($self, $widget) = @_; 3365 my ($self, $widget) = @_;
3366
3367 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3368 if $widget->{tooltip} =~ /^#(.*)$/;
2711 3369
2712 my $tooltip = $widget->{tooltip}; 3370 my $tooltip = $widget->{tooltip};
2713 3371
2714 if ($ENV{CFPLUS_DEBUG} & 2) { 3372 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n" 3373 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3374 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n" 3375 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}"; 3376 . "visible $widget->{visible}";
2719 } 3377 }
2720 3378
3379 $tooltip =~ s/^\n+//;
3380 $tooltip =~ s/\n+$//;
3381
2721 $self->add (new CFClient::UI::Label 3382 $self->add (new CFPlus::UI::Label
2722 markup => $tooltip, 3383 markup => $tooltip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3384 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8, 3385 fontsize => 0.8,
2725 fg => [0, 0, 0, 1], 3386 style => 1, # FLAG_INVERSE
2726 ellipsise => 0, 3387 ellipsise => 0,
2727 font => ($widget->{tooltip_font} || $::FONT_PROP), 3388 font => ($widget->{tooltip_font} || $::FONT_PROP),
2728 ); 3389 );
2729} 3390}
2730 3391
… …
2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3395 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735 3396
2736 ($w + 4, $h + 4) 3397 ($w + 4, $h + 4)
2737} 3398}
2738 3399
2739sub size_allocate { 3400sub invoke_size_allocate {
2740 my ($self, $w, $h) = @_; 3401 my ($self, $w, $h) = @_;
2741 3402
2742 $self->SUPER::size_allocate ($w - 4, $h - 4); 3403 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2743} 3404}
2744 3405
2745sub visibility_change { 3406sub invoke_visibility_change {
2746 my ($self, $visible) = @_; 3407 my ($self, $visible) = @_;
2747 3408
2748 return unless $visible; 3409 return unless $visible;
2749 3410
2750 $self->{root}->on_post_alloc ("move_$self" => sub { 3411 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner} 3412 my $widget = $self->{owner}
2752 or return; 3413 or return;
2753 3414
3415 if ($widget->{visible}) {
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3416 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755 3417
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3418 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH; 3419 if $x + $self->{w} > $self->{root}{w};
2758 3420
2759 $self->move_abs ($x, $y); 3421 $self->move_abs ($x, $y);
3422 } else {
3423 $self->hide;
3424 }
2760 }); 3425 });
2761} 3426}
2762 3427
2763sub _draw { 3428sub _draw {
2764 my ($self) = @_; 3429 my ($self) = @_;
… …
2788 $self->SUPER::_draw; 3453 $self->SUPER::_draw;
2789} 3454}
2790 3455
2791############################################################################# 3456#############################################################################
2792 3457
2793package CFClient::UI::Face; 3458package CFPlus::UI::Face;
2794 3459
2795our @ISA = CFClient::UI::Base::; 3460our @ISA = CFPlus::UI::DrawBG::;
2796 3461
2797use CFClient::OpenGL; 3462use CFPlus::OpenGL;
2798 3463
2799sub new { 3464sub new {
2800 my $class = shift; 3465 my $class = shift;
2801 3466
2802 my $self = $class->SUPER::new ( 3467 my $self = $class->SUPER::new (
3468 size_w => 32,
3469 size_h => 8,
2803 aspect => 1, 3470 aspect => 1,
2804 can_events => 0, 3471 can_events => 0,
2805 @_, 3472 @_,
2806 ); 3473 );
2807 3474
2808 if ($self->{anim} && $self->{animspeed}) { 3475 if ($self->{anim} && $self->{animspeed}) {
2809 Scalar::Util::weaken (my $widget = $self); 3476 CFPlus::weaken (my $widget = $self);
2810 3477
3478 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3479 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2811 $self->{timer} = Event->timer ( 3480 $self->{timer} = Event->timer (
2812 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2813 hard => 1, 3481 parked => 1,
2814 interval => $self->{animspeed},
2815 cb => sub { 3482 cb => sub {
3483 return unless $::CONN && $widget;
3484
2816 ++$widget->{frame}; 3485 ++$widget->{frame};
3486 $widget->update_face;
2817 $widget->update; 3487 $widget->update;
3488
3489 $widget->update_timer;
2818 }, 3490 },
2819 ); 3491 );
3492
3493 $self->update_face;
3494 $self->update_timer;
2820 } 3495 }
2821 3496
2822 $self 3497 $self
2823} 3498}
2824 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
2825sub size_request { 3530sub size_request {
2826 (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)
2827} 3546}
2828 3547
2829sub update { 3548sub update {
2830 my ($self) = @_; 3549 my ($self) = @_;
2831 3550
2832 return unless $self->{visible}; 3551 return unless $self->{visible};
2833 3552
2834 $self->SUPER::update; 3553 $self->SUPER::update;
2835} 3554}
2836 3555
3556sub invoke_visibility_change {
3557 my ($self) = @_;
3558
3559 $self->update_timer;
3560
3561 0
3562}
3563
2837sub _draw { 3564sub _draw {
2838 my ($self) = @_; 3565 my ($self) = @_;
2839 3566
2840 return unless $::CONN; 3567 return unless $::CONN;
2841 3568
2842 my $face; 3569 $self->SUPER::_draw;
2843 3570
2844 if ($self->{frame}) {
2845 my $anim = $::CONN->{anim}[$self->{anim}]; 3571 my $faceid = $::CONN->{faceid}[$self->{face}]
2846 3572 or return;
2847 $face = $anim->[ $self->{frame} % @$anim ]
2848 if $anim && @$anim;
2849 }
2850 3573
2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3574 my $tex = $::CONN->{texture}[$faceid];
2852 3575
2853 if ($tex) { 3576 if ($tex) {
2854 glEnable GL_TEXTURE_2D; 3577 glEnable GL_TEXTURE_2D;
2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3578 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2856 glColor 1, 1, 1, 1; 3579 glColor 0, 0, 0, 1;
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3580 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 3581 glDisable GL_TEXTURE_2D;
2859 } 3582 }
2860} 3583}
2861 3584
2862sub DESTROY { 3585sub destroy {
2863 my ($self) = @_; 3586 my ($self) = @_;
2864 3587
2865 $self->{timer}->cancel 3588 (delete $self->{timer})->cancel
2866 if $self->{timer}; 3589 if $self->{timer};
2867 3590
2868 $self->SUPER::DESTROY; 3591 $self->SUPER::destroy;
2869} 3592}
2870 3593
2871############################################################################# 3594#############################################################################
2872 3595
2873package CFClient::UI::Buttonbar; 3596package CFPlus::UI::Buttonbar;
2874 3597
2875our @ISA = CFClient::UI::HBox::; 3598our @ISA = CFPlus::UI::HBox::;
2876 3599
2877# TODO: should actualyl wrap buttons and other goodies. 3600# TODO: should actually wrap buttons and other goodies.
2878 3601
2879############################################################################# 3602#############################################################################
2880 3603
2881package CFClient::UI::Menu; 3604package CFPlus::UI::Menu;
2882 3605
2883our @ISA = CFClient::UI::FancyFrame::; 3606our @ISA = CFPlus::UI::Toplevel::;
2884 3607
2885use CFClient::OpenGL; 3608use CFPlus::OpenGL;
2886 3609
2887sub new { 3610sub new {
2888 my $class = shift; 3611 my $class = shift;
2889 3612
2890 my $self = $class->SUPER::new ( 3613 my $self = $class->SUPER::new (
2891 items => [], 3614 items => [],
2892 z => 100, 3615 z => 100,
2893 @_, 3616 @_,
2894 ); 3617 );
2895 3618
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3619 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2897 3620
2898 for my $item (@{ $self->{items} }) { 3621 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item; 3622 my ($widget, $cb, $tooltip) = @$item;
2900 3623
2901 # handle various types of items, only text for now 3624 # handle various types of items, only text for now
2902 if (!ref $widget) { 3625 if (!ref $widget) {
3626 if ($widget =~ /\t/) {
3627 my ($left, $right) = split /\t/, $widget, 2;
3628
2903 $widget = new CFClient::UI::Label 3629 $widget = new CFPlus::UI::HBox
2904 can_hover => 1, 3630 can_hover => 1,
2905 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,
2906 text => $widget; 3643 markup => $widget,
3644 tooltip => $tooltip;
3645 }
2907 } 3646 }
2908 3647
2909 $self->{item}{$widget} = $item; 3648 $self->{item}{$widget} = $item;
2910 3649
2911 $self->{vbox}->add ($widget); 3650 $self->{vbox}->add ($widget);
… …
2916 3655
2917# 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)
2918sub popup { 3657sub popup {
2919 my ($self, $ev) = @_; 3658 my ($self, $ev) = @_;
2920 3659
2921 $self->_emit ("popdown"); 3660 $self->emit ("popdown");
2922 3661
2923 # maybe save $GRAB? must be careful about events... 3662 # maybe save $GRAB? must be careful about events...
2924 $GRAB = $self; 3663 $GRAB = $self;
2925 $self->{button} = $ev->{button}; 3664 $self->{button} = $ev->{button};
2926 3665
2927 $self->show; 3666 $self->show;
2928 $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);
2929} 3668}
2930 3669
2931sub mouse_motion { 3670sub invoke_mouse_motion {
2932 my ($self, $ev, $x, $y) = @_; 3671 my ($self, $ev, $x, $y) = @_;
2933 3672
2934 # TODO: should use vbox->find_widget or so 3673 # TODO: should use vbox->find_widget or so
2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3674 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936 $self->{hover} = $self->{item}{$HOVER}; 3675 $self->{hover} = $self->{item}{$HOVER};
2937 3676
2938 0 3677 0
2939} 3678}
2940 3679
2941sub button_up { 3680sub invoke_button_up {
2942 my ($self, $ev, $x, $y) = @_; 3681 my ($self, $ev, $x, $y) = @_;
2943 3682
2944 if ($ev->{button} == $self->{button}) { 3683 if ($ev->{button} == $self->{button}) {
2945 undef $GRAB; 3684 undef $GRAB;
2946 $self->hide; 3685 $self->hide;
2947 3686
2948 $self->_emit ("popdown"); 3687 $self->emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover}; 3688 $self->{hover}[1]->() if $self->{hover};
2950 } else { 3689 } else {
2951 return 0 3690 return 0
2952 } 3691 }
2953 3692
2954 1 3693 1
2955} 3694}
2956 3695
2957############################################################################# 3696#############################################################################
2958 3697
2959package CFClient::UI::Multiplexer; 3698package CFPlus::UI::Multiplexer;
2960 3699
2961our @ISA = CFClient::UI::Container::; 3700our @ISA = CFPlus::UI::Container::;
2962 3701
2963sub new { 3702sub new {
2964 my $class = shift; 3703 my $class = shift;
2965 3704
2966 my $self = $class->SUPER::new ( 3705 my $self = $class->SUPER::new (
… …
2980 3719
2981 $self->{current} = $self->{children}[0] 3720 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} }; 3721 if @{ $self->{children} };
2983} 3722}
2984 3723
3724sub get_current_page {
3725 my ($self) = @_;
3726
3727 $self->{current}
3728}
3729
2985sub set_current_page { 3730sub set_current_page {
2986 my ($self, $page_or_widget) = @_; 3731 my ($self, $page_or_widget) = @_;
2987 3732
2988 my $widget = ref $page_or_widget 3733 my $widget = ref $page_or_widget
2989 ? $page_or_widget 3734 ? $page_or_widget
2990 : $self->{children}[$page_or_widget]; 3735 : $self->{children}[$page_or_widget];
2991 3736
2992 $self->{current} = $widget; 3737 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3738 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994 3739
2995 $self->_emit (page_changed => $self->{current}); 3740 $self->emit (page_changed => $self->{current});
2996 3741
2997 $self->realloc; 3742 $self->realloc;
2998} 3743}
2999 3744
3000sub visible_children { 3745sub visible_children {
… …
3005 my ($self) = @_; 3750 my ($self) = @_;
3006 3751
3007 $self->{current}->size_request 3752 $self->{current}->size_request
3008} 3753}
3009 3754
3010sub size_allocate { 3755sub invoke_size_allocate {
3011 my ($self, $w, $h) = @_; 3756 my ($self, $w, $h) = @_;
3012 3757
3013 $self->{current}->configure (0, 0, $w, $h); 3758 $self->{current}->configure (0, 0, $w, $h);
3759
3760 1
3014} 3761}
3015 3762
3016sub _draw { 3763sub _draw {
3017 my ($self) = @_; 3764 my ($self) = @_;
3018 3765
3019 $self->{current}->draw; 3766 $self->{current}->draw;
3020} 3767}
3021 3768
3022############################################################################# 3769#############################################################################
3023 3770
3024package CFClient::UI::Notebook; 3771package CFPlus::UI::Notebook;
3025 3772
3026our @ISA = CFClient::UI::VBox::; 3773our @ISA = CFPlus::UI::VBox::;
3027 3774
3028sub new { 3775sub new {
3029 my $class = shift; 3776 my $class = shift;
3030 3777
3031 my $self = $class->SUPER::new ( 3778 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar), 3779 buttonbar => (new CFPlus::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3780 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self 3781 # filter => # will be put between multiplexer and $self
3035 @_, 3782 @_,
3036 ); 3783 );
3037 3784
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3785 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3042} 3789}
3043 3790
3044sub add { 3791sub add {
3045 my ($self, $title, $widget, $tooltip) = @_; 3792 my ($self, $title, $widget, $tooltip) = @_;
3046 3793
3047 Scalar::Util::weaken $self; 3794 CFPlus::weaken $self;
3048 3795
3049 $self->{buttonbar}->add (new CFClient::UI::Button 3796 $self->{buttonbar}->add (new CFPlus::UI::Button
3050 markup => $title, 3797 markup => $title,
3051 tooltip => $tooltip, 3798 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) }, 3799 on_activate => sub { $self->set_current_page ($widget) },
3053 ); 3800 );
3054 3801
3055 $self->{multiplexer}->add ($widget); 3802 $self->{multiplexer}->add ($widget);
3056} 3803}
3057 3804
3805sub get_current_page {
3806 my ($self) = @_;
3807
3808 $self->{multiplexer}->get_current_page
3809}
3810
3058sub set_current_page { 3811sub set_current_page {
3059 my ($self, $page) = @_; 3812 my ($self, $page) = @_;
3060 3813
3061 $self->{multiplexer}->set_current_page ($page); 3814 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current}); 3815 $self->emit (page_changed => $self->{multiplexer}{current});
3063} 3816}
3064 3817
3065############################################################################# 3818#############################################################################
3066 3819
3067package CFClient::UI::Statusbox; 3820package CFPlus::UI::Selector;
3068 3821
3822use utf8;
3823
3069our @ISA = CFClient::UI::VBox::; 3824our @ISA = CFPlus::UI::Button::;
3070 3825
3071sub new { 3826sub new {
3072 my $class = shift; 3827 my $class = shift;
3073 3828
3074 $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 (
3075 fontsize => 0.8, 3884 fontsize => 0.8,
3076 @_, 3885 @_,
3077 ) 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
3078} 3893}
3079 3894
3080sub reorder { 3895sub reorder {
3081 my ($self) = @_; 3896 my ($self) = @_;
3082 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} };
3083 3903
3084 while (my ($k, $v) = each %{ $self->{item} }) { 3904 while (my ($k, $v) = each %{ $self->{item} }) {
3085 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3905 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3086 } 3906 }
3087 3907
… …
3090 my @items = sort { 3910 my @items = sort {
3091 $a->{pri} <=> $b->{pri} 3911 $a->{pri} <=> $b->{pri}
3092 or $b->{id} <=> $a->{id} 3912 or $b->{id} <=> $a->{id}
3093 } values %{ $self->{item} }; 3913 } values %{ $self->{item} };
3094 3914
3915 $self->{timer}->interval (1);
3916
3095 my $count = 10 + 1; 3917 my $count = 10 + 1;
3096 for my $item (@items) { 3918 for my $item (@items) {
3097 last unless --$count; 3919 last unless --$count;
3098 3920
3099 push @widgets, $item->{label} ||= do { 3921 my $label = $item->{label} ||= do {
3100 # TODO: doesn't handle markup well (read as: at all) 3922 # TODO: doesn't handle markup well (read as: at all)
3101 my $short = $item->{count} > 1 3923 my $short = $item->{count} > 1
3102 ? "<b>$item->{count} ×</b> $item->{text}" 3924 ? "<b>$item->{count} ×</b> $item->{text}"
3103 : $item->{text}; 3925 : $item->{text};
3104 3926
3105 for ($short) { 3927 for ($short) {
3106 s/^\s+//; 3928 s/^\s+//;
3107 s/\s+/ /g; 3929 s/\s+/ /g;
3108 } 3930 }
3109 3931
3110 new CFClient::UI::Label 3932 new CFPlus::UI::Label
3111 markup => $short, 3933 markup => $short,
3112 tooltip => $item->{tooltip}, 3934 tooltip => $item->{tooltip},
3113 tooltip_font => $::FONT_PROP, 3935 tooltip_font => $::FONT_PROP,
3114 tooltip_width => 0.67, 3936 tooltip_width => 0.67,
3115 fontsize => $item->{fontsize} || $self->{fontsize}, 3937 fontsize => $item->{fontsize} || $self->{fontsize},
3116 max_w => $::WIDTH * 0.44, 3938 max_w => $::WIDTH * 0.44,
3117 fg => $item->{fg}, 3939 fg => [@{ $item->{fg} }],
3118 can_events => 1, 3940 can_events => 1,
3119 can_hover => 1 3941 can_hover => 1
3120 }; 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;
3121 } 3955 }
3122 3956
3123 $self->clear; 3957 $self->clear;
3124 $self->SUPER::add (reverse @widgets); 3958 $self->SUPER::add (reverse @widgets);
3125} 3959}
… …
3130 $text =~ s/^\s+//; 3964 $text =~ s/^\s+//;
3131 $text =~ s/\s+$//; 3965 $text =~ s/\s+$//;
3132 3966
3133 return unless $text; 3967 return unless $text;
3134 3968
3135 my $timeout = time + ((delete $arg{timeout}) || 60); 3969 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3136 3970
3137 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3971 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3138 3972
3139 if (my $item = $self->{item}{$group}) { 3973 if (my $item = $self->{item}{$group}) {
3140 if ($item->{text} eq $text) { 3974 if ($item->{text} eq $text) {
3141 $item->{count}++; 3975 $item->{count}++;
3142 } else { 3976 } else {
3143 $item->{count} = 1; 3977 $item->{count} = 1;
3144 $item->{text} = $item->{tooltip} = $text; 3978 $item->{text} = $item->{tooltip} = $text;
3145 } 3979 }
3146 $item->{id} = ++$self->{id}; 3980 $item->{id} += 0.2;#d#
3147 $item->{timeout} = $timeout; 3981 $item->{timeout} = $timeout;
3148 delete $item->{label}; 3982 delete $item->{label};
3149 } else { 3983 } else {
3150 $self->{item}{$group} = { 3984 $self->{item}{$group} = {
3151 id => ++$self->{id}, 3985 id => ++$self->{id},
… …
3157 count => 1, 3991 count => 1,
3158 %arg, 3992 %arg,
3159 }; 3993 };
3160 } 3994 }
3161 3995
3996 $ROOT->on_refresh (reorder => sub {
3162 $self->reorder; 3997 $self->reorder;
3998 });
3163} 3999}
3164 4000
3165sub reconfigure { 4001sub reconfigure {
3166 my ($self) = @_; 4002 my ($self) = @_;
3167 4003
… …
3170 4006
3171 $self->reorder; 4007 $self->reorder;
3172 $self->SUPER::reconfigure; 4008 $self->SUPER::reconfigure;
3173} 4009}
3174 4010
4011sub destroy {
4012 my ($self) = @_;
4013
4014 $self->{timer}->cancel;
4015
4016 $self->SUPER::destroy;
4017}
4018
3175############################################################################# 4019#############################################################################
3176 4020
3177package CFClient::UI::Inventory;
3178
3179our @ISA = CFClient::UI::ScrolledWindow::;
3180
3181sub new {
3182 my $class = shift;
3183
3184 my $self = $class->SUPER::new (
3185 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3186 @_,
3187 );
3188
3189 $self
3190}
3191
3192sub set_items {
3193 my ($self, $items) = @_;
3194
3195 $self->{child}->clear;
3196 return unless $items;
3197
3198 my @items = sort {
3199 ($a->{type} <=> $b->{type})
3200 or ($a->{name} cmp $b->{name})
3201 } @$items;
3202
3203 $self->{real_items} = \@items;
3204
3205 my $row = 0;
3206 for my $item (@items) {
3207 CFClient::Item::update_widgets $item;
3208
3209 $self->{child}->add (0, $row, $item->{face_widget});
3210 $self->{child}->add (1, $row, $item->{desc_widget});
3211 $self->{child}->add (2, $row, $item->{weight_widget});
3212
3213 $row++;
3214 }
3215}
3216
3217#############################################################################
3218
3219package CFClient::UI::BindEditor;
3220
3221our @ISA = CFClient::UI::FancyFrame::;
3222
3223sub new {
3224 my $class = shift;
3225
3226 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3227
3228 $self->add (my $vb = new CFClient::UI::VBox);
3229
3230
3231 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3232 text => "start recording",
3233 tooltip => "Start/Stops recording of actions."
3234 ."All subsequent actions after the recording started will be captured."
3235 ."The actions are displayed after the record was stopped."
3236 ."To bind the action you have to click on the 'Bind' button",
3237 on_activate => sub {
3238 unless ($self->{recording}) {
3239 $self->start;
3240 } else {
3241 $self->stop;
3242 }
3243 });
3244
3245 $vb->add (new CFClient::UI::Label text => "Actions:");
3246 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3247
3248 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3251 $hb->add (new CFClient::UI::Button
3252 text => "bind",
3253 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3254 on_activate => sub {
3255 $self->ask_for_bind;
3256 });
3257
3258 $vb->add (my $hb = new CFClient::UI::HBox);
3259 $hb->add (new CFClient::UI::Button
3260 text => "ok",
3261 expand => 1,
3262 tooltip => "This closes the binding editor and saves the binding",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->commit;
3266 });
3267
3268 $hb->add (new CFClient::UI::Button
3269 text => "cancel",
3270 expand => 1,
3271 tooltip => "This closes the binding editor without saving",
3272 on_activate => sub {
3273 $self->hide;
3274 $self->{binding_cancel}->()
3275 if $self->{binding_cancel};
3276 });
3277
3278 $self->update_binding_widgets;
3279
3280 $self
3281}
3282
3283sub commit {
3284 my ($self) = @_;
3285 my ($mod, $sym, $cmds) = $self->get_binding;
3286 if ($sym != 0 && @$cmds > 0) {
3287 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3288 ."'. Don't forget 'Save Config'!");
3289 $self->{binding_change}->($mod, $sym, $cmds)
3290 if $self->{binding_change};
3291 } else {
3292 $::STATUSBOX->add ("No action bound, no key or action specified!");
3293 $self->{binding_cancel}->()
3294 if $self->{binding_cancel};
3295 }
3296}
3297
3298sub start {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("stop recording");
3302 $self->{recording} = 1;
3303 $self->clear_command_list;
3304 $::CONN->start_record if $::CONN;
3305}
3306
3307sub stop {
3308 my ($self) = @_;
3309
3310 $self->{rec_btn}->set_text ("start recording");
3311 $self->{recording} = 0;
3312
3313 my $rec;
3314 $rec = $::CONN->stop_record if $::CONN;
3315 return unless ref $rec eq 'ARRAY';
3316 $self->set_command_list ($rec);
3317}
3318
3319
3320sub ask_for_bind_and_commit {
3321 my ($self) = @_;
3322 $self->ask_for_bind (1);
3323}
3324
3325sub ask_for_bind {
3326 my ($self, $commit) = @_;
3327
3328 CFClient::Binder::open_binding_dialog (sub {
3329 my ($mod, $sym) = @_;
3330 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3331 $self->update_binding_widgets;
3332 $self->commit if $commit;
3333 });
3334}
3335
3336# $mod and $sym are the modifiers and key symbol
3337# $cmds is a array ref of strings (the commands)
3338# $cb is the callback that is executed on OK
3339# $ccb is the callback that is executed on CANCEL and
3340# when the binding was unsuccessful on OK
3341sub set_binding {
3342 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3343
3344 $self->clear_command_list;
3345 $self->{recording} = 0;
3346 $self->{rec_btn}->set_text ("start recording");
3347
3348 $self->{binding} = [$mod, $sym];
3349 $self->{commands} = $cmds;
3350
3351 $self->{binding_change} = $cb;
3352 $self->{binding_cancel} = $ccb;
3353
3354 $self->update_binding_widgets;
3355}
3356
3357# this is a shortcut method that asks for a binding
3358# and then just binds it.
3359sub do_quick_binding {
3360 my ($self, $cmds) = @_;
3361 $self->set_binding (undef, undef, $cmds, sub {
3362 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3363 });
3364 $self->ask_for_bind (1);
3365}
3366
3367sub update_binding_widgets {
3368 my ($self) = @_;
3369 my ($mod, $sym, $cmds) = $self->get_binding;
3370 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3371 $self->set_command_list ($cmds);
3372}
3373
3374sub get_binding {
3375 my ($self) = @_;
3376 return (
3377 $self->{binding}->[0],
3378 $self->{binding}->[1],
3379 [ grep { defined $_ } @{$self->{commands}} ]
3380 );
3381}
3382
3383sub clear_command_list {
3384 my ($self) = @_;
3385 $self->{cmdbox}->clear ();
3386}
3387
3388sub set_command_list {
3389 my ($self, $cmds) = @_;
3390
3391 $self->{cmdbox}->clear ();
3392 $self->{commands} = $cmds;
3393
3394 my $idx = 0;
3395
3396 for (@$cmds) {
3397 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3398
3399 my $i = $idx;
3400 $hb->add (new CFClient::UI::Label text => $_);
3401 $hb->add (new CFClient::UI::Button
3402 text => "delete",
3403 tooltip => "Deletes the action from the record",
3404 on_activate => sub {
3405 $self->{cmdbox}->remove ($hb);
3406 $cmds->[$i] = undef;
3407 });
3408
3409
3410 $idx++
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::SpellList;
3417
3418our @ISA = CFClient::UI::Table::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (
3424 binding => [],
3425 commands => [],
3426 @_,
3427 )
3428}
3429
3430# XXX: Do sorting? Argl...
3431sub add_spell {
3432 my ($self, $spell) = @_;
3433 $self->{spells}->{$spell->{name}} = $spell;
3434
3435 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3436 face => $spell->{face},
3437 can_hover => 1,
3438 can_events => 1,
3439 tooltip => $spell->{message});
3440
3441 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => $spell->{name},
3443 can_hover => 1,
3444 can_events => 1,
3445 tooltip => $spell->{message},
3446 expand => 1);
3447
3448 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3450 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3451 expand => 1);
3452
3453 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3454 text => "bind to key",
3455 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3456}
3457
3458sub rebuild_spell_list {
3459 my ($self) = @_;
3460 $self->{tbl_idx} = 0;
3461 $self->add_spell ($_) for values %{$self->{spells}};
3462}
3463
3464sub remove_spell {
3465 my ($self, $spell) = @_;
3466 delete $self->{spells}->{$spell->{name}};
3467 $self->rebuild_spell_list;
3468}
3469
3470#############################################################################
3471
3472package CFClient::UI::Root; 4021package CFPlus::UI::Root;
3473 4022
3474our @ISA = CFClient::UI::Container::; 4023our @ISA = CFPlus::UI::Container::;
3475 4024
4025use List::Util qw(min max);
4026
3476use CFClient::OpenGL; 4027use CFPlus::OpenGL;
3477 4028
3478sub new { 4029sub new {
3479 my $class = shift; 4030 my $class = shift;
3480 4031
3481 my $self = $class->SUPER::new ( 4032 my $self = $class->SUPER::new (
3482 visible => 1, 4033 visible => 1,
3483 @_, 4034 @_,
3484 ); 4035 );
3485 4036
3486 Scalar::Util::weaken ($self->{root} = $self); 4037 CFPlus::weaken ($self->{root} = $self);
3487 4038
3488 $self 4039 $self
3489} 4040}
3490 4041
3491sub size_request { 4042sub size_request {
… …
3506 $coord = $max - $size if $coord > $max - $size; 4057 $coord = $max - $size if $coord > $max - $size;
3507 4058
3508 int $coord + 0.5 4059 int $coord + 0.5
3509} 4060}
3510 4061
3511sub size_allocate { 4062sub invoke_size_allocate {
3512 my ($self, $w, $h) = @_; 4063 my ($self, $w, $h) = @_;
3513 4064
3514 for my $child ($self->children) { 4065 for my $child ($self->children) {
3515 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)};
3516 4067
… …
3520 $X = _to_pixel $X, $W, $self->{w}; 4071 $X = _to_pixel $X, $W, $self->{w};
3521 $Y = _to_pixel $Y, $H, $self->{h}; 4072 $Y = _to_pixel $Y, $H, $self->{h};
3522 4073
3523 $child->configure ($X, $Y, $W, $H); 4074 $child->configure ($X, $Y, $W, $H);
3524 } 4075 }
4076
4077 1
3525} 4078}
3526 4079
3527sub coord2local { 4080sub coord2local {
3528 my ($self, $x, $y) = @_; 4081 my ($self, $x, $y) = @_;
3529 4082
… …
3614 4167
3615 delete $queue{$widget+0}; 4168 delete $queue{$widget+0};
3616 4169
3617 my ($w, $h) = $widget->size_request; 4170 my ($w, $h) = $widget->size_request;
3618 4171
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4172 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $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};
3621 4177
3622 $w = $widget->{force_w} if exists $widget->{force_w}; 4178 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h}; 4179 $h = $widget->{force_h} if exists $widget->{force_h};
3624 4180
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4181 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3652 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4208 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3653 4209
3654 $w = 0 if $w < 0; 4210 $w = 0 if $w < 0;
3655 $h = 0 if $h < 0; 4211 $h = 0 if $h < 0;
3656 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
3657 $w = int $w + 0.5; 4222 $w = int $w + 0.5;
3658 $h = int $h + 0.5; 4223 $h = int $h + 0.5;
3659 4224
3660 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}) {
3661 $widget->{old_w} = $widget->{w}; 4226 $widget->{old_w} = $widget->{w};
… …
3671 4236
3672 while ($self->{post_alloc_hook}) { 4237 while ($self->{post_alloc_hook}) {
3673 $_->() 4238 $_->()
3674 for values %{delete $self->{post_alloc_hook}}; 4239 for values %{delete $self->{post_alloc_hook}};
3675 } 4240 }
3676
3677 4241
3678 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4242 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3679 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4243 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3680 glClear GL_COLOR_BUFFER_BIT; 4244 glClear GL_COLOR_BUFFER_BIT;
3681 4245
… …
3684 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4248 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3685 glMatrixMode GL_MODELVIEW; 4249 glMatrixMode GL_MODELVIEW;
3686 glLoadIdentity; 4250 glLoadIdentity;
3687 4251
3688 { 4252 {
3689 package CFClient::UI::Base; 4253 package CFPlus::UI::Base;
3690 4254
3691 ($draw_x, $draw_y, $draw_w, $draw_h) = 4255 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3692 (0, 0, $self->{w}, $self->{h}); 4256 (0, 0, $self->{w}, $self->{h});
3693 }
3694 4257
3695 $self->_draw; 4258 $self->_draw;
4259 }
3696} 4260}
3697 4261
3698############################################################################# 4262#############################################################################
3699 4263
3700package CFClient::UI; 4264package CFPlus::UI;
3701 4265
3702$ROOT = new CFClient::UI::Root; 4266$ROOT = new CFPlus::UI::Root;
3703$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4267$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3704 4268
37051 42691
3706 4270

Diff Legend

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