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

Diff Legend

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