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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.273 by root, Sat Jun 3 02:32:35 2006 UTC vs.
Revision 1.366 by root, Mon Apr 23 19:17:41 2007 UTC

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

Diff Legend

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