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.230 by root, Wed May 24 21:59:54 2006 UTC vs.
Revision 1.314 by root, Mon Jun 26 21:59:04 2006 UTC

… …
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 CFClient;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
102 118
103 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
104 } 120 }
105} 121}
106 122
107sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
108 my ($ev) = @_; 124 my ($ev) = @_;
… …
114 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
115 131
116 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 $TOOLTIP_WATCHER->start;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
158sub rescale_widgets { 172sub rescale_widgets {
159 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
160 174
161 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
162 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
163 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
164 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
165 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
166 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
167 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
168 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
169 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
170 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
171 } 190 }
172 } 191 }
173 192
174 reconfigure_widgets; 193 reconfigure_widgets;
175} 194}
… …
184 203
185sub new { 204sub new {
186 my $class = shift; 205 my $class = shift;
187 206
188 my $self = bless { 207 my $self = bless {
189 x => 0, 208 x => "center",
190 y => 0, 209 y => "center",
191 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
192 can_events => 1, 213 can_events => 1,
193 @_ 214 @_
194 }, $class; 215 }, $class;
195 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
196 for (keys %$self) { 219 for (keys %$self) {
197 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
198 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
199 } 222 }
200 } 223 }
201 224
202 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
203 236
204 $self 237 $self
205} 238}
206 239
207sub destroy { 240sub destroy {
… …
211 %$self = (); 244 %$self = ();
212} 245}
213 246
214sub show { 247sub show {
215 my ($self) = @_; 248 my ($self) = @_;
249
216 return if $self->{parent}; 250 return if $self->{parent};
217 251
218 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
219} 253}
220 254
221sub show_centered { 255sub set_visible {
222 my ($self) = @_; 256 my ($self) = @_;
257
223 return if $self->{parent}; 258 return if $self->{visible};
224 259
225 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
226 262
227 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
228 "centered $self" => sub {
229 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
230 },
231 );
232}
233 264
234sub hide { 265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
235 my ($self) = @_; 271 my ($self) = @_;
272
273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
276
277 delete $self->{visible};
278 delete $self->{root};
236 279
237 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
238 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
239 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
286 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
240 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
241 if $self->{parent}; 313 if $self->{parent};
242} 314}
243 315
244sub move { 316sub move_abs {
245 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
246 318
247 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
248 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
249 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
250 322
251 $self->update; 323 $self->update;
252} 324}
253 325
254sub set_size { 326sub set_size {
255 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
256 328
257 $self->{user_w} = $w; 329 $self->{force_w} = $w;
258 $self->{user_h} = $h; 330 $self->{force_h} = $h;
259 331
260 $self->check_size; 332 $self->realloc;
261} 333}
262 334
263sub size_request { 335sub size_request {
264 require Carp; 336 require Carp;
265 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
266} 338}
267 339
340sub baseline_shift {
341 0
342}
343
268sub configure { 344sub configure {
269 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
270 346
271 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
272 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
273 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
274 352
275 # use alignment to adjust x, y 353 # use alignment to adjust x, y
276 354
277 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
278 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
279
280 ($w, $h) = ($w2, $h2);
281 } 357 }
282 358
283 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
284 $self->{x} = $x; 360 $self->{x} = $x;
285 $self->{y} = $y; 361 $self->{y} = $y;
286 $self->update; 362 $self->update;
287 } 363 }
288 364
289 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
290 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 366 return unless $self->{visible};
291 }
292}
293 367
294sub size_allocate { 368 $self->{alloc_w} = $w;
295 # nothing to be done 369 $self->{alloc_h} = $h;
296}
297 370
298sub reconfigure { 371 $self->{root}{size_alloc}{$self+0} = $self;
299 my ($self) = @_; 372 }
300
301 $self->check_size (1);
302 $self->update;
303} 373}
304 374
305sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
306} 381}
307 382
308sub set_max_size { 383sub set_max_size {
309 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
310 385
311 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
312 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
313} 390}
314 391
315sub set_tooltip { 392sub set_tooltip {
316 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
317 394
395 $tooltip =~ s/^\s+//;
396 $tooltip =~ s/\s+$//;
397
398 return if $self->{tooltip} eq $tooltip;
399
318 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
319 401
320 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
321 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
322 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
323 } 405 }
324} 406}
325 407
326# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
327sub coord2local { 409sub coord2local {
… …
335 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
336 418
337 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
338} 420}
339 421
340sub focus_in { 422sub invoke_focus_in {
341 my ($self) = @_; 423 my ($self) = @_;
342 424
343 return if $FOCUS == $self; 425 return if $FOCUS == $self;
344 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
345 427
346 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
347 429
348 $self->emit (focus_in => $focus);
349
350 $focus->update if $focus; 430 $focus->update if $focus;
351 $FOCUS->update; 431 $FOCUS->update;
352}
353 432
433 0
434}
435
354sub focus_out { 436sub invoke_focus_out {
355 my ($self) = @_; 437 my ($self) = @_;
356 438
357 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
358 440
359 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
360 442
361 $self->emit (focus_out => $focus);
362
363 $focus->update if $focus; #? 443 $focus->update if $focus; #?
364}
365 444
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
366sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
367sub button_up { } 458sub invoke_button_up { 1 }
368sub key_down { } 459sub invoke_key_down { 1 }
369sub key_up { } 460sub invoke_key_up { 1 }
370 461
371sub button_down { 462sub invoke_button_down {
372 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
373 464
374 $self->focus_in; 465 $self->grab_focus;
375}
376 466
377sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
378sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
379sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
380sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
381sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
484
485sub find_widget {
486 my ($self, $x, $y) = @_;
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496
497sub set_parent {
498 my ($self, $parent) = @_;
499
500 Scalar::Util::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible};
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
382 535
383sub draw { 536sub draw {
384 my ($self) = @_; 537 my ($self) = @_;
385 538
386 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
387 548
388 glPushMatrix; 549 glPushMatrix;
389 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
390 $self->_draw;
391 glPopMatrix;
392 551
393 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
394 my ($x, $y) = @$self{qw(x y)};
395
396 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
397 glEnable GL_BLEND; 554 glEnable GL_BLEND;
398 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
399 glBegin GL_QUADS; 556 glBegin GL_QUADS;
400 glVertex $x , $y;
401 glVertex $x + $self->{w}, $y;
402 glVertex $x + $self->{w}, $y + $self->{h};
403 glVertex $x , $y + $self->{h};
404 glEnd;
405 glDisable GL_BLEND;
406 }
407
408 if ($ENV{PCLIENT_DEBUG}) {
409 glPushMatrix;
410 glColor 1, 1, 0, 1;
411 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
412 glBegin GL_LINE_LOOP;
413 glVertex 0 , 0; 557 glVertex 0 , 0;
414 glVertex $self->{w}, 0; 558 glVertex $self->{w}, 0;
415 glVertex $self->{w}, $self->{h}; 559 glVertex $self->{w}, $self->{h};
416 glVertex 0 , $self->{h}; 560 glVertex 0 , $self->{h};
417 glEnd; 561 glEnd;
562 glDisable GL_BLEND;
563 }
564
565 if ($ENV{CFPLUS_DEBUG} & 1) {
566 glPushMatrix;
567 glColor 1, 1, 0, 1;
568 glTranslate 0.375, 0.375;
569 glBegin GL_LINE_LOOP;
570 glVertex 0 , 0;
571 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1;
574 glEnd;
418 glPopMatrix; 575 glPopMatrix;
419 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
420 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
421} 581}
422 582
423sub _draw { 583sub _draw {
424 my ($self) = @_; 584 my ($self) = @_;
425 585
426 warn "no draw defined for $self\n"; 586 warn "no draw defined for $self\n";
427} 587}
428 588
429sub find_widget {
430 my ($self, $x, $y) = @_;
431
432 return () unless $self->{can_events};
433
434 return $self
435 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
436 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
437
438 ()
439}
440
441sub set_parent {
442 my ($self, $parent) = @_;
443
444 Scalar::Util::weaken ($self->{parent} = $parent);
445
446 # TODO: req_w _does_change after ->reconfigure
447 $self->check_size
448 unless exists $self->{req_w};
449
450 $self->show;
451}
452
453sub check_size {
454 my ($self, $forced) = @_;
455
456 $self->{force_alloc} = 1 if $forced;
457 $CFClient::UI::ROOT->{check_size}{$self} = $self;
458}
459
460sub update {
461 my ($self) = @_;
462
463 $self->{parent}->update
464 if $self->{parent};
465}
466
467sub connect {
468 my ($self, $signal, $cb) = @_;
469
470 push @{ $self->{signal_cb}{$signal} }, $cb;
471}
472
473sub emit {
474 my ($self, $signal, @args) = @_;
475
476 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
477}
478
479sub DESTROY { 589sub DESTROY {
480 my ($self) = @_; 590 my ($self) = @_;
481 591
482 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
483 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
484} 596}
485 597
486############################################################################# 598#############################################################################
487 599
488package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
513 625
514 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
515 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
516 628
517 glEnable GL_BLEND; 629 glEnable GL_BLEND;
518 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
519 glColor @$color; 631 glColor_premultiply @$color;
520 632
521 glBegin GL_QUADS; 633 glBegin GL_QUADS;
522 glVertex 0 , 0; 634 glVertex 0 , 0;
523 glVertex 0 , $h; 635 glVertex 0 , $h;
524 glVertex $w, $h; 636 glVertex $w, $h;
… …
539 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
540 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
541} 653}
542 654
543sub size_request { 655sub size_request {
544 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
545} 659}
546 660
547sub draw { } 661sub draw { }
548 662
549############################################################################# 663#############################################################################
… …
553our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
554 668
555sub new { 669sub new {
556 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
557 671
558 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
559 673
560 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
561 children => [], 675 children => [],
562 can_events => 0, 676 can_events => 0,
563 %arg, 677 %arg,
564 ); 678 );
679
565 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
566 682
567 $self 683 $self
568} 684}
569 685
570sub add { 686sub add {
… …
578 $self->{children} = [ 694 $self->{children} = [
579 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
580 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
581 ]; 697 ];
582 698
583 $self->check_size (1); 699 $self->realloc;
584 $self->update;
585} 700}
586 701
587sub children { 702sub children {
588 @{ $_[0]{children} } 703 @{ $_[0]{children} }
589} 704}
… …
594 delete $child->{parent}; 709 delete $child->{parent};
595 $child->hide; 710 $child->hide;
596 711
597 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
598 713
599 $self->check_size; 714 $self->realloc;
600 $self->update;
601} 715}
602 716
603sub clear { 717sub clear {
604 my ($self) = @_; 718 my ($self) = @_;
605 719
… …
609 for (@$children) { 723 for (@$children) {
610 delete $_->{parent}; 724 delete $_->{parent};
611 $_->hide; 725 $_->hide;
612 } 726 }
613 727
614 $self->check_size; 728 $self->realloc;
615 $self->update;
616} 729}
617 730
618sub find_widget { 731sub find_widget {
619 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
620 733
621 $x -= $self->{x}; 734 $x -= $self->{x};
622 $y -= $self->{y}; 735 $y -= $self->{y};
623 736
624 my $res; 737 my $res;
625 738
626 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
627 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
628 and return $res; 741 and return $res;
629 } 742 }
630 743
631 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
652} 765}
653 766
654sub add { 767sub add {
655 my ($self, $child) = @_; 768 my ($self, $child) = @_;
656 769
657 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
658
659 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
660} 772}
661 773
662sub remove { 774sub remove {
663 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
672 784
673sub size_request { 785sub size_request {
674 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
675} 787}
676 788
677sub size_allocate { 789sub invoke_size_allocate {
678 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
679 791
680 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
681} 795}
682 796
683############################################################################# 797#############################################################################
798
799# back-buffered drawing area
684 800
685package CFClient::UI::Window; 801package CFClient::UI::Window;
686 802
687our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
688 804
… …
699 815
700 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
701 $self->SUPER::update; 817 $self->SUPER::update;
702} 818}
703 819
704sub size_allocate { 820sub invoke_size_allocate {
705 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
706 822
707 $self->SUPER::size_allocate ($w, $h);
708 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
709} 826}
710 827
711sub _render { 828sub _render {
829 my ($self) = @_;
830
712 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
713} 832}
714 833
715sub render_child { 834sub render_child {
716 my ($self) = @_; 835 my ($self) = @_;
717 836
718 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
719 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
720 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
721 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
722 $self->_render; 848 $self->_render;
723 }; 849 };
724} 850}
725 851
726sub _draw { 852sub _draw {
727 my ($self) = @_; 853 my ($self) = @_;
728 854
729 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
730 856
731 my $tex = $self->{texture} 857 my $tex = $self->{texture}
732 or return; 858 or return;
733 859
734 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
735 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
736 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
737 863
738 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
739 865
740 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
741} 867}
… …
744 870
745package CFClient::UI::ViewPort; 871package CFClient::UI::ViewPort;
746 872
747our @ISA = CFClient::UI::Window::; 873our @ISA = CFClient::UI::Window::;
748 874
875sub new {
876 my $class = shift;
877
878 $class->SUPER::new (
879 scroll_x => 0,
880 scroll_y => 1,
881 @_,
882 )
883}
884
749sub size_request { 885sub size_request {
750 my ($self) = @_; 886 my ($self) = @_;
751 887
752 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
753 889
754 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
755} 891 $h = 10 if $self->{scroll_y};
756 892
893 ($w, $h)
894}
895
757sub size_allocate { 896sub invoke_size_allocate {
758 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
759 898
760 my ($cw, $ch) = @$self{qw(child_w child_h)}; 899 my $child = $self->child;
761# $w = $self->{w}; 900
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903
762 $self->child->configure (0, 0, $cw, $ch); 904 $self->child->configure (0, 0, $w, $h);
763 $self->update; 905 $self->update;
906
907 1
764} 908}
765 909
766sub set_offset { 910sub set_offset {
767 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
768 912
… …
801} 945}
802 946
803sub _render { 947sub _render {
804 my ($self) = @_; 948 my ($self) = @_;
805 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
806 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
807 954
808 $self->SUPER::_render; 955 $self->SUPER::_render;
809} 956}
810 957
… …
813package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
814 961
815our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
816 963
817sub new { 964sub new {
818 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
819 968
820 my $self; 969 my $self;
821 970
822 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
823 vertical => 1, 972 vertical => 1,
824 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
825 connect_changed => sub { 974 on_changed => sub {
826 $self->{vp}->set_offset (0, $_[1]); 975 $self->{vp}->set_offset (0, $_[1]);
827 }, 976 },
828 ; 977 ;
829 978
830 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
831 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
832 slider => $slider, 981 slider => $slider,
833 @_, 982 %arg,
834 ); 983 );
835 984
836 $self->{vp}->add ($self->{scrolled});
837 $self->add ($self->{vp});
838 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
839 987
840 $self 988 $self
841} 989}
842 990
991#TODO# update range on size_allocate depending on child
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
997}
998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
1005sub update {
1006 my ($self) = @_;
1007
1008 $self->SUPER::update;
1009
1010 $self->update_slider;
1011}
1012
843sub size_allocate { 1013sub invoke_size_allocate {
844 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
845 1015
1016 $self->update_slider;
1017
846 $self->SUPER::size_allocate ($w, $h); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
847
848 my $child = $self->{vp}->child;
849 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
850} 1019}
851
852#TODO# update range on size_allocate depending on child
853# update viewport offset on scroll
854 1020
855############################################################################# 1021#############################################################################
856 1022
857package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
858 1024
… …
874 1040
875 if ($self->{bg}) { 1041 if ($self->{bg}) {
876 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
877 1043
878 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
879 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
880 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
881 1047
882 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
883 glVertex 0 , 0; 1049 glVertex 0 , 0;
884 glVertex 0 , $h; 1050 glVertex 0 , $h;
885 glVertex $w, $h; 1051 glVertex $w, $h;
… …
898 1064
899our @ISA = CFClient::UI::Bin::; 1065our @ISA = CFClient::UI::Bin::;
900 1066
901use CFClient::OpenGL; 1067use CFClient::OpenGL;
902 1068
903my @tex = 1069my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1;
1072
1073my @border =
904 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
905 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
906 1076
907sub new { 1077sub new {
908 my $class = shift; 1078 my ($class, %arg) = @_;
909
910 # TODO: user_x, user_y, overwrite moveto?
911 1079
912 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
913 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
914 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
915 border => 0.6, 1083 border => 0.6,
916 is_toplevel => 1,
917 can_events => 1, 1084 can_events => 1,
918 @_ 1085 min_w => 16,
1086 min_h => 16,
1087 %arg,
919 ); 1088 );
920 1089
921 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
922 align => 0, 1091 align => 0,
923 valign => 1, 1092 valign => 1,
924 text => $self->{title}, 1093 text => $self->{title},
925 fontsize => $self->{border}; 1094 fontsize => $self->{border},
1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->hide };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
926 1105
927 $self 1106 $self
1107}
1108
1109sub add {
1110 my ($self, @widgets) = @_;
1111
1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
928} 1115}
929 1116
930sub border { 1117sub border {
931 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
932} 1119}
933 1120
934sub size_request { 1121sub size_request {
935 my ($self) = @_; 1122 my ($self) = @_;
1123
1124 $self->{title_widget}->size_request
1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
936 1129
937 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
938 1131
939 ( 1132 (
940 $w + $self->border * 2, 1133 $w + $self->border * 2,
941 $h + $self->border * 2, 1134 $h + $self->border * 2,
942 ) 1135 )
943} 1136}
944 1137
945sub size_allocate { 1138sub invoke_size_allocate {
946 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
947 1140
1141 if ($self->{title_widget}) {
1142 $self->{title_widget}{w} = $w;
1143 $self->{title_widget}{h} = $h;
1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1145 }
1146
1147 my $border = $self->border;
1148
948 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
949 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
950 1151
951 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
952 if $self->{title};
953
954 $self->child->configure ($self->border, $self->border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
955}
956 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
957sub button_down { 1160sub invoke_button_down {
958 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
959 1162
960 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
961 my $border = $self->border; 1164 my $border = $self->border;
962 1165
… …
975 my ($ev, $x, $y) = @_; 1178 my ($ev, $x, $y) = @_;
976 1179
977 my $dx = $ev->{x} - $ox; 1180 my $dx = $ev->{x} - $ox;
978 my $dy = $ev->{y} - $oy; 1181 my $dy = $ev->{y} - $oy;
979 1182
980 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1183 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
981 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1184 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1185
982 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1186 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
983 $self->check_size; 1187 $self->realloc;
984 }; 1188 };
985 1189
986 } elsif ($lr ^ $td) { 1190 } elsif ($lr ^ $td) {
987 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1191 my ($ox, $oy) = ($ev->{x}, $ev->{y});
988 my ($bx, $by) = ($self->{x}, $self->{y}); 1192 my ($bx, $by) = ($self->{x}, $self->{y});
… …
990 $self->{motion} = sub { 1194 $self->{motion} = sub {
991 my ($ev, $x, $y) = @_; 1195 my ($ev, $x, $y) = @_;
992 1196
993 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
994 1198
995 $self->move ($bx + $x - $ox, $by + $y - $oy); 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
996 $self->update; 1200 # HACK: the next line is required to enforce placement
1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
997 }; 1202 };
1203 } else {
1204 return 0;
1205 }
1206
998 } 1207 1
999} 1208}
1000 1209
1001sub button_up { 1210sub invoke_button_up {
1002 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
1003 1212
1004 delete $self->{motion}; 1213 ! ! delete $self->{motion}
1005} 1214}
1006 1215
1007sub mouse_motion { 1216sub invoke_mouse_motion {
1008 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
1009 1218
1010 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220
1221 ! ! $self->{motion}
1011} 1222}
1012 1223
1013sub _draw { 1224sub _draw {
1014 my ($self) = @_; 1225 my ($self) = @_;
1015 1226
1227 my $child = $self->{children}[0];
1228
1016 my ($w, $h ) = ($self->{w}, $self->{h}); 1229 my ($w, $h ) = ($self->{w}, $self->{h});
1017 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1230 my ($cw, $ch) = ($child->{w}, $child->{h});
1018 1231
1019 glEnable GL_TEXTURE_2D; 1232 glEnable GL_TEXTURE_2D;
1020 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1021 1234
1022 my $border = $self->border; 1235 my $border = $self->border;
1023 1236
1024 glColor @{ $self->{border_bg} }; 1237 glColor @{ $self->{border_bg} };
1025 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1238 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1026 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1239 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1027 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1240 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1028 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1241 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1029 1242
1030 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1243 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1031 my $bg = $tex[0]; 1244 glColor @{ $self->{bg} };
1032 1245
1033 # TODO: repeat texture not scale 1246 # TODO: repeat texture not scale
1247 # solve this better(?)
1034 my $rep_x = $cw / $bg->{w}; 1248 $bg->{s} = $cw / $bg->{w};
1035 my $rep_y = $ch / $bg->{h}; 1249 $bg->{t} = $ch / $bg->{h};
1036
1037 glColor @{ $self->{bg} };
1038
1039 $bg->{s} = $rep_x;
1040 $bg->{t} = $rep_y;
1041 $bg->{wrap_mode} = 1;
1042 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1250 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1043 } 1251 }
1044 1252
1045 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1046 1254
1047 $self->{title}->draw if $self->{title};
1048
1049 $self->child->draw; 1255 $child->draw;
1256
1257 if ($self->{title_widget}) {
1258 glTranslate 0, $border - $self->{h};
1259 $self->{title_widget}->_draw;
1260
1261 glTranslate 0, - ($border - $self->{h});
1262 }
1263
1264 $self->{close_button}->draw
1265 if $self->{close_button};
1050} 1266}
1051 1267
1052############################################################################# 1268#############################################################################
1053 1269
1054package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
1062sub new { 1278sub new {
1063 my $class = shift; 1279 my $class = shift;
1064 1280
1065 $class->SUPER::new ( 1281 $class->SUPER::new (
1066 col_expand => [], 1282 col_expand => [],
1067 @_ 1283 @_,
1068 ) 1284 )
1285}
1286
1287sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1069} 1289}
1070 1290
1071sub add { 1291sub add {
1072 my ($self, $x, $y, $child) = @_; 1292 my ($self, $x, $y, $child) = @_;
1073 1293
1074 $child->set_parent ($self); 1294 $child->set_parent ($self);
1075 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1076 1296
1077 $child->check_size; 1297 $self->realloc;
1078} 1298}
1079 1299
1080sub children { 1300sub remove {
1081 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1301 my ($self, $child) = @_;
1082}
1083 1302
1303 # TODO: not yet implemented
1304}
1305
1084# TODO: move to container class maybe? send childs a signal on removal? 1306# TODO: move to container class maybe? send children a signal on removal?
1085sub clear { 1307sub clear {
1086 my ($self) = @_; 1308 my ($self) = @_;
1087 1309
1088 my @children = $self->children; 1310 my @children = $self->children;
1089 delete $self->{children}; 1311 delete $self->{children};
… …
1091 for (@children) { 1313 for (@children) {
1092 delete $_->{parent}; 1314 delete $_->{parent};
1093 $_->hide; 1315 $_->hide;
1094 } 1316 }
1095 1317
1096 $self->update; 1318 $self->realloc;
1097} 1319}
1098 1320
1099sub get_wh { 1321sub get_wh {
1100 my ($self) = @_; 1322 my ($self) = @_;
1101 1323
… …
1127 (sum @$ws), 1349 (sum @$ws),
1128 (sum @$hs), 1350 (sum @$hs),
1129 ) 1351 )
1130} 1352}
1131 1353
1132sub size_allocate { 1354sub invoke_size_allocate {
1133 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1134 1356
1135 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1136 1358
1137 my $req_w = sum @$ws; 1359 my $req_w = (sum @$ws) || 1;
1138 my $req_h = sum @$hs; 1360 my $req_h = (sum @$hs) || 1;
1139 1361
1140 # TODO: nicer code && do row_expand 1362 # TODO: nicer code && do row_expand
1141 my @col_expand = @{$self->{col_expand}}; 1363 my @col_expand = @{$self->{col_expand}};
1142 @col_expand = (1) x @$ws unless @col_expand; 1364 @col_expand = (1) x @$ws unless @col_expand;
1143 my $col_expand = (sum @col_expand) || 1; 1365 my $col_expand = (sum @col_expand) || 1;
… …
1169 } 1391 }
1170 1392
1171 $y += $row_h; 1393 $y += $row_h;
1172 } 1394 }
1173 1395
1396 1
1174} 1397}
1175 1398
1176sub find_widget { 1399sub find_widget {
1177 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1178 1401
… …
1197 } 1420 }
1198} 1421}
1199 1422
1200############################################################################# 1423#############################################################################
1201 1424
1425package CFClient::UI::Box;
1426
1427our @ISA = CFClient::UI::Container::;
1428
1429sub size_request {
1430 my ($self) = @_;
1431
1432 $self->{vertical}
1433 ? (
1434 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1435 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1436 )
1437 : (
1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1440 )
1441}
1442
1443sub invoke_size_allocate {
1444 my ($self, $w, $h) = @_;
1445
1446 my $space = $self->{vertical} ? $h : $w;
1447 my @children = $self->visible_children;
1448
1449 my @req;
1450
1451 if ($self->{homogeneous}) {
1452 @req = ($space / (@children || 1)) x @children;
1453 } else {
1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1455 my $req = List::Util::sum @req;
1456
1457 if ($req > $space) {
1458 # ah well, not enough space
1459 $_ *= $space / $req for @req;
1460 } else {
1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1462
1463 $space = ($space - $req) / $expand; # remaining space to give away
1464
1465 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children;
1467 }
1468 }
1469
1470 CFClient::UI::harmonize \@req;
1471
1472 my $pos = 0;
1473 for (0 .. $#children) {
1474 my $alloc = $req[$_];
1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1476
1477 $pos += $alloc;
1478 }
1479
1480 1
1481}
1482
1483#############################################################################
1484
1202package CFClient::UI::HBox; 1485package CFClient::UI::HBox;
1203 1486
1204# TODO: wrap into common Box base class
1205
1206our @ISA = CFClient::UI::Container::; 1487our @ISA = CFClient::UI::Box::;
1207 1488
1208sub size_request { 1489sub new {
1209 my ($self) = @_; 1490 my $class = shift;
1210 1491
1211 my @alloc = map [$_->size_request], @{$self->{children}}; 1492 $class->SUPER::new (
1212 1493 vertical => 0,
1213 ( 1494 @_,
1214 (List::Util::sum map $_->[0], @alloc),
1215 (List::Util::max map $_->[1], @alloc),
1216 ) 1495 )
1217} 1496}
1218 1497
1219sub size_allocate {
1220 my ($self, $w, $h) = @_;
1221
1222 ($h, $w) = ($w, $h);
1223
1224 my $children = $self->{children};
1225
1226 my @h = map $_->{req_w}, @$children;
1227
1228 my $req_h = List::Util::sum @h;
1229
1230 if ($req_h > $h) {
1231 # ah well, not enough space
1232 $_ *= $h / $req_h for @h;
1233 } else {
1234 my $exp = List::Util::sum map $_->{expand}, @$children;
1235 $exp ||= 1;
1236
1237 for (0 .. $#$children) {
1238 my $child = $children->[$_];
1239
1240 my $alloc_h = $h[$_];
1241 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1242 $h[$_] = $alloc_h;
1243 }
1244 }
1245
1246 CFClient::UI::harmonize \@h;
1247
1248 my $y = 0;
1249 for (0 .. $#$children) {
1250 my $child = $children->[$_];
1251 my $h = $h[$_];
1252 $child->configure ($y, 0, $h, $w);
1253
1254 $y += $h;
1255 }
1256
1257 1
1258}
1259
1260############################################################################# 1498#############################################################################
1261 1499
1262package CFClient::UI::VBox; 1500package CFClient::UI::VBox;
1263 1501
1264# TODO: wrap into common Box base class
1265
1266our @ISA = CFClient::UI::Container::; 1502our @ISA = CFClient::UI::Box::;
1267 1503
1268sub size_request { 1504sub new {
1269 my ($self) = @_; 1505 my $class = shift;
1270 1506
1271 my @alloc = map [$_->size_request], @{$self->{children}}; 1507 $class->SUPER::new (
1272 1508 vertical => 1,
1273 ( 1509 @_,
1274 (List::Util::max map $_->[0], @alloc),
1275 (List::Util::sum map $_->[1], @alloc),
1276 ) 1510 )
1277}
1278
1279sub size_allocate {
1280 my ($self, $w, $h) = @_;
1281
1282 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1283
1284 my $children = $self->{children};
1285
1286 my @h = map $_->{req_h}, @$children;
1287
1288 my $req_h = List::Util::sum @h;
1289
1290 if ($req_h > $h) {
1291 # ah well, not enough space
1292 $_ *= $h / $req_h for @h;
1293 } else {
1294 my $exp = List::Util::sum map $_->{expand}, @$children;
1295 $exp ||= 1;
1296
1297 for (0 .. $#$children) {
1298 my $child = $children->[$_];
1299
1300 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1301 }
1302 }
1303
1304 CFClient::UI::harmonize \@h;
1305
1306 my $y = 0;
1307 for (0 .. $#$children) {
1308 my $child = $children->[$_];
1309 my $h = $h[$_];
1310 $child->configure (0, $y, $w, $h);
1311
1312 $y += $h;
1313 }
1314
1315 1
1316} 1511}
1317 1512
1318############################################################################# 1513#############################################################################
1319 1514
1320package CFClient::UI::Label; 1515package CFClient::UI::Label;
… …
1337 ellipsise => 3, # end 1532 ellipsise => 3, # end
1338 layout => (new CFClient::Layout), 1533 layout => (new CFClient::Layout),
1339 fontsize => 1, 1534 fontsize => 1,
1340 align => -1, 1535 align => -1,
1341 valign => -1, 1536 valign => -1,
1342 padding => 2, 1537 padding_x => 2,
1538 padding_y => 2,
1343 can_events => 0, 1539 can_events => 0,
1344 %arg 1540 %arg
1345 ); 1541 );
1346 1542
1347 if (exists $self->{template}) { 1543 if (exists $self->{template}) {
… …
1374 1570
1375 delete $self->{texture}; 1571 delete $self->{texture};
1376 $self->SUPER::update; 1572 $self->SUPER::update;
1377} 1573}
1378 1574
1575sub realloc {
1576 my ($self) = @_;
1577
1578 delete $self->{ox};
1579 $self->SUPER::realloc;
1580}
1581
1379sub set_text { 1582sub set_text {
1380 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1381 1584
1382 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1383 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1384 1587
1385 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1386 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1387 1590
1591 delete $self->{size_req};
1592 $self->realloc;
1388 $self->update; 1593 $self->update;
1389 $self->check_size;
1390} 1594}
1391 1595
1392sub set_markup { 1596sub set_markup {
1393 my ($self, $markup) = @_; 1597 my ($self, $markup) = @_;
1394 1598
… …
1398 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1399 1603
1400 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1401 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1402 1606
1607 delete $self->{size_req};
1608 $self->realloc;
1403 $self->update; 1609 $self->update;
1404 $self->check_size;
1405} 1610}
1406 1611
1407sub size_request { 1612sub size_request {
1408 my ($self) = @_; 1613 my ($self) = @_;
1409 1614
1615 $self->{size_req} ||= do {
1410 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1411 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1412 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1413 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1414 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1415 1621
1416 my ($w, $h) = $self->{layout}->size; 1622 my ($w, $h) = $self->{layout}->size;
1417 1623
1418 if (exists $self->{template}) { 1624 if (exists $self->{template}) {
1419 $self->{template}->set_font ($self->{font}) if $self->{font}; 1625 $self->{template}->set_font ($self->{font}) if $self->{font};
1420 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1421 1627
1422 my ($w2, $h2) = $self->{template}->size; 1628 my ($w2, $h2) = $self->{template}->size;
1423 1629
1424 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1425 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1632 }
1633
1634 [$w, $h]
1426 } 1635 };
1427 1636
1428 ( 1637 @{ $self->{size_req} }
1429 $w + $self->{padding} * 2,
1430 $h + $self->{padding} * 2,
1431 )
1432} 1638}
1433 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1434sub size_allocate { 1644sub invoke_size_allocate {
1435 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1436 1646
1647 delete $self->{ox};
1648
1437 delete $self->{texture}; 1649 delete $self->{texture}
1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1438} 1653}
1439 1654
1440sub set_fontsize { 1655sub set_fontsize {
1441 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1442 1657
1443 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1444 delete $self->{texture}; 1659 delete $self->{texture};
1445 1660
1446 $self->update; 1661 $self->realloc;
1447 $self->check_size; 1662}
1663
1664sub reconfigure {
1665 my ($self) = @_;
1666
1667 delete $self->{size_req};
1668
1669 $self->SUPER::reconfigure;
1448} 1670}
1449 1671
1450sub _draw { 1672sub _draw {
1451 my ($self) = @_; 1673 my ($self) = @_;
1452 1674
… …
1458 $self->{layout}->set_width ($self->{w}); 1680 $self->{layout}->set_width ($self->{w});
1459 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1681 $self->{layout}->set_ellipsise ($self->{ellipsise});
1460 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1461 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1462 1684
1463 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1685 new_from_layout CFClient::Texture $self->{layout}
1686 };
1464 1687
1688 unless (exists $self->{ox}) {
1465 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1466 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1467 : ($self->{w} - $tex->{w}) * 0.5); 1691 : ($self->{w} - $tex->{w}) * 0.5);
1468 1692
1469 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1470 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1471 : ($self->{h} - $tex->{h}) * 0.5); 1695 : ($self->{h} - $tex->{h}) * 0.5);
1472
1473 $tex
1474 }; 1696 };
1475 1697
1476 glEnable GL_TEXTURE_2D; 1698 glEnable GL_TEXTURE_2D;
1477 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1478 1702
1479 if ($tex->{format} == GL_ALPHA) { 1703 if ($tex->{format} == GL_ALPHA) {
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1480 glColor @{$self->{fg}}; 1705 glColor @{$self->{fg}};
1481 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1482 } else { 1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1483 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1484 } 1710 }
1485 1711
1486 glDisable GL_TEXTURE_2D; 1712 glDisable GL_TEXTURE_2D;
1487} 1713}
1488 1714
… …
1505 can_hover => 1, 1731 can_hover => 1,
1506 can_focus => 1, 1732 can_focus => 1,
1507 valign => 0, 1733 valign => 0,
1508 can_events => 1, 1734 can_events => 1,
1509 #text => ... 1735 #text => ...
1736 #hidden => "*",
1510 @_ 1737 @_
1511 ) 1738 )
1512} 1739}
1513 1740
1514sub _set_text { 1741sub _set_text {
… …
1516 1743
1517 delete $self->{cur_h}; 1744 delete $self->{cur_h};
1518 1745
1519 return if $self->{text} eq $text; 1746 return if $self->{text} eq $text;
1520 1747
1521 delete $self->{texture};
1522
1523 $self->{last_activity} = $::NOW; 1748 $self->{last_activity} = $::NOW;
1524 $self->{text} = $text; 1749 $self->{text} = $text;
1525 1750
1526 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1527 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1753 delete $self->{size_req};
1528 1754
1529 $self->emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1756
1757 $self->realloc;
1758 $self->update;
1530} 1759}
1531 1760
1532sub set_text { 1761sub set_text {
1533 my ($self, $text) = @_; 1762 my ($self, $text) = @_;
1534 1763
1535 $self->{cursor} = length $text; 1764 $self->{cursor} = length $text;
1536 $self->_set_text ($text); 1765 $self->_set_text ($text);
1537 $self->update;
1538 $self->check_size;
1539} 1766}
1540 1767
1541sub get_text { 1768sub get_text {
1542 $_[0]{text} 1769 $_[0]{text}
1543} 1770}
… …
1548 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1549 1776
1550 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1551} 1778}
1552 1779
1553sub size_allocate {
1554 my ($self, $w, $h) = @_;
1555
1556 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1557}
1558
1559sub key_down { 1780sub invoke_key_down {
1560 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1561 1782
1562 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1563 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1564 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
… …
1579 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1580 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1581 $self->emit ('escape'); 1802 $self->emit ('escape');
1582 } elsif ($uni) { 1803 } elsif ($uni) {
1583 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else {
1806 return 0;
1584 } 1807 }
1585 1808
1586 $self->_set_text ($text); 1809 $self->_set_text ($text);
1587 $self->update;
1588 $self->check_size;
1589}
1590 1810
1811 $self->realloc;
1812
1813 1
1814}
1815
1591sub focus_in { 1816sub invoke_focus_in {
1592 my ($self) = @_; 1817 my ($self) = @_;
1593 1818
1594 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1595 1820
1596 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1597} 1822}
1598 1823
1599sub button_down { 1824sub invoke_button_down {
1600 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1601 1826
1602 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1603 1828
1604 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1605 1830
1606 # byte-index to char-index 1831 # byte-index to char-index
1607 my $text = $self->{text}; 1832 my $text = $self->{text};
1608 utf8::encode $text; 1833 utf8::encode $text;
1609 $self->{cursor} = length substr $text, 0, $idx; 1834 $self->{cursor} = length substr $text, 0, $idx;
1610 1835
1611 $self->_set_text ($self->{text}); 1836 $self->_set_text ($self->{text});
1612 $self->update; 1837 $self->update;
1838
1839 1
1613} 1840}
1614 1841
1615sub mouse_motion { 1842sub invoke_mouse_motion {
1616 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1617# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1844# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1845
1846 1
1618} 1847}
1619 1848
1620sub _draw { 1849sub _draw {
1621 my ($self) = @_; 1850 my ($self) = @_;
1622 1851
1623 local $self->{fg} = $self->{fg}; 1852 local $self->{fg} = $self->{fg};
1624 1853
1625 if ($FOCUS == $self) { 1854 if ($FOCUS == $self) {
1626 glColor @{$self->{active_bg}}; 1855 glColor_premultiply @{$self->{active_bg}};
1627 $self->{fg} = $self->{active_fg}; 1856 $self->{fg} = $self->{active_fg};
1628 } else { 1857 } else {
1629 glColor @{$self->{bg}}; 1858 glColor_premultiply @{$self->{bg}};
1630 } 1859 }
1631 1860
1632 glEnable GL_BLEND; 1861 glEnable GL_BLEND;
1633 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1634 glBegin GL_QUADS; 1863 glBegin GL_QUADS;
1635 glVertex 0 , 0; 1864 glVertex 0 , 0;
1636 glVertex 0 , $self->{h}; 1865 glVertex 0 , $self->{h};
1637 glVertex $self->{w}, $self->{h}; 1866 glVertex $self->{w}, $self->{h};
1638 glVertex $self->{w}, 0; 1867 glVertex $self->{w}, 0;
… …
1663 1892
1664our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1665 1894
1666use CFClient::OpenGL; 1895use CFClient::OpenGL;
1667 1896
1668sub key_down { 1897sub invoke_key_down {
1669 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1670 1899
1671 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1672 1901
1673 if ($sym == 13) { 1902 if ($sym == 13) {
1674 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1675 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1676 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1677 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1678 $self->emit (activate => $txt); 1908 $self->emit (activate => $txt);
1679 $self->update; 1909 $self->update;
1680 1910
… …
1699 } else { 1929 } else {
1700 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1701 } 1931 }
1702 1932
1703 } else { 1933 } else {
1704 $self->SUPER::key_down ($ev); 1934 return $self->SUPER::invoke_key_down ($ev)
1935 }
1936
1705 } 1937 1
1706
1707} 1938}
1708 1939
1709############################################################################# 1940#############################################################################
1710 1941
1711package CFClient::UI::Button; 1942package CFClient::UI::Button;
… …
1720 1951
1721sub new { 1952sub new {
1722 my $class = shift; 1953 my $class = shift;
1723 1954
1724 $class->SUPER::new ( 1955 $class->SUPER::new (
1725 padding => 4, 1956 padding_x => 4,
1957 padding_y => 4,
1726 fg => [1, 1, 1], 1958 fg => [1, 1, 1],
1727 active_fg => [0, 0, 1], 1959 active_fg => [0, 0, 1],
1728 can_hover => 1, 1960 can_hover => 1,
1729 align => 0, 1961 align => 0,
1730 valign => 0, 1962 valign => 0,
1731 can_events => 1, 1963 can_events => 1,
1732 @_ 1964 @_
1733 ) 1965 )
1734} 1966}
1735 1967
1736sub button_up { 1968sub invoke_button_up {
1737 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1738 1970
1971 $self->emit ("activate")
1739 if ($x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1740 && $y >= 0 && $y < $self->{h}) { 1973 && $y >= 0 && $y < $self->{h};
1741 $self->emit ("activate"); 1974
1742 } 1975 1
1743} 1976}
1744 1977
1745sub _draw { 1978sub _draw {
1746 my ($self) = @_; 1979 my ($self) = @_;
1747 1980
1748 local $self->{fg} = $self->{fg}; 1981 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1749
1750 if ($GRAB == $self) {
1751 $self->{fg} = $self->{active_fg};
1752 }
1753 1982
1754 glEnable GL_TEXTURE_2D; 1983 glEnable GL_TEXTURE_2D;
1755 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1756 glColor 0, 0, 0, 1; 1985 glColor 0, 0, 0, 1;
1757 1986
… …
1762 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1763} 1992}
1764 1993
1765############################################################################# 1994#############################################################################
1766 1995
1996package CFClient::UI::ImageButton;
1997
1998our @ISA = CFClient::UI::Image::;
1999
2000use CFClient::OpenGL;
2001
2002my %textures;
2003
2004sub new {
2005 my $class = shift;
2006
2007 my $self = $class->SUPER::new (
2008 padding_x => 4,
2009 padding_y => 4,
2010 fg => [1, 1, 1],
2011 active_fg => [0, 0, 1],
2012 can_hover => 1,
2013 align => 0,
2014 valign => 0,
2015 can_events => 1,
2016 @_
2017 );
2018}
2019
2020sub invoke_button_up {
2021 my ($self, $ev, $x, $y) = @_;
2022
2023 $self->emit ("activate")
2024 if $x >= 0 && $x < $self->{w}
2025 && $y >= 0 && $y < $self->{h};
2026
2027 1
2028}
2029
2030#############################################################################
2031
1767package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
1768 2033
1769our @ISA = CFClient::UI::DrawBG::; 2034our @ISA = CFClient::UI::DrawBG::;
1770 2035
1771my @tex = 2036my @tex =
… …
1776 2041
1777sub new { 2042sub new {
1778 my $class = shift; 2043 my $class = shift;
1779 2044
1780 $class->SUPER::new ( 2045 $class->SUPER::new (
1781 padding => 2, 2046 padding_x => 2,
2047 padding_y => 2,
1782 fg => [1, 1, 1], 2048 fg => [1, 1, 1],
1783 active_fg => [1, 1, 0], 2049 active_fg => [1, 1, 0],
1784 bg => [0, 0, 0, 0.2], 2050 bg => [0, 0, 0, 0.2],
1785 active_bg => [1, 1, 1, 0.5], 2051 active_bg => [1, 1, 1, 0.5],
1786 state => 0, 2052 state => 0,
… …
1790} 2056}
1791 2057
1792sub size_request { 2058sub size_request {
1793 my ($self) = @_; 2059 my ($self) = @_;
1794 2060
1795 ($self->{padding} * 2 + 6) x 2 2061 (6) x 2
1796} 2062}
1797 2063
1798sub button_down { 2064sub invoke_button_down {
1799 my ($self, $ev, $x, $y) = @_; 2065 my ($self, $ev, $x, $y) = @_;
1800 2066
1801 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1802 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1803 $self->{state} = !$self->{state}; 2069 $self->{state} = !$self->{state};
1804 $self->emit (changed => $self->{state}); 2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
1805 } 2075 1
1806} 2076}
1807 2077
1808sub _draw { 2078sub _draw {
1809 my ($self) = @_; 2079 my ($self) = @_;
1810 2080
1811 $self->SUPER::_draw; 2081 $self->SUPER::_draw;
1812 2082
1813 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2083 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1814 2084
1815 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2085 my ($w, $h) = @$self{qw(w h)};
2086
2087 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1816 2088
1817 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2089 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1818 2090
1819 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2091 my $tex = $self->{state} ? $tex[1] : $tex[0];
1820 2092
… …
1828package CFClient::UI::Image; 2100package CFClient::UI::Image;
1829 2101
1830our @ISA = CFClient::UI::Base::; 2102our @ISA = CFClient::UI::Base::;
1831 2103
1832use CFClient::OpenGL; 2104use CFClient::OpenGL;
1833use Carp qw/confess/;
1834 2105
1835our %loaded_images; 2106our %texture_cache;
1836 2107
1837sub new { 2108sub new {
1838 my $class = shift; 2109 my $class = shift;
1839 2110
1840 my $self = $class->SUPER::new (can_events => 0, @_); 2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
1841 2115
1842 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
1843 2118
1844 $loaded_images{$self->{image}} ||= 2119 $self->{tex} = $texture_cache{$self->{path}} ||=
1845 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1846 2121
1847 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2122 Scalar::Util::weaken $texture_cache{$self->{path}};
1848 2123
1849 Scalar::Util::weaken $loaded_images{$self->{image}}; 2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1850
1851 $self->{aspect} = $tex->{w} / $tex->{h};
1852 2125
1853 $self 2126 $self
1854} 2127}
1855 2128
1856sub size_request { 2129sub size_request {
1857 my ($self) = @_; 2130 my ($self) = @_;
1858 2131
1859 ($self->{tex}->{w}, $self->{tex}->{h}) 2132 ($self->{tex}{w}, $self->{tex}{h})
1860} 2133}
1861 2134
1862sub _draw { 2135sub _draw {
1863 my ($self) = @_; 2136 my ($self) = @_;
1864 2137
… …
1975 2248
1976 my $h1 = $self->{h} * (1 - $ycut1); 2249 my $h1 = $self->{h} * (1 - $ycut1);
1977 my $h2 = $self->{h} * (1 - $ycut2); 2250 my $h2 = $self->{h} * (1 - $ycut2);
1978 2251
1979 glEnable GL_BLEND; 2252 glEnable GL_BLEND;
1980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1981 glEnable GL_TEXTURE_2D; 2255 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2256 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983 2257
1984 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2258 glBindTexture GL_TEXTURE_2D, $t1->{name};
1985 glBegin GL_QUADS; 2259 glBegin GL_QUADS;
… …
2085 fg => [1, 1, 1], 2359 fg => [1, 1, 1],
2086 active_fg => [0, 0, 0], 2360 active_fg => [0, 0, 0],
2087 bg => [0, 0, 0, 0.2], 2361 bg => [0, 0, 0, 0.2],
2088 active_bg => [1, 1, 1, 0.5], 2362 active_bg => [1, 1, 1, 0.5],
2089 range => [0, 0, 100, 10, 0], 2363 range => [0, 0, 100, 10, 0],
2090 req_w => $::WIDTH / 80, 2364 min_w => $::WIDTH / 80,
2091 req_h => $::WIDTH / 80, 2365 min_h => $::WIDTH / 80,
2092 vertical => 0, 2366 vertical => 0,
2093 can_hover => 1, 2367 can_hover => 1,
2094 inner_pad => 0.02, 2368 inner_pad => 0.02,
2095 @_ 2369 @_
2096 ); 2370 );
… …
2102} 2376}
2103 2377
2104sub set_range { 2378sub set_range {
2105 my ($self, $range) = @_; 2379 my ($self, $range) = @_;
2106 2380
2107 $self->{range} = $range; 2381 ($range, $self->{range}) = ($self->{range}, $range);
2108 2382
2383 if ("@$range" ne "@{$self->{range}}") {
2109 $self->update; 2384 $self->update;
2385 $self->set_value ($self->{range}[0]);
2386 }
2110} 2387}
2111 2388
2112sub set_value { 2389sub set_value {
2113 my ($self, $value) = @_; 2390 my ($self, $value) = @_;
2114 2391
… …
2133} 2410}
2134 2411
2135sub size_request { 2412sub size_request {
2136 my ($self) = @_; 2413 my ($self) = @_;
2137 2414
2138 my $w = $self->{req_w}; 2415 ($self->{req_w}, $self->{req_h})
2139 my $h = $self->{req_h};
2140
2141 $self->{vertical} ? ($h, $w) : ($w, $h)
2142} 2416}
2143 2417
2144sub button_down { 2418sub invoke_button_down {
2145 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2146 2420
2147 $self->SUPER::button_down ($ev, $x, $y); 2421 $self->SUPER::invoke_button_down ($ev, $x, $y);
2148 2422
2149 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2423 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2150 2424
2151 $self->mouse_motion ($ev, $x, $y); 2425 $self->invoke_mouse_motion ($ev, $x, $y)
2152} 2426}
2153 2427
2154sub mouse_motion { 2428sub invoke_mouse_motion {
2155 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2156 2430
2157 if ($GRAB == $self) { 2431 if ($GRAB == $self) {
2158 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2159 2433
2160 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2434 my (undef, $lo, $hi, $page) = @{$self->{range}};
2161 2435
2162 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2436 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2163 2437
2164 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2438 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2439 } else {
2440 return 0;
2441 }
2442
2165 } 2443 1
2166} 2444}
2167 2445
2168sub update { 2446sub update {
2169 my ($self) = @_; 2447 my ($self) = @_;
2170 2448
2171 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2449 delete $self->{knob_w};
2450 $self->SUPER::update;
2451}
2452
2453sub _draw {
2454 my ($self) = @_;
2455
2456 unless ($self->{knob_w}) {
2172 $self->set_value ($self->{range}[0]); 2457 $self->set_value ($self->{range}[0]);
2173 2458
2174 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2459 my ($value, $lo, $hi, $page) = @{$self->{range}};
2175 my $range = ($hi - $page - $lo) || 1e-100; 2460 my $range = ($hi - $page - $lo) || 1e-100;
2176 2461
… …
2182 $value = ($value - $lo) / $range; 2467 $value = ($value - $lo) / $range;
2183 $value = $value * $self->{scale} + $self->{offset}; 2468 $value = $value * $self->{scale} + $self->{offset};
2184 2469
2185 $self->{knob_x} = $value - $knob_w * 0.5; 2470 $self->{knob_x} = $value - $knob_w * 0.5;
2186 $self->{knob_w} = $knob_w; 2471 $self->{knob_w} = $knob_w;
2187 }); 2472 }
2188
2189 $self->SUPER::update;
2190}
2191
2192sub _draw {
2193 my ($self) = @_;
2194 2473
2195 $self->SUPER::_draw (); 2474 $self->SUPER::_draw ();
2196 2475
2197 glScale $self->{w}, $self->{h}; 2476 glScale $self->{w}, $self->{h};
2198 2477
… …
2259sub set_range { shift->{slider}->set_range (@_) } 2538sub set_range { shift->{slider}->set_range (@_) }
2260sub set_value { shift->{slider}->set_value (@_) } 2539sub set_value { shift->{slider}->set_value (@_) }
2261 2540
2262############################################################################# 2541#############################################################################
2263 2542
2264package CFClient::UI::TextView; 2543package CFClient::UI::TextScroller;
2265 2544
2266our @ISA = CFClient::UI::HBox::; 2545our @ISA = CFClient::UI::HBox::;
2267 2546
2268use CFClient::OpenGL; 2547use CFClient::OpenGL;
2269 2548
… …
2271 my $class = shift; 2550 my $class = shift;
2272 2551
2273 my $self = $class->SUPER::new ( 2552 my $self = $class->SUPER::new (
2274 fontsize => 1, 2553 fontsize => 1,
2275 can_events => 0, 2554 can_events => 0,
2555 indent => 0,
2276 #font => default_font 2556 #font => default_font
2277 @_, 2557 @_,
2278 2558
2279 layout => (new CFClient::Layout 1), 2559 layout => (new CFClient::Layout 1),
2280 par => [], 2560 par => [],
… …
2295 2575
2296 $self->{fontsize} = $fontsize; 2576 $self->{fontsize} = $fontsize;
2297 $self->reflow; 2577 $self->reflow;
2298} 2578}
2299 2579
2580sub size_request {
2581 my ($self) = @_;
2582
2583 my ($empty, $slider) = @{ $self->{children} };
2584
2585 local $self->{children} = [$empty, $slider];
2586 $self->SUPER::size_request
2587}
2588
2300sub size_allocate { 2589sub invoke_size_allocate {
2301 my ($self, $w, $h) = @_; 2590 my ($self, $w, $h) = @_;
2302 2591
2303 $self->SUPER::size_allocate ($w, $h); 2592 my ($empty, $slider, @other) = @{ $self->{children} };
2593 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2304 2594
2305 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2595 $self->{layout}->set_font ($self->{font}) if $self->{font};
2306 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2596 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2307 $self->{layout}->set_width ($self->{children}[0]{w}); 2597 $self->{layout}->set_width ($empty->{w});
2598 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2308 2599
2309 $self->reflow; 2600 $self->reflow;
2310}
2311 2601
2312sub text_size { 2602 local $self->{children} = [$empty, $slider];
2313 my ($self, $text, $indent) = @_; 2603 $self->SUPER::invoke_size_allocate ($w, $h)
2604}
2605
2606sub get_layout {
2607 my ($self, $para) = @_;
2314 2608
2315 my $layout = $self->{layout}; 2609 my $layout = $self->{layout};
2316 2610
2611 $layout->set_font ($self->{font}) if $self->{font};
2612 $layout->set_foreground (@{$para->{fg}});
2317 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2613 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2318 $layout->set_width ($self->{children}[0]{w} - $indent); 2614 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2615 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2319 $layout->set_markup ($text); 2616 $layout->set_markup ($para->{markup});
2617
2618 $layout->set_shapes (
2619 map
2620 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2621 @{$para->{widget}}
2320 2622 );
2623
2321 $layout->size 2624 $layout
2322} 2625}
2323 2626
2324sub reflow { 2627sub reflow {
2325 my ($self) = @_; 2628 my ($self) = @_;
2326 2629
… …
2335 $self->{children}[1]->set_value ($offset); 2638 $self->{children}[1]->set_value ($offset);
2336} 2639}
2337 2640
2338sub clear { 2641sub clear {
2339 my ($self) = @_; 2642 my ($self) = @_;
2643
2644 my (undef, undef, @other) = @{ $self->{children} };
2645 $self->remove ($_) for @other;
2340 2646
2341 $self->{par} = []; 2647 $self->{par} = [];
2342 $self->{height} = 0; 2648 $self->{height} = 0;
2343 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2649 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2344} 2650}
2345 2651
2346sub add_paragraph { 2652sub add_paragraph {
2347 my ($self, $color, $text, $indent) = @_; 2653 my ($self, $color, $para, $indent) = @_;
2348 2654
2349 for my $line (split /\n/, $text) { 2655 my ($text, @w) = ref $para ? @$para : $para;
2350 my ($w, $h) = $self->text_size ($line); 2656
2351 $self->{height} += $h; 2657 $para = {
2352 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2658 w => 1e10,
2659 wrapped => 1,
2660 fg => $color,
2661 indent => $indent,
2662 markup => $text,
2663 widget => \@w,
2353 } 2664 };
2354 2665
2355 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2666 $self->add (@w) if @w;
2667 push @{$self->{par}}, $para;
2668
2669 $self->{need_reflow}++;
2670 $self->update;
2671}
2672
2673sub scroll_to_bottom {
2674 my ($self) = @_;
2675
2676 $self->{scroll_to_bottom} = 1;
2677 $self->update;
2356} 2678}
2357 2679
2358sub update { 2680sub update {
2359 my ($self) = @_; 2681 my ($self) = @_;
2360 2682
… …
2362 2684
2363 return unless $self->{h} > 0; 2685 return unless $self->{h} > 0;
2364 2686
2365 delete $self->{texture}; 2687 delete $self->{texture};
2366 2688
2367 $ROOT->on_post_alloc ($self, sub { 2689 $ROOT->on_post_alloc ($self => sub {
2368 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2690 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2369 2691
2370 if (delete $self->{need_reflow}) { 2692 if (delete $self->{need_reflow}) {
2371 my $height = 0; 2693 my $height = 0;
2372 2694
2373 my $layout = $self->{layout};
2374
2375 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2376
2377 for (@{$self->{par}}) { 2695 for my $para (@{$self->{par}}) {
2378 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2696 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2379 $layout->set_width ($W - $_->[3]); 2697 my $layout = $self->get_layout ($para);
2380 $layout->set_markup ($_->[4]);
2381 my ($w, $h) = $layout->size; 2698 my ($w, $h) = $layout->size;
2382 $_->[0] = $w + $_->[3]; 2699
2383 $_->[1] = $h; 2700 $para->{w} = $w + $para->{indent};
2701 $para->{h} = $h;
2702 $para->{wrapped} = $layout->has_wrapped;
2384 } 2703 }
2385 2704
2386 $height += $_->[1]; 2705 $height += $para->{h};
2387 } 2706 }
2388 2707
2389 $self->{height} = $height; 2708 $self->{height} = $height;
2390 2709
2391 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2710 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2392 2711
2393 delete $self->{texture}; 2712 delete $self->{texture};
2394 } 2713 }
2395 2714
2715 if (delete $self->{scroll_to_bottom}) {
2716 $self->{children}[1]->set_value (1e10);
2717 }
2718
2396 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2719 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2397 glClearColor 0.5, 0.5, 0.5, 0; 2720 glClearColor 0, 0, 0, 0;
2398 glClear GL_COLOR_BUFFER_BIT; 2721 glClear GL_COLOR_BUFFER_BIT;
2399 2722
2400 my $top = int $self->{children}[1]{range}[0]; 2723 my $top = int $self->{children}[1]{range}[0];
2401 2724
2402 my $y0 = $top; 2725 my $y0 = $top;
2403 my $y1 = $top + $H; 2726 my $y1 = $top + $H;
2404 2727
2405 my $y = 0; 2728 my $y = 0;
2406
2407 my $layout = $self->{layout};
2408
2409 $layout->set_font ($self->{font}) if $self->{font};
2410 2729
2411 glEnable GL_BLEND; 2730 glEnable GL_BLEND;
2412 #TODO# not correct in windows where rgba is forced off 2731 #TODO# not correct in windows where rgba is forced off
2413 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2732 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2414 2733
2415 for my $par (@{$self->{par}}) { 2734 for my $para (@{$self->{par}}) {
2416 my $h = $par->[1]; 2735 my $h = $para->{h};
2417 2736
2418 if ($y0 < $y + $h && $y < $y1) { 2737 if ($y0 < $y + $h && $y < $y1) {
2419 $layout->set_foreground (@{ $par->[2] }); 2738
2420 $layout->set_width ($W - $par->[3]); 2739 my $layout = $self->get_layout ($para);
2421 $layout->set_markup ($par->[4]);
2422 2740
2423 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2741 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2424 2742
2425 glRasterPos $par->[3], $y - $y0; 2743 glRasterPos $para->{indent}, $y - $y0;
2426 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2744 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745
2746 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes;
2748
2749 glDisable GL_BLEND;
2750 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, ();
2752
2753 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0;
2755
2756 $_->draw;
2757 }
2758 glEnable GL_BLEND;
2759 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760 }
2427 } 2761 }
2428 2762
2429 $y += $h; 2763 $y += $h;
2430 } 2764 }
2431 2765
2432 glDisable GL_BLEND; 2766 glDisable GL_BLEND;
2433 }; 2767 };
2434 }); 2768 });
2435} 2769}
2436 2770
2771sub reconfigure {
2772 my ($self) = @_;
2773
2774 $self->SUPER::reconfigure;
2775
2776 $_->{w} = 1e10 for @{ $self->{par} };
2777 $self->reflow;
2778}
2779
2437sub _draw { 2780sub _draw {
2438 my ($self) = @_; 2781 my ($self) = @_;
2439 2782
2440 glEnable GL_TEXTURE_2D; 2783 glEnable GL_TEXTURE_2D;
2441 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2784 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2442 glColor 1, 1, 1, 1; 2785 glColor 0, 0, 0, 1;
2443 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2786 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2444 glDisable GL_TEXTURE_2D; 2787 glDisable GL_TEXTURE_2D;
2445 2788
2446 $self->{children}[1]->draw; 2789 $self->{children}[1]->draw;
2447
2448} 2790}
2449 2791
2450############################################################################# 2792#############################################################################
2451 2793
2452package CFClient::UI::Animator; 2794package CFClient::UI::Animator;
… …
2497 2839
2498sub new { 2840sub new {
2499 my $class = shift; 2841 my $class = shift;
2500 2842
2501 my $self = $class->SUPER::new ( 2843 my $self = $class->SUPER::new (
2502 state => 0, 2844 state => 0,
2503 connect_activate => \&toggle_flopper, 2845 on_activate => \&toggle_flopper,
2504 @_ 2846 @_
2505 ); 2847 );
2506 2848
2507 if ($self->{state}) {
2508 $self->{state} = 0;
2509 $self->toggle_flopper;
2510 }
2511
2512 $self 2849 $self
2513} 2850}
2514 2851
2515sub toggle_flopper { 2852sub toggle_flopper {
2516 my ($self) = @_; 2853 my ($self) = @_;
2517 2854
2518 # TODO: use animation 2855 $self->{other}->toggle_visibility;
2519 if ($self->{state} = !$self->{state}) {
2520 $CFClient::UI::ROOT->add ($self->{other});
2521 $self->{other}->move ($self->coord2global (0, $self->{h}));
2522 $self->emit ("open");
2523 } else {
2524 $CFClient::UI::ROOT->remove ($self->{other});
2525 $self->emit ("close");
2526 }
2527
2528 $self->emit (changed => $self->{state});
2529} 2856}
2530 2857
2531############################################################################# 2858#############################################################################
2532 2859
2533package CFClient::UI::Tooltip; 2860package CFClient::UI::Tooltip;
… …
2546} 2873}
2547 2874
2548sub set_tooltip_from { 2875sub set_tooltip_from {
2549 my ($self, $widget) = @_; 2876 my ($self, $widget) = @_;
2550 2877
2878 my $tooltip = $widget->{tooltip};
2879
2880 if ($ENV{CFPLUS_DEBUG} & 2) {
2881 $tooltip .= "\n\n" . (ref $widget) . "\n"
2882 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2883 . "req $widget->{req_w} $widget->{req_h}\n"
2884 . "visible $widget->{visible}";
2885 }
2886
2887 $tooltip =~ s/^\n+//;
2888 $tooltip =~ s/\n+$//;
2889
2551 $self->add (new CFClient::UI::Label 2890 $self->add (new CFClient::UI::Label
2552 markup => $widget->{tooltip}, 2891 markup => $tooltip,
2553 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2892 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2554 fontsize => 0.8, 2893 fontsize => 0.8,
2555 fg => [0, 0, 0, 1], 2894 fg => [0, 0, 0, 1],
2556 ellipsise => 0, 2895 ellipsise => 0,
2557 font => ($widget->{tooltip_font} || $::FONT_PROP), 2896 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2564 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2903 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2565 2904
2566 ($w + 4, $h + 4) 2905 ($w + 4, $h + 4)
2567} 2906}
2568 2907
2569sub size_allocate { 2908sub invoke_size_allocate {
2570 my ($self, $w, $h) = @_; 2909 my ($self, $w, $h) = @_;
2571 2910
2572 $self->SUPER::size_allocate ($w - 4, $h - 4); 2911 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2912}
2913
2914sub invoke_visibility_change {
2915 my ($self, $visible) = @_;
2916
2917 return unless $visible;
2918
2919 $self->{root}->on_post_alloc ("move_$self" => sub {
2920 my $widget = $self->{owner}
2921 or return;
2922
2923 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2924
2925 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2926 if $x + $self->{w} > $self->{root}{w};
2927
2928 $self->move_abs ($x, $y);
2929 });
2573} 2930}
2574 2931
2575sub _draw { 2932sub _draw {
2576 my ($self) = @_; 2933 my ($self) = @_;
2577 2934
… …
2594 glVertex $w, $h; 2951 glVertex $w, $h;
2595 glVertex $w, 0; 2952 glVertex $w, 0;
2596 glEnd; 2953 glEnd;
2597 2954
2598 glTranslate 2 - 0.375, 2 - 0.375; 2955 glTranslate 2 - 0.375, 2 - 0.375;
2956
2599 $self->SUPER::_draw; 2957 $self->SUPER::_draw;
2600} 2958}
2601 2959
2602############################################################################# 2960#############################################################################
2603 2961
… …
2609 2967
2610sub new { 2968sub new {
2611 my $class = shift; 2969 my $class = shift;
2612 2970
2613 my $self = $class->SUPER::new ( 2971 my $self = $class->SUPER::new (
2614 aspect => 1, 2972 aspect => 1,
2973 can_events => 0,
2615 @_, 2974 @_,
2616 ); 2975 );
2617 2976
2618 if ($self->{anim} && $self->{animspeed}) { 2977 if ($self->{anim} && $self->{animspeed}) {
2619 Scalar::Util::weaken (my $widget = $self); 2978 Scalar::Util::weaken (my $widget = $self);
… …
2661 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3020 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2662 3021
2663 if ($tex) { 3022 if ($tex) {
2664 glEnable GL_TEXTURE_2D; 3023 glEnable GL_TEXTURE_2D;
2665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3024 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2666 glColor 1, 1, 1, 1; 3025 glColor 0, 0, 0, 1;
2667 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3026 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2668 glDisable GL_TEXTURE_2D; 3027 glDisable GL_TEXTURE_2D;
2669 } 3028 }
2670} 3029}
2671 3030
2672sub DESTROY { 3031sub destroy {
2673 my ($self) = @_; 3032 my ($self) = @_;
2674 3033
2675 $self->{timer}->cancel 3034 $self->{timer}->cancel
2676 if $self->{timer}; 3035 if $self->{timer};
2677 3036
2678 $self->SUPER::DESTROY; 3037 $self->SUPER::destroy;
2679} 3038}
2680 3039
2681############################################################################# 3040#############################################################################
2682 3041
2683package CFClient::UI::InventoryItem; 3042package CFClient::UI::Buttonbar;
2684 3043
2685our @ISA = CFClient::UI::HBox::; 3044our @ISA = CFClient::UI::HBox::;
2686 3045
2687sub _item_to_desc { 3046# TODO: should actualyl wrap buttons and other goodies.
2688 my ($item) = @_;
2689
2690 my $desc =
2691 $item->{nrof} < 2
2692 ? $item->{name}
2693 : "$item->{nrof} × $item->{name_pl}";
2694
2695 $item->{flags} & Crossfire::Protocol::F_OPEN
2696 and $desc .= " (open)";
2697 $item->{flags} & Crossfire::Protocol::F_APPLIED
2698 and $desc .= " (applied)";
2699 $item->{flags} & Crossfire::Protocol::F_UNPAID
2700 and $desc .= " (unpaid)";
2701 $item->{flags} & Crossfire::Protocol::F_MAGIC
2702 and $desc .= " (magic)";
2703 $item->{flags} & Crossfire::Protocol::F_CURSED
2704 and $desc .= " (cursed)";
2705 $item->{flags} & Crossfire::Protocol::F_DAMNED
2706 and $desc .= " (damned)";
2707 $item->{flags} & Crossfire::Protocol::F_LOCKED
2708 and $desc .= " *";
2709
2710 $desc
2711}
2712
2713sub new {
2714 my $class = shift;
2715
2716 my %args = @_;
2717
2718 my $item = delete $args{item};
2719
2720 my $desc = _item_to_desc ($item);
2721
2722 my $self = $class->SUPER::new (
2723 can_hover => 1,
2724 can_events => 1,
2725 tooltip => ((CFClient::UI::Label::escape $desc)
2726 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2727 connect_button_down => sub {
2728 my ($self, $ev, $x, $y) = @_;
2729
2730 # todo: maybe put examine on 1? but should just be a tooltip :(
2731 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2732 my $targ = $::CONN->{player}{tag};
2733
2734 if ($item->{container} == $::CONN->{player}{tag}) {
2735 $targ = $main::OPENCONT;
2736 }
2737
2738 $::CONN->send ("move $targ $item->{tag} 0");
2739 } elsif ($ev->{button} == 1) {
2740 $::CONN->send ("examine $item->{tag}");
2741 } elsif ($ev->{button} == 2) {
2742 $::CONN->send ("apply $item->{tag}");
2743 } elsif ($ev->{button} == 3) {
2744 my @menu_items = (
2745 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2746 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2747 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2748 (
2749 $item->{flags} & Crossfire::Protocol::F_LOCKED
2750 ? (
2751 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2752 )
2753 : (
2754 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2755 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2756 )
2757 ),
2758 );
2759
2760 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2761 }
2762
2763 1
2764 },
2765 %args
2766 );
2767
2768
2769 $self->add (new CFClient::UI::Face
2770 can_events => 0,
2771 face => $item->{face},
2772 anim => $item->{anim},
2773 animspeed => $item->{animspeed},
2774 );
2775
2776 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2777
2778 $self->{item} = $item;
2779
2780 $self->update_item;
2781
2782 $self
2783}
2784
2785sub update_item {
2786 my ($self) = @_;
2787
2788 my $desc = _item_to_desc ($self->{item});
2789
2790 $self->{name_lbl}->set_text ($desc);
2791}
2792
2793#############################################################################
2794
2795package CFClient::UI::Inventory;
2796
2797our @ISA = CFClient::UI::ScrolledWindow::;
2798
2799sub new {
2800 my $class = shift;
2801
2802 my $self = $class->SUPER::new (
2803 scrolled => (new CFClient::UI::Table),
2804 @_,
2805 );
2806
2807 $self
2808}
2809
2810sub set_items {
2811 my ($self, $items) = @_;
2812
2813 $self->{scrolled}->clear;
2814 return unless $items;
2815
2816 my @items = sort {
2817 ($a->{type} <=> $b->{type})
2818 or ($a->{name} cmp $b->{name})
2819 } @$items;
2820
2821 $self->{real_items} = \@items;
2822
2823 for my $item (@items) {
2824 $item->{item} = $item;
2825 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2826 $item->update_item ();
2827 }
2828
2829 my $i = 0;
2830 for (@items) {
2831 $self->{scrolled}->add (0, $i, $_);
2832 my $nrof = $_->{item}->{nrof} || 1;
2833 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2834 }
2835
2836# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2837}
2838
2839sub size_request {
2840 my ($self) = @_;
2841 ($self->{req_w}, $self->{req_h});
2842}
2843 3047
2844############################################################################# 3048#############################################################################
2845 3049
2846package CFClient::UI::Menu; 3050package CFClient::UI::Menu;
2847 3051
… …
2859 ); 3063 );
2860 3064
2861 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3065 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2862 3066
2863 for my $item (@{ $self->{items} }) { 3067 for my $item (@{ $self->{items} }) {
2864 my ($widget, $cb) = @$item; 3068 my ($widget, $cb, $tooltip) = @$item;
2865 3069
2866 # handle various types of items, only text for now 3070 # handle various types of items, only text for now
2867 if (!ref $widget) { 3071 if (!ref $widget) {
2868 $widget = new CFClient::UI::Label 3072 $widget = new CFClient::UI::Label
2869 can_hover => 1, 3073 can_hover => 1,
2870 can_events => 1, 3074 can_events => 1,
2871 text => $widget; 3075 markup => $widget,
3076 tooltip => $tooltip
2872 } 3077 }
2873 3078
2874 $self->{item}{$widget} = $item; 3079 $self->{item}{$widget} = $item;
2875 3080
2876 $self->{vbox}->add ($widget); 3081 $self->{vbox}->add ($widget);
… …
2888 # maybe save $GRAB? must be careful about events... 3093 # maybe save $GRAB? must be careful about events...
2889 $GRAB = $self; 3094 $GRAB = $self;
2890 $self->{button} = $ev->{button}; 3095 $self->{button} = $ev->{button};
2891 3096
2892 $self->show; 3097 $self->show;
2893 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3098 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2894} 3099}
2895 3100
2896sub mouse_motion { 3101sub invoke_mouse_motion {
2897 my ($self, $ev, $x, $y) = @_; 3102 my ($self, $ev, $x, $y) = @_;
2898 3103
2899 # TODO: should use vbox->find_widget or so 3104 # TODO: should use vbox->find_widget or so
2900 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3105 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2901 $self->{hover} = $self->{item}{$HOVER}; 3106 $self->{hover} = $self->{item}{$HOVER};
2902}
2903 3107
3108 0
3109}
3110
2904sub button_up { 3111sub invoke_button_up {
2905 my ($self, $ev, $x, $y) = @_; 3112 my ($self, $ev, $x, $y) = @_;
2906 3113
2907 if ($ev->{button} == $self->{button}) { 3114 if ($ev->{button} == $self->{button}) {
2908 undef $GRAB; 3115 undef $GRAB;
2909 $self->hide; 3116 $self->hide;
2910 3117
2911 $self->emit ("popdown"); 3118 $self->emit ("popdown");
2912 $self->{hover}[1]->() if $self->{hover}; 3119 $self->{hover}[1]->() if $self->{hover};
3120 } else {
3121 return 0
3122 }
3123
2913 } 3124 1
2914} 3125}
2915 3126
2916############################################################################# 3127#############################################################################
2917 3128
2918package CFClient::UI::Statusbox; 3129package CFClient::UI::Multiplexer;
2919 3130
2920our @ISA = CFClient::UI::VBox::; 3131our @ISA = CFClient::UI::Container::;
2921 3132
2922sub new { 3133sub new {
2923 my $class = shift; 3134 my $class = shift;
2924 3135
2925 $class->SUPER::new ( 3136 my $self = $class->SUPER::new (
3137 @_,
3138 );
3139
3140 $self->{current} = $self->{children}[0]
3141 if @{ $self->{children} };
3142
3143 $self
3144}
3145
3146sub add {
3147 my ($self, @widgets) = @_;
3148
3149 $self->SUPER::add (@widgets);
3150
3151 $self->{current} = $self->{children}[0]
3152 if @{ $self->{children} };
3153}
3154
3155sub set_current_page {
3156 my ($self, $page_or_widget) = @_;
3157
3158 my $widget = ref $page_or_widget
3159 ? $page_or_widget
3160 : $self->{children}[$page_or_widget];
3161
3162 $self->{current} = $widget;
3163 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3164
3165 $self->emit (page_changed => $self->{current});
3166
3167 $self->realloc;
3168}
3169
3170sub visible_children {
3171 $_[0]{current}
3172}
3173
3174sub size_request {
3175 my ($self) = @_;
3176
3177 $self->{current}->size_request
3178}
3179
3180sub invoke_size_allocate {
3181 my ($self, $w, $h) = @_;
3182
3183 $self->{current}->configure (0, 0, $w, $h);
3184
3185 1
3186}
3187
3188sub _draw {
3189 my ($self) = @_;
3190
3191 $self->{current}->draw;
3192}
3193
3194#############################################################################
3195
3196package CFClient::UI::Notebook;
3197
3198our @ISA = CFClient::UI::VBox::;
3199
3200sub new {
3201 my $class = shift;
3202
3203 my $self = $class->SUPER::new (
3204 buttonbar => (new CFClient::UI::Buttonbar),
3205 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3206 # filter => # will be put between multiplexer and $self
3207 @_,
3208 );
3209
3210 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3211 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3212
3213 $self
3214}
3215
3216sub add {
3217 my ($self, $title, $widget, $tooltip) = @_;
3218
3219 Scalar::Util::weaken $self;
3220
3221 $self->{buttonbar}->add (new CFClient::UI::Button
3222 markup => $title,
3223 tooltip => $tooltip,
3224 on_activate => sub { $self->set_current_page ($widget) },
3225 );
3226
3227 $self->{multiplexer}->add ($widget);
3228}
3229
3230sub set_current_page {
3231 my ($self, $page) = @_;
3232
3233 $self->{multiplexer}->set_current_page ($page);
3234 $self->emit (page_changed => $self->{multiplexer}{current});
3235}
3236
3237#############################################################################
3238
3239package CFClient::UI::Combobox;
3240
3241use utf8;
3242
3243our @ISA = CFClient::UI::Button::;
3244
3245sub new {
3246 my $class = shift;
3247
3248 my $self = $class->SUPER::new (
3249 options => [], # [value, title, longdesc], ...
3250 value => undef,
3251 @_,
3252 );
3253
3254 $self->_set_value ($self->{value});
3255
3256 $self
3257}
3258
3259sub invoke_button_down {
3260 my ($self, $ev) = @_;
3261
3262 my @menu_items;
3263
3264 for (@{ $self->{options} }) {
3265 my ($value, $title, $tooltip) = @$_;
3266
3267 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3268 }
3269
3270 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3271}
3272
3273sub _set_value {
3274 my ($self, $value) = @_;
3275
3276 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3277 or return;
3278
3279 $self->{value} = $item->[0];
3280 $self->set_markup ("$item->[1] ⇓");
3281 $self->set_tooltip ($item->[2]);
3282}
3283
3284sub set_value {
3285 my ($self, $value) = @_;
3286
3287 return unless $self->{value} ne $value;
3288
3289 $self->_set_value ($value);
3290 $self->emit (changed => $value);
3291}
3292
3293#############################################################################
3294
3295package CFClient::UI::Statusbox;
3296
3297our @ISA = CFClient::UI::VBox::;
3298
3299sub new {
3300 my $class = shift;
3301
3302 my $self = $class->SUPER::new (
2926 fontsize => 0.8, 3303 fontsize => 0.8,
2927 @_, 3304 @_,
2928 ) 3305 );
3306
3307 Scalar::Util::weaken (my $this = $self);
3308
3309 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3310
3311 $self
2929} 3312}
2930 3313
2931sub reorder { 3314sub reorder {
2932 my ($self) = @_; 3315 my ($self) = @_;
2933 my $NOW = time; 3316 my $NOW = Time::HiRes::time;
3317
3318 # freeze display when hovering over any label
3319 return if $CFClient::UI::TOOLTIP->{owner}
3320 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3321 values %{ $self->{item} };
2934 3322
2935 while (my ($k, $v) = each %{ $self->{item} }) { 3323 while (my ($k, $v) = each %{ $self->{item} }) {
2936 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3324 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2937 } 3325 }
2938 3326
… …
2941 my @items = sort { 3329 my @items = sort {
2942 $a->{pri} <=> $b->{pri} 3330 $a->{pri} <=> $b->{pri}
2943 or $b->{id} <=> $a->{id} 3331 or $b->{id} <=> $a->{id}
2944 } values %{ $self->{item} }; 3332 } values %{ $self->{item} };
2945 3333
3334 $self->{timer}->interval (1);
3335
2946 my $count = 10 + 1; 3336 my $count = 10 + 1;
2947 for my $item (@items) { 3337 for my $item (@items) {
2948 last unless --$count; 3338 last unless --$count;
2949 3339
2950 push @widgets, $item->{label} ||= do { 3340 my $label = $item->{label} ||= do {
2951 # TODO: doesn't handle markup well (read as: at all) 3341 # TODO: doesn't handle markup well (read as: at all)
2952 my $short = $item->{count} > 1 3342 my $short = $item->{count} > 1
2953 ? "<b>$item->{count} ×</b> $item->{text}" 3343 ? "<b>$item->{count} ×</b> $item->{text}"
2954 : $item->{text}; 3344 : $item->{text};
2955 3345
… …
2963 tooltip => $item->{tooltip}, 3353 tooltip => $item->{tooltip},
2964 tooltip_font => $::FONT_PROP, 3354 tooltip_font => $::FONT_PROP,
2965 tooltip_width => 0.67, 3355 tooltip_width => 0.67,
2966 fontsize => $item->{fontsize} || $self->{fontsize}, 3356 fontsize => $item->{fontsize} || $self->{fontsize},
2967 max_w => $::WIDTH * 0.44, 3357 max_w => $::WIDTH * 0.44,
2968 fg => $item->{fg}, 3358 fg => [@{ $item->{fg} }],
2969 can_events => 1, 3359 can_events => 1,
2970 can_hover => 1 3360 can_hover => 1
2971 }; 3361 };
3362
3363 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3364 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3365 $label->update;
3366 $label->set_max_size (undef, $label->{req_h} * $diff)
3367 if $diff < 1;
3368 $self->{timer}->interval (1/30);
3369 } else {
3370 $label->{fg}[3] = $item->{fg}[3] || 1;
3371 }
3372
3373 push @widgets, $label;
2972 } 3374 }
2973 3375
2974 $self->clear; 3376 $self->clear;
2975 $self->SUPER::add (reverse @widgets); 3377 $self->SUPER::add (reverse @widgets);
2976} 3378}
… …
2979 my ($self, $text, %arg) = @_; 3381 my ($self, $text, %arg) = @_;
2980 3382
2981 $text =~ s/^\s+//; 3383 $text =~ s/^\s+//;
2982 $text =~ s/\s+$//; 3384 $text =~ s/\s+$//;
2983 3385
3386 return unless $text;
3387
2984 my $timeout = time + ((delete $arg{timeout}) || 60); 3388 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2985 3389
2986 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3390 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2987 3391
2988 if (my $item = $self->{item}{$group}) { 3392 if (my $item = $self->{item}{$group}) {
2989 if ($item->{text} eq $text) { 3393 if ($item->{text} eq $text) {
2990 $item->{count}++; 3394 $item->{count}++;
2991 } else { 3395 } else {
2992 $item->{count} = 1; 3396 $item->{count} = 1;
2993 $item->{text} = $item->{tooltip} = $text; 3397 $item->{text} = $item->{tooltip} = $text;
2994 } 3398 }
2995 $item->{id} = ++$self->{id}; 3399 $item->{id} += 0.2;#d#
2996 $item->{timeout} = $timeout; 3400 $item->{timeout} = $timeout;
2997 delete $item->{label}; 3401 delete $item->{label};
2998 } else { 3402 } else {
2999 $self->{item}{$group} = { 3403 $self->{item}{$group} = {
3000 id => ++$self->{id}, 3404 id => ++$self->{id},
… …
3019 3423
3020 $self->reorder; 3424 $self->reorder;
3021 $self->SUPER::reconfigure; 3425 $self->SUPER::reconfigure;
3022} 3426}
3023 3427
3428sub destroy {
3429 my ($self) = @_;
3430
3431 $self->{timer}->cancel;
3432
3433 $self->SUPER::destroy;
3434}
3435
3024############################################################################# 3436#############################################################################
3025 3437
3026package CFClient::UI::Root; 3438package CFClient::UI::Inventory;
3027 3439
3028our @ISA = CFClient::UI::Container::; 3440our @ISA = CFClient::UI::ScrolledWindow::;
3029
3030use CFClient::OpenGL;
3031 3441
3032sub new { 3442sub new {
3033 my $class = shift; 3443 my $class = shift;
3034 3444
3035 $class->SUPER::new ( 3445 my $self = $class->SUPER::new (
3446 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3447 @_,
3448 );
3449
3450 $self
3451}
3452
3453sub set_items {
3454 my ($self, $items) = @_;
3455
3456 $self->{child}->clear;
3457 return unless $items;
3458
3459 my @items = sort {
3460 ($a->{type} <=> $b->{type})
3461 or ($a->{name} cmp $b->{name})
3462 } @$items;
3463
3464 $self->{real_items} = \@items;
3465
3466 my $row = 0;
3467 for my $item (@items) {
3468 CFClient::Item::update_widgets $item;
3469
3470 $self->{child}->add (0, $row, $item->{face_widget});
3471 $self->{child}->add (1, $row, $item->{desc_widget});
3472 $self->{child}->add (2, $row, $item->{weight_widget});
3473
3474 $row++;
3475 }
3476}
3477
3478#############################################################################
3479
3480package CFClient::UI::SpellList;
3481
3482our @ISA = CFClient::UI::Table::;
3483
3484sub new {
3485 my $class = shift;
3486
3487 my $self = $class->SUPER::new (
3488 binding => [],
3489 commands => [],
3036 @_, 3490 @_,
3037 ) 3491 )
3038} 3492}
3039 3493
3040sub configure { 3494my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3041 my ($self, $x, $y, $w, $h) = @_;
3042 3495
3043 $self->{w} = $w; 3496my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3044 $self->{h} = $h; 3497 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3045} 3498my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3499 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3500my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3501 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3502my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3503 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3504my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3505 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3046 3506
3047sub check_size { 3507sub rebuild_spell_list {
3508 my ($self) = @_;
3509
3510 $CFClient::UI::ROOT->on_refresh ($self => sub {
3511 $self->clear;
3512
3513 return unless $::CONN;
3514
3515 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3516 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3517 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3518 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3519 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3520
3521 my $row = 0;
3522
3523 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3524 my $spell = $self->{spell}{$_};
3525
3526 $row++;
3527
3528 my $spell_cb = sub {
3529 my ($widget, $ev) = @_;
3530
3531 if ($ev->{button} == 1) {
3532 $::CONN->user_send ("cast $spell->{name}");
3533 } elsif ($ev->{button} == 2) {
3534 $::CONN->user_send ("invoke $spell->{name}");
3535 } elsif ($ev->{button} == 3) {
3536 (new CFClient::UI::Menu
3537 items => [
3538 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3539 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3540 ],
3541 )->popup ($ev);
3542 } else {
3543 return 0;
3544 }
3545
3546 1
3547 };
3548
3549 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3550
3551 #TODO: add path info to tooltip
3552 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3553
3554 $self->add (0, $row, new CFClient::UI::Face
3555 face => $spell->{face},
3556 can_hover => 1,
3557 can_events => 1,
3558 tooltip => $tooltip,
3559 on_button_down => $spell_cb,
3560 );
3561
3562 $self->add (1, $row, new CFClient::UI::Label
3563 expand => 1,
3564 text => $spell->{name},
3565 can_hover => 1,
3566 can_events => 1,
3567 tooltip => $tooltip,
3568 on_button_down => $spell_cb,
3569 );
3570
3571 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3572 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3573 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3574 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3575 }
3576 });
3577}
3578
3579sub add_spell {
3048 my ($self) = @_; 3580 my ($self, $spell) = @_;
3049 3581
3050 $self->size_allocate ($self->{w}, $self->{h}) 3582 $self->{spell}->{$spell->{name}} = $spell;
3051 if $self->{w}; 3583 $self->rebuild_spell_list;
3584}
3585
3586sub remove_spell {
3587 my ($self, $spell) = @_;
3588
3589 delete $self->{spell}->{$spell->{name}};
3590 $self->rebuild_spell_list;
3591}
3592
3593sub clear_spells {
3594 my ($self) = @_;
3595
3596 $self->{spell} = {};
3597 $self->rebuild_spell_list;
3598}
3599
3600#############################################################################
3601
3602package CFClient::UI::Root;
3603
3604our @ISA = CFClient::UI::Container::;
3605
3606use List::Util qw(min max);
3607
3608use CFClient::OpenGL;
3609
3610sub new {
3611 my $class = shift;
3612
3613 my $self = $class->SUPER::new (
3614 visible => 1,
3615 @_,
3616 );
3617
3618 Scalar::Util::weaken ($self->{root} = $self);
3619
3620 $self
3052} 3621}
3053 3622
3054sub size_request { 3623sub size_request {
3055 my ($self) = @_; 3624 my ($self) = @_;
3056 3625
3057 ($self->{w}, $self->{h}) 3626 ($self->{w}, $self->{h})
3058} 3627}
3059 3628
3629sub _to_pixel {
3630 my ($coord, $size, $max) = @_;
3631
3632 $coord =
3633 $coord eq "center" ? ($max - $size) * 0.5
3634 : $coord eq "max" ? $max
3635 : $coord;
3636
3637 $coord = 0 if $coord < 0;
3638 $coord = $max - $size if $coord > $max - $size;
3639
3640 int $coord + 0.5
3641}
3642
3060sub size_allocate { 3643sub invoke_size_allocate {
3061 my ($self, $w, $h) = @_; 3644 my ($self, $w, $h) = @_;
3062 3645
3063 for my $child ($self->children) { 3646 for my $child ($self->children) {
3064 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3647 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3065 3648
3066 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3649 $X = $child->{force_x} if exists $child->{force_x};
3067 if exists $child->{req_x}; 3650 $Y = $child->{force_y} if exists $child->{force_y};
3068 3651
3069 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3652 $X = _to_pixel $X, $W, $self->{w};
3070 if exists $child->{req_y}; 3653 $Y = _to_pixel $Y, $H, $self->{h};
3071
3072 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3073 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3074 3654
3075 $child->configure ($X, $Y, $W, $H); 3655 $child->configure ($X, $Y, $W, $H);
3076 } 3656 }
3657
3658 1
3077} 3659}
3078 3660
3079sub coord2local { 3661sub coord2local {
3080 my ($self, $x, $y) = @_; 3662 my ($self, $x, $y) = @_;
3081 3663
… …
3089} 3671}
3090 3672
3091sub update { 3673sub update {
3092 my ($self) = @_; 3674 my ($self) = @_;
3093 3675
3094 $self->check_size;
3095 $::WANT_REFRESH++; 3676 $::WANT_REFRESH++;
3096} 3677}
3097 3678
3098sub add { 3679sub add {
3099 my ($self, @children) = @_; 3680 my ($self, @children) = @_;
3100 3681
3101 for (my @widgets = @children; my $w = pop @widgets; ) {
3102 push @widgets, $w->children;
3103 $w->{root} = $self;
3104 $w->{visible} = 1;
3105 }
3106
3107 for my $child (@children) {
3108 $child->{is_toplevel} = 1; 3682 $_->{is_toplevel} = 1
3109 3683 for @children;
3110 # integerise window positions
3111 $child->{x} = int $child->{x};
3112 $child->{y} = int $child->{y};
3113 }
3114 3684
3115 $self->SUPER::add (@children); 3685 $self->SUPER::add (@children);
3116} 3686}
3117 3687
3118sub remove { 3688sub remove {
3119 my ($self, @children) = @_; 3689 my ($self, @children) = @_;
3120 3690
3121 $self->SUPER::remove (@children); 3691 $self->SUPER::remove (@children);
3692
3693 delete $self->{is_toplevel}
3694 for @children;
3122 3695
3123 while (@children) { 3696 while (@children) {
3124 my $w = pop @children; 3697 my $w = pop @children;
3125 push @children, $w->children; 3698 push @children, $w->children;
3126 delete $w->{visible}; 3699 $w->set_invisible;
3127 } 3700 }
3128} 3701}
3129 3702
3130sub on_refresh { 3703sub on_refresh {
3131 my ($self, $id, $cb) = @_; 3704 my ($self, $id, $cb) = @_;
… …
3145 while ($self->{refresh_hook}) { 3718 while ($self->{refresh_hook}) {
3146 $_->() 3719 $_->()
3147 for values %{delete $self->{refresh_hook}}; 3720 for values %{delete $self->{refresh_hook}};
3148 } 3721 }
3149 3722
3150 if ($self->{check_size}) { 3723 if ($self->{realloc}) {
3151 my @queue = ([], []); 3724 my %queue;
3725 my @queue;
3726 my $widget;
3152 3727
3153 for (;;) { 3728 outer:
3154 if ($self->{check_size}) { 3729 while () {
3155 # heuristic: check containers last 3730 if (my $realloc = delete $self->{realloc}) {
3156 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3731 for $widget (values %$realloc) {
3157 for values %{delete $self->{check_size}} 3732 $widget->{visible} or next; # do not resize invisible widgets
3733
3734 $queue{$widget+0}++ and next; # duplicates are common
3735
3736 push @{ $queue[$widget->{visible}] }, $widget;
3737 }
3158 } 3738 }
3159 3739
3160 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3740 while () {
3741 @queue or last outer;
3161 3742
3162 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3743 $widget = pop @{ $queue[-1] || [] }
3163 ? @$widget{qw(user_w user_h)} 3744 and last;
3164 : $widget->size_request;
3165
3166 if (delete $widget->{force_alloc}
3167 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3168 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3169 3745
3746 pop @queue;
3747 }
3748
3749 delete $queue{$widget+0};
3750
3751 my ($w, $h) = $widget->size_request;
3752
3753 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3754 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3755
3756 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3757 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3758
3759 $w = $widget->{force_w} if exists $widget->{force_w};
3760 $h = $widget->{force_h} if exists $widget->{force_h};
3761
3762 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3763 || delete $widget->{force_realloc}) {
3170 $widget->{req_w} = $w; 3764 $widget->{req_w} = $w;
3171 $widget->{req_h} = $h; 3765 $widget->{req_h} = $h;
3172 3766
3173 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3767 $self->{size_alloc}{$widget+0} = $widget;
3174 3768
3175 $widget->{parent}->check_size
3176 if $widget->{parent}; 3769 if (my $parent = $widget->{parent}) {
3770 $self->{realloc}{$parent+0} = $parent
3771 unless $queue{$parent+0};
3772
3773 $parent->{force_size_alloc} = 1;
3774 $self->{size_alloc}{$parent+0} = $parent;
3775 }
3177 } 3776 }
3777
3778 delete $self->{realloc}{$widget+0};
3178 } 3779 }
3179 } 3780 }
3180 3781
3181 while ($self->{size_alloc}) { 3782 while (my $size_alloc = delete $self->{size_alloc}) {
3182 for (values %{delete $self->{size_alloc}}) { 3783 my @queue = sort { $b->{visible} <=> $a->{visible} }
3183 my ($widget, $w, $h) = @$_; 3784 values %$size_alloc;
3785
3786 while () {
3787 my $widget = pop @queue || last;
3788
3789 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3184 3790
3185 $w = 0 if $w < 0; 3791 $w = 0 if $w < 0;
3186 $h = 0 if $h < 0; 3792 $h = 0 if $h < 0;
3187 3793
3794 $w = int $w + 0.5;
3795 $h = int $h + 0.5;
3796
3797 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3798 $widget->{old_w} = $widget->{w};
3799 $widget->{old_h} = $widget->{h};
3800
3188 $widget->{w} = $w; 3801 $widget->{w} = $w;
3189 $widget->{h} = $h; 3802 $widget->{h} = $h;
3190 $widget->size_allocate ($w, $h); 3803
3191 $widget->emit (size_allocate => $w, $h); 3804 $widget->emit (size_allocate => $w, $h);
3805 }
3192 } 3806 }
3193 } 3807 }
3194 3808
3195 while ($self->{post_alloc_hook}) { 3809 while ($self->{post_alloc_hook}) {
3196 $_->() 3810 $_->()
3197 for values %{delete $self->{post_alloc_hook}}; 3811 for values %{delete $self->{post_alloc_hook}};
3198 } 3812 }
3813
3199 3814
3200 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3815 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3816 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3202 glClear GL_COLOR_BUFFER_BIT; 3817 glClear GL_COLOR_BUFFER_BIT;
3203 3818
… …
3205 glLoadIdentity; 3820 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3821 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 3822 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 3823 glLoadIdentity;
3209 3824
3825 {
3826 package CFClient::UI::Base;
3827
3828 ($draw_x, $draw_y, $draw_w, $draw_h) =
3829 (0, 0, $self->{w}, $self->{h});
3830 }
3831
3210 $self->_draw; 3832 $self->_draw;
3211} 3833}
3212 3834
3213############################################################################# 3835#############################################################################
3214 3836

Diff Legend

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