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.230 by root, Wed May 24 21:59:54 2006 UTC vs.
Revision 1.287 by root, Mon Jun 5 05:31:13 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]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
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 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
102 118
103 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
104 } 120 }
105} 121}
106 122
107sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
108 my ($ev) = @_; 124 my ($ev) = @_;
… …
114 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
115 131
116 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 $TOOLTIP_WATCHER->start;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
158sub rescale_widgets { 172sub rescale_widgets {
159 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
160 174
161 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
162 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
163 $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.]+$/;
164 $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};
165 $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};
166 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
167 $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.]+$/;
168 $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};
169 $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};
170 $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
171 } 190 }
172 } 191 }
173 192
174 reconfigure_widgets; 193 reconfigure_widgets;
175} 194}
… …
184 203
185sub new { 204sub new {
186 my $class = shift; 205 my $class = shift;
187 206
188 my $self = bless { 207 my $self = bless {
189 x => 0, 208 x => "center",
190 y => 0, 209 y => "center",
191 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
192 can_events => 1, 213 can_events => 1,
193 @_ 214 @_
194 }, $class; 215 }, $class;
195 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
196 for (keys %$self) { 219 for (keys %$self) {
197 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
198 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
199 } 222 }
200 } 223 }
201 224
202 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 }
203 236
204 $self 237 $self
205} 238}
206 239
207sub destroy { 240sub destroy {
… …
211 %$self = (); 244 %$self = ();
212} 245}
213 246
214sub show { 247sub show {
215 my ($self) = @_; 248 my ($self) = @_;
249
216 return if $self->{parent}; 250 return if $self->{parent};
217 251
218 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
219} 253}
220 254
221sub show_centered { 255sub set_visible {
222 my ($self) = @_; 256 my ($self) = @_;
257
223 return if $self->{parent}; 258 return if $self->{visible};
224 259
225 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
226 262
227 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
228 "centered $self" => sub {
229 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
230 },
231 );
232}
233 264
234sub hide { 265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
235 my ($self) = @_; 271 my ($self) = @_;
272
273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
276
277 delete $self->{root};
278 delete $self->{visible};
236 279
237 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
238 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
239 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
286 $self->focus_out;
287
288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
306}
307
308sub hide {
309 my ($self) = @_;
310
311 $self->set_invisible;
312
240 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
241 if $self->{parent}; 314 if $self->{parent};
242} 315}
243 316
244sub move { 317sub move_abs {
245 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
246 319
247 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
248 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
249 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
250 323
251 $self->update; 324 $self->update;
252} 325}
253 326
254sub set_size { 327sub set_size {
255 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
256 329
257 $self->{user_w} = $w; 330 $self->{force_w} = $w;
258 $self->{user_h} = $h; 331 $self->{force_h} = $h;
259 332
260 $self->check_size; 333 $self->realloc;
261} 334}
262 335
263sub size_request { 336sub size_request {
264 require Carp; 337 require Carp;
265 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
267 340
268sub configure { 341sub configure {
269 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
270 343
271 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
272 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
273 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
274 349
275 # use alignment to adjust x, y 350 # use alignment to adjust x, y
276 351
277 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
278 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
279
280 ($w, $h) = ($w2, $h2);
281 } 354 }
282 355
283 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
284 $self->{x} = $x; 357 $self->{x} = $x;
285 $self->{y} = $y; 358 $self->{y} = $y;
286 $self->update; 359 $self->update;
287 } 360 }
288 361
289 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
290 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 return unless $self->{visible};
364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
368 $self->{root}{size_alloc}{$self+0} = $self;
291 } 369 }
292} 370}
293 371
294sub size_allocate { 372sub size_allocate {
295 # nothing to be done 373 # nothing to be done
296} 374}
297 375
298sub reconfigure {
299 my ($self) = @_;
300
301 $self->check_size (1);
302 $self->update;
303}
304
305sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
306} 382}
307 383
308sub set_max_size { 384sub set_max_size {
309 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
310 386
311 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
312 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
313} 391}
314 392
315sub set_tooltip { 393sub set_tooltip {
316 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
317 395
396 $tooltip =~ s/^\s+//;
397 $tooltip =~ s/\s+$//;
398
399 return if $self->{tooltip} eq $tooltip;
400
318 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
319 402
320 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
321 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
322 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
323 } 406 }
324} 407}
325 408
326# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
327sub coord2local { 410sub coord2local {
… …
343 return if $FOCUS == $self; 426 return if $FOCUS == $self;
344 return unless $self->{can_focus}; 427 return unless $self->{can_focus};
345 428
346 my $focus = $FOCUS; $FOCUS = $self; 429 my $focus = $FOCUS; $FOCUS = $self;
347 430
348 $self->emit (focus_in => $focus); 431 $self->_emit (focus_in => $focus);
349 432
350 $focus->update if $focus; 433 $focus->update if $focus;
351 $FOCUS->update; 434 $FOCUS->update;
352} 435}
353 436
… …
356 439
357 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
358 441
359 my $focus = $FOCUS; undef $FOCUS; 442 my $focus = $FOCUS; undef $FOCUS;
360 443
361 $self->emit (focus_out => $focus); 444 $self->_emit (focus_out => $focus);
362 445
363 $focus->update if $focus; #? 446 $focus->update if $focus; #?
364}
365 447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
449 unless $FOCUS;
450}
451
366sub mouse_motion { } 452sub mouse_motion { 0 }
367sub button_up { } 453sub button_up { 0 }
368sub key_down { } 454sub key_down { 0 }
369sub key_up { } 455sub key_up { 0 }
370 456
371sub button_down { 457sub button_down {
372 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
373 459
374 $self->focus_in; 460 $self->focus_in;
375}
376 461
377sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
378sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
379sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
380sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
381sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
382 538
383sub draw { 539sub draw {
384 my ($self) = @_; 540 my ($self) = @_;
385 541
386 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
387 553
388 glPushMatrix; 554 glPushMatrix;
389 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
390 $self->_draw;
391 glPopMatrix;
392 556
393 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
394 my ($x, $y) = @$self{qw(x y)};
395
396 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
397 glEnable GL_BLEND; 559 glEnable GL_BLEND;
398 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
399 glBegin GL_QUADS; 561 glBegin GL_QUADS;
400 glVertex $x , $y;
401 glVertex $x + $self->{w}, $y;
402 glVertex $x + $self->{w}, $y + $self->{h};
403 glVertex $x , $y + $self->{h};
404 glEnd;
405 glDisable GL_BLEND;
406 }
407
408 if ($ENV{PCLIENT_DEBUG}) {
409 glPushMatrix;
410 glColor 1, 1, 0, 1;
411 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
412 glBegin GL_LINE_LOOP;
413 glVertex 0 , 0; 562 glVertex 0 , 0;
414 glVertex $self->{w}, 0; 563 glVertex $self->{w}, 0;
415 glVertex $self->{w}, $self->{h}; 564 glVertex $self->{w}, $self->{h};
416 glVertex 0 , $self->{h}; 565 glVertex 0 , $self->{h};
417 glEnd; 566 glEnd;
567 glDisable GL_BLEND;
568 }
569
570 if ($ENV{CFPLUS_DEBUG} & 1) {
571 glPushMatrix;
572 glColor 1, 1, 0, 1;
573 glTranslate 0.375, 0.375;
574 glBegin GL_LINE_LOOP;
575 glVertex 0 , 0;
576 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1;
579 glEnd;
418 glPopMatrix; 580 glPopMatrix;
419 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
420 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
421} 586}
422 587
423sub _draw { 588sub _draw {
424 my ($self) = @_; 589 my ($self) = @_;
425 590
426 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
427}
428
429sub find_widget {
430 my ($self, $x, $y) = @_;
431
432 return () unless $self->{can_events};
433
434 return $self
435 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
436 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
437
438 ()
439}
440
441sub set_parent {
442 my ($self, $parent) = @_;
443
444 Scalar::Util::weaken ($self->{parent} = $parent);
445
446 # TODO: req_w _does_change after ->reconfigure
447 $self->check_size
448 unless exists $self->{req_w};
449
450 $self->show;
451}
452
453sub check_size {
454 my ($self, $forced) = @_;
455
456 $self->{force_alloc} = 1 if $forced;
457 $CFClient::UI::ROOT->{check_size}{$self} = $self;
458}
459
460sub update {
461 my ($self) = @_;
462
463 $self->{parent}->update
464 if $self->{parent};
465}
466
467sub connect {
468 my ($self, $signal, $cb) = @_;
469
470 push @{ $self->{signal_cb}{$signal} }, $cb;
471}
472
473sub emit {
474 my ($self, $signal, @args) = @_;
475
476 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
477} 592}
478 593
479sub DESTROY { 594sub DESTROY {
480 my ($self) = @_; 595 my ($self) = @_;
481 596
… …
513 628
514 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
515 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
516 631
517 glEnable GL_BLEND; 632 glEnable GL_BLEND;
518 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
519 glColor @$color; 634 glColor_premultiply @$color;
520 635
521 glBegin GL_QUADS; 636 glBegin GL_QUADS;
522 glVertex 0 , 0; 637 glVertex 0 , 0;
523 glVertex 0 , $h; 638 glVertex 0 , $h;
524 glVertex $w, $h; 639 glVertex $w, $h;
… …
539 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
540 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
541} 656}
542 657
543sub size_request { 658sub size_request {
544 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
545} 662}
546 663
547sub draw { } 664sub draw { }
548 665
549############################################################################# 666#############################################################################
… …
553our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
554 671
555sub new { 672sub new {
556 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
557 674
558 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
559 676
560 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
561 children => [], 678 children => [],
562 can_events => 0, 679 can_events => 0,
563 %arg, 680 %arg,
564 ); 681 );
682
565 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
566 685
567 $self 686 $self
568} 687}
569 688
570sub add { 689sub add {
… …
578 $self->{children} = [ 697 $self->{children} = [
579 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
580 @{$self->{children}}, @widgets 699 @{$self->{children}}, @widgets
581 ]; 700 ];
582 701
583 $self->check_size (1); 702 $self->realloc;
584 $self->update;
585} 703}
586 704
587sub children { 705sub children {
588 @{ $_[0]{children} } 706 @{ $_[0]{children} }
589} 707}
… …
594 delete $child->{parent}; 712 delete $child->{parent};
595 $child->hide; 713 $child->hide;
596 714
597 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
598 716
599 $self->check_size; 717 $self->realloc;
600 $self->update;
601} 718}
602 719
603sub clear { 720sub clear {
604 my ($self) = @_; 721 my ($self) = @_;
605 722
… …
609 for (@$children) { 726 for (@$children) {
610 delete $_->{parent}; 727 delete $_->{parent};
611 $_->hide; 728 $_->hide;
612 } 729 }
613 730
614 $self->check_size; 731 $self->realloc;
615 $self->update;
616} 732}
617 733
618sub find_widget { 734sub find_widget {
619 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
620 736
621 $x -= $self->{x}; 737 $x -= $self->{x};
622 $y -= $self->{y}; 738 $y -= $self->{y};
623 739
624 my $res; 740 my $res;
625 741
626 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
627 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
628 and return $res; 744 and return $res;
629 } 745 }
630 746
631 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
680 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
681} 797}
682 798
683############################################################################# 799#############################################################################
684 800
801# back-buffered drawing area
802
685package CFClient::UI::Window; 803package CFClient::UI::Window;
686 804
687our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
688 806
689use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
707 $self->SUPER::size_allocate ($w, $h); 825 $self->SUPER::size_allocate ($w, $h);
708 $self->update; 826 $self->update;
709} 827}
710 828
711sub _render { 829sub _render {
830 my ($self) = @_;
831
712 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
713} 833}
714 834
715sub render_child { 835sub render_child {
716 my ($self) = @_; 836 my ($self) = @_;
717 837
718 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
719 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
720 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
721 841
842 {
843 package CFClient::UI::Base;
844
845 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h});
847 }
848
722 $self->_render; 849 $self->_render;
723 }; 850 };
724} 851}
725 852
726sub _draw { 853sub _draw {
727 my ($self) = @_; 854 my ($self) = @_;
728 855
729 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
730 857
731 my $tex = $self->{texture} 858 my $tex = $self->{texture}
732 or return; 859 or return;
733 860
734 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
735 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
736 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
737 864
738 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
739 866
740 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
741} 868}
… …
744 871
745package CFClient::UI::ViewPort; 872package CFClient::UI::ViewPort;
746 873
747our @ISA = CFClient::UI::Window::; 874our @ISA = CFClient::UI::Window::;
748 875
876sub new {
877 my $class = shift;
878
879 $class->SUPER::new (
880 scroll_x => 0,
881 scroll_y => 1,
882 @_,
883 )
884}
885
749sub size_request { 886sub size_request {
750 my ($self) = @_; 887 my ($self) = @_;
751 888
752 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
753 890
754 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
755} 895}
756 896
757sub size_allocate { 897sub size_allocate {
758 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
759 899
760 my ($cw, $ch) = @$self{qw(child_w child_h)}; 900 my $child = $self->child;
761# $w = $self->{w}; 901
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904
762 $self->child->configure (0, 0, $cw, $ch); 905 $self->child->configure (0, 0, $w, $h);
763 $self->update; 906 $self->update;
764} 907}
765 908
766sub set_offset { 909sub set_offset {
767 my ($self, $x, $y) = @_; 910 my ($self, $x, $y) = @_;
… …
801} 944}
802 945
803sub _render { 946sub _render {
804 my ($self) = @_; 947 my ($self) = @_;
805 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
806 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
807 953
808 $self->SUPER::_render; 954 $self->SUPER::_render;
809} 955}
810 956
… …
813package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
814 960
815our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
816 962
817sub new { 963sub new {
818 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
819 967
820 my $self; 968 my $self;
821 969
822 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
823 vertical => 1, 971 vertical => 1,
824 range => [0, 0, 1, 0.01], # HACK fix 972 range => [0, 0, 1, 0.01], # HACK fix
825 connect_changed => sub { 973 on_changed => sub {
826 $self->{vp}->set_offset (0, $_[1]); 974 $self->{vp}->set_offset (0, $_[1]);
827 }, 975 },
828 ; 976 ;
829 977
830 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
831 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
832 slider => $slider, 980 slider => $slider,
833 @_, 981 %arg,
834 ); 982 );
835 983
836 $self->{vp}->add ($self->{scrolled});
837 $self->add ($self->{vp});
838 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
839 986
840 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
994}
995
996sub update {
997 my ($self) = @_;
998
999 $self->SUPER::update;
1000
1001 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
841} 1004}
842 1005
843sub size_allocate { 1006sub size_allocate {
844 my ($self, $w, $h) = @_; 1007 my ($self, $w, $h) = @_;
845 1008
… …
874 1037
875 if ($self->{bg}) { 1038 if ($self->{bg}) {
876 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
877 1040
878 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
879 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
880 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
881 1044
882 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
883 glVertex 0 , 0; 1046 glVertex 0 , 0;
884 glVertex 0 , $h; 1047 glVertex 0 , $h;
885 glVertex $w, $h; 1048 glVertex $w, $h;
… …
898 1061
899our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
900 1063
901use CFClient::OpenGL; 1064use CFClient::OpenGL;
902 1065
903my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
904 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
905 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
906 1073
907sub new { 1074sub new {
908 my $class = shift; 1075 my ($class, %arg) = @_;
909 1076
910 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
911 1078
912 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
913 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
914 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
915 border => 0.6, 1082 border => 0.6,
916 is_toplevel => 1,
917 can_events => 1, 1083 can_events => 1,
918 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
919 ); 1087 );
920 1088
921 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
922 align => 0, 1090 align => 0,
923 valign => 1, 1091 valign => 1,
924 text => $self->{title}, 1092 text => $title,
925 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
926 1095
927 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
928} 1104}
929 1105
930sub border { 1106sub border {
931 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
932} 1108}
933 1109
934sub size_request { 1110sub size_request {
935 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
936 1115
937 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
938 1117
939 ( 1118 (
940 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
943} 1122}
944 1123
945sub size_allocate { 1124sub size_allocate {
946 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
947 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
948 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
949 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
950 1137
951 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
952 if $self->{title};
953
954 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
955} 1139}
956 1140
957sub button_down { 1141sub button_down {
958 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
959 1143
… …
975 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
976 1160
977 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
978 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
979 1163
980 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
981 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1166
982 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
983 $self->check_size; 1168 $self->realloc;
984 }; 1169 };
985 1170
986 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
987 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
988 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
990 $self->{motion} = sub { 1175 $self->{motion} = sub {
991 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
992 1177
993 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
994 1179
995 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
996 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
997 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
998 } 1188 1
999} 1189}
1000 1190
1001sub button_up { 1191sub button_up {
1002 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1003 1193
1004 delete $self->{motion}; 1194 !!delete $self->{motion}
1005} 1195}
1006 1196
1007sub mouse_motion { 1197sub mouse_motion {
1008 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1009 1199
1010 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1011} 1203}
1012 1204
1013sub _draw { 1205sub _draw {
1014 my ($self) = @_; 1206 my ($self) = @_;
1015 1207
1208 my $child = $self->{children}[0];
1209
1016 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1017 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1018 1212
1019 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1020 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1021 1215
1022 my $border = $self->border; 1216 my $border = $self->border;
1023 1217
1024 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1025 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1026 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1027 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1028 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1029 1223
1030 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1031 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1032 1226
1033 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1034 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1035 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1036
1037 glColor @{ $self->{bg} };
1038
1039 $bg->{s} = $rep_x;
1040 $bg->{t} = $rep_y;
1041 $bg->{wrap_mode} = 1;
1042 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1043 } 1232 }
1044 1233
1045 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1046 1235
1047 $self->{title}->draw if $self->{title};
1048
1049 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1050} 1242}
1051 1243
1052############################################################################# 1244#############################################################################
1053 1245
1054package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1062sub new { 1254sub new {
1063 my $class = shift; 1255 my $class = shift;
1064 1256
1065 $class->SUPER::new ( 1257 $class->SUPER::new (
1066 col_expand => [], 1258 col_expand => [],
1067 @_ 1259 @_,
1068 ) 1260 )
1261}
1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1069} 1265}
1070 1266
1071sub add { 1267sub add {
1072 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1073 1269
1074 $child->set_parent ($self); 1270 $child->set_parent ($self);
1075 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1076 1272
1077 $child->check_size; 1273 $self->realloc;
1078} 1274}
1079 1275
1080sub children {
1081 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1082}
1083
1084# TODO: move to container class maybe? send childs a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
1085sub clear { 1277sub clear {
1086 my ($self) = @_; 1278 my ($self) = @_;
1087 1279
1088 my @children = $self->children; 1280 my @children = $self->children;
1089 delete $self->{children}; 1281 delete $self->{children};
… …
1091 for (@children) { 1283 for (@children) {
1092 delete $_->{parent}; 1284 delete $_->{parent};
1093 $_->hide; 1285 $_->hide;
1094 } 1286 }
1095 1287
1096 $self->update; 1288 $self->realloc;
1097} 1289}
1098 1290
1099sub get_wh { 1291sub get_wh {
1100 my ($self) = @_; 1292 my ($self) = @_;
1101 1293
… …
1132sub size_allocate { 1324sub size_allocate {
1133 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
1134 1326
1135 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1136 1328
1137 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
1138 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
1139 1331
1140 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
1141 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
1142 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
1143 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
1197 } 1389 }
1198} 1390}
1199 1391
1200############################################################################# 1392#############################################################################
1201 1393
1202package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1203
1204# TODO: wrap into common Box base class
1205 1395
1206our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1207 1397
1208sub size_request { 1398sub size_request {
1209 my ($self) = @_; 1399 my ($self) = @_;
1210 1400
1211 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1212 1402 ? (
1213 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1214 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1215 (List::Util::max map $_->[1], @alloc), 1405 )
1216 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1217} 1410}
1218 1411
1219sub size_allocate { 1412sub size_allocate {
1220 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1221 1414
1222 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1223
1224 my $children = $self->{children}; 1416 my $children = $self->{children};
1225 1417
1226 my @h = map $_->{req_w}, @$children; 1418 my @req;
1227 1419
1228 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1229 1421 @req = ($space / (@$children || 1)) x @$children;
1230 if ($req_h > $h) {
1231 # ah well, not enough space
1232 $_ *= $h / $req_h for @h;
1233 } else { 1422 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1424 my $req = List::Util::sum @req;
1425
1426 if ($req > $space) {
1427 # ah well, not enough space
1428 $_ *= $space / $req for @req;
1429 } else {
1234 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1235 $exp ||= 1;
1236 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1237 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1238 my $child = $children->[$_];
1239
1240 my $alloc_h = $h[$_];
1241 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1242 $h[$_] = $alloc_h;
1243 } 1436 }
1244 } 1437 }
1245 1438
1246 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1247 1440
1248 my $y = 0; 1441 my $pos = 0;
1249 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1250 my $child = $children->[$_];
1251 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1252 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1253 1445
1254 $y += $h; 1446 $pos += $alloc;
1255 } 1447 }
1256 1448
1257 1 1449 1
1258} 1450}
1259 1451
1260############################################################################# 1452#############################################################################
1261 1453
1454package CFClient::UI::HBox;
1455
1456our @ISA = CFClient::UI::Box::;
1457
1458sub new {
1459 my $class = shift;
1460
1461 $class->SUPER::new (
1462 vertical => 0,
1463 @_,
1464 )
1465}
1466
1467#############################################################################
1468
1262package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1263 1470
1264# TODO: wrap into common Box base class
1265
1266our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1267 1472
1268sub size_request { 1473sub new {
1269 my ($self) = @_; 1474 my $class = shift;
1270 1475
1271 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1272 1477 vertical => 1,
1273 ( 1478 @_,
1274 (List::Util::max map $_->[0], @alloc),
1275 (List::Util::sum map $_->[1], @alloc),
1276 ) 1479 )
1277}
1278
1279sub size_allocate {
1280 my ($self, $w, $h) = @_;
1281
1282 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1283
1284 my $children = $self->{children};
1285
1286 my @h = map $_->{req_h}, @$children;
1287
1288 my $req_h = List::Util::sum @h;
1289
1290 if ($req_h > $h) {
1291 # ah well, not enough space
1292 $_ *= $h / $req_h for @h;
1293 } else {
1294 my $exp = List::Util::sum map $_->{expand}, @$children;
1295 $exp ||= 1;
1296
1297 for (0 .. $#$children) {
1298 my $child = $children->[$_];
1299
1300 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1301 }
1302 }
1303
1304 CFClient::UI::harmonize \@h;
1305
1306 my $y = 0;
1307 for (0 .. $#$children) {
1308 my $child = $children->[$_];
1309 my $h = $h[$_];
1310 $child->configure (0, $y, $w, $h);
1311
1312 $y += $h;
1313 }
1314
1315 1
1316} 1480}
1317 1481
1318############################################################################# 1482#############################################################################
1319 1483
1320package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1337 ellipsise => 3, # end 1501 ellipsise => 3, # end
1338 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1339 fontsize => 1, 1503 fontsize => 1,
1340 align => -1, 1504 align => -1,
1341 valign => -1, 1505 valign => -1,
1342 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1343 can_events => 0, 1508 can_events => 0,
1344 %arg 1509 %arg
1345 ); 1510 );
1346 1511
1347 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1374 1539
1375 delete $self->{texture}; 1540 delete $self->{texture};
1376 $self->SUPER::update; 1541 $self->SUPER::update;
1377} 1542}
1378 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1379sub set_text { 1551sub set_text {
1380 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1381 1553
1382 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1383 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1384 1556
1385 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1386 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1559 delete $self->{req_h};
1387 1560
1561 $self->realloc;
1388 $self->update; 1562 $self->update;
1389 $self->check_size;
1390} 1563}
1391 1564
1392sub set_markup { 1565sub set_markup {
1393 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1394 1567
… …
1397 1570
1398 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1399 1572
1400 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1401 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1575 delete $self->{req_h};
1402 1576
1577 $self->realloc;
1403 $self->update; 1578 $self->update;
1404 $self->check_size;
1405} 1579}
1406 1580
1407sub size_request { 1581sub size_request {
1408 my ($self) = @_; 1582 my ($self) = @_;
1409 1583
1584 if (exists $self->{req_h}) {
1585 @$self{qw(req_w req_h)}
1586 } else {
1410 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1587 $self->{layout}->set_font ($self->{font}) if $self->{font};
1411 $self->{layout}->set_width ($self->{max_w} || -1); 1588 $self->{layout}->set_width ($self->{max_w} || -1);
1412 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1589 $self->{layout}->set_ellipsise ($self->{ellipsise});
1413 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1414 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1415 1592
1416 my ($w, $h) = $self->{layout}->size; 1593 my ($w, $h) = $self->{layout}->size;
1417 1594
1418 if (exists $self->{template}) { 1595 if (exists $self->{template}) {
1419 $self->{template}->set_font ($self->{font}) if $self->{font}; 1596 $self->{template}->set_font ($self->{font}) if $self->{font};
1420 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1421 1598
1422 my ($w2, $h2) = $self->{template}->size; 1599 my ($w2, $h2) = $self->{template}->size;
1423 1600
1424 $w = List::Util::max $w, $w2; 1601 $w = List::Util::max $w, $w2;
1425 $h = List::Util::max $h, $h2; 1602 $h = List::Util::max $h, $h2;
1426 } 1603 }
1427 1604
1605 ($w, $h)
1428 ( 1606 }
1429 $w + $self->{padding} * 2,
1430 $h + $self->{padding} * 2,
1431 )
1432} 1607}
1433 1608
1434sub size_allocate { 1609sub size_allocate {
1435 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1436 1611
1612 delete $self->{ox};
1613
1437 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1438} 1616}
1439 1617
1440sub set_fontsize { 1618sub set_fontsize {
1441 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1442 1620
1443 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1444 delete $self->{texture}; 1622 delete $self->{texture};
1445 1623
1446 $self->update; 1624 $self->realloc;
1447 $self->check_size;
1448} 1625}
1449 1626
1450sub _draw { 1627sub _draw {
1451 my ($self) = @_; 1628 my ($self) = @_;
1452 1629
… …
1458 $self->{layout}->set_width ($self->{w}); 1635 $self->{layout}->set_width ($self->{w});
1459 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1460 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1461 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1462 1639
1463 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1640 new_from_layout CFClient::Texture $self->{layout}
1641 };
1464 1642
1643 unless (exists $self->{ox}) {
1465 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1466 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1467 : ($self->{w} - $tex->{w}) * 0.5); 1646 : ($self->{w} - $tex->{w}) * 0.5);
1468 1647
1469 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1470 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1471 : ($self->{h} - $tex->{h}) * 0.5); 1650 : ($self->{h} - $tex->{h}) * 0.5);
1472
1473 $tex
1474 }; 1651 };
1475 1652
1476 glEnable GL_TEXTURE_2D; 1653 glEnable GL_TEXTURE_2D;
1477 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1478 1654
1479 if ($tex->{format} == GL_ALPHA) { 1655 if ($tex->{format} == GL_ALPHA) {
1656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1480 glColor @{$self->{fg}}; 1657 glColor @{$self->{fg}};
1481 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1658 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1482 } else { 1659 } else {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1483 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1661 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1484 } 1662 }
1485 1663
1486 glDisable GL_TEXTURE_2D; 1664 glDisable GL_TEXTURE_2D;
1487} 1665}
… …
1516 1694
1517 delete $self->{cur_h}; 1695 delete $self->{cur_h};
1518 1696
1519 return if $self->{text} eq $text; 1697 return if $self->{text} eq $text;
1520 1698
1521 delete $self->{texture};
1522
1523 $self->{last_activity} = $::NOW; 1699 $self->{last_activity} = $::NOW;
1524 $self->{text} = $text; 1700 $self->{text} = $text;
1525 1701
1526 $text =~ s/./*/g if $self->{hidden}; 1702 $text =~ s/./*/g if $self->{hidden};
1527 $self->{layout}->set_text ("$text "); 1703 $self->{layout}->set_text ("$text ");
1704 delete $self->{req_h};
1528 1705
1529 $self->emit (changed => $self->{text}); 1706 $self->_emit (changed => $self->{text});
1707
1708 $self->realloc;
1709 $self->update;
1530} 1710}
1531 1711
1532sub set_text { 1712sub set_text {
1533 my ($self, $text) = @_; 1713 my ($self, $text) = @_;
1534 1714
1535 $self->{cursor} = length $text; 1715 $self->{cursor} = length $text;
1536 $self->_set_text ($text); 1716 $self->_set_text ($text);
1537 $self->update;
1538 $self->check_size;
1539} 1717}
1540 1718
1541sub get_text { 1719sub get_text {
1542 $_[0]{text} 1720 $_[0]{text}
1543} 1721}
… …
1546 my ($self) = @_; 1724 my ($self) = @_;
1547 1725
1548 my ($w, $h) = $self->SUPER::size_request; 1726 my ($w, $h) = $self->SUPER::size_request;
1549 1727
1550 ($w + 1, $h) # add 1 for cursor 1728 ($w + 1, $h) # add 1 for cursor
1551}
1552
1553sub size_allocate {
1554 my ($self, $w, $h) = @_;
1555
1556 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1557} 1729}
1558 1730
1559sub key_down { 1731sub key_down {
1560 my ($self, $ev) = @_; 1732 my ($self, $ev) = @_;
1561 1733
… …
1576 } elsif ($sym == CFClient::SDLK_HOME) { 1748 } elsif ($sym == CFClient::SDLK_HOME) {
1577 $self->{cursor} = 0; 1749 $self->{cursor} = 0;
1578 } elsif ($sym == CFClient::SDLK_END) { 1750 } elsif ($sym == CFClient::SDLK_END) {
1579 $self->{cursor} = length $text; 1751 $self->{cursor} = length $text;
1580 } elsif ($uni == 27) { 1752 } elsif ($uni == 27) {
1581 $self->emit ('escape'); 1753 $self->_emit ('escape');
1582 } elsif ($uni) { 1754 } elsif ($uni) {
1583 substr $text, $self->{cursor}++, 0, chr $uni; 1755 substr $text, $self->{cursor}++, 0, chr $uni;
1756 } else {
1757 return 0;
1584 } 1758 }
1585 1759
1586 $self->_set_text ($text); 1760 $self->_set_text ($text);
1587 $self->update; 1761
1588 $self->check_size; 1762 $self->realloc;
1763
1764 1
1589} 1765}
1590 1766
1591sub focus_in { 1767sub focus_in {
1592 my ($self) = @_; 1768 my ($self) = @_;
1593 1769
… …
1608 utf8::encode $text; 1784 utf8::encode $text;
1609 $self->{cursor} = length substr $text, 0, $idx; 1785 $self->{cursor} = length substr $text, 0, $idx;
1610 1786
1611 $self->_set_text ($self->{text}); 1787 $self->_set_text ($self->{text});
1612 $self->update; 1788 $self->update;
1789
1790 1
1613} 1791}
1614 1792
1615sub mouse_motion { 1793sub mouse_motion {
1616 my ($self, $ev, $x, $y) = @_; 1794 my ($self, $ev, $x, $y) = @_;
1617# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1795# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1796
1797 0
1618} 1798}
1619 1799
1620sub _draw { 1800sub _draw {
1621 my ($self) = @_; 1801 my ($self) = @_;
1622 1802
1623 local $self->{fg} = $self->{fg}; 1803 local $self->{fg} = $self->{fg};
1624 1804
1625 if ($FOCUS == $self) { 1805 if ($FOCUS == $self) {
1626 glColor @{$self->{active_bg}}; 1806 glColor_premultiply @{$self->{active_bg}};
1627 $self->{fg} = $self->{active_fg}; 1807 $self->{fg} = $self->{active_fg};
1628 } else { 1808 } else {
1629 glColor @{$self->{bg}}; 1809 glColor_premultiply @{$self->{bg}};
1630 } 1810 }
1631 1811
1632 glEnable GL_BLEND; 1812 glEnable GL_BLEND;
1633 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1813 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1634 glBegin GL_QUADS; 1814 glBegin GL_QUADS;
1635 glVertex 0 , 0; 1815 glVertex 0 , 0;
1636 glVertex 0 , $self->{h}; 1816 glVertex 0 , $self->{h};
1637 glVertex $self->{w}, $self->{h}; 1817 glVertex $self->{w}, $self->{h};
1638 glVertex $self->{w}, 0; 1818 glVertex $self->{w}, 0;
… …
1673 if ($sym == 13) { 1853 if ($sym == 13) {
1674 unshift @{$self->{history}}, 1854 unshift @{$self->{history}},
1675 my $txt = $self->get_text; 1855 my $txt = $self->get_text;
1676 $self->{history_pointer} = -1; 1856 $self->{history_pointer} = -1;
1677 $self->{history_saveback} = ''; 1857 $self->{history_saveback} = '';
1678 $self->emit (activate => $txt); 1858 $self->_emit (activate => $txt);
1679 $self->update; 1859 $self->update;
1680 1860
1681 } elsif ($sym == CFClient::SDLK_UP) { 1861 } elsif ($sym == CFClient::SDLK_UP) {
1682 if ($self->{history_pointer} < 0) { 1862 if ($self->{history_pointer} < 0) {
1683 $self->{history_saveback} = $self->get_text; 1863 $self->{history_saveback} = $self->get_text;
… …
1699 } else { 1879 } else {
1700 $self->set_text ($self->{history_saveback}); 1880 $self->set_text ($self->{history_saveback});
1701 } 1881 }
1702 1882
1703 } else { 1883 } else {
1704 $self->SUPER::key_down ($ev); 1884 return $self->SUPER::key_down ($ev)
1885 }
1886
1705 } 1887 1
1706
1707} 1888}
1708 1889
1709############################################################################# 1890#############################################################################
1710 1891
1711package CFClient::UI::Button; 1892package CFClient::UI::Button;
… …
1720 1901
1721sub new { 1902sub new {
1722 my $class = shift; 1903 my $class = shift;
1723 1904
1724 $class->SUPER::new ( 1905 $class->SUPER::new (
1725 padding => 4, 1906 padding_x => 4,
1907 padding_y => 4,
1726 fg => [1, 1, 1], 1908 fg => [1, 1, 1],
1727 active_fg => [0, 0, 1], 1909 active_fg => [0, 0, 1],
1728 can_hover => 1, 1910 can_hover => 1,
1729 align => 0, 1911 align => 0,
1730 valign => 0, 1912 valign => 0,
1731 can_events => 1, 1913 can_events => 1,
1732 @_ 1914 @_
1733 ) 1915 )
1734} 1916}
1735 1917
1918sub activate { }
1919
1736sub button_up { 1920sub button_up {
1737 my ($self, $ev, $x, $y) = @_; 1921 my ($self, $ev, $x, $y) = @_;
1738 1922
1923 $self->emit ("activate")
1739 if ($x >= 0 && $x < $self->{w} 1924 if $x >= 0 && $x < $self->{w}
1740 && $y >= 0 && $y < $self->{h}) { 1925 && $y >= 0 && $y < $self->{h};
1741 $self->emit ("activate"); 1926
1742 } 1927 1
1743} 1928}
1744 1929
1745sub _draw { 1930sub _draw {
1746 my ($self) = @_; 1931 my ($self) = @_;
1747 1932
1748 local $self->{fg} = $self->{fg}; 1933 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1749
1750 if ($GRAB == $self) {
1751 $self->{fg} = $self->{active_fg};
1752 }
1753 1934
1754 glEnable GL_TEXTURE_2D; 1935 glEnable GL_TEXTURE_2D;
1755 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1936 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1756 glColor 0, 0, 0, 1; 1937 glColor 0, 0, 0, 1;
1757 1938
… …
1776 1957
1777sub new { 1958sub new {
1778 my $class = shift; 1959 my $class = shift;
1779 1960
1780 $class->SUPER::new ( 1961 $class->SUPER::new (
1781 padding => 2, 1962 padding_x => 2,
1963 padding_y => 2,
1782 fg => [1, 1, 1], 1964 fg => [1, 1, 1],
1783 active_fg => [1, 1, 0], 1965 active_fg => [1, 1, 0],
1784 bg => [0, 0, 0, 0.2], 1966 bg => [0, 0, 0, 0.2],
1785 active_bg => [1, 1, 1, 0.5], 1967 active_bg => [1, 1, 1, 0.5],
1786 state => 0, 1968 state => 0,
… …
1790} 1972}
1791 1973
1792sub size_request { 1974sub size_request {
1793 my ($self) = @_; 1975 my ($self) = @_;
1794 1976
1795 ($self->{padding} * 2 + 6) x 2 1977 (6) x 2
1796} 1978}
1797 1979
1798sub button_down { 1980sub button_down {
1799 my ($self, $ev, $x, $y) = @_; 1981 my ($self, $ev, $x, $y) = @_;
1800 1982
1801 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1983 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1802 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1984 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1803 $self->{state} = !$self->{state}; 1985 $self->{state} = !$self->{state};
1804 $self->emit (changed => $self->{state}); 1986 $self->_emit (changed => $self->{state});
1987 } else {
1988 return 0
1989 }
1990
1805 } 1991 1
1806} 1992}
1807 1993
1808sub _draw { 1994sub _draw {
1809 my ($self) = @_; 1995 my ($self) = @_;
1810 1996
1811 $self->SUPER::_draw; 1997 $self->SUPER::_draw;
1812 1998
1813 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1999 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1814 2000
1815 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2001 my ($w, $h) = @$self{qw(w h)};
2002
2003 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1816 2004
1817 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2005 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1818 2006
1819 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2007 my $tex = $self->{state} ? $tex[1] : $tex[0];
1820 2008
… …
1975 2163
1976 my $h1 = $self->{h} * (1 - $ycut1); 2164 my $h1 = $self->{h} * (1 - $ycut1);
1977 my $h2 = $self->{h} * (1 - $ycut2); 2165 my $h2 = $self->{h} * (1 - $ycut2);
1978 2166
1979 glEnable GL_BLEND; 2167 glEnable GL_BLEND;
1980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2168 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2169 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1981 glEnable GL_TEXTURE_2D; 2170 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2171 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983 2172
1984 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2173 glBindTexture GL_TEXTURE_2D, $t1->{name};
1985 glBegin GL_QUADS; 2174 glBegin GL_QUADS;
… …
2085 fg => [1, 1, 1], 2274 fg => [1, 1, 1],
2086 active_fg => [0, 0, 0], 2275 active_fg => [0, 0, 0],
2087 bg => [0, 0, 0, 0.2], 2276 bg => [0, 0, 0, 0.2],
2088 active_bg => [1, 1, 1, 0.5], 2277 active_bg => [1, 1, 1, 0.5],
2089 range => [0, 0, 100, 10, 0], 2278 range => [0, 0, 100, 10, 0],
2090 req_w => $::WIDTH / 80, 2279 min_w => $::WIDTH / 80,
2091 req_h => $::WIDTH / 80, 2280 min_h => $::WIDTH / 80,
2092 vertical => 0, 2281 vertical => 0,
2093 can_hover => 1, 2282 can_hover => 1,
2094 inner_pad => 0.02, 2283 inner_pad => 0.02,
2095 @_ 2284 @_
2096 ); 2285 );
… …
2099 $self->update; 2288 $self->update;
2100 2289
2101 $self 2290 $self
2102} 2291}
2103 2292
2293sub changed { }
2294
2104sub set_range { 2295sub set_range {
2105 my ($self, $range) = @_; 2296 my ($self, $range) = @_;
2106 2297
2107 $self->{range} = $range; 2298 ($range, $self->{range}) = ($self->{range}, $range);
2108 2299
2109 $self->update; 2300 $self->update
2301 if "@$range" ne "@{$self->{range}}";
2110} 2302}
2111 2303
2112sub set_value { 2304sub set_value {
2113 my ($self, $value) = @_; 2305 my ($self, $value) = @_;
2114 2306
… …
2125 if $unit; 2317 if $unit;
2126 2318
2127 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2319 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2128 2320
2129 if ($value != $old_value) { 2321 if ($value != $old_value) {
2130 $self->emit (changed => $value); 2322 $self->_emit (changed => $value);
2131 $self->update; 2323 $self->update;
2132 } 2324 }
2133} 2325}
2134 2326
2135sub size_request { 2327sub size_request {
2136 my ($self) = @_; 2328 my ($self) = @_;
2137 2329
2138 my $w = $self->{req_w}; 2330 ($self->{req_w}, $self->{req_h})
2139 my $h = $self->{req_h};
2140
2141 $self->{vertical} ? ($h, $w) : ($w, $h)
2142} 2331}
2143 2332
2144sub button_down { 2333sub button_down {
2145 my ($self, $ev, $x, $y) = @_; 2334 my ($self, $ev, $x, $y) = @_;
2146 2335
2147 $self->SUPER::button_down ($ev, $x, $y); 2336 $self->SUPER::button_down ($ev, $x, $y);
2148 2337
2149 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2338 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2150 2339
2151 $self->mouse_motion ($ev, $x, $y); 2340 $self->mouse_motion ($ev, $x, $y)
2152} 2341}
2153 2342
2154sub mouse_motion { 2343sub mouse_motion {
2155 my ($self, $ev, $x, $y) = @_; 2344 my ($self, $ev, $x, $y) = @_;
2156 2345
… …
2160 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2349 my (undef, $lo, $hi, $page) = @{$self->{range}};
2161 2350
2162 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2351 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2163 2352
2164 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2353 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2354 } else {
2355 return 0;
2356 }
2357
2165 } 2358 1
2166} 2359}
2167 2360
2168sub update { 2361sub update {
2169 my ($self) = @_; 2362 my ($self) = @_;
2170 2363
2171 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2364 delete $self->{knob_w};
2365 $self->SUPER::update;
2366}
2367
2368sub _draw {
2369 my ($self) = @_;
2370
2371 unless ($self->{knob_w}) {
2172 $self->set_value ($self->{range}[0]); 2372 $self->set_value ($self->{range}[0]);
2173 2373
2174 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2374 my ($value, $lo, $hi, $page) = @{$self->{range}};
2175 my $range = ($hi - $page - $lo) || 1e-100; 2375 my $range = ($hi - $page - $lo) || 1e-100;
2176 2376
… …
2182 $value = ($value - $lo) / $range; 2382 $value = ($value - $lo) / $range;
2183 $value = $value * $self->{scale} + $self->{offset}; 2383 $value = $value * $self->{scale} + $self->{offset};
2184 2384
2185 $self->{knob_x} = $value - $knob_w * 0.5; 2385 $self->{knob_x} = $value - $knob_w * 0.5;
2186 $self->{knob_w} = $knob_w; 2386 $self->{knob_w} = $knob_w;
2187 }); 2387 }
2188
2189 $self->SUPER::update;
2190}
2191
2192sub _draw {
2193 my ($self) = @_;
2194 2388
2195 $self->SUPER::_draw (); 2389 $self->SUPER::_draw ();
2196 2390
2197 glScale $self->{w}, $self->{h}; 2391 glScale $self->{w}, $self->{h};
2198 2392
… …
2392 2586
2393 delete $self->{texture}; 2587 delete $self->{texture};
2394 } 2588 }
2395 2589
2396 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2590 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2397 glClearColor 0.5, 0.5, 0.5, 0; 2591 glClearColor 0, 0, 0, 0;
2398 glClear GL_COLOR_BUFFER_BIT; 2592 glClear GL_COLOR_BUFFER_BIT;
2399 2593
2400 my $top = int $self->{children}[1]{range}[0]; 2594 my $top = int $self->{children}[1]{range}[0];
2401 2595
2402 my $y0 = $top; 2596 my $y0 = $top;
… …
2437sub _draw { 2631sub _draw {
2438 my ($self) = @_; 2632 my ($self) = @_;
2439 2633
2440 glEnable GL_TEXTURE_2D; 2634 glEnable GL_TEXTURE_2D;
2441 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2442 glColor 1, 1, 1, 1; 2636 glColor 0, 0, 0, 1;
2443 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2637 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2444 glDisable GL_TEXTURE_2D; 2638 glDisable GL_TEXTURE_2D;
2445 2639
2446 $self->{children}[1]->draw; 2640 $self->{children}[1]->draw;
2447 2641
2448} 2642}
… …
2497 2691
2498sub new { 2692sub new {
2499 my $class = shift; 2693 my $class = shift;
2500 2694
2501 my $self = $class->SUPER::new ( 2695 my $self = $class->SUPER::new (
2502 state => 0, 2696 state => 0,
2503 connect_activate => \&toggle_flopper, 2697 on_activate => \&toggle_flopper,
2504 @_ 2698 @_
2505 ); 2699 );
2506 2700
2507 if ($self->{state}) {
2508 $self->{state} = 0;
2509 $self->toggle_flopper;
2510 }
2511
2512 $self 2701 $self
2513} 2702}
2514 2703
2515sub toggle_flopper { 2704sub toggle_flopper {
2516 my ($self) = @_; 2705 my ($self) = @_;
2517 2706
2518 # TODO: use animation 2707 $self->{other}->toggle_visibility;
2519 if ($self->{state} = !$self->{state}) {
2520 $CFClient::UI::ROOT->add ($self->{other});
2521 $self->{other}->move ($self->coord2global (0, $self->{h}));
2522 $self->emit ("open");
2523 } else {
2524 $CFClient::UI::ROOT->remove ($self->{other});
2525 $self->emit ("close");
2526 }
2527
2528 $self->emit (changed => $self->{state});
2529} 2708}
2530 2709
2531############################################################################# 2710#############################################################################
2532 2711
2533package CFClient::UI::Tooltip; 2712package CFClient::UI::Tooltip;
… …
2546} 2725}
2547 2726
2548sub set_tooltip_from { 2727sub set_tooltip_from {
2549 my ($self, $widget) = @_; 2728 my ($self, $widget) = @_;
2550 2729
2730 my $tooltip = $widget->{tooltip};
2731
2732 if ($ENV{CFPLUS_DEBUG} & 2) {
2733 $tooltip .= "\n\n" . (ref $widget) . "\n"
2734 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2735 . "req $widget->{req_w} $widget->{req_h}\n"
2736 . "visible $widget->{visible}";
2737 }
2738
2551 $self->add (new CFClient::UI::Label 2739 $self->add (new CFClient::UI::Label
2552 markup => $widget->{tooltip}, 2740 markup => $tooltip,
2553 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2741 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2554 fontsize => 0.8, 2742 fontsize => 0.8,
2555 fg => [0, 0, 0, 1], 2743 fg => [0, 0, 0, 1],
2556 ellipsise => 0, 2744 ellipsise => 0,
2557 font => ($widget->{tooltip_font} || $::FONT_PROP), 2745 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2568 2756
2569sub size_allocate { 2757sub size_allocate {
2570 my ($self, $w, $h) = @_; 2758 my ($self, $w, $h) = @_;
2571 2759
2572 $self->SUPER::size_allocate ($w - 4, $h - 4); 2760 $self->SUPER::size_allocate ($w - 4, $h - 4);
2761}
2762
2763sub visibility_change {
2764 my ($self, $visible) = @_;
2765
2766 return unless $visible;
2767
2768 $self->{root}->on_post_alloc ("move_$self" => sub {
2769 my $widget = $self->{owner}
2770 or return;
2771
2772 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2773
2774 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2775 if $x + $self->{w} > $::WIDTH;
2776
2777 $self->move_abs ($x, $y);
2778 });
2573} 2779}
2574 2780
2575sub _draw { 2781sub _draw {
2576 my ($self) = @_; 2782 my ($self) = @_;
2577 2783
… …
2594 glVertex $w, $h; 2800 glVertex $w, $h;
2595 glVertex $w, 0; 2801 glVertex $w, 0;
2596 glEnd; 2802 glEnd;
2597 2803
2598 glTranslate 2 - 0.375, 2 - 0.375; 2804 glTranslate 2 - 0.375, 2 - 0.375;
2805
2599 $self->SUPER::_draw; 2806 $self->SUPER::_draw;
2600} 2807}
2601 2808
2602############################################################################# 2809#############################################################################
2603 2810
… …
2609 2816
2610sub new { 2817sub new {
2611 my $class = shift; 2818 my $class = shift;
2612 2819
2613 my $self = $class->SUPER::new ( 2820 my $self = $class->SUPER::new (
2614 aspect => 1, 2821 aspect => 1,
2822 can_events => 0,
2615 @_, 2823 @_,
2616 ); 2824 );
2617 2825
2618 if ($self->{anim} && $self->{animspeed}) { 2826 if ($self->{anim} && $self->{animspeed}) {
2619 Scalar::Util::weaken (my $widget = $self); 2827 Scalar::Util::weaken (my $widget = $self);
… …
2661 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2869 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2662 2870
2663 if ($tex) { 2871 if ($tex) {
2664 glEnable GL_TEXTURE_2D; 2872 glEnable GL_TEXTURE_2D;
2665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2873 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2666 glColor 1, 1, 1, 1; 2874 glColor 0, 0, 0, 1;
2667 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2875 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2668 glDisable GL_TEXTURE_2D; 2876 glDisable GL_TEXTURE_2D;
2669 } 2877 }
2670} 2878}
2671 2879
… …
2678 $self->SUPER::DESTROY; 2886 $self->SUPER::DESTROY;
2679} 2887}
2680 2888
2681############################################################################# 2889#############################################################################
2682 2890
2683package CFClient::UI::InventoryItem; 2891package CFClient::UI::Buttonbar;
2684 2892
2685our @ISA = CFClient::UI::HBox::; 2893our @ISA = CFClient::UI::HBox::;
2686 2894
2687sub _item_to_desc { 2895# TODO: should actualyl wrap buttons and other goodies.
2688 my ($item) = @_;
2689
2690 my $desc =
2691 $item->{nrof} < 2
2692 ? $item->{name}
2693 : "$item->{nrof} × $item->{name_pl}";
2694
2695 $item->{flags} & Crossfire::Protocol::F_OPEN
2696 and $desc .= " (open)";
2697 $item->{flags} & Crossfire::Protocol::F_APPLIED
2698 and $desc .= " (applied)";
2699 $item->{flags} & Crossfire::Protocol::F_UNPAID
2700 and $desc .= " (unpaid)";
2701 $item->{flags} & Crossfire::Protocol::F_MAGIC
2702 and $desc .= " (magic)";
2703 $item->{flags} & Crossfire::Protocol::F_CURSED
2704 and $desc .= " (cursed)";
2705 $item->{flags} & Crossfire::Protocol::F_DAMNED
2706 and $desc .= " (damned)";
2707 $item->{flags} & Crossfire::Protocol::F_LOCKED
2708 and $desc .= " *";
2709
2710 $desc
2711}
2712
2713sub new {
2714 my $class = shift;
2715
2716 my %args = @_;
2717
2718 my $item = delete $args{item};
2719
2720 my $desc = _item_to_desc ($item);
2721
2722 my $self = $class->SUPER::new (
2723 can_hover => 1,
2724 can_events => 1,
2725 tooltip => ((CFClient::UI::Label::escape $desc)
2726 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2727 connect_button_down => sub {
2728 my ($self, $ev, $x, $y) = @_;
2729
2730 # todo: maybe put examine on 1? but should just be a tooltip :(
2731 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2732 my $targ = $::CONN->{player}{tag};
2733
2734 if ($item->{container} == $::CONN->{player}{tag}) {
2735 $targ = $main::OPENCONT;
2736 }
2737
2738 $::CONN->send ("move $targ $item->{tag} 0");
2739 } elsif ($ev->{button} == 1) {
2740 $::CONN->send ("examine $item->{tag}");
2741 } elsif ($ev->{button} == 2) {
2742 $::CONN->send ("apply $item->{tag}");
2743 } elsif ($ev->{button} == 3) {
2744 my @menu_items = (
2745 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2746 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2747 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2748 (
2749 $item->{flags} & Crossfire::Protocol::F_LOCKED
2750 ? (
2751 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2752 )
2753 : (
2754 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2755 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2756 )
2757 ),
2758 );
2759
2760 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2761 }
2762
2763 1
2764 },
2765 %args
2766 );
2767
2768
2769 $self->add (new CFClient::UI::Face
2770 can_events => 0,
2771 face => $item->{face},
2772 anim => $item->{anim},
2773 animspeed => $item->{animspeed},
2774 );
2775
2776 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2777
2778 $self->{item} = $item;
2779
2780 $self->update_item;
2781
2782 $self
2783}
2784
2785sub update_item {
2786 my ($self) = @_;
2787
2788 my $desc = _item_to_desc ($self->{item});
2789
2790 $self->{name_lbl}->set_text ($desc);
2791}
2792
2793#############################################################################
2794
2795package CFClient::UI::Inventory;
2796
2797our @ISA = CFClient::UI::ScrolledWindow::;
2798
2799sub new {
2800 my $class = shift;
2801
2802 my $self = $class->SUPER::new (
2803 scrolled => (new CFClient::UI::Table),
2804 @_,
2805 );
2806
2807 $self
2808}
2809
2810sub set_items {
2811 my ($self, $items) = @_;
2812
2813 $self->{scrolled}->clear;
2814 return unless $items;
2815
2816 my @items = sort {
2817 ($a->{type} <=> $b->{type})
2818 or ($a->{name} cmp $b->{name})
2819 } @$items;
2820
2821 $self->{real_items} = \@items;
2822
2823 for my $item (@items) {
2824 $item->{item} = $item;
2825 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2826 $item->update_item ();
2827 }
2828
2829 my $i = 0;
2830 for (@items) {
2831 $self->{scrolled}->add (0, $i, $_);
2832 my $nrof = $_->{item}->{nrof} || 1;
2833 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2834 }
2835
2836# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2837}
2838
2839sub size_request {
2840 my ($self) = @_;
2841 ($self->{req_w}, $self->{req_h});
2842}
2843 2896
2844############################################################################# 2897#############################################################################
2845 2898
2846package CFClient::UI::Menu; 2899package CFClient::UI::Menu;
2847 2900
… …
2881 2934
2882# popup given the event (must be a mouse button down event currently) 2935# popup given the event (must be a mouse button down event currently)
2883sub popup { 2936sub popup {
2884 my ($self, $ev) = @_; 2937 my ($self, $ev) = @_;
2885 2938
2886 $self->emit ("popdown"); 2939 $self->_emit ("popdown");
2887 2940
2888 # maybe save $GRAB? must be careful about events... 2941 # maybe save $GRAB? must be careful about events...
2889 $GRAB = $self; 2942 $GRAB = $self;
2890 $self->{button} = $ev->{button}; 2943 $self->{button} = $ev->{button};
2891 2944
2892 $self->show; 2945 $self->show;
2893 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2946 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2894} 2947}
2895 2948
2896sub mouse_motion { 2949sub mouse_motion {
2897 my ($self, $ev, $x, $y) = @_; 2950 my ($self, $ev, $x, $y) = @_;
2898 2951
2899 # TODO: should use vbox->find_widget or so 2952 # TODO: should use vbox->find_widget or so
2900 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2953 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2901 $self->{hover} = $self->{item}{$HOVER}; 2954 $self->{hover} = $self->{item}{$HOVER};
2955
2956 0
2902} 2957}
2903 2958
2904sub button_up { 2959sub button_up {
2905 my ($self, $ev, $x, $y) = @_; 2960 my ($self, $ev, $x, $y) = @_;
2906 2961
2907 if ($ev->{button} == $self->{button}) { 2962 if ($ev->{button} == $self->{button}) {
2908 undef $GRAB; 2963 undef $GRAB;
2909 $self->hide; 2964 $self->hide;
2910 2965
2911 $self->emit ("popdown"); 2966 $self->_emit ("popdown");
2912 $self->{hover}[1]->() if $self->{hover}; 2967 $self->{hover}[1]->() if $self->{hover};
2968 } else {
2969 return 0
2970 }
2971
2913 } 2972 1
2914} 2973}
2915 2974
2916############################################################################# 2975#############################################################################
2917 2976
2918package CFClient::UI::Statusbox; 2977package CFClient::UI::Multiplexer;
2919 2978
2920our @ISA = CFClient::UI::VBox::; 2979our @ISA = CFClient::UI::Container::;
2921 2980
2922sub new { 2981sub new {
2923 my $class = shift; 2982 my $class = shift;
2924 2983
2925 $class->SUPER::new ( 2984 my $self = $class->SUPER::new (
2985 @_,
2986 );
2987
2988 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} };
2990
2991 $self
2992}
2993
2994sub add {
2995 my ($self, @widgets) = @_;
2996
2997 $self->SUPER::add (@widgets);
2998
2999 $self->{current} = $self->{children}[0]
3000 if @{ $self->{children} };
3001}
3002
3003sub set_current_page {
3004 my ($self, $page_or_widget) = @_;
3005
3006 my $widget = ref $page_or_widget
3007 ? $page_or_widget
3008 : $self->{children}[$page_or_widget];
3009
3010 $self->{current} = $widget;
3011 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3012
3013 $self->_emit (page_changed => $self->{current});
3014
3015 $self->realloc;
3016}
3017
3018sub visible_children {
3019 $_[0]{current}
3020}
3021
3022sub size_request {
3023 my ($self) = @_;
3024
3025 $self->{current}->size_request
3026}
3027
3028sub size_allocate {
3029 my ($self, $w, $h) = @_;
3030
3031 $self->{current}->configure (0, 0, $w, $h);
3032}
3033
3034sub _draw {
3035 my ($self) = @_;
3036
3037 $self->{current}->draw;
3038}
3039
3040#############################################################################
3041
3042package CFClient::UI::Notebook;
3043
3044our @ISA = CFClient::UI::VBox::;
3045
3046sub new {
3047 my $class = shift;
3048
3049 my $self = $class->SUPER::new (
3050 buttonbar => (new CFClient::UI::Buttonbar),
3051 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3052 # filter => # will be put between multiplexer and $self
3053 @_,
3054 );
3055
3056 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3057 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3058
3059 $self
3060}
3061
3062sub add {
3063 my ($self, $title, $widget, $tooltip) = @_;
3064
3065 Scalar::Util::weaken $self;
3066
3067 $self->{buttonbar}->add (new CFClient::UI::Button
3068 markup => $title,
3069 tooltip => $tooltip,
3070 on_activate => sub { $self->set_current_page ($widget) },
3071 );
3072
3073 $self->{multiplexer}->add ($widget);
3074}
3075
3076sub set_current_page {
3077 my ($self, $page) = @_;
3078
3079 $self->{multiplexer}->set_current_page ($page);
3080 $self->_emit (page_changed => $self->{multiplexer}{current});
3081}
3082
3083#############################################################################
3084
3085package CFClient::UI::Statusbox;
3086
3087our @ISA = CFClient::UI::VBox::;
3088
3089sub new {
3090 my $class = shift;
3091
3092 my $self = $class->SUPER::new (
2926 fontsize => 0.8, 3093 fontsize => 0.8,
2927 @_, 3094 @_,
2928 ) 3095 );
3096
3097 Scalar::Util::weaken (my $this = $self);
3098
3099 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3100
3101 $self
2929} 3102}
2930 3103
2931sub reorder { 3104sub reorder {
2932 my ($self) = @_; 3105 my ($self) = @_;
2933 my $NOW = time; 3106 my $NOW = Time::HiRes::time;
3107
3108 # freeze display when hovering over any label
3109 return if $CFClient::UI::TOOLTIP->{owner}
3110 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3111 values %{ $self->{item} };
2934 3112
2935 while (my ($k, $v) = each %{ $self->{item} }) { 3113 while (my ($k, $v) = each %{ $self->{item} }) {
2936 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3114 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2937 } 3115 }
2938 3116
… …
2941 my @items = sort { 3119 my @items = sort {
2942 $a->{pri} <=> $b->{pri} 3120 $a->{pri} <=> $b->{pri}
2943 or $b->{id} <=> $a->{id} 3121 or $b->{id} <=> $a->{id}
2944 } values %{ $self->{item} }; 3122 } values %{ $self->{item} };
2945 3123
3124 $self->{timer}->interval (1);
3125
2946 my $count = 10 + 1; 3126 my $count = 10 + 1;
2947 for my $item (@items) { 3127 for my $item (@items) {
2948 last unless --$count; 3128 last unless --$count;
2949 3129
2950 push @widgets, $item->{label} ||= do { 3130 my $label = $item->{label} ||= do {
2951 # TODO: doesn't handle markup well (read as: at all) 3131 # TODO: doesn't handle markup well (read as: at all)
2952 my $short = $item->{count} > 1 3132 my $short = $item->{count} > 1
2953 ? "<b>$item->{count} ×</b> $item->{text}" 3133 ? "<b>$item->{count} ×</b> $item->{text}"
2954 : $item->{text}; 3134 : $item->{text};
2955 3135
… …
2963 tooltip => $item->{tooltip}, 3143 tooltip => $item->{tooltip},
2964 tooltip_font => $::FONT_PROP, 3144 tooltip_font => $::FONT_PROP,
2965 tooltip_width => 0.67, 3145 tooltip_width => 0.67,
2966 fontsize => $item->{fontsize} || $self->{fontsize}, 3146 fontsize => $item->{fontsize} || $self->{fontsize},
2967 max_w => $::WIDTH * 0.44, 3147 max_w => $::WIDTH * 0.44,
2968 fg => $item->{fg}, 3148 fg => [@{ $item->{fg} }],
2969 can_events => 1, 3149 can_events => 1,
2970 can_hover => 1 3150 can_hover => 1
2971 }; 3151 };
3152
3153 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3154 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3155 $label->update;
3156 $label->set_max_size (undef, $label->{req_h} * $diff)
3157 if $diff < 1;
3158 $self->{timer}->interval (1/30);
3159 } else {
3160 $label->{fg}[3] = $item->{fg}[3] || 1;
3161 }
3162
3163 push @widgets, $label;
2972 } 3164 }
2973 3165
2974 $self->clear; 3166 $self->clear;
2975 $self->SUPER::add (reverse @widgets); 3167 $self->SUPER::add (reverse @widgets);
2976} 3168}
… …
2979 my ($self, $text, %arg) = @_; 3171 my ($self, $text, %arg) = @_;
2980 3172
2981 $text =~ s/^\s+//; 3173 $text =~ s/^\s+//;
2982 $text =~ s/\s+$//; 3174 $text =~ s/\s+$//;
2983 3175
3176 return unless $text;
3177
2984 my $timeout = time + ((delete $arg{timeout}) || 60); 3178 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2985 3179
2986 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3180 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2987 3181
2988 if (my $item = $self->{item}{$group}) { 3182 if (my $item = $self->{item}{$group}) {
2989 if ($item->{text} eq $text) { 3183 if ($item->{text} eq $text) {
… …
3019 3213
3020 $self->reorder; 3214 $self->reorder;
3021 $self->SUPER::reconfigure; 3215 $self->SUPER::reconfigure;
3022} 3216}
3023 3217
3218sub DESTROY {
3219 my ($self) = @_;
3220
3221 $self->{timer}->cancel;
3222
3223 $self->SUPER::DESTROY;
3224}
3225
3024############################################################################# 3226#############################################################################
3025 3227
3026package CFClient::UI::Root; 3228package CFClient::UI::Inventory;
3027 3229
3028our @ISA = CFClient::UI::Container::; 3230our @ISA = CFClient::UI::ScrolledWindow::;
3029
3030use CFClient::OpenGL;
3031 3231
3032sub new { 3232sub new {
3033 my $class = shift; 3233 my $class = shift;
3034 3234
3035 $class->SUPER::new ( 3235 my $self = $class->SUPER::new (
3236 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3237 @_,
3238 );
3239
3240 $self
3241}
3242
3243sub set_items {
3244 my ($self, $items) = @_;
3245
3246 $self->{child}->clear;
3247 return unless $items;
3248
3249 my @items = sort {
3250 ($a->{type} <=> $b->{type})
3251 or ($a->{name} cmp $b->{name})
3252 } @$items;
3253
3254 $self->{real_items} = \@items;
3255
3256 my $row = 0;
3257 for my $item (@items) {
3258 CFClient::Item::update_widgets $item;
3259
3260 $self->{child}->add (0, $row, $item->{face_widget});
3261 $self->{child}->add (1, $row, $item->{desc_widget});
3262 $self->{child}->add (2, $row, $item->{weight_widget});
3263
3264 $row++;
3265 }
3266}
3267
3268#############################################################################
3269
3270package CFClient::UI::BindEditor;
3271
3272our @ISA = CFClient::UI::FancyFrame::;
3273
3274sub new {
3275 my $class = shift;
3276
3277 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3278
3279 $self->add (my $vb = new CFClient::UI::VBox);
3280
3281
3282 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3283 text => "start recording",
3284 tooltip => "Start/Stops recording of actions."
3285 ."All subsequent actions after the recording started will be captured."
3286 ."The actions are displayed after the record was stopped."
3287 ."To bind the action you have to click on the 'Bind' button",
3288 on_activate => sub {
3289 unless ($self->{recording}) {
3290 $self->start;
3291 } else {
3292 $self->stop;
3293 }
3294 });
3295
3296 $vb->add (new CFClient::UI::Label text => "Actions:");
3297 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3298
3299 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3300 $vb->add (my $hb = new CFClient::UI::HBox);
3301 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3302 $hb->add (new CFClient::UI::Button
3303 text => "bind",
3304 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3305 on_activate => sub {
3306 $self->ask_for_bind;
3307 });
3308
3309 $vb->add (my $hb = new CFClient::UI::HBox);
3310 $hb->add (new CFClient::UI::Button
3311 text => "ok",
3312 expand => 1,
3313 tooltip => "This closes the binding editor and saves the binding",
3314 on_activate => sub {
3315 $self->hide;
3316 $self->commit;
3317 });
3318
3319 $hb->add (new CFClient::UI::Button
3320 text => "cancel",
3321 expand => 1,
3322 tooltip => "This closes the binding editor without saving",
3323 on_activate => sub {
3324 $self->hide;
3325 $self->{binding_cancel}->()
3326 if $self->{binding_cancel};
3327 });
3328
3329 $self->update_binding_widgets;
3330
3331 $self
3332}
3333
3334sub commit {
3335 my ($self) = @_;
3336 my ($mod, $sym, $cmds) = $self->get_binding;
3337 if ($sym != 0 && @$cmds > 0) {
3338 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3339 ."'. Don't forget 'Save Config'!");
3340 $self->{binding_change}->($mod, $sym, $cmds)
3341 if $self->{binding_change};
3342 } else {
3343 $::STATUSBOX->add ("No action bound, no key or action specified!");
3344 $self->{binding_cancel}->()
3345 if $self->{binding_cancel};
3346 }
3347}
3348
3349sub start {
3350 my ($self) = @_;
3351
3352 $self->{rec_btn}->set_text ("stop recording");
3353 $self->{recording} = 1;
3354 $self->clear_command_list;
3355 $::CONN->start_record if $::CONN;
3356}
3357
3358sub stop {
3359 my ($self) = @_;
3360
3361 $self->{rec_btn}->set_text ("start recording");
3362 $self->{recording} = 0;
3363
3364 my $rec;
3365 $rec = $::CONN->stop_record if $::CONN;
3366 return unless ref $rec eq 'ARRAY';
3367 $self->set_command_list ($rec);
3368}
3369
3370
3371sub ask_for_bind_and_commit {
3372 my ($self) = @_;
3373 $self->ask_for_bind (1);
3374}
3375
3376sub ask_for_bind {
3377 my ($self, $commit) = @_;
3378
3379 CFClient::Binder::open_binding_dialog (sub {
3380 my ($mod, $sym) = @_;
3381 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3382 $self->update_binding_widgets;
3383 $self->commit if $commit;
3384 });
3385}
3386
3387# $mod and $sym are the modifiers and key symbol
3388# $cmds is a array ref of strings (the commands)
3389# $cb is the callback that is executed on OK
3390# $ccb is the callback that is executed on CANCEL and
3391# when the binding was unsuccessful on OK
3392sub set_binding {
3393 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3394
3395 $self->clear_command_list;
3396 $self->{recording} = 0;
3397 $self->{rec_btn}->set_text ("start recording");
3398
3399 $self->{binding} = [$mod, $sym];
3400 $self->{commands} = $cmds;
3401
3402 $self->{binding_change} = $cb;
3403 $self->{binding_cancel} = $ccb;
3404
3405 $self->update_binding_widgets;
3406}
3407
3408# this is a shortcut method that asks for a binding
3409# and then just binds it.
3410sub do_quick_binding {
3411 my ($self, $cmds) = @_;
3412 $self->set_binding (undef, undef, $cmds, sub {
3413 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3414 });
3415 $self->ask_for_bind (1);
3416}
3417
3418sub update_binding_widgets {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3422 $self->set_command_list ($cmds);
3423}
3424
3425sub get_binding {
3426 my ($self) = @_;
3427 return (
3428 $self->{binding}->[0],
3429 $self->{binding}->[1],
3430 [ grep { defined $_ } @{$self->{commands}} ]
3431 );
3432}
3433
3434sub clear_command_list {
3435 my ($self) = @_;
3436 $self->{cmdbox}->clear ();
3437}
3438
3439sub set_command_list {
3440 my ($self, $cmds) = @_;
3441
3442 $self->{cmdbox}->clear ();
3443 $self->{commands} = $cmds;
3444
3445 my $idx = 0;
3446
3447 for (@$cmds) {
3448 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3449
3450 my $i = $idx;
3451 $hb->add (new CFClient::UI::Label text => $_);
3452 $hb->add (new CFClient::UI::Button
3453 text => "delete",
3454 tooltip => "Deletes the action from the record",
3455 on_activate => sub {
3456 $self->{cmdbox}->remove ($hb);
3457 $cmds->[$i] = undef;
3458 });
3459
3460
3461 $idx++
3462 }
3463}
3464
3465#############################################################################
3466
3467package CFClient::UI::SpellList;
3468
3469our @ISA = CFClient::UI::Table::;
3470
3471sub new {
3472 my $class = shift;
3473
3474 my $self = $class->SUPER::new (
3475 binding => [],
3476 commands => [],
3036 @_, 3477 @_,
3037 ) 3478 )
3038} 3479}
3039 3480
3040sub configure { 3481# XXX: Do sorting? Argl...
3041 my ($self, $x, $y, $w, $h) = @_; 3482sub add_spell {
3042
3043 $self->{w} = $w;
3044 $self->{h} = $h;
3045}
3046
3047sub check_size {
3048 my ($self) = @_; 3483 my ($self, $spell) = @_;
3484 $self->{spells}->{$spell->{name}} = $spell;
3049 3485
3050 $self->size_allocate ($self->{w}, $self->{h}) 3486 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3051 if $self->{w}; 3487 face => $spell->{face},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message});
3491
3492 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3493 text => $spell->{name},
3494 can_hover => 1,
3495 can_events => 1,
3496 tooltip => $spell->{message},
3497 expand => 1);
3498
3499 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3500 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3501 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3502 expand => 1);
3503
3504 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3505 text => "bind to key",
3506 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3507}
3508
3509sub rebuild_spell_list {
3510 my ($self) = @_;
3511 $self->{tbl_idx} = 0;
3512 $self->add_spell ($_) for values %{$self->{spells}};
3513}
3514
3515sub remove_spell {
3516 my ($self, $spell) = @_;
3517 delete $self->{spells}->{$spell->{name}};
3518 $self->rebuild_spell_list;
3519}
3520
3521#############################################################################
3522
3523package CFClient::UI::Root;
3524
3525our @ISA = CFClient::UI::Container::;
3526
3527use List::Util qw(min max);
3528
3529use CFClient::OpenGL;
3530
3531sub new {
3532 my $class = shift;
3533
3534 my $self = $class->SUPER::new (
3535 visible => 1,
3536 @_,
3537 );
3538
3539 Scalar::Util::weaken ($self->{root} = $self);
3540
3541 $self
3052} 3542}
3053 3543
3054sub size_request { 3544sub size_request {
3055 my ($self) = @_; 3545 my ($self) = @_;
3056 3546
3057 ($self->{w}, $self->{h}) 3547 ($self->{w}, $self->{h})
3548}
3549
3550sub _to_pixel {
3551 my ($coord, $size, $max) = @_;
3552
3553 $coord =
3554 $coord eq "center" ? ($max - $size) * 0.5
3555 : $coord eq "max" ? $max
3556 : $coord;
3557
3558 $coord = 0 if $coord < 0;
3559 $coord = $max - $size if $coord > $max - $size;
3560
3561 int $coord + 0.5
3058} 3562}
3059 3563
3060sub size_allocate { 3564sub size_allocate {
3061 my ($self, $w, $h) = @_; 3565 my ($self, $w, $h) = @_;
3062 3566
3063 for my $child ($self->children) { 3567 for my $child ($self->children) {
3064 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3568 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3065 3569
3066 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3570 $X = $child->{force_x} if exists $child->{force_x};
3067 if exists $child->{req_x}; 3571 $Y = $child->{force_y} if exists $child->{force_y};
3068 3572
3069 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3573 $X = _to_pixel $X, $W, $self->{w};
3070 if exists $child->{req_y}; 3574 $Y = _to_pixel $Y, $H, $self->{h};
3071
3072 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3073 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3074 3575
3075 $child->configure ($X, $Y, $W, $H); 3576 $child->configure ($X, $Y, $W, $H);
3076 } 3577 }
3077} 3578}
3078 3579
… …
3089} 3590}
3090 3591
3091sub update { 3592sub update {
3092 my ($self) = @_; 3593 my ($self) = @_;
3093 3594
3094 $self->check_size;
3095 $::WANT_REFRESH++; 3595 $::WANT_REFRESH++;
3096} 3596}
3097 3597
3098sub add { 3598sub add {
3099 my ($self, @children) = @_; 3599 my ($self, @children) = @_;
3100 3600
3101 for (my @widgets = @children; my $w = pop @widgets; ) {
3102 push @widgets, $w->children;
3103 $w->{root} = $self;
3104 $w->{visible} = 1;
3105 }
3106
3107 for my $child (@children) {
3108 $child->{is_toplevel} = 1; 3601 $_->{is_toplevel} = 1
3109 3602 for @children;
3110 # integerise window positions
3111 $child->{x} = int $child->{x};
3112 $child->{y} = int $child->{y};
3113 }
3114 3603
3115 $self->SUPER::add (@children); 3604 $self->SUPER::add (@children);
3116} 3605}
3117 3606
3118sub remove { 3607sub remove {
3119 my ($self, @children) = @_; 3608 my ($self, @children) = @_;
3120 3609
3121 $self->SUPER::remove (@children); 3610 $self->SUPER::remove (@children);
3611
3612 delete $self->{is_toplevel}
3613 for @children;
3122 3614
3123 while (@children) { 3615 while (@children) {
3124 my $w = pop @children; 3616 my $w = pop @children;
3125 push @children, $w->children; 3617 push @children, $w->children;
3126 delete $w->{visible}; 3618 $w->set_invisible;
3127 } 3619 }
3128} 3620}
3129 3621
3130sub on_refresh { 3622sub on_refresh {
3131 my ($self, $id, $cb) = @_; 3623 my ($self, $id, $cb) = @_;
… …
3145 while ($self->{refresh_hook}) { 3637 while ($self->{refresh_hook}) {
3146 $_->() 3638 $_->()
3147 for values %{delete $self->{refresh_hook}}; 3639 for values %{delete $self->{refresh_hook}};
3148 } 3640 }
3149 3641
3150 if ($self->{check_size}) { 3642 if ($self->{realloc}) {
3151 my @queue = ([], []); 3643 my %queue;
3644 my @queue;
3645 my $widget;
3152 3646
3153 for (;;) { 3647 outer:
3154 if ($self->{check_size}) { 3648 while () {
3155 # heuristic: check containers last 3649 if (my $realloc = delete $self->{realloc}) {
3156 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3650 for $widget (values %$realloc) {
3157 for values %{delete $self->{check_size}} 3651 $widget->{visible} or next; # do not resize invisible widgets
3652
3653 $queue{$widget+0}++ and next; # duplicates are common
3654
3655 push @{ $queue[$widget->{visible}] }, $widget;
3656 }
3158 } 3657 }
3159 3658
3160 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3659 while () {
3660 @queue or last outer;
3161 3661
3162 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3662 $widget = pop @{ $queue[-1] || [] }
3163 ? @$widget{qw(user_w user_h)} 3663 and last;
3164 : $widget->size_request;
3165
3166 if (delete $widget->{force_alloc}
3167 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3168 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3169 3664
3665 pop @queue;
3666 }
3667
3668 delete $queue{$widget+0};
3669
3670 my ($w, $h) = $widget->size_request;
3671
3672 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3673 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3674
3675 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3676 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3677
3678 $w = $widget->{force_w} if exists $widget->{force_w};
3679 $h = $widget->{force_h} if exists $widget->{force_h};
3680
3681 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3682 || delete $widget->{force_realloc}) {
3170 $widget->{req_w} = $w; 3683 $widget->{req_w} = $w;
3171 $widget->{req_h} = $h; 3684 $widget->{req_h} = $h;
3172 3685
3173 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3686 $self->{size_alloc}{$widget+0} = $widget;
3174 3687
3175 $widget->{parent}->check_size
3176 if $widget->{parent}; 3688 if (my $parent = $widget->{parent}) {
3689 $self->{realloc}{$parent+0} = $parent
3690 unless $queue{$parent+0};
3691
3692 $parent->{force_size_alloc} = 1;
3693 $self->{size_alloc}{$parent+0} = $parent;
3694 }
3177 } 3695 }
3696
3697 delete $self->{realloc}{$widget+0};
3178 } 3698 }
3179 } 3699 }
3180 3700
3181 while ($self->{size_alloc}) { 3701 while (my $size_alloc = delete $self->{size_alloc}) {
3182 for (values %{delete $self->{size_alloc}}) { 3702 my @queue = sort { $b->{visible} <=> $a->{visible} }
3183 my ($widget, $w, $h) = @$_; 3703 values %$size_alloc;
3704
3705 while () {
3706 my $widget = pop @queue || last;
3707
3708 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3184 3709
3185 $w = 0 if $w < 0; 3710 $w = 0 if $w < 0;
3186 $h = 0 if $h < 0; 3711 $h = 0 if $h < 0;
3187 3712
3713 $w = int $w + 0.5;
3714 $h = int $h + 0.5;
3715
3716 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3717 $widget->{old_w} = $widget->{w};
3718 $widget->{old_h} = $widget->{h};
3719
3188 $widget->{w} = $w; 3720 $widget->{w} = $w;
3189 $widget->{h} = $h; 3721 $widget->{h} = $h;
3190 $widget->size_allocate ($w, $h); 3722
3191 $widget->emit (size_allocate => $w, $h); 3723 $widget->emit (size_allocate => $w, $h);
3724 }
3192 } 3725 }
3193 } 3726 }
3194 3727
3195 while ($self->{post_alloc_hook}) { 3728 while ($self->{post_alloc_hook}) {
3196 $_->() 3729 $_->()
3197 for values %{delete $self->{post_alloc_hook}}; 3730 for values %{delete $self->{post_alloc_hook}};
3198 } 3731 }
3732
3199 3733
3200 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3734 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3735 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3202 glClear GL_COLOR_BUFFER_BIT; 3736 glClear GL_COLOR_BUFFER_BIT;
3203 3737
… …
3205 glLoadIdentity; 3739 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3740 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 3741 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 3742 glLoadIdentity;
3209 3743
3744 {
3745 package CFClient::UI::Base;
3746
3747 ($draw_x, $draw_y, $draw_w, $draw_h) =
3748 (0, 0, $self->{w}, $self->{h});
3749 }
3750
3210 $self->_draw; 3751 $self->_draw;
3211} 3752}
3212 3753
3213############################################################################# 3754#############################################################################
3214 3755

Diff Legend

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