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.349 by root, Thu Aug 17 16:05:36 2006 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFPlus;
11use CFPlus::Pod;
10use CFClient::Texture; 12use CFPlus::Texture;
11 13
12our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
13 15
14our $LAYOUT; 16our $LAYOUT;
15our $ROOT; 17our $ROOT;
16our $TOOLTIP; 18our $TOOLTIP;
17our $BUTTON_STATE; 19our $BUTTON_STATE;
18 20
19our %WIDGET; # all widgets, weak-referenced 21our %WIDGET; # all widgets, weak-referenced
22
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) {
28 $TOOLTIP->hide;
29
30 $TOOLTIP->{owner} = $widget;
31
32 return if $ENV{CFPLUS_DEBUG} & 8;
33
34 my $tip = $widget->{tooltip};
35
36 $tip = $tip->($widget) if CODE:: eq ref $tip;
37
38 $TOOLTIP->set_tooltip_from ($widget);
39 $TOOLTIP->show;
40 }
41
42 return;
43 }
44 }
45 }
46
47 $TOOLTIP->hide;
48 delete $TOOLTIP->{owner};
49});
20 50
21sub get_layout { 51sub get_layout {
22 my $layout; 52 my $layout;
23 53
24 for (grep { $_->{name} } values %WIDGET) { 54 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 69 my ($layout) = @_;
40 70
41 $LAYOUT = $layout; 71 $LAYOUT = $layout;
42} 72}
43 73
44sub check_tooltip {
45 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
52 $TOOLTIP->{owner} = $widget;
53
54 my $tip = $widget->{tooltip};
55
56 $tip = $tip->($widget) if CODE:: eq ref $tip;
57
58 $TOOLTIP->set_tooltip_from ($widget);
59 $TOOLTIP->show;
60 }
61
62 return;
63 }
64 }
65 }
66
67 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner};
69}
70
71# class methods for events 74# class methods for events
72sub feed_sdl_key_down_event { 75sub feed_sdl_key_down_event {
73 $FOCUS->emit (key_down => $_[0]) 76 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS; 77 if $FOCUS;
75} 78}
… …
77sub feed_sdl_key_up_event { 80sub feed_sdl_key_up_event {
78 $FOCUS->emit (key_up => $_[0]) 81 $FOCUS->emit (key_up => $_[0])
79 if $FOCUS; 82 if $FOCUS;
80} 83}
81 84
85sub check_hover {
86 my ($widget) = @_;
87
88 if ($widget != $HOVER) {
89 my $hover = $HOVER; $HOVER = $widget;
90
91 $hover->update if $hover && $hover->{can_hover};
92 $HOVER->update if $HOVER && $HOVER->{can_hover};
93
94 $TOOLTIP_WATCHER->start;
95 }
96}
97
82sub feed_sdl_button_down_event { 98sub feed_sdl_button_down_event {
83 my ($ev) = @_; 99 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 100 my ($x, $y) = ($ev->{x}, $ev->{y});
85 101
86 if (!$BUTTON_STATE) { 102 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
103
104 unless ($GRAB) {
87 my $widget = $ROOT->find_widget ($x, $y); 105 my $widget = $ROOT->find_widget ($x, $y);
88 106
89 $GRAB = $widget; 107 $GRAB = $widget;
90 $GRAB->update if $GRAB; 108 $GRAB->update if $GRAB;
91 109
92 check_tooltip; 110 $TOOLTIP_WATCHER->cb->();
93 } 111 }
94 112
95 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 113 if ($GRAB) {
96 114 if ($ev->{button} == 4 || $ev->{button} == 5) {
97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 115 # mousewheel
98 if $GRAB; 116 $ev->{dx} = 0;
117 $ev->{dy} = $ev->{button} * 2 - 9;
118 $GRAB->emit (mouse_wheel => $ev);
119 } else {
120 $GRAB->emit (button_down => $ev)
121 }
122 }
99} 123}
100 124
101sub feed_sdl_button_up_event { 125sub feed_sdl_button_up_event {
102 my ($ev) = @_; 126 my ($ev) = @_;
103 my ($x, $y) = ($ev->{x}, $ev->{y});
104 127
105 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 128 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
106 129
107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 130 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
108 131
109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 132 $GRAB->emit (button_up => $ev)
110 if $GRAB; 133 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
111 134
112 if (!$BUTTON_STATE) { 135 unless ($BUTTON_STATE) {
113 my $grab = $GRAB; undef $GRAB; 136 my $grab = $GRAB; undef $GRAB;
114 $grab->update if $grab; 137 $grab->update if $grab;
115 $GRAB->update if $GRAB; 138 $GRAB->update if $GRAB;
116 139
117 check_tooltip; 140 check_hover $widget;
141 $TOOLTIP_WATCHER->cb->();
118 } 142 }
119} 143}
120 144
121sub feed_sdl_motion_event { 145sub feed_sdl_motion_event {
122 my ($ev) = @_; 146 my ($ev) = @_;
123 my ($x, $y) = ($ev->{x}, $ev->{y}); 147 my ($x, $y) = ($ev->{x}, $ev->{y});
124 148
125 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 149 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
126 150
127 if ($widget != $HOVER) { 151 check_hover $widget;
128 my $hover = $HOVER; $HOVER = $widget;
129 152
130 $hover->update if $hover && $hover->{can_hover}; 153 $HOVER->emit (mouse_motion => $ev)
131 $HOVER->update if $HOVER && $HOVER->{can_hover};
132
133 check_tooltip;
134 }
135
136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER; 154 if $HOVER;
138} 155}
139 156
140# convert position array to integers 157# convert position array to integers
141sub harmonize { 158sub harmonize {
… …
170sub rescale_widgets { 187sub rescale_widgets {
171 my ($sx, $sy) = @_; 188 my ($sx, $sy) = @_;
172 189
173 for my $widget (values %WIDGET) { 190 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 191 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 192 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 193 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177 194
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 195 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 196 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 197 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 198 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 199 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 200 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 201
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 202 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 203 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187 204
188 } 205 }
189 } 206 }
190 207
191 reconfigure_widgets; 208 reconfigure_widgets;
192} 209}
193 210
194############################################################################# 211#############################################################################
195 212
213package CFPlus::UI::Event;
214
215sub xy {
216 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
217}
218
219#############################################################################
220
196package CFClient::UI::Base; 221package CFPlus::UI::Base;
197 222
198use strict; 223use strict;
199 224
200use CFClient::OpenGL; 225use CFPlus::OpenGL;
201 226
202sub new { 227sub new {
203 my $class = shift; 228 my $class = shift;
204 229
205 my $self = bless { 230 my $self = bless {
… …
210 h => undef, 235 h => undef,
211 can_events => 1, 236 can_events => 1,
212 @_ 237 @_
213 }, $class; 238 }, $class;
214 239
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
216 241
217 for (keys %$self) { 242 for (keys %$self) {
218 if (/^on_(.*)$/) { 243 if (/^on_(.*)$/) {
219 $self->connect ($1 => delete $self->{$_}); 244 $self->connect ($1 => delete $self->{$_});
220 } 245 }
221 } 246 }
222 247
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 248 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{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);
823
824 my $tex = $self->{texture} 914 my $tex = $self->{texture}
825 or return; 915 or return;
826 916
827 glEnable GL_TEXTURE_2D; 917 glEnable GL_TEXTURE_2D;
828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
829 glColor 1, 1, 1, 1; 919 glColor 0, 0, 0, 1;
830 920
831 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 921 $tex->draw_quad_alpha_premultiplied (0, 0);
832 922
833 glDisable GL_TEXTURE_2D; 923 glDisable GL_TEXTURE_2D;
834} 924}
835 925
836############################################################################# 926#############################################################################
837 927
838package CFClient::UI::ViewPort; 928package CFPlus::UI::ViewPort;
839 929
840our @ISA = CFClient::UI::Window::; 930our @ISA = CFPlus::UI::Window::;
841 931
842sub new { 932sub new {
843 my $class = shift; 933 my $class = shift;
844 934
845 $class->SUPER::new ( 935 $class->SUPER::new (
… …
850} 940}
851 941
852sub size_request { 942sub size_request {
853 my ($self) = @_; 943 my ($self) = @_;
854 944
855 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 945 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
856 946
857 $w = 10 if $self->{scroll_x}; 947 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y}; 948 $h = 10 if $self->{scroll_y};
859 949
860 ($w, $h) 950 ($w, $h)
861} 951}
862 952
863sub size_allocate { 953sub invoke_size_allocate {
864 my ($self, $w, $h, $changed) = @_; 954 my ($self, $w, $h) = @_;
865 955
956 my $child = $self->child;
957
866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 958 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 959 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
868 960
869 $self->child->configure (0, 0, $w, $h); 961 $self->child->configure (0, 0, $w, $h);
870 $self->update; 962 $self->update;
963
964 1
871} 965}
872 966
873sub set_offset { 967sub set_offset {
874 my ($self, $x, $y) = @_; 968 my ($self, $x, $y) = @_;
875 969
… …
901 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
902 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 996 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
903 ) { 997 ) {
904 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
905 } else { 999 } else {
906 $self->CFClient::UI::Base::find_widget ($x, $y) 1000 $self->CFPlus::UI::Base::find_widget ($x, $y)
907 } 1001 }
908} 1002}
909 1003
910sub _render { 1004sub _render {
911 my ($self) = @_; 1005 my ($self) = @_;
912 1006
1007 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1008 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1009
913 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1010 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
914 1011
915 $self->SUPER::_render; 1012 $self->SUPER::_render;
916} 1013}
917 1014
918############################################################################# 1015#############################################################################
919 1016
920package CFClient::UI::ScrolledWindow; 1017package CFPlus::UI::ScrolledWindow;
921 1018
922our @ISA = CFClient::UI::HBox::; 1019our @ISA = CFPlus::UI::HBox::;
923 1020
924sub new { 1021sub new {
925 my $class = shift; 1022 my ($class, %arg) = @_;
1023
1024 my $child = delete $arg{child};
926 1025
927 my $self; 1026 my $self;
928 1027
929 my $slider = new CFClient::UI::Slider 1028 my $slider = new CFPlus::UI::Slider
930 vertical => 1, 1029 vertical => 1,
931 range => [0, 0, 1, 0.01], # HACK fix 1030 range => [0, 0, 1, 0.01], # HACK fix
932 on_changed => sub { 1031 on_changed => sub {
933 $self->{vp}->set_offset (0, $_[1]); 1032 $self->{vp}->set_offset (0, $_[1]);
934 }, 1033 },
935 ; 1034 ;
936 1035
937 $self = $class->SUPER::new ( 1036 $self = $class->SUPER::new (
938 vp => (new CFClient::UI::ViewPort expand => 1), 1037 vp => (new CFPlus::UI::ViewPort expand => 1),
1038 can_events => 1,
939 slider => $slider, 1039 slider => $slider,
940 @_, 1040 %arg,
941 ); 1041 );
942 1042
943 $self->{vp}->add ($self->{scrolled});
944 $self->add ($self->{vp});
945 $self->add ($self->{slider}); 1043 $self->SUPER::add ($self->{vp}, $self->{slider});
1044 $self->add ($child) if $child;
946 1045
947 $self 1046 $self
948} 1047}
949 1048
1049#TODO# update range on size_allocate depending on child
1050
1051sub add {
1052 my ($self, $widget) = @_;
1053
1054 $self->{vp}->add ($self->{child} = $widget);
1055}
1056
1057sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_;
1059
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev);
1063
1064 1
1065}
1066
1067sub update_slider {
1068 my ($self) = @_;
1069
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1071}
1072
950sub update { 1073sub update {
951 my ($self) = @_; 1074 my ($self) = @_;
952 1075
953 $self->SUPER::update; 1076 $self->SUPER::update;
954 1077
955 # todo: overwrite size_allocate of child 1078 $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} 1079}
959 1080
960sub size_allocate { 1081sub invoke_size_allocate {
961 my ($self, $w, $h, $changed) = @_; 1082 my ($self, $w, $h) = @_;
962 1083
1084 $self->update_slider;
1085
963 $self->SUPER::size_allocate ($w, $h, $changed); 1086 $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} 1087}
968
969#TODO# update range on size_allocate depending on child
970# update viewport offset on scroll
971 1088
972############################################################################# 1089#############################################################################
973 1090
974package CFClient::UI::Frame; 1091package CFPlus::UI::Frame;
975 1092
976our @ISA = CFClient::UI::Bin::; 1093our @ISA = CFPlus::UI::Bin::;
977 1094
978use CFClient::OpenGL; 1095use CFPlus::OpenGL;
979 1096
980sub new { 1097sub new {
981 my $class = shift; 1098 my $class = shift;
982 1099
983 $class->SUPER::new ( 1100 $class->SUPER::new (
… …
991 1108
992 if ($self->{bg}) { 1109 if ($self->{bg}) {
993 my ($w, $h) = @$self{qw(w h)}; 1110 my ($w, $h) = @$self{qw(w h)};
994 1111
995 glEnable GL_BLEND; 1112 glEnable GL_BLEND;
996 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1113 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
997 glColor @{ $self->{bg} }; 1114 glColor_premultiply @{ $self->{bg} };
998 1115
999 glBegin GL_QUADS; 1116 glBegin GL_QUADS;
1000 glVertex 0 , 0; 1117 glVertex 0 , 0;
1001 glVertex 0 , $h; 1118 glVertex 0 , $h;
1002 glVertex $w, $h; 1119 glVertex $w, $h;
… …
1009 $self->SUPER::_draw; 1126 $self->SUPER::_draw;
1010} 1127}
1011 1128
1012############################################################################# 1129#############################################################################
1013 1130
1014package CFClient::UI::FancyFrame; 1131package CFPlus::UI::FancyFrame;
1015 1132
1016our @ISA = CFClient::UI::Bin::; 1133our @ISA = CFPlus::UI::Bin::;
1017 1134
1018use CFClient::OpenGL; 1135use CFPlus::OpenGL;
1136
1137sub new {
1138 my ($class, %arg) = @_;
1139
1140 if ((exists $arg{label}) && !ref $arg{label}) {
1141 $arg{label} = new CFPlus::UI::Label
1142 align => 1,
1143 valign => 0,
1144 text => $arg{label},
1145 fontsize => ($arg{border} || 0.8) * 0.75;
1146 }
1147
1148 my $self = $class->SUPER::new (
1149 # label => "",
1150 fg => [0.6, 0.3, 0.1],
1151 border => 0.8,
1152 style => 'single',
1153 %arg,
1154 );
1155
1156 $self
1157}
1158
1159sub add {
1160 my ($self, @widgets) = @_;
1161
1162 $self->SUPER::add (@widgets);
1163 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1164}
1165
1166sub border {
1167 int $_[0]{border} * $::FONTSIZE
1168}
1169
1170sub size_request {
1171 my ($self) = @_;
1172
1173 ($self->{label_w}, undef) = $self->{label}->size_request
1174 if $self->{label};
1175
1176 my ($w, $h) = $self->SUPER::size_request;
1177
1178 (
1179 $w + $self->border * 2,
1180 $h + $self->border * 2,
1181 )
1182}
1183
1184sub invoke_size_allocate {
1185 my ($self, $w, $h) = @_;
1186
1187 my $border = $self->border;
1188
1189 $w -= List::Util::max 0, $border * 2;
1190 $h -= List::Util::max 0, $border * 2;
1191
1192 if (my $label = $self->{label}) {
1193 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1194 $label->{h} = List::Util::min $h, $border;
1195 $label->invoke_size_allocate ($label->{w}, $label->{h});
1196 }
1197
1198 $self->child->configure ($border, $border, $w, $h);
1199
1200 1
1201}
1202
1203sub _draw {
1204 my ($self) = @_;
1205
1206 my $child = $self->{children}[0];
1207
1208 my $border = $self->border;
1209 my ($w, $h) = ($self->{w}, $self->{h});
1210
1211 $child->draw;
1212
1213 glColor @{$self->{fg}};
1214 glBegin GL_LINE_STRIP;
1215 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1216 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1217 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1218 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1219 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1220 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1221 glEnd;
1222
1223 if ($self->{label}) {
1224 glTranslate $border * 2, 0;
1225 $self->{label}->_draw;
1226 }
1227}
1228
1229#############################################################################
1230
1231package CFPlus::UI::Toplevel;
1232
1233our @ISA = CFPlus::UI::Bin::;
1234
1235use CFPlus::OpenGL;
1019 1236
1020my $bg = 1237my $bg =
1021 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1238 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1022 mipmap => 1, wrap => 1; 1239 mipmap => 1, wrap => 1;
1023 1240
1024my @border = 1241my @border =
1025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1242 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); 1243 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1027 1244
1028sub new { 1245sub new {
1029 my $class = shift; 1246 my ($class, %arg) = @_;
1030 1247
1031 my $self = $class->SUPER::new ( 1248 my $self = $class->SUPER::new (
1032 bg => [1, 1, 1, 1], 1249 bg => [1, 1, 1, 1],
1033 border_bg => [1, 1, 1, 1], 1250 border_bg => [1, 1, 1, 1],
1034 border => 0.6, 1251 border => 0.6,
1035 can_events => 1, 1252 can_events => 1,
1036 min_w => 16, 1253 min_w => 64,
1037 min_h => 16, 1254 min_h => 32,
1038 @_ 1255 %arg,
1039 ); 1256 );
1040 1257
1041 $self->{title} &&= new CFClient::UI::Label 1258 $self->{title_widget} = new CFPlus::UI::Label
1042 align => 0, 1259 align => 0,
1043 valign => 1, 1260 valign => 1,
1044 text => $self->{title}, 1261 text => $self->{title},
1045 fontsize => $self->{border}; 1262 fontsize => $self->{border},
1263 if exists $self->{title};
1264
1265 if ($self->{has_close_button}) {
1266 $self->{close_button} =
1267 new CFPlus::UI::ImageButton
1268 path => 'x1_close.png',
1269 on_activate => sub { $self->emit ("delete") };
1270
1271 $self->CFPlus::UI::Container::add ($self->{close_button});
1272 }
1046 1273
1047 $self 1274 $self
1275}
1276
1277sub add {
1278 my ($self, @widgets) = @_;
1279
1280 $self->SUPER::add (@widgets);
1281 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1282 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1048} 1283}
1049 1284
1050sub border { 1285sub border {
1051 int $_[0]{border} * $::FONTSIZE 1286 int $_[0]{border} * $::FONTSIZE
1052} 1287}
1053 1288
1054sub size_request { 1289sub size_request {
1055 my ($self) = @_; 1290 my ($self) = @_;
1291
1292 $self->{title_widget}->size_request
1293 if $self->{title_widget};
1294
1295 $self->{close_button}->size_request
1296 if $self->{close_button};
1056 1297
1057 my ($w, $h) = $self->SUPER::size_request; 1298 my ($w, $h) = $self->SUPER::size_request;
1058 1299
1059 ( 1300 (
1060 $w + $self->border * 2, 1301 $w + $self->border * 2,
1061 $h + $self->border * 2, 1302 $h + $self->border * 2,
1062 ) 1303 )
1063} 1304}
1064 1305
1065sub size_allocate { 1306sub invoke_size_allocate {
1066 my ($self, $w, $h, $changed) = @_; 1307 my ($self, $w, $h) = @_;
1067 1308
1068 return unless $changed; 1309 if ($self->{title_widget}) {
1310 $self->{title_widget}{w} = $w;
1311 $self->{title_widget}{h} = $h;
1312 $self->{title_widget}->invoke_size_allocate ($w, $h);
1313 }
1069 1314
1315 my $border = $self->border;
1316
1070 $h -= List::Util::max 0, $self->border * 2; 1317 $h -= List::Util::max 0, $border * 2;
1071 $w -= List::Util::max 0, $self->border * 2; 1318 $w -= List::Util::max 0, $border * 2;
1072 1319
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); 1320 $self->child->configure ($border, $border, $w, $h);
1077}
1078 1321
1322 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1323 if $self->{close_button};
1324
1325 1
1326}
1327
1328sub invoke_delete {
1329 my ($self) = @_;
1330
1331 $self->hide;
1332
1333 1
1334}
1335
1079sub button_down { 1336sub invoke_button_down {
1080 my ($self, $ev, $x, $y) = @_; 1337 my ($self, $ev, $x, $y) = @_;
1081 1338
1082 my ($w, $h) = @$self{qw(w h)}; 1339 my ($w, $h) = @$self{qw(w h)};
1083 my $border = $self->border; 1340 my $border = $self->border;
1084 1341
… …
1100 my $dy = $ev->{y} - $oy; 1357 my $dy = $ev->{y} - $oy;
1101 1358
1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1359 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1360 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104 1361
1362 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1105 $self->realloc; 1363 $self->realloc;
1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1107 }; 1364 };
1108 1365
1109 } elsif ($lr ^ $td) { 1366 } elsif ($lr ^ $td) {
1110 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1367 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1111 my ($bx, $by) = ($self->{x}, $self->{y}); 1368 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1114 my ($ev, $x, $y) = @_; 1371 my ($ev, $x, $y) = @_;
1115 1372
1116 ($x, $y) = ($ev->{x}, $ev->{y}); 1373 ($x, $y) = ($ev->{x}, $ev->{y});
1117 1374
1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1375 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1376 # HACK: the next line is required to enforce placement
1377 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1119 }; 1378 };
1379 } else {
1380 return 0;
1381 }
1382
1120 } 1383 1
1121} 1384}
1122 1385
1123sub button_up { 1386sub invoke_button_up {
1124 my ($self, $ev, $x, $y) = @_; 1387 my ($self, $ev, $x, $y) = @_;
1125 1388
1126 delete $self->{motion}; 1389 ! ! delete $self->{motion}
1127} 1390}
1128 1391
1129sub mouse_motion { 1392sub invoke_mouse_motion {
1130 my ($self, $ev, $x, $y) = @_; 1393 my ($self, $ev, $x, $y) = @_;
1131 1394
1132 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1395 $self->{motion}->($ev, $x, $y) if $self->{motion};
1396
1397 ! ! $self->{motion}
1398}
1399
1400sub invoke_visibility_change {
1401 my ($self, $visible) = @_;
1402
1403 delete $self->{motion} unless $visible;
1404
1405 0
1133} 1406}
1134 1407
1135sub _draw { 1408sub _draw {
1136 my ($self) = @_; 1409 my ($self) = @_;
1137 1410
1411 my $child = $self->{children}[0];
1412
1138 my ($w, $h ) = ($self->{w}, $self->{h}); 1413 my ($w, $h ) = ($self->{w}, $self->{h});
1139 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1414 my ($cw, $ch) = ($child->{w}, $child->{h});
1140 1415
1141 glEnable GL_TEXTURE_2D; 1416 glEnable GL_TEXTURE_2D;
1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1143 1418
1144 my $border = $self->border; 1419 my $border = $self->border;
… …
1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1434 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160 } 1435 }
1161 1436
1162 glDisable GL_TEXTURE_2D; 1437 glDisable GL_TEXTURE_2D;
1163 1438
1164 $self->{title}->draw if $self->{title};
1165
1166 $self->child->draw; 1439 $child->draw;
1440
1441 if ($self->{title_widget}) {
1442 glTranslate 0, $border - $self->{h};
1443 $self->{title_widget}->_draw;
1444
1445 glTranslate 0, - ($border - $self->{h});
1446 }
1447
1448 $self->{close_button}->draw
1449 if $self->{close_button};
1167} 1450}
1168 1451
1169############################################################################# 1452#############################################################################
1170 1453
1171package CFClient::UI::Table; 1454package CFPlus::UI::Table;
1172 1455
1173our @ISA = CFClient::UI::Base::; 1456our @ISA = CFPlus::UI::Base::;
1174 1457
1175use List::Util qw(max sum); 1458use List::Util qw(max sum);
1176 1459
1177use CFClient::OpenGL; 1460use CFPlus::OpenGL;
1178 1461
1179sub new { 1462sub new {
1180 my $class = shift; 1463 my $class = shift;
1181 1464
1182 $class->SUPER::new ( 1465 $class->SUPER::new (
… …
1188sub children { 1471sub children {
1189 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1472 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1190} 1473}
1191 1474
1192sub add { 1475sub add {
1193 my ($self, $x, $y, $child) = @_; 1476 my ($self) = shift;
1194 1477
1478 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, ();
1195 $child->set_parent ($self); 1480 $child->set_parent ($self);
1196 $self->{children}[$y][$x] = $child; 1481 $self->{children}[$y][$x] = $child;
1482 }
1197 1483
1484 $self->{force_realloc} = 1;
1485 $self->{force_size_alloc} = 1;
1198 $self->realloc; 1486 $self->realloc;
1487}
1488
1489sub remove {
1490 my ($self, $child) = @_;
1491
1492 # TODO: not yet implemented
1199} 1493}
1200 1494
1201# TODO: move to container class maybe? send children a signal on removal? 1495# TODO: move to container class maybe? send children a signal on removal?
1202sub clear { 1496sub clear {
1203 my ($self) = @_; 1497 my ($self) = @_;
… …
1244 (sum @$ws), 1538 (sum @$ws),
1245 (sum @$hs), 1539 (sum @$hs),
1246 ) 1540 )
1247} 1541}
1248 1542
1249sub size_allocate { 1543sub invoke_size_allocate {
1250 my ($self, $w, $h, $changed) = @_; 1544 my ($self, $w, $h) = @_;
1251 1545
1252 my ($ws, $hs) = $self->get_wh; 1546 my ($ws, $hs) = $self->get_wh;
1253 1547
1254 my $req_w = (sum @$ws) || 1; 1548 my $req_w = (sum @$ws) || 1;
1255 my $req_h = (sum @$hs) || 1; 1549 my $req_h = (sum @$hs) || 1;
… …
1261 1555
1262 # linearly scale sizes 1556 # linearly scale sizes
1263 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1264 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1265 1559
1266 CFClient::UI::harmonize $ws; 1560 CFPlus::UI::harmonize $ws;
1267 CFClient::UI::harmonize $hs; 1561 CFPlus::UI::harmonize $hs;
1268 1562
1269 my $y; 1563 my $y;
1270 1564
1271 for my $r (0 .. $#{$self->{children}}) { 1565 for my $r (0 .. $#{$self->{children}}) {
1272 my $row = $self->{children}[$r] 1566 my $row = $self->{children}[$r]
… …
1286 } 1580 }
1287 1581
1288 $y += $row_h; 1582 $y += $row_h;
1289 } 1583 }
1290 1584
1585 1
1291} 1586}
1292 1587
1293sub find_widget { 1588sub find_widget {
1294 my ($self, $x, $y) = @_; 1589 my ($self, $x, $y) = @_;
1295 1590
… …
1314 } 1609 }
1315} 1610}
1316 1611
1317############################################################################# 1612#############################################################################
1318 1613
1319package CFClient::UI::Box; 1614package CFPlus::UI::Box;
1320 1615
1321our @ISA = CFClient::UI::Container::; 1616our @ISA = CFPlus::UI::Container::;
1322 1617
1323sub size_request { 1618sub size_request {
1324 my ($self) = @_; 1619 my ($self) = @_;
1325 1620
1326 $self->{vertical} 1621 $self->{vertical}
… …
1332 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1627 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1333 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1628 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1334 ) 1629 )
1335} 1630}
1336 1631
1337sub size_allocate { 1632sub invoke_size_allocate {
1338 my ($self, $w, $h, $changed) = @_; 1633 my ($self, $w, $h) = @_;
1339 1634
1340 my $space = $self->{vertical} ? $h : $w; 1635 my $space = $self->{vertical} ? $h : $w;
1341 my $children = $self->{children}; 1636 my @children = $self->visible_children;
1342 1637
1343 my @req; 1638 my @req;
1344 1639
1345 if ($self->{homogeneous}) { 1640 if ($self->{homogeneous}) {
1346 @req = ($space / (@$children || 1)) x @$children; 1641 @req = ($space / (@children || 1)) x @children;
1347 } else { 1642 } else {
1348 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1643 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1349 my $req = List::Util::sum @req; 1644 my $req = List::Util::sum @req;
1350 1645
1351 if ($req > $space) { 1646 if ($req > $space) {
1352 # ah well, not enough space 1647 # ah well, not enough space
1353 $_ *= $space / $req for @req; 1648 $_ *= $space / $req for @req;
1354 } else { 1649 } else {
1355 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1650 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1356 1651
1357 $space = ($space - $req) / $expand; # remaining space to give away 1652 $space = ($space - $req) / $expand; # remaining space to give away
1358 1653
1359 $req[$_] += $space * $children->[$_]{expand} 1654 $req[$_] += $space * $children[$_]{expand}
1360 for 0 .. $#$children; 1655 for 0 .. $#children;
1361 } 1656 }
1362 } 1657 }
1363 1658
1364 CFClient::UI::harmonize \@req; 1659 CFPlus::UI::harmonize \@req;
1365 1660
1366 my $pos = 0; 1661 my $pos = 0;
1367 for (0 .. $#$children) { 1662 for (0 .. $#children) {
1368 my $alloc = $req[$_]; 1663 my $alloc = $req[$_];
1369 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1664 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1370 1665
1371 $pos += $alloc; 1666 $pos += $alloc;
1372 } 1667 }
1373 1668
1374 1 1669 1
1375} 1670}
1376 1671
1377############################################################################# 1672#############################################################################
1378 1673
1379package CFClient::UI::HBox; 1674package CFPlus::UI::HBox;
1380 1675
1381our @ISA = CFClient::UI::Box::; 1676our @ISA = CFPlus::UI::Box::;
1382 1677
1383sub new { 1678sub new {
1384 my $class = shift; 1679 my $class = shift;
1385 1680
1386 $class->SUPER::new ( 1681 $class->SUPER::new (
… …
1389 ) 1684 )
1390} 1685}
1391 1686
1392############################################################################# 1687#############################################################################
1393 1688
1394package CFClient::UI::VBox; 1689package CFPlus::UI::VBox;
1395 1690
1396our @ISA = CFClient::UI::Box::; 1691our @ISA = CFPlus::UI::Box::;
1397 1692
1398sub new { 1693sub new {
1399 my $class = shift; 1694 my $class = shift;
1400 1695
1401 $class->SUPER::new ( 1696 $class->SUPER::new (
… …
1404 ) 1699 )
1405} 1700}
1406 1701
1407############################################################################# 1702#############################################################################
1408 1703
1409package CFClient::UI::Label; 1704package CFPlus::UI::Label;
1410 1705
1411our @ISA = CFClient::UI::DrawBG::; 1706our @ISA = CFPlus::UI::DrawBG::;
1412 1707
1413use CFClient::OpenGL; 1708use CFPlus::OpenGL;
1414 1709
1415sub new { 1710sub new {
1416 my ($class, %arg) = @_; 1711 my ($class, %arg) = @_;
1417 1712
1418 my $self = $class->SUPER::new ( 1713 my $self = $class->SUPER::new (
… …
1421 #active_bg => none 1716 #active_bg => none
1422 #font => default_font 1717 #font => default_font
1423 #text => initial text 1718 #text => initial text
1424 #markup => initial narkup 1719 #markup => initial narkup
1425 #max_w => maximum pixel width 1720 #max_w => maximum pixel width
1721 #style => 0, # render flags
1426 ellipsise => 3, # end 1722 ellipsise => 3, # end
1427 layout => (new CFClient::Layout), 1723 layout => (new CFPlus::Layout),
1428 fontsize => 1, 1724 fontsize => 1,
1429 align => -1, 1725 align => -1,
1430 valign => -1, 1726 valign => -1,
1431 padding_x => 2, 1727 padding_x => 2,
1432 padding_y => 2, 1728 padding_y => 2,
1433 can_events => 0, 1729 can_events => 0,
1434 %arg 1730 %arg
1435 ); 1731 );
1436 1732
1437 if (exists $self->{template}) { 1733 if (exists $self->{template}) {
1438 my $layout = new CFClient::Layout; 1734 my $layout = new CFPlus::Layout;
1439 $layout->set_text (delete $self->{template}); 1735 $layout->set_text (delete $self->{template});
1440 $self->{template} = $layout; 1736 $self->{template} = $layout;
1441 } 1737 }
1442 1738
1443 if (exists $self->{markup}) { 1739 if (exists $self->{markup}) {
… …
1447 } 1743 }
1448 1744
1449 $self 1745 $self
1450} 1746}
1451 1747
1452sub escape($) {
1453 local $_ = $_[0];
1454
1455 s/&/&amp;/g;
1456 s/>/&gt;/g;
1457 s/</&lt;/g;
1458
1459 $_
1460}
1461
1462sub update { 1748sub update {
1463 my ($self) = @_; 1749 my ($self) = @_;
1464 1750
1465 delete $self->{texture}; 1751 delete $self->{texture};
1466 $self->SUPER::update; 1752 $self->SUPER::update;
1467} 1753}
1468 1754
1755sub realloc {
1756 my ($self) = @_;
1757
1758 delete $self->{ox};
1759 $self->SUPER::realloc;
1760}
1761
1469sub set_text { 1762sub set_text {
1470 my ($self, $text) = @_; 1763 my ($self, $text) = @_;
1471 1764
1472 return if $self->{text} eq "T$text"; 1765 return if $self->{text} eq "T$text";
1473 $self->{text} = "T$text"; 1766 $self->{text} = "T$text";
1474 1767
1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1476 $self->{layout}->set_text ($text); 1768 $self->{layout}->set_text ($text);
1477 1769
1770 delete $self->{size_req};
1478 $self->realloc; 1771 $self->realloc;
1479 $self->update; 1772 $self->update;
1480} 1773}
1481 1774
1482sub set_markup { 1775sub set_markup {
… …
1485 return if $self->{text} eq "M$markup"; 1778 return if $self->{text} eq "M$markup";
1486 $self->{text} = "M$markup"; 1779 $self->{text} = "M$markup";
1487 1780
1488 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1781 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1489 1782
1490 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1491 $self->{layout}->set_markup ($markup); 1783 $self->{layout}->set_markup ($markup);
1492 1784
1785 delete $self->{size_req};
1493 $self->realloc; 1786 $self->realloc;
1494 $self->update; 1787 $self->update;
1495} 1788}
1496 1789
1497sub size_request { 1790sub size_request {
1498 my ($self) = @_; 1791 my ($self) = @_;
1499 1792
1793 $self->{size_req} ||= do {
1500 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1794 $self->{layout}->set_font ($self->{font}) if $self->{font};
1501 $self->{layout}->set_width ($self->{max_w} || -1); 1795 $self->{layout}->set_width ($self->{max_w} || -1);
1502 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1796 $self->{layout}->set_ellipsise ($self->{ellipsise});
1503 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1797 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1798 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1799
1506 my ($w, $h) = $self->{layout}->size; 1800 my ($w, $h) = $self->{layout}->size;
1507 1801
1508 if (exists $self->{template}) { 1802 if (exists $self->{template}) {
1509 $self->{template}->set_font ($self->{font}) if $self->{font}; 1803 $self->{template}->set_font ($self->{font}) if $self->{font};
1804 $self->{template}->set_width ($self->{max_w} || -1);
1510 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1805 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1511 1806
1512 my ($w2, $h2) = $self->{template}->size; 1807 my ($w2, $h2) = $self->{template}->size;
1513 1808
1514 $w = List::Util::max $w, $w2; 1809 $w = List::Util::max $w, $w2;
1515 $h = List::Util::max $h, $h2; 1810 $h = List::Util::max $h, $h2;
1811 }
1812
1813 [$w, $h]
1516 } 1814 };
1517 1815
1518 ($w, $h) 1816 @{ $self->{size_req} }
1519} 1817}
1520 1818
1819sub baseline_shift {
1820 $_[0]{layout}->descent
1821}
1822
1521sub size_allocate { 1823sub invoke_size_allocate {
1522 my ($self, $w, $h, $changed) = @_; 1824 my ($self, $w, $h) = @_;
1825
1826 delete $self->{ox};
1523 1827
1524 delete $self->{texture} 1828 delete $self->{texture}
1525 if $changed; 1829 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1830
1831 1
1526} 1832}
1527 1833
1528sub set_fontsize { 1834sub set_fontsize {
1529 my ($self, $fontsize) = @_; 1835 my ($self, $fontsize) = @_;
1530 1836
1531 $self->{fontsize} = $fontsize; 1837 $self->{fontsize} = $fontsize;
1838 delete $self->{size_req};
1532 delete $self->{texture}; 1839 delete $self->{texture};
1533 1840
1534 $self->realloc; 1841 $self->realloc;
1535} 1842}
1536 1843
1844sub reconfigure {
1845 my ($self) = @_;
1846
1847 delete $self->{size_req};
1848 delete $self->{texture};
1849
1850 $self->SUPER::reconfigure;
1851}
1852
1537sub _draw { 1853sub _draw {
1538 my ($self) = @_; 1854 my ($self) = @_;
1539 1855
1540 $self->SUPER::_draw; # draw background, if applicable 1856 $self->SUPER::_draw; # draw background, if applicable
1541 1857
1542 my $tex = $self->{texture} ||= do { 1858 my $size = $self->{texture} ||= do {
1543 $self->{layout}->set_foreground (@{$self->{fg}}); 1859 $self->{layout}->set_foreground (@{$self->{fg}});
1544 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1860 $self->{layout}->set_font ($self->{font}) if $self->{font};
1545 $self->{layout}->set_width ($self->{w}); 1861 $self->{layout}->set_width ($self->{w});
1546 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1862 $self->{layout}->set_ellipsise ($self->{ellipsise});
1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1863 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1864 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549 1865
1550 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1866 [$self->{layout}->size]
1867 };
1551 1868
1869 unless (exists $self->{ox}) {
1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1870 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1871 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1554 : ($self->{w} - $tex->{w}) * 0.5); 1872 : ($self->{w} - $size->[0]) * 0.5);
1555 1873
1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1874 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1875 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1558 : ($self->{h} - $tex->{h}) * 0.5); 1876 : ($self->{h} - $size->[1]) * 0.5);
1559
1560 $tex
1561 }; 1877 };
1562 1878
1563 glEnable GL_TEXTURE_2D; 1879 my $w = List::Util::min $self->{w} + 4, $size->[0];
1564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1880 my $h = List::Util::min $self->{h} + 2, $size->[1];
1565 1881
1566 if ($tex->{format} == GL_ALPHA) { 1882 $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} 1883}
1575 1884
1576############################################################################# 1885#############################################################################
1577 1886
1578package CFClient::UI::EntryBase; 1887package CFPlus::UI::EntryBase;
1579 1888
1580our @ISA = CFClient::UI::Label::; 1889our @ISA = CFPlus::UI::Label::;
1581 1890
1582use CFClient::OpenGL; 1891use CFPlus::OpenGL;
1583 1892
1584sub new { 1893sub new {
1585 my $class = shift; 1894 my $class = shift;
1586 1895
1587 $class->SUPER::new ( 1896 $class->SUPER::new (
… …
1592 can_hover => 1, 1901 can_hover => 1,
1593 can_focus => 1, 1902 can_focus => 1,
1594 valign => 0, 1903 valign => 0,
1595 can_events => 1, 1904 can_events => 1,
1596 #text => ... 1905 #text => ...
1906 #hidden => "*",
1597 @_ 1907 @_
1598 ) 1908 )
1599} 1909}
1600 1910
1601sub _set_text { 1911sub _set_text {
… …
1603 1913
1604 delete $self->{cur_h}; 1914 delete $self->{cur_h};
1605 1915
1606 return if $self->{text} eq $text; 1916 return if $self->{text} eq $text;
1607 1917
1608 delete $self->{texture};
1609
1610 $self->{last_activity} = $::NOW; 1918 $self->{last_activity} = $::NOW;
1611 $self->{text} = $text; 1919 $self->{text} = $text;
1612 1920
1613 $text =~ s/./*/g if $self->{hidden}; 1921 $text =~ s/./*/g if $self->{hidden};
1614 $self->{layout}->set_text ("$text "); 1922 $self->{layout}->set_text ("$text ");
1923 delete $self->{size_req};
1615 1924
1616 $self->_emit (changed => $self->{text}); 1925 $self->emit (changed => $self->{text});
1926
1927 $self->realloc;
1928 $self->update;
1617} 1929}
1618 1930
1619sub set_text { 1931sub set_text {
1620 my ($self, $text) = @_; 1932 my ($self, $text) = @_;
1621 1933
1622 $self->{cursor} = length $text; 1934 $self->{cursor} = length $text;
1623 $self->_set_text ($text); 1935 $self->_set_text ($text);
1624
1625 $self->realloc;
1626} 1936}
1627 1937
1628sub get_text { 1938sub get_text {
1629 $_[0]{text} 1939 $_[0]{text}
1630} 1940}
… …
1635 my ($w, $h) = $self->SUPER::size_request; 1945 my ($w, $h) = $self->SUPER::size_request;
1636 1946
1637 ($w + 1, $h) # add 1 for cursor 1947 ($w + 1, $h) # add 1 for cursor
1638} 1948}
1639 1949
1640sub key_down { 1950sub invoke_key_down {
1641 my ($self, $ev) = @_; 1951 my ($self, $ev) = @_;
1642 1952
1643 my $mod = $ev->{mod}; 1953 my $mod = $ev->{mod};
1644 my $sym = $ev->{sym}; 1954 my $sym = $ev->{sym};
1645 my $uni = $ev->{unicode}; 1955 my $uni = $ev->{unicode};
… …
1648 1958
1649 if ($uni == 8) { 1959 if ($uni == 8) {
1650 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1960 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1651 } elsif ($uni == 127) { 1961 } elsif ($uni == 127) {
1652 substr $text, $self->{cursor}, 1, ""; 1962 substr $text, $self->{cursor}, 1, "";
1653 } elsif ($sym == CFClient::SDLK_LEFT) { 1963 } elsif ($sym == CFPlus::SDLK_LEFT) {
1654 --$self->{cursor} if $self->{cursor}; 1964 --$self->{cursor} if $self->{cursor};
1655 } elsif ($sym == CFClient::SDLK_RIGHT) { 1965 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1656 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1966 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1657 } elsif ($sym == CFClient::SDLK_HOME) { 1967 } elsif ($sym == CFPlus::SDLK_HOME) {
1658 $self->{cursor} = 0; 1968 $self->{cursor} = 0;
1659 } elsif ($sym == CFClient::SDLK_END) { 1969 } elsif ($sym == CFPlus::SDLK_END) {
1660 $self->{cursor} = length $text; 1970 $self->{cursor} = length $text;
1971 } elsif ($uni == 21) { # ctrl-u
1972 $text = "";
1973 $self->{cursor} = 0;
1661 } elsif ($uni == 27) { 1974 } elsif ($uni == 27) {
1662 $self->_emit ('escape'); 1975 $self->emit ('escape');
1663 } elsif ($uni) { 1976 } elsif ($uni) {
1664 substr $text, $self->{cursor}++, 0, chr $uni; 1977 substr $text, $self->{cursor}++, 0, chr $uni;
1978 } else {
1979 return 0;
1665 } 1980 }
1666 1981
1667 $self->_set_text ($text); 1982 $self->_set_text ($text);
1668 1983
1669 $self->realloc; 1984 $self->realloc;
1670}
1671 1985
1986 1
1987}
1988
1672sub focus_in { 1989sub invoke_focus_in {
1673 my ($self) = @_; 1990 my ($self) = @_;
1674 1991
1675 $self->{last_activity} = $::NOW; 1992 $self->{last_activity} = $::NOW;
1676 1993
1677 $self->SUPER::focus_in; 1994 $self->SUPER::invoke_focus_in
1678} 1995}
1679 1996
1680sub button_down { 1997sub invoke_button_down {
1681 my ($self, $ev, $x, $y) = @_; 1998 my ($self, $ev, $x, $y) = @_;
1682 1999
1683 $self->SUPER::button_down ($ev, $x, $y); 2000 $self->SUPER::invoke_button_down ($ev, $x, $y);
1684 2001
1685 my $idx = $self->{layout}->xy_to_index ($x, $y); 2002 my $idx = $self->{layout}->xy_to_index ($x, $y);
1686 2003
1687 # byte-index to char-index 2004 # byte-index to char-index
1688 my $text = $self->{text}; 2005 my $text = $self->{text};
1689 utf8::encode $text; 2006 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1690 $self->{cursor} = length substr $text, 0, $idx; 2007 $self->{cursor} = length $text;
1691 2008
1692 $self->_set_text ($self->{text}); 2009 $self->_set_text ($self->{text});
1693 $self->update; 2010 $self->update;
2011
2012 1
1694} 2013}
1695 2014
1696sub mouse_motion { 2015sub invoke_mouse_motion {
1697 my ($self, $ev, $x, $y) = @_; 2016 my ($self, $ev, $x, $y) = @_;
1698# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2017# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2018
2019 1
1699} 2020}
1700 2021
1701sub _draw { 2022sub _draw {
1702 my ($self) = @_; 2023 my ($self) = @_;
1703 2024
1704 local $self->{fg} = $self->{fg}; 2025 local $self->{fg} = $self->{fg};
1705 2026
1706 if ($FOCUS == $self) { 2027 if ($FOCUS == $self) {
1707 glColor @{$self->{active_bg}}; 2028 glColor_premultiply @{$self->{active_bg}};
1708 $self->{fg} = $self->{active_fg}; 2029 $self->{fg} = $self->{active_fg};
1709 } else { 2030 } else {
1710 glColor @{$self->{bg}}; 2031 glColor_premultiply @{$self->{bg}};
1711 } 2032 }
1712 2033
1713 glEnable GL_BLEND; 2034 glEnable GL_BLEND;
1714 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2035 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1715 glBegin GL_QUADS; 2036 glBegin GL_QUADS;
1716 glVertex 0 , 0; 2037 glVertex 0 , 0;
1717 glVertex 0 , $self->{h}; 2038 glVertex 0 , $self->{h};
1718 glVertex $self->{w}, $self->{h}; 2039 glVertex $self->{w}, $self->{h};
1719 glVertex $self->{w}, 0; 2040 glVertex $self->{w}, 0;
… …
1730 utf8::encode $text; 2051 utf8::encode $text;
1731 2052
1732 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2053 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1733 } 2054 }
1734 2055
1735 glColor @{$self->{fg}};
1736 glBegin GL_LINES; 2056 glBegin GL_LINES;
1737 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2057 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1738 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2058 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1739 glEnd; 2059 glEnd;
1740 } 2060 }
1741} 2061}
1742 2062
1743package CFClient::UI::Entry; 2063package CFPlus::UI::Entry;
1744 2064
1745our @ISA = CFClient::UI::EntryBase::; 2065our @ISA = CFPlus::UI::EntryBase::;
1746 2066
1747use CFClient::OpenGL; 2067use CFPlus::OpenGL;
1748 2068
1749sub key_down { 2069sub invoke_key_down {
1750 my ($self, $ev) = @_; 2070 my ($self, $ev) = @_;
1751 2071
1752 my $sym = $ev->{sym}; 2072 my $sym = $ev->{sym};
1753 2073
1754 if ($sym == 13) { 2074 if ($sym == 13) {
1755 unshift @{$self->{history}}, 2075 unshift @{$self->{history}},
1756 my $txt = $self->get_text; 2076 my $txt = $self->get_text;
2077
1757 $self->{history_pointer} = -1; 2078 $self->{history_pointer} = -1;
1758 $self->{history_saveback} = ''; 2079 $self->{history_saveback} = '';
1759 $self->_emit (activate => $txt); 2080 $self->emit (activate => $txt);
1760 $self->update; 2081 $self->update;
1761 2082
1762 } elsif ($sym == CFClient::SDLK_UP) { 2083 } elsif ($sym == CFPlus::SDLK_UP) {
1763 if ($self->{history_pointer} < 0) { 2084 if ($self->{history_pointer} < 0) {
1764 $self->{history_saveback} = $self->get_text; 2085 $self->{history_saveback} = $self->get_text;
1765 } 2086 }
1766 if (@{$self->{history} || []} > 0) { 2087 if (@{$self->{history} || []} > 0) {
1767 $self->{history_pointer}++; 2088 $self->{history_pointer}++;
… …
1769 $self->{history_pointer} = @{$self->{history} || []} - 1; 2090 $self->{history_pointer} = @{$self->{history} || []} - 1;
1770 } 2091 }
1771 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2092 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1772 } 2093 }
1773 2094
1774 } elsif ($sym == CFClient::SDLK_DOWN) { 2095 } elsif ($sym == CFPlus::SDLK_DOWN) {
1775 $self->{history_pointer}--; 2096 $self->{history_pointer}--;
1776 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2097 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1777 2098
1778 if ($self->{history_pointer} >= 0) { 2099 if ($self->{history_pointer} >= 0) {
1779 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2100 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1780 } else { 2101 } else {
1781 $self->set_text ($self->{history_saveback}); 2102 $self->set_text ($self->{history_saveback});
1782 } 2103 }
1783 2104
1784 } else { 2105 } else {
1785 $self->SUPER::key_down ($ev); 2106 return $self->SUPER::invoke_key_down ($ev)
2107 }
2108
1786 } 2109 1
1787
1788} 2110}
1789 2111
1790############################################################################# 2112#############################################################################
1791 2113
1792package CFClient::UI::Button; 2114package CFPlus::UI::Button;
1793 2115
1794our @ISA = CFClient::UI::Label::; 2116our @ISA = CFPlus::UI::Label::;
1795 2117
1796use CFClient::OpenGL; 2118use CFPlus::OpenGL;
1797 2119
1798my @tex = 2120my @tex =
1799 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2121 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1800 qw(b1_button_active.png); 2122 qw(b1_button_active.png);
1801 2123
1802sub new { 2124sub new {
1803 my $class = shift; 2125 my $class = shift;
1804 2126
… …
1813 can_events => 1, 2135 can_events => 1,
1814 @_ 2136 @_
1815 ) 2137 )
1816} 2138}
1817 2139
1818sub activate { }
1819
1820sub button_up { 2140sub invoke_button_up {
1821 my ($self, $ev, $x, $y) = @_; 2141 my ($self, $ev, $x, $y) = @_;
1822 2142
1823 $self->emit ("activate") 2143 $self->emit ("activate")
1824 if $x >= 0 && $x < $self->{w} 2144 if $x >= 0 && $x < $self->{w}
1825 && $y >= 0 && $y < $self->{h}; 2145 && $y >= 0 && $y < $self->{h};
2146
2147 1
1826} 2148}
1827 2149
1828sub _draw { 2150sub _draw {
1829 my ($self) = @_; 2151 my ($self) = @_;
1830 2152
1831 local $self->{fg} = $self->{fg}; 2153 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1832
1833 if ($GRAB == $self) {
1834 $self->{fg} = $self->{active_fg};
1835 }
1836 2154
1837 glEnable GL_TEXTURE_2D; 2155 glEnable GL_TEXTURE_2D;
1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2156 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1839 glColor 0, 0, 0, 1; 2157 glColor 0, 0, 0, 1;
1840 2158
… …
1845 $self->SUPER::_draw; 2163 $self->SUPER::_draw;
1846} 2164}
1847 2165
1848############################################################################# 2166#############################################################################
1849 2167
1850package CFClient::UI::CheckBox; 2168package CFPlus::UI::CheckBox;
1851 2169
1852our @ISA = CFClient::UI::DrawBG::; 2170our @ISA = CFPlus::UI::DrawBG::;
1853 2171
1854my @tex = 2172my @tex =
1855 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2173 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1856 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2174 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1857 2175
1858use CFClient::OpenGL; 2176use CFPlus::OpenGL;
1859 2177
1860sub new { 2178sub new {
1861 my $class = shift; 2179 my $class = shift;
1862 2180
1863 $class->SUPER::new ( 2181 $class->SUPER::new (
… …
1877 my ($self) = @_; 2195 my ($self) = @_;
1878 2196
1879 (6) x 2 2197 (6) x 2
1880} 2198}
1881 2199
2200sub toggle {
2201 my ($self) = @_;
2202
2203 $self->{state} = !$self->{state};
2204 $self->emit (changed => $self->{state});
2205 $self->update;
2206}
2207
1882sub button_down { 2208sub invoke_button_down {
1883 my ($self, $ev, $x, $y) = @_; 2209 my ($self, $ev, $x, $y) = @_;
1884 2210
1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2211 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2212 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1887 $self->{state} = !$self->{state}; 2213 $self->toggle;
1888 $self->_emit (changed => $self->{state}); 2214 } else {
2215 return 0
2216 }
2217
1889 } 2218 1
1890} 2219}
1891 2220
1892sub _draw { 2221sub _draw {
1893 my ($self) = @_; 2222 my ($self) = @_;
1894 2223
… …
1909 glDisable GL_TEXTURE_2D; 2238 glDisable GL_TEXTURE_2D;
1910} 2239}
1911 2240
1912############################################################################# 2241#############################################################################
1913 2242
1914package CFClient::UI::Image; 2243package CFPlus::UI::Image;
1915 2244
1916our @ISA = CFClient::UI::Base::; 2245our @ISA = CFPlus::UI::Base::;
1917 2246
1918use CFClient::OpenGL; 2247use CFPlus::OpenGL;
1919use Carp qw/confess/;
1920 2248
1921our %loaded_images; 2249our %texture_cache;
1922 2250
1923sub new { 2251sub new {
1924 my $class = shift; 2252 my $class = shift;
1925 2253
1926 my $self = $class->SUPER::new (can_events => 0, @_); 2254 my $self = $class->SUPER::new (
2255 can_events => 0,
2256 @_,
2257 );
1927 2258
1928 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2259 $self->{path} || $self->{tex}
2260 or Carp::croak "'path' or 'tex' attributes required";
1929 2261
1930 $loaded_images{$self->{image}} ||= 2262 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1931 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2263 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1932 2264
1933 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2265 Scalar::Util::weaken $texture_cache{$self->{path}};
1934 2266
1935 Scalar::Util::weaken $loaded_images{$self->{image}}; 2267 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1936
1937 $self->{aspect} = $tex->{w} / $tex->{h};
1938 2268
1939 $self 2269 $self
1940} 2270}
1941 2271
2272sub STORABLE_freeze {
2273 my ($self, $cloning) = @_;
2274
2275 $self->{path}
2276 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2277
2278 $self->{path}
2279}
2280
2281sub STORABLE_attach {
2282 my ($self, $cloning, $path) = @_;
2283
2284 $self->new (path => $path)
2285}
2286
1942sub size_request { 2287sub size_request {
1943 my ($self) = @_; 2288 my ($self) = @_;
1944 2289
1945 ($self->{tex}->{w}, $self->{tex}->{h}) 2290 ($self->{tex}{w}, $self->{tex}{h})
1946} 2291}
1947 2292
1948sub _draw { 2293sub _draw {
1949 my ($self) = @_; 2294 my ($self) = @_;
1950 2295
… …
1960 } 2305 }
1961 2306
1962 glEnable GL_TEXTURE_2D; 2307 glEnable GL_TEXTURE_2D;
1963 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2308 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1964 2309
1965 $tex->draw_quad_alpha (0, 0, $w, $h); 2310 $tex->draw_quad (0, 0, $w, $h);
1966 2311
1967 glDisable GL_TEXTURE_2D; 2312 glDisable GL_TEXTURE_2D;
1968} 2313}
1969 2314
1970############################################################################# 2315#############################################################################
1971 2316
2317package CFPlus::UI::ImageButton;
2318
2319our @ISA = CFPlus::UI::Image::;
2320
2321use CFPlus::OpenGL;
2322
2323my %textures;
2324
2325sub new {
2326 my $class = shift;
2327
2328 my $self = $class->SUPER::new (
2329 padding_x => 4,
2330 padding_y => 4,
2331 fg => [1, 1, 1],
2332 active_fg => [0, 0, 1],
2333 can_hover => 1,
2334 align => 0,
2335 valign => 0,
2336 can_events => 1,
2337 @_
2338 );
2339}
2340
2341sub invoke_button_up {
2342 my ($self, $ev, $x, $y) = @_;
2343
2344 $self->emit ("activate")
2345 if $x >= 0 && $x < $self->{w}
2346 && $y >= 0 && $y < $self->{h};
2347
2348 1
2349}
2350
2351#############################################################################
2352
1972package CFClient::UI::VGauge; 2353package CFPlus::UI::VGauge;
1973 2354
1974our @ISA = CFClient::UI::Base::; 2355our @ISA = CFPlus::UI::Base::;
1975 2356
1976use List::Util qw(min max); 2357use List::Util qw(min max);
1977 2358
1978use CFClient::OpenGL; 2359use CFPlus::OpenGL;
1979 2360
1980my %tex = ( 2361my %tex = (
1981 food => [ 2362 food => [
1982 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1983 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2364 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1984 ], 2365 ],
1985 grace => [ 2366 grace => [
1986 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2367 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/ 2368 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1988 ], 2369 ],
1989 hp => [ 2370 hp => [
1990 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2371 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1991 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2372 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1992 ], 2373 ],
1993 mana => [ 2374 mana => [
1994 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2375 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/ 2376 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1996 ], 2377 ],
1997); 2378);
1998 2379
1999# eg. VGauge->new (gauge => 'food'), default gauge: food 2380# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2059 my $ycut1 = max 0, min 1, $ycut; 2440 my $ycut1 = max 0, min 1, $ycut;
2060 my $ycut2 = max 0, min 1, $ycut - 1; 2441 my $ycut2 = max 0, min 1, $ycut - 1;
2061 2442
2062 my $h1 = $self->{h} * (1 - $ycut1); 2443 my $h1 = $self->{h} * (1 - $ycut1);
2063 my $h2 = $self->{h} * (1 - $ycut2); 2444 my $h2 = $self->{h} * (1 - $ycut2);
2445 my $h3 = $self->{h};
2446
2447 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2064 2448
2065 glEnable GL_BLEND; 2449 glEnable GL_BLEND;
2066 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2450 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2451 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2067 glEnable GL_TEXTURE_2D; 2452 glEnable GL_TEXTURE_2D;
2068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2069 2454
2070 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2455 glBindTexture GL_TEXTURE_2D, $t1->{name};
2071 glBegin GL_QUADS; 2456 glBegin GL_QUADS;
… …
2086 2471
2087 if ($t3) { 2472 if ($t3) {
2088 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2473 glBindTexture GL_TEXTURE_2D, $t3->{name};
2089 glBegin GL_QUADS; 2474 glBegin GL_QUADS;
2090 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2475 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2091 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2476 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2092 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2477 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2093 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2478 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2094 glEnd; 2479 glEnd;
2095 } 2480 }
2096 2481
2097 glDisable GL_BLEND; 2482 glDisable GL_BLEND;
2098 glDisable GL_TEXTURE_2D; 2483 glDisable GL_TEXTURE_2D;
2099} 2484}
2100 2485
2101############################################################################# 2486#############################################################################
2102 2487
2103package CFClient::UI::Gauge; 2488package CFPlus::UI::Gauge;
2104 2489
2105our @ISA = CFClient::UI::VBox::; 2490our @ISA = CFPlus::UI::VBox::;
2106 2491
2107sub new { 2492sub new {
2108 my ($class, %arg) = @_; 2493 my ($class, %arg) = @_;
2109 2494
2110 my $self = $class->SUPER::new ( 2495 my $self = $class->SUPER::new (
… …
2112 can_hover => 1, 2497 can_hover => 1,
2113 can_events => 1, 2498 can_events => 1,
2114 %arg, 2499 %arg,
2115 ); 2500 );
2116 2501
2117 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2502 $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); 2503 $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"); 2504 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2120 2505
2121 $self 2506 $self
2122} 2507}
2123 2508
2124sub set_fontsize { 2509sub set_fontsize {
… …
2145 $self->{value}->set_text ($val); 2530 $self->{value}->set_text ($val);
2146} 2531}
2147 2532
2148############################################################################# 2533#############################################################################
2149 2534
2150package CFClient::UI::Slider; 2535package CFPlus::UI::Slider;
2151 2536
2152use strict; 2537use strict;
2153 2538
2154use CFClient::OpenGL; 2539use CFPlus::OpenGL;
2155 2540
2156our @ISA = CFClient::UI::DrawBG::; 2541our @ISA = CFPlus::UI::DrawBG::;
2157 2542
2158my @tex = 2543my @tex =
2159 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2544 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2160 qw(s1_slider.png s1_slider_bg.png); 2545 qw(s1_slider.png s1_slider_bg.png);
2161 2546
2162sub new { 2547sub new {
2163 my $class = shift; 2548 my $class = shift;
2164 2549
… …
2185 $self->update; 2570 $self->update;
2186 2571
2187 $self 2572 $self
2188} 2573}
2189 2574
2190sub changed { }
2191
2192sub set_range { 2575sub set_range {
2193 my ($self, $range) = @_; 2576 my ($self, $range) = @_;
2194 2577
2195 ($range, $self->{range}) = ($self->{range}, $range); 2578 ($range, $self->{range}) = ($self->{range}, $range);
2196 2579
2197 $self->update
2198 if "@$range" ne "@{$self->{range}}"; 2580 if ("@$range" ne "@{$self->{range}}") {
2581 $self->update;
2582 $self->set_value ($self->{range}[0]);
2583 }
2199} 2584}
2200 2585
2201sub set_value { 2586sub set_value {
2202 my ($self, $value) = @_; 2587 my ($self, $value) = @_;
2203 2588
… …
2214 if $unit; 2599 if $unit;
2215 2600
2216 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2601 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2217 2602
2218 if ($value != $old_value) { 2603 if ($value != $old_value) {
2219 $self->_emit (changed => $value); 2604 $self->emit (changed => $value);
2220 $self->update; 2605 $self->update;
2221 } 2606 }
2222} 2607}
2223 2608
2224sub size_request { 2609sub size_request {
2225 my ($self) = @_; 2610 my ($self) = @_;
2226 2611
2227 ($self->{req_w}, $self->{req_h}) 2612 ($self->{req_w}, $self->{req_h})
2228} 2613}
2229 2614
2230sub button_down { 2615sub invoke_button_down {
2231 my ($self, $ev, $x, $y) = @_; 2616 my ($self, $ev, $x, $y) = @_;
2232 2617
2233 $self->SUPER::button_down ($ev, $x, $y); 2618 $self->SUPER::invoke_button_down ($ev, $x, $y);
2234 2619
2235 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2620 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236 2621
2237 $self->mouse_motion ($ev, $x, $y); 2622 $self->invoke_mouse_motion ($ev, $x, $y)
2238} 2623}
2239 2624
2240sub mouse_motion { 2625sub invoke_mouse_motion {
2241 my ($self, $ev, $x, $y) = @_; 2626 my ($self, $ev, $x, $y) = @_;
2242 2627
2243 if ($GRAB == $self) { 2628 if ($GRAB == $self) {
2244 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2629 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2245 2630
2246 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2631 my (undef, $lo, $hi, $page) = @{$self->{range}};
2247 2632
2248 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2633 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249 2634
2250 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2635 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2636 } else {
2637 return 0;
2638 }
2639
2251 } 2640 1
2641}
2642
2643sub invoke_mouse_wheel {
2644 my ($self, $ev) = @_;
2645
2646 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2647
2648 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2649
2650 ! ! $delta
2252} 2651}
2253 2652
2254sub update { 2653sub update {
2255 my ($self) = @_; 2654 my ($self) = @_;
2256 2655
2257 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2656 delete $self->{knob_w};
2657 $self->SUPER::update;
2658}
2659
2660sub _draw {
2661 my ($self) = @_;
2662
2663 unless ($self->{knob_w}) {
2258 $self->set_value ($self->{range}[0]); 2664 $self->set_value ($self->{range}[0]);
2259 2665
2260 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2666 my ($value, $lo, $hi, $page) = @{$self->{range}};
2261 my $range = ($hi - $page - $lo) || 1e-100; 2667 my $range = ($hi - $page - $lo) || 1e-100;
2262 2668
… …
2268 $value = ($value - $lo) / $range; 2674 $value = ($value - $lo) / $range;
2269 $value = $value * $self->{scale} + $self->{offset}; 2675 $value = $value * $self->{scale} + $self->{offset};
2270 2676
2271 $self->{knob_x} = $value - $knob_w * 0.5; 2677 $self->{knob_x} = $value - $knob_w * 0.5;
2272 $self->{knob_w} = $knob_w; 2678 $self->{knob_w} = $knob_w;
2273 }); 2679 }
2274
2275 $self->SUPER::update;
2276}
2277
2278sub _draw {
2279 my ($self) = @_;
2280 2680
2281 $self->SUPER::_draw (); 2681 $self->SUPER::_draw ();
2282 2682
2283 glScale $self->{w}, $self->{h}; 2683 glScale $self->{w}, $self->{h};
2284 2684
… …
2304 glDisable GL_TEXTURE_2D; 2704 glDisable GL_TEXTURE_2D;
2305} 2705}
2306 2706
2307############################################################################# 2707#############################################################################
2308 2708
2309package CFClient::UI::ValSlider; 2709package CFPlus::UI::ValSlider;
2310 2710
2311our @ISA = CFClient::UI::HBox::; 2711our @ISA = CFPlus::UI::HBox::;
2312 2712
2313sub new { 2713sub new {
2314 my ($class, %arg) = @_; 2714 my ($class, %arg) = @_;
2315 2715
2316 my $range = delete $arg{range}; 2716 my $range = delete $arg{range};
2317 2717
2318 my $self = $class->SUPER::new ( 2718 my $self = $class->SUPER::new (
2319 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2719 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2320 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2720 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2321 to_value => sub { shift }, 2721 to_value => sub { shift },
2322 from_value => sub { shift }, 2722 from_value => sub { shift },
2323 %arg, 2723 %arg,
2324 ); 2724 );
2325 2725
… …
2345sub set_range { shift->{slider}->set_range (@_) } 2745sub set_range { shift->{slider}->set_range (@_) }
2346sub set_value { shift->{slider}->set_value (@_) } 2746sub set_value { shift->{slider}->set_value (@_) }
2347 2747
2348############################################################################# 2748#############################################################################
2349 2749
2350package CFClient::UI::TextView; 2750package CFPlus::UI::TextScroller;
2351 2751
2352our @ISA = CFClient::UI::HBox::; 2752our @ISA = CFPlus::UI::HBox::;
2353 2753
2354use CFClient::OpenGL; 2754use CFPlus::OpenGL;
2355 2755
2356sub new { 2756sub new {
2357 my $class = shift; 2757 my $class = shift;
2358 2758
2359 my $self = $class->SUPER::new ( 2759 my $self = $class->SUPER::new (
2360 fontsize => 1, 2760 fontsize => 1,
2361 can_events => 0, 2761 can_events => 1,
2762 indent => 0,
2362 #font => default_font 2763 #font => default_font
2363 @_, 2764 @_,
2364 2765
2365 layout => (new CFClient::Layout 1), 2766 layout => (new CFPlus::Layout),
2366 par => [], 2767 par => [],
2367 height => 0, 2768 height => 0,
2368 children => [ 2769 children => [
2369 (new CFClient::UI::Empty expand => 1), 2770 (new CFPlus::UI::Empty expand => 1),
2370 (new CFClient::UI::Slider vertical => 1), 2771 (new CFPlus::UI::Slider vertical => 1),
2371 ], 2772 ],
2372 ); 2773 );
2373 2774
2374 $self->{children}[1]->connect (changed => sub { $self->update }); 2775 $self->{children}[1]->connect (changed => sub { $self->update });
2375 2776
… …
2381 2782
2382 $self->{fontsize} = $fontsize; 2783 $self->{fontsize} = $fontsize;
2383 $self->reflow; 2784 $self->reflow;
2384} 2785}
2385 2786
2787sub size_request {
2788 my ($self) = @_;
2789
2790 my ($empty, $slider) = @{ $self->{children} };
2791
2792 local $self->{children} = [$empty, $slider];
2793 $self->SUPER::size_request
2794}
2795
2386sub size_allocate { 2796sub invoke_size_allocate {
2387 my ($self, $w, $h, $changed) = @_; 2797 my ($self, $w, $h) = @_;
2388 2798
2389 $self->SUPER::size_allocate ($w, $h, $changed); 2799 my ($empty, $slider, @other) = @{ $self->{children} };
2390 2800 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2391 return unless $changed;
2392 2801
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2802 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2803 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 2804 $self->{layout}->set_width ($empty->{w});
2805 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 2806
2397 $self->reflow; 2807 $self->reflow;
2398}
2399 2808
2400sub text_size { 2809 local $self->{children} = [$empty, $slider];
2810 $self->SUPER::invoke_size_allocate ($w, $h)
2811}
2812
2813sub invoke_mouse_wheel {
2401 my ($self, $text, $indent) = @_; 2814 my ($self, $ev) = @_;
2815
2816 return 0 unless $ev->{dy}; # only vertical movements
2817
2818 $self->{children}[1]->emit (mouse_wheel => $ev);
2819
2820 1
2821}
2822
2823sub get_layout {
2824 my ($self, $para) = @_;
2402 2825
2403 my $layout = $self->{layout}; 2826 my $layout = $self->{layout};
2404 2827
2828 $layout->set_font ($self->{font}) if $self->{font};
2829 $layout->set_foreground (@{$para->{fg}});
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2830 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent); 2831 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2832 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($text); 2833 $layout->set_markup ($para->{markup});
2834
2835 $layout->set_shapes (
2836 map
2837 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2838 @{$para->{widget}}
2408 2839 );
2840
2409 $layout->size 2841 $layout
2410} 2842}
2411 2843
2412sub reflow { 2844sub reflow {
2413 my ($self) = @_; 2845 my ($self) = @_;
2414 2846
… …
2421 2853
2422 # todo: base offset on lines or so, not on pixels 2854 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset); 2855 $self->{children}[1]->set_value ($offset);
2424} 2856}
2425 2857
2858sub current_paragraph {
2859 my ($self) = @_;
2860
2861 $self->{top_paragraph} - 1
2862}
2863
2864sub scroll_to {
2865 my ($self, $para) = @_;
2866
2867 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2868
2869 $self->{scroll_to} = $para;
2870 $self->update;
2871}
2872
2426sub clear { 2873sub clear {
2427 my ($self) = @_; 2874 my ($self) = @_;
2875
2876 my (undef, undef, @other) = @{ $self->{children} };
2877 $self->remove ($_) for @other;
2428 2878
2429 $self->{par} = []; 2879 $self->{par} = [];
2430 $self->{height} = 0; 2880 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2881 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432} 2882}
2433 2883
2434sub add_paragraph { 2884sub add_paragraph {
2435 my ($self, $color, $text, $indent) = @_; 2885 my $self = shift;
2436 2886
2437 for my $line (split /\n/, $text) { 2887 for my $para (@_) {
2438 my ($w, $h) = $self->text_size ($line); 2888 $para = {
2889 fg => [1, 1, 1, 1],
2890 indent => 0,
2891 markup => "",
2892 widget => [],
2893 ref $para ? %$para : (markup => $para),
2894 w => 1e10,
2895 wrapped => 1,
2896 };
2897
2898 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2899 push @{$self->{par}}, $para;
2900 }
2901
2902 $self->{need_reflow}++;
2903 $self->update;
2904}
2905
2906sub scroll_to_bottom {
2907 my ($self) = @_;
2908
2909 $self->{scroll_to} = $#{$self->{par}};
2910 $self->update;
2911}
2912
2913sub force_uptodate {
2914 my ($self) = @_;
2915
2916 if (delete $self->{need_reflow}) {
2917 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2918
2919 my $height = 0;
2920
2921 for my $para (@{$self->{par}}) {
2922 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2923 my $layout = $self->get_layout ($para);
2924 my ($w, $h) = $layout->size;
2925
2926 $para->{w} = $w + $para->{indent};
2927 $para->{h} = $h;
2928 $para->{wrapped} = $layout->has_wrapped;
2929 }
2930
2931 $para->{y} = $height;
2932 $height += $para->{h};
2933 }
2934
2439 $self->{height} += $h; 2935 $self->{height} = $height;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2936 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2441 }
2442 2937
2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2938 delete $self->{texture};
2939 }
2940
2941 if (my $paridx = delete $self->{scroll_to}) {
2942 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2943 }
2444} 2944}
2445 2945
2446sub update { 2946sub update {
2447 my ($self) = @_; 2947 my ($self) = @_;
2448 2948
… …
2450 2950
2451 return unless $self->{h} > 0; 2951 return unless $self->{h} > 0;
2452 2952
2453 delete $self->{texture}; 2953 delete $self->{texture};
2454 2954
2455 $ROOT->on_post_alloc ($self, sub { 2955 $ROOT->on_post_alloc ($self => sub {
2956 $self->force_uptodate;
2957
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2958 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457 2959
2458 if (delete $self->{need_reflow}) {
2459 my $height = 0;
2460
2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2465 for (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467 $layout->set_width ($W - $_->[3]);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3];
2471 $_->[1] = $h;
2472 }
2473
2474 $height += $_->[1];
2475 }
2476
2477 $self->{height} = $height;
2478
2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2480
2481 delete $self->{texture};
2482 }
2483
2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2960 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 2961 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 2962 glClear GL_COLOR_BUFFER_BIT;
2487 2963
2964 my $top = int $self->{children}[1]{range}[0];
2965
2966 my $paridx = 0;
2967 my $top_paragraph;
2488 my $top = int $self->{children}[1]{range}[0]; 2968 my $top = int $self->{children}[1]{range}[0];
2489 2969
2490 my $y0 = $top; 2970 my $y0 = $top;
2491 my $y1 = $top + $H; 2971 my $y1 = $top + $H;
2492 2972
2493 my $y = 0;
2494
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}}) { 2973 for my $para (@{$self->{par}}) {
2504 my $h = $par->[1]; 2974 my $h = $para->{h};
2975 my $y = $para->{y};
2505 2976
2506 if ($y0 < $y + $h && $y < $y1) { 2977 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] }); 2978 my $layout = $self->get_layout ($para);
2508 $layout->set_width ($W - $par->[3]);
2509 $layout->set_markup ($par->[4]);
2510 2979
2511 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2980 $layout->render ($para->{indent}, $y - $y0);
2512 2981
2513 glRasterPos $par->[3], $y - $y0; 2982 if (my @w = @{ $para->{widget} }) {
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2983 my @s = $layout->get_shapes;
2984
2985 for (@w) {
2986 my ($dx, $dy) = splice @s, 0, 2, ();
2987
2988 $_->{x} = $dx + $para->{indent};
2989 $_->{y} = $dy + $y - $y0;
2990
2991 $_->draw;
2992 }
2993 }
2515 } 2994 }
2516 2995
2517 $y += $h; 2996 $paridx++;
2997 $top_paragraph ||= $paridx if $y >= $top;
2518 } 2998 }
2519 2999
2520 glDisable GL_BLEND; 3000 $self->{top_paragraph} = $top_paragraph;
2521 }; 3001 };
2522 }); 3002 });
2523} 3003}
2524 3004
3005sub reconfigure {
3006 my ($self) = @_;
3007
3008 $self->SUPER::reconfigure;
3009
3010 $_->{w} = 1e10 for @{ $self->{par} };
3011 $self->reflow;
3012}
3013
2525sub _draw { 3014sub _draw {
2526 my ($self) = @_; 3015 my ($self) = @_;
2527 3016
2528 glEnable GL_TEXTURE_2D; 3017 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3018 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 3019 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3020 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 3021 glDisable GL_TEXTURE_2D;
2533 3022
2534 $self->{children}[1]->draw; 3023 $self->{children}[1]->draw;
2535
2536} 3024}
2537 3025
2538############################################################################# 3026#############################################################################
2539 3027
2540package CFClient::UI::Animator; 3028package CFPlus::UI::Animator;
2541 3029
2542use CFClient::OpenGL; 3030use CFPlus::OpenGL;
2543 3031
2544our @ISA = CFClient::UI::Bin::; 3032our @ISA = CFPlus::UI::Bin::;
2545 3033
2546sub moveto { 3034sub moveto {
2547 my ($self, $x, $y) = @_; 3035 my ($self, $x, $y) = @_;
2548 3036
2549 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3037 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2577 glPopMatrix; 3065 glPopMatrix;
2578} 3066}
2579 3067
2580############################################################################# 3068#############################################################################
2581 3069
2582package CFClient::UI::Flopper; 3070package CFPlus::UI::Flopper;
2583 3071
2584our @ISA = CFClient::UI::Button::; 3072our @ISA = CFPlus::UI::Button::;
2585 3073
2586sub new { 3074sub new {
2587 my $class = shift; 3075 my $class = shift;
2588 3076
2589 my $self = $class->SUPER::new ( 3077 my $self = $class->SUPER::new (
… …
2601 $self->{other}->toggle_visibility; 3089 $self->{other}->toggle_visibility;
2602} 3090}
2603 3091
2604############################################################################# 3092#############################################################################
2605 3093
2606package CFClient::UI::Tooltip; 3094package CFPlus::UI::Tooltip;
2607 3095
2608our @ISA = CFClient::UI::Bin::; 3096our @ISA = CFPlus::UI::Bin::;
2609 3097
2610use CFClient::OpenGL; 3098use CFPlus::OpenGL;
2611 3099
2612sub new { 3100sub new {
2613 my $class = shift; 3101 my $class = shift;
2614 3102
2615 $class->SUPER::new ( 3103 $class->SUPER::new (
… …
2619} 3107}
2620 3108
2621sub set_tooltip_from { 3109sub set_tooltip_from {
2622 my ($self, $widget) = @_; 3110 my ($self, $widget) = @_;
2623 3111
3112 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3113 if $widget->{tooltip} =~ /^#(.*)$/;
3114
3115 my $tooltip = $widget->{tooltip};
3116
3117 if ($ENV{CFPLUS_DEBUG} & 2) {
3118 $tooltip .= "\n\n" . (ref $widget) . "\n"
3119 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3120 . "req $widget->{req_w} $widget->{req_h}\n"
3121 . "visible $widget->{visible}";
3122 }
3123
3124 $tooltip =~ s/^\n+//;
3125 $tooltip =~ s/\n+$//;
3126
2624 $self->add (new CFClient::UI::Label 3127 $self->add (new CFPlus::UI::Label
2625 markup => $widget->{tooltip}, 3128 markup => $tooltip,
2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3129 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8, 3130 fontsize => 0.8,
2628 fg => [0, 0, 0, 1], 3131 style => 1, # FLAG_INVERSE
2629 ellipsise => 0, 3132 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP), 3133 font => ($widget->{tooltip_font} || $::FONT_PROP),
2631 ); 3134 );
2632} 3135}
2633 3136
… …
2637 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3140 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2638 3141
2639 ($w + 4, $h + 4) 3142 ($w + 4, $h + 4)
2640} 3143}
2641 3144
2642sub size_allocate { 3145sub invoke_size_allocate {
2643 my ($self, $w, $h, $changed) = @_; 3146 my ($self, $w, $h) = @_;
2644 3147
2645 return unless $changed;
2646
2647 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 3148 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2648} 3149}
2649 3150
2650sub visibility_change { 3151sub invoke_visibility_change {
2651 my ($self, $visible) = @_; 3152 my ($self, $visible) = @_;
2652 3153
2653 return unless $visible; 3154 return unless $visible;
2654 3155
2655 $self->{root}->on_post_alloc ("move_$self" => sub { 3156 $self->{root}->on_post_alloc ("move_$self" => sub {
2656 my $widget = $self->{owner} 3157 my $widget = $self->{owner}
2657 or return; 3158 or return;
2658 3159
3160 if ($widget->{visible}) {
2659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3161 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2660 3162
2661 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3163 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2662 if $x + $self->{w} > $::WIDTH; 3164 if $x + $self->{w} > $self->{root}{w};
2663 3165
2664 $self->move_abs ($x, $y); 3166 $self->move_abs ($x, $y);
3167 } else {
3168 $self->hide;
3169 }
2665 }); 3170 });
2666} 3171}
2667 3172
2668sub _draw { 3173sub _draw {
2669 my ($self) = @_; 3174 my ($self) = @_;
… …
2693 $self->SUPER::_draw; 3198 $self->SUPER::_draw;
2694} 3199}
2695 3200
2696############################################################################# 3201#############################################################################
2697 3202
2698package CFClient::UI::Face; 3203package CFPlus::UI::Face;
2699 3204
2700our @ISA = CFClient::UI::Base::; 3205our @ISA = CFPlus::UI::DrawBG::;
2701 3206
2702use CFClient::OpenGL; 3207use CFPlus::OpenGL;
2703 3208
2704sub new { 3209sub new {
2705 my $class = shift; 3210 my $class = shift;
2706 3211
2707 my $self = $class->SUPER::new ( 3212 my $self = $class->SUPER::new (
… …
2742sub _draw { 3247sub _draw {
2743 my ($self) = @_; 3248 my ($self) = @_;
2744 3249
2745 return unless $::CONN; 3250 return unless $::CONN;
2746 3251
3252 $self->SUPER::_draw;
3253
2747 my $face; 3254 my $face;
2748 3255
2749 if ($self->{frame}) { 3256 if ($self->{frame}) {
2750 my $anim = $::CONN->{anim}[$self->{anim}]; 3257 my $anim = $::CONN->{anim}[$self->{anim}];
2751 3258
… …
2756 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3263 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2757 3264
2758 if ($tex) { 3265 if ($tex) {
2759 glEnable GL_TEXTURE_2D; 3266 glEnable GL_TEXTURE_2D;
2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3267 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2761 glColor 1, 1, 1, 1; 3268 glColor 0, 0, 0, 1;
2762 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3269 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2763 glDisable GL_TEXTURE_2D; 3270 glDisable GL_TEXTURE_2D;
2764 } 3271 }
2765} 3272}
2766 3273
2767sub DESTROY { 3274sub destroy {
2768 my ($self) = @_; 3275 my ($self) = @_;
2769 3276
2770 $self->{timer}->cancel 3277 $self->{timer}->cancel
2771 if $self->{timer}; 3278 if $self->{timer};
2772 3279
2773 $self->SUPER::DESTROY; 3280 $self->SUPER::destroy;
2774} 3281}
2775 3282
2776############################################################################# 3283#############################################################################
2777 3284
2778package CFClient::UI::Inventory; 3285package CFPlus::UI::Buttonbar;
2779 3286
2780our @ISA = CFClient::UI::ScrolledWindow::; 3287our @ISA = CFPlus::UI::HBox::;
2781 3288
2782sub new { 3289# 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 3290
2818############################################################################# 3291#############################################################################
2819 3292
2820package CFClient::UI::Menu; 3293package CFPlus::UI::Menu;
2821 3294
2822our @ISA = CFClient::UI::FancyFrame::; 3295our @ISA = CFPlus::UI::Toplevel::;
2823 3296
2824use CFClient::OpenGL; 3297use CFPlus::OpenGL;
2825 3298
2826sub new { 3299sub new {
2827 my $class = shift; 3300 my $class = shift;
2828 3301
2829 my $self = $class->SUPER::new ( 3302 my $self = $class->SUPER::new (
2830 items => [], 3303 items => [],
2831 z => 100, 3304 z => 100,
2832 @_, 3305 @_,
2833 ); 3306 );
2834 3307
2835 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3308 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2836 3309
2837 for my $item (@{ $self->{items} }) { 3310 for my $item (@{ $self->{items} }) {
2838 my ($widget, $cb) = @$item; 3311 my ($widget, $cb, $tooltip) = @$item;
2839 3312
2840 # handle various types of items, only text for now 3313 # handle various types of items, only text for now
2841 if (!ref $widget) { 3314 if (!ref $widget) {
3315 if ($widget =~ /\t/) {
3316 my ($left, $right) = split /\t/, $widget, 2;
3317
2842 $widget = new CFClient::UI::Label 3318 $widget = new CFPlus::UI::HBox
2843 can_hover => 1, 3319 can_hover => 1,
2844 can_events => 1, 3320 can_events => 1,
3321 tooltip => $tooltip,
3322 children => [
3323 (new CFPlus::UI::Label markup => $left, expand => 1),
3324 (new CFPlus::UI::Label markup => $right, align => +1),
3325 ],
3326 ;
3327
3328 } else {
3329 $widget = new CFPlus::UI::Label
3330 can_hover => 1,
3331 can_events => 1,
2845 text => $widget; 3332 markup => $widget,
3333 tooltip => $tooltip;
3334 }
2846 } 3335 }
2847 3336
2848 $self->{item}{$widget} = $item; 3337 $self->{item}{$widget} = $item;
2849 3338
2850 $self->{vbox}->add ($widget); 3339 $self->{vbox}->add ($widget);
… …
2855 3344
2856# popup given the event (must be a mouse button down event currently) 3345# popup given the event (must be a mouse button down event currently)
2857sub popup { 3346sub popup {
2858 my ($self, $ev) = @_; 3347 my ($self, $ev) = @_;
2859 3348
2860 $self->_emit ("popdown"); 3349 $self->emit ("popdown");
2861 3350
2862 # maybe save $GRAB? must be careful about events... 3351 # maybe save $GRAB? must be careful about events...
2863 $GRAB = $self; 3352 $GRAB = $self;
2864 $self->{button} = $ev->{button}; 3353 $self->{button} = $ev->{button};
2865 3354
2866 $self->show; 3355 $self->show;
2867 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3356 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2868} 3357}
2869 3358
2870sub mouse_motion { 3359sub invoke_mouse_motion {
2871 my ($self, $ev, $x, $y) = @_; 3360 my ($self, $ev, $x, $y) = @_;
2872 3361
2873 # TODO: should use vbox->find_widget or so 3362 # TODO: should use vbox->find_widget or so
2874 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3363 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875 $self->{hover} = $self->{item}{$HOVER}; 3364 $self->{hover} = $self->{item}{$HOVER};
2876}
2877 3365
3366 0
3367}
3368
2878sub button_up { 3369sub invoke_button_up {
2879 my ($self, $ev, $x, $y) = @_; 3370 my ($self, $ev, $x, $y) = @_;
2880 3371
2881 if ($ev->{button} == $self->{button}) { 3372 if ($ev->{button} == $self->{button}) {
2882 undef $GRAB; 3373 undef $GRAB;
2883 $self->hide; 3374 $self->hide;
2884 3375
2885 $self->_emit ("popdown"); 3376 $self->emit ("popdown");
2886 $self->{hover}[1]->() if $self->{hover}; 3377 $self->{hover}[1]->() if $self->{hover};
3378 } else {
3379 return 0
3380 }
3381
2887 } 3382 1
2888} 3383}
2889 3384
2890############################################################################# 3385#############################################################################
2891 3386
2892package CFClient::UI::Statusbox; 3387package CFPlus::UI::Multiplexer;
2893 3388
2894our @ISA = CFClient::UI::VBox::; 3389our @ISA = CFPlus::UI::Container::;
2895 3390
2896sub new { 3391sub new {
2897 my $class = shift; 3392 my $class = shift;
2898 3393
2899 $class->SUPER::new ( 3394 my $self = $class->SUPER::new (
3395 @_,
3396 );
3397
3398 $self->{current} = $self->{children}[0]
3399 if @{ $self->{children} };
3400
3401 $self
3402}
3403
3404sub add {
3405 my ($self, @widgets) = @_;
3406
3407 $self->SUPER::add (@widgets);
3408
3409 $self->{current} = $self->{children}[0]
3410 if @{ $self->{children} };
3411}
3412
3413sub get_current_page {
3414 my ($self) = @_;
3415
3416 $self->{current}
3417}
3418
3419sub set_current_page {
3420 my ($self, $page_or_widget) = @_;
3421
3422 my $widget = ref $page_or_widget
3423 ? $page_or_widget
3424 : $self->{children}[$page_or_widget];
3425
3426 $self->{current} = $widget;
3427 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3428
3429 $self->emit (page_changed => $self->{current});
3430
3431 $self->realloc;
3432}
3433
3434sub visible_children {
3435 $_[0]{current}
3436}
3437
3438sub size_request {
3439 my ($self) = @_;
3440
3441 $self->{current}->size_request
3442}
3443
3444sub invoke_size_allocate {
3445 my ($self, $w, $h) = @_;
3446
3447 $self->{current}->configure (0, 0, $w, $h);
3448
3449 1
3450}
3451
3452sub _draw {
3453 my ($self) = @_;
3454
3455 $self->{current}->draw;
3456}
3457
3458#############################################################################
3459
3460package CFPlus::UI::Notebook;
3461
3462our @ISA = CFPlus::UI::VBox::;
3463
3464sub new {
3465 my $class = shift;
3466
3467 my $self = $class->SUPER::new (
3468 buttonbar => (new CFPlus::UI::Buttonbar),
3469 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3470 # filter => # will be put between multiplexer and $self
3471 @_,
3472 );
3473
3474 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3475 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3476
3477 $self
3478}
3479
3480sub add {
3481 my ($self, $title, $widget, $tooltip) = @_;
3482
3483 Scalar::Util::weaken $self;
3484
3485 $self->{buttonbar}->add (new CFPlus::UI::Button
3486 markup => $title,
3487 tooltip => $tooltip,
3488 on_activate => sub { $self->set_current_page ($widget) },
3489 );
3490
3491 $self->{multiplexer}->add ($widget);
3492}
3493
3494sub get_current_page {
3495 my ($self) = @_;
3496
3497 $self->{multiplexer}->get_current_page
3498}
3499
3500sub set_current_page {
3501 my ($self, $page) = @_;
3502
3503 $self->{multiplexer}->set_current_page ($page);
3504 $self->emit (page_changed => $self->{multiplexer}{current});
3505}
3506
3507#############################################################################
3508
3509package CFPlus::UI::Selector;
3510
3511use utf8;
3512
3513our @ISA = CFPlus::UI::Button::;
3514
3515sub new {
3516 my $class = shift;
3517
3518 my $self = $class->SUPER::new (
3519 options => [], # [value, title, longdesc], ...
3520 value => undef,
3521 @_,
3522 );
3523
3524 $self->_set_value ($self->{value});
3525
3526 $self
3527}
3528
3529sub invoke_button_down {
3530 my ($self, $ev) = @_;
3531
3532 my @menu_items;
3533
3534 for (@{ $self->{options} }) {
3535 my ($value, $title, $tooltip) = @$_;
3536
3537 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3538 }
3539
3540 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3541}
3542
3543sub _set_value {
3544 my ($self, $value) = @_;
3545
3546 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3547 or return;
3548
3549 $self->{value} = $item->[0];
3550 $self->set_markup ("$item->[1] ⇓");
3551 $self->set_tooltip ($item->[2]);
3552}
3553
3554sub set_value {
3555 my ($self, $value) = @_;
3556
3557 return unless $self->{value} ne $value;
3558
3559 $self->_set_value ($value);
3560 $self->emit (changed => $value);
3561}
3562
3563#############################################################################
3564
3565package CFPlus::UI::Statusbox;
3566
3567our @ISA = CFPlus::UI::VBox::;
3568
3569sub new {
3570 my $class = shift;
3571
3572 my $self = $class->SUPER::new (
2900 fontsize => 0.8, 3573 fontsize => 0.8,
2901 @_, 3574 @_,
2902 ) 3575 );
3576
3577 Scalar::Util::weaken (my $this = $self);
3578
3579 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3580
3581 $self
2903} 3582}
2904 3583
2905sub reorder { 3584sub reorder {
2906 my ($self) = @_; 3585 my ($self) = @_;
2907 my $NOW = time; 3586 my $NOW = Time::HiRes::time;
3587
3588 # freeze display when hovering over any label
3589 return if $CFPlus::UI::TOOLTIP->{owner}
3590 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3591 values %{ $self->{item} };
2908 3592
2909 while (my ($k, $v) = each %{ $self->{item} }) { 3593 while (my ($k, $v) = each %{ $self->{item} }) {
2910 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3594 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2911 } 3595 }
2912 3596
… …
2915 my @items = sort { 3599 my @items = sort {
2916 $a->{pri} <=> $b->{pri} 3600 $a->{pri} <=> $b->{pri}
2917 or $b->{id} <=> $a->{id} 3601 or $b->{id} <=> $a->{id}
2918 } values %{ $self->{item} }; 3602 } values %{ $self->{item} };
2919 3603
3604 $self->{timer}->interval (1);
3605
2920 my $count = 10 + 1; 3606 my $count = 10 + 1;
2921 for my $item (@items) { 3607 for my $item (@items) {
2922 last unless --$count; 3608 last unless --$count;
2923 3609
2924 push @widgets, $item->{label} ||= do { 3610 my $label = $item->{label} ||= do {
2925 # TODO: doesn't handle markup well (read as: at all) 3611 # TODO: doesn't handle markup well (read as: at all)
2926 my $short = $item->{count} > 1 3612 my $short = $item->{count} > 1
2927 ? "<b>$item->{count} ×</b> $item->{text}" 3613 ? "<b>$item->{count} ×</b> $item->{text}"
2928 : $item->{text}; 3614 : $item->{text};
2929 3615
2930 for ($short) { 3616 for ($short) {
2931 s/^\s+//; 3617 s/^\s+//;
2932 s/\s+/ /g; 3618 s/\s+/ /g;
2933 } 3619 }
2934 3620
2935 new CFClient::UI::Label 3621 new CFPlus::UI::Label
2936 markup => $short, 3622 markup => $short,
2937 tooltip => $item->{tooltip}, 3623 tooltip => $item->{tooltip},
2938 tooltip_font => $::FONT_PROP, 3624 tooltip_font => $::FONT_PROP,
2939 tooltip_width => 0.67, 3625 tooltip_width => 0.67,
2940 fontsize => $item->{fontsize} || $self->{fontsize}, 3626 fontsize => $item->{fontsize} || $self->{fontsize},
2941 max_w => $::WIDTH * 0.44, 3627 max_w => $::WIDTH * 0.44,
2942 fg => $item->{fg}, 3628 fg => [@{ $item->{fg} }],
2943 can_events => 1, 3629 can_events => 1,
2944 can_hover => 1 3630 can_hover => 1
2945 }; 3631 };
3632
3633 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3634 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3635 $label->update;
3636 $label->set_max_size (undef, $label->{req_h} * $diff)
3637 if $diff < 1;
3638 $self->{timer}->interval (1/30);
3639 } else {
3640 $label->{fg}[3] = $item->{fg}[3] || 1;
3641 }
3642
3643 push @widgets, $label;
2946 } 3644 }
2947 3645
2948 $self->clear; 3646 $self->clear;
2949 $self->SUPER::add (reverse @widgets); 3647 $self->SUPER::add (reverse @widgets);
2950} 3648}
… …
2955 $text =~ s/^\s+//; 3653 $text =~ s/^\s+//;
2956 $text =~ s/\s+$//; 3654 $text =~ s/\s+$//;
2957 3655
2958 return unless $text; 3656 return unless $text;
2959 3657
2960 my $timeout = time + ((delete $arg{timeout}) || 60); 3658 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2961 3659
2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3660 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2963 3661
2964 if (my $item = $self->{item}{$group}) { 3662 if (my $item = $self->{item}{$group}) {
2965 if ($item->{text} eq $text) { 3663 if ($item->{text} eq $text) {
2966 $item->{count}++; 3664 $item->{count}++;
2967 } else { 3665 } else {
2968 $item->{count} = 1; 3666 $item->{count} = 1;
2969 $item->{text} = $item->{tooltip} = $text; 3667 $item->{text} = $item->{tooltip} = $text;
2970 } 3668 }
2971 $item->{id} = ++$self->{id}; 3669 $item->{id} += 0.2;#d#
2972 $item->{timeout} = $timeout; 3670 $item->{timeout} = $timeout;
2973 delete $item->{label}; 3671 delete $item->{label};
2974 } else { 3672 } else {
2975 $self->{item}{$group} = { 3673 $self->{item}{$group} = {
2976 id => ++$self->{id}, 3674 id => ++$self->{id},
… …
2982 count => 1, 3680 count => 1,
2983 %arg, 3681 %arg,
2984 }; 3682 };
2985 } 3683 }
2986 3684
3685 $ROOT->on_refresh (reorder => sub {
2987 $self->reorder; 3686 $self->reorder;
3687 });
2988} 3688}
2989 3689
2990sub reconfigure { 3690sub reconfigure {
2991 my ($self) = @_; 3691 my ($self) = @_;
2992 3692
… …
2995 3695
2996 $self->reorder; 3696 $self->reorder;
2997 $self->SUPER::reconfigure; 3697 $self->SUPER::reconfigure;
2998} 3698}
2999 3699
3700sub destroy {
3701 my ($self) = @_;
3702
3703 $self->{timer}->cancel;
3704
3705 $self->SUPER::destroy;
3706}
3707
3000############################################################################# 3708#############################################################################
3001 3709
3710package CFPlus::UI::Inventory;
3711
3712our @ISA = CFPlus::UI::Table::;
3713
3714sub new {
3715 my $class = shift;
3716
3717 my $self = $class->SUPER::new (
3718 col_expand => [0, 1, 0],
3719 items => [],
3720 @_,
3721 );
3722
3723 $self->set_sort_order (undef);
3724
3725 $self
3726}
3727
3728sub update_items {
3729 my ($self) = @_;
3730
3731 $self->clear;
3732
3733 my @item = $self->{sort}->(@{ $self->{items} });
3734
3735 my @adds;
3736 my $row = 0;
3737 for my $item ($self->{sort}->(@{ $self->{items} })) {
3738 CFPlus::Item::update_widgets $item;
3739
3740 push @adds, 0, $row, $item->{face_widget};
3741 push @adds, 1, $row, $item->{desc_widget};
3742 push @adds, 2, $row, $item->{weight_widget};
3743
3744 $row++;
3745 }
3746
3747 $self->add (@adds);
3748}
3749
3750sub set_sort_order {
3751 my ($self, $order) = @_;
3752
3753 $self->{sort} = $order ||= sub {
3754 sort {
3755 $a->{type} <=> $b->{type}
3756 or $a->{name} cmp $b->{name}
3757 } @_
3758 };
3759
3760 $self->update_items;
3761}
3762
3763sub set_items {
3764 my ($self, $items) = @_;
3765
3766 $self->{items} = [$items ? values %$items : ()];
3767 $self->update_items;
3768}
3769
3770#############################################################################
3771
3772package CFPlus::UI::SpellList;
3773
3774our @ISA = CFPlus::UI::Table::;
3775
3776sub new {
3777 my $class = shift;
3778
3779 my $self = $class->SUPER::new (
3780 binding => [],
3781 commands => [],
3782 @_,
3783 )
3784}
3785
3786my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3787
3788my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3789 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3790my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3791 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3792my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3793 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3794my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3795 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3796my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3797 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3798
3799sub rebuild_spell_list {
3800 my ($self) = @_;
3801
3802 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3803 $self->clear;
3804
3805 return unless $::CONN;
3806
3807 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3808 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3809 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3810 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3811 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3812
3813 my $row = 0;
3814
3815 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3816 my $spell = $self->{spell}{$_};
3817
3818 $row++;
3819
3820 my $spell_cb = sub {
3821 my ($widget, $ev) = @_;
3822
3823 if ($ev->{button} == 1) {
3824 $::CONN->user_send ("cast $spell->{name}");
3825 } elsif ($ev->{button} == 2) {
3826 $::CONN->user_send ("invoke $spell->{name}");
3827 } elsif ($ev->{button} == 3) {
3828 (new CFPlus::UI::Menu
3829 items => [
3830 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3831 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3832 ],
3833 )->popup ($ev);
3834 } else {
3835 return 0;
3836 }
3837
3838 1
3839 };
3840
3841 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3842
3843 #TODO: add path info to tooltip
3844 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3845
3846 $self->add (0, $row, new CFPlus::UI::Face
3847 face => $spell->{face},
3848 can_hover => 1,
3849 can_events => 1,
3850 tooltip => $tooltip,
3851 on_button_down => $spell_cb,
3852 );
3853
3854 $self->add (1, $row, new CFPlus::UI::Label
3855 expand => 1,
3856 text => $spell->{name},
3857 can_hover => 1,
3858 can_events => 1,
3859 tooltip => $tooltip,
3860 on_button_down => $spell_cb,
3861 );
3862
3863 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3864 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3865 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3866 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3867 }
3868 });
3869}
3870
3871sub add_spell {
3872 my ($self, $spell) = @_;
3873
3874 $self->{spell}->{$spell->{name}} = $spell;
3875 $self->rebuild_spell_list;
3876}
3877
3878sub remove_spell {
3879 my ($self, $spell) = @_;
3880
3881 delete $self->{spell}->{$spell->{name}};
3882 $self->rebuild_spell_list;
3883}
3884
3885sub clear_spells {
3886 my ($self) = @_;
3887
3888 $self->{spell} = {};
3889 $self->rebuild_spell_list;
3890}
3891
3892#############################################################################
3893
3002package CFClient::UI::Root; 3894package CFPlus::UI::Root;
3003 3895
3004our @ISA = CFClient::UI::Container::; 3896our @ISA = CFPlus::UI::Container::;
3005 3897
3898use List::Util qw(min max);
3899
3006use CFClient::OpenGL; 3900use CFPlus::OpenGL;
3007 3901
3008sub new { 3902sub new {
3009 my $class = shift; 3903 my $class = shift;
3010 3904
3011 my $self = $class->SUPER::new ( 3905 my $self = $class->SUPER::new (
… …
3016 Scalar::Util::weaken ($self->{root} = $self); 3910 Scalar::Util::weaken ($self->{root} = $self);
3017 3911
3018 $self 3912 $self
3019} 3913}
3020 3914
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 { 3915sub size_request {
3038 my ($self) = @_; 3916 my ($self) = @_;
3039 3917
3040 ($self->{w}, $self->{h}) 3918 ($self->{w}, $self->{h})
3041} 3919}
… …
3052 $coord = $max - $size if $coord > $max - $size; 3930 $coord = $max - $size if $coord > $max - $size;
3053 3931
3054 int $coord + 0.5 3932 int $coord + 0.5
3055} 3933}
3056 3934
3057sub size_allocate { 3935sub invoke_size_allocate {
3058 my ($self, $w, $h, $changed) = @_; 3936 my ($self, $w, $h) = @_;
3059 3937
3060 for my $child ($self->children) { 3938 for my $child ($self->children) {
3061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3939 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3062 3940
3063 $X = $child->{force_x} if exists $child->{force_x}; 3941 $X = $child->{force_x} if exists $child->{force_x};
… …
3066 $X = _to_pixel $X, $W, $self->{w}; 3944 $X = _to_pixel $X, $W, $self->{w};
3067 $Y = _to_pixel $Y, $H, $self->{h}; 3945 $Y = _to_pixel $Y, $H, $self->{h};
3068 3946
3069 $child->configure ($X, $Y, $W, $H); 3947 $child->configure ($X, $Y, $W, $H);
3070 } 3948 }
3949
3950 1
3071} 3951}
3072 3952
3073sub coord2local { 3953sub coord2local {
3074 my ($self, $x, $y) = @_; 3954 my ($self, $x, $y) = @_;
3075 3955
… …
3131 $_->() 4011 $_->()
3132 for values %{delete $self->{refresh_hook}}; 4012 for values %{delete $self->{refresh_hook}};
3133 } 4013 }
3134 4014
3135 if ($self->{realloc}) { 4015 if ($self->{realloc}) {
4016 my %queue;
3136 my @queue; 4017 my @queue;
4018 my $widget;
3137 4019
4020 outer:
3138 while () { 4021 while () {
3139 if ($self->{realloc}) { 4022 if (my $realloc = delete $self->{realloc}) {
3140 #TODO use array-of-depth approach 4023 for $widget (values %$realloc) {
4024 $widget->{visible} or next; # do not resize invisible widgets
3141 4025
3142 @queue = sort { $a->{visible} <=> $b->{visible} } 4026 $queue{$widget+0}++ and next; # duplicates are common
3143 @queue, values %{delete $self->{realloc}}; 4027
4028 push @{ $queue[$widget->{visible}] }, $widget;
4029 }
3144 } 4030 }
3145 4031
4032 while () {
4033 @queue or last outer;
4034
3146 my $widget = pop @queue || last; 4035 $widget = pop @{ $queue[-1] || [] }
4036 and last;
4037
4038 pop @queue;
4039 }
3147 4040
3148 $widget->{visible} or last; # do not resize invisible widgets 4041 delete $queue{$widget+0};
3149 4042
3150 my ($w, $h) = $widget->size_request; 4043 my ($w, $h) = $widget->size_request;
3151 4044
3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4045 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4046 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4047
4048 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4049 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3154 4050
3155 $w = $widget->{force_w} if exists $widget->{force_w}; 4051 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h}; 4052 $h = $widget->{force_h} if exists $widget->{force_h};
3157 4053
4054 if ($widget->{req_w} != $w || $widget->{req_h} != $h
4055 || delete $widget->{force_realloc}) {
3158 $widget->{req_w} = $w; 4056 $widget->{req_w} = $w;
3159 $widget->{req_h} = $h; 4057 $widget->{req_h} = $h;
3160 4058
3161 $self->{size_alloc}{$widget} = [$widget, undef, undef]; 4059 $self->{size_alloc}{$widget+0} = $widget;
3162 4060
3163 push @queue, $widget->{parent} 4061 if (my $parent = $widget->{parent}) {
3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent}; 4062 $self->{realloc}{$parent+0} = $parent
4063 unless $queue{$parent+0};
4064
4065 $parent->{force_size_alloc} = 1;
4066 $self->{size_alloc}{$parent+0} = $parent;
4067 }
4068 }
4069
4070 delete $self->{realloc}{$widget+0};
3165 } 4071 }
3166 } 4072 }
3167 4073
3168 while (my $size_alloc = delete $self->{size_alloc}) { 4074 while (my $size_alloc = delete $self->{size_alloc}) {
3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 4075 my @queue = sort { $b->{visible} <=> $a->{visible} }
3170 values %$size_alloc; 4076 values %$size_alloc;
3171 4077
3172 while () { 4078 while () {
3173 my ($widget, $w, $h) = @{ pop @queue or last }; 4079 my $widget = pop @queue || last;
3174 4080
3175 $w = $widget->{w} || $widget->{req_w} unless defined $w; 4081 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3177 4082
3178 $w = 0 if $w < 0; 4083 $w = 0 if $w < 0;
3179 $h = 0 if $h < 0; 4084 $h = 0 if $h < 0;
3180 4085
4086 $w = max $widget->{min_w}, $w;
4087 $h = max $widget->{min_h}, $h;
4088
4089# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4090# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4091
4092 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4093 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4094
3181 $w = int $w + 0.5; 4095 $w = int $w + 0.5;
3182 $h = int $h + 0.5; 4096 $h = int $h + 0.5;
3183 4097
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h; 4098 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4099 $widget->{old_w} = $widget->{w};
4100 $widget->{old_h} = $widget->{h};
3185 4101
3186 $widget->{w} = $w; 4102 $widget->{w} = $w;
3187 $widget->{h} = $h; 4103 $widget->{h} = $h;
3188 4104
3189 $widget->emit (size_allocate => $w, $h, $changed); 4105 $widget->emit (size_allocate => $w, $h);
4106 }
3190 } 4107 }
3191 } 4108 }
3192 4109
3193 while ($self->{post_alloc_hook}) { 4110 while ($self->{post_alloc_hook}) {
3194 $_->() 4111 $_->()
3195 for values %{delete $self->{post_alloc_hook}}; 4112 for values %{delete $self->{post_alloc_hook}};
3196 } 4113 }
4114
3197 4115
3198 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4116 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3199 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4117 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3200 glClear GL_COLOR_BUFFER_BIT; 4118 glClear GL_COLOR_BUFFER_BIT;
3201 4119
… …
3203 glLoadIdentity; 4121 glLoadIdentity;
3204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4122 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3205 glMatrixMode GL_MODELVIEW; 4123 glMatrixMode GL_MODELVIEW;
3206 glLoadIdentity; 4124 glLoadIdentity;
3207 4125
4126 {
4127 package CFPlus::UI::Base;
4128
4129 ($draw_x, $draw_y, $draw_w, $draw_h) =
4130 (0, 0, $self->{w}, $self->{h});
4131 }
4132
3208 $self->_draw; 4133 $self->_draw;
3209} 4134}
3210 4135
3211############################################################################# 4136#############################################################################
3212 4137
3213package CFClient::UI; 4138package CFPlus::UI;
3214 4139
3215$ROOT = new CFClient::UI::Root; 4140$ROOT = new CFPlus::UI::Root;
3216$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4141$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3217 4142
32181 41431
3219 4144

Diff Legend

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