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

Diff Legend

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