ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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