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.354 by root, Sat Nov 18 23:31:23 2006 UTC

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

Diff Legend

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