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

Diff Legend

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