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.231 by root, Thu May 25 00:26:19 2006 UTC vs.
Revision 1.308 by root, Mon Jun 19 05:18:14 2006 UTC

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

Diff Legend

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