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

Diff Legend

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