ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.234 by root, Thu May 25 16:24:44 2006 UTC vs.
Revision 1.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
… …
331 399
332 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
333 401
334 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
335 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
336 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
337 } 405 }
338} 406}
339 407
340# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
341sub coord2local { 409sub coord2local {
… …
349 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
350 418
351 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
352} 420}
353 421
354sub focus_in { 422sub invoke_focus_in {
355 my ($self) = @_; 423 my ($self) = @_;
356 424
357 return if $FOCUS == $self; 425 return if $FOCUS == $self;
358 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
359 427
360 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
361 429
362 $self->_emit (focus_in => $focus); 430 $self->update;
363 431
364 $focus->update if $focus; 432 0
365 $FOCUS->update;
366} 433}
367 434
368sub focus_out { 435sub invoke_focus_out {
369 my ($self) = @_; 436 my ($self) = @_;
370 437
371 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
372 439
373 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
374 441
375 $self->_emit (focus_out => $focus); 442 $self->update;
376 443
377 $focus->update if $focus; #?
378
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
380 unless $FOCUS; 445 unless $FOCUS;
381}
382 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
383sub mouse_motion { } 457sub invoke_mouse_motion { 0 }
384sub button_up { } 458sub invoke_button_up { 0 }
385sub key_down { } 459sub invoke_key_down { 0 }
386sub key_up { } 460sub invoke_key_up { 0 }
387 461
388sub button_down { 462sub invoke_button_down {
389 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
390 464
391 $self->focus_in; 465 $self->grab_focus;
392}
393 466
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 0
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
398sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #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
399 537
400sub draw { 538sub draw {
401 my ($self) = @_; 539 my ($self) = @_;
402 540
403 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);
404 550
405 glPushMatrix; 551 glPushMatrix;
406 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
407 $self->_draw;
408 glPopMatrix;
409 553
410 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
411 my ($x, $y) = @$self{qw(x y)};
412
413 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
414 glEnable GL_BLEND; 556 glEnable GL_BLEND;
415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
416 glBegin GL_QUADS; 558 glBegin GL_QUADS;
417 glVertex $x , $y; 559 glVertex 0 , 0;
418 glVertex $x + $self->{w}, $y; 560 glVertex $self->{w}, 0;
419 glVertex $x + $self->{w}, $y + $self->{h}; 561 glVertex $self->{w}, $self->{h};
420 glVertex $x , $y + $self->{h}; 562 glVertex 0 , $self->{h};
421 glEnd; 563 glEnd;
422 glDisable GL_BLEND; 564 glDisable GL_BLEND;
423 } 565 }
424 566
425 if ($ENV{PCLIENT_DEBUG}) { 567 if ($ENV{CFPLUS_DEBUG} & 1) {
426 glPushMatrix; 568 glPushMatrix;
427 glColor 1, 1, 0, 1; 569 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 570 glTranslate 0.375, 0.375;
429 glBegin GL_LINE_LOOP; 571 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 572 glVertex 0 , 0;
431 glVertex $self->{w} - 1, 0; 573 glVertex $self->{w} - 1, 0;
432 glVertex $self->{w} - 1, $self->{h} - 1; 574 glVertex $self->{w} - 1, $self->{h} - 1;
433 glVertex 0 , $self->{h} - 1; 575 glVertex 0 , $self->{h} - 1;
434 glEnd; 576 glEnd;
435 glPopMatrix; 577 glPopMatrix;
436 #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;
437 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
438} 583}
439 584
440sub _draw { 585sub _draw {
441 my ($self) = @_; 586 my ($self) = @_;
442 587
443 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
444} 589}
445 590
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 # TODO: req_w _does_change after ->reconfigure
464 $self->check_size
465 unless exists $self->{req_w};
466
467 $self->show;
468}
469
470sub check_size {
471 my ($self, $forced) = @_;
472
473 $self->{force_alloc} = 1 if $forced;
474 $CFClient::UI::ROOT->{check_size}{$self} = $self;
475}
476
477sub update {
478 my ($self) = @_;
479
480 $self->{parent}->update
481 if $self->{parent};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub DESTROY { 591sub DESTROY {
504 my ($self) = @_; 592 my ($self) = @_;
505 593
594 return if CFClient::in_destruct;
595
506 delete $WIDGET{$self+0}; 596 delete $WIDGET{$self+0};
507 #$self->deactivate; 597
598 eval { $self->destroy };
599 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
508} 600}
509 601
510############################################################################# 602#############################################################################
511 603
512package CFClient::UI::DrawBG; 604package CFClient::UI::DrawBG;
… …
537 629
538 if ($color && (@$color < 4 || $color->[3])) { 630 if ($color && (@$color < 4 || $color->[3])) {
539 my ($w, $h) = @$self{qw(w h)}; 631 my ($w, $h) = @$self{qw(w h)};
540 632
541 glEnable GL_BLEND; 633 glEnable GL_BLEND;
542 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 634 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
543 glColor @$color; 635 glColor_premultiply @$color;
544 636
545 glBegin GL_QUADS; 637 glBegin GL_QUADS;
546 glVertex 0 , 0; 638 glVertex 0 , 0;
547 glVertex 0 , $h; 639 glVertex 0 , $h;
548 glVertex $w, $h; 640 glVertex $w, $h;
… …
563 my ($class, %arg) = @_; 655 my ($class, %arg) = @_;
564 $class->SUPER::new (can_events => 0, %arg); 656 $class->SUPER::new (can_events => 0, %arg);
565} 657}
566 658
567sub size_request { 659sub size_request {
568 (0, 0) 660 my ($self) = @_;
661
662 ($self->{w} + 0, $self->{h} + 0)
569} 663}
570 664
571sub draw { } 665sub draw { }
572 666
573############################################################################# 667#############################################################################
… …
577our @ISA = CFClient::UI::Base::; 671our @ISA = CFClient::UI::Base::;
578 672
579sub new { 673sub new {
580 my ($class, %arg) = @_; 674 my ($class, %arg) = @_;
581 675
582 my $children = delete $arg{children} || []; 676 my $children = delete $arg{children};
583 677
584 my $self = $class->SUPER::new ( 678 my $self = $class->SUPER::new (
585 children => [], 679 children => [],
586 can_events => 0, 680 can_events => 0,
587 %arg, 681 %arg,
588 ); 682 );
683
589 $self->add ($_) for @$children; 684 $self->add (@$children)
685 if $children;
590 686
591 $self 687 $self
592} 688}
593 689
594sub add { 690sub add {
… …
602 $self->{children} = [ 698 $self->{children} = [
603 sort { $a->{z} <=> $b->{z} } 699 sort { $a->{z} <=> $b->{z} }
604 @{$self->{children}}, @widgets 700 @{$self->{children}}, @widgets
605 ]; 701 ];
606 702
607 $self->check_size (1); 703 $self->realloc;
608 $self->update;
609} 704}
610 705
611sub children { 706sub children {
612 @{ $_[0]{children} } 707 @{ $_[0]{children} }
613} 708}
… …
618 delete $child->{parent}; 713 delete $child->{parent};
619 $child->hide; 714 $child->hide;
620 715
621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 716 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622 717
623 $self->check_size; 718 $self->realloc;
624 $self->update;
625} 719}
626 720
627sub clear { 721sub clear {
628 my ($self) = @_; 722 my ($self) = @_;
629 723
… …
633 for (@$children) { 727 for (@$children) {
634 delete $_->{parent}; 728 delete $_->{parent};
635 $_->hide; 729 $_->hide;
636 } 730 }
637 731
638 $self->check_size; 732 $self->realloc;
639 $self->update;
640} 733}
641 734
642sub find_widget { 735sub find_widget {
643 my ($self, $x, $y) = @_; 736 my ($self, $x, $y) = @_;
644 737
645 $x -= $self->{x}; 738 $x -= $self->{x};
646 $y -= $self->{y}; 739 $y -= $self->{y};
647 740
648 my $res; 741 my $res;
649 742
650 for (reverse @{ $self->{children} }) { 743 for (reverse $self->visible_children) {
651 $res = $_->find_widget ($x, $y) 744 $res = $_->find_widget ($x, $y)
652 and return $res; 745 and return $res;
653 } 746 }
654 747
655 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 748 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
676} 769}
677 770
678sub add { 771sub add {
679 my ($self, $child) = @_; 772 my ($self, $child) = @_;
680 773
681 $self->{children} = []; 774 $self->SUPER::remove ($_) for @{ $self->{children} };
682
683 $self->SUPER::add ($child); 775 $self->SUPER::add ($child);
684} 776}
685 777
686sub remove { 778sub remove {
687 my ($self, $widget) = @_; 779 my ($self, $widget) = @_;
… …
696 788
697sub size_request { 789sub size_request {
698 $_[0]{children}[0]->size_request 790 $_[0]{children}[0]->size_request
699} 791}
700 792
701sub size_allocate { 793sub invoke_size_allocate {
702 my ($self, $w, $h) = @_; 794 my ($self, $w, $h) = @_;
703 795
704 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
797
798 1
705} 799}
706 800
707############################################################################# 801#############################################################################
802
803# back-buffered drawing area
708 804
709package CFClient::UI::Window; 805package CFClient::UI::Window;
710 806
711our @ISA = CFClient::UI::Bin::; 807our @ISA = CFClient::UI::Bin::;
712 808
… …
723 819
724 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 820 $ROOT->on_post_alloc ($self => sub { $self->render_child });
725 $self->SUPER::update; 821 $self->SUPER::update;
726} 822}
727 823
728sub size_allocate { 824sub invoke_size_allocate {
729 my ($self, $w, $h) = @_; 825 my ($self, $w, $h) = @_;
730 826
731 $self->SUPER::size_allocate ($w, $h);
732 $self->update; 827 $self->update;
828
829 $self->SUPER::invoke_size_allocate ($w, $h)
733} 830}
734 831
735sub _render { 832sub _render {
833 my ($self) = @_;
834
736 $_[0]{children}[0]->draw; 835 $self->{children}[0]->draw;
737} 836}
738 837
739sub render_child { 838sub render_child {
740 my ($self) = @_; 839 my ($self) = @_;
741 840
742 $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 {
743 glClearColor 0, 0, 0, 0; 842 glClearColor 0, 0, 0, 0;
744 glClear GL_COLOR_BUFFER_BIT; 843 glClear GL_COLOR_BUFFER_BIT;
745 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
746 $self->_render; 852 $self->_render;
747 }; 853 };
748} 854}
749 855
750sub _draw { 856sub _draw {
751 my ($self) = @_; 857 my ($self) = @_;
752 858
753 my ($w, $h) = ($self->w, $self->h); 859 my ($w, $h) = @$self{qw(w h)};
754 860
755 my $tex = $self->{texture} 861 my $tex = $self->{texture}
756 or return; 862 or return;
757 863
758 glEnable GL_TEXTURE_2D; 864 glEnable GL_TEXTURE_2D;
759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 865 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
760 glColor 1, 1, 1, 1; 866 glColor 0, 0, 0, 1;
761 867
762 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 868 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
763 869
764 glDisable GL_TEXTURE_2D; 870 glDisable GL_TEXTURE_2D;
765} 871}
… …
781} 887}
782 888
783sub size_request { 889sub size_request {
784 my ($self) = @_; 890 my ($self) = @_;
785 891
786 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 892 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
787 893
788 @$self{qw(child_w child_h)} 894 $w = 10 if $self->{scroll_x};
789} 895 $h = 10 if $self->{scroll_y};
790 896
897 ($w, $h)
898}
899
791sub size_allocate { 900sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 901 my ($self, $w, $h) = @_;
793 902
903 my $child = $self->child;
904
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 905 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 906 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
796 907
797 $self->child->configure (0, 0, $w, $h); 908 $self->child->configure (0, 0, $w, $h);
798 $self->update; 909 $self->update;
910
911 1
799} 912}
800 913
801sub set_offset { 914sub set_offset {
802 my ($self, $x, $y) = @_; 915 my ($self, $x, $y) = @_;
803 916
… …
836} 949}
837 950
838sub _render { 951sub _render {
839 my ($self) = @_; 952 my ($self) = @_;
840 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
841 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 957 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
842 958
843 $self->SUPER::_render; 959 $self->SUPER::_render;
844} 960}
845 961
… …
848package CFClient::UI::ScrolledWindow; 964package CFClient::UI::ScrolledWindow;
849 965
850our @ISA = CFClient::UI::HBox::; 966our @ISA = CFClient::UI::HBox::;
851 967
852sub new { 968sub new {
853 my $class = shift; 969 my ($class, %arg) = @_;
970
971 my $child = delete $arg{child};
854 972
855 my $self; 973 my $self;
856 974
857 my $slider = new CFClient::UI::Slider 975 my $slider = new CFClient::UI::Slider
858 vertical => 1, 976 vertical => 1,
859 range => [0, 0, 1, 0.01], # HACK fix 977 range => [0, 0, 1, 0.01], # HACK fix
860 connect_changed => sub { 978 on_changed => sub {
861 $self->{vp}->set_offset (0, $_[1]); 979 $self->{vp}->set_offset (0, $_[1]);
862 }, 980 },
863 ; 981 ;
864 982
865 $self = $class->SUPER::new ( 983 $self = $class->SUPER::new (
866 vp => (new CFClient::UI::ViewPort expand => 1), 984 vp => (new CFClient::UI::ViewPort expand => 1),
867 slider => $slider, 985 slider => $slider,
868 @_, 986 %arg,
869 ); 987 );
870 988
871 $self->{vp}->add ($self->{scrolled});
872 $self->add ($self->{vp});
873 $self->add ($self->{slider}); 989 $self->SUPER::add ($self->{vp}, $self->{slider});
990 $self->add ($child) if $child;
874 991
875 $self 992 $self
876} 993}
877 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
878sub size_allocate { 1025sub invoke_size_allocate {
879 my ($self, $w, $h) = @_; 1026 my ($self, $w, $h) = @_;
880 1027
1028 $self->update_slider;
1029
881 $self->SUPER::size_allocate ($w, $h); 1030 $self->SUPER::invoke_size_allocate ($w, $h)
882
883 my $child = $self->{vp}->child;
884 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
885} 1031}
886
887#TODO# update range on size_allocate depending on child
888# update viewport offset on scroll
889 1032
890############################################################################# 1033#############################################################################
891 1034
892package CFClient::UI::Frame; 1035package CFClient::UI::Frame;
893 1036
… …
909 1052
910 if ($self->{bg}) { 1053 if ($self->{bg}) {
911 my ($w, $h) = @$self{qw(w h)}; 1054 my ($w, $h) = @$self{qw(w h)};
912 1055
913 glEnable GL_BLEND; 1056 glEnable GL_BLEND;
914 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1057 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
915 glColor @{ $self->{bg} }; 1058 glColor_premultiply @{ $self->{bg} };
916 1059
917 glBegin GL_QUADS; 1060 glBegin GL_QUADS;
918 glVertex 0 , 0; 1061 glVertex 0 , 0;
919 glVertex 0 , $h; 1062 glVertex 0 , $h;
920 glVertex $w, $h; 1063 glVertex $w, $h;
… …
933 1076
934our @ISA = CFClient::UI::Bin::; 1077our @ISA = CFClient::UI::Bin::;
935 1078
936use CFClient::OpenGL; 1079use CFClient::OpenGL;
937 1080
938my @tex = 1081my $bg =
1082 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1083 mipmap => 1, wrap => 1;
1084
1085my @border =
939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1086 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1087 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
941 1088
942sub new { 1089sub new {
943 my $class = shift; 1090 my ($class, %arg) = @_;
944
945 # TODO: user_x, user_y, overwrite moveto?
946 1091
947 my $self = $class->SUPER::new ( 1092 my $self = $class->SUPER::new (
948 bg => [1, 1, 1, 1], 1093 bg => [1, 1, 1, 1],
949 border_bg => [1, 1, 1, 1], 1094 border_bg => [1, 1, 1, 1],
950 border => 0.6, 1095 border => 0.6,
951 is_toplevel => 1,
952 can_events => 1, 1096 can_events => 1,
953 @_ 1097 min_w => 64,
1098 min_h => 32,
1099 %arg,
954 ); 1100 );
955 1101
956 $self->{title} &&= new CFClient::UI::Label 1102 $self->{title_widget} = new CFClient::UI::Label
957 align => 0, 1103 align => 0,
958 valign => 1, 1104 valign => 1,
959 text => $self->{title}, 1105 text => $self->{title},
960 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 }
961 1117
962 $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};
963} 1127}
964 1128
965sub border { 1129sub border {
966 int $_[0]{border} * $::FONTSIZE 1130 int $_[0]{border} * $::FONTSIZE
967} 1131}
968 1132
969sub size_request { 1133sub size_request {
970 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};
971 1141
972 my ($w, $h) = $self->SUPER::size_request; 1142 my ($w, $h) = $self->SUPER::size_request;
973 1143
974 ( 1144 (
975 $w + $self->border * 2, 1145 $w + $self->border * 2,
976 $h + $self->border * 2, 1146 $h + $self->border * 2,
977 ) 1147 )
978} 1148}
979 1149
980sub size_allocate { 1150sub invoke_size_allocate {
981 my ($self, $w, $h) = @_; 1151 my ($self, $w, $h) = @_;
982 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
983 $h -= List::Util::max 0, $self->border * 2; 1161 $h -= List::Util::max 0, $border * 2;
984 $w -= List::Util::max 0, $self->border * 2; 1162 $w -= List::Util::max 0, $border * 2;
985 1163
986 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
987 if $self->{title};
988
989 $self->child->configure ($self->border, $self->border, $w, $h); 1164 $self->child->configure ($border, $border, $w, $h);
990}
991 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
992sub button_down { 1180sub invoke_button_down {
993 my ($self, $ev, $x, $y) = @_; 1181 my ($self, $ev, $x, $y) = @_;
994 1182
995 my ($w, $h) = @$self{qw(w h)}; 1183 my ($w, $h) = @$self{qw(w h)};
996 my $border = $self->border; 1184 my $border = $self->border;
997 1185
… …
1010 my ($ev, $x, $y) = @_; 1198 my ($ev, $x, $y) = @_;
1011 1199
1012 my $dx = $ev->{x} - $ox; 1200 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy; 1201 my $dy = $ev->{y} - $oy;
1014 1202
1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1203 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1204 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1205
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1206 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018 $self->check_size; 1207 $self->realloc;
1019 }; 1208 };
1020 1209
1021 } elsif ($lr ^ $td) { 1210 } elsif ($lr ^ $td) {
1022 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1211 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023 my ($bx, $by) = ($self->{x}, $self->{y}); 1212 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1025 $self->{motion} = sub { 1214 $self->{motion} = sub {
1026 my ($ev, $x, $y) = @_; 1215 my ($ev, $x, $y) = @_;
1027 1216
1028 ($x, $y) = ($ev->{x}, $ev->{y}); 1217 ($x, $y) = ($ev->{x}, $ev->{y});
1029 1218
1030 $self->move ($bx + $x - $ox, $by + $y - $oy); 1219 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031 $self->update; 1220 # HACK: the next line is required to enforce placement
1221 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1032 }; 1222 };
1223 } else {
1224 return 0;
1225 }
1226
1033 } 1227 1
1034} 1228}
1035 1229
1036sub button_up { 1230sub invoke_button_up {
1037 my ($self, $ev, $x, $y) = @_; 1231 my ($self, $ev, $x, $y) = @_;
1038 1232
1039 delete $self->{motion}; 1233 ! ! delete $self->{motion}
1040} 1234}
1041 1235
1042sub mouse_motion { 1236sub invoke_mouse_motion {
1043 my ($self, $ev, $x, $y) = @_; 1237 my ($self, $ev, $x, $y) = @_;
1044 1238
1045 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1239 $self->{motion}->($ev, $x, $y) if $self->{motion};
1240
1241 ! ! $self->{motion}
1046} 1242}
1047 1243
1048sub _draw { 1244sub _draw {
1049 my ($self) = @_; 1245 my ($self) = @_;
1050 1246
1247 my $child = $self->{children}[0];
1248
1051 my ($w, $h ) = ($self->{w}, $self->{h}); 1249 my ($w, $h ) = ($self->{w}, $self->{h});
1052 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1250 my ($cw, $ch) = ($child->{w}, $child->{h});
1053 1251
1054 glEnable GL_TEXTURE_2D; 1252 glEnable GL_TEXTURE_2D;
1055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1253 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056 1254
1057 my $border = $self->border; 1255 my $border = $self->border;
1058 1256
1059 glColor @{ $self->{border_bg} }; 1257 glColor @{ $self->{border_bg} };
1060 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1258 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1061 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1259 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1260 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1261 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064 1262
1065 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1263 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066 my $bg = $tex[0]; 1264 glColor @{ $self->{bg} };
1067 1265
1068 # TODO: repeat texture not scale 1266 # TODO: repeat texture not scale
1267 # solve this better(?)
1069 my $rep_x = $cw / $bg->{w}; 1268 $bg->{s} = $cw / $bg->{w};
1070 my $rep_y = $ch / $bg->{h}; 1269 $bg->{t} = $ch / $bg->{h};
1071
1072 glColor @{ $self->{bg} };
1073
1074 $bg->{s} = $rep_x;
1075 $bg->{t} = $rep_y;
1076 $bg->{wrap_mode} = 1;
1077 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1270 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078 } 1271 }
1079 1272
1080 glDisable GL_TEXTURE_2D; 1273 glDisable GL_TEXTURE_2D;
1081 1274
1082 $self->{title}->draw if $self->{title};
1083
1084 $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};
1085} 1286}
1086 1287
1087############################################################################# 1288#############################################################################
1088 1289
1089package CFClient::UI::Table; 1290package CFClient::UI::Table;
… …
1101 col_expand => [], 1302 col_expand => [],
1102 @_, 1303 @_,
1103 ) 1304 )
1104} 1305}
1105 1306
1307sub children {
1308 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1309}
1310
1106sub add { 1311sub add {
1107 my ($self, $x, $y, $child) = @_; 1312 my ($self, $x, $y, $child) = @_;
1108 1313
1109 $child->set_parent ($self); 1314 $child->set_parent ($self);
1110 $self->{children}[$y][$x] = $child; 1315 $self->{children}[$y][$x] = $child;
1111 1316
1112 $child->check_size; 1317 $self->realloc;
1113} 1318}
1114 1319
1115sub children { 1320sub remove {
1116 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1321 my ($self, $child) = @_;
1117}
1118 1322
1323 # TODO: not yet implemented
1324}
1325
1119# 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?
1120sub clear { 1327sub clear {
1121 my ($self) = @_; 1328 my ($self) = @_;
1122 1329
1123 my @children = $self->children; 1330 my @children = $self->children;
1124 delete $self->{children}; 1331 delete $self->{children};
… …
1126 for (@children) { 1333 for (@children) {
1127 delete $_->{parent}; 1334 delete $_->{parent};
1128 $_->hide; 1335 $_->hide;
1129 } 1336 }
1130 1337
1131 $self->update; 1338 $self->realloc;
1132} 1339}
1133 1340
1134sub get_wh { 1341sub get_wh {
1135 my ($self) = @_; 1342 my ($self) = @_;
1136 1343
… …
1162 (sum @$ws), 1369 (sum @$ws),
1163 (sum @$hs), 1370 (sum @$hs),
1164 ) 1371 )
1165} 1372}
1166 1373
1167sub size_allocate { 1374sub invoke_size_allocate {
1168 my ($self, $w, $h) = @_; 1375 my ($self, $w, $h) = @_;
1169 1376
1170 my ($ws, $hs) = $self->get_wh; 1377 my ($ws, $hs) = $self->get_wh;
1171 1378
1172 my $req_w = sum @$ws; 1379 my $req_w = (sum @$ws) || 1;
1173 my $req_h = sum @$hs; 1380 my $req_h = (sum @$hs) || 1;
1174 1381
1175 # TODO: nicer code && do row_expand 1382 # TODO: nicer code && do row_expand
1176 my @col_expand = @{$self->{col_expand}}; 1383 my @col_expand = @{$self->{col_expand}};
1177 @col_expand = (1) x @$ws unless @col_expand; 1384 @col_expand = (1) x @$ws unless @col_expand;
1178 my $col_expand = (sum @col_expand) || 1; 1385 my $col_expand = (sum @col_expand) || 1;
… …
1204 } 1411 }
1205 1412
1206 $y += $row_h; 1413 $y += $row_h;
1207 } 1414 }
1208 1415
1416 1
1209} 1417}
1210 1418
1211sub find_widget { 1419sub find_widget {
1212 my ($self, $x, $y) = @_; 1420 my ($self, $x, $y) = @_;
1213 1421
… …
1232 } 1440 }
1233} 1441}
1234 1442
1235############################################################################# 1443#############################################################################
1236 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
1237package CFClient::UI::HBox; 1505package CFClient::UI::HBox;
1238 1506
1239# TODO: wrap into common Box base class
1240
1241our @ISA = CFClient::UI::Container::; 1507our @ISA = CFClient::UI::Box::;
1242 1508
1243sub size_request { 1509sub new {
1244 my ($self) = @_; 1510 my $class = shift;
1245 1511
1246 my @alloc = map [$_->size_request], @{$self->{children}}; 1512 $class->SUPER::new (
1247 1513 vertical => 0,
1248 ( 1514 @_,
1249 (List::Util::sum map $_->[0], @alloc),
1250 (List::Util::max map $_->[1], @alloc),
1251 ) 1515 )
1252} 1516}
1253 1517
1254sub size_allocate {
1255 my ($self, $w, $h) = @_;
1256
1257 ($h, $w) = ($w, $h);
1258
1259 my $children = $self->{children};
1260
1261 my @h = map $_->{req_w}, @$children;
1262
1263 my $req_h = List::Util::sum @h;
1264
1265 if ($req_h > $h) {
1266 # ah well, not enough space
1267 $_ *= $h / $req_h for @h;
1268 } else {
1269 my $exp = List::Util::sum map $_->{expand}, @$children;
1270 $exp ||= 1;
1271
1272 for (0 .. $#$children) {
1273 my $child = $children->[$_];
1274
1275 my $alloc_h = $h[$_];
1276 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1277 $h[$_] = $alloc_h;
1278 }
1279 }
1280
1281 CFClient::UI::harmonize \@h;
1282
1283 my $y = 0;
1284 for (0 .. $#$children) {
1285 my $child = $children->[$_];
1286 my $h = $h[$_];
1287 $child->configure ($y, 0, $h, $w);
1288
1289 $y += $h;
1290 }
1291
1292 1
1293}
1294
1295############################################################################# 1518#############################################################################
1296 1519
1297package CFClient::UI::VBox; 1520package CFClient::UI::VBox;
1298 1521
1299# TODO: wrap into common Box base class
1300
1301our @ISA = CFClient::UI::Container::; 1522our @ISA = CFClient::UI::Box::;
1302 1523
1303sub size_request { 1524sub new {
1304 my ($self) = @_; 1525 my $class = shift;
1305 1526
1306 my @alloc = map [$_->size_request], @{$self->{children}}; 1527 $class->SUPER::new (
1307 1528 vertical => 1,
1308 ( 1529 @_,
1309 (List::Util::max map $_->[0], @alloc),
1310 (List::Util::sum map $_->[1], @alloc),
1311 ) 1530 )
1312}
1313
1314sub size_allocate {
1315 my ($self, $w, $h) = @_;
1316
1317 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
1319 my $children = $self->{children};
1320
1321 my @h = map $_->{req_h}, @$children;
1322
1323 my $req_h = List::Util::sum @h;
1324
1325 if ($req_h > $h) {
1326 # ah well, not enough space
1327 $_ *= $h / $req_h for @h;
1328 } else {
1329 my $exp = List::Util::sum map $_->{expand}, @$children;
1330 $exp ||= 1;
1331
1332 for (0 .. $#$children) {
1333 my $child = $children->[$_];
1334
1335 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1336 }
1337 }
1338
1339 CFClient::UI::harmonize \@h;
1340
1341 my $y = 0;
1342 for (0 .. $#$children) {
1343 my $child = $children->[$_];
1344 my $h = $h[$_];
1345 $child->configure (0, $y, $w, $h);
1346
1347 $y += $h;
1348 }
1349
1350 1
1351} 1531}
1352 1532
1353############################################################################# 1533#############################################################################
1354 1534
1355package CFClient::UI::Label; 1535package CFClient::UI::Label;
… …
1372 ellipsise => 3, # end 1552 ellipsise => 3, # end
1373 layout => (new CFClient::Layout), 1553 layout => (new CFClient::Layout),
1374 fontsize => 1, 1554 fontsize => 1,
1375 align => -1, 1555 align => -1,
1376 valign => -1, 1556 valign => -1,
1377 padding => 2, 1557 padding_x => 2,
1558 padding_y => 2,
1378 can_events => 0, 1559 can_events => 0,
1379 %arg 1560 %arg
1380 ); 1561 );
1381 1562
1382 if (exists $self->{template}) { 1563 if (exists $self->{template}) {
… …
1409 1590
1410 delete $self->{texture}; 1591 delete $self->{texture};
1411 $self->SUPER::update; 1592 $self->SUPER::update;
1412} 1593}
1413 1594
1595sub realloc {
1596 my ($self) = @_;
1597
1598 delete $self->{ox};
1599 $self->SUPER::realloc;
1600}
1601
1414sub set_text { 1602sub set_text {
1415 my ($self, $text) = @_; 1603 my ($self, $text) = @_;
1416 1604
1417 return if $self->{text} eq "T$text"; 1605 return if $self->{text} eq "T$text";
1418 $self->{text} = "T$text"; 1606 $self->{text} = "T$text";
1419 1607
1420 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1421 $self->{layout}->set_text ($text); 1608 $self->{layout}->set_text ($text);
1422 1609
1610 delete $self->{size_req};
1611 $self->realloc;
1423 $self->update; 1612 $self->update;
1424 $self->check_size;
1425} 1613}
1426 1614
1427sub set_markup { 1615sub set_markup {
1428 my ($self, $markup) = @_; 1616 my ($self, $markup) = @_;
1429 1617
1430 return if $self->{text} eq "M$markup"; 1618 return if $self->{text} eq "M$markup";
1431 $self->{text} = "M$markup"; 1619 $self->{text} = "M$markup";
1432 1620
1433 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1621 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434 1622
1435 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1436 $self->{layout}->set_markup ($markup); 1623 $self->{layout}->set_markup ($markup);
1437 1624
1625 delete $self->{size_req};
1626 $self->realloc;
1438 $self->update; 1627 $self->update;
1439 $self->check_size;
1440} 1628}
1441 1629
1442sub size_request { 1630sub size_request {
1443 my ($self) = @_; 1631 my ($self) = @_;
1444 1632
1633 $self->{size_req} ||= do {
1445 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1634 $self->{layout}->set_font ($self->{font}) if $self->{font};
1446 $self->{layout}->set_width ($self->{max_w} || -1); 1635 $self->{layout}->set_width ($self->{max_w} || -1);
1447 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1448 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1449 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1450 1639
1451 my ($w, $h) = $self->{layout}->size; 1640 my ($w, $h) = $self->{layout}->size;
1452 1641
1453 if (exists $self->{template}) { 1642 if (exists $self->{template}) {
1454 $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);
1455 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1645 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1456 1646
1457 my ($w2, $h2) = $self->{template}->size; 1647 my ($w2, $h2) = $self->{template}->size;
1458 1648
1459 $w = List::Util::max $w, $w2; 1649 $w = List::Util::max $w, $w2;
1460 $h = List::Util::max $h, $h2; 1650 $h = List::Util::max $h, $h2;
1651 }
1652
1653 [$w, $h]
1461 } 1654 };
1462 1655
1463 ( 1656 @{ $self->{size_req} }
1464 $w + $self->{padding} * 2,
1465 $h + $self->{padding} * 2,
1466 )
1467} 1657}
1468 1658
1659sub baseline_shift {
1660 $_[0]{layout}->descent
1661}
1662
1469sub size_allocate { 1663sub invoke_size_allocate {
1470 my ($self, $w, $h) = @_; 1664 my ($self, $w, $h) = @_;
1471 1665
1666 delete $self->{ox};
1667
1472 delete $self->{texture}; 1668 delete $self->{texture}
1669 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1670
1671 1
1473} 1672}
1474 1673
1475sub set_fontsize { 1674sub set_fontsize {
1476 my ($self, $fontsize) = @_; 1675 my ($self, $fontsize) = @_;
1477 1676
1478 $self->{fontsize} = $fontsize; 1677 $self->{fontsize} = $fontsize;
1678 delete $self->{size_req};
1479 delete $self->{texture}; 1679 delete $self->{texture};
1480 1680
1481 $self->update; 1681 $self->realloc;
1482 $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;
1483} 1691}
1484 1692
1485sub _draw { 1693sub _draw {
1486 my ($self) = @_; 1694 my ($self) = @_;
1487 1695
1488 $self->SUPER::_draw; # draw background, if applicable 1696 $self->SUPER::_draw; # draw background, if applicable
1489 1697
1490 my $tex = $self->{texture} ||= do { 1698 my $size = $self->{texture} ||= do {
1491 $self->{layout}->set_foreground (@{$self->{fg}}); 1699 $self->{layout}->set_foreground (@{$self->{fg}});
1492 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1700 $self->{layout}->set_font ($self->{font}) if $self->{font};
1493 $self->{layout}->set_width ($self->{w}); 1701 $self->{layout}->set_width ($self->{w});
1494 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1702 $self->{layout}->set_ellipsise ($self->{ellipsise});
1495 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1703 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1704 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497 1705
1498 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1706 [$self->{layout}->size]
1499
1500 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1501 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1502 : ($self->{w} - $tex->{w}) * 0.5);
1503
1504 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1505 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1506 : ($self->{h} - $tex->{h}) * 0.5);
1507
1508 $tex
1509 }; 1707 };
1510 1708
1511 glEnable GL_TEXTURE_2D; 1709 unless (exists $self->{ox}) {
1512 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);
1513 1713
1514 if ($tex->{format} == GL_ALPHA) { 1714 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1515 glColor @{$self->{fg}}; 1715 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1516 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1716 : ($self->{h} - $size->[1]) * 0.5);
1517 } else {
1518 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1519 } 1717 };
1520 1718
1521 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});
1522} 1723}
1523 1724
1524############################################################################# 1725#############################################################################
1525 1726
1526package CFClient::UI::EntryBase; 1727package CFClient::UI::EntryBase;
… …
1540 can_hover => 1, 1741 can_hover => 1,
1541 can_focus => 1, 1742 can_focus => 1,
1542 valign => 0, 1743 valign => 0,
1543 can_events => 1, 1744 can_events => 1,
1544 #text => ... 1745 #text => ...
1746 #hidden => "*",
1545 @_ 1747 @_
1546 ) 1748 )
1547} 1749}
1548 1750
1549sub _set_text { 1751sub _set_text {
… …
1551 1753
1552 delete $self->{cur_h}; 1754 delete $self->{cur_h};
1553 1755
1554 return if $self->{text} eq $text; 1756 return if $self->{text} eq $text;
1555 1757
1556 delete $self->{texture};
1557
1558 $self->{last_activity} = $::NOW; 1758 $self->{last_activity} = $::NOW;
1559 $self->{text} = $text; 1759 $self->{text} = $text;
1560 1760
1561 $text =~ s/./*/g if $self->{hidden}; 1761 $text =~ s/./*/g if $self->{hidden};
1562 $self->{layout}->set_text ("$text "); 1762 $self->{layout}->set_text ("$text ");
1763 delete $self->{size_req};
1563 1764
1564 $self->_emit (changed => $self->{text}); 1765 $self->emit (changed => $self->{text});
1766
1767 $self->realloc;
1768 $self->update;
1565} 1769}
1566 1770
1567sub set_text { 1771sub set_text {
1568 my ($self, $text) = @_; 1772 my ($self, $text) = @_;
1569 1773
1570 $self->{cursor} = length $text; 1774 $self->{cursor} = length $text;
1571 $self->_set_text ($text); 1775 $self->_set_text ($text);
1572 $self->update;
1573 $self->check_size;
1574} 1776}
1575 1777
1576sub get_text { 1778sub get_text {
1577 $_[0]{text} 1779 $_[0]{text}
1578} 1780}
… …
1583 my ($w, $h) = $self->SUPER::size_request; 1785 my ($w, $h) = $self->SUPER::size_request;
1584 1786
1585 ($w + 1, $h) # add 1 for cursor 1787 ($w + 1, $h) # add 1 for cursor
1586} 1788}
1587 1789
1588sub key_down { 1790sub invoke_key_down {
1589 my ($self, $ev) = @_; 1791 my ($self, $ev) = @_;
1590 1792
1591 my $mod = $ev->{mod}; 1793 my $mod = $ev->{mod};
1592 my $sym = $ev->{sym}; 1794 my $sym = $ev->{sym};
1593 my $uni = $ev->{unicode}; 1795 my $uni = $ev->{unicode};
… …
1605 } elsif ($sym == CFClient::SDLK_HOME) { 1807 } elsif ($sym == CFClient::SDLK_HOME) {
1606 $self->{cursor} = 0; 1808 $self->{cursor} = 0;
1607 } elsif ($sym == CFClient::SDLK_END) { 1809 } elsif ($sym == CFClient::SDLK_END) {
1608 $self->{cursor} = length $text; 1810 $self->{cursor} = length $text;
1609 } elsif ($uni == 27) { 1811 } elsif ($uni == 27) {
1610 $self->_emit ('escape'); 1812 $self->emit ('escape');
1611 } elsif ($uni) { 1813 } elsif ($uni) {
1612 substr $text, $self->{cursor}++, 0, chr $uni; 1814 substr $text, $self->{cursor}++, 0, chr $uni;
1815 } else {
1816 return 0;
1613 } 1817 }
1614 1818
1615 $self->_set_text ($text); 1819 $self->_set_text ($text);
1616 $self->update;
1617 $self->check_size;
1618}
1619 1820
1821 $self->realloc;
1822
1823 1
1824}
1825
1620sub focus_in { 1826sub invoke_focus_in {
1621 my ($self) = @_; 1827 my ($self) = @_;
1622 1828
1623 $self->{last_activity} = $::NOW; 1829 $self->{last_activity} = $::NOW;
1624 1830
1625 $self->SUPER::focus_in; 1831 $self->SUPER::invoke_focus_in
1626} 1832}
1627 1833
1628sub button_down { 1834sub invoke_button_down {
1629 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1630 1836
1631 $self->SUPER::button_down ($ev, $x, $y); 1837 $self->SUPER::invoke_button_down ($ev, $x, $y);
1632 1838
1633 my $idx = $self->{layout}->xy_to_index ($x, $y); 1839 my $idx = $self->{layout}->xy_to_index ($x, $y);
1634 1840
1635 # byte-index to char-index 1841 # byte-index to char-index
1636 my $text = $self->{text}; 1842 my $text = $self->{text};
1637 utf8::encode $text; 1843 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1638 $self->{cursor} = length substr $text, 0, $idx; 1844 $self->{cursor} = length $text;
1639 1845
1640 $self->_set_text ($self->{text}); 1846 $self->_set_text ($self->{text});
1641 $self->update; 1847 $self->update;
1848
1849 1
1642} 1850}
1643 1851
1644sub mouse_motion { 1852sub invoke_mouse_motion {
1645 my ($self, $ev, $x, $y) = @_; 1853 my ($self, $ev, $x, $y) = @_;
1646# 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
1647} 1857}
1648 1858
1649sub _draw { 1859sub _draw {
1650 my ($self) = @_; 1860 my ($self) = @_;
1651 1861
1652 local $self->{fg} = $self->{fg}; 1862 local $self->{fg} = $self->{fg};
1653 1863
1654 if ($FOCUS == $self) { 1864 if ($FOCUS == $self) {
1655 glColor @{$self->{active_bg}}; 1865 glColor_premultiply @{$self->{active_bg}};
1656 $self->{fg} = $self->{active_fg}; 1866 $self->{fg} = $self->{active_fg};
1657 } else { 1867 } else {
1658 glColor @{$self->{bg}}; 1868 glColor_premultiply @{$self->{bg}};
1659 } 1869 }
1660 1870
1661 glEnable GL_BLEND; 1871 glEnable GL_BLEND;
1662 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1872 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1663 glBegin GL_QUADS; 1873 glBegin GL_QUADS;
1664 glVertex 0 , 0; 1874 glVertex 0 , 0;
1665 glVertex 0 , $self->{h}; 1875 glVertex 0 , $self->{h};
1666 glVertex $self->{w}, $self->{h}; 1876 glVertex $self->{w}, $self->{h};
1667 glVertex $self->{w}, 0; 1877 glVertex $self->{w}, 0;
… …
1692 1902
1693our @ISA = CFClient::UI::EntryBase::; 1903our @ISA = CFClient::UI::EntryBase::;
1694 1904
1695use CFClient::OpenGL; 1905use CFClient::OpenGL;
1696 1906
1697sub key_down { 1907sub invoke_key_down {
1698 my ($self, $ev) = @_; 1908 my ($self, $ev) = @_;
1699 1909
1700 my $sym = $ev->{sym}; 1910 my $sym = $ev->{sym};
1701 1911
1702 if ($sym == 13) { 1912 if ($sym == 13) {
1703 unshift @{$self->{history}}, 1913 unshift @{$self->{history}},
1704 my $txt = $self->get_text; 1914 my $txt = $self->get_text;
1915
1705 $self->{history_pointer} = -1; 1916 $self->{history_pointer} = -1;
1706 $self->{history_saveback} = ''; 1917 $self->{history_saveback} = '';
1707 $self->_emit (activate => $txt); 1918 $self->emit (activate => $txt);
1708 $self->update; 1919 $self->update;
1709 1920
1710 } elsif ($sym == CFClient::SDLK_UP) { 1921 } elsif ($sym == CFClient::SDLK_UP) {
1711 if ($self->{history_pointer} < 0) { 1922 if ($self->{history_pointer} < 0) {
1712 $self->{history_saveback} = $self->get_text; 1923 $self->{history_saveback} = $self->get_text;
… …
1728 } else { 1939 } else {
1729 $self->set_text ($self->{history_saveback}); 1940 $self->set_text ($self->{history_saveback});
1730 } 1941 }
1731 1942
1732 } else { 1943 } else {
1733 $self->SUPER::key_down ($ev); 1944 return $self->SUPER::invoke_key_down ($ev)
1945 }
1946
1734 } 1947 1
1735
1736} 1948}
1737 1949
1738############################################################################# 1950#############################################################################
1739 1951
1740package CFClient::UI::Button; 1952package CFClient::UI::Button;
… …
1749 1961
1750sub new { 1962sub new {
1751 my $class = shift; 1963 my $class = shift;
1752 1964
1753 $class->SUPER::new ( 1965 $class->SUPER::new (
1754 padding => 4, 1966 padding_x => 4,
1967 padding_y => 4,
1755 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1756 active_fg => [0, 0, 1], 1969 active_fg => [0, 0, 1],
1757 can_hover => 1, 1970 can_hover => 1,
1758 align => 0, 1971 align => 0,
1759 valign => 0, 1972 valign => 0,
1760 can_events => 1, 1973 can_events => 1,
1761 @_ 1974 @_
1762 ) 1975 )
1763} 1976}
1764 1977
1765sub activate { }
1766
1767sub button_up { 1978sub invoke_button_up {
1768 my ($self, $ev, $x, $y) = @_; 1979 my ($self, $ev, $x, $y) = @_;
1769 1980
1770 $self->emit ("activate") 1981 $self->emit ("activate")
1771 if $x >= 0 && $x < $self->{w} 1982 if $x >= 0 && $x < $self->{w}
1772 && $y >= 0 && $y < $self->{h}; 1983 && $y >= 0 && $y < $self->{h};
1984
1985 1
1773} 1986}
1774 1987
1775sub _draw { 1988sub _draw {
1776 my ($self) = @_; 1989 my ($self) = @_;
1777 1990
1778 local $self->{fg} = $self->{fg}; 1991 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1779
1780 if ($GRAB == $self) {
1781 $self->{fg} = $self->{active_fg};
1782 }
1783 1992
1784 glEnable GL_TEXTURE_2D; 1993 glEnable GL_TEXTURE_2D;
1785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1786 glColor 0, 0, 0, 1; 1995 glColor 0, 0, 0, 1;
1787 1996
… …
1792 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
1793} 2002}
1794 2003
1795############################################################################# 2004#############################################################################
1796 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
1797package CFClient::UI::CheckBox; 2042package CFClient::UI::CheckBox;
1798 2043
1799our @ISA = CFClient::UI::DrawBG::; 2044our @ISA = CFClient::UI::DrawBG::;
1800 2045
1801my @tex = 2046my @tex =
… …
1806 2051
1807sub new { 2052sub new {
1808 my $class = shift; 2053 my $class = shift;
1809 2054
1810 $class->SUPER::new ( 2055 $class->SUPER::new (
1811 padding => 2, 2056 padding_x => 2,
2057 padding_y => 2,
1812 fg => [1, 1, 1], 2058 fg => [1, 1, 1],
1813 active_fg => [1, 1, 0], 2059 active_fg => [1, 1, 0],
1814 bg => [0, 0, 0, 0.2], 2060 bg => [0, 0, 0, 0.2],
1815 active_bg => [1, 1, 1, 0.5], 2061 active_bg => [1, 1, 1, 0.5],
1816 state => 0, 2062 state => 0,
… …
1820} 2066}
1821 2067
1822sub size_request { 2068sub size_request {
1823 my ($self) = @_; 2069 my ($self) = @_;
1824 2070
1825 ($self->{padding} * 2 + 6) x 2 2071 (6) x 2
1826} 2072}
1827 2073
2074sub toggle {
2075 my ($self) = @_;
2076
2077 $self->{state} = !$self->{state};
2078 $self->emit (changed => $self->{state});
2079 $self->update;
2080}
2081
1828sub button_down { 2082sub invoke_button_down {
1829 my ($self, $ev, $x, $y) = @_; 2083 my ($self, $ev, $x, $y) = @_;
1830 2084
1831 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2085 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1832 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2086 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1833 $self->{state} = !$self->{state}; 2087 $self->toggle;
1834 $self->_emit (changed => $self->{state}); 2088 } else {
2089 return 0
2090 }
2091
1835 } 2092 1
1836} 2093}
1837 2094
1838sub _draw { 2095sub _draw {
1839 my ($self) = @_; 2096 my ($self) = @_;
1840 2097
1841 $self->SUPER::_draw; 2098 $self->SUPER::_draw;
1842 2099
1843 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2100 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1844 2101
1845 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;
1846 2105
1847 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2106 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1848 2107
1849 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2108 my $tex = $self->{state} ? $tex[1] : $tex[0];
1850 2109
… …
1858package CFClient::UI::Image; 2117package CFClient::UI::Image;
1859 2118
1860our @ISA = CFClient::UI::Base::; 2119our @ISA = CFClient::UI::Base::;
1861 2120
1862use CFClient::OpenGL; 2121use CFClient::OpenGL;
1863use Carp qw/confess/;
1864 2122
1865our %loaded_images; 2123our %texture_cache;
1866 2124
1867sub new { 2125sub new {
1868 my $class = shift; 2126 my $class = shift;
1869 2127
1870 my $self = $class->SUPER::new (can_events => 0, @_); 2128 my $self = $class->SUPER::new (
2129 can_events => 0,
2130 @_,
2131 );
1871 2132
1872 $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";
1873 2135
1874 $loaded_images{$self->{image}} ||= 2136 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1875 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;
1876 2138
1877 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2139 Scalar::Util::weaken $texture_cache{$self->{path}};
1878 2140
1879 Scalar::Util::weaken $loaded_images{$self->{image}}; 2141 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1880
1881 $self->{aspect} = $tex->{w} / $tex->{h};
1882 2142
1883 $self 2143 $self
1884} 2144}
1885 2145
1886sub size_request { 2146sub size_request {
1887 my ($self) = @_; 2147 my ($self) = @_;
1888 2148
1889 ($self->{tex}->{w}, $self->{tex}->{h}) 2149 ($self->{tex}{w}, $self->{tex}{h})
1890} 2150}
1891 2151
1892sub _draw { 2152sub _draw {
1893 my ($self) = @_; 2153 my ($self) = @_;
1894 2154
… …
2003 my $ycut1 = max 0, min 1, $ycut; 2263 my $ycut1 = max 0, min 1, $ycut;
2004 my $ycut2 = max 0, min 1, $ycut - 1; 2264 my $ycut2 = max 0, min 1, $ycut - 1;
2005 2265
2006 my $h1 = $self->{h} * (1 - $ycut1); 2266 my $h1 = $self->{h} * (1 - $ycut1);
2007 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);
2008 2271
2009 glEnable GL_BLEND; 2272 glEnable GL_BLEND;
2010 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;
2011 glEnable GL_TEXTURE_2D; 2275 glEnable GL_TEXTURE_2D;
2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2276 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013 2277
2014 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2278 glBindTexture GL_TEXTURE_2D, $t1->{name};
2015 glBegin GL_QUADS; 2279 glBegin GL_QUADS;
… …
2030 2294
2031 if ($t3) { 2295 if ($t3) {
2032 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2296 glBindTexture GL_TEXTURE_2D, $t3->{name};
2033 glBegin GL_QUADS; 2297 glBegin GL_QUADS;
2034 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2298 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2035 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2299 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2036 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2300 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2037 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2301 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2038 glEnd; 2302 glEnd;
2039 } 2303 }
2040 2304
2041 glDisable GL_BLEND; 2305 glDisable GL_BLEND;
… …
2115 fg => [1, 1, 1], 2379 fg => [1, 1, 1],
2116 active_fg => [0, 0, 0], 2380 active_fg => [0, 0, 0],
2117 bg => [0, 0, 0, 0.2], 2381 bg => [0, 0, 0, 0.2],
2118 active_bg => [1, 1, 1, 0.5], 2382 active_bg => [1, 1, 1, 0.5],
2119 range => [0, 0, 100, 10, 0], 2383 range => [0, 0, 100, 10, 0],
2120 req_w => $::WIDTH / 80, 2384 min_w => $::WIDTH / 80,
2121 req_h => $::WIDTH / 80, 2385 min_h => $::WIDTH / 80,
2122 vertical => 0, 2386 vertical => 0,
2123 can_hover => 1, 2387 can_hover => 1,
2124 inner_pad => 0.02, 2388 inner_pad => 0.02,
2125 @_ 2389 @_
2126 ); 2390 );
… …
2132} 2396}
2133 2397
2134sub set_range { 2398sub set_range {
2135 my ($self, $range) = @_; 2399 my ($self, $range) = @_;
2136 2400
2137 $self->{range} = $range; 2401 ($range, $self->{range}) = ($self->{range}, $range);
2138 2402
2403 if ("@$range" ne "@{$self->{range}}") {
2139 $self->update; 2404 $self->update;
2405 $self->set_value ($self->{range}[0]);
2406 }
2140} 2407}
2141 2408
2142sub set_value { 2409sub set_value {
2143 my ($self, $value) = @_; 2410 my ($self, $value) = @_;
2144 2411
… …
2155 if $unit; 2422 if $unit;
2156 2423
2157 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2424 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2158 2425
2159 if ($value != $old_value) { 2426 if ($value != $old_value) {
2160 $self->_emit (changed => $value); 2427 $self->emit (changed => $value);
2161 $self->update; 2428 $self->update;
2162 } 2429 }
2163} 2430}
2164 2431
2165sub size_request { 2432sub size_request {
2166 my ($self) = @_; 2433 my ($self) = @_;
2167 2434
2168 my $w = $self->{req_w}; 2435 ($self->{req_w}, $self->{req_h})
2169 my $h = $self->{req_h};
2170
2171 $self->{vertical} ? ($h, $w) : ($w, $h)
2172} 2436}
2173 2437
2174sub button_down { 2438sub invoke_button_down {
2175 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2176 2440
2177 $self->SUPER::button_down ($ev, $x, $y); 2441 $self->SUPER::invoke_button_down ($ev, $x, $y);
2178 2442
2179 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2443 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2180 2444
2181 $self->mouse_motion ($ev, $x, $y); 2445 $self->invoke_mouse_motion ($ev, $x, $y)
2182} 2446}
2183 2447
2184sub mouse_motion { 2448sub invoke_mouse_motion {
2185 my ($self, $ev, $x, $y) = @_; 2449 my ($self, $ev, $x, $y) = @_;
2186 2450
2187 if ($GRAB == $self) { 2451 if ($GRAB == $self) {
2188 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2452 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2189 2453
2190 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2454 my (undef, $lo, $hi, $page) = @{$self->{range}};
2191 2455
2192 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2456 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2193 2457
2194 $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
2195 } 2463 1
2196} 2464}
2197 2465
2198sub update { 2466sub update {
2199 my ($self) = @_; 2467 my ($self) = @_;
2200 2468
2201 $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}) {
2202 $self->set_value ($self->{range}[0]); 2477 $self->set_value ($self->{range}[0]);
2203 2478
2204 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2479 my ($value, $lo, $hi, $page) = @{$self->{range}};
2205 my $range = ($hi - $page - $lo) || 1e-100; 2480 my $range = ($hi - $page - $lo) || 1e-100;
2206 2481
… …
2212 $value = ($value - $lo) / $range; 2487 $value = ($value - $lo) / $range;
2213 $value = $value * $self->{scale} + $self->{offset}; 2488 $value = $value * $self->{scale} + $self->{offset};
2214 2489
2215 $self->{knob_x} = $value - $knob_w * 0.5; 2490 $self->{knob_x} = $value - $knob_w * 0.5;
2216 $self->{knob_w} = $knob_w; 2491 $self->{knob_w} = $knob_w;
2217 }); 2492 }
2218
2219 $self->SUPER::update;
2220}
2221
2222sub _draw {
2223 my ($self) = @_;
2224 2493
2225 $self->SUPER::_draw (); 2494 $self->SUPER::_draw ();
2226 2495
2227 glScale $self->{w}, $self->{h}; 2496 glScale $self->{w}, $self->{h};
2228 2497
… …
2289sub set_range { shift->{slider}->set_range (@_) } 2558sub set_range { shift->{slider}->set_range (@_) }
2290sub set_value { shift->{slider}->set_value (@_) } 2559sub set_value { shift->{slider}->set_value (@_) }
2291 2560
2292############################################################################# 2561#############################################################################
2293 2562
2294package CFClient::UI::TextView; 2563package CFClient::UI::TextScroller;
2295 2564
2296our @ISA = CFClient::UI::HBox::; 2565our @ISA = CFClient::UI::HBox::;
2297 2566
2298use CFClient::OpenGL; 2567use CFClient::OpenGL;
2299 2568
… …
2301 my $class = shift; 2570 my $class = shift;
2302 2571
2303 my $self = $class->SUPER::new ( 2572 my $self = $class->SUPER::new (
2304 fontsize => 1, 2573 fontsize => 1,
2305 can_events => 0, 2574 can_events => 0,
2575 indent => 0,
2306 #font => default_font 2576 #font => default_font
2307 @_, 2577 @_,
2308 2578
2309 layout => (new CFClient::Layout 1), 2579 layout => (new CFClient::Layout),
2310 par => [], 2580 par => [],
2311 height => 0, 2581 height => 0,
2312 children => [ 2582 children => [
2313 (new CFClient::UI::Empty expand => 1), 2583 (new CFClient::UI::Empty expand => 1),
2314 (new CFClient::UI::Slider vertical => 1), 2584 (new CFClient::UI::Slider vertical => 1),
… …
2325 2595
2326 $self->{fontsize} = $fontsize; 2596 $self->{fontsize} = $fontsize;
2327 $self->reflow; 2597 $self->reflow;
2328} 2598}
2329 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
2330sub size_allocate { 2609sub invoke_size_allocate {
2331 my ($self, $w, $h) = @_; 2610 my ($self, $w, $h) = @_;
2332 2611
2333 $self->SUPER::size_allocate ($w, $h); 2612 my ($empty, $slider, @other) = @{ $self->{children} };
2613 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2334 2614
2335 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2615 $self->{layout}->set_font ($self->{font}) if $self->{font};
2336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2337 $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});
2338 2619
2339 $self->reflow; 2620 $self->reflow;
2340}
2341 2621
2342sub text_size { 2622 local $self->{children} = [$empty, $slider];
2343 my ($self, $text, $indent) = @_; 2623 $self->SUPER::invoke_size_allocate ($w, $h)
2624}
2625
2626sub get_layout {
2627 my ($self, $para) = @_;
2344 2628
2345 my $layout = $self->{layout}; 2629 my $layout = $self->{layout};
2346 2630
2631 $layout->set_font ($self->{font}) if $self->{font};
2632 $layout->set_foreground (@{$para->{fg}});
2347 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2633 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2348 $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});
2349 $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}}
2350 2642 );
2643
2351 $layout->size 2644 $layout
2352} 2645}
2353 2646
2354sub reflow { 2647sub reflow {
2355 my ($self) = @_; 2648 my ($self) = @_;
2356 2649
… …
2365 $self->{children}[1]->set_value ($offset); 2658 $self->{children}[1]->set_value ($offset);
2366} 2659}
2367 2660
2368sub clear { 2661sub clear {
2369 my ($self) = @_; 2662 my ($self) = @_;
2663
2664 my (undef, undef, @other) = @{ $self->{children} };
2665 $self->remove ($_) for @other;
2370 2666
2371 $self->{par} = []; 2667 $self->{par} = [];
2372 $self->{height} = 0; 2668 $self->{height} = 0;
2373 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2669 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2374} 2670}
2375 2671
2376sub add_paragraph { 2672sub add_paragraph {
2377 my ($self, $color, $text, $indent) = @_; 2673 my ($self, $color, $para, $indent) = @_;
2378 2674
2379 for my $line (split /\n/, $text) { 2675 my ($text, @w) = ref $para ? @$para : $para;
2380 my ($w, $h) = $self->text_size ($line); 2676
2381 $self->{height} += $h; 2677 $para = {
2382 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,
2383 } 2684 };
2384 2685
2385 $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;
2386} 2698}
2387 2699
2388sub update { 2700sub update {
2389 my ($self) = @_; 2701 my ($self) = @_;
2390 2702
… …
2392 2704
2393 return unless $self->{h} > 0; 2705 return unless $self->{h} > 0;
2394 2706
2395 delete $self->{texture}; 2707 delete $self->{texture};
2396 2708
2397 $ROOT->on_post_alloc ($self, sub { 2709 $ROOT->on_post_alloc ($self => sub {
2398 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2710 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2399 2711
2400 if (delete $self->{need_reflow}) { 2712 if (delete $self->{need_reflow}) {
2401 my $height = 0; 2713 my $height = 0;
2402 2714
2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406
2407 for (@{$self->{par}}) { 2715 for my $para (@{$self->{par}}) {
2408 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2716 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2409 $layout->set_width ($W - $_->[3]); 2717 my $layout = $self->get_layout ($para);
2410 $layout->set_markup ($_->[4]);
2411 my ($w, $h) = $layout->size; 2718 my ($w, $h) = $layout->size;
2412 $_->[0] = $w + $_->[3]; 2719
2413 $_->[1] = $h; 2720 $para->{w} = $w + $para->{indent};
2721 $para->{h} = $h;
2722 $para->{wrapped} = $layout->has_wrapped;
2414 } 2723 }
2415 2724
2416 $height += $_->[1]; 2725 $height += $para->{h};
2417 } 2726 }
2418 2727
2419 $self->{height} = $height; 2728 $self->{height} = $height;
2420 2729
2421 $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]);
2422 2731
2423 delete $self->{texture}; 2732 delete $self->{texture};
2424 } 2733 }
2425 2734
2735 if (delete $self->{scroll_to_bottom}) {
2736 $self->{children}[1]->set_value (1e10);
2737 }
2738
2426 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2739 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2427 glClearColor 0.5, 0.5, 0.5, 0; 2740 glClearColor 0, 0, 0, 0;
2428 glClear GL_COLOR_BUFFER_BIT; 2741 glClear GL_COLOR_BUFFER_BIT;
2429 2742
2430 my $top = int $self->{children}[1]{range}[0]; 2743 my $top = int $self->{children}[1]{range}[0];
2431 2744
2432 my $y0 = $top; 2745 my $y0 = $top;
2433 my $y1 = $top + $H; 2746 my $y1 = $top + $H;
2434 2747
2435 my $y = 0; 2748 my $y = 0;
2436 2749
2437 my $layout = $self->{layout};
2438
2439 $layout->set_font ($self->{font}) if $self->{font};
2440
2441 glEnable GL_BLEND;
2442 #TODO# not correct in windows where rgba is forced off
2443 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2444
2445 for my $par (@{$self->{par}}) { 2750 for my $para (@{$self->{par}}) {
2446 my $h = $par->[1]; 2751 my $h = $para->{h};
2447 2752
2448 if ($y0 < $y + $h && $y < $y1) { 2753 if ($y0 < $y + $h && $y < $y1) {
2449 $layout->set_foreground (@{ $par->[2] });
2450 $layout->set_width ($W - $par->[3]);
2451 $layout->set_markup ($par->[4]);
2452 2754
2453 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2755 my $layout = $self->get_layout ($para);
2454 2756
2455 glRasterPos $par->[3], $y - $y0; 2757 $layout->render ($para->{indent}, $y - $y0);
2456 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 }
2457 } 2771 }
2458 2772
2459 $y += $h; 2773 $y += $h;
2460 } 2774 }
2461
2462 glDisable GL_BLEND;
2463 }; 2775 };
2464 }); 2776 });
2465} 2777}
2466 2778
2779sub reconfigure {
2780 my ($self) = @_;
2781
2782 $self->SUPER::reconfigure;
2783
2784 $_->{w} = 1e10 for @{ $self->{par} };
2785 $self->reflow;
2786}
2787
2467sub _draw { 2788sub _draw {
2468 my ($self) = @_; 2789 my ($self) = @_;
2469 2790
2470 glEnable GL_TEXTURE_2D; 2791 glEnable GL_TEXTURE_2D;
2471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2472 glColor 1, 1, 1, 1; 2793 glColor 0, 0, 0, 1;
2473 $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});
2474 glDisable GL_TEXTURE_2D; 2795 glDisable GL_TEXTURE_2D;
2475 2796
2476 $self->{children}[1]->draw; 2797 $self->{children}[1]->draw;
2477
2478} 2798}
2479 2799
2480############################################################################# 2800#############################################################################
2481 2801
2482package CFClient::UI::Animator; 2802package CFClient::UI::Animator;
… …
2527 2847
2528sub new { 2848sub new {
2529 my $class = shift; 2849 my $class = shift;
2530 2850
2531 my $self = $class->SUPER::new ( 2851 my $self = $class->SUPER::new (
2532 state => 0, 2852 state => 0,
2533 connect_activate => \&toggle_flopper, 2853 on_activate => \&toggle_flopper,
2534 @_ 2854 @_
2535 ); 2855 );
2536 2856
2537 if ($self->{state}) {
2538 $self->{state} = 0;
2539 $self->toggle_flopper;
2540 }
2541
2542 $self 2857 $self
2543} 2858}
2544 2859
2545sub toggle_flopper { 2860sub toggle_flopper {
2546 my ($self) = @_; 2861 my ($self) = @_;
2547 2862
2548 # TODO: use animation 2863 $self->{other}->toggle_visibility;
2549 if ($self->{state} = !$self->{state}) {
2550 $CFClient::UI::ROOT->add ($self->{other});
2551 $self->{other}->move ($self->coord2global (0, $self->{h}));
2552 $self->_emit ("open");
2553 } else {
2554 $CFClient::UI::ROOT->remove ($self->{other});
2555 $self->_emit ("close");
2556 }
2557
2558 $self->_emit (changed => $self->{state});
2559} 2864}
2560 2865
2561############################################################################# 2866#############################################################################
2562 2867
2563package CFClient::UI::Tooltip; 2868package CFClient::UI::Tooltip;
… …
2576} 2881}
2577 2882
2578sub set_tooltip_from { 2883sub set_tooltip_from {
2579 my ($self, $widget) = @_; 2884 my ($self, $widget) = @_;
2580 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
2581 $self->add (new CFClient::UI::Label 2898 $self->add (new CFClient::UI::Label
2582 markup => $widget->{tooltip}, 2899 markup => $tooltip,
2583 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2900 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2584 fontsize => 0.8, 2901 fontsize => 0.8,
2585 fg => [0, 0, 0, 1], 2902 fg => [0, 0, 0, 1],
2586 ellipsise => 0, 2903 ellipsise => 0,
2587 font => ($widget->{tooltip_font} || $::FONT_PROP), 2904 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2594 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2911 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2595 2912
2596 ($w + 4, $h + 4) 2913 ($w + 4, $h + 4)
2597} 2914}
2598 2915
2599sub size_allocate { 2916sub invoke_size_allocate {
2600 my ($self, $w, $h) = @_; 2917 my ($self, $w, $h) = @_;
2601 2918
2602 $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 });
2603} 2938}
2604 2939
2605sub _draw { 2940sub _draw {
2606 my ($self) = @_; 2941 my ($self) = @_;
2607 2942
… …
2624 glVertex $w, $h; 2959 glVertex $w, $h;
2625 glVertex $w, 0; 2960 glVertex $w, 0;
2626 glEnd; 2961 glEnd;
2627 2962
2628 glTranslate 2 - 0.375, 2 - 0.375; 2963 glTranslate 2 - 0.375, 2 - 0.375;
2964
2629 $self->SUPER::_draw; 2965 $self->SUPER::_draw;
2630} 2966}
2631 2967
2632############################################################################# 2968#############################################################################
2633 2969
… …
2692 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3028 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2693 3029
2694 if ($tex) { 3030 if ($tex) {
2695 glEnable GL_TEXTURE_2D; 3031 glEnable GL_TEXTURE_2D;
2696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3032 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2697 glColor 1, 1, 1, 1; 3033 glColor 0, 0, 0, 1;
2698 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3034 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2699 glDisable GL_TEXTURE_2D; 3035 glDisable GL_TEXTURE_2D;
2700 } 3036 }
2701} 3037}
2702 3038
2703sub DESTROY { 3039sub destroy {
2704 my ($self) = @_; 3040 my ($self) = @_;
2705 3041
2706 $self->{timer}->cancel 3042 $self->{timer}->cancel
2707 if $self->{timer}; 3043 if $self->{timer};
2708 3044
2709 $self->SUPER::DESTROY; 3045 $self->SUPER::destroy;
2710} 3046}
2711 3047
2712############################################################################# 3048#############################################################################
2713 3049
2714package CFClient::UI::InventoryItem; 3050package CFClient::UI::Buttonbar;
2715 3051
2716our @ISA = CFClient::UI::HBox::; 3052our @ISA = CFClient::UI::HBox::;
2717 3053
2718sub new { 3054# TODO: should actualyl wrap buttons and other goodies.
2719 my $class = shift;
2720
2721 my %args = @_;
2722
2723 my $item = delete $args{item};
2724
2725 my $desc = CFClient::Item::desc_string $item;
2726
2727 my $self = $class->SUPER::new (
2728 can_hover => 1,
2729 can_events => 1,
2730 tooltip => ((CFClient::UI::Label::escape $desc)
2731 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2732 connect_button_down => sub {
2733 my ($self, $ev, $x, $y) = @_;
2734
2735 # todo: maybe put examine on 1? but should just be a tooltip :(
2736 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2737 my $targ = $::CONN->{player}{tag};
2738
2739 if ($item->{container} == $::CONN->{player}{tag}) {
2740 $targ = $main::OPENCONT;
2741 }
2742
2743 $::CONN->send ("move $targ $item->{tag} 0");
2744 } elsif ($ev->{button} == 1) {
2745 $::CONN->send ("examine $item->{tag}");
2746 } elsif ($ev->{button} == 2) {
2747 $::CONN->send ("apply $item->{tag}");
2748 } elsif ($ev->{button} == 3) {
2749 my @menu_items = (
2750 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2751 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2752 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2753 (
2754 $item->{flags} & Crossfire::Protocol::F_LOCKED
2755 ? (
2756 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2757 )
2758 : (
2759 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2760 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2761 )
2762 ),
2763 );
2764
2765 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2766 }
2767
2768 1
2769 },
2770 %args
2771 );
2772
2773
2774 $self->add (new CFClient::UI::Face
2775 can_events => 0,
2776 face => $item->{face},
2777 anim => $item->{anim},
2778 animspeed => $item->{animspeed},
2779 );
2780
2781 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2782
2783 $self->{item} = $item;
2784
2785 $self->update_item;
2786
2787 $self
2788}
2789
2790sub update_item {
2791 my ($self) = @_;
2792
2793 my $desc = CFClient::Item::desc_string ($self->{item});
2794
2795 $self->{name_lbl}->set_text ($desc);
2796}
2797
2798#############################################################################
2799
2800package CFClient::UI::Inventory;
2801
2802our @ISA = CFClient::UI::ScrolledWindow::;
2803
2804sub new {
2805 my $class = shift;
2806
2807 my $self = $class->SUPER::new (
2808 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2809 @_,
2810 );
2811
2812 $self
2813}
2814
2815sub set_items {
2816 my ($self, $items) = @_;
2817
2818 $self->{scrolled}->clear;
2819 return unless $items;
2820
2821 my @items = sort {
2822 ($a->{type} <=> $b->{type})
2823 or ($a->{name} cmp $b->{name})
2824 } @$items;
2825
2826 $self->{real_items} = \@items;
2827
2828 my $row = 0;
2829 for my $item (@items) {
2830 CFClient::Item::update_widgets $item;
2831
2832 $self->{scrolled}->add (0, $row, $item->{face_widget});
2833 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2834 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2835
2836 $row++;
2837 }
2838
2839# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2840}
2841
2842sub size_request {
2843 my ($self) = @_;
2844 ($self->{req_w}, $self->{req_h});
2845}
2846 3055
2847############################################################################# 3056#############################################################################
2848 3057
2849package CFClient::UI::Menu; 3058package CFClient::UI::Menu;
2850 3059
… …
2862 ); 3071 );
2863 3072
2864 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3073 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2865 3074
2866 for my $item (@{ $self->{items} }) { 3075 for my $item (@{ $self->{items} }) {
2867 my ($widget, $cb) = @$item; 3076 my ($widget, $cb, $tooltip) = @$item;
2868 3077
2869 # handle various types of items, only text for now 3078 # handle various types of items, only text for now
2870 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 {
2871 $widget = new CFClient::UI::Label 3094 $widget = new CFClient::UI::Label
2872 can_hover => 1, 3095 can_hover => 1,
2873 can_events => 1, 3096 can_events => 1,
2874 text => $widget; 3097 markup => $widget,
3098 tooltip => $tooltip;
3099 }
2875 } 3100 }
2876 3101
2877 $self->{item}{$widget} = $item; 3102 $self->{item}{$widget} = $item;
2878 3103
2879 $self->{vbox}->add ($widget); 3104 $self->{vbox}->add ($widget);
… …
2884 3109
2885# 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)
2886sub popup { 3111sub popup {
2887 my ($self, $ev) = @_; 3112 my ($self, $ev) = @_;
2888 3113
2889 $self->_emit ("popdown"); 3114 $self->emit ("popdown");
2890 3115
2891 # maybe save $GRAB? must be careful about events... 3116 # maybe save $GRAB? must be careful about events...
2892 $GRAB = $self; 3117 $GRAB = $self;
2893 $self->{button} = $ev->{button}; 3118 $self->{button} = $ev->{button};
2894 3119
2895 $self->show; 3120 $self->show;
2896 $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);
2897} 3122}
2898 3123
2899sub mouse_motion { 3124sub invoke_mouse_motion {
2900 my ($self, $ev, $x, $y) = @_; 3125 my ($self, $ev, $x, $y) = @_;
2901 3126
2902 # TODO: should use vbox->find_widget or so 3127 # TODO: should use vbox->find_widget or so
2903 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3128 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2904 $self->{hover} = $self->{item}{$HOVER}; 3129 $self->{hover} = $self->{item}{$HOVER};
2905}
2906 3130
3131 0
3132}
3133
2907sub button_up { 3134sub invoke_button_up {
2908 my ($self, $ev, $x, $y) = @_; 3135 my ($self, $ev, $x, $y) = @_;
2909 3136
2910 if ($ev->{button} == $self->{button}) { 3137 if ($ev->{button} == $self->{button}) {
2911 undef $GRAB; 3138 undef $GRAB;
2912 $self->hide; 3139 $self->hide;
2913 3140
2914 $self->_emit ("popdown"); 3141 $self->emit ("popdown");
2915 $self->{hover}[1]->() if $self->{hover}; 3142 $self->{hover}[1]->() if $self->{hover};
3143 } else {
3144 return 0
3145 }
3146
2916 } 3147 1
2917} 3148}
2918 3149
2919############################################################################# 3150#############################################################################
2920 3151
2921package CFClient::UI::Statusbox; 3152package CFClient::UI::Multiplexer;
2922 3153
2923our @ISA = CFClient::UI::VBox::; 3154our @ISA = CFClient::UI::Container::;
2924 3155
2925sub new { 3156sub new {
2926 my $class = shift; 3157 my $class = shift;
2927 3158
2928 $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 (
2929 fontsize => 0.8, 3338 fontsize => 0.8,
2930 @_, 3339 @_,
2931 ) 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
2932} 3347}
2933 3348
2934sub reorder { 3349sub reorder {
2935 my ($self) = @_; 3350 my ($self) = @_;
2936 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} };
2937 3357
2938 while (my ($k, $v) = each %{ $self->{item} }) { 3358 while (my ($k, $v) = each %{ $self->{item} }) {
2939 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3359 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2940 } 3360 }
2941 3361
… …
2944 my @items = sort { 3364 my @items = sort {
2945 $a->{pri} <=> $b->{pri} 3365 $a->{pri} <=> $b->{pri}
2946 or $b->{id} <=> $a->{id} 3366 or $b->{id} <=> $a->{id}
2947 } values %{ $self->{item} }; 3367 } values %{ $self->{item} };
2948 3368
3369 $self->{timer}->interval (1);
3370
2949 my $count = 10 + 1; 3371 my $count = 10 + 1;
2950 for my $item (@items) { 3372 for my $item (@items) {
2951 last unless --$count; 3373 last unless --$count;
2952 3374
2953 push @widgets, $item->{label} ||= do { 3375 my $label = $item->{label} ||= do {
2954 # TODO: doesn't handle markup well (read as: at all) 3376 # TODO: doesn't handle markup well (read as: at all)
2955 my $short = $item->{count} > 1 3377 my $short = $item->{count} > 1
2956 ? "<b>$item->{count} ×</b> $item->{text}" 3378 ? "<b>$item->{count} ×</b> $item->{text}"
2957 : $item->{text}; 3379 : $item->{text};
2958 3380
… …
2966 tooltip => $item->{tooltip}, 3388 tooltip => $item->{tooltip},
2967 tooltip_font => $::FONT_PROP, 3389 tooltip_font => $::FONT_PROP,
2968 tooltip_width => 0.67, 3390 tooltip_width => 0.67,
2969 fontsize => $item->{fontsize} || $self->{fontsize}, 3391 fontsize => $item->{fontsize} || $self->{fontsize},
2970 max_w => $::WIDTH * 0.44, 3392 max_w => $::WIDTH * 0.44,
2971 fg => $item->{fg}, 3393 fg => [@{ $item->{fg} }],
2972 can_events => 1, 3394 can_events => 1,
2973 can_hover => 1 3395 can_hover => 1
2974 }; 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;
2975 } 3409 }
2976 3410
2977 $self->clear; 3411 $self->clear;
2978 $self->SUPER::add (reverse @widgets); 3412 $self->SUPER::add (reverse @widgets);
2979} 3413}
… …
2984 $text =~ s/^\s+//; 3418 $text =~ s/^\s+//;
2985 $text =~ s/\s+$//; 3419 $text =~ s/\s+$//;
2986 3420
2987 return unless $text; 3421 return unless $text;
2988 3422
2989 my $timeout = time + ((delete $arg{timeout}) || 60); 3423 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2990 3424
2991 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3425 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2992 3426
2993 if (my $item = $self->{item}{$group}) { 3427 if (my $item = $self->{item}{$group}) {
2994 if ($item->{text} eq $text) { 3428 if ($item->{text} eq $text) {
2995 $item->{count}++; 3429 $item->{count}++;
2996 } else { 3430 } else {
2997 $item->{count} = 1; 3431 $item->{count} = 1;
2998 $item->{text} = $item->{tooltip} = $text; 3432 $item->{text} = $item->{tooltip} = $text;
2999 } 3433 }
3000 $item->{id} = ++$self->{id}; 3434 $item->{id} += 0.2;#d#
3001 $item->{timeout} = $timeout; 3435 $item->{timeout} = $timeout;
3002 delete $item->{label}; 3436 delete $item->{label};
3003 } else { 3437 } else {
3004 $self->{item}{$group} = { 3438 $self->{item}{$group} = {
3005 id => ++$self->{id}, 3439 id => ++$self->{id},
… …
3011 count => 1, 3445 count => 1,
3012 %arg, 3446 %arg,
3013 }; 3447 };
3014 } 3448 }
3015 3449
3450 $ROOT->on_refresh (reorder => sub {
3016 $self->reorder; 3451 $self->reorder;
3452 });
3017} 3453}
3018 3454
3019sub reconfigure { 3455sub reconfigure {
3020 my ($self) = @_; 3456 my ($self) = @_;
3021 3457
… …
3024 3460
3025 $self->reorder; 3461 $self->reorder;
3026 $self->SUPER::reconfigure; 3462 $self->SUPER::reconfigure;
3027} 3463}
3028 3464
3465sub destroy {
3466 my ($self) = @_;
3467
3468 $self->{timer}->cancel;
3469
3470 $self->SUPER::destroy;
3471}
3472
3029############################################################################# 3473#############################################################################
3030 3474
3031package CFClient::UI::Root; 3475package CFClient::UI::Inventory;
3032 3476
3033our @ISA = CFClient::UI::Container::; 3477our @ISA = CFClient::UI::Table::;
3034
3035use CFClient::OpenGL;
3036 3478
3037sub new { 3479sub new {
3038 my $class = shift; 3480 my $class = shift;
3039 3481
3040 $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 => [],
3041 @_, 3527 @_,
3042 ) 3528 )
3043} 3529}
3044 3530
3045sub configure { 3531my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3046 my ($self, $x, $y, $w, $h) = @_;
3047 3532
3048 $self->{w} = $w; 3533my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3049 $self->{h} = $h; 3534 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3050} 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");
3051 3543
3052sub 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 {
3053 my ($self) = @_; 3617 my ($self, $spell) = @_;
3054 3618
3055 $self->size_allocate ($self->{w}, $self->{h}) 3619 $self->{spell}->{$spell->{name}} = $spell;
3056 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
3057} 3658}
3058 3659
3059sub size_request { 3660sub size_request {
3060 my ($self) = @_; 3661 my ($self) = @_;
3061 3662
3062 ($self->{w}, $self->{h}) 3663 ($self->{w}, $self->{h})
3063} 3664}
3064 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
3065sub size_allocate { 3680sub invoke_size_allocate {
3066 my ($self, $w, $h) = @_; 3681 my ($self, $w, $h) = @_;
3067 3682
3068 for my $child ($self->children) { 3683 for my $child ($self->children) {
3069 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)};
3070 3685
3071 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3686 $X = $child->{force_x} if exists $child->{force_x};
3072 if exists $child->{req_x}; 3687 $Y = $child->{force_y} if exists $child->{force_y};
3073 3688
3074 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3689 $X = _to_pixel $X, $W, $self->{w};
3075 if exists $child->{req_y}; 3690 $Y = _to_pixel $Y, $H, $self->{h};
3076
3077 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3078 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3079 3691
3080 $child->configure ($X, $Y, $W, $H); 3692 $child->configure ($X, $Y, $W, $H);
3081 } 3693 }
3694
3695 1
3082} 3696}
3083 3697
3084sub coord2local { 3698sub coord2local {
3085 my ($self, $x, $y) = @_; 3699 my ($self, $x, $y) = @_;
3086 3700
… …
3094} 3708}
3095 3709
3096sub update { 3710sub update {
3097 my ($self) = @_; 3711 my ($self) = @_;
3098 3712
3099 $self->check_size;
3100 $::WANT_REFRESH++; 3713 $::WANT_REFRESH++;
3101} 3714}
3102 3715
3103sub add { 3716sub add {
3104 my ($self, @children) = @_; 3717 my ($self, @children) = @_;
3105 3718
3106 for (my @widgets = @children; my $w = pop @widgets; ) {
3107 push @widgets, $w->children;
3108 $w->{root} = $self;
3109 $w->{visible} = 1;
3110 }
3111
3112 for my $child (@children) {
3113 $child->{is_toplevel} = 1; 3719 $_->{is_toplevel} = 1
3114 3720 for @children;
3115 # integerise window positions
3116 $child->{x} = int $child->{x};
3117 $child->{y} = int $child->{y};
3118 }
3119 3721
3120 $self->SUPER::add (@children); 3722 $self->SUPER::add (@children);
3121} 3723}
3122 3724
3123sub remove { 3725sub remove {
3124 my ($self, @children) = @_; 3726 my ($self, @children) = @_;
3125 3727
3126 $self->SUPER::remove (@children); 3728 $self->SUPER::remove (@children);
3729
3730 delete $self->{is_toplevel}
3731 for @children;
3127 3732
3128 while (@children) { 3733 while (@children) {
3129 my $w = pop @children; 3734 my $w = pop @children;
3130 push @children, $w->children; 3735 push @children, $w->children;
3131 $w->set_invisible; 3736 $w->set_invisible;
… …
3150 while ($self->{refresh_hook}) { 3755 while ($self->{refresh_hook}) {
3151 $_->() 3756 $_->()
3152 for values %{delete $self->{refresh_hook}}; 3757 for values %{delete $self->{refresh_hook}};
3153 } 3758 }
3154 3759
3155 if ($self->{check_size}) { 3760 if ($self->{realloc}) {
3156 my @queue = ([], []); 3761 my %queue;
3762 my @queue;
3763 my $widget;
3157 3764
3158 for (;;) { 3765 outer:
3159 if ($self->{check_size}) { 3766 while () {
3160 # heuristic: check containers last 3767 if (my $realloc = delete $self->{realloc}) {
3161 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3768 for $widget (values %$realloc) {
3162 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 }
3163 } 3775 }
3164 3776
3165 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3777 while () {
3778 @queue or last outer;
3166 3779
3167 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3780 $widget = pop @{ $queue[-1] || [] }
3168 ? @$widget{qw(user_w user_h)} 3781 and last;
3169 : $widget->size_request;
3170
3171 if (delete $widget->{force_alloc}
3172 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3173 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3174 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}) {
3175 $widget->{req_w} = $w; 3801 $widget->{req_w} = $w;
3176 $widget->{req_h} = $h; 3802 $widget->{req_h} = $h;
3177 3803
3178 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3804 $self->{size_alloc}{$widget+0} = $widget;
3179 3805
3180 $widget->{parent}->check_size
3181 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 }
3182 } 3813 }
3814
3815 delete $self->{realloc}{$widget+0};
3183 } 3816 }
3184 } 3817 }
3185 3818
3186 while ($self->{size_alloc}) { 3819 while (my $size_alloc = delete $self->{size_alloc}) {
3187 for (values %{delete $self->{size_alloc}}) { 3820 my @queue = sort { $b->{visible} <=> $a->{visible} }
3188 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)};
3189 3827
3190 $w = 0 if $w < 0; 3828 $w = 0 if $w < 0;
3191 $h = 0 if $h < 0; 3829 $h = 0 if $h < 0;
3192 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
3193 $widget->{w} = $w; 3844 $widget->{w} = $w;
3194 $widget->{h} = $h; 3845 $widget->{h} = $h;
3846
3195 $widget->emit (size_allocate => $w, $h); 3847 $widget->emit (size_allocate => $w, $h);
3848 }
3196 } 3849 }
3197 } 3850 }
3198 3851
3199 while ($self->{post_alloc_hook}) { 3852 while ($self->{post_alloc_hook}) {
3200 $_->() 3853 $_->()
3201 for values %{delete $self->{post_alloc_hook}}; 3854 for values %{delete $self->{post_alloc_hook}};
3202 } 3855 }
3856
3203 3857
3204 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3858 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3205 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3859 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3206 glClear GL_COLOR_BUFFER_BIT; 3860 glClear GL_COLOR_BUFFER_BIT;
3207 3861
… …
3209 glLoadIdentity; 3863 glLoadIdentity;
3210 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3864 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3211 glMatrixMode GL_MODELVIEW; 3865 glMatrixMode GL_MODELVIEW;
3212 glLoadIdentity; 3866 glLoadIdentity;
3213 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
3214 $self->_draw; 3875 $self->_draw;
3215} 3876}
3216 3877
3217############################################################################# 3878#############################################################################
3218 3879

Diff Legend

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