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

Diff Legend

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