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.271 by root, Fri Jun 2 22:13:47 2006 UTC vs.
Revision 1.361 by root, Sat Dec 9 02:21:25 2006 UTC

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

Diff Legend

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