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

Diff Legend

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