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

Diff Legend

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