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.270 by elmex, Fri Jun 2 09:02:49 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 {
399 # nop
400}
401
402sub visible_children {
403 $_[0]->children
376} 404}
377 405
378sub set_max_size { 406sub set_max_size {
379 my ($self, $w, $h) = @_; 407 my ($self, $w, $h) = @_;
380 408
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 409 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 410 $self->{max_h} = int $h if defined $h;
411
412 $self->realloc;
383} 413}
384 414
385sub set_tooltip { 415sub set_tooltip {
386 my ($self, $tooltip) = @_; 416 my ($self, $tooltip) = @_;
387 417
… …
390 420
391 return if $self->{tooltip} eq $tooltip; 421 return if $self->{tooltip} eq $tooltip;
392 422
393 $self->{tooltip} = $tooltip; 423 $self->{tooltip} = $tooltip;
394 424
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 425 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner}; 426 delete $CFPlus::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip; 427 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
398 } 428 }
399} 429}
400 430
401# translate global coordinates to local coordinate system 431# translate global coordinates to local coordinate system
402sub coord2local { 432sub coord2local {
403 my ($self, $x, $y) = @_; 433 my ($self, $x, $y) = @_;
404 434
435 Carp::confess unless $self->{parent};#d#
436
405 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 437 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
406} 438}
407 439
408# translate local coordinates to global coordinate system 440# translate local coordinates to global coordinate system
409sub coord2global { 441sub coord2global {
410 my ($self, $x, $y) = @_; 442 my ($self, $x, $y) = @_;
411 443
444 Carp::confess unless $self->{parent};#d#
445
412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 446 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
413} 447}
414 448
415sub focus_in { 449sub invoke_focus_in {
416 my ($self) = @_; 450 my ($self) = @_;
417 451
418 return if $FOCUS == $self; 452 return if $FOCUS == $self;
419 return unless $self->{can_focus}; 453 return unless $self->{can_focus};
420 454
421 my $focus = $FOCUS; $FOCUS = $self; 455 $FOCUS = $self;
422 456
423 $self->_emit (focus_in => $focus); 457 $self->update;
424 458
425 $focus->update if $focus; 459 0
426 $FOCUS->update;
427} 460}
428 461
429sub focus_out { 462sub invoke_focus_out {
430 my ($self) = @_; 463 my ($self) = @_;
431 464
432 return unless $FOCUS == $self; 465 return unless $FOCUS == $self;
433 466
434 my $focus = $FOCUS; undef $FOCUS; 467 undef $FOCUS;
435 468
436 $self->_emit (focus_out => $focus); 469 $self->update;
437 470
438 $focus->update if $focus; #?
439
440 $::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
441 unless $FOCUS; 472 unless $FOCUS;
442}
443 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
444sub mouse_motion { } 484sub invoke_mouse_motion { 0 }
445sub button_up { } 485sub invoke_button_up { 0 }
446sub key_down { } 486sub invoke_key_down { 0 }
447sub key_up { } 487sub invoke_key_up { 0 }
488sub invoke_mouse_wheel { 0 }
448 489
449sub button_down { 490sub invoke_button_down {
450 my ($self, $ev, $x, $y) = @_; 491 my ($self, $ev, $x, $y) = @_;
451 492
452 $self->focus_in; 493 $self->grab_focus;
494
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
453} 545}
454 546
455sub find_widget { 547sub find_widget {
456 my ($self, $x, $y) = @_; 548 my ($self, $x, $y) = @_;
457 549
… …
467sub set_parent { 559sub set_parent {
468 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
469 561
470 Scalar::Util::weaken ($self->{parent} = $parent); 562 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495} 564}
496 565
497sub realloc { 566sub realloc {
498 my ($self) = @_; 567 my ($self) = @_;
499 568
… …
532 return unless $self->{h} && $self->{w}; 601 return unless $self->{h} && $self->{w};
533 602
534 # update screen rectangle 603 # update screen rectangle
535 local $draw_x = $draw_x + $self->{x}; 604 local $draw_x = $draw_x + $self->{x};
536 local $draw_y = $draw_y + $self->{y}; 605 local $draw_y = $draw_y + $self->{y};
537 local $draw_w = $draw_x + $self->{w};
538 local $draw_h = $draw_y + $self->{h};
539 606
540 # skip widgets that are entirely outside the drawing area 607 # skip widgets that are entirely outside the drawing area
541 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
543 610
544 glPushMatrix; 611 glPushMatrix;
545 glTranslate $self->{x}, $self->{y}, 0; 612 glTranslate $self->{x}, $self->{y}, 0;
546 $self->_draw;
547 glPopMatrix;
548 613
549 if ($self == $HOVER && $self->{can_hover}) { 614 if ($self == $HOVER && $self->{can_hover}) {
550 my ($x, $y) = @$self{qw(x y)};
551
552 glColor 1, 0.8, 0.5, 0.2; 615 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
553 glEnable GL_BLEND; 616 glEnable GL_BLEND;
554 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 617 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
555 glBegin GL_QUADS; 618 glBegin GL_QUADS;
556 glVertex $x , $y; 619 glVertex 0 , 0;
557 glVertex $x + $self->{w}, $y; 620 glVertex $self->{w}, 0;
558 glVertex $x + $self->{w}, $y + $self->{h}; 621 glVertex $self->{w}, $self->{h};
559 glVertex $x , $y + $self->{h}; 622 glVertex 0 , $self->{h};
560 glEnd; 623 glEnd;
561 glDisable GL_BLEND; 624 glDisable GL_BLEND;
562 } 625 }
563 626
564 if ($ENV{CFPLUS_DEBUG} & 1) { 627 if ($ENV{CFPLUS_DEBUG} & 1) {
565 glPushMatrix; 628 glPushMatrix;
566 glColor 1, 1, 0, 1; 629 glColor 1, 1, 0, 1;
567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 630 glTranslate 0.375, 0.375;
568 glBegin GL_LINE_LOOP; 631 glBegin GL_LINE_LOOP;
569 glVertex 0 , 0; 632 glVertex 0 , 0;
570 glVertex $self->{w} - 1, 0; 633 glVertex $self->{w} - 1, 0;
571 glVertex $self->{w} - 1, $self->{h} - 1; 634 glVertex $self->{w} - 1, $self->{h} - 1;
572 glVertex 0 , $self->{h} - 1; 635 glVertex 0 , $self->{h} - 1;
573 glEnd; 636 glEnd;
574 glPopMatrix; 637 glPopMatrix;
575 #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;
576 } 639 }
640
641 $self->_draw;
642 glPopMatrix;
577} 643}
578 644
579sub _draw { 645sub _draw {
580 my ($self) = @_; 646 my ($self) = @_;
581 647
… …
583} 649}
584 650
585sub DESTROY { 651sub DESTROY {
586 my ($self) = @_; 652 my ($self) = @_;
587 653
654 return if CFPlus::in_destruct;
655
588 delete $WIDGET{$self+0}; 656 delete $WIDGET{$self+0};
589 #$self->deactivate; 657
658 eval { $self->destroy };
659 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
590} 660}
591 661
592############################################################################# 662#############################################################################
593 663
594package CFClient::UI::DrawBG; 664package CFPlus::UI::DrawBG;
595 665
596our @ISA = CFClient::UI::Base::; 666our @ISA = CFPlus::UI::Base::;
597 667
598use strict; 668use strict;
599use CFClient::OpenGL; 669use CFPlus::OpenGL;
600 670
601sub new { 671sub new {
602 my $class = shift; 672 my $class = shift;
603 673
604 # range [value, low, high, page] 674 # range [value, low, high, page]
… …
619 689
620 if ($color && (@$color < 4 || $color->[3])) { 690 if ($color && (@$color < 4 || $color->[3])) {
621 my ($w, $h) = @$self{qw(w h)}; 691 my ($w, $h) = @$self{qw(w h)};
622 692
623 glEnable GL_BLEND; 693 glEnable GL_BLEND;
624 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 694 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
625 glColor @$color; 695 glColor_premultiply @$color;
626 696
627 glBegin GL_QUADS; 697 glBegin GL_QUADS;
628 glVertex 0 , 0; 698 glVertex 0 , 0;
629 glVertex 0 , $h; 699 glVertex 0 , $h;
630 glVertex $w, $h; 700 glVertex $w, $h;
… …
635 } 705 }
636} 706}
637 707
638############################################################################# 708#############################################################################
639 709
640package CFClient::UI::Empty; 710package CFPlus::UI::Empty;
641 711
642our @ISA = CFClient::UI::Base::; 712our @ISA = CFPlus::UI::Base::;
643 713
644sub new { 714sub new {
645 my ($class, %arg) = @_; 715 my ($class, %arg) = @_;
646 $class->SUPER::new (can_events => 0, %arg); 716 $class->SUPER::new (can_events => 0, %arg);
647} 717}
… …
654 724
655sub draw { } 725sub draw { }
656 726
657############################################################################# 727#############################################################################
658 728
659package CFClient::UI::Container; 729package CFPlus::UI::Container;
660 730
661our @ISA = CFClient::UI::Base::; 731our @ISA = CFPlus::UI::Base::;
662 732
663sub new { 733sub new {
664 my ($class, %arg) = @_; 734 my ($class, %arg) = @_;
665 735
666 my $children = delete $arg{children} || []; 736 my $children = delete $arg{children};
667 737
668 my $self = $class->SUPER::new ( 738 my $self = $class->SUPER::new (
669 children => [], 739 children => [],
670 can_events => 0, 740 can_events => 0,
671 %arg, 741 %arg,
672 ); 742 );
743
673 $self->add ($_) for @$children; 744 $self->add (@$children)
745 if $children;
674 746
675 $self 747 $self
748}
749
750sub realloc {
751 my ($self) = @_;
752
753 $self->{force_realloc} = 1;
754 $self->{force_size_alloc} = 1;
755 $self->SUPER::realloc;
676} 756}
677 757
678sub add { 758sub add {
679 my ($self, @widgets) = @_; 759 my ($self, @widgets) = @_;
680 760
… …
726 $x -= $self->{x}; 806 $x -= $self->{x};
727 $y -= $self->{y}; 807 $y -= $self->{y};
728 808
729 my $res; 809 my $res;
730 810
731 for (reverse @{ $self->{children} }) { 811 for (reverse $self->visible_children) {
732 $res = $_->find_widget ($x, $y) 812 $res = $_->find_widget ($x, $y)
733 and return $res; 813 and return $res;
734 } 814 }
735 815
736 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 816 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
742 $_->draw for @{$self->{children}}; 822 $_->draw for @{$self->{children}};
743} 823}
744 824
745############################################################################# 825#############################################################################
746 826
747package CFClient::UI::Bin; 827package CFPlus::UI::Bin;
748 828
749our @ISA = CFClient::UI::Container::; 829our @ISA = CFPlus::UI::Container::;
750 830
751sub new { 831sub new {
752 my ($class, %arg) = @_; 832 my ($class, %arg) = @_;
753 833
754 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 834 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
755 835
756 $class->SUPER::new (children => [$child], %arg) 836 $class->SUPER::new (children => [$child], %arg)
757} 837}
758 838
759sub add { 839sub add {
760 my ($self, $child) = @_; 840 my ($self, $child) = @_;
761 841
762 $self->{children} = []; 842 $self->SUPER::remove ($_) for @{ $self->{children} };
763
764 $self->SUPER::add ($child); 843 $self->SUPER::add ($child);
765} 844}
766 845
767sub remove { 846sub remove {
768 my ($self, $widget) = @_; 847 my ($self, $widget) = @_;
769 848
770 $self->SUPER::remove ($widget); 849 $self->SUPER::remove ($widget);
771 850
772 $self->{children} = [new CFClient::UI::Empty] 851 $self->{children} = [new CFPlus::UI::Empty]
773 unless @{$self->{children}}; 852 unless @{$self->{children}};
774} 853}
775 854
776sub child { $_[0]->{children}[0] } 855sub child { $_[0]->{children}[0] }
777 856
778sub size_request { 857sub size_request {
779 $_[0]{children}[0]->size_request 858 $_[0]{children}[0]->size_request
780} 859}
781 860
782sub size_allocate { 861sub invoke_size_allocate {
783 my ($self, $w, $h) = @_; 862 my ($self, $w, $h) = @_;
784 863
785 $self->{children}[0]->configure (0, 0, $w, $h); 864 $self->{children}[0]->configure (0, 0, $w, $h);
865
866 1
786} 867}
787 868
788############################################################################# 869#############################################################################
789 870
871# back-buffered drawing area
872
790package CFClient::UI::Window; 873package CFPlus::UI::Window;
791 874
792our @ISA = CFClient::UI::Bin::; 875our @ISA = CFPlus::UI::Bin::;
793 876
794use CFClient::OpenGL; 877use CFPlus::OpenGL;
795 878
796sub new { 879sub new {
797 my ($class, %arg) = @_; 880 my ($class, %arg) = @_;
798 881
799 my $self = $class->SUPER::new (%arg); 882 my $self = $class->SUPER::new (%arg);
… …
804 887
805 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 888 $ROOT->on_post_alloc ($self => sub { $self->render_child });
806 $self->SUPER::update; 889 $self->SUPER::update;
807} 890}
808 891
809sub size_allocate { 892sub invoke_size_allocate {
810 my ($self, $w, $h) = @_; 893 my ($self, $w, $h) = @_;
811 894
812 $self->SUPER::size_allocate ($w, $h);
813 $self->update; 895 $self->update;
896
897 $self->SUPER::invoke_size_allocate ($w, $h)
814} 898}
815 899
816sub _render { 900sub _render {
817 my ($self) = @_; 901 my ($self) = @_;
818 902
… …
820} 904}
821 905
822sub render_child { 906sub render_child {
823 my ($self) = @_; 907 my ($self) = @_;
824 908
825 $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 {
826 glClearColor 0, 0, 0, 0; 910 glClearColor 0, 0, 0, 0;
827 glClear GL_COLOR_BUFFER_BIT; 911 glClear GL_COLOR_BUFFER_BIT;
828 912
829 { 913 {
830 package CFClient::UI::Base; 914 package CFPlus::UI::Base;
831 915
832 ($draw_x, $draw_y, $draw_w, $draw_h) = 916 local ($draw_x, $draw_y, $draw_w, $draw_h) =
833 (0, 0, $self->{w}, $self->{h}); 917 (0, 0, $self->{w}, $self->{h});
918
919 $self->_render;
834 } 920 }
835
836 $self->_render;
837 }; 921 };
838} 922}
839 923
840sub _draw { 924sub _draw {
841 my ($self) = @_; 925 my ($self) = @_;
842
843 my ($w, $h) = @$self{qw(w h)};
844 926
845 my $tex = $self->{texture} 927 my $tex = $self->{texture}
846 or return; 928 or return;
847 929
848 glEnable GL_TEXTURE_2D; 930 glEnable GL_TEXTURE_2D;
849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 931 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
850 glColor 1, 1, 1, 1; 932 glColor 0, 0, 0, 1;
851 933
852 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 934 $tex->draw_quad_alpha_premultiplied (0, 0);
853 935
854 glDisable GL_TEXTURE_2D; 936 glDisable GL_TEXTURE_2D;
855} 937}
856 938
857############################################################################# 939#############################################################################
858 940
859package CFClient::UI::ViewPort; 941package CFPlus::UI::ViewPort;
860 942
861our @ISA = CFClient::UI::Window::; 943our @ISA = CFPlus::UI::Window::;
862 944
863sub new { 945sub new {
864 my $class = shift; 946 my $class = shift;
865 947
866 $class->SUPER::new ( 948 $class->SUPER::new (
… …
879 $h = 10 if $self->{scroll_y}; 961 $h = 10 if $self->{scroll_y};
880 962
881 ($w, $h) 963 ($w, $h)
882} 964}
883 965
884sub size_allocate { 966sub invoke_size_allocate {
885 my ($self, $w, $h) = @_; 967 my ($self, $w, $h) = @_;
886 968
887 my $child = $self->child; 969 my $child = $self->child;
888 970
889 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 971 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
890 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 972 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
891 973
892 $self->child->configure (0, 0, $w, $h); 974 $self->child->configure (0, 0, $w, $h);
893 $self->update; 975 $self->update;
976
977 1
894} 978}
895 979
896sub set_offset { 980sub set_offset {
897 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
898 982
… …
924 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1008 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
925 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1009 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
926 ) { 1010 ) {
927 $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})
928 } else { 1012 } else {
929 $self->CFClient::UI::Base::find_widget ($x, $y) 1013 $self->CFPlus::UI::Base::find_widget ($x, $y)
930 } 1014 }
931} 1015}
932 1016
933sub _render { 1017sub _render {
934 my ($self) = @_; 1018 my ($self) = @_;
935 1019
936 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};
937 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};
938 1022
939 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1023 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
940 1024
941 $self->SUPER::_render; 1025 $self->SUPER::_render;
942} 1026}
943 1027
944############################################################################# 1028#############################################################################
945 1029
946package CFClient::UI::ScrolledWindow; 1030package CFPlus::UI::ScrolledWindow;
947 1031
948our @ISA = CFClient::UI::HBox::; 1032our @ISA = CFPlus::UI::HBox::;
949 1033
950sub new { 1034sub new {
951 my $class = shift; 1035 my ($class, %arg) = @_;
1036
1037 my $child = delete $arg{child};
952 1038
953 my $self; 1039 my $self;
954 1040
955 my $slider = new CFClient::UI::Slider 1041 my $slider = new CFPlus::UI::Slider
956 vertical => 1, 1042 vertical => 1,
957 range => [0, 0, 1, 0.01], # HACK fix 1043 range => [0, 0, 1, 0.01], # HACK fix
958 on_changed => sub { 1044 on_changed => sub {
959 $self->{vp}->set_offset (0, $_[1]); 1045 $self->{vp}->set_offset (0, $_[1]);
960 }, 1046 },
961 ; 1047 ;
962 1048
963 $self = $class->SUPER::new ( 1049 $self = $class->SUPER::new (
964 vp => (new CFClient::UI::ViewPort expand => 1), 1050 vp => (new CFPlus::UI::ViewPort expand => 1),
1051 can_events => 1,
965 slider => $slider, 1052 slider => $slider,
966 @_, 1053 %arg,
967 ); 1054 );
968 1055
969 $self->{vp}->add ($self->{scrolled});
970 $self->add ($self->{vp});
971 $self->add ($self->{slider}); 1056 $self->SUPER::add ($self->{vp}, $self->{slider});
1057 $self->add ($child) if $child;
972 1058
973 $self 1059 $self
974} 1060}
975 1061
1062#TODO# update range on size_allocate depending on child
1063
1064sub add {
1065 my ($self, $widget) = @_;
1066
1067 $self->{vp}->add ($self->{child} = $widget);
1068}
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
976sub update { 1086sub update {
977 my ($self) = @_; 1087 my ($self) = @_;
978 1088
979 $self->SUPER::update; 1089 $self->SUPER::update;
980 1090
981 # todo: overwrite size_allocate of child 1091 $self->update_slider;
982 my $child = $self->{vp}->child;
983 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
984} 1092}
985 1093
986sub size_allocate { 1094sub invoke_size_allocate {
987 my ($self, $w, $h) = @_; 1095 my ($self, $w, $h) = @_;
988 1096
1097 $self->update_slider;
1098
989 $self->SUPER::size_allocate ($w, $h); 1099 $self->SUPER::invoke_size_allocate ($w, $h)
990
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
993} 1100}
994
995#TODO# update range on size_allocate depending on child
996# update viewport offset on scroll
997 1101
998############################################################################# 1102#############################################################################
999 1103
1000package CFClient::UI::Frame; 1104package CFPlus::UI::Frame;
1001 1105
1002our @ISA = CFClient::UI::Bin::; 1106our @ISA = CFPlus::UI::Bin::;
1003 1107
1004use CFClient::OpenGL; 1108use CFPlus::OpenGL;
1005 1109
1006sub new { 1110sub new {
1007 my $class = shift; 1111 my $class = shift;
1008 1112
1009 $class->SUPER::new ( 1113 $class->SUPER::new (
… …
1017 1121
1018 if ($self->{bg}) { 1122 if ($self->{bg}) {
1019 my ($w, $h) = @$self{qw(w h)}; 1123 my ($w, $h) = @$self{qw(w h)};
1020 1124
1021 glEnable GL_BLEND; 1125 glEnable GL_BLEND;
1022 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1126 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1023 glColor @{ $self->{bg} }; 1127 glColor_premultiply @{ $self->{bg} };
1024 1128
1025 glBegin GL_QUADS; 1129 glBegin GL_QUADS;
1026 glVertex 0 , 0; 1130 glVertex 0 , 0;
1027 glVertex 0 , $h; 1131 glVertex 0 , $h;
1028 glVertex $w, $h; 1132 glVertex $w, $h;
… …
1035 $self->SUPER::_draw; 1139 $self->SUPER::_draw;
1036} 1140}
1037 1141
1038############################################################################# 1142#############################################################################
1039 1143
1040package CFClient::UI::FancyFrame; 1144package CFPlus::UI::FancyFrame;
1041 1145
1042our @ISA = CFClient::UI::Bin::; 1146our @ISA = CFPlus::UI::Bin::;
1043 1147
1044use CFClient::OpenGL; 1148use CFPlus::OpenGL;
1045
1046my $bg =
1047 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1048 mipmap => 1, wrap => 1;
1049
1050my @border =
1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1053 1149
1054sub new { 1150sub new {
1055 my ($class, %arg) = @_; 1151 my ($class, %arg) = @_;
1056 1152
1057 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) = @_;
1058 1260
1059 my $self = $class->SUPER::new ( 1261 my $self = $class->SUPER::new (
1060 bg => [1, 1, 1, 1], 1262 bg => [1, 1, 1, 1],
1061 border_bg => [1, 1, 1, 1], 1263 border_bg => [1, 1, 1, 1],
1062 border => 0.6, 1264 border => 0.6,
1063 can_events => 1, 1265 can_events => 1,
1064 min_w => 16, 1266 min_w => 64,
1065 min_h => 16, 1267 min_h => 32,
1066 %arg, 1268 %arg,
1067 ); 1269 );
1068 1270
1069 $self->{title} = new CFClient::UI::Label 1271 $self->{title_widget} = new CFPlus::UI::Label
1070 align => 0, 1272 align => 0,
1071 valign => 1, 1273 valign => 1,
1072 text => $title, 1274 text => $self->{title},
1073 fontsize => $self->{border} 1275 fontsize => $self->{border},
1074 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 }
1075 1286
1076 $self 1287 $self
1077} 1288}
1078 1289
1079sub add { 1290sub add {
1080 my ($self, @widgets) = @_; 1291 my ($self, @widgets) = @_;
1081 1292
1082 $self->SUPER::add (@widgets); 1293 $self->SUPER::add (@widgets);
1294 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1083 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1295 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1084} 1296}
1085 1297
1086sub border { 1298sub border {
1087 int $_[0]{border} * $::FONTSIZE 1299 int $_[0]{border} * $::FONTSIZE
1088} 1300}
1089 1301
1090sub size_request { 1302sub size_request {
1091 my ($self) = @_; 1303 my ($self) = @_;
1092 1304
1093 $self->{title}->size_request 1305 $self->{title_widget}->size_request
1094 if $self->{title}; 1306 if $self->{title_widget};
1307
1308 $self->{close_button}->size_request
1309 if $self->{close_button};
1095 1310
1096 my ($w, $h) = $self->SUPER::size_request; 1311 my ($w, $h) = $self->SUPER::size_request;
1097 1312
1098 ( 1313 (
1099 $w + $self->border * 2, 1314 $w + $self->border * 2,
1100 $h + $self->border * 2, 1315 $h + $self->border * 2,
1101 ) 1316 )
1102} 1317}
1103 1318
1104sub size_allocate { 1319sub invoke_size_allocate {
1105 my ($self, $w, $h) = @_; 1320 my ($self, $w, $h) = @_;
1106 1321
1107 if ($self->{title}) { 1322 if ($self->{title_widget}) {
1108 $self->{title}{w} = $w; 1323 $self->{title_widget}{w} = $w;
1109 $self->{title}{h} = $h; 1324 $self->{title_widget}{h} = $h;
1110 $self->{title}->size_allocate ($w, $h); 1325 $self->{title_widget}->invoke_size_allocate ($w, $h);
1111 } 1326 }
1112 1327
1113 my $border = $self->border; 1328 my $border = $self->border;
1114 1329
1115 $h -= List::Util::max 0, $border * 2; 1330 $h -= List::Util::max 0, $border * 2;
1116 $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;
1117 1345
1118 $self->child->configure ($border, $border, $w, $h); 1346 1
1119} 1347}
1120 1348
1121sub button_down { 1349sub invoke_button_down {
1122 my ($self, $ev, $x, $y) = @_; 1350 my ($self, $ev, $x, $y) = @_;
1123 1351
1124 my ($w, $h) = @$self{qw(w h)}; 1352 my ($w, $h) = @$self{qw(w h)};
1125 my $border = $self->border; 1353 my $border = $self->border;
1126 1354
… …
1142 my $dy = $ev->{y} - $oy; 1370 my $dy = $ev->{y} - $oy;
1143 1371
1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1372 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1373 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146 1374
1375 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1147 $self->realloc; 1376 $self->realloc;
1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149 }; 1377 };
1150 1378
1151 } elsif ($lr ^ $td) { 1379 } elsif ($lr ^ $td) {
1152 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1380 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1153 my ($bx, $by) = ($self->{x}, $self->{y}); 1381 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1156 my ($ev, $x, $y) = @_; 1384 my ($ev, $x, $y) = @_;
1157 1385
1158 ($x, $y) = ($ev->{x}, $ev->{y}); 1386 ($x, $y) = ($ev->{x}, $ev->{y});
1159 1387
1160 $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});
1161 }; 1391 };
1392 } else {
1393 return 0;
1394 }
1395
1162 } 1396 1
1163} 1397}
1164 1398
1165sub button_up { 1399sub invoke_button_up {
1166 my ($self, $ev, $x, $y) = @_; 1400 my ($self, $ev, $x, $y) = @_;
1167 1401
1168 delete $self->{motion}; 1402 ! ! delete $self->{motion}
1169} 1403}
1170 1404
1171sub mouse_motion { 1405sub invoke_mouse_motion {
1172 my ($self, $ev, $x, $y) = @_; 1406 my ($self, $ev, $x, $y) = @_;
1173 1407
1174 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1408 $self->{motion}->($ev, $x, $y) if $self->{motion};
1409
1410 ! ! $self->{motion}
1411}
1412
1413sub invoke_visibility_change {
1414 my ($self, $visible) = @_;
1415
1416 delete $self->{motion} unless $visible;
1417
1418 0
1175} 1419}
1176 1420
1177sub _draw { 1421sub _draw {
1178 my ($self) = @_; 1422 my ($self) = @_;
1179 1423
… …
1205 1449
1206 glDisable GL_TEXTURE_2D; 1450 glDisable GL_TEXTURE_2D;
1207 1451
1208 $child->draw; 1452 $child->draw;
1209 1453
1210 if ($self->{title}) { 1454 if ($self->{title_widget}) {
1211 glTranslate 0, $border - $self->{h}; 1455 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw; 1456 $self->{title_widget}->_draw;
1457
1458 glTranslate 0, - ($border - $self->{h});
1213 } 1459 }
1460
1461 $self->{close_button}->draw
1462 if $self->{close_button};
1214} 1463}
1215 1464
1216############################################################################# 1465#############################################################################
1217 1466
1218package CFClient::UI::Table; 1467package CFPlus::UI::Table;
1219 1468
1220our @ISA = CFClient::UI::Base::; 1469our @ISA = CFPlus::UI::Base::;
1221 1470
1222use List::Util qw(max sum); 1471use List::Util qw(max sum);
1223 1472
1224use CFClient::OpenGL; 1473use CFPlus::OpenGL;
1225 1474
1226sub new { 1475sub new {
1227 my $class = shift; 1476 my $class = shift;
1228 1477
1229 $class->SUPER::new ( 1478 $class->SUPER::new (
… …
1235sub children { 1484sub children {
1236 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1485 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1237} 1486}
1238 1487
1239sub add { 1488sub add {
1240 my ($self, $x, $y, $child) = @_; 1489 my ($self) = shift;
1241 1490
1491 while (@_) {
1492 my ($x, $y, $child) = splice @_, 0, 3, ();
1242 $child->set_parent ($self); 1493 $child->set_parent ($self);
1243 $self->{children}[$y][$x] = $child; 1494 $self->{children}[$y][$x] = $child;
1495 }
1244 1496
1497 $self->{force_realloc} = 1;
1498 $self->{force_size_alloc} = 1;
1245 $self->realloc; 1499 $self->realloc;
1500}
1501
1502sub remove {
1503 my ($self, $child) = @_;
1504
1505 # TODO: not yet implemented
1246} 1506}
1247 1507
1248# 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?
1249sub clear { 1509sub clear {
1250 my ($self) = @_; 1510 my ($self) = @_;
… …
1291 (sum @$ws), 1551 (sum @$ws),
1292 (sum @$hs), 1552 (sum @$hs),
1293 ) 1553 )
1294} 1554}
1295 1555
1296sub size_allocate { 1556sub invoke_size_allocate {
1297 my ($self, $w, $h) = @_; 1557 my ($self, $w, $h) = @_;
1298 1558
1299 my ($ws, $hs) = $self->get_wh; 1559 my ($ws, $hs) = $self->get_wh;
1300 1560
1301 my $req_w = (sum @$ws) || 1; 1561 my $req_w = (sum @$ws) || 1;
… …
1308 1568
1309 # linearly scale sizes 1569 # linearly scale sizes
1310 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1570 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1311 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1571 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1312 1572
1313 CFClient::UI::harmonize $ws; 1573 CFPlus::UI::harmonize $ws;
1314 CFClient::UI::harmonize $hs; 1574 CFPlus::UI::harmonize $hs;
1315 1575
1316 my $y; 1576 my $y;
1317 1577
1318 for my $r (0 .. $#{$self->{children}}) { 1578 for my $r (0 .. $#{$self->{children}}) {
1319 my $row = $self->{children}[$r] 1579 my $row = $self->{children}[$r]
… …
1333 } 1593 }
1334 1594
1335 $y += $row_h; 1595 $y += $row_h;
1336 } 1596 }
1337 1597
1598 1
1338} 1599}
1339 1600
1340sub find_widget { 1601sub find_widget {
1341 my ($self, $x, $y) = @_; 1602 my ($self, $x, $y) = @_;
1342 1603
… …
1361 } 1622 }
1362} 1623}
1363 1624
1364############################################################################# 1625#############################################################################
1365 1626
1366package CFClient::UI::Box; 1627package CFPlus::UI::Box;
1367 1628
1368our @ISA = CFClient::UI::Container::; 1629our @ISA = CFPlus::UI::Container::;
1369 1630
1370sub size_request { 1631sub size_request {
1371 my ($self) = @_; 1632 my ($self) = @_;
1372 1633
1373 $self->{vertical} 1634 $self->{vertical}
… …
1379 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1640 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1380 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1641 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1381 ) 1642 )
1382} 1643}
1383 1644
1384sub size_allocate { 1645sub invoke_size_allocate {
1385 my ($self, $w, $h) = @_; 1646 my ($self, $w, $h) = @_;
1386 1647
1387 my $space = $self->{vertical} ? $h : $w; 1648 my $space = $self->{vertical} ? $h : $w;
1388 my $children = $self->{children}; 1649 my @children = $self->visible_children;
1389 1650
1390 my @req; 1651 my @req;
1391 1652
1392 if ($self->{homogeneous}) { 1653 if ($self->{homogeneous}) {
1393 @req = ($space / (@$children || 1)) x @$children; 1654 @req = ($space / (@children || 1)) x @children;
1394 } else { 1655 } else {
1395 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1656 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1396 my $req = List::Util::sum @req; 1657 my $req = List::Util::sum @req;
1397 1658
1398 if ($req > $space) { 1659 if ($req > $space) {
1399 # ah well, not enough space 1660 # ah well, not enough space
1400 $_ *= $space / $req for @req; 1661 $_ *= $space / $req for @req;
1401 } else { 1662 } else {
1402 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1663 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1403 1664
1404 $space = ($space - $req) / $expand; # remaining space to give away 1665 $space = ($space - $req) / $expand; # remaining space to give away
1405 1666
1406 $req[$_] += $space * $children->[$_]{expand} 1667 $req[$_] += $space * $children[$_]{expand}
1407 for 0 .. $#$children; 1668 for 0 .. $#children;
1408 } 1669 }
1409 } 1670 }
1410 1671
1411 CFClient::UI::harmonize \@req; 1672 CFPlus::UI::harmonize \@req;
1412 1673
1413 my $pos = 0; 1674 my $pos = 0;
1414 for (0 .. $#$children) { 1675 for (0 .. $#children) {
1415 my $alloc = $req[$_]; 1676 my $alloc = $req[$_];
1416 $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));
1417 1678
1418 $pos += $alloc; 1679 $pos += $alloc;
1419 } 1680 }
1420 1681
1421 1 1682 1
1422} 1683}
1423 1684
1424############################################################################# 1685#############################################################################
1425 1686
1426package CFClient::UI::HBox; 1687package CFPlus::UI::HBox;
1427 1688
1428our @ISA = CFClient::UI::Box::; 1689our @ISA = CFPlus::UI::Box::;
1429 1690
1430sub new { 1691sub new {
1431 my $class = shift; 1692 my $class = shift;
1432 1693
1433 $class->SUPER::new ( 1694 $class->SUPER::new (
… …
1436 ) 1697 )
1437} 1698}
1438 1699
1439############################################################################# 1700#############################################################################
1440 1701
1441package CFClient::UI::VBox; 1702package CFPlus::UI::VBox;
1442 1703
1443our @ISA = CFClient::UI::Box::; 1704our @ISA = CFPlus::UI::Box::;
1444 1705
1445sub new { 1706sub new {
1446 my $class = shift; 1707 my $class = shift;
1447 1708
1448 $class->SUPER::new ( 1709 $class->SUPER::new (
… …
1451 ) 1712 )
1452} 1713}
1453 1714
1454############################################################################# 1715#############################################################################
1455 1716
1456package CFClient::UI::Label; 1717package CFPlus::UI::Label;
1457 1718
1458our @ISA = CFClient::UI::DrawBG::; 1719our @ISA = CFPlus::UI::DrawBG::;
1459 1720
1460use CFClient::OpenGL; 1721use CFPlus::OpenGL;
1461 1722
1462sub new { 1723sub new {
1463 my ($class, %arg) = @_; 1724 my ($class, %arg) = @_;
1464 1725
1465 my $self = $class->SUPER::new ( 1726 my $self = $class->SUPER::new (
… …
1468 #active_bg => none 1729 #active_bg => none
1469 #font => default_font 1730 #font => default_font
1470 #text => initial text 1731 #text => initial text
1471 #markup => initial narkup 1732 #markup => initial narkup
1472 #max_w => maximum pixel width 1733 #max_w => maximum pixel width
1734 #style => 0, # render flags
1473 ellipsise => 3, # end 1735 ellipsise => 3, # end
1474 layout => (new CFClient::Layout), 1736 layout => (new CFPlus::Layout),
1475 fontsize => 1, 1737 fontsize => 1,
1476 align => -1, 1738 align => -1,
1477 valign => -1, 1739 valign => -1,
1478 padding_x => 2, 1740 padding_x => 2,
1479 padding_y => 2, 1741 padding_y => 2,
1480 can_events => 0, 1742 can_events => 0,
1481 %arg 1743 %arg
1482 ); 1744 );
1483 1745
1484 if (exists $self->{template}) { 1746 if (exists $self->{template}) {
1485 my $layout = new CFClient::Layout; 1747 my $layout = new CFPlus::Layout;
1486 $layout->set_text (delete $self->{template}); 1748 $layout->set_text (delete $self->{template});
1487 $self->{template} = $layout; 1749 $self->{template} = $layout;
1488 } 1750 }
1489 1751
1490 if (exists $self->{markup}) { 1752 if (exists $self->{markup}) {
… …
1494 } 1756 }
1495 1757
1496 $self 1758 $self
1497} 1759}
1498 1760
1499sub escape($) {
1500 local $_ = $_[0];
1501
1502 s/&/&amp;/g;
1503 s/>/&gt;/g;
1504 s/</&lt;/g;
1505
1506 $_
1507}
1508
1509sub update { 1761sub update {
1510 my ($self) = @_; 1762 my ($self) = @_;
1511 1763
1512 delete $self->{texture}; 1764 delete $self->{texture};
1513 $self->SUPER::update; 1765 $self->SUPER::update;
1514} 1766}
1515 1767
1768sub realloc {
1769 my ($self) = @_;
1770
1771 delete $self->{ox};
1772 $self->SUPER::realloc;
1773}
1774
1516sub set_text { 1775sub set_text {
1517 my ($self, $text) = @_; 1776 my ($self, $text) = @_;
1518 1777
1519 return if $self->{text} eq "T$text"; 1778 return if $self->{text} eq "T$text";
1520 $self->{text} = "T$text"; 1779 $self->{text} = "T$text";
1521 1780
1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1523 $self->{layout}->set_text ($text); 1781 $self->{layout}->set_text ($text);
1524 1782
1783 delete $self->{size_req};
1525 $self->realloc; 1784 $self->realloc;
1526 $self->update; 1785 $self->update;
1527} 1786}
1528 1787
1529sub set_markup { 1788sub set_markup {
… …
1532 return if $self->{text} eq "M$markup"; 1791 return if $self->{text} eq "M$markup";
1533 $self->{text} = "M$markup"; 1792 $self->{text} = "M$markup";
1534 1793
1535 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1794 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1536 1795
1537 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1538 $self->{layout}->set_markup ($markup); 1796 $self->{layout}->set_markup ($markup);
1539 1797
1798 delete $self->{size_req};
1540 $self->realloc; 1799 $self->realloc;
1541 $self->update; 1800 $self->update;
1542} 1801}
1543 1802
1544sub size_request { 1803sub size_request {
1545 my ($self) = @_; 1804 my ($self) = @_;
1546 1805
1806 $self->{size_req} ||= do {
1547 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1807 $self->{layout}->set_font ($self->{font}) if $self->{font};
1548 $self->{layout}->set_width ($self->{max_w} || -1); 1808 $self->{layout}->set_width ($self->{max_w} || -1);
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1809 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1810 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1811 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1812
1553 my ($w, $h) = $self->{layout}->size; 1813 my ($w, $h) = $self->{layout}->size;
1554 1814
1555 if (exists $self->{template}) { 1815 if (exists $self->{template}) {
1556 $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);
1557 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1818 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1558 1819
1559 my ($w2, $h2) = $self->{template}->size; 1820 my ($w2, $h2) = $self->{template}->size;
1560 1821
1561 $w = List::Util::max $w, $w2; 1822 $w = List::Util::max $w, $w2;
1562 $h = List::Util::max $h, $h2; 1823 $h = List::Util::max $h, $h2;
1824 }
1825
1826 [$w, $h]
1563 } 1827 };
1564 1828
1565 ($w, $h) 1829 @{ $self->{size_req} }
1566} 1830}
1567 1831
1832sub baseline_shift {
1833 $_[0]{layout}->descent
1834}
1835
1568sub size_allocate { 1836sub invoke_size_allocate {
1569 my ($self, $w, $h) = @_; 1837 my ($self, $w, $h) = @_;
1570 1838
1571 delete $self->{ox}; 1839 delete $self->{ox};
1572 1840
1573 delete $self->{texture} 1841 delete $self->{texture}
1574 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
1575} 1845}
1576 1846
1577sub set_fontsize { 1847sub set_fontsize {
1578 my ($self, $fontsize) = @_; 1848 my ($self, $fontsize) = @_;
1579 1849
1580 $self->{fontsize} = $fontsize; 1850 $self->{fontsize} = $fontsize;
1851 delete $self->{size_req};
1581 delete $self->{texture}; 1852 delete $self->{texture};
1582 1853
1583 $self->realloc; 1854 $self->realloc;
1584} 1855}
1585 1856
1857sub reconfigure {
1858 my ($self) = @_;
1859
1860 delete $self->{size_req};
1861 delete $self->{texture};
1862
1863 $self->SUPER::reconfigure;
1864}
1865
1586sub _draw { 1866sub _draw {
1587 my ($self) = @_; 1867 my ($self) = @_;
1588 1868
1589 $self->SUPER::_draw; # draw background, if applicable 1869 $self->SUPER::_draw; # draw background, if applicable
1590 1870
1591 my $tex = $self->{texture} ||= do { 1871 my $size = $self->{texture} ||= do {
1592 $self->{layout}->set_foreground (@{$self->{fg}}); 1872 $self->{layout}->set_foreground (@{$self->{fg}});
1593 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1873 $self->{layout}->set_font ($self->{font}) if $self->{font};
1594 $self->{layout}->set_width ($self->{w}); 1874 $self->{layout}->set_width ($self->{w});
1595 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1875 $self->{layout}->set_ellipsise ($self->{ellipsise});
1596 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1876 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1877 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 1878
1599 new_from_layout CFClient::Texture $self->{layout} 1879 [$self->{layout}->size]
1600 }; 1880 };
1601 1881
1602 unless (exists $self->{ox}) { 1882 unless (exists $self->{ox}) {
1603 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1883 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1604 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1884 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1605 : ($self->{w} - $tex->{w}) * 0.5); 1885 : ($self->{w} - $size->[0]) * 0.5);
1606 1886
1607 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1887 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1608 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1888 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1609 : ($self->{h} - $tex->{h}) * 0.5); 1889 : ($self->{h} - $size->[1]) * 0.5);
1610 }; 1890 };
1611 1891
1612 glEnable GL_TEXTURE_2D; 1892 my $w = List::Util::min $self->{w} + 4, $size->[0];
1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1893 my $h = List::Util::min $self->{h} + 2, $size->[1];
1614 1894
1615 if ($tex->{format} == GL_ALPHA) { 1895 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1616 glColor @{$self->{fg}};
1617 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1618 } else {
1619 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1620 }
1621
1622 glDisable GL_TEXTURE_2D;
1623} 1896}
1624 1897
1625############################################################################# 1898#############################################################################
1626 1899
1627package CFClient::UI::EntryBase; 1900package CFPlus::UI::EntryBase;
1628 1901
1629our @ISA = CFClient::UI::Label::; 1902our @ISA = CFPlus::UI::Label::;
1630 1903
1631use CFClient::OpenGL; 1904use CFPlus::OpenGL;
1632 1905
1633sub new { 1906sub new {
1634 my $class = shift; 1907 my $class = shift;
1635 1908
1636 $class->SUPER::new ( 1909 $class->SUPER::new (
… …
1641 can_hover => 1, 1914 can_hover => 1,
1642 can_focus => 1, 1915 can_focus => 1,
1643 valign => 0, 1916 valign => 0,
1644 can_events => 1, 1917 can_events => 1,
1645 #text => ... 1918 #text => ...
1919 #hidden => "*",
1646 @_ 1920 @_
1647 ) 1921 )
1648} 1922}
1649 1923
1650sub _set_text { 1924sub _set_text {
… …
1652 1926
1653 delete $self->{cur_h}; 1927 delete $self->{cur_h};
1654 1928
1655 return if $self->{text} eq $text; 1929 return if $self->{text} eq $text;
1656 1930
1657 delete $self->{texture};
1658
1659 $self->{last_activity} = $::NOW; 1931 $self->{last_activity} = $::NOW;
1660 $self->{text} = $text; 1932 $self->{text} = $text;
1661 1933
1662 $text =~ s/./*/g if $self->{hidden}; 1934 $text =~ s/./*/g if $self->{hidden};
1663 $self->{layout}->set_text ("$text "); 1935 $self->{layout}->set_text ("$text ");
1936 delete $self->{size_req};
1664 1937
1665 $self->_emit (changed => $self->{text}); 1938 $self->emit (changed => $self->{text});
1939
1940 $self->realloc;
1941 $self->update;
1666} 1942}
1667 1943
1668sub set_text { 1944sub set_text {
1669 my ($self, $text) = @_; 1945 my ($self, $text) = @_;
1670 1946
1671 $self->{cursor} = length $text; 1947 $self->{cursor} = length $text;
1672 $self->_set_text ($text); 1948 $self->_set_text ($text);
1673
1674 $self->realloc;
1675} 1949}
1676 1950
1677sub get_text { 1951sub get_text {
1678 $_[0]{text} 1952 $_[0]{text}
1679} 1953}
… …
1684 my ($w, $h) = $self->SUPER::size_request; 1958 my ($w, $h) = $self->SUPER::size_request;
1685 1959
1686 ($w + 1, $h) # add 1 for cursor 1960 ($w + 1, $h) # add 1 for cursor
1687} 1961}
1688 1962
1689sub key_down { 1963sub invoke_key_down {
1690 my ($self, $ev) = @_; 1964 my ($self, $ev) = @_;
1691 1965
1692 my $mod = $ev->{mod}; 1966 my $mod = $ev->{mod};
1693 my $sym = $ev->{sym}; 1967 my $sym = $ev->{sym};
1694 my $uni = $ev->{unicode}; 1968 my $uni = $ev->{unicode};
… …
1697 1971
1698 if ($uni == 8) { 1972 if ($uni == 8) {
1699 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1700 } elsif ($uni == 127) { 1974 } elsif ($uni == 127) {
1701 substr $text, $self->{cursor}, 1, ""; 1975 substr $text, $self->{cursor}, 1, "";
1702 } elsif ($sym == CFClient::SDLK_LEFT) { 1976 } elsif ($sym == CFPlus::SDLK_LEFT) {
1703 --$self->{cursor} if $self->{cursor}; 1977 --$self->{cursor} if $self->{cursor};
1704 } elsif ($sym == CFClient::SDLK_RIGHT) { 1978 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1705 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1979 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1706 } elsif ($sym == CFClient::SDLK_HOME) { 1980 } elsif ($sym == CFPlus::SDLK_HOME) {
1707 $self->{cursor} = 0; 1981 $self->{cursor} = 0;
1708 } elsif ($sym == CFClient::SDLK_END) { 1982 } elsif ($sym == CFPlus::SDLK_END) {
1709 $self->{cursor} = length $text; 1983 $self->{cursor} = length $text;
1984 } elsif ($uni == 21) { # ctrl-u
1985 $text = "";
1986 $self->{cursor} = 0;
1710 } elsif ($uni == 27) { 1987 } elsif ($uni == 27) {
1711 $self->_emit ('escape'); 1988 $self->emit ('escape');
1712 } elsif ($uni) { 1989 } elsif ($uni) {
1713 substr $text, $self->{cursor}++, 0, chr $uni; 1990 substr $text, $self->{cursor}++, 0, chr $uni;
1991 } else {
1992 return 0;
1714 } 1993 }
1715 1994
1716 $self->_set_text ($text); 1995 $self->_set_text ($text);
1717 1996
1718 $self->realloc; 1997 $self->realloc;
1719}
1720 1998
1999 1
2000}
2001
1721sub focus_in { 2002sub invoke_focus_in {
1722 my ($self) = @_; 2003 my ($self) = @_;
1723 2004
1724 $self->{last_activity} = $::NOW; 2005 $self->{last_activity} = $::NOW;
1725 2006
1726 $self->SUPER::focus_in; 2007 $self->SUPER::invoke_focus_in
1727} 2008}
1728 2009
1729sub button_down { 2010sub invoke_button_down {
1730 my ($self, $ev, $x, $y) = @_; 2011 my ($self, $ev, $x, $y) = @_;
1731 2012
1732 $self->SUPER::button_down ($ev, $x, $y); 2013 $self->SUPER::invoke_button_down ($ev, $x, $y);
1733 2014
1734 my $idx = $self->{layout}->xy_to_index ($x, $y); 2015 my $idx = $self->{layout}->xy_to_index ($x, $y);
1735 2016
1736 # byte-index to char-index 2017 # byte-index to char-index
1737 my $text = $self->{text}; 2018 my $text = $self->{text};
1738 utf8::encode $text; 2019 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1739 $self->{cursor} = length substr $text, 0, $idx; 2020 $self->{cursor} = length $text;
1740 2021
1741 $self->_set_text ($self->{text}); 2022 $self->_set_text ($self->{text});
1742 $self->update; 2023 $self->update;
2024
2025 1
1743} 2026}
1744 2027
1745sub mouse_motion { 2028sub invoke_mouse_motion {
1746 my ($self, $ev, $x, $y) = @_; 2029 my ($self, $ev, $x, $y) = @_;
1747# 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#
2031
2032 1
1748} 2033}
1749 2034
1750sub _draw { 2035sub _draw {
1751 my ($self) = @_; 2036 my ($self) = @_;
1752 2037
1753 local $self->{fg} = $self->{fg}; 2038 local $self->{fg} = $self->{fg};
1754 2039
1755 if ($FOCUS == $self) { 2040 if ($FOCUS == $self) {
1756 glColor @{$self->{active_bg}}; 2041 glColor_premultiply @{$self->{active_bg}};
1757 $self->{fg} = $self->{active_fg}; 2042 $self->{fg} = $self->{active_fg};
1758 } else { 2043 } else {
1759 glColor @{$self->{bg}}; 2044 glColor_premultiply @{$self->{bg}};
1760 } 2045 }
1761 2046
1762 glEnable GL_BLEND; 2047 glEnable GL_BLEND;
1763 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2048 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1764 glBegin GL_QUADS; 2049 glBegin GL_QUADS;
1765 glVertex 0 , 0; 2050 glVertex 0 , 0;
1766 glVertex 0 , $self->{h}; 2051 glVertex 0 , $self->{h};
1767 glVertex $self->{w}, $self->{h}; 2052 glVertex $self->{w}, $self->{h};
1768 glVertex $self->{w}, 0; 2053 glVertex $self->{w}, 0;
… …
1779 utf8::encode $text; 2064 utf8::encode $text;
1780 2065
1781 @$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)
1782 } 2067 }
1783 2068
1784 glColor @{$self->{fg}};
1785 glBegin GL_LINES; 2069 glBegin GL_LINES;
1786 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};
1787 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};
1788 glEnd; 2072 glEnd;
1789 } 2073 }
1790} 2074}
1791 2075
1792package CFClient::UI::Entry; 2076package CFPlus::UI::Entry;
1793 2077
1794our @ISA = CFClient::UI::EntryBase::; 2078our @ISA = CFPlus::UI::EntryBase::;
1795 2079
1796use CFClient::OpenGL; 2080use CFPlus::OpenGL;
1797 2081
1798sub key_down { 2082sub invoke_key_down {
1799 my ($self, $ev) = @_; 2083 my ($self, $ev) = @_;
1800 2084
1801 my $sym = $ev->{sym}; 2085 my $sym = $ev->{sym};
1802 2086
1803 if ($sym == 13) { 2087 if ($sym == 13) {
1804 unshift @{$self->{history}}, 2088 unshift @{$self->{history}},
1805 my $txt = $self->get_text; 2089 my $txt = $self->get_text;
2090
1806 $self->{history_pointer} = -1; 2091 $self->{history_pointer} = -1;
1807 $self->{history_saveback} = ''; 2092 $self->{history_saveback} = '';
1808 $self->_emit (activate => $txt); 2093 $self->emit (activate => $txt);
1809 $self->update; 2094 $self->update;
1810 2095
1811 } elsif ($sym == CFClient::SDLK_UP) { 2096 } elsif ($sym == CFPlus::SDLK_UP) {
1812 if ($self->{history_pointer} < 0) { 2097 if ($self->{history_pointer} < 0) {
1813 $self->{history_saveback} = $self->get_text; 2098 $self->{history_saveback} = $self->get_text;
1814 } 2099 }
1815 if (@{$self->{history} || []} > 0) { 2100 if (@{$self->{history} || []} > 0) {
1816 $self->{history_pointer}++; 2101 $self->{history_pointer}++;
… …
1818 $self->{history_pointer} = @{$self->{history} || []} - 1; 2103 $self->{history_pointer} = @{$self->{history} || []} - 1;
1819 } 2104 }
1820 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2105 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1821 } 2106 }
1822 2107
1823 } elsif ($sym == CFClient::SDLK_DOWN) { 2108 } elsif ($sym == CFPlus::SDLK_DOWN) {
1824 $self->{history_pointer}--; 2109 $self->{history_pointer}--;
1825 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2110 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1826 2111
1827 if ($self->{history_pointer} >= 0) { 2112 if ($self->{history_pointer} >= 0) {
1828 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2113 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1829 } else { 2114 } else {
1830 $self->set_text ($self->{history_saveback}); 2115 $self->set_text ($self->{history_saveback});
1831 } 2116 }
1832 2117
1833 } else { 2118 } else {
1834 $self->SUPER::key_down ($ev); 2119 return $self->SUPER::invoke_key_down ($ev)
2120 }
2121
1835 } 2122 1
1836
1837} 2123}
1838 2124
1839############################################################################# 2125#############################################################################
1840 2126
1841package CFClient::UI::Button; 2127package CFPlus::UI::Button;
1842 2128
1843our @ISA = CFClient::UI::Label::; 2129our @ISA = CFPlus::UI::Label::;
1844 2130
1845use CFClient::OpenGL; 2131use CFPlus::OpenGL;
1846 2132
1847my @tex = 2133my @tex =
1848 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2134 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1849 qw(b1_button_active.png); 2135 qw(b1_button_active.png);
1850 2136
1851sub new { 2137sub new {
1852 my $class = shift; 2138 my $class = shift;
1853 2139
… …
1862 can_events => 1, 2148 can_events => 1,
1863 @_ 2149 @_
1864 ) 2150 )
1865} 2151}
1866 2152
1867sub activate { }
1868
1869sub button_up { 2153sub invoke_button_up {
1870 my ($self, $ev, $x, $y) = @_; 2154 my ($self, $ev, $x, $y) = @_;
1871 2155
1872 $self->emit ("activate") 2156 $self->emit ("activate")
1873 if $x >= 0 && $x < $self->{w} 2157 if $x >= 0 && $x < $self->{w}
1874 && $y >= 0 && $y < $self->{h}; 2158 && $y >= 0 && $y < $self->{h};
2159
2160 1
1875} 2161}
1876 2162
1877sub _draw { 2163sub _draw {
1878 my ($self) = @_; 2164 my ($self) = @_;
1879 2165
1880 local $self->{fg} = $self->{fg}; 2166 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1881
1882 if ($GRAB == $self) {
1883 $self->{fg} = $self->{active_fg};
1884 }
1885 2167
1886 glEnable GL_TEXTURE_2D; 2168 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2169 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 glColor 0, 0, 0, 1; 2170 glColor 0, 0, 0, 1;
1889 2171
… …
1894 $self->SUPER::_draw; 2176 $self->SUPER::_draw;
1895} 2177}
1896 2178
1897############################################################################# 2179#############################################################################
1898 2180
1899package CFClient::UI::CheckBox; 2181package CFPlus::UI::CheckBox;
1900 2182
1901our @ISA = CFClient::UI::DrawBG::; 2183our @ISA = CFPlus::UI::DrawBG::;
1902 2184
1903my @tex = 2185my @tex =
1904 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2186 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1905 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2187 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1906 2188
1907use CFClient::OpenGL; 2189use CFPlus::OpenGL;
1908 2190
1909sub new { 2191sub new {
1910 my $class = shift; 2192 my $class = shift;
1911 2193
1912 $class->SUPER::new ( 2194 $class->SUPER::new (
… …
1926 my ($self) = @_; 2208 my ($self) = @_;
1927 2209
1928 (6) x 2 2210 (6) x 2
1929} 2211}
1930 2212
2213sub toggle {
2214 my ($self) = @_;
2215
2216 $self->{state} = !$self->{state};
2217 $self->emit (changed => $self->{state});
2218 $self->update;
2219}
2220
1931sub button_down { 2221sub invoke_button_down {
1932 my ($self, $ev, $x, $y) = @_; 2222 my ($self, $ev, $x, $y) = @_;
1933 2223
1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2224 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2225 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1936 $self->{state} = !$self->{state}; 2226 $self->toggle;
1937 $self->_emit (changed => $self->{state}); 2227 } else {
2228 return 0
2229 }
2230
1938 } 2231 1
1939} 2232}
1940 2233
1941sub _draw { 2234sub _draw {
1942 my ($self) = @_; 2235 my ($self) = @_;
1943 2236
… …
1958 glDisable GL_TEXTURE_2D; 2251 glDisable GL_TEXTURE_2D;
1959} 2252}
1960 2253
1961############################################################################# 2254#############################################################################
1962 2255
1963package CFClient::UI::Image; 2256package CFPlus::UI::Image;
1964 2257
1965our @ISA = CFClient::UI::Base::; 2258our @ISA = CFPlus::UI::Base::;
1966 2259
1967use CFClient::OpenGL; 2260use CFPlus::OpenGL;
1968use Carp qw/confess/;
1969 2261
1970our %loaded_images; 2262our %texture_cache;
1971 2263
1972sub new { 2264sub new {
1973 my $class = shift; 2265 my $class = shift;
1974 2266
1975 my $self = $class->SUPER::new (can_events => 0, @_); 2267 my $self = $class->SUPER::new (
2268 can_events => 0,
2269 @_,
2270 );
1976 2271
1977 $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";
1978 2274
1979 $loaded_images{$self->{image}} ||= 2275 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1980 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;
1981 2277
1982 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2278 Scalar::Util::weaken $texture_cache{$self->{path}};
1983 2279
1984 Scalar::Util::weaken $loaded_images{$self->{image}}; 2280 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1985
1986 $self->{aspect} = $tex->{w} / $tex->{h};
1987 2281
1988 $self 2282 $self
1989} 2283}
1990 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
1991sub size_request { 2300sub size_request {
1992 my ($self) = @_; 2301 my ($self) = @_;
1993 2302
1994 ($self->{tex}->{w}, $self->{tex}->{h}) 2303 ($self->{tex}{w}, $self->{tex}{h})
1995} 2304}
1996 2305
1997sub _draw { 2306sub _draw {
1998 my ($self) = @_; 2307 my ($self) = @_;
1999 2308
… …
2009 } 2318 }
2010 2319
2011 glEnable GL_TEXTURE_2D; 2320 glEnable GL_TEXTURE_2D;
2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2321 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013 2322
2014 $tex->draw_quad_alpha (0, 0, $w, $h); 2323 $tex->draw_quad (0, 0, $w, $h);
2015 2324
2016 glDisable GL_TEXTURE_2D; 2325 glDisable GL_TEXTURE_2D;
2017} 2326}
2018 2327
2019############################################################################# 2328#############################################################################
2020 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
2021package CFClient::UI::VGauge; 2366package CFPlus::UI::VGauge;
2022 2367
2023our @ISA = CFClient::UI::Base::; 2368our @ISA = CFPlus::UI::Base::;
2024 2369
2025use List::Util qw(min max); 2370use List::Util qw(min max);
2026 2371
2027use CFClient::OpenGL; 2372use CFPlus::OpenGL;
2028 2373
2029my %tex = ( 2374my %tex = (
2030 food => [ 2375 food => [
2031 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2376 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2032 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2377 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2033 ], 2378 ],
2034 grace => [ 2379 grace => [
2035 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2380 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2036 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/
2037 ], 2382 ],
2038 hp => [ 2383 hp => [
2039 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2384 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2040 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2385 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2041 ], 2386 ],
2042 mana => [ 2387 mana => [
2043 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2388 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2044 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/
2045 ], 2390 ],
2046); 2391);
2047 2392
2048# eg. VGauge->new (gauge => 'food'), default gauge: food 2393# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2108 my $ycut1 = max 0, min 1, $ycut; 2453 my $ycut1 = max 0, min 1, $ycut;
2109 my $ycut2 = max 0, min 1, $ycut - 1; 2454 my $ycut2 = max 0, min 1, $ycut - 1;
2110 2455
2111 my $h1 = $self->{h} * (1 - $ycut1); 2456 my $h1 = $self->{h} * (1 - $ycut1);
2112 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);
2113 2461
2114 glEnable GL_BLEND; 2462 glEnable GL_BLEND;
2115 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;
2116 glEnable GL_TEXTURE_2D; 2465 glEnable GL_TEXTURE_2D;
2117 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2466 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118 2467
2119 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2468 glBindTexture GL_TEXTURE_2D, $t1->{name};
2120 glBegin GL_QUADS; 2469 glBegin GL_QUADS;
… …
2135 2484
2136 if ($t3) { 2485 if ($t3) {
2137 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2486 glBindTexture GL_TEXTURE_2D, $t3->{name};
2138 glBegin GL_QUADS; 2487 glBegin GL_QUADS;
2139 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2488 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2140 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2489 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2141 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2490 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2142 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2491 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2143 glEnd; 2492 glEnd;
2144 } 2493 }
2145 2494
2146 glDisable GL_BLEND; 2495 glDisable GL_BLEND;
2147 glDisable GL_TEXTURE_2D; 2496 glDisable GL_TEXTURE_2D;
2148} 2497}
2149 2498
2150############################################################################# 2499#############################################################################
2151 2500
2152package CFClient::UI::Gauge; 2501package CFPlus::UI::Gauge;
2153 2502
2154our @ISA = CFClient::UI::VBox::; 2503our @ISA = CFPlus::UI::VBox::;
2155 2504
2156sub new { 2505sub new {
2157 my ($class, %arg) = @_; 2506 my ($class, %arg) = @_;
2158 2507
2159 my $self = $class->SUPER::new ( 2508 my $self = $class->SUPER::new (
… …
2161 can_hover => 1, 2510 can_hover => 1,
2162 can_events => 1, 2511 can_events => 1,
2163 %arg, 2512 %arg,
2164 ); 2513 );
2165 2514
2166 $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");
2167 $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);
2168 $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");
2169 2518
2170 $self 2519 $self
2171} 2520}
2172 2521
2173sub set_fontsize { 2522sub set_fontsize {
… …
2194 $self->{value}->set_text ($val); 2543 $self->{value}->set_text ($val);
2195} 2544}
2196 2545
2197############################################################################# 2546#############################################################################
2198 2547
2199package CFClient::UI::Slider; 2548package CFPlus::UI::Slider;
2200 2549
2201use strict; 2550use strict;
2202 2551
2203use CFClient::OpenGL; 2552use CFPlus::OpenGL;
2204 2553
2205our @ISA = CFClient::UI::DrawBG::; 2554our @ISA = CFPlus::UI::DrawBG::;
2206 2555
2207my @tex = 2556my @tex =
2208 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2557 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2209 qw(s1_slider.png s1_slider_bg.png); 2558 qw(s1_slider.png s1_slider_bg.png);
2210 2559
2211sub new { 2560sub new {
2212 my $class = shift; 2561 my $class = shift;
2213 2562
… …
2234 $self->update; 2583 $self->update;
2235 2584
2236 $self 2585 $self
2237} 2586}
2238 2587
2239sub changed { }
2240
2241sub set_range { 2588sub set_range {
2242 my ($self, $range) = @_; 2589 my ($self, $range) = @_;
2243 2590
2244 ($range, $self->{range}) = ($self->{range}, $range); 2591 ($range, $self->{range}) = ($self->{range}, $range);
2245 2592
2246 $self->update
2247 if "@$range" ne "@{$self->{range}}"; 2593 if ("@$range" ne "@{$self->{range}}") {
2594 $self->update;
2595 $self->set_value ($self->{range}[0]);
2596 }
2248} 2597}
2249 2598
2250sub set_value { 2599sub set_value {
2251 my ($self, $value) = @_; 2600 my ($self, $value) = @_;
2252 2601
… …
2263 if $unit; 2612 if $unit;
2264 2613
2265 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2614 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2266 2615
2267 if ($value != $old_value) { 2616 if ($value != $old_value) {
2268 $self->_emit (changed => $value); 2617 $self->emit (changed => $value);
2269 $self->update; 2618 $self->update;
2270 } 2619 }
2271} 2620}
2272 2621
2273sub size_request { 2622sub size_request {
2274 my ($self) = @_; 2623 my ($self) = @_;
2275 2624
2276 ($self->{req_w}, $self->{req_h}) 2625 ($self->{req_w}, $self->{req_h})
2277} 2626}
2278 2627
2279sub button_down { 2628sub invoke_button_down {
2280 my ($self, $ev, $x, $y) = @_; 2629 my ($self, $ev, $x, $y) = @_;
2281 2630
2282 $self->SUPER::button_down ($ev, $x, $y); 2631 $self->SUPER::invoke_button_down ($ev, $x, $y);
2283 2632
2284 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2633 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285 2634
2286 $self->mouse_motion ($ev, $x, $y); 2635 $self->invoke_mouse_motion ($ev, $x, $y)
2287} 2636}
2288 2637
2289sub mouse_motion { 2638sub invoke_mouse_motion {
2290 my ($self, $ev, $x, $y) = @_; 2639 my ($self, $ev, $x, $y) = @_;
2291 2640
2292 if ($GRAB == $self) { 2641 if ($GRAB == $self) {
2293 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2642 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2294 2643
2295 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2644 my (undef, $lo, $hi, $page) = @{$self->{range}};
2296 2645
2297 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2646 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298 2647
2299 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2648 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2649 } else {
2650 return 0;
2651 }
2652
2300 } 2653 1
2654}
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
2301} 2664}
2302 2665
2303sub update { 2666sub update {
2304 my ($self) = @_; 2667 my ($self) = @_;
2305 2668
2306 $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}) {
2307 $self->set_value ($self->{range}[0]); 2677 $self->set_value ($self->{range}[0]);
2308 2678
2309 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2679 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100; 2680 my $range = ($hi - $page - $lo) || 1e-100;
2311 2681
… …
2317 $value = ($value - $lo) / $range; 2687 $value = ($value - $lo) / $range;
2318 $value = $value * $self->{scale} + $self->{offset}; 2688 $value = $value * $self->{scale} + $self->{offset};
2319 2689
2320 $self->{knob_x} = $value - $knob_w * 0.5; 2690 $self->{knob_x} = $value - $knob_w * 0.5;
2321 $self->{knob_w} = $knob_w; 2691 $self->{knob_w} = $knob_w;
2322 }); 2692 }
2323
2324 $self->SUPER::update;
2325}
2326
2327sub _draw {
2328 my ($self) = @_;
2329 2693
2330 $self->SUPER::_draw (); 2694 $self->SUPER::_draw ();
2331 2695
2332 glScale $self->{w}, $self->{h}; 2696 glScale $self->{w}, $self->{h};
2333 2697
… …
2353 glDisable GL_TEXTURE_2D; 2717 glDisable GL_TEXTURE_2D;
2354} 2718}
2355 2719
2356############################################################################# 2720#############################################################################
2357 2721
2358package CFClient::UI::ValSlider; 2722package CFPlus::UI::ValSlider;
2359 2723
2360our @ISA = CFClient::UI::HBox::; 2724our @ISA = CFPlus::UI::HBox::;
2361 2725
2362sub new { 2726sub new {
2363 my ($class, %arg) = @_; 2727 my ($class, %arg) = @_;
2364 2728
2365 my $range = delete $arg{range}; 2729 my $range = delete $arg{range};
2366 2730
2367 my $self = $class->SUPER::new ( 2731 my $self = $class->SUPER::new (
2368 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2732 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2369 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2733 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2370 to_value => sub { shift }, 2734 to_value => sub { shift },
2371 from_value => sub { shift }, 2735 from_value => sub { shift },
2372 %arg, 2736 %arg,
2373 ); 2737 );
2374 2738
… …
2394sub set_range { shift->{slider}->set_range (@_) } 2758sub set_range { shift->{slider}->set_range (@_) }
2395sub set_value { shift->{slider}->set_value (@_) } 2759sub set_value { shift->{slider}->set_value (@_) }
2396 2760
2397############################################################################# 2761#############################################################################
2398 2762
2399package CFClient::UI::TextView; 2763package CFPlus::UI::TextScroller;
2400 2764
2401our @ISA = CFClient::UI::HBox::; 2765our @ISA = CFPlus::UI::HBox::;
2402 2766
2403use CFClient::OpenGL; 2767use CFPlus::OpenGL;
2404 2768
2405sub new { 2769sub new {
2406 my $class = shift; 2770 my $class = shift;
2407 2771
2408 my $self = $class->SUPER::new ( 2772 my $self = $class->SUPER::new (
2409 fontsize => 1, 2773 fontsize => 1,
2410 can_events => 0, 2774 can_events => 1,
2775 indent => 0,
2411 #font => default_font 2776 #font => default_font
2412 @_, 2777 @_,
2413 2778
2414 layout => (new CFClient::Layout 1), 2779 layout => (new CFPlus::Layout),
2415 par => [], 2780 par => [],
2416 height => 0, 2781 height => 0,
2417 children => [ 2782 children => [
2418 (new CFClient::UI::Empty expand => 1), 2783 (new CFPlus::UI::Empty expand => 1),
2419 (new CFClient::UI::Slider vertical => 1), 2784 (new CFPlus::UI::Slider vertical => 1),
2420 ], 2785 ],
2421 ); 2786 );
2422 2787
2423 $self->{children}[1]->connect (changed => sub { $self->update }); 2788 $self->{children}[1]->connect (changed => sub { $self->update });
2424 2789
… …
2430 2795
2431 $self->{fontsize} = $fontsize; 2796 $self->{fontsize} = $fontsize;
2432 $self->reflow; 2797 $self->reflow;
2433} 2798}
2434 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
2435sub size_allocate { 2809sub invoke_size_allocate {
2436 my ($self, $w, $h) = @_; 2810 my ($self, $w, $h) = @_;
2437 2811
2438 $self->SUPER::size_allocate ($w, $h); 2812 my ($empty, $slider, @other) = @{ $self->{children} };
2813 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2439 2814
2440 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2815 $self->{layout}->set_font ($self->{font}) if $self->{font};
2441 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2816 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2442 $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});
2443 2819
2444 $self->reflow; 2820 $self->reflow;
2445}
2446 2821
2447sub text_size { 2822 local $self->{children} = [$empty, $slider];
2823 $self->SUPER::invoke_size_allocate ($w, $h)
2824}
2825
2826sub invoke_mouse_wheel {
2448 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) = @_;
2449 2838
2450 my $layout = $self->{layout}; 2839 my $layout = $self->{layout};
2451 2840
2841 $layout->set_font ($self->{font}) if $self->{font};
2842 $layout->set_foreground (@{$para->{fg}});
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2843 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453 $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});
2454 $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}}
2455 2852 );
2853
2456 $layout->size 2854 $layout
2457} 2855}
2458 2856
2459sub reflow { 2857sub reflow {
2460 my ($self) = @_; 2858 my ($self) = @_;
2461 2859
… …
2468 2866
2469 # todo: base offset on lines or so, not on pixels 2867 # todo: base offset on lines or so, not on pixels
2470 $self->{children}[1]->set_value ($offset); 2868 $self->{children}[1]->set_value ($offset);
2471} 2869}
2472 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
2473sub clear { 2886sub clear {
2474 my ($self) = @_; 2887 my ($self) = @_;
2888
2889 my (undef, undef, @other) = @{ $self->{children} };
2890 $self->remove ($_) for @other;
2475 2891
2476 $self->{par} = []; 2892 $self->{par} = [];
2477 $self->{height} = 0; 2893 $self->{height} = 0;
2478 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2894 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2479} 2895}
2480 2896
2481sub add_paragraph { 2897sub add_paragraph {
2482 my ($self, $color, $text, $indent) = @_; 2898 my $self = shift;
2483 2899
2484 for my $line (split /\n/, $text) { 2900 for my $para (@_) {
2485 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
2486 $self->{height} += $h; 2948 $self->{height} = $height;
2487 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2949 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2488 }
2489 2950
2490 $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 }
2491} 2957}
2492 2958
2493sub update { 2959sub update {
2494 my ($self) = @_; 2960 my ($self) = @_;
2495 2961
… …
2497 2963
2498 return unless $self->{h} > 0; 2964 return unless $self->{h} > 0;
2499 2965
2500 delete $self->{texture}; 2966 delete $self->{texture};
2501 2967
2502 $ROOT->on_post_alloc ($self, sub { 2968 $ROOT->on_post_alloc ($self => sub {
2969 $self->force_uptodate;
2970
2503 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2971 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504 2972
2505 if (delete $self->{need_reflow}) {
2506 my $height = 0;
2507
2508 my $layout = $self->{layout};
2509
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511
2512 for (@{$self->{par}}) {
2513 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2514 $layout->set_width ($W - $_->[3]);
2515 $layout->set_markup ($_->[4]);
2516 my ($w, $h) = $layout->size;
2517 $_->[0] = $w + $_->[3];
2518 $_->[1] = $h;
2519 }
2520
2521 $height += $_->[1];
2522 }
2523
2524 $self->{height} = $height;
2525
2526 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2527
2528 delete $self->{texture};
2529 }
2530
2531 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2973 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2532 glClearColor 0.5, 0.5, 0.5, 0; 2974 glClearColor 0, 0, 0, 0;
2533 glClear GL_COLOR_BUFFER_BIT; 2975 glClear GL_COLOR_BUFFER_BIT;
2534 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;
2535 my $top = int $self->{children}[1]{range}[0]; 2985 my $top = int $self->{children}[1]{range}[0];
2536 2986
2537 my $y0 = $top; 2987 my $y0 = $top;
2538 my $y1 = $top + $H; 2988 my $y1 = $top + $H;
2539 2989
2540 my $y = 0;
2541
2542 my $layout = $self->{layout};
2543
2544 $layout->set_font ($self->{font}) if $self->{font};
2545
2546 glEnable GL_BLEND;
2547 #TODO# not correct in windows where rgba is forced off
2548 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2549
2550 for my $par (@{$self->{par}}) { 2990 for my $para (@{$self->{par}}) {
2551 my $h = $par->[1]; 2991 my $h = $para->{h};
2992 my $y = $para->{y};
2552 2993
2553 if ($y0 < $y + $h && $y < $y1) { 2994 if ($y0 < $y + $h && $y < $y1) {
2554 $layout->set_foreground (@{ $par->[2] }); 2995 my $layout = $self->get_layout ($para);
2555 $layout->set_width ($W - $par->[3]);
2556 $layout->set_markup ($par->[4]);
2557 2996
2558 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2997 $layout->render ($para->{indent}, $y - $y0);
2559 2998
2560 glRasterPos $par->[3], $y - $y0; 2999 if (my @w = @{ $para->{widget} }) {
2561 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 }
2562 } 3011 }
2563 3012
2564 $y += $h; 3013 $paridx++;
3014 $top_paragraph ||= $paridx if $y >= $top;
2565 } 3015 }
2566 3016
2567 glDisable GL_BLEND; 3017 $self->{top_paragraph} = $top_paragraph;
2568 }; 3018 };
2569 }); 3019 });
2570} 3020}
2571 3021
3022sub reconfigure {
3023 my ($self) = @_;
3024
3025 $self->SUPER::reconfigure;
3026
3027 $_->{w} = 1e10 for @{ $self->{par} };
3028 $self->reflow;
3029}
3030
2572sub _draw { 3031sub _draw {
2573 my ($self) = @_; 3032 my ($self) = @_;
2574 3033
2575 glEnable GL_TEXTURE_2D; 3034 glEnable GL_TEXTURE_2D;
2576 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3035 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2577 glColor 1, 1, 1, 1; 3036 glColor 0, 0, 0, 1;
2578 $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});
2579 glDisable GL_TEXTURE_2D; 3038 glDisable GL_TEXTURE_2D;
2580 3039
2581 $self->{children}[1]->draw; 3040 $self->{children}[1]->draw;
2582
2583} 3041}
2584 3042
2585############################################################################# 3043#############################################################################
2586 3044
2587package CFClient::UI::Animator; 3045package CFPlus::UI::Animator;
2588 3046
2589use CFClient::OpenGL; 3047use CFPlus::OpenGL;
2590 3048
2591our @ISA = CFClient::UI::Bin::; 3049our @ISA = CFPlus::UI::Bin::;
2592 3050
2593sub moveto { 3051sub moveto {
2594 my ($self, $x, $y) = @_; 3052 my ($self, $x, $y) = @_;
2595 3053
2596 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3054 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2624 glPopMatrix; 3082 glPopMatrix;
2625} 3083}
2626 3084
2627############################################################################# 3085#############################################################################
2628 3086
2629package CFClient::UI::Flopper; 3087package CFPlus::UI::Flopper;
2630 3088
2631our @ISA = CFClient::UI::Button::; 3089our @ISA = CFPlus::UI::Button::;
2632 3090
2633sub new { 3091sub new {
2634 my $class = shift; 3092 my $class = shift;
2635 3093
2636 my $self = $class->SUPER::new ( 3094 my $self = $class->SUPER::new (
… …
2648 $self->{other}->toggle_visibility; 3106 $self->{other}->toggle_visibility;
2649} 3107}
2650 3108
2651############################################################################# 3109#############################################################################
2652 3110
2653package CFClient::UI::Tooltip; 3111package CFPlus::UI::Tooltip;
2654 3112
2655our @ISA = CFClient::UI::Bin::; 3113our @ISA = CFPlus::UI::Bin::;
2656 3114
2657use CFClient::OpenGL; 3115use CFPlus::OpenGL;
2658 3116
2659sub new { 3117sub new {
2660 my $class = shift; 3118 my $class = shift;
2661 3119
2662 $class->SUPER::new ( 3120 $class->SUPER::new (
… …
2665 ) 3123 )
2666} 3124}
2667 3125
2668sub set_tooltip_from { 3126sub set_tooltip_from {
2669 my ($self, $widget) = @_; 3127 my ($self, $widget) = @_;
3128
3129 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3130 if $widget->{tooltip} =~ /^#(.*)$/;
2670 3131
2671 my $tooltip = $widget->{tooltip}; 3132 my $tooltip = $widget->{tooltip};
2672 3133
2673 if ($ENV{CFPLUS_DEBUG} & 2) { 3134 if ($ENV{CFPLUS_DEBUG} & 2) {
2674 $tooltip .= "\n\n" . (ref $widget) . "\n" 3135 $tooltip .= "\n\n" . (ref $widget) . "\n"
2675 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3136 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676 . "req $widget->{req_w} $widget->{req_h}\n" 3137 . "req $widget->{req_w} $widget->{req_h}\n"
2677 . "visible $widget->{visible}"; 3138 . "visible $widget->{visible}";
2678 } 3139 }
2679 3140
3141 $tooltip =~ s/^\n+//;
3142 $tooltip =~ s/\n+$//;
3143
2680 $self->add (new CFClient::UI::Label 3144 $self->add (new CFPlus::UI::Label
2681 markup => $tooltip, 3145 markup => $tooltip,
2682 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3146 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2683 fontsize => 0.8, 3147 fontsize => 0.8,
2684 fg => [0, 0, 0, 1], 3148 style => 1, # FLAG_INVERSE
2685 ellipsise => 0, 3149 ellipsise => 0,
2686 font => ($widget->{tooltip_font} || $::FONT_PROP), 3150 font => ($widget->{tooltip_font} || $::FONT_PROP),
2687 ); 3151 );
2688} 3152}
2689 3153
… …
2693 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3157 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2694 3158
2695 ($w + 4, $h + 4) 3159 ($w + 4, $h + 4)
2696} 3160}
2697 3161
2698sub size_allocate { 3162sub invoke_size_allocate {
2699 my ($self, $w, $h) = @_; 3163 my ($self, $w, $h) = @_;
2700 3164
2701 $self->SUPER::size_allocate ($w - 4, $h - 4); 3165 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2702} 3166}
2703 3167
2704sub visibility_change { 3168sub invoke_visibility_change {
2705 my ($self, $visible) = @_; 3169 my ($self, $visible) = @_;
2706 3170
2707 return unless $visible; 3171 return unless $visible;
2708 3172
2709 $self->{root}->on_post_alloc ("move_$self" => sub { 3173 $self->{root}->on_post_alloc ("move_$self" => sub {
2710 my $widget = $self->{owner} 3174 my $widget = $self->{owner}
2711 or return; 3175 or return;
2712 3176
3177 if ($widget->{visible}) {
2713 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3178 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714 3179
2715 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3180 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716 if $x + $self->{w} > $::WIDTH; 3181 if $x + $self->{w} > $self->{root}{w};
2717 3182
2718 $self->move_abs ($x, $y); 3183 $self->move_abs ($x, $y);
3184 } else {
3185 $self->hide;
3186 }
2719 }); 3187 });
2720} 3188}
2721 3189
2722sub _draw { 3190sub _draw {
2723 my ($self) = @_; 3191 my ($self) = @_;
… …
2747 $self->SUPER::_draw; 3215 $self->SUPER::_draw;
2748} 3216}
2749 3217
2750############################################################################# 3218#############################################################################
2751 3219
2752package CFClient::UI::Face; 3220package CFPlus::UI::Face;
2753 3221
2754our @ISA = CFClient::UI::Base::; 3222our @ISA = CFPlus::UI::DrawBG::;
2755 3223
2756use CFClient::OpenGL; 3224use CFPlus::OpenGL;
2757 3225
2758sub new { 3226sub new {
2759 my $class = shift; 3227 my $class = shift;
2760 3228
2761 my $self = $class->SUPER::new ( 3229 my $self = $class->SUPER::new (
… …
2796sub _draw { 3264sub _draw {
2797 my ($self) = @_; 3265 my ($self) = @_;
2798 3266
2799 return unless $::CONN; 3267 return unless $::CONN;
2800 3268
3269 $self->SUPER::_draw;
3270
2801 my $face; 3271 my $face;
2802 3272
2803 if ($self->{frame}) { 3273 if ($self->{frame}) {
2804 my $anim = $::CONN->{anim}[$self->{anim}]; 3274 my $anim = $::CONN->{anim}[$self->{anim}];
2805 3275
… …
2810 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3280 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2811 3281
2812 if ($tex) { 3282 if ($tex) {
2813 glEnable GL_TEXTURE_2D; 3283 glEnable GL_TEXTURE_2D;
2814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2815 glColor 1, 1, 1, 1; 3285 glColor 0, 0, 0, 1;
2816 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3286 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2817 glDisable GL_TEXTURE_2D; 3287 glDisable GL_TEXTURE_2D;
2818 } 3288 }
2819} 3289}
2820 3290
2821sub DESTROY { 3291sub destroy {
2822 my ($self) = @_; 3292 my ($self) = @_;
2823 3293
2824 $self->{timer}->cancel 3294 $self->{timer}->cancel
2825 if $self->{timer}; 3295 if $self->{timer};
2826 3296
2827 $self->SUPER::DESTROY; 3297 $self->SUPER::destroy;
2828} 3298}
2829 3299
2830############################################################################# 3300#############################################################################
2831 3301
3302package CFPlus::UI::Buttonbar;
3303
3304our @ISA = CFPlus::UI::HBox::;
3305
3306# TODO: should actually wrap buttons and other goodies.
3307
3308#############################################################################
3309
2832package CFClient::UI::Menu; 3310package CFPlus::UI::Menu;
2833 3311
2834our @ISA = CFClient::UI::FancyFrame::; 3312our @ISA = CFPlus::UI::Toplevel::;
2835 3313
2836use CFClient::OpenGL; 3314use CFPlus::OpenGL;
2837 3315
2838sub new { 3316sub new {
2839 my $class = shift; 3317 my $class = shift;
2840 3318
2841 my $self = $class->SUPER::new ( 3319 my $self = $class->SUPER::new (
2842 items => [], 3320 items => [],
2843 z => 100, 3321 z => 100,
2844 @_, 3322 @_,
2845 ); 3323 );
2846 3324
2847 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3325 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2848 3326
2849 for my $item (@{ $self->{items} }) { 3327 for my $item (@{ $self->{items} }) {
2850 my ($widget, $cb) = @$item; 3328 my ($widget, $cb, $tooltip) = @$item;
2851 3329
2852 # handle various types of items, only text for now 3330 # handle various types of items, only text for now
2853 if (!ref $widget) { 3331 if (!ref $widget) {
3332 if ($widget =~ /\t/) {
3333 my ($left, $right) = split /\t/, $widget, 2;
3334
2854 $widget = new CFClient::UI::Label 3335 $widget = new CFPlus::UI::HBox
2855 can_hover => 1, 3336 can_hover => 1,
2856 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,
2857 text => $widget; 3349 markup => $widget,
3350 tooltip => $tooltip;
3351 }
2858 } 3352 }
2859 3353
2860 $self->{item}{$widget} = $item; 3354 $self->{item}{$widget} = $item;
2861 3355
2862 $self->{vbox}->add ($widget); 3356 $self->{vbox}->add ($widget);
… …
2867 3361
2868# 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)
2869sub popup { 3363sub popup {
2870 my ($self, $ev) = @_; 3364 my ($self, $ev) = @_;
2871 3365
2872 $self->_emit ("popdown"); 3366 $self->emit ("popdown");
2873 3367
2874 # maybe save $GRAB? must be careful about events... 3368 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self; 3369 $GRAB = $self;
2876 $self->{button} = $ev->{button}; 3370 $self->{button} = $ev->{button};
2877 3371
2878 $self->show; 3372 $self->show;
2879 $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);
2880} 3374}
2881 3375
2882sub mouse_motion { 3376sub invoke_mouse_motion {
2883 my ($self, $ev, $x, $y) = @_; 3377 my ($self, $ev, $x, $y) = @_;
2884 3378
2885 # TODO: should use vbox->find_widget or so 3379 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3380 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER}; 3381 $self->{hover} = $self->{item}{$HOVER};
2888}
2889 3382
3383 0
3384}
3385
2890sub button_up { 3386sub invoke_button_up {
2891 my ($self, $ev, $x, $y) = @_; 3387 my ($self, $ev, $x, $y) = @_;
2892 3388
2893 if ($ev->{button} == $self->{button}) { 3389 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB; 3390 undef $GRAB;
2895 $self->hide; 3391 $self->hide;
2896 3392
2897 $self->_emit ("popdown"); 3393 $self->emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 3394 $self->{hover}[1]->() if $self->{hover};
3395 } else {
3396 return 0
3397 }
3398
2899 } 3399 1
2900} 3400}
2901 3401
2902############################################################################# 3402#############################################################################
2903 3403
2904package CFClient::UI::Statusbox; 3404package CFPlus::UI::Multiplexer;
2905 3405
2906our @ISA = CFClient::UI::VBox::; 3406our @ISA = CFPlus::UI::Container::;
2907 3407
2908sub new { 3408sub new {
2909 my $class = shift; 3409 my $class = shift;
2910 3410
2911 $class->SUPER::new ( 3411 my $self = $class->SUPER::new (
3412 @_,
3413 );
3414
3415 $self->{current} = $self->{children}[0]
3416 if @{ $self->{children} };
3417
3418 $self
3419}
3420
3421sub add {
3422 my ($self, @widgets) = @_;
3423
3424 $self->SUPER::add (@widgets);
3425
3426 $self->{current} = $self->{children}[0]
3427 if @{ $self->{children} };
3428}
3429
3430sub get_current_page {
3431 my ($self) = @_;
3432
3433 $self->{current}
3434}
3435
3436sub set_current_page {
3437 my ($self, $page_or_widget) = @_;
3438
3439 my $widget = ref $page_or_widget
3440 ? $page_or_widget
3441 : $self->{children}[$page_or_widget];
3442
3443 $self->{current} = $widget;
3444 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3445
3446 $self->emit (page_changed => $self->{current});
3447
3448 $self->realloc;
3449}
3450
3451sub visible_children {
3452 $_[0]{current}
3453}
3454
3455sub size_request {
3456 my ($self) = @_;
3457
3458 $self->{current}->size_request
3459}
3460
3461sub invoke_size_allocate {
3462 my ($self, $w, $h) = @_;
3463
3464 $self->{current}->configure (0, 0, $w, $h);
3465
3466 1
3467}
3468
3469sub _draw {
3470 my ($self) = @_;
3471
3472 $self->{current}->draw;
3473}
3474
3475#############################################################################
3476
3477package CFPlus::UI::Notebook;
3478
3479our @ISA = CFPlus::UI::VBox::;
3480
3481sub new {
3482 my $class = shift;
3483
3484 my $self = $class->SUPER::new (
3485 buttonbar => (new CFPlus::UI::Buttonbar),
3486 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3487 # filter => # will be put between multiplexer and $self
3488 @_,
3489 );
3490
3491 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3492 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3493
3494 $self
3495}
3496
3497sub add {
3498 my ($self, $title, $widget, $tooltip) = @_;
3499
3500 Scalar::Util::weaken $self;
3501
3502 $self->{buttonbar}->add (new CFPlus::UI::Button
3503 markup => $title,
3504 tooltip => $tooltip,
3505 on_activate => sub { $self->set_current_page ($widget) },
3506 );
3507
3508 $self->{multiplexer}->add ($widget);
3509}
3510
3511sub get_current_page {
3512 my ($self) = @_;
3513
3514 $self->{multiplexer}->get_current_page
3515}
3516
3517sub set_current_page {
3518 my ($self, $page) = @_;
3519
3520 $self->{multiplexer}->set_current_page ($page);
3521 $self->emit (page_changed => $self->{multiplexer}{current});
3522}
3523
3524#############################################################################
3525
3526package CFPlus::UI::Selector;
3527
3528use utf8;
3529
3530our @ISA = CFPlus::UI::Button::;
3531
3532sub new {
3533 my $class = shift;
3534
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 (
2912 fontsize => 0.8, 3590 fontsize => 0.8,
2913 @_, 3591 @_,
2914 ) 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
2915} 3599}
2916 3600
2917sub reorder { 3601sub reorder {
2918 my ($self) = @_; 3602 my ($self) = @_;
2919 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} };
2920 3609
2921 while (my ($k, $v) = each %{ $self->{item} }) { 3610 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3611 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 } 3612 }
2924 3613
… …
2927 my @items = sort { 3616 my @items = sort {
2928 $a->{pri} <=> $b->{pri} 3617 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id} 3618 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} }; 3619 } values %{ $self->{item} };
2931 3620
3621 $self->{timer}->interval (1);
3622
2932 my $count = 10 + 1; 3623 my $count = 10 + 1;
2933 for my $item (@items) { 3624 for my $item (@items) {
2934 last unless --$count; 3625 last unless --$count;
2935 3626
2936 push @widgets, $item->{label} ||= do { 3627 my $label = $item->{label} ||= do {
2937 # TODO: doesn't handle markup well (read as: at all) 3628 # TODO: doesn't handle markup well (read as: at all)
2938 my $short = $item->{count} > 1 3629 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}" 3630 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text}; 3631 : $item->{text};
2941 3632
2942 for ($short) { 3633 for ($short) {
2943 s/^\s+//; 3634 s/^\s+//;
2944 s/\s+/ /g; 3635 s/\s+/ /g;
2945 } 3636 }
2946 3637
2947 new CFClient::UI::Label 3638 new CFPlus::UI::Label
2948 markup => $short, 3639 markup => $short,
2949 tooltip => $item->{tooltip}, 3640 tooltip => $item->{tooltip},
2950 tooltip_font => $::FONT_PROP, 3641 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67, 3642 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize}, 3643 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44, 3644 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg}, 3645 fg => [@{ $item->{fg} }],
2955 can_events => 1, 3646 can_events => 1,
2956 can_hover => 1 3647 can_hover => 1
2957 }; 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;
2958 } 3661 }
2959 3662
2960 $self->clear; 3663 $self->clear;
2961 $self->SUPER::add (reverse @widgets); 3664 $self->SUPER::add (reverse @widgets);
2962} 3665}
… …
2967 $text =~ s/^\s+//; 3670 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 3671 $text =~ s/\s+$//;
2969 3672
2970 return unless $text; 3673 return unless $text;
2971 3674
2972 my $timeout = time + ((delete $arg{timeout}) || 60); 3675 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2973 3676
2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3677 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2975 3678
2976 if (my $item = $self->{item}{$group}) { 3679 if (my $item = $self->{item}{$group}) {
2977 if ($item->{text} eq $text) { 3680 if ($item->{text} eq $text) {
2978 $item->{count}++; 3681 $item->{count}++;
2979 } else { 3682 } else {
2980 $item->{count} = 1; 3683 $item->{count} = 1;
2981 $item->{text} = $item->{tooltip} = $text; 3684 $item->{text} = $item->{tooltip} = $text;
2982 } 3685 }
2983 $item->{id} = ++$self->{id}; 3686 $item->{id} += 0.2;#d#
2984 $item->{timeout} = $timeout; 3687 $item->{timeout} = $timeout;
2985 delete $item->{label}; 3688 delete $item->{label};
2986 } else { 3689 } else {
2987 $self->{item}{$group} = { 3690 $self->{item}{$group} = {
2988 id => ++$self->{id}, 3691 id => ++$self->{id},
… …
2994 count => 1, 3697 count => 1,
2995 %arg, 3698 %arg,
2996 }; 3699 };
2997 } 3700 }
2998 3701
3702 $ROOT->on_refresh (reorder => sub {
2999 $self->reorder; 3703 $self->reorder;
3704 });
3000} 3705}
3001 3706
3002sub reconfigure { 3707sub reconfigure {
3003 my ($self) = @_; 3708 my ($self) = @_;
3004 3709
… …
3007 3712
3008 $self->reorder; 3713 $self->reorder;
3009 $self->SUPER::reconfigure; 3714 $self->SUPER::reconfigure;
3010} 3715}
3011 3716
3717sub destroy {
3718 my ($self) = @_;
3719
3720 $self->{timer}->cancel;
3721
3722 $self->SUPER::destroy;
3723}
3724
3012############################################################################# 3725#############################################################################
3013 3726
3014package CFClient::UI::Inventory; 3727package CFPlus::UI::Inventory;
3015 3728
3016our @ISA = CFClient::UI::ScrolledWindow::; 3729our @ISA = CFPlus::UI::Table::;
3017 3730
3018sub new { 3731sub new {
3019 my $class = shift; 3732 my $class = shift;
3020 3733
3021 my $self = $class->SUPER::new ( 3734 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3735 col_expand => [0, 1, 0],
3736 items => [],
3023 @_, 3737 @_,
3024 ); 3738 );
3025 3739
3740 $self->set_sort_order (undef);
3741
3026 $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;
3027} 3778}
3028 3779
3029sub set_items { 3780sub set_items {
3030 my ($self, $items) = @_; 3781 my ($self, $items) = @_;
3031 3782
3032 $self->{scrolled}->clear; 3783 $self->{items} = [$items ? values %$items : ()];
3033 return unless $items; 3784 $self->update_items;
3034
3035 my @items = sort {
3036 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name})
3038 } @$items;
3039
3040 $self->{real_items} = \@items;
3041
3042 my $row = 0;
3043 for my $item (@items) {
3044 CFClient::Item::update_widgets $item;
3045
3046 $self->{scrolled}->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3049
3050 $row++;
3051 }
3052} 3785}
3053 3786
3054############################################################################# 3787#############################################################################
3055 3788
3056package CFClient::UI::BindEditor; 3789package CFPlus::UI::SpellList;
3057 3790
3058our @ISA = CFClient::UI::FancyFrame::; 3791our @ISA = CFPlus::UI::Table::;
3059 3792
3060sub new { 3793sub new {
3061 my $class = shift; 3794 my $class = shift;
3062 3795
3063 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3796 my $self = $class->SUPER::new (
3797 binding => [],
3798 commands => [],
3799 @_,
3800 )
3801}
3064 3802
3065 $self->add (my $vb = new CFClient::UI::VBox); 3803my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3066 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");
3067 3815
3068 $vb->add ($self->{rec_btn} = new CFClient::UI::Button 3816sub rebuild_spell_list {
3069 text => "start recording", 3817 my ($self) = @_;
3070 tooltip => "Start/Stops recording of actions." 3818
3071 ."All subsequent actions after the recording started will be captured." 3819 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3072 ."The actions are displayed after the record was stopped." 3820 $self->clear;
3073 ."To bind the action you have to click on the 'Bind' button", 3821
3074 on_activate => sub { 3822 return unless $::CONN;
3075 unless ($self->{recording}) { 3823
3076 $self->start; 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);
3077 } else { 3851 } else {
3078 $self->stop; 3852 return 0;
3853 }
3854
3855 1
3079 } 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);
3080 }); 3884 }
3081
3082 $vb->add (new CFClient::UI::Label text => "Actions:");
3083 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3084
3085 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3086 $vb->add (my $hb = new CFClient::UI::HBox);
3087 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3088 $hb->add (new CFClient::UI::Button
3089 text => "bind",
3090 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3091 on_activate => sub {
3092 $self->ask_for_bind;
3093 });
3094
3095 $vb->add (my $hb = new CFClient::UI::HBox);
3096 $hb->add (new CFClient::UI::Button
3097 text => "ok",
3098 expand => 1,
3099 tooltip => "This closes the binding editor and saves the binding",
3100 on_activate => sub {
3101 $self->hide;
3102 $self->commit;
3103 });
3104
3105 $hb->add (new CFClient::UI::Button
3106 text => "cancel",
3107 expand => 1,
3108 tooltip => "This closes the binding editor without saving",
3109 on_activate => sub {
3110 $self->hide;
3111 $self->{binding_cancel}->()
3112 if $self->{binding_cancel};
3113 });
3114
3115 $self->update_binding_widgets;
3116
3117 $self
3118}
3119
3120sub commit {
3121 my ($self) = @_;
3122 my ($mod, $sym, $cmds) = $self->get_binding;
3123 if ($sym != 0 && @$cmds > 0) {
3124 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3125 ."'. Don't forget 'Save Config'!");
3126 $self->{binding_change}->($mod, $sym, $cmds)
3127 if $self->{binding_change};
3128 } else {
3129 $::STATUSBOX->add ("No action bound, no key or action specified!");
3130 $self->{binding_cancel}->()
3131 if $self->{binding_cancel};
3132 }
3133}
3134
3135sub start {
3136 my ($self) = @_;
3137
3138 $self->{rec_btn}->set_text ("stop recording");
3139 $self->{recording} = 1;
3140 $self->clear_command_list;
3141 $::CONN->start_record if $::CONN;
3142}
3143
3144sub stop {
3145 my ($self) = @_;
3146
3147 $self->{rec_btn}->set_text ("start recording");
3148 $self->{recording} = 0;
3149
3150 my $rec;
3151 $rec = $::CONN->stop_record if $::CONN;
3152 return unless ref $rec eq 'ARRAY';
3153 $self->set_command_list ($rec);
3154}
3155
3156
3157sub ask_for_bind_and_commit {
3158 my ($self) = @_;
3159 $self->ask_for_bind (1);
3160}
3161
3162sub ask_for_bind {
3163 my ($self, $commit) = @_;
3164
3165 CFClient::Binder::open_binding_dialog (sub {
3166 my ($mod, $sym) = @_;
3167 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3168 $self->update_binding_widgets;
3169 $self->commit if $commit;
3170 }); 3885 });
3171} 3886}
3172 3887
3173# $mod and $sym are the modifiers and key symbol
3174# $cmds is a array ref of strings (the commands)
3175# $cb is the callback that is executed on OK
3176# $ccb is the callback that is executed on CANCEL and
3177# when the binding was unsuccessful on OK
3178sub set_binding {
3179 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3180
3181 $self->clear_command_list;
3182 $self->{recording} = 0;
3183 $self->{rec_btn}->set_text ("start recording");
3184
3185 $self->{binding} = [$mod, $sym];
3186 $self->{commands} = $cmds;
3187
3188 $self->{binding_change} = $cb;
3189 $self->{binding_cancel} = $ccb;
3190
3191 $self->update_binding_widgets;
3192}
3193
3194# this is a shortcut method that asks for a binding
3195# and then just binds it.
3196sub do_quick_binding {
3197 my ($self, $cmds) = @_;
3198 $self->set_binding (undef, undef, $cmds, sub {
3199 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3200 });
3201 $self->ask_for_bind (1);
3202}
3203
3204sub update_binding_widgets {
3205 my ($self) = @_;
3206 my ($mod, $sym, $cmds) = $self->get_binding;
3207 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3208 $self->set_command_list ($cmds);
3209}
3210
3211sub get_binding {
3212 my ($self) = @_;
3213 return (
3214 $self->{binding}->[0],
3215 $self->{binding}->[1],
3216 [ grep { defined $_ } @{$self->{commands}} ]
3217 );
3218}
3219
3220sub clear_command_list {
3221 my ($self) = @_;
3222 $self->{cmdbox}->clear ();
3223}
3224
3225sub set_command_list {
3226 my ($self, $cmds) = @_;
3227
3228 $self->{cmdbox}->clear ();
3229 $self->{commands} = $cmds;
3230
3231 my $idx = 0;
3232
3233 for (@$cmds) {
3234 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3235
3236 my $i = $idx;
3237 $hb->add (new CFClient::UI::Label text => $_);
3238 $hb->add (new CFClient::UI::Button
3239 text => "delete",
3240 tooltip => "Deletes the action from the record",
3241 on_activate => sub {
3242 $self->{cmdbox}->remove ($hb);
3243 $cmds->[$i] = undef;
3244 });
3245
3246
3247 $idx++
3248 }
3249}
3250
3251#############################################################################
3252
3253package CFClient::UI::SpellList;
3254
3255our @ISA = CFClient::UI::FancyFrame::;
3256
3257sub new {
3258 my $class = shift;
3259
3260 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3261
3262 $self->add (new CFClient::UI::ScrolledWindow
3263 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3264
3265 $self;
3266}
3267
3268# XXX: Do sorting? Argl...
3269sub add_spell { 3888sub add_spell {
3270 my ($self, $spell) = @_; 3889 my ($self, $spell) = @_;
3890
3271 $self->{spells}->{$spell->{name}} = $spell; 3891 $self->{spell}->{$spell->{name}} = $spell;
3272 3892 $self->rebuild_spell_list;
3273 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3274 face => $spell->{face},
3275 can_hover => 1,
3276 can_events => 1,
3277 tooltip => $spell->{message});
3278
3279 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3280 text => $spell->{name},
3281 can_hover => 1,
3282 can_events => 1,
3283 tooltip => $spell->{message},
3284 expand => 1);
3285
3286 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3287 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3288 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3289 expand => 1);
3290
3291 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3292 text => "bind to key",
3293 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3294}
3295
3296sub rebuild_spell_list {
3297 my ($self) = @_;
3298 $self->{tbl_idx} = 0;
3299 $self->add_spell ($_) for values %{$self->{spells}};
3300} 3893}
3301 3894
3302sub remove_spell { 3895sub remove_spell {
3303 my ($self, $spell) = @_; 3896 my ($self, $spell) = @_;
3897
3304 delete $self->{spells}->{$spell->{name}}; 3898 delete $self->{spell}->{$spell->{name}};
3305 $self->rebuild_spell_list; 3899 $self->rebuild_spell_list;
3306} 3900}
3307 3901
3902sub clear_spells {
3903 my ($self) = @_;
3904
3905 $self->{spell} = {};
3906 $self->rebuild_spell_list;
3907}
3908
3308############################################################################# 3909#############################################################################
3309 3910
3310package CFClient::UI::Root; 3911package CFPlus::UI::Root;
3311 3912
3312our @ISA = CFClient::UI::Container::; 3913our @ISA = CFPlus::UI::Container::;
3313 3914
3915use List::Util qw(min max);
3916
3314use CFClient::OpenGL; 3917use CFPlus::OpenGL;
3315 3918
3316sub new { 3919sub new {
3317 my $class = shift; 3920 my $class = shift;
3318 3921
3319 my $self = $class->SUPER::new ( 3922 my $self = $class->SUPER::new (
… …
3344 $coord = $max - $size if $coord > $max - $size; 3947 $coord = $max - $size if $coord > $max - $size;
3345 3948
3346 int $coord + 0.5 3949 int $coord + 0.5
3347} 3950}
3348 3951
3349sub size_allocate { 3952sub invoke_size_allocate {
3350 my ($self, $w, $h) = @_; 3953 my ($self, $w, $h) = @_;
3351 3954
3352 for my $child ($self->children) { 3955 for my $child ($self->children) {
3353 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)};
3354 3957
… …
3358 $X = _to_pixel $X, $W, $self->{w}; 3961 $X = _to_pixel $X, $W, $self->{w};
3359 $Y = _to_pixel $Y, $H, $self->{h}; 3962 $Y = _to_pixel $Y, $H, $self->{h};
3360 3963
3361 $child->configure ($X, $Y, $W, $H); 3964 $child->configure ($X, $Y, $W, $H);
3362 } 3965 }
3966
3967 1
3363} 3968}
3364 3969
3365sub coord2local { 3970sub coord2local {
3366 my ($self, $x, $y) = @_; 3971 my ($self, $x, $y) = @_;
3367 3972
… …
3452 4057
3453 delete $queue{$widget+0}; 4058 delete $queue{$widget+0};
3454 4059
3455 my ($w, $h) = $widget->size_request; 4060 my ($w, $h) = $widget->size_request;
3456 4061
3457 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4062 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3458 $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};
3459 4067
3460 $w = $widget->{force_w} if exists $widget->{force_w}; 4068 $w = $widget->{force_w} if exists $widget->{force_w};
3461 $h = $widget->{force_h} if exists $widget->{force_h}; 4069 $h = $widget->{force_h} if exists $widget->{force_h};
3462 4070
3463 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4071 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3489 4097
3490 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4098 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3491 4099
3492 $w = 0 if $w < 0; 4100 $w = 0 if $w < 0;
3493 $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};
3494 4111
3495 $w = int $w + 0.5; 4112 $w = int $w + 0.5;
3496 $h = int $h + 0.5; 4113 $h = int $h + 0.5;
3497 4114
3498 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}) {
… …
3522 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4139 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3523 glMatrixMode GL_MODELVIEW; 4140 glMatrixMode GL_MODELVIEW;
3524 glLoadIdentity; 4141 glLoadIdentity;
3525 4142
3526 { 4143 {
3527 package CFClient::UI::Base; 4144 package CFPlus::UI::Base;
3528 4145
3529 ($draw_x, $draw_y, $draw_w, $draw_h) = 4146 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3530 (0, 0, $self->{w}, $self->{h}); 4147 (0, 0, $self->{w}, $self->{h});
3531 }
3532 4148
3533 $self->_draw; 4149 $self->_draw;
4150 }
3534} 4151}
3535 4152
3536############################################################################# 4153#############################################################################
3537 4154
3538package CFClient::UI; 4155package CFPlus::UI;
3539 4156
3540$ROOT = new CFClient::UI::Root; 4157$ROOT = new CFPlus::UI::Root;
3541$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4158$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3542 4159
35431 41601
3544 4161

Diff Legend

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