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.265 by root, Thu Jun 1 02:59:46 2006 UTC vs.
Revision 1.341 by root, Sun Aug 13 03:20:56 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); 914 my ($w, $h) = @$self{qw(w h)};
826 915
827 my $tex = $self->{texture} 916 my $tex = $self->{texture}
828 or return; 917 or return;
829 918
830 glEnable GL_TEXTURE_2D; 919 glEnable GL_TEXTURE_2D;
831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1; 921 glColor 0, 0, 0, 1;
833 922
834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 923 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
835 924
836 glDisable GL_TEXTURE_2D; 925 glDisable GL_TEXTURE_2D;
837} 926}
838 927
839############################################################################# 928#############################################################################
840 929
841package CFClient::UI::ViewPort; 930package CFPlus::UI::ViewPort;
842 931
843our @ISA = CFClient::UI::Window::; 932our @ISA = CFPlus::UI::Window::;
844 933
845sub new { 934sub new {
846 my $class = shift; 935 my $class = shift;
847 936
848 $class->SUPER::new ( 937 $class->SUPER::new (
… …
861 $h = 10 if $self->{scroll_y}; 950 $h = 10 if $self->{scroll_y};
862 951
863 ($w, $h) 952 ($w, $h)
864} 953}
865 954
866sub size_allocate { 955sub invoke_size_allocate {
867 my ($self, $w, $h) = @_; 956 my ($self, $w, $h) = @_;
868 957
869 my $child = $self->child; 958 my $child = $self->child;
870 959
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 960 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 961 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873 962
874 $self->child->configure (0, 0, $w, $h); 963 $self->child->configure (0, 0, $w, $h);
875 $self->update; 964 $self->update;
965
966 1
876} 967}
877 968
878sub set_offset { 969sub set_offset {
879 my ($self, $x, $y) = @_; 970 my ($self, $x, $y) = @_;
880 971
… …
906 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 997 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
907 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 998 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
908 ) { 999 ) {
909 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1000 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
910 } else { 1001 } else {
911 $self->CFClient::UI::Base::find_widget ($x, $y) 1002 $self->CFPlus::UI::Base::find_widget ($x, $y)
912 } 1003 }
913} 1004}
914 1005
915sub _render { 1006sub _render {
916 my ($self) = @_; 1007 my ($self) = @_;
917 1008
1009 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1010 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1011
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1012 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919 1013
920 $self->SUPER::_render; 1014 $self->SUPER::_render;
921} 1015}
922 1016
923############################################################################# 1017#############################################################################
924 1018
925package CFClient::UI::ScrolledWindow; 1019package CFPlus::UI::ScrolledWindow;
926 1020
927our @ISA = CFClient::UI::HBox::; 1021our @ISA = CFPlus::UI::HBox::;
928 1022
929sub new { 1023sub new {
930 my $class = shift; 1024 my ($class, %arg) = @_;
1025
1026 my $child = delete $arg{child};
931 1027
932 my $self; 1028 my $self;
933 1029
934 my $slider = new CFClient::UI::Slider 1030 my $slider = new CFPlus::UI::Slider
935 vertical => 1, 1031 vertical => 1,
936 range => [0, 0, 1, 0.01], # HACK fix 1032 range => [0, 0, 1, 0.01], # HACK fix
937 on_changed => sub { 1033 on_changed => sub {
938 $self->{vp}->set_offset (0, $_[1]); 1034 $self->{vp}->set_offset (0, $_[1]);
939 }, 1035 },
940 ; 1036 ;
941 1037
942 $self = $class->SUPER::new ( 1038 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1), 1039 vp => (new CFPlus::UI::ViewPort expand => 1),
1040 can_events => 1,
944 slider => $slider, 1041 slider => $slider,
945 @_, 1042 %arg,
946 ); 1043 );
947 1044
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider}); 1045 $self->SUPER::add ($self->{vp}, $self->{slider});
1046 $self->add ($child) if $child;
951 1047
952 $self 1048 $self
953} 1049}
954 1050
1051#TODO# update range on size_allocate depending on child
1052
1053sub add {
1054 my ($self, $widget) = @_;
1055
1056 $self->{vp}->add ($self->{child} = $widget);
1057}
1058
1059sub invoke_mouse_wheel {
1060 my ($self, $ev) = @_;
1061
1062 return 0 unless $ev->{dy}; # only vertical movements
1063
1064 $self->{slider}->emit (mouse_wheel => $ev);
1065
1066 1
1067}
1068
1069sub update_slider {
1070 my ($self) = @_;
1071
1072 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1073}
1074
955sub update { 1075sub update {
956 my ($self) = @_; 1076 my ($self) = @_;
957 1077
958 $self->SUPER::update; 1078 $self->SUPER::update;
959 1079
960 # todo: overwrite size_allocate of child 1080 $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} 1081}
964 1082
965sub size_allocate { 1083sub invoke_size_allocate {
966 my ($self, $w, $h) = @_; 1084 my ($self, $w, $h) = @_;
967 1085
1086 $self->update_slider;
1087
968 $self->SUPER::size_allocate ($w, $h); 1088 $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} 1089}
973
974#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll
976 1090
977############################################################################# 1091#############################################################################
978 1092
979package CFClient::UI::Frame; 1093package CFPlus::UI::Frame;
980 1094
981our @ISA = CFClient::UI::Bin::; 1095our @ISA = CFPlus::UI::Bin::;
982 1096
983use CFClient::OpenGL; 1097use CFPlus::OpenGL;
984 1098
985sub new { 1099sub new {
986 my $class = shift; 1100 my $class = shift;
987 1101
988 $class->SUPER::new ( 1102 $class->SUPER::new (
… …
996 1110
997 if ($self->{bg}) { 1111 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)}; 1112 my ($w, $h) = @$self{qw(w h)};
999 1113
1000 glEnable GL_BLEND; 1114 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1115 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} }; 1116 glColor_premultiply @{ $self->{bg} };
1003 1117
1004 glBegin GL_QUADS; 1118 glBegin GL_QUADS;
1005 glVertex 0 , 0; 1119 glVertex 0 , 0;
1006 glVertex 0 , $h; 1120 glVertex 0 , $h;
1007 glVertex $w, $h; 1121 glVertex $w, $h;
… …
1014 $self->SUPER::_draw; 1128 $self->SUPER::_draw;
1015} 1129}
1016 1130
1017############################################################################# 1131#############################################################################
1018 1132
1019package CFClient::UI::FancyFrame; 1133package CFPlus::UI::FancyFrame;
1020 1134
1021our @ISA = CFClient::UI::Bin::; 1135our @ISA = CFPlus::UI::Bin::;
1022 1136
1023use CFClient::OpenGL; 1137use CFPlus::OpenGL;
1024 1138
1025my $bg = 1139my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1140 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1; 1141 mipmap => 1, wrap => 1;
1028 1142
1029my @border = 1143my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1144 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); 1145 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032 1146
1033sub new { 1147sub new {
1034 my $class = shift; 1148 my ($class, %arg) = @_;
1035 1149
1036 my $self = $class->SUPER::new ( 1150 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1151 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1152 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1153 border => 0.6,
1040 can_events => 1, 1154 can_events => 1,
1041 min_w => 16, 1155 min_w => 64,
1042 min_h => 16, 1156 min_h => 32,
1043 @_ 1157 %arg,
1044 ); 1158 );
1045 1159
1046 $self->{title} &&= new CFClient::UI::Label 1160 $self->{title_widget} = new CFPlus::UI::Label
1047 align => 0, 1161 align => 0,
1048 valign => 1, 1162 valign => 1,
1049 text => $self->{title}, 1163 text => $self->{title},
1050 fontsize => $self->{border}; 1164 fontsize => $self->{border},
1165 if exists $self->{title};
1166
1167 if ($self->{has_close_button}) {
1168 $self->{close_button} =
1169 new CFPlus::UI::ImageButton
1170 path => 'x1_close.png',
1171 on_activate => sub { $self->emit ("delete") };
1172
1173 $self->CFPlus::UI::Container::add ($self->{close_button});
1174 }
1051 1175
1052 $self 1176 $self
1177}
1178
1179sub add {
1180 my ($self, @widgets) = @_;
1181
1182 $self->SUPER::add (@widgets);
1183 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1184 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1053} 1185}
1054 1186
1055sub border { 1187sub border {
1056 int $_[0]{border} * $::FONTSIZE 1188 int $_[0]{border} * $::FONTSIZE
1057} 1189}
1058 1190
1059sub size_request { 1191sub size_request {
1060 my ($self) = @_; 1192 my ($self) = @_;
1193
1194 $self->{title_widget}->size_request
1195 if $self->{title_widget};
1196
1197 $self->{close_button}->size_request
1198 if $self->{close_button};
1061 1199
1062 my ($w, $h) = $self->SUPER::size_request; 1200 my ($w, $h) = $self->SUPER::size_request;
1063 1201
1064 ( 1202 (
1065 $w + $self->border * 2, 1203 $w + $self->border * 2,
1066 $h + $self->border * 2, 1204 $h + $self->border * 2,
1067 ) 1205 )
1068} 1206}
1069 1207
1070sub size_allocate { 1208sub invoke_size_allocate {
1071 my ($self, $w, $h) = @_; 1209 my ($self, $w, $h) = @_;
1072 1210
1211 if ($self->{title_widget}) {
1212 $self->{title_widget}{w} = $w;
1213 $self->{title_widget}{h} = $h;
1214 $self->{title_widget}->invoke_size_allocate ($w, $h);
1215 }
1216
1217 my $border = $self->border;
1218
1073 $h -= List::Util::max 0, $self->border * 2; 1219 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1220 $w -= List::Util::max 0, $border * 2;
1075 1221
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); 1222 $self->child->configure ($border, $border, $w, $h);
1080}
1081 1223
1224 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1225 if $self->{close_button};
1226
1227 1
1228}
1229
1230sub invoke_delete {
1231 my ($self) = @_;
1232
1233 $self->hide;
1234
1235 1
1236}
1237
1082sub button_down { 1238sub invoke_button_down {
1083 my ($self, $ev, $x, $y) = @_; 1239 my ($self, $ev, $x, $y) = @_;
1084 1240
1085 my ($w, $h) = @$self{qw(w h)}; 1241 my ($w, $h) = @$self{qw(w h)};
1086 my $border = $self->border; 1242 my $border = $self->border;
1087 1243
… …
1103 my $dy = $ev->{y} - $oy; 1259 my $dy = $ev->{y} - $oy;
1104 1260
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1261 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1262 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1263
1264 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1265 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1266 };
1111 1267
1112 } elsif ($lr ^ $td) { 1268 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1269 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1270 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1117 my ($ev, $x, $y) = @_; 1273 my ($ev, $x, $y) = @_;
1118 1274
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1275 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1276
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1277 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1278 # HACK: the next line is required to enforce placement
1279 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122 }; 1280 };
1281 } else {
1282 return 0;
1283 }
1284
1123 } 1285 1
1124} 1286}
1125 1287
1126sub button_up { 1288sub invoke_button_up {
1127 my ($self, $ev, $x, $y) = @_; 1289 my ($self, $ev, $x, $y) = @_;
1128 1290
1129 delete $self->{motion}; 1291 ! ! delete $self->{motion}
1130} 1292}
1131 1293
1132sub mouse_motion { 1294sub invoke_mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1295 my ($self, $ev, $x, $y) = @_;
1134 1296
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1297 $self->{motion}->($ev, $x, $y) if $self->{motion};
1298
1299 ! ! $self->{motion}
1300}
1301
1302sub invoke_visibility_change {
1303 my ($self, $visible) = @_;
1304
1305 delete $self->{motion} unless $visible;
1306
1307 0
1136} 1308}
1137 1309
1138sub _draw { 1310sub _draw {
1139 my ($self) = @_; 1311 my ($self) = @_;
1140 1312
1313 my $child = $self->{children}[0];
1314
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1315 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1316 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1317
1144 glEnable GL_TEXTURE_2D; 1318 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1319 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1320
1147 my $border = $self->border; 1321 my $border = $self->border;
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1336 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1337 }
1164 1338
1165 glDisable GL_TEXTURE_2D; 1339 glDisable GL_TEXTURE_2D;
1166 1340
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1341 $child->draw;
1342
1343 if ($self->{title_widget}) {
1344 glTranslate 0, $border - $self->{h};
1345 $self->{title_widget}->_draw;
1346
1347 glTranslate 0, - ($border - $self->{h});
1348 }
1349
1350 $self->{close_button}->draw
1351 if $self->{close_button};
1170} 1352}
1171 1353
1172############################################################################# 1354#############################################################################
1173 1355
1174package CFClient::UI::Table; 1356package CFPlus::UI::Table;
1175 1357
1176our @ISA = CFClient::UI::Base::; 1358our @ISA = CFPlus::UI::Base::;
1177 1359
1178use List::Util qw(max sum); 1360use List::Util qw(max sum);
1179 1361
1180use CFClient::OpenGL; 1362use CFPlus::OpenGL;
1181 1363
1182sub new { 1364sub new {
1183 my $class = shift; 1365 my $class = shift;
1184 1366
1185 $class->SUPER::new ( 1367 $class->SUPER::new (
… …
1191sub children { 1373sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1374 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1193} 1375}
1194 1376
1195sub add { 1377sub add {
1196 my ($self, $x, $y, $child) = @_; 1378 my ($self) = shift;
1197 1379
1380 while (@_) {
1381 my ($x, $y, $child) = splice @_, 0, 3, ();
1198 $child->set_parent ($self); 1382 $child->set_parent ($self);
1199 $self->{children}[$y][$x] = $child; 1383 $self->{children}[$y][$x] = $child;
1384 }
1200 1385
1386 $self->{force_realloc} = 1;
1387 $self->{force_size_alloc} = 1;
1201 $self->realloc; 1388 $self->realloc;
1389}
1390
1391sub remove {
1392 my ($self, $child) = @_;
1393
1394 # TODO: not yet implemented
1202} 1395}
1203 1396
1204# TODO: move to container class maybe? send children a signal on removal? 1397# TODO: move to container class maybe? send children a signal on removal?
1205sub clear { 1398sub clear {
1206 my ($self) = @_; 1399 my ($self) = @_;
… …
1247 (sum @$ws), 1440 (sum @$ws),
1248 (sum @$hs), 1441 (sum @$hs),
1249 ) 1442 )
1250} 1443}
1251 1444
1252sub size_allocate { 1445sub invoke_size_allocate {
1253 my ($self, $w, $h) = @_; 1446 my ($self, $w, $h) = @_;
1254 1447
1255 my ($ws, $hs) = $self->get_wh; 1448 my ($ws, $hs) = $self->get_wh;
1256 1449
1257 my $req_w = (sum @$ws) || 1; 1450 my $req_w = (sum @$ws) || 1;
… …
1264 1457
1265 # linearly scale sizes 1458 # linearly scale sizes
1266 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1459 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1267 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1460 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1268 1461
1269 CFClient::UI::harmonize $ws; 1462 CFPlus::UI::harmonize $ws;
1270 CFClient::UI::harmonize $hs; 1463 CFPlus::UI::harmonize $hs;
1271 1464
1272 my $y; 1465 my $y;
1273 1466
1274 for my $r (0 .. $#{$self->{children}}) { 1467 for my $r (0 .. $#{$self->{children}}) {
1275 my $row = $self->{children}[$r] 1468 my $row = $self->{children}[$r]
… …
1289 } 1482 }
1290 1483
1291 $y += $row_h; 1484 $y += $row_h;
1292 } 1485 }
1293 1486
1487 1
1294} 1488}
1295 1489
1296sub find_widget { 1490sub find_widget {
1297 my ($self, $x, $y) = @_; 1491 my ($self, $x, $y) = @_;
1298 1492
… …
1317 } 1511 }
1318} 1512}
1319 1513
1320############################################################################# 1514#############################################################################
1321 1515
1322package CFClient::UI::Box; 1516package CFPlus::UI::Box;
1323 1517
1324our @ISA = CFClient::UI::Container::; 1518our @ISA = CFPlus::UI::Container::;
1325 1519
1326sub size_request { 1520sub size_request {
1327 my ($self) = @_; 1521 my ($self) = @_;
1328 1522
1329 $self->{vertical} 1523 $self->{vertical}
… …
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1529 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1530 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 ) 1531 )
1338} 1532}
1339 1533
1340sub size_allocate { 1534sub invoke_size_allocate {
1341 my ($self, $w, $h) = @_; 1535 my ($self, $w, $h) = @_;
1342 1536
1343 my $space = $self->{vertical} ? $h : $w; 1537 my $space = $self->{vertical} ? $h : $w;
1344 my $children = $self->{children}; 1538 my @children = $self->visible_children;
1345 1539
1346 my @req; 1540 my @req;
1347 1541
1348 if ($self->{homogeneous}) { 1542 if ($self->{homogeneous}) {
1349 @req = ($space / (@$children || 1)) x @$children; 1543 @req = ($space / (@children || 1)) x @children;
1350 } else { 1544 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1545 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1352 my $req = List::Util::sum @req; 1546 my $req = List::Util::sum @req;
1353 1547
1354 if ($req > $space) { 1548 if ($req > $space) {
1355 # ah well, not enough space 1549 # ah well, not enough space
1356 $_ *= $space / $req for @req; 1550 $_ *= $space / $req for @req;
1357 } else { 1551 } else {
1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1552 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1359 1553
1360 $space = ($space - $req) / $expand; # remaining space to give away 1554 $space = ($space - $req) / $expand; # remaining space to give away
1361 1555
1362 $req[$_] += $space * $children->[$_]{expand} 1556 $req[$_] += $space * $children[$_]{expand}
1363 for 0 .. $#$children; 1557 for 0 .. $#children;
1364 } 1558 }
1365 } 1559 }
1366 1560
1367 CFClient::UI::harmonize \@req; 1561 CFPlus::UI::harmonize \@req;
1368 1562
1369 my $pos = 0; 1563 my $pos = 0;
1370 for (0 .. $#$children) { 1564 for (0 .. $#children) {
1371 my $alloc = $req[$_]; 1565 my $alloc = $req[$_];
1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1566 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1373 1567
1374 $pos += $alloc; 1568 $pos += $alloc;
1375 } 1569 }
1376 1570
1377 1 1571 1
1378} 1572}
1379 1573
1380############################################################################# 1574#############################################################################
1381 1575
1382package CFClient::UI::HBox; 1576package CFPlus::UI::HBox;
1383 1577
1384our @ISA = CFClient::UI::Box::; 1578our @ISA = CFPlus::UI::Box::;
1385 1579
1386sub new { 1580sub new {
1387 my $class = shift; 1581 my $class = shift;
1388 1582
1389 $class->SUPER::new ( 1583 $class->SUPER::new (
… …
1392 ) 1586 )
1393} 1587}
1394 1588
1395############################################################################# 1589#############################################################################
1396 1590
1397package CFClient::UI::VBox; 1591package CFPlus::UI::VBox;
1398 1592
1399our @ISA = CFClient::UI::Box::; 1593our @ISA = CFPlus::UI::Box::;
1400 1594
1401sub new { 1595sub new {
1402 my $class = shift; 1596 my $class = shift;
1403 1597
1404 $class->SUPER::new ( 1598 $class->SUPER::new (
… …
1407 ) 1601 )
1408} 1602}
1409 1603
1410############################################################################# 1604#############################################################################
1411 1605
1412package CFClient::UI::Label; 1606package CFPlus::UI::Label;
1413 1607
1414our @ISA = CFClient::UI::DrawBG::; 1608our @ISA = CFPlus::UI::DrawBG::;
1415 1609
1416use CFClient::OpenGL; 1610use CFPlus::OpenGL;
1417 1611
1418sub new { 1612sub new {
1419 my ($class, %arg) = @_; 1613 my ($class, %arg) = @_;
1420 1614
1421 my $self = $class->SUPER::new ( 1615 my $self = $class->SUPER::new (
… …
1425 #font => default_font 1619 #font => default_font
1426 #text => initial text 1620 #text => initial text
1427 #markup => initial narkup 1621 #markup => initial narkup
1428 #max_w => maximum pixel width 1622 #max_w => maximum pixel width
1429 ellipsise => 3, # end 1623 ellipsise => 3, # end
1430 layout => (new CFClient::Layout), 1624 layout => (new CFPlus::Layout),
1431 fontsize => 1, 1625 fontsize => 1,
1432 align => -1, 1626 align => -1,
1433 valign => -1, 1627 valign => -1,
1434 padding_x => 2, 1628 padding_x => 2,
1435 padding_y => 2, 1629 padding_y => 2,
1436 can_events => 0, 1630 can_events => 0,
1437 %arg 1631 %arg
1438 ); 1632 );
1439 1633
1440 if (exists $self->{template}) { 1634 if (exists $self->{template}) {
1441 my $layout = new CFClient::Layout; 1635 my $layout = new CFPlus::Layout;
1442 $layout->set_text (delete $self->{template}); 1636 $layout->set_text (delete $self->{template});
1443 $self->{template} = $layout; 1637 $self->{template} = $layout;
1444 } 1638 }
1445 1639
1446 if (exists $self->{markup}) { 1640 if (exists $self->{markup}) {
… …
1450 } 1644 }
1451 1645
1452 $self 1646 $self
1453} 1647}
1454 1648
1455sub escape($) {
1456 local $_ = $_[0];
1457
1458 s/&/&amp;/g;
1459 s/>/&gt;/g;
1460 s/</&lt;/g;
1461
1462 $_
1463}
1464
1465sub update { 1649sub update {
1466 my ($self) = @_; 1650 my ($self) = @_;
1467 1651
1468 delete $self->{texture}; 1652 delete $self->{texture};
1469 $self->SUPER::update; 1653 $self->SUPER::update;
1470} 1654}
1471 1655
1656sub realloc {
1657 my ($self) = @_;
1658
1659 delete $self->{ox};
1660 $self->SUPER::realloc;
1661}
1662
1472sub set_text { 1663sub set_text {
1473 my ($self, $text) = @_; 1664 my ($self, $text) = @_;
1474 1665
1475 return if $self->{text} eq "T$text"; 1666 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text"; 1667 $self->{text} = "T$text";
1477 1668
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479 $self->{layout}->set_text ($text); 1669 $self->{layout}->set_text ($text);
1480 1670
1671 delete $self->{size_req};
1481 $self->realloc; 1672 $self->realloc;
1482 $self->update; 1673 $self->update;
1483} 1674}
1484 1675
1485sub set_markup { 1676sub set_markup {
… …
1488 return if $self->{text} eq "M$markup"; 1679 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup"; 1680 $self->{text} = "M$markup";
1490 1681
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1682 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492 1683
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494 $self->{layout}->set_markup ($markup); 1684 $self->{layout}->set_markup ($markup);
1495 1685
1686 delete $self->{size_req};
1496 $self->realloc; 1687 $self->realloc;
1497 $self->update; 1688 $self->update;
1498} 1689}
1499 1690
1500sub size_request { 1691sub size_request {
1501 my ($self) = @_; 1692 my ($self) = @_;
1502 1693
1694 $self->{size_req} ||= do {
1503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1695 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1); 1696 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1697 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1698 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1699 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508 1700
1509 my ($w, $h) = $self->{layout}->size; 1701 my ($w, $h) = $self->{layout}->size;
1510 1702
1511 if (exists $self->{template}) { 1703 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font}; 1704 $self->{template}->set_font ($self->{font}) if $self->{font};
1705 $self->{template}->set_width ($self->{max_w} || -1);
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1706 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514 1707
1515 my ($w2, $h2) = $self->{template}->size; 1708 my ($w2, $h2) = $self->{template}->size;
1516 1709
1517 $w = List::Util::max $w, $w2; 1710 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2; 1711 $h = List::Util::max $h, $h2;
1712 }
1713
1714 [$w, $h]
1519 } 1715 };
1520 1716
1521 ($w, $h) 1717 @{ $self->{size_req} }
1522} 1718}
1523 1719
1720sub baseline_shift {
1721 $_[0]{layout}->descent
1722}
1723
1524sub size_allocate { 1724sub invoke_size_allocate {
1525 my ($self, $w, $h) = @_; 1725 my ($self, $w, $h) = @_;
1526 1726
1727 delete $self->{ox};
1728
1527 delete $self->{texture} 1729 delete $self->{texture}
1528 ;#d# 1730 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1731
1732 1
1529} 1733}
1530 1734
1531sub set_fontsize { 1735sub set_fontsize {
1532 my ($self, $fontsize) = @_; 1736 my ($self, $fontsize) = @_;
1533 1737
1534 $self->{fontsize} = $fontsize; 1738 $self->{fontsize} = $fontsize;
1739 delete $self->{size_req};
1535 delete $self->{texture}; 1740 delete $self->{texture};
1536 1741
1537 $self->realloc; 1742 $self->realloc;
1538} 1743}
1539 1744
1745sub reconfigure {
1746 my ($self) = @_;
1747
1748 delete $self->{size_req};
1749 delete $self->{texture};
1750
1751 $self->SUPER::reconfigure;
1752}
1753
1540sub _draw { 1754sub _draw {
1541 my ($self) = @_; 1755 my ($self) = @_;
1542 1756
1543 $self->SUPER::_draw; # draw background, if applicable 1757 $self->SUPER::_draw; # draw background, if applicable
1544 1758
1545 my $tex = $self->{texture} ||= do { 1759 my $size = $self->{texture} ||= do {
1546 $self->{layout}->set_foreground (@{$self->{fg}}); 1760 $self->{layout}->set_foreground (@{$self->{fg}});
1547 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1761 $self->{layout}->set_font ($self->{font}) if $self->{font};
1548 $self->{layout}->set_width ($self->{w}); 1762 $self->{layout}->set_width ($self->{w});
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1763 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1764 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1765 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1766
1553 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1767 [$self->{layout}->size]
1768 };
1554 1769
1770 unless (exists $self->{ox}) {
1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1771 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1772 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1557 : ($self->{w} - $tex->{w}) * 0.5); 1773 : ($self->{w} - $size->[0]) * 0.5);
1558 1774
1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1775 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1776 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1561 : ($self->{h} - $tex->{h}) * 0.5); 1777 : ($self->{h} - $size->[1]) * 0.5);
1562
1563 $tex
1564 }; 1778 };
1565 1779
1566 glEnable GL_TEXTURE_2D; 1780 my $w = List::Util::min $self->{w} + 4, $size->[0];
1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1781 my $h = List::Util::min $self->{h} + 2, $size->[1];
1568 1782
1569 if ($tex->{format} == GL_ALPHA) { 1783 $self->{layout}->render ($self->{ox}, $self->{oy});
1570 glColor @{$self->{fg}};
1571 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1572 } else {
1573 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1574 }
1575
1576 glDisable GL_TEXTURE_2D;
1577} 1784}
1578 1785
1579############################################################################# 1786#############################################################################
1580 1787
1581package CFClient::UI::EntryBase; 1788package CFPlus::UI::EntryBase;
1582 1789
1583our @ISA = CFClient::UI::Label::; 1790our @ISA = CFPlus::UI::Label::;
1584 1791
1585use CFClient::OpenGL; 1792use CFPlus::OpenGL;
1586 1793
1587sub new { 1794sub new {
1588 my $class = shift; 1795 my $class = shift;
1589 1796
1590 $class->SUPER::new ( 1797 $class->SUPER::new (
… …
1595 can_hover => 1, 1802 can_hover => 1,
1596 can_focus => 1, 1803 can_focus => 1,
1597 valign => 0, 1804 valign => 0,
1598 can_events => 1, 1805 can_events => 1,
1599 #text => ... 1806 #text => ...
1807 #hidden => "*",
1600 @_ 1808 @_
1601 ) 1809 )
1602} 1810}
1603 1811
1604sub _set_text { 1812sub _set_text {
… …
1606 1814
1607 delete $self->{cur_h}; 1815 delete $self->{cur_h};
1608 1816
1609 return if $self->{text} eq $text; 1817 return if $self->{text} eq $text;
1610 1818
1611 delete $self->{texture};
1612
1613 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1614 $self->{text} = $text; 1820 $self->{text} = $text;
1615 1821
1616 $text =~ s/./*/g if $self->{hidden}; 1822 $text =~ s/./*/g if $self->{hidden};
1617 $self->{layout}->set_text ("$text "); 1823 $self->{layout}->set_text ("$text ");
1824 delete $self->{size_req};
1618 1825
1619 $self->_emit (changed => $self->{text}); 1826 $self->emit (changed => $self->{text});
1827
1828 $self->realloc;
1829 $self->update;
1620} 1830}
1621 1831
1622sub set_text { 1832sub set_text {
1623 my ($self, $text) = @_; 1833 my ($self, $text) = @_;
1624 1834
1625 $self->{cursor} = length $text; 1835 $self->{cursor} = length $text;
1626 $self->_set_text ($text); 1836 $self->_set_text ($text);
1627
1628 $self->realloc;
1629} 1837}
1630 1838
1631sub get_text { 1839sub get_text {
1632 $_[0]{text} 1840 $_[0]{text}
1633} 1841}
… …
1638 my ($w, $h) = $self->SUPER::size_request; 1846 my ($w, $h) = $self->SUPER::size_request;
1639 1847
1640 ($w + 1, $h) # add 1 for cursor 1848 ($w + 1, $h) # add 1 for cursor
1641} 1849}
1642 1850
1643sub key_down { 1851sub invoke_key_down {
1644 my ($self, $ev) = @_; 1852 my ($self, $ev) = @_;
1645 1853
1646 my $mod = $ev->{mod}; 1854 my $mod = $ev->{mod};
1647 my $sym = $ev->{sym}; 1855 my $sym = $ev->{sym};
1648 my $uni = $ev->{unicode}; 1856 my $uni = $ev->{unicode};
… …
1651 1859
1652 if ($uni == 8) { 1860 if ($uni == 8) {
1653 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1861 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1654 } elsif ($uni == 127) { 1862 } elsif ($uni == 127) {
1655 substr $text, $self->{cursor}, 1, ""; 1863 substr $text, $self->{cursor}, 1, "";
1656 } elsif ($sym == CFClient::SDLK_LEFT) { 1864 } elsif ($sym == CFPlus::SDLK_LEFT) {
1657 --$self->{cursor} if $self->{cursor}; 1865 --$self->{cursor} if $self->{cursor};
1658 } elsif ($sym == CFClient::SDLK_RIGHT) { 1866 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1659 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1867 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1660 } elsif ($sym == CFClient::SDLK_HOME) { 1868 } elsif ($sym == CFPlus::SDLK_HOME) {
1661 $self->{cursor} = 0; 1869 $self->{cursor} = 0;
1662 } elsif ($sym == CFClient::SDLK_END) { 1870 } elsif ($sym == CFPlus::SDLK_END) {
1663 $self->{cursor} = length $text; 1871 $self->{cursor} = length $text;
1664 } elsif ($uni == 27) { 1872 } elsif ($uni == 27) {
1665 $self->_emit ('escape'); 1873 $self->emit ('escape');
1666 } elsif ($uni) { 1874 } elsif ($uni) {
1667 substr $text, $self->{cursor}++, 0, chr $uni; 1875 substr $text, $self->{cursor}++, 0, chr $uni;
1876 } else {
1877 return 0;
1668 } 1878 }
1669 1879
1670 $self->_set_text ($text); 1880 $self->_set_text ($text);
1671 1881
1672 $self->realloc; 1882 $self->realloc;
1673}
1674 1883
1884 1
1885}
1886
1675sub focus_in { 1887sub invoke_focus_in {
1676 my ($self) = @_; 1888 my ($self) = @_;
1677 1889
1678 $self->{last_activity} = $::NOW; 1890 $self->{last_activity} = $::NOW;
1679 1891
1680 $self->SUPER::focus_in; 1892 $self->SUPER::invoke_focus_in
1681} 1893}
1682 1894
1683sub button_down { 1895sub invoke_button_down {
1684 my ($self, $ev, $x, $y) = @_; 1896 my ($self, $ev, $x, $y) = @_;
1685 1897
1686 $self->SUPER::button_down ($ev, $x, $y); 1898 $self->SUPER::invoke_button_down ($ev, $x, $y);
1687 1899
1688 my $idx = $self->{layout}->xy_to_index ($x, $y); 1900 my $idx = $self->{layout}->xy_to_index ($x, $y);
1689 1901
1690 # byte-index to char-index 1902 # byte-index to char-index
1691 my $text = $self->{text}; 1903 my $text = $self->{text};
1692 utf8::encode $text; 1904 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1693 $self->{cursor} = length substr $text, 0, $idx; 1905 $self->{cursor} = length $text;
1694 1906
1695 $self->_set_text ($self->{text}); 1907 $self->_set_text ($self->{text});
1696 $self->update; 1908 $self->update;
1909
1910 1
1697} 1911}
1698 1912
1699sub mouse_motion { 1913sub invoke_mouse_motion {
1700 my ($self, $ev, $x, $y) = @_; 1914 my ($self, $ev, $x, $y) = @_;
1701# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1915# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1916
1917 1
1702} 1918}
1703 1919
1704sub _draw { 1920sub _draw {
1705 my ($self) = @_; 1921 my ($self) = @_;
1706 1922
1707 local $self->{fg} = $self->{fg}; 1923 local $self->{fg} = $self->{fg};
1708 1924
1709 if ($FOCUS == $self) { 1925 if ($FOCUS == $self) {
1710 glColor @{$self->{active_bg}}; 1926 glColor_premultiply @{$self->{active_bg}};
1711 $self->{fg} = $self->{active_fg}; 1927 $self->{fg} = $self->{active_fg};
1712 } else { 1928 } else {
1713 glColor @{$self->{bg}}; 1929 glColor_premultiply @{$self->{bg}};
1714 } 1930 }
1715 1931
1716 glEnable GL_BLEND; 1932 glEnable GL_BLEND;
1717 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1933 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1718 glBegin GL_QUADS; 1934 glBegin GL_QUADS;
1719 glVertex 0 , 0; 1935 glVertex 0 , 0;
1720 glVertex 0 , $self->{h}; 1936 glVertex 0 , $self->{h};
1721 glVertex $self->{w}, $self->{h}; 1937 glVertex $self->{w}, $self->{h};
1722 glVertex $self->{w}, 0; 1938 glVertex $self->{w}, 0;
… …
1741 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 1957 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1742 glEnd; 1958 glEnd;
1743 } 1959 }
1744} 1960}
1745 1961
1746package CFClient::UI::Entry; 1962package CFPlus::UI::Entry;
1747 1963
1748our @ISA = CFClient::UI::EntryBase::; 1964our @ISA = CFPlus::UI::EntryBase::;
1749 1965
1750use CFClient::OpenGL; 1966use CFPlus::OpenGL;
1751 1967
1752sub key_down { 1968sub invoke_key_down {
1753 my ($self, $ev) = @_; 1969 my ($self, $ev) = @_;
1754 1970
1755 my $sym = $ev->{sym}; 1971 my $sym = $ev->{sym};
1756 1972
1757 if ($sym == 13) { 1973 if ($sym == 13) {
1758 unshift @{$self->{history}}, 1974 unshift @{$self->{history}},
1759 my $txt = $self->get_text; 1975 my $txt = $self->get_text;
1976
1760 $self->{history_pointer} = -1; 1977 $self->{history_pointer} = -1;
1761 $self->{history_saveback} = ''; 1978 $self->{history_saveback} = '';
1762 $self->_emit (activate => $txt); 1979 $self->emit (activate => $txt);
1763 $self->update; 1980 $self->update;
1764 1981
1765 } elsif ($sym == CFClient::SDLK_UP) { 1982 } elsif ($sym == CFPlus::SDLK_UP) {
1766 if ($self->{history_pointer} < 0) { 1983 if ($self->{history_pointer} < 0) {
1767 $self->{history_saveback} = $self->get_text; 1984 $self->{history_saveback} = $self->get_text;
1768 } 1985 }
1769 if (@{$self->{history} || []} > 0) { 1986 if (@{$self->{history} || []} > 0) {
1770 $self->{history_pointer}++; 1987 $self->{history_pointer}++;
… …
1772 $self->{history_pointer} = @{$self->{history} || []} - 1; 1989 $self->{history_pointer} = @{$self->{history} || []} - 1;
1773 } 1990 }
1774 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1991 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1775 } 1992 }
1776 1993
1777 } elsif ($sym == CFClient::SDLK_DOWN) { 1994 } elsif ($sym == CFPlus::SDLK_DOWN) {
1778 $self->{history_pointer}--; 1995 $self->{history_pointer}--;
1779 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1996 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1780 1997
1781 if ($self->{history_pointer} >= 0) { 1998 if ($self->{history_pointer} >= 0) {
1782 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1999 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1783 } else { 2000 } else {
1784 $self->set_text ($self->{history_saveback}); 2001 $self->set_text ($self->{history_saveback});
1785 } 2002 }
1786 2003
1787 } else { 2004 } else {
1788 $self->SUPER::key_down ($ev); 2005 return $self->SUPER::invoke_key_down ($ev)
2006 }
2007
1789 } 2008 1
1790
1791} 2009}
1792 2010
1793############################################################################# 2011#############################################################################
1794 2012
1795package CFClient::UI::Button; 2013package CFPlus::UI::Button;
1796 2014
1797our @ISA = CFClient::UI::Label::; 2015our @ISA = CFPlus::UI::Label::;
1798 2016
1799use CFClient::OpenGL; 2017use CFPlus::OpenGL;
1800 2018
1801my @tex = 2019my @tex =
1802 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2020 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1803 qw(b1_button_active.png); 2021 qw(b1_button_active.png);
1804 2022
1805sub new { 2023sub new {
1806 my $class = shift; 2024 my $class = shift;
1807 2025
… …
1816 can_events => 1, 2034 can_events => 1,
1817 @_ 2035 @_
1818 ) 2036 )
1819} 2037}
1820 2038
1821sub activate { }
1822
1823sub button_up { 2039sub invoke_button_up {
1824 my ($self, $ev, $x, $y) = @_; 2040 my ($self, $ev, $x, $y) = @_;
1825 2041
1826 $self->emit ("activate") 2042 $self->emit ("activate")
1827 if $x >= 0 && $x < $self->{w} 2043 if $x >= 0 && $x < $self->{w}
1828 && $y >= 0 && $y < $self->{h}; 2044 && $y >= 0 && $y < $self->{h};
2045
2046 1
1829} 2047}
1830 2048
1831sub _draw { 2049sub _draw {
1832 my ($self) = @_; 2050 my ($self) = @_;
1833 2051
1834 local $self->{fg} = $self->{fg}; 2052 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1835
1836 if ($GRAB == $self) {
1837 $self->{fg} = $self->{active_fg};
1838 }
1839 2053
1840 glEnable GL_TEXTURE_2D; 2054 glEnable GL_TEXTURE_2D;
1841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1842 glColor 0, 0, 0, 1; 2056 glColor 0, 0, 0, 1;
1843 2057
… …
1848 $self->SUPER::_draw; 2062 $self->SUPER::_draw;
1849} 2063}
1850 2064
1851############################################################################# 2065#############################################################################
1852 2066
1853package CFClient::UI::CheckBox; 2067package CFPlus::UI::CheckBox;
1854 2068
1855our @ISA = CFClient::UI::DrawBG::; 2069our @ISA = CFPlus::UI::DrawBG::;
1856 2070
1857my @tex = 2071my @tex =
1858 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2072 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1859 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2073 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1860 2074
1861use CFClient::OpenGL; 2075use CFPlus::OpenGL;
1862 2076
1863sub new { 2077sub new {
1864 my $class = shift; 2078 my $class = shift;
1865 2079
1866 $class->SUPER::new ( 2080 $class->SUPER::new (
… …
1880 my ($self) = @_; 2094 my ($self) = @_;
1881 2095
1882 (6) x 2 2096 (6) x 2
1883} 2097}
1884 2098
2099sub toggle {
2100 my ($self) = @_;
2101
2102 $self->{state} = !$self->{state};
2103 $self->emit (changed => $self->{state});
2104 $self->update;
2105}
2106
1885sub button_down { 2107sub invoke_button_down {
1886 my ($self, $ev, $x, $y) = @_; 2108 my ($self, $ev, $x, $y) = @_;
1887 2109
1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2110 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2111 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1890 $self->{state} = !$self->{state}; 2112 $self->toggle;
1891 $self->_emit (changed => $self->{state}); 2113 } else {
2114 return 0
2115 }
2116
1892 } 2117 1
1893} 2118}
1894 2119
1895sub _draw { 2120sub _draw {
1896 my ($self) = @_; 2121 my ($self) = @_;
1897 2122
… …
1912 glDisable GL_TEXTURE_2D; 2137 glDisable GL_TEXTURE_2D;
1913} 2138}
1914 2139
1915############################################################################# 2140#############################################################################
1916 2141
1917package CFClient::UI::Image; 2142package CFPlus::UI::Image;
1918 2143
1919our @ISA = CFClient::UI::Base::; 2144our @ISA = CFPlus::UI::Base::;
1920 2145
1921use CFClient::OpenGL; 2146use CFPlus::OpenGL;
1922use Carp qw/confess/;
1923 2147
1924our %loaded_images; 2148our %texture_cache;
1925 2149
1926sub new { 2150sub new {
1927 my $class = shift; 2151 my $class = shift;
1928 2152
1929 my $self = $class->SUPER::new (can_events => 0, @_); 2153 my $self = $class->SUPER::new (
2154 can_events => 0,
2155 @_,
2156 );
1930 2157
1931 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2158 $self->{path} || $self->{tex}
2159 or Carp::croak "'path' or 'tex' attributes required";
1932 2160
1933 $loaded_images{$self->{image}} ||= 2161 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1934 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2162 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1935 2163
1936 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2164 Scalar::Util::weaken $texture_cache{$self->{path}};
1937 2165
1938 Scalar::Util::weaken $loaded_images{$self->{image}}; 2166 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1939
1940 $self->{aspect} = $tex->{w} / $tex->{h};
1941 2167
1942 $self 2168 $self
1943} 2169}
1944 2170
2171sub STORABLE_freeze {
2172 my ($self, $cloning) = @_;
2173
2174 $self->{path}
2175 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2176
2177 $self->{path}
2178}
2179
2180sub STORABLE_attach {
2181 my ($self, $cloning, $path) = @_;
2182
2183 $self->new (path => $path)
2184}
2185
1945sub size_request { 2186sub size_request {
1946 my ($self) = @_; 2187 my ($self) = @_;
1947 2188
1948 ($self->{tex}->{w}, $self->{tex}->{h}) 2189 ($self->{tex}{w}, $self->{tex}{h})
1949} 2190}
1950 2191
1951sub _draw { 2192sub _draw {
1952 my ($self) = @_; 2193 my ($self) = @_;
1953 2194
… …
1963 } 2204 }
1964 2205
1965 glEnable GL_TEXTURE_2D; 2206 glEnable GL_TEXTURE_2D;
1966 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2207 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1967 2208
1968 $tex->draw_quad_alpha (0, 0, $w, $h); 2209 $tex->draw_quad (0, 0, $w, $h);
1969 2210
1970 glDisable GL_TEXTURE_2D; 2211 glDisable GL_TEXTURE_2D;
1971} 2212}
1972 2213
1973############################################################################# 2214#############################################################################
1974 2215
2216package CFPlus::UI::ImageButton;
2217
2218our @ISA = CFPlus::UI::Image::;
2219
2220use CFPlus::OpenGL;
2221
2222my %textures;
2223
2224sub new {
2225 my $class = shift;
2226
2227 my $self = $class->SUPER::new (
2228 padding_x => 4,
2229 padding_y => 4,
2230 fg => [1, 1, 1],
2231 active_fg => [0, 0, 1],
2232 can_hover => 1,
2233 align => 0,
2234 valign => 0,
2235 can_events => 1,
2236 @_
2237 );
2238}
2239
2240sub invoke_button_up {
2241 my ($self, $ev, $x, $y) = @_;
2242
2243 $self->emit ("activate")
2244 if $x >= 0 && $x < $self->{w}
2245 && $y >= 0 && $y < $self->{h};
2246
2247 1
2248}
2249
2250#############################################################################
2251
1975package CFClient::UI::VGauge; 2252package CFPlus::UI::VGauge;
1976 2253
1977our @ISA = CFClient::UI::Base::; 2254our @ISA = CFPlus::UI::Base::;
1978 2255
1979use List::Util qw(min max); 2256use List::Util qw(min max);
1980 2257
1981use CFClient::OpenGL; 2258use CFPlus::OpenGL;
1982 2259
1983my %tex = ( 2260my %tex = (
1984 food => [ 2261 food => [
1985 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2262 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1986 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2263 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1987 ], 2264 ],
1988 grace => [ 2265 grace => [
1989 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2266 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1990 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2267 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1991 ], 2268 ],
1992 hp => [ 2269 hp => [
1993 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2270 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1994 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2271 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1995 ], 2272 ],
1996 mana => [ 2273 mana => [
1997 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2274 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1998 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2275 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1999 ], 2276 ],
2000); 2277);
2001 2278
2002# eg. VGauge->new (gauge => 'food'), default gauge: food 2279# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2062 my $ycut1 = max 0, min 1, $ycut; 2339 my $ycut1 = max 0, min 1, $ycut;
2063 my $ycut2 = max 0, min 1, $ycut - 1; 2340 my $ycut2 = max 0, min 1, $ycut - 1;
2064 2341
2065 my $h1 = $self->{h} * (1 - $ycut1); 2342 my $h1 = $self->{h} * (1 - $ycut1);
2066 my $h2 = $self->{h} * (1 - $ycut2); 2343 my $h2 = $self->{h} * (1 - $ycut2);
2344 my $h3 = $self->{h};
2345
2346 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2067 2347
2068 glEnable GL_BLEND; 2348 glEnable GL_BLEND;
2069 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2349 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2350 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2070 glEnable GL_TEXTURE_2D; 2351 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2352 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072 2353
2073 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2354 glBindTexture GL_TEXTURE_2D, $t1->{name};
2074 glBegin GL_QUADS; 2355 glBegin GL_QUADS;
… …
2089 2370
2090 if ($t3) { 2371 if ($t3) {
2091 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2372 glBindTexture GL_TEXTURE_2D, $t3->{name};
2092 glBegin GL_QUADS; 2373 glBegin GL_QUADS;
2093 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2374 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2094 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2375 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2095 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2376 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2096 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2377 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2097 glEnd; 2378 glEnd;
2098 } 2379 }
2099 2380
2100 glDisable GL_BLEND; 2381 glDisable GL_BLEND;
2101 glDisable GL_TEXTURE_2D; 2382 glDisable GL_TEXTURE_2D;
2102} 2383}
2103 2384
2104############################################################################# 2385#############################################################################
2105 2386
2106package CFClient::UI::Gauge; 2387package CFPlus::UI::Gauge;
2107 2388
2108our @ISA = CFClient::UI::VBox::; 2389our @ISA = CFPlus::UI::VBox::;
2109 2390
2110sub new { 2391sub new {
2111 my ($class, %arg) = @_; 2392 my ($class, %arg) = @_;
2112 2393
2113 my $self = $class->SUPER::new ( 2394 my $self = $class->SUPER::new (
… …
2115 can_hover => 1, 2396 can_hover => 1,
2116 can_events => 1, 2397 can_events => 1,
2117 %arg, 2398 %arg,
2118 ); 2399 );
2119 2400
2120 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2401 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2121 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2402 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2122 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2403 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2123 2404
2124 $self 2405 $self
2125} 2406}
2126 2407
2127sub set_fontsize { 2408sub set_fontsize {
… …
2148 $self->{value}->set_text ($val); 2429 $self->{value}->set_text ($val);
2149} 2430}
2150 2431
2151############################################################################# 2432#############################################################################
2152 2433
2153package CFClient::UI::Slider; 2434package CFPlus::UI::Slider;
2154 2435
2155use strict; 2436use strict;
2156 2437
2157use CFClient::OpenGL; 2438use CFPlus::OpenGL;
2158 2439
2159our @ISA = CFClient::UI::DrawBG::; 2440our @ISA = CFPlus::UI::DrawBG::;
2160 2441
2161my @tex = 2442my @tex =
2162 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2443 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2163 qw(s1_slider.png s1_slider_bg.png); 2444 qw(s1_slider.png s1_slider_bg.png);
2164 2445
2165sub new { 2446sub new {
2166 my $class = shift; 2447 my $class = shift;
2167 2448
… …
2188 $self->update; 2469 $self->update;
2189 2470
2190 $self 2471 $self
2191} 2472}
2192 2473
2193sub changed { }
2194
2195sub set_range { 2474sub set_range {
2196 my ($self, $range) = @_; 2475 my ($self, $range) = @_;
2197 2476
2198 ($range, $self->{range}) = ($self->{range}, $range); 2477 ($range, $self->{range}) = ($self->{range}, $range);
2199 2478
2200 $self->update
2201 if "@$range" ne "@{$self->{range}}"; 2479 if ("@$range" ne "@{$self->{range}}") {
2480 $self->update;
2481 $self->set_value ($self->{range}[0]);
2482 }
2202} 2483}
2203 2484
2204sub set_value { 2485sub set_value {
2205 my ($self, $value) = @_; 2486 my ($self, $value) = @_;
2206 2487
… …
2217 if $unit; 2498 if $unit;
2218 2499
2219 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2500 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2220 2501
2221 if ($value != $old_value) { 2502 if ($value != $old_value) {
2222 $self->_emit (changed => $value); 2503 $self->emit (changed => $value);
2223 $self->update; 2504 $self->update;
2224 } 2505 }
2225} 2506}
2226 2507
2227sub size_request { 2508sub size_request {
2228 my ($self) = @_; 2509 my ($self) = @_;
2229 2510
2230 ($self->{req_w}, $self->{req_h}) 2511 ($self->{req_w}, $self->{req_h})
2231} 2512}
2232 2513
2233sub button_down { 2514sub invoke_button_down {
2234 my ($self, $ev, $x, $y) = @_; 2515 my ($self, $ev, $x, $y) = @_;
2235 2516
2236 $self->SUPER::button_down ($ev, $x, $y); 2517 $self->SUPER::invoke_button_down ($ev, $x, $y);
2237 2518
2238 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2519 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239 2520
2240 $self->mouse_motion ($ev, $x, $y); 2521 $self->invoke_mouse_motion ($ev, $x, $y)
2241} 2522}
2242 2523
2243sub mouse_motion { 2524sub invoke_mouse_motion {
2244 my ($self, $ev, $x, $y) = @_; 2525 my ($self, $ev, $x, $y) = @_;
2245 2526
2246 if ($GRAB == $self) { 2527 if ($GRAB == $self) {
2247 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2528 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2248 2529
2249 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2530 my (undef, $lo, $hi, $page) = @{$self->{range}};
2250 2531
2251 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2532 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252 2533
2253 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2534 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2535 } else {
2536 return 0;
2537 }
2538
2254 } 2539 1
2540}
2541
2542sub invoke_mouse_wheel {
2543 my ($self, $ev) = @_;
2544
2545 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2546
2547 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2548
2549 ! ! $delta
2255} 2550}
2256 2551
2257sub update { 2552sub update {
2258 my ($self) = @_; 2553 my ($self) = @_;
2259 2554
2260 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2555 delete $self->{knob_w};
2556 $self->SUPER::update;
2557}
2558
2559sub _draw {
2560 my ($self) = @_;
2561
2562 unless ($self->{knob_w}) {
2261 $self->set_value ($self->{range}[0]); 2563 $self->set_value ($self->{range}[0]);
2262 2564
2263 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2565 my ($value, $lo, $hi, $page) = @{$self->{range}};
2264 my $range = ($hi - $page - $lo) || 1e-100; 2566 my $range = ($hi - $page - $lo) || 1e-100;
2265 2567
… …
2271 $value = ($value - $lo) / $range; 2573 $value = ($value - $lo) / $range;
2272 $value = $value * $self->{scale} + $self->{offset}; 2574 $value = $value * $self->{scale} + $self->{offset};
2273 2575
2274 $self->{knob_x} = $value - $knob_w * 0.5; 2576 $self->{knob_x} = $value - $knob_w * 0.5;
2275 $self->{knob_w} = $knob_w; 2577 $self->{knob_w} = $knob_w;
2276 }); 2578 }
2277
2278 $self->SUPER::update;
2279}
2280
2281sub _draw {
2282 my ($self) = @_;
2283 2579
2284 $self->SUPER::_draw (); 2580 $self->SUPER::_draw ();
2285 2581
2286 glScale $self->{w}, $self->{h}; 2582 glScale $self->{w}, $self->{h};
2287 2583
… …
2307 glDisable GL_TEXTURE_2D; 2603 glDisable GL_TEXTURE_2D;
2308} 2604}
2309 2605
2310############################################################################# 2606#############################################################################
2311 2607
2312package CFClient::UI::ValSlider; 2608package CFPlus::UI::ValSlider;
2313 2609
2314our @ISA = CFClient::UI::HBox::; 2610our @ISA = CFPlus::UI::HBox::;
2315 2611
2316sub new { 2612sub new {
2317 my ($class, %arg) = @_; 2613 my ($class, %arg) = @_;
2318 2614
2319 my $range = delete $arg{range}; 2615 my $range = delete $arg{range};
2320 2616
2321 my $self = $class->SUPER::new ( 2617 my $self = $class->SUPER::new (
2322 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2618 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2323 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2619 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2324 to_value => sub { shift }, 2620 to_value => sub { shift },
2325 from_value => sub { shift }, 2621 from_value => sub { shift },
2326 %arg, 2622 %arg,
2327 ); 2623 );
2328 2624
… …
2348sub set_range { shift->{slider}->set_range (@_) } 2644sub set_range { shift->{slider}->set_range (@_) }
2349sub set_value { shift->{slider}->set_value (@_) } 2645sub set_value { shift->{slider}->set_value (@_) }
2350 2646
2351############################################################################# 2647#############################################################################
2352 2648
2353package CFClient::UI::TextView; 2649package CFPlus::UI::TextScroller;
2354 2650
2355our @ISA = CFClient::UI::HBox::; 2651our @ISA = CFPlus::UI::HBox::;
2356 2652
2357use CFClient::OpenGL; 2653use CFPlus::OpenGL;
2358 2654
2359sub new { 2655sub new {
2360 my $class = shift; 2656 my $class = shift;
2361 2657
2362 my $self = $class->SUPER::new ( 2658 my $self = $class->SUPER::new (
2363 fontsize => 1, 2659 fontsize => 1,
2364 can_events => 0, 2660 can_events => 1,
2661 indent => 0,
2365 #font => default_font 2662 #font => default_font
2366 @_, 2663 @_,
2367 2664
2368 layout => (new CFClient::Layout 1), 2665 layout => (new CFPlus::Layout),
2369 par => [], 2666 par => [],
2370 height => 0, 2667 height => 0,
2371 children => [ 2668 children => [
2372 (new CFClient::UI::Empty expand => 1), 2669 (new CFPlus::UI::Empty expand => 1),
2373 (new CFClient::UI::Slider vertical => 1), 2670 (new CFPlus::UI::Slider vertical => 1),
2374 ], 2671 ],
2375 ); 2672 );
2376 2673
2377 $self->{children}[1]->connect (changed => sub { $self->update }); 2674 $self->{children}[1]->connect (changed => sub { $self->update });
2378 2675
… …
2384 2681
2385 $self->{fontsize} = $fontsize; 2682 $self->{fontsize} = $fontsize;
2386 $self->reflow; 2683 $self->reflow;
2387} 2684}
2388 2685
2686sub size_request {
2687 my ($self) = @_;
2688
2689 my ($empty, $slider) = @{ $self->{children} };
2690
2691 local $self->{children} = [$empty, $slider];
2692 $self->SUPER::size_request
2693}
2694
2389sub size_allocate { 2695sub invoke_size_allocate {
2390 my ($self, $w, $h) = @_; 2696 my ($self, $w, $h) = @_;
2391 2697
2392 $self->SUPER::size_allocate ($w, $h); 2698 my ($empty, $slider, @other) = @{ $self->{children} };
2699 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2393 2700
2394 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2701 $self->{layout}->set_font ($self->{font}) if $self->{font};
2395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2702 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2396 $self->{layout}->set_width ($self->{children}[0]{w}); 2703 $self->{layout}->set_width ($empty->{w});
2704 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2397 2705
2398 $self->reflow; 2706 $self->reflow;
2399}
2400 2707
2401sub text_size { 2708 local $self->{children} = [$empty, $slider];
2709 $self->SUPER::invoke_size_allocate ($w, $h)
2710}
2711
2712sub invoke_mouse_wheel {
2402 my ($self, $text, $indent) = @_; 2713 my ($self, $ev) = @_;
2714
2715 return 0 unless $ev->{dy}; # only vertical movements
2716
2717 $self->{children}[1]->emit (mouse_wheel => $ev);
2718
2719 1
2720}
2721
2722sub get_layout {
2723 my ($self, $para) = @_;
2403 2724
2404 my $layout = $self->{layout}; 2725 my $layout = $self->{layout};
2405 2726
2727 $layout->set_font ($self->{font}) if $self->{font};
2728 $layout->set_foreground (@{$para->{fg}});
2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2729 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2407 $layout->set_width ($self->{children}[0]{w} - $indent); 2730 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2731 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2408 $layout->set_markup ($text); 2732 $layout->set_markup ($para->{markup});
2733
2734 $layout->set_shapes (
2735 map
2736 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2737 @{$para->{widget}}
2409 2738 );
2739
2410 $layout->size 2740 $layout
2411} 2741}
2412 2742
2413sub reflow { 2743sub reflow {
2414 my ($self) = @_; 2744 my ($self) = @_;
2415 2745
… …
2424 $self->{children}[1]->set_value ($offset); 2754 $self->{children}[1]->set_value ($offset);
2425} 2755}
2426 2756
2427sub clear { 2757sub clear {
2428 my ($self) = @_; 2758 my ($self) = @_;
2759
2760 my (undef, undef, @other) = @{ $self->{children} };
2761 $self->remove ($_) for @other;
2429 2762
2430 $self->{par} = []; 2763 $self->{par} = [];
2431 $self->{height} = 0; 2764 $self->{height} = 0;
2432 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2765 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2433} 2766}
2434 2767
2435sub add_paragraph { 2768sub add_paragraph {
2436 my ($self, $color, $text, $indent) = @_; 2769 my $self = shift;
2437 2770
2438 for my $line (split /\n/, $text) { 2771 for my $para (@_) {
2439 my ($w, $h) = $self->text_size ($line); 2772 $para = {
2440 $self->{height} += $h; 2773 fg => [1, 1, 1, 1],
2441 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2774 indent => 0,
2442 } 2775 markup => "",
2776 widget => [],
2777 ref $para ? %$para : (markup => $para),
2778 w => 1e10,
2779 wrapped => 1,
2780 };
2443 2781
2444 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2782 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2783 push @{$self->{par}}, $para;
2784 }
2785
2786 $self->{need_reflow}++;
2787 $self->update;
2788}
2789
2790sub scroll_to_bottom {
2791 my ($self) = @_;
2792
2793 $self->{scroll_to_bottom} = 1;
2794 $self->update;
2445} 2795}
2446 2796
2447sub update { 2797sub update {
2448 my ($self) = @_; 2798 my ($self) = @_;
2449 2799
… …
2451 2801
2452 return unless $self->{h} > 0; 2802 return unless $self->{h} > 0;
2453 2803
2454 delete $self->{texture}; 2804 delete $self->{texture};
2455 2805
2456 $ROOT->on_post_alloc ($self, sub { 2806 $ROOT->on_post_alloc ($self => sub {
2457 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2807 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2458 2808
2459 if (delete $self->{need_reflow}) { 2809 if (delete $self->{need_reflow}) {
2460 my $height = 0; 2810 my $height = 0;
2461 2811
2462 my $layout = $self->{layout};
2463
2464 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2465
2466 for (@{$self->{par}}) { 2812 for my $para (@{$self->{par}}) {
2467 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2813 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2468 $layout->set_width ($W - $_->[3]); 2814 my $layout = $self->get_layout ($para);
2469 $layout->set_markup ($_->[4]);
2470 my ($w, $h) = $layout->size; 2815 my ($w, $h) = $layout->size;
2471 $_->[0] = $w + $_->[3]; 2816
2472 $_->[1] = $h; 2817 $para->{w} = $w + $para->{indent};
2818 $para->{h} = $h;
2819 $para->{wrapped} = $layout->has_wrapped;
2473 } 2820 }
2474 2821
2475 $height += $_->[1]; 2822 $height += $para->{h};
2476 } 2823 }
2477 2824
2478 $self->{height} = $height; 2825 $self->{height} = $height;
2479 2826
2480 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2827 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2481 2828
2482 delete $self->{texture}; 2829 delete $self->{texture};
2483 } 2830 }
2484 2831
2832 if (delete $self->{scroll_to_bottom}) {
2833 $self->{children}[1]->set_value (1e10);
2834 }
2835
2485 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2836 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2486 glClearColor 0.5, 0.5, 0.5, 0; 2837 glClearColor 0, 0, 0, 0;
2487 glClear GL_COLOR_BUFFER_BIT; 2838 glClear GL_COLOR_BUFFER_BIT;
2488 2839
2489 my $top = int $self->{children}[1]{range}[0]; 2840 my $top = int $self->{children}[1]{range}[0];
2490 2841
2491 my $y0 = $top; 2842 my $y0 = $top;
2492 my $y1 = $top + $H; 2843 my $y1 = $top + $H;
2493 2844
2494 my $y = 0; 2845 my $y = 0;
2495 2846
2496 my $layout = $self->{layout};
2497
2498 $layout->set_font ($self->{font}) if $self->{font};
2499
2500 glEnable GL_BLEND;
2501 #TODO# not correct in windows where rgba is forced off
2502 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2503
2504 for my $par (@{$self->{par}}) { 2847 for my $para (@{$self->{par}}) {
2505 my $h = $par->[1]; 2848 my $h = $para->{h};
2506 2849
2507 if ($y0 < $y + $h && $y < $y1) { 2850 if ($y0 < $y + $h && $y < $y1) {
2508 $layout->set_foreground (@{ $par->[2] });
2509 $layout->set_width ($W - $par->[3]);
2510 $layout->set_markup ($par->[4]);
2511 2851
2512 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2852 my $layout = $self->get_layout ($para);
2513 2853
2514 glRasterPos $par->[3], $y - $y0; 2854 $layout->render ($para->{indent}, $y - $y0);
2515 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2855
2856 if (my @w = @{ $para->{widget} }) {
2857 my @s = $layout->get_shapes;
2858
2859 for (@w) {
2860 my ($dx, $dy) = splice @s, 0, 2, ();
2861
2862 $_->{x} = $dx + $para->{indent};
2863 $_->{y} = $dy + $y - $y0;
2864
2865 $_->draw;
2866 }
2867 }
2516 } 2868 }
2517 2869
2518 $y += $h; 2870 $y += $h;
2519 } 2871 }
2520
2521 glDisable GL_BLEND;
2522 }; 2872 };
2523 }); 2873 });
2524} 2874}
2525 2875
2876sub reconfigure {
2877 my ($self) = @_;
2878
2879 $self->SUPER::reconfigure;
2880
2881 $_->{w} = 1e10 for @{ $self->{par} };
2882 $self->reflow;
2883}
2884
2526sub _draw { 2885sub _draw {
2527 my ($self) = @_; 2886 my ($self) = @_;
2528 2887
2529 glEnable GL_TEXTURE_2D; 2888 glEnable GL_TEXTURE_2D;
2530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2889 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2531 glColor 1, 1, 1, 1; 2890 glColor 0, 0, 0, 1;
2532 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2891 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2533 glDisable GL_TEXTURE_2D; 2892 glDisable GL_TEXTURE_2D;
2534 2893
2535 $self->{children}[1]->draw; 2894 $self->{children}[1]->draw;
2536
2537} 2895}
2538 2896
2539############################################################################# 2897#############################################################################
2540 2898
2541package CFClient::UI::Animator; 2899package CFPlus::UI::Animator;
2542 2900
2543use CFClient::OpenGL; 2901use CFPlus::OpenGL;
2544 2902
2545our @ISA = CFClient::UI::Bin::; 2903our @ISA = CFPlus::UI::Bin::;
2546 2904
2547sub moveto { 2905sub moveto {
2548 my ($self, $x, $y) = @_; 2906 my ($self, $x, $y) = @_;
2549 2907
2550 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2908 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2578 glPopMatrix; 2936 glPopMatrix;
2579} 2937}
2580 2938
2581############################################################################# 2939#############################################################################
2582 2940
2583package CFClient::UI::Flopper; 2941package CFPlus::UI::Flopper;
2584 2942
2585our @ISA = CFClient::UI::Button::; 2943our @ISA = CFPlus::UI::Button::;
2586 2944
2587sub new { 2945sub new {
2588 my $class = shift; 2946 my $class = shift;
2589 2947
2590 my $self = $class->SUPER::new ( 2948 my $self = $class->SUPER::new (
… …
2602 $self->{other}->toggle_visibility; 2960 $self->{other}->toggle_visibility;
2603} 2961}
2604 2962
2605############################################################################# 2963#############################################################################
2606 2964
2607package CFClient::UI::Tooltip; 2965package CFPlus::UI::Tooltip;
2608 2966
2609our @ISA = CFClient::UI::Bin::; 2967our @ISA = CFPlus::UI::Bin::;
2610 2968
2611use CFClient::OpenGL; 2969use CFPlus::OpenGL;
2612 2970
2613sub new { 2971sub new {
2614 my $class = shift; 2972 my $class = shift;
2615 2973
2616 $class->SUPER::new ( 2974 $class->SUPER::new (
… …
2619 ) 2977 )
2620} 2978}
2621 2979
2622sub set_tooltip_from { 2980sub set_tooltip_from {
2623 my ($self, $widget) = @_; 2981 my ($self, $widget) = @_;
2982
2983 $widget->{tooltip} = CFPlus::Pod::as_label CFPlus::Pod::section tooltip => $1
2984 if $widget->{tooltip} =~ /^#(.*)$/;
2624 2985
2625 my $tooltip = $widget->{tooltip}; 2986 my $tooltip = $widget->{tooltip};
2626 2987
2627 if ($ENV{CFPLUS_DEBUG} & 2) { 2988 if ($ENV{CFPLUS_DEBUG} & 2) {
2628 $tooltip .= "\n\n" . (ref $widget) . "\n" 2989 $tooltip .= "\n\n" . (ref $widget) . "\n"
2629 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2990 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2630 . "req $widget->{req_w} $widget->{req_h}\n" 2991 . "req $widget->{req_w} $widget->{req_h}\n"
2631 . "visible $widget->{visible}"; 2992 . "visible $widget->{visible}";
2632 } 2993 }
2633 2994
2995 $tooltip =~ s/^\n+//;
2996 $tooltip =~ s/\n+$//;
2997
2634 $self->add (new CFClient::UI::Label 2998 $self->add (new CFPlus::UI::Label
2635 markup => $tooltip, 2999 markup => $tooltip,
2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3000 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2637 fontsize => 0.8, 3001 fontsize => 0.8,
2638 fg => [0, 0, 0, 1], 3002 fg => [0, 0, 0, 1],
2639 ellipsise => 0, 3003 ellipsise => 0,
… …
2647 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3011 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2648 3012
2649 ($w + 4, $h + 4) 3013 ($w + 4, $h + 4)
2650} 3014}
2651 3015
2652sub size_allocate { 3016sub invoke_size_allocate {
2653 my ($self, $w, $h) = @_; 3017 my ($self, $w, $h) = @_;
2654 3018
2655 $self->SUPER::size_allocate ($w - 4, $h - 4); 3019 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2656} 3020}
2657 3021
2658sub visibility_change { 3022sub invoke_visibility_change {
2659 my ($self, $visible) = @_; 3023 my ($self, $visible) = @_;
2660 3024
2661 return unless $visible; 3025 return unless $visible;
2662 3026
2663 $self->{root}->on_post_alloc ("move_$self" => sub { 3027 $self->{root}->on_post_alloc ("move_$self" => sub {
2664 my $widget = $self->{owner} 3028 my $widget = $self->{owner}
2665 or return; 3029 or return;
2666 3030
3031 if ($widget->{visible}) {
2667 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3032 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2668 3033
2669 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3034 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2670 if $x + $self->{w} > $::WIDTH; 3035 if $x + $self->{w} > $self->{root}{w};
2671 3036
2672 $self->move_abs ($x, $y); 3037 $self->move_abs ($x, $y);
3038 } else {
3039 $self->hide;
3040 }
2673 }); 3041 });
2674} 3042}
2675 3043
2676sub _draw { 3044sub _draw {
2677 my ($self) = @_; 3045 my ($self) = @_;
… …
2701 $self->SUPER::_draw; 3069 $self->SUPER::_draw;
2702} 3070}
2703 3071
2704############################################################################# 3072#############################################################################
2705 3073
2706package CFClient::UI::Face; 3074package CFPlus::UI::Face;
2707 3075
2708our @ISA = CFClient::UI::Base::; 3076our @ISA = CFPlus::UI::DrawBG::;
2709 3077
2710use CFClient::OpenGL; 3078use CFPlus::OpenGL;
2711 3079
2712sub new { 3080sub new {
2713 my $class = shift; 3081 my $class = shift;
2714 3082
2715 my $self = $class->SUPER::new ( 3083 my $self = $class->SUPER::new (
… …
2750sub _draw { 3118sub _draw {
2751 my ($self) = @_; 3119 my ($self) = @_;
2752 3120
2753 return unless $::CONN; 3121 return unless $::CONN;
2754 3122
3123 $self->SUPER::_draw;
3124
2755 my $face; 3125 my $face;
2756 3126
2757 if ($self->{frame}) { 3127 if ($self->{frame}) {
2758 my $anim = $::CONN->{anim}[$self->{anim}]; 3128 my $anim = $::CONN->{anim}[$self->{anim}];
2759 3129
… …
2764 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3134 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2765 3135
2766 if ($tex) { 3136 if ($tex) {
2767 glEnable GL_TEXTURE_2D; 3137 glEnable GL_TEXTURE_2D;
2768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3138 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2769 glColor 1, 1, 1, 1; 3139 glColor 0, 0, 0, 1;
2770 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3140 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2771 glDisable GL_TEXTURE_2D; 3141 glDisable GL_TEXTURE_2D;
2772 } 3142 }
2773} 3143}
2774 3144
2775sub DESTROY { 3145sub destroy {
2776 my ($self) = @_; 3146 my ($self) = @_;
2777 3147
2778 $self->{timer}->cancel 3148 $self->{timer}->cancel
2779 if $self->{timer}; 3149 if $self->{timer};
2780 3150
2781 $self->SUPER::DESTROY; 3151 $self->SUPER::destroy;
2782} 3152}
2783 3153
2784############################################################################# 3154#############################################################################
2785 3155
3156package CFPlus::UI::Buttonbar;
3157
3158our @ISA = CFPlus::UI::HBox::;
3159
3160# TODO: should actualyl wrap buttons and other goodies.
3161
3162#############################################################################
3163
2786package CFClient::UI::Menu; 3164package CFPlus::UI::Menu;
2787 3165
2788our @ISA = CFClient::UI::FancyFrame::; 3166our @ISA = CFPlus::UI::FancyFrame::;
2789 3167
2790use CFClient::OpenGL; 3168use CFPlus::OpenGL;
2791 3169
2792sub new { 3170sub new {
2793 my $class = shift; 3171 my $class = shift;
2794 3172
2795 my $self = $class->SUPER::new ( 3173 my $self = $class->SUPER::new (
2796 items => [], 3174 items => [],
2797 z => 100, 3175 z => 100,
2798 @_, 3176 @_,
2799 ); 3177 );
2800 3178
2801 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3179 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2802 3180
2803 for my $item (@{ $self->{items} }) { 3181 for my $item (@{ $self->{items} }) {
2804 my ($widget, $cb) = @$item; 3182 my ($widget, $cb, $tooltip) = @$item;
2805 3183
2806 # handle various types of items, only text for now 3184 # handle various types of items, only text for now
2807 if (!ref $widget) { 3185 if (!ref $widget) {
3186 if ($widget =~ /\t/) {
3187 my ($left, $right) = split /\t/, $widget, 2;
3188
2808 $widget = new CFClient::UI::Label 3189 $widget = new CFPlus::UI::HBox
2809 can_hover => 1, 3190 can_hover => 1,
2810 can_events => 1, 3191 can_events => 1,
3192 tooltip => $tooltip,
3193 children => [
3194 (new CFPlus::UI::Label markup => $left, expand => 1),
3195 (new CFPlus::UI::Label markup => $right, align => +1),
3196 ],
3197 ;
3198
3199 } else {
3200 $widget = new CFPlus::UI::Label
3201 can_hover => 1,
3202 can_events => 1,
2811 text => $widget; 3203 markup => $widget,
3204 tooltip => $tooltip;
3205 }
2812 } 3206 }
2813 3207
2814 $self->{item}{$widget} = $item; 3208 $self->{item}{$widget} = $item;
2815 3209
2816 $self->{vbox}->add ($widget); 3210 $self->{vbox}->add ($widget);
… …
2821 3215
2822# popup given the event (must be a mouse button down event currently) 3216# popup given the event (must be a mouse button down event currently)
2823sub popup { 3217sub popup {
2824 my ($self, $ev) = @_; 3218 my ($self, $ev) = @_;
2825 3219
2826 $self->_emit ("popdown"); 3220 $self->emit ("popdown");
2827 3221
2828 # maybe save $GRAB? must be careful about events... 3222 # maybe save $GRAB? must be careful about events...
2829 $GRAB = $self; 3223 $GRAB = $self;
2830 $self->{button} = $ev->{button}; 3224 $self->{button} = $ev->{button};
2831 3225
2832 $self->show; 3226 $self->show;
2833 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3227 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2834} 3228}
2835 3229
2836sub mouse_motion { 3230sub invoke_mouse_motion {
2837 my ($self, $ev, $x, $y) = @_; 3231 my ($self, $ev, $x, $y) = @_;
2838 3232
2839 # TODO: should use vbox->find_widget or so 3233 # TODO: should use vbox->find_widget or so
2840 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3234 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2841 $self->{hover} = $self->{item}{$HOVER}; 3235 $self->{hover} = $self->{item}{$HOVER};
2842}
2843 3236
3237 0
3238}
3239
2844sub button_up { 3240sub invoke_button_up {
2845 my ($self, $ev, $x, $y) = @_; 3241 my ($self, $ev, $x, $y) = @_;
2846 3242
2847 if ($ev->{button} == $self->{button}) { 3243 if ($ev->{button} == $self->{button}) {
2848 undef $GRAB; 3244 undef $GRAB;
2849 $self->hide; 3245 $self->hide;
2850 3246
2851 $self->_emit ("popdown"); 3247 $self->emit ("popdown");
2852 $self->{hover}[1]->() if $self->{hover}; 3248 $self->{hover}[1]->() if $self->{hover};
3249 } else {
3250 return 0
3251 }
3252
2853 } 3253 1
2854} 3254}
2855 3255
2856############################################################################# 3256#############################################################################
2857 3257
2858package CFClient::UI::Statusbox; 3258package CFPlus::UI::Multiplexer;
2859 3259
2860our @ISA = CFClient::UI::VBox::; 3260our @ISA = CFPlus::UI::Container::;
2861 3261
2862sub new { 3262sub new {
2863 my $class = shift; 3263 my $class = shift;
2864 3264
2865 $class->SUPER::new ( 3265 my $self = $class->SUPER::new (
3266 @_,
3267 );
3268
3269 $self->{current} = $self->{children}[0]
3270 if @{ $self->{children} };
3271
3272 $self
3273}
3274
3275sub add {
3276 my ($self, @widgets) = @_;
3277
3278 $self->SUPER::add (@widgets);
3279
3280 $self->{current} = $self->{children}[0]
3281 if @{ $self->{children} };
3282}
3283
3284sub get_current_page {
3285 my ($self) = @_;
3286
3287 $self->{current}
3288}
3289
3290sub set_current_page {
3291 my ($self, $page_or_widget) = @_;
3292
3293 my $widget = ref $page_or_widget
3294 ? $page_or_widget
3295 : $self->{children}[$page_or_widget];
3296
3297 $self->{current} = $widget;
3298 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3299
3300 $self->emit (page_changed => $self->{current});
3301
3302 $self->realloc;
3303}
3304
3305sub visible_children {
3306 $_[0]{current}
3307}
3308
3309sub size_request {
3310 my ($self) = @_;
3311
3312 $self->{current}->size_request
3313}
3314
3315sub invoke_size_allocate {
3316 my ($self, $w, $h) = @_;
3317
3318 $self->{current}->configure (0, 0, $w, $h);
3319
3320 1
3321}
3322
3323sub _draw {
3324 my ($self) = @_;
3325
3326 $self->{current}->draw;
3327}
3328
3329#############################################################################
3330
3331package CFPlus::UI::Notebook;
3332
3333our @ISA = CFPlus::UI::VBox::;
3334
3335sub new {
3336 my $class = shift;
3337
3338 my $self = $class->SUPER::new (
3339 buttonbar => (new CFPlus::UI::Buttonbar),
3340 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3341 # filter => # will be put between multiplexer and $self
3342 @_,
3343 );
3344
3345 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3346 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3347
3348 $self
3349}
3350
3351sub add {
3352 my ($self, $title, $widget, $tooltip) = @_;
3353
3354 Scalar::Util::weaken $self;
3355
3356 $self->{buttonbar}->add (new CFPlus::UI::Button
3357 markup => $title,
3358 tooltip => $tooltip,
3359 on_activate => sub { $self->set_current_page ($widget) },
3360 );
3361
3362 $self->{multiplexer}->add ($widget);
3363}
3364
3365sub get_current_page {
3366 my ($self) = @_;
3367
3368 $self->{multiplexer}->get_current_page
3369}
3370
3371sub set_current_page {
3372 my ($self, $page) = @_;
3373
3374 $self->{multiplexer}->set_current_page ($page);
3375 $self->emit (page_changed => $self->{multiplexer}{current});
3376}
3377
3378#############################################################################
3379
3380package CFPlus::UI::Selector;
3381
3382use utf8;
3383
3384our @ISA = CFPlus::UI::Button::;
3385
3386sub new {
3387 my $class = shift;
3388
3389 my $self = $class->SUPER::new (
3390 options => [], # [value, title, longdesc], ...
3391 value => undef,
3392 @_,
3393 );
3394
3395 $self->_set_value ($self->{value});
3396
3397 $self
3398}
3399
3400sub invoke_button_down {
3401 my ($self, $ev) = @_;
3402
3403 my @menu_items;
3404
3405 for (@{ $self->{options} }) {
3406 my ($value, $title, $tooltip) = @$_;
3407
3408 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3409 }
3410
3411 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3412}
3413
3414sub _set_value {
3415 my ($self, $value) = @_;
3416
3417 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3418 or return;
3419
3420 $self->{value} = $item->[0];
3421 $self->set_markup ("$item->[1] ⇓");
3422 $self->set_tooltip ($item->[2]);
3423}
3424
3425sub set_value {
3426 my ($self, $value) = @_;
3427
3428 return unless $self->{value} ne $value;
3429
3430 $self->_set_value ($value);
3431 $self->emit (changed => $value);
3432}
3433
3434#############################################################################
3435
3436package CFPlus::UI::Statusbox;
3437
3438our @ISA = CFPlus::UI::VBox::;
3439
3440sub new {
3441 my $class = shift;
3442
3443 my $self = $class->SUPER::new (
2866 fontsize => 0.8, 3444 fontsize => 0.8,
2867 @_, 3445 @_,
2868 ) 3446 );
3447
3448 Scalar::Util::weaken (my $this = $self);
3449
3450 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3451
3452 $self
2869} 3453}
2870 3454
2871sub reorder { 3455sub reorder {
2872 my ($self) = @_; 3456 my ($self) = @_;
2873 my $NOW = time; 3457 my $NOW = Time::HiRes::time;
3458
3459 # freeze display when hovering over any label
3460 return if $CFPlus::UI::TOOLTIP->{owner}
3461 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3462 values %{ $self->{item} };
2874 3463
2875 while (my ($k, $v) = each %{ $self->{item} }) { 3464 while (my ($k, $v) = each %{ $self->{item} }) {
2876 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3465 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2877 } 3466 }
2878 3467
… …
2881 my @items = sort { 3470 my @items = sort {
2882 $a->{pri} <=> $b->{pri} 3471 $a->{pri} <=> $b->{pri}
2883 or $b->{id} <=> $a->{id} 3472 or $b->{id} <=> $a->{id}
2884 } values %{ $self->{item} }; 3473 } values %{ $self->{item} };
2885 3474
3475 $self->{timer}->interval (1);
3476
2886 my $count = 10 + 1; 3477 my $count = 10 + 1;
2887 for my $item (@items) { 3478 for my $item (@items) {
2888 last unless --$count; 3479 last unless --$count;
2889 3480
2890 push @widgets, $item->{label} ||= do { 3481 my $label = $item->{label} ||= do {
2891 # TODO: doesn't handle markup well (read as: at all) 3482 # TODO: doesn't handle markup well (read as: at all)
2892 my $short = $item->{count} > 1 3483 my $short = $item->{count} > 1
2893 ? "<b>$item->{count} ×</b> $item->{text}" 3484 ? "<b>$item->{count} ×</b> $item->{text}"
2894 : $item->{text}; 3485 : $item->{text};
2895 3486
2896 for ($short) { 3487 for ($short) {
2897 s/^\s+//; 3488 s/^\s+//;
2898 s/\s+/ /g; 3489 s/\s+/ /g;
2899 } 3490 }
2900 3491
2901 new CFClient::UI::Label 3492 new CFPlus::UI::Label
2902 markup => $short, 3493 markup => $short,
2903 tooltip => $item->{tooltip}, 3494 tooltip => $item->{tooltip},
2904 tooltip_font => $::FONT_PROP, 3495 tooltip_font => $::FONT_PROP,
2905 tooltip_width => 0.67, 3496 tooltip_width => 0.67,
2906 fontsize => $item->{fontsize} || $self->{fontsize}, 3497 fontsize => $item->{fontsize} || $self->{fontsize},
2907 max_w => $::WIDTH * 0.44, 3498 max_w => $::WIDTH * 0.44,
2908 fg => $item->{fg}, 3499 fg => [@{ $item->{fg} }],
2909 can_events => 1, 3500 can_events => 1,
2910 can_hover => 1 3501 can_hover => 1
2911 }; 3502 };
3503
3504 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3505 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3506 $label->update;
3507 $label->set_max_size (undef, $label->{req_h} * $diff)
3508 if $diff < 1;
3509 $self->{timer}->interval (1/30);
3510 } else {
3511 $label->{fg}[3] = $item->{fg}[3] || 1;
3512 }
3513
3514 push @widgets, $label;
2912 } 3515 }
2913 3516
2914 $self->clear; 3517 $self->clear;
2915 $self->SUPER::add (reverse @widgets); 3518 $self->SUPER::add (reverse @widgets);
2916} 3519}
… …
2921 $text =~ s/^\s+//; 3524 $text =~ s/^\s+//;
2922 $text =~ s/\s+$//; 3525 $text =~ s/\s+$//;
2923 3526
2924 return unless $text; 3527 return unless $text;
2925 3528
2926 my $timeout = time + ((delete $arg{timeout}) || 60); 3529 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2927 3530
2928 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3531 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2929 3532
2930 if (my $item = $self->{item}{$group}) { 3533 if (my $item = $self->{item}{$group}) {
2931 if ($item->{text} eq $text) { 3534 if ($item->{text} eq $text) {
2932 $item->{count}++; 3535 $item->{count}++;
2933 } else { 3536 } else {
2934 $item->{count} = 1; 3537 $item->{count} = 1;
2935 $item->{text} = $item->{tooltip} = $text; 3538 $item->{text} = $item->{tooltip} = $text;
2936 } 3539 }
2937 $item->{id} = ++$self->{id}; 3540 $item->{id} += 0.2;#d#
2938 $item->{timeout} = $timeout; 3541 $item->{timeout} = $timeout;
2939 delete $item->{label}; 3542 delete $item->{label};
2940 } else { 3543 } else {
2941 $self->{item}{$group} = { 3544 $self->{item}{$group} = {
2942 id => ++$self->{id}, 3545 id => ++$self->{id},
… …
2948 count => 1, 3551 count => 1,
2949 %arg, 3552 %arg,
2950 }; 3553 };
2951 } 3554 }
2952 3555
3556 $ROOT->on_refresh (reorder => sub {
2953 $self->reorder; 3557 $self->reorder;
3558 });
2954} 3559}
2955 3560
2956sub reconfigure { 3561sub reconfigure {
2957 my ($self) = @_; 3562 my ($self) = @_;
2958 3563
… …
2961 3566
2962 $self->reorder; 3567 $self->reorder;
2963 $self->SUPER::reconfigure; 3568 $self->SUPER::reconfigure;
2964} 3569}
2965 3570
3571sub destroy {
3572 my ($self) = @_;
3573
3574 $self->{timer}->cancel;
3575
3576 $self->SUPER::destroy;
3577}
3578
2966############################################################################# 3579#############################################################################
2967 3580
2968package CFClient::UI::Inventory; 3581package CFPlus::UI::Inventory;
2969 3582
2970our @ISA = CFClient::UI::ScrolledWindow::; 3583our @ISA = CFPlus::UI::Table::;
2971 3584
2972sub new { 3585sub new {
2973 my $class = shift; 3586 my $class = shift;
2974 3587
2975 my $self = $class->SUPER::new ( 3588 my $self = $class->SUPER::new (
2976 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3589 col_expand => [0, 1, 0],
3590 items => [],
2977 @_, 3591 @_,
2978 ); 3592 );
2979 3593
3594 $self->set_sort_order (undef);
3595
2980 $self 3596 $self
3597}
3598
3599sub update_items {
3600 my ($self) = @_;
3601
3602 $self->clear;
3603
3604 my @item = $self->{sort}->(@{ $self->{items} });
3605
3606 my @adds;
3607 my $row = 0;
3608 for my $item ($self->{sort}->(@{ $self->{items} })) {
3609 CFPlus::Item::update_widgets $item;
3610
3611 push @adds, 0, $row, $item->{face_widget};
3612 push @adds, 1, $row, $item->{desc_widget};
3613 push @adds, 2, $row, $item->{weight_widget};
3614
3615 $row++;
3616 }
3617
3618 $self->add (@adds);
3619}
3620
3621sub set_sort_order {
3622 my ($self, $order) = @_;
3623
3624 $self->{sort} = $order ||= sub {
3625 sort {
3626 $a->{type} <=> $b->{type}
3627 or $a->{name} cmp $b->{name}
3628 } @_
3629 };
3630
3631 $self->update_items;
2981} 3632}
2982 3633
2983sub set_items { 3634sub set_items {
2984 my ($self, $items) = @_; 3635 my ($self, $items) = @_;
2985 3636
2986 $self->{scrolled}->clear; 3637 $self->{items} = [$items ? values %$items : ()];
2987 return unless $items; 3638 $self->update_items;
2988
2989 my @items = sort {
2990 ($a->{type} <=> $b->{type})
2991 or ($a->{name} cmp $b->{name})
2992 } @$items;
2993
2994 $self->{real_items} = \@items;
2995
2996 my $row = 0;
2997 for my $item (@items) {
2998 CFClient::Item::update_widgets $item;
2999
3000 $self->{scrolled}->add (0, $row, $item->{face_widget});
3001 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3002 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3003
3004 $row++;
3005 }
3006} 3639}
3007 3640
3008############################################################################# 3641#############################################################################
3009 3642
3010package CFClient::UI::BindEditor; 3643package CFPlus::UI::SpellList;
3011 3644
3012our @ISA = CFClient::UI::FancyFrame::; 3645our @ISA = CFPlus::UI::Table::;
3013 3646
3014sub new { 3647sub new {
3015 my $class = shift; 3648 my $class = shift;
3016 3649
3017 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3650 my $self = $class->SUPER::new (
3651 binding => [],
3652 commands => [],
3653 @_,
3654 )
3655}
3018 3656
3019 $self->add (my $vb = new CFClient::UI::VBox); 3657my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3020 3658
3659my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3661my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3663my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3665my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3666 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3667my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3668 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3021 3669
3022 $vb->add ($self->{rec_btn} = new CFClient::UI::Button 3670sub rebuild_spell_list {
3023 text => "start recording", 3671 my ($self) = @_;
3024 tooltip => "Start/Stops recording of actions." 3672
3025 ."All subsequent actions after the recording started will be captured." 3673 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3026 ."The actions are displayed after the record was stopped." 3674 $self->clear;
3027 ."To bind the action you have to click on the 'Bind' button", 3675
3028 on_activate => sub { 3676 return unless $::CONN;
3029 unless ($self->{recording}) { 3677
3030 $self->start; 3678 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3679 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3680 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3681 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3682 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3683
3684 my $row = 0;
3685
3686 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3687 my $spell = $self->{spell}{$_};
3688
3689 $row++;
3690
3691 my $spell_cb = sub {
3692 my ($widget, $ev) = @_;
3693
3694 if ($ev->{button} == 1) {
3695 $::CONN->user_send ("cast $spell->{name}");
3696 } elsif ($ev->{button} == 2) {
3697 $::CONN->user_send ("invoke $spell->{name}");
3698 } elsif ($ev->{button} == 3) {
3699 (new CFPlus::UI::Menu
3700 items => [
3701 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3702 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3703 ],
3704 )->popup ($ev);
3031 } else { 3705 } else {
3032 $self->stop; 3706 return 0;
3707 }
3708
3709 1
3033 } 3710 };
3711
3712 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3713
3714 #TODO: add path info to tooltip
3715 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3716
3717 $self->add (0, $row, new CFPlus::UI::Face
3718 face => $spell->{face},
3719 can_hover => 1,
3720 can_events => 1,
3721 tooltip => $tooltip,
3722 on_button_down => $spell_cb,
3723 );
3724
3725 $self->add (1, $row, new CFPlus::UI::Label
3726 expand => 1,
3727 text => $spell->{name},
3728 can_hover => 1,
3729 can_events => 1,
3730 tooltip => $tooltip,
3731 on_button_down => $spell_cb,
3732 );
3733
3734 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3735 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3736 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3737 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3034 }); 3738 }
3035
3036 $vb->add (new CFClient::UI::Label text => "Actions:");
3037 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3038
3039 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3040 $vb->add (my $hb = new CFClient::UI::HBox);
3041 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3042 $hb->add (new CFClient::UI::Button
3043 text => "bind",
3044 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3045 on_activate => sub {
3046 $self->ask_for_bind;
3047 });
3048
3049 $vb->add (my $hb = new CFClient::UI::HBox);
3050 $hb->add (new CFClient::UI::Button
3051 text => "ok",
3052 expand => 1,
3053 tooltip => "This closes the binding editor and saves the binding",
3054 on_activate => sub {
3055 $self->hide;
3056 $self->commit;
3057 });
3058
3059 $hb->add (new CFClient::UI::Button
3060 text => "cancel",
3061 expand => 1,
3062 tooltip => "This closes the binding editor without saving",
3063 on_activate => sub {
3064 $self->hide;
3065 $self->{binding_cancel}->()
3066 if $self->{binding_cancel};
3067 });
3068
3069 $self->update_binding_widgets;
3070
3071 $self
3072}
3073
3074sub commit {
3075 my ($self) = @_;
3076 my ($mod, $sym, $cmds) = $self->get_binding;
3077 if ($sym != 0 && @$cmds > 0) {
3078 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3079 ."'. Don't forget 'Save Config'!");
3080 $self->{binding_change}->($mod, $sym, $cmds)
3081 if $self->{binding_change};
3082 } else {
3083 $::STATUSBOX->add ("No action bound, no key or action specified!");
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 }
3087}
3088
3089sub start {
3090 my ($self) = @_;
3091
3092 $self->{rec_btn}->set_text ("stop recording");
3093 $self->{recording} = 1;
3094 $self->clear_command_list;
3095 $::CONN->start_record if $::CONN;
3096}
3097
3098sub stop {
3099 my ($self) = @_;
3100
3101 $self->{rec_btn}->set_text ("start recording");
3102 $self->{recording} = 0;
3103
3104 my $rec;
3105 $rec = $::CONN->stop_record if $::CONN;
3106 return unless ref $rec eq 'ARRAY';
3107 $self->set_command_list ($rec);
3108}
3109
3110# if $commit is true, the binding will be set after the user entered a key combo
3111sub ask_for_bind {
3112 my ($self, $commit) = @_;
3113
3114 CFClient::Binder::open_binding_dialog (sub {
3115 my ($mod, $sym) = @_;
3116 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3117 $self->update_binding_widgets;
3118 $self->commit if $commit;
3119 }); 3739 });
3120} 3740}
3121 3741
3122# $mod and $sym are the modifiers and key symbol
3123# $cmds is a array ref of strings (the commands)
3124# $cb is the callback that is executed on OK
3125# $ccb is the callback that is executed on CANCEL and
3126# when the binding was unsuccessful on OK
3127sub set_binding {
3128 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3129
3130 $self->clear_command_list;
3131 $self->{recording} = 0;
3132 $self->{rec_btn}->set_text ("start recording");
3133
3134 $self->{binding} = [$mod, $sym];
3135 $self->{commands} = $cmds;
3136
3137 $self->{binding_change} = $cb;
3138 $self->{binding_cancel} = $ccb;
3139
3140 $self->update_binding_widgets;
3141}
3142
3143# this is a shortcut method that asks for a binding
3144# and then just binds it.
3145sub do_quick_binding {
3146 my ($self, $cmds) = @_;
3147 $self->set_binding (undef, undef, $cmds, sub {
3148 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3149 });
3150 $self->ask_for_bind (1);
3151}
3152
3153sub update_binding_widgets {
3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3157 $self->set_command_list ($cmds);
3158}
3159
3160sub get_binding {
3161 my ($self) = @_;
3162 return (
3163 $self->{binding}->[0],
3164 $self->{binding}->[1],
3165 [ grep { defined $_ } @{$self->{commands}} ]
3166 );
3167}
3168
3169sub clear_command_list {
3170 my ($self) = @_;
3171 $self->{cmdbox}->clear ();
3172}
3173
3174sub set_command_list {
3175 my ($self, $cmds) = @_;
3176
3177 $self->{cmdbox}->clear ();
3178 $self->{commands} = $cmds;
3179
3180 my $idx = 0;
3181
3182 for (@$cmds) {
3183 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3184
3185 my $i = $idx;
3186 $hb->add (new CFClient::UI::Label text => $_);
3187 $hb->add (new CFClient::UI::Button
3188 text => "delete",
3189 tooltip => "Deletes the action from the record",
3190 on_activate => sub {
3191 $self->{cmdbox}->remove ($hb);
3192 $cmds->[$i] = undef;
3193 });
3194
3195
3196 $idx++
3197 }
3198}
3199
3200#############################################################################
3201
3202package CFClient::UI::SpellList;
3203
3204our @ISA = CFClient::UI::FancyFrame::;
3205
3206sub new {
3207 my $class = shift;
3208
3209 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3210
3211 $self->add (new CFClient::UI::ScrolledWindow
3212 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3213
3214 $self;
3215}
3216
3217# XXX: Do sorting? Argl...
3218sub add_spell { 3742sub add_spell {
3219 my ($self, $spell) = @_; 3743 my ($self, $spell) = @_;
3744
3220 $self->{spells}->{$spell->{name}} = $spell; 3745 $self->{spell}->{$spell->{name}} = $spell;
3221 3746 $self->rebuild_spell_list;
3222 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3223 face => $spell->{face},
3224 can_hover => 1,
3225 can_events => 1,
3226 tooltip => $spell->{message});
3227
3228 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3229 text => $spell->{name},
3230 can_hover => 1,
3231 can_events => 1,
3232 tooltip => $spell->{message},
3233 expand => 1);
3234
3235 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3236 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3237 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3238 expand => 1);
3239
3240 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3241 text => "bind to key",
3242 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3243}
3244
3245sub rebuild_spell_list {
3246 my ($self) = @_;
3247 $self->{tbl_idx} = 0;
3248 $self->add_spell ($_) for values %{$self->{spells}};
3249} 3747}
3250 3748
3251sub remove_spell { 3749sub remove_spell {
3252 my ($self, $spell) = @_; 3750 my ($self, $spell) = @_;
3751
3253 delete $self->{spells}->{$spell->{name}}; 3752 delete $self->{spell}->{$spell->{name}};
3254 $self->rebuild_spell_list; 3753 $self->rebuild_spell_list;
3255} 3754}
3256 3755
3756sub clear_spells {
3757 my ($self) = @_;
3758
3759 $self->{spell} = {};
3760 $self->rebuild_spell_list;
3761}
3762
3257############################################################################# 3763#############################################################################
3258 3764
3259package CFClient::UI::Root; 3765package CFPlus::UI::Root;
3260 3766
3261our @ISA = CFClient::UI::Container::; 3767our @ISA = CFPlus::UI::Container::;
3262 3768
3769use List::Util qw(min max);
3770
3263use CFClient::OpenGL; 3771use CFPlus::OpenGL;
3264 3772
3265sub new { 3773sub new {
3266 my $class = shift; 3774 my $class = shift;
3267 3775
3268 my $self = $class->SUPER::new ( 3776 my $self = $class->SUPER::new (
… …
3293 $coord = $max - $size if $coord > $max - $size; 3801 $coord = $max - $size if $coord > $max - $size;
3294 3802
3295 int $coord + 0.5 3803 int $coord + 0.5
3296} 3804}
3297 3805
3298sub size_allocate { 3806sub invoke_size_allocate {
3299 my ($self, $w, $h) = @_; 3807 my ($self, $w, $h) = @_;
3300 3808
3301 for my $child ($self->children) { 3809 for my $child ($self->children) {
3302 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3810 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3303 3811
… …
3307 $X = _to_pixel $X, $W, $self->{w}; 3815 $X = _to_pixel $X, $W, $self->{w};
3308 $Y = _to_pixel $Y, $H, $self->{h}; 3816 $Y = _to_pixel $Y, $H, $self->{h};
3309 3817
3310 $child->configure ($X, $Y, $W, $H); 3818 $child->configure ($X, $Y, $W, $H);
3311 } 3819 }
3820
3821 1
3312} 3822}
3313 3823
3314sub coord2local { 3824sub coord2local {
3315 my ($self, $x, $y) = @_; 3825 my ($self, $x, $y) = @_;
3316 3826
… …
3372 $_->() 3882 $_->()
3373 for values %{delete $self->{refresh_hook}}; 3883 for values %{delete $self->{refresh_hook}};
3374 } 3884 }
3375 3885
3376 if ($self->{realloc}) { 3886 if ($self->{realloc}) {
3887 my %queue;
3377 my @queue; 3888 my @queue;
3889 my $widget;
3378 3890
3891 outer:
3379 while () { 3892 while () {
3380 if ($self->{realloc}) { 3893 if (my $realloc = delete $self->{realloc}) {
3381 #TODO use array-of-depth approach 3894 for $widget (values %$realloc) {
3895 $widget->{visible} or next; # do not resize invisible widgets
3382 3896
3383 use sort 'stable'; 3897 $queue{$widget+0}++ and next; # duplicates are common
3384 3898
3385 @queue = sort { $a->{visible} <=> $b->{visible} } 3899 push @{ $queue[$widget->{visible}] }, $widget;
3386 @queue, values %{delete $self->{realloc}}; 3900 }
3387 } 3901 }
3388 3902
3903 while () {
3904 @queue or last outer;
3905
3389 my $widget = pop @queue || last; 3906 $widget = pop @{ $queue[-1] || [] }
3907 and last;
3908
3909 pop @queue;
3910 }
3390 3911
3391 $widget->{visible} or last; # do not resize invisible widgets 3912 delete $queue{$widget+0};
3392 3913
3393 my ($w, $h) = $widget->size_request; 3914 my ($w, $h) = $widget->size_request;
3394 3915
3395 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3916 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3396 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3917 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3918
3919 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3920 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3397 3921
3398 $w = $widget->{force_w} if exists $widget->{force_w}; 3922 $w = $widget->{force_w} if exists $widget->{force_w};
3399 $h = $widget->{force_h} if exists $widget->{force_h}; 3923 $h = $widget->{force_h} if exists $widget->{force_h};
3400 3924
3401 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3925 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3404 $widget->{req_h} = $h; 3928 $widget->{req_h} = $h;
3405 3929
3406 $self->{size_alloc}{$widget+0} = $widget; 3930 $self->{size_alloc}{$widget+0} = $widget;
3407 3931
3408 if (my $parent = $widget->{parent}) { 3932 if (my $parent = $widget->{parent}) {
3409 $self->{realloc}{$parent+0} = $parent; 3933 $self->{realloc}{$parent+0} = $parent
3410 #unshift @queue, $parent; 3934 unless $queue{$parent+0};
3935
3411 $parent->{force_size_alloc} = 1; 3936 $parent->{force_size_alloc} = 1;
3412 $self->{size_alloc}{$parent+0} = $parent; 3937 $self->{size_alloc}{$parent+0} = $parent;
3413 } 3938 }
3414 } 3939 }
3415 3940
… …
3427 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3952 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3428 3953
3429 $w = 0 if $w < 0; 3954 $w = 0 if $w < 0;
3430 $h = 0 if $h < 0; 3955 $h = 0 if $h < 0;
3431 3956
3957 $w = max $widget->{min_w}, $w;
3958 $h = max $widget->{min_h}, $h;
3959
3960# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3961# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3962
3963 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3964 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3965
3432 $w = int $w + 0.5; 3966 $w = int $w + 0.5;
3433 $h = int $h + 0.5; 3967 $h = int $h + 0.5;
3434 3968
3435 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3969 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3970 $widget->{old_w} = $widget->{w};
3971 $widget->{old_h} = $widget->{h};
3972
3436 $widget->{w} = $w; 3973 $widget->{w} = $w;
3437 $widget->{h} = $h; 3974 $widget->{h} = $h;
3438 3975
3439 $widget->emit (size_allocate => $w, $h); 3976 $widget->emit (size_allocate => $w, $h);
3440 } 3977 }
… …
3455 glLoadIdentity; 3992 glLoadIdentity;
3456 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3993 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3457 glMatrixMode GL_MODELVIEW; 3994 glMatrixMode GL_MODELVIEW;
3458 glLoadIdentity; 3995 glLoadIdentity;
3459 3996
3997 {
3998 package CFPlus::UI::Base;
3999
4000 ($draw_x, $draw_y, $draw_w, $draw_h) =
4001 (0, 0, $self->{w}, $self->{h});
4002 }
4003
3460 $self->_draw; 4004 $self->_draw;
3461} 4005}
3462 4006
3463############################################################################# 4007#############################################################################
3464 4008
3465package CFClient::UI; 4009package CFPlus::UI;
3466 4010
3467$ROOT = new CFClient::UI::Root; 4011$ROOT = new CFPlus::UI::Root;
3468$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4012$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3469 4013
34701 40141
3471 4015

Diff Legend

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