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

Diff Legend

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