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

Diff Legend

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