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.288 by root, Mon Jun 5 21:14:40 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 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
534
535 $self->realloc;
536 $self->update;
537}
538
539# using global variables seems a bit hacky, but passing through all drawing
540# functions seems pointless.
541our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
382 542
383sub draw { 543sub draw {
384 my ($self) = @_; 544 my ($self) = @_;
385 545
386 return unless $self->{h} && $self->{w}; 546 return unless $self->{h} && $self->{w};
547
548 # update screen rectangle
549 local $draw_x = $draw_x + $self->{x};
550 local $draw_y = $draw_y + $self->{y};
551 local $draw_w = $draw_x + $self->{w};
552 local $draw_h = $draw_y + $self->{h};
553
554 # skip widgets that are entirely outside the drawing area
555 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
556 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
387 557
388 glPushMatrix; 558 glPushMatrix;
389 glTranslate $self->{x}, $self->{y}, 0; 559 glTranslate $self->{x}, $self->{y}, 0;
390 $self->_draw;
391 glPopMatrix;
392 560
393 if ($self == $HOVER && $self->{can_hover}) { 561 if ($self == $HOVER && $self->{can_hover}) {
394 my ($x, $y) = @$self{qw(x y)};
395
396 glColor 1, 0.8, 0.5, 0.2; 562 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
397 glEnable GL_BLEND; 563 glEnable GL_BLEND;
398 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 564 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
399 glBegin GL_QUADS; 565 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; 566 glVertex 0 , 0;
414 glVertex $self->{w}, 0; 567 glVertex $self->{w}, 0;
415 glVertex $self->{w}, $self->{h}; 568 glVertex $self->{w}, $self->{h};
416 glVertex 0 , $self->{h}; 569 glVertex 0 , $self->{h};
417 glEnd; 570 glEnd;
571 glDisable GL_BLEND;
572 }
573
574 if ($ENV{CFPLUS_DEBUG} & 1) {
575 glPushMatrix;
576 glColor 1, 1, 0, 1;
577 glTranslate 0.375, 0.375;
578 glBegin GL_LINE_LOOP;
579 glVertex 0 , 0;
580 glVertex $self->{w} - 1, 0;
581 glVertex $self->{w} - 1, $self->{h} - 1;
582 glVertex 0 , $self->{h} - 1;
583 glEnd;
418 glPopMatrix; 584 glPopMatrix;
419 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 585 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
420 } 586 }
587
588 $self->_draw;
589 glPopMatrix;
421} 590}
422 591
423sub _draw { 592sub _draw {
424 my ($self) = @_; 593 my ($self) = @_;
425 594
426 warn "no draw defined for $self\n"; 595 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} 596}
478 597
479sub DESTROY { 598sub DESTROY {
480 my ($self) = @_; 599 my ($self) = @_;
481 600
… …
513 632
514 if ($color && (@$color < 4 || $color->[3])) { 633 if ($color && (@$color < 4 || $color->[3])) {
515 my ($w, $h) = @$self{qw(w h)}; 634 my ($w, $h) = @$self{qw(w h)};
516 635
517 glEnable GL_BLEND; 636 glEnable GL_BLEND;
518 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 637 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
519 glColor @$color; 638 glColor_premultiply @$color;
520 639
521 glBegin GL_QUADS; 640 glBegin GL_QUADS;
522 glVertex 0 , 0; 641 glVertex 0 , 0;
523 glVertex 0 , $h; 642 glVertex 0 , $h;
524 glVertex $w, $h; 643 glVertex $w, $h;
… …
539 my ($class, %arg) = @_; 658 my ($class, %arg) = @_;
540 $class->SUPER::new (can_events => 0, %arg); 659 $class->SUPER::new (can_events => 0, %arg);
541} 660}
542 661
543sub size_request { 662sub size_request {
544 (0, 0) 663 my ($self) = @_;
664
665 ($self->{w} + 0, $self->{h} + 0)
545} 666}
546 667
547sub draw { } 668sub draw { }
548 669
549############################################################################# 670#############################################################################
… …
553our @ISA = CFClient::UI::Base::; 674our @ISA = CFClient::UI::Base::;
554 675
555sub new { 676sub new {
556 my ($class, %arg) = @_; 677 my ($class, %arg) = @_;
557 678
558 my $children = delete $arg{children} || []; 679 my $children = delete $arg{children};
559 680
560 my $self = $class->SUPER::new ( 681 my $self = $class->SUPER::new (
561 children => [], 682 children => [],
562 can_events => 0, 683 can_events => 0,
563 %arg, 684 %arg,
564 ); 685 );
686
565 $self->add ($_) for @$children; 687 $self->add (@$children)
688 if $children;
566 689
567 $self 690 $self
568} 691}
569 692
570sub add { 693sub add {
… …
578 $self->{children} = [ 701 $self->{children} = [
579 sort { $a->{z} <=> $b->{z} } 702 sort { $a->{z} <=> $b->{z} }
580 @{$self->{children}}, @widgets 703 @{$self->{children}}, @widgets
581 ]; 704 ];
582 705
583 $self->check_size (1); 706 $self->realloc;
584 $self->update;
585} 707}
586 708
587sub children { 709sub children {
588 @{ $_[0]{children} } 710 @{ $_[0]{children} }
589} 711}
… …
594 delete $child->{parent}; 716 delete $child->{parent};
595 $child->hide; 717 $child->hide;
596 718
597 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 719 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
598 720
599 $self->check_size; 721 $self->realloc;
600 $self->update;
601} 722}
602 723
603sub clear { 724sub clear {
604 my ($self) = @_; 725 my ($self) = @_;
605 726
… …
609 for (@$children) { 730 for (@$children) {
610 delete $_->{parent}; 731 delete $_->{parent};
611 $_->hide; 732 $_->hide;
612 } 733 }
613 734
614 $self->check_size; 735 $self->realloc;
615 $self->update;
616} 736}
617 737
618sub find_widget { 738sub find_widget {
619 my ($self, $x, $y) = @_; 739 my ($self, $x, $y) = @_;
620 740
621 $x -= $self->{x}; 741 $x -= $self->{x};
622 $y -= $self->{y}; 742 $y -= $self->{y};
623 743
624 my $res; 744 my $res;
625 745
626 for (reverse @{ $self->{children} }) { 746 for (reverse $self->visible_children) {
627 $res = $_->find_widget ($x, $y) 747 $res = $_->find_widget ($x, $y)
628 and return $res; 748 and return $res;
629 } 749 }
630 750
631 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 751 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
680 $self->{children}[0]->configure (0, 0, $w, $h); 800 $self->{children}[0]->configure (0, 0, $w, $h);
681} 801}
682 802
683############################################################################# 803#############################################################################
684 804
805# back-buffered drawing area
806
685package CFClient::UI::Window; 807package CFClient::UI::Window;
686 808
687our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
688 810
689use CFClient::OpenGL; 811use CFClient::OpenGL;
… …
707 $self->SUPER::size_allocate ($w, $h); 829 $self->SUPER::size_allocate ($w, $h);
708 $self->update; 830 $self->update;
709} 831}
710 832
711sub _render { 833sub _render {
834 my ($self) = @_;
835
712 $_[0]{children}[0]->draw; 836 $self->{children}[0]->draw;
713} 837}
714 838
715sub render_child { 839sub render_child {
716 my ($self) = @_; 840 my ($self) = @_;
717 841
718 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 842 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
719 glClearColor 0, 0, 0, 0; 843 glClearColor 0, 0, 0, 0;
720 glClear GL_COLOR_BUFFER_BIT; 844 glClear GL_COLOR_BUFFER_BIT;
721 845
846 {
847 package CFClient::UI::Base;
848
849 ($draw_x, $draw_y, $draw_w, $draw_h) =
850 (0, 0, $self->{w}, $self->{h});
851 }
852
722 $self->_render; 853 $self->_render;
723 }; 854 };
724} 855}
725 856
726sub _draw { 857sub _draw {
727 my ($self) = @_; 858 my ($self) = @_;
728 859
729 my ($w, $h) = ($self->w, $self->h); 860 my ($w, $h) = @$self{qw(w h)};
730 861
731 my $tex = $self->{texture} 862 my $tex = $self->{texture}
732 or return; 863 or return;
733 864
734 glEnable GL_TEXTURE_2D; 865 glEnable GL_TEXTURE_2D;
735 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
736 glColor 1, 1, 1, 1; 867 glColor 0, 0, 0, 1;
737 868
738 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 869 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
739 870
740 glDisable GL_TEXTURE_2D; 871 glDisable GL_TEXTURE_2D;
741} 872}
… …
744 875
745package CFClient::UI::ViewPort; 876package CFClient::UI::ViewPort;
746 877
747our @ISA = CFClient::UI::Window::; 878our @ISA = CFClient::UI::Window::;
748 879
880sub new {
881 my $class = shift;
882
883 $class->SUPER::new (
884 scroll_x => 0,
885 scroll_y => 1,
886 @_,
887 )
888}
889
749sub size_request { 890sub size_request {
750 my ($self) = @_; 891 my ($self) = @_;
751 892
752 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 893 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
753 894
754 @$self{qw(child_w child_h)} 895 $w = 10 if $self->{scroll_x};
896 $h = 10 if $self->{scroll_y};
897
898 ($w, $h)
755} 899}
756 900
757sub size_allocate { 901sub size_allocate {
758 my ($self, $w, $h) = @_; 902 my ($self, $w, $h) = @_;
759 903
760 my ($cw, $ch) = @$self{qw(child_w child_h)}; 904 my $child = $self->child;
761# $w = $self->{w}; 905
906 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
907 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
908
762 $self->child->configure (0, 0, $cw, $ch); 909 $self->child->configure (0, 0, $w, $h);
763 $self->update; 910 $self->update;
764} 911}
765 912
766sub set_offset { 913sub set_offset {
767 my ($self, $x, $y) = @_; 914 my ($self, $x, $y) = @_;
… …
801} 948}
802 949
803sub _render { 950sub _render {
804 my ($self) = @_; 951 my ($self) = @_;
805 952
953 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
954 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
955
806 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 956 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
807 957
808 $self->SUPER::_render; 958 $self->SUPER::_render;
809} 959}
810 960
… …
813package CFClient::UI::ScrolledWindow; 963package CFClient::UI::ScrolledWindow;
814 964
815our @ISA = CFClient::UI::HBox::; 965our @ISA = CFClient::UI::HBox::;
816 966
817sub new { 967sub new {
818 my $class = shift; 968 my ($class, %arg) = @_;
969
970 my $child = delete $arg{child};
819 971
820 my $self; 972 my $self;
821 973
822 my $slider = new CFClient::UI::Slider 974 my $slider = new CFClient::UI::Slider
823 vertical => 1, 975 vertical => 1,
824 range => [0, 0, 1, 0.01], # HACK fix 976 range => [0, 0, 1, 0.01], # HACK fix
825 connect_changed => sub { 977 on_changed => sub {
826 $self->{vp}->set_offset (0, $_[1]); 978 $self->{vp}->set_offset (0, $_[1]);
827 }, 979 },
828 ; 980 ;
829 981
830 $self = $class->SUPER::new ( 982 $self = $class->SUPER::new (
831 vp => (new CFClient::UI::ViewPort expand => 1), 983 vp => (new CFClient::UI::ViewPort expand => 1),
832 slider => $slider, 984 slider => $slider,
833 @_, 985 %arg,
834 ); 986 );
835 987
836 $self->{vp}->add ($self->{scrolled});
837 $self->add ($self->{vp});
838 $self->add ($self->{slider}); 988 $self->SUPER::add ($self->{vp}, $self->{slider});
989 $self->add ($child) if $child;
839 990
840 $self 991 $self
992}
993
994sub add {
995 my ($self, $widget) = @_;
996
997 $self->{vp}->add ($self->{child} = $widget);
998}
999
1000sub update {
1001 my ($self) = @_;
1002
1003 $self->SUPER::update;
1004
1005 # todo: overwrite size_allocate of child
1006 my $child = $self->{vp}->child;
1007 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
841} 1008}
842 1009
843sub size_allocate { 1010sub size_allocate {
844 my ($self, $w, $h) = @_; 1011 my ($self, $w, $h) = @_;
845 1012
… …
874 1041
875 if ($self->{bg}) { 1042 if ($self->{bg}) {
876 my ($w, $h) = @$self{qw(w h)}; 1043 my ($w, $h) = @$self{qw(w h)};
877 1044
878 glEnable GL_BLEND; 1045 glEnable GL_BLEND;
879 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1046 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
880 glColor @{ $self->{bg} }; 1047 glColor_premultiply @{ $self->{bg} };
881 1048
882 glBegin GL_QUADS; 1049 glBegin GL_QUADS;
883 glVertex 0 , 0; 1050 glVertex 0 , 0;
884 glVertex 0 , $h; 1051 glVertex 0 , $h;
885 glVertex $w, $h; 1052 glVertex $w, $h;
… …
898 1065
899our @ISA = CFClient::UI::Bin::; 1066our @ISA = CFClient::UI::Bin::;
900 1067
901use CFClient::OpenGL; 1068use CFClient::OpenGL;
902 1069
903my @tex = 1070my $bg =
1071 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1072 mipmap => 1, wrap => 1;
1073
1074my @border =
904 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1075 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); 1076 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
906 1077
907sub new { 1078sub new {
908 my $class = shift; 1079 my ($class, %arg) = @_;
909 1080
910 # TODO: user_x, user_y, overwrite moveto? 1081 my $title = delete $arg{title};
911 1082
912 my $self = $class->SUPER::new ( 1083 my $self = $class->SUPER::new (
913 bg => [1, 1, 1, 1], 1084 bg => [1, 1, 1, 1],
914 border_bg => [1, 1, 1, 1], 1085 border_bg => [1, 1, 1, 1],
915 border => 0.6, 1086 border => 0.6,
916 is_toplevel => 1,
917 can_events => 1, 1087 can_events => 1,
918 @_ 1088 min_w => 16,
1089 min_h => 16,
1090 %arg,
919 ); 1091 );
920 1092
921 $self->{title} &&= new CFClient::UI::Label 1093 $self->{title} = new CFClient::UI::Label
922 align => 0, 1094 align => 0,
923 valign => 1, 1095 valign => 1,
924 text => $self->{title}, 1096 text => $title,
925 fontsize => $self->{border}; 1097 fontsize => $self->{border}
1098 if defined $title;
926 1099
927 $self 1100 $self
1101}
1102
1103sub add {
1104 my ($self, @widgets) = @_;
1105
1106 $self->SUPER::add (@widgets);
1107 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
928} 1108}
929 1109
930sub border { 1110sub border {
931 int $_[0]{border} * $::FONTSIZE 1111 int $_[0]{border} * $::FONTSIZE
932} 1112}
933 1113
934sub size_request { 1114sub size_request {
935 my ($self) = @_; 1115 my ($self) = @_;
1116
1117 $self->{title}->size_request
1118 if $self->{title};
936 1119
937 my ($w, $h) = $self->SUPER::size_request; 1120 my ($w, $h) = $self->SUPER::size_request;
938 1121
939 ( 1122 (
940 $w + $self->border * 2, 1123 $w + $self->border * 2,
… …
943} 1126}
944 1127
945sub size_allocate { 1128sub size_allocate {
946 my ($self, $w, $h) = @_; 1129 my ($self, $w, $h) = @_;
947 1130
1131 if ($self->{title}) {
1132 $self->{title}{w} = $w;
1133 $self->{title}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h);
1135 }
1136
1137 my $border = $self->border;
1138
948 $h -= List::Util::max 0, $self->border * 2; 1139 $h -= List::Util::max 0, $border * 2;
949 $w -= List::Util::max 0, $self->border * 2; 1140 $w -= List::Util::max 0, $border * 2;
950 1141
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); 1142 $self->child->configure ($border, $border, $w, $h);
955} 1143}
956 1144
957sub button_down { 1145sub button_down {
958 my ($self, $ev, $x, $y) = @_; 1146 my ($self, $ev, $x, $y) = @_;
959 1147
… …
975 my ($ev, $x, $y) = @_; 1163 my ($ev, $x, $y) = @_;
976 1164
977 my $dx = $ev->{x} - $ox; 1165 my $dx = $ev->{x} - $ox;
978 my $dy = $ev->{y} - $oy; 1166 my $dy = $ev->{y} - $oy;
979 1167
980 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1168 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
981 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1169 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1170
982 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1171 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
983 $self->check_size; 1172 $self->realloc;
984 }; 1173 };
985 1174
986 } elsif ($lr ^ $td) { 1175 } elsif ($lr ^ $td) {
987 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1176 my ($ox, $oy) = ($ev->{x}, $ev->{y});
988 my ($bx, $by) = ($self->{x}, $self->{y}); 1177 my ($bx, $by) = ($self->{x}, $self->{y});
… …
990 $self->{motion} = sub { 1179 $self->{motion} = sub {
991 my ($ev, $x, $y) = @_; 1180 my ($ev, $x, $y) = @_;
992 1181
993 ($x, $y) = ($ev->{x}, $ev->{y}); 1182 ($x, $y) = ($ev->{x}, $ev->{y});
994 1183
995 $self->move ($bx + $x - $ox, $by + $y - $oy); 1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
996 $self->update; 1185 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
997 }; 1187 };
1188 } else {
1189 return 0;
1190 }
1191
998 } 1192 1
999} 1193}
1000 1194
1001sub button_up { 1195sub button_up {
1002 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
1003 1197
1004 delete $self->{motion}; 1198 !!delete $self->{motion}
1005} 1199}
1006 1200
1007sub mouse_motion { 1201sub mouse_motion {
1008 my ($self, $ev, $x, $y) = @_; 1202 my ($self, $ev, $x, $y) = @_;
1009 1203
1010 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1204 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205
1206 !!$self->{motion}
1011} 1207}
1012 1208
1013sub _draw { 1209sub _draw {
1014 my ($self) = @_; 1210 my ($self) = @_;
1015 1211
1212 my $child = $self->{children}[0];
1213
1016 my ($w, $h ) = ($self->{w}, $self->{h}); 1214 my ($w, $h ) = ($self->{w}, $self->{h});
1017 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1215 my ($cw, $ch) = ($child->{w}, $child->{h});
1018 1216
1019 glEnable GL_TEXTURE_2D; 1217 glEnable GL_TEXTURE_2D;
1020 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1021 1219
1022 my $border = $self->border; 1220 my $border = $self->border;
1023 1221
1024 glColor @{ $self->{border_bg} }; 1222 glColor @{ $self->{border_bg} };
1025 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1223 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1026 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1224 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1027 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1225 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1028 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1226 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1029 1227
1030 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1228 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1031 my $bg = $tex[0]; 1229 glColor @{ $self->{bg} };
1032 1230
1033 # TODO: repeat texture not scale 1231 # TODO: repeat texture not scale
1232 # solve this better(?)
1034 my $rep_x = $cw / $bg->{w}; 1233 $bg->{s} = $cw / $bg->{w};
1035 my $rep_y = $ch / $bg->{h}; 1234 $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); 1235 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1043 } 1236 }
1044 1237
1045 glDisable GL_TEXTURE_2D; 1238 glDisable GL_TEXTURE_2D;
1046 1239
1047 $self->{title}->draw if $self->{title};
1048
1049 $self->child->draw; 1240 $child->draw;
1241
1242 if ($self->{title}) {
1243 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw;
1245 }
1050} 1246}
1051 1247
1052############################################################################# 1248#############################################################################
1053 1249
1054package CFClient::UI::Table; 1250package CFClient::UI::Table;
… …
1062sub new { 1258sub new {
1063 my $class = shift; 1259 my $class = shift;
1064 1260
1065 $class->SUPER::new ( 1261 $class->SUPER::new (
1066 col_expand => [], 1262 col_expand => [],
1067 @_ 1263 @_,
1068 ) 1264 )
1265}
1266
1267sub children {
1268 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1069} 1269}
1070 1270
1071sub add { 1271sub add {
1072 my ($self, $x, $y, $child) = @_; 1272 my ($self, $x, $y, $child) = @_;
1073 1273
1074 $child->set_parent ($self); 1274 $child->set_parent ($self);
1075 $self->{children}[$y][$x] = $child; 1275 $self->{children}[$y][$x] = $child;
1076 1276
1077 $child->check_size; 1277 $self->realloc;
1078} 1278}
1079 1279
1080sub children {
1081 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1082}
1083
1084# TODO: move to container class maybe? send childs a signal on removal? 1280# TODO: move to container class maybe? send children a signal on removal?
1085sub clear { 1281sub clear {
1086 my ($self) = @_; 1282 my ($self) = @_;
1087 1283
1088 my @children = $self->children; 1284 my @children = $self->children;
1089 delete $self->{children}; 1285 delete $self->{children};
… …
1091 for (@children) { 1287 for (@children) {
1092 delete $_->{parent}; 1288 delete $_->{parent};
1093 $_->hide; 1289 $_->hide;
1094 } 1290 }
1095 1291
1096 $self->update; 1292 $self->realloc;
1097} 1293}
1098 1294
1099sub get_wh { 1295sub get_wh {
1100 my ($self) = @_; 1296 my ($self) = @_;
1101 1297
… …
1132sub size_allocate { 1328sub size_allocate {
1133 my ($self, $w, $h) = @_; 1329 my ($self, $w, $h) = @_;
1134 1330
1135 my ($ws, $hs) = $self->get_wh; 1331 my ($ws, $hs) = $self->get_wh;
1136 1332
1137 my $req_w = sum @$ws; 1333 my $req_w = (sum @$ws) || 1;
1138 my $req_h = sum @$hs; 1334 my $req_h = (sum @$hs) || 1;
1139 1335
1140 # TODO: nicer code && do row_expand 1336 # TODO: nicer code && do row_expand
1141 my @col_expand = @{$self->{col_expand}}; 1337 my @col_expand = @{$self->{col_expand}};
1142 @col_expand = (1) x @$ws unless @col_expand; 1338 @col_expand = (1) x @$ws unless @col_expand;
1143 my $col_expand = (sum @col_expand) || 1; 1339 my $col_expand = (sum @col_expand) || 1;
… …
1197 } 1393 }
1198} 1394}
1199 1395
1200############################################################################# 1396#############################################################################
1201 1397
1202package CFClient::UI::HBox; 1398package CFClient::UI::Box;
1203
1204# TODO: wrap into common Box base class
1205 1399
1206our @ISA = CFClient::UI::Container::; 1400our @ISA = CFClient::UI::Container::;
1207 1401
1208sub size_request { 1402sub size_request {
1209 my ($self) = @_; 1403 my ($self) = @_;
1210 1404
1211 my @alloc = map [$_->size_request], @{$self->{children}}; 1405 $self->{vertical}
1212 1406 ? (
1213 ( 1407 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1214 (List::Util::sum map $_->[0], @alloc), 1408 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1215 (List::Util::max map $_->[1], @alloc), 1409 )
1216 ) 1410 : (
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 )
1217} 1414}
1218 1415
1219sub size_allocate { 1416sub size_allocate {
1220 my ($self, $w, $h) = @_; 1417 my ($self, $w, $h) = @_;
1221 1418
1222 ($h, $w) = ($w, $h); 1419 my $space = $self->{vertical} ? $h : $w;
1223
1224 my $children = $self->{children}; 1420 my $children = $self->{children};
1225 1421
1226 my @h = map $_->{req_w}, @$children; 1422 my @req;
1227 1423
1228 my $req_h = List::Util::sum @h; 1424 if ($self->{homogeneous}) {
1229 1425 @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 { 1426 } else {
1427 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1428 my $req = List::Util::sum @req;
1429
1430 if ($req > $space) {
1431 # ah well, not enough space
1432 $_ *= $space / $req for @req;
1433 } else {
1234 my $exp = List::Util::sum map $_->{expand}, @$children; 1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1235 $exp ||= 1;
1236 1435
1436 $space = ($space - $req) / $expand; # remaining space to give away
1437
1438 $req[$_] += $space * $children->[$_]{expand}
1237 for (0 .. $#$children) { 1439 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 } 1440 }
1244 } 1441 }
1245 1442
1246 CFClient::UI::harmonize \@h; 1443 CFClient::UI::harmonize \@req;
1247 1444
1248 my $y = 0; 1445 my $pos = 0;
1249 for (0 .. $#$children) { 1446 for (0 .. $#$children) {
1250 my $child = $children->[$_];
1251 my $h = $h[$_]; 1447 my $alloc = $req[$_];
1252 $child->configure ($y, 0, $h, $w); 1448 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1253 1449
1254 $y += $h; 1450 $pos += $alloc;
1255 } 1451 }
1256 1452
1257 1 1453 1
1258} 1454}
1259 1455
1260############################################################################# 1456#############################################################################
1261 1457
1458package CFClient::UI::HBox;
1459
1460our @ISA = CFClient::UI::Box::;
1461
1462sub new {
1463 my $class = shift;
1464
1465 $class->SUPER::new (
1466 vertical => 0,
1467 @_,
1468 )
1469}
1470
1471#############################################################################
1472
1262package CFClient::UI::VBox; 1473package CFClient::UI::VBox;
1263 1474
1264# TODO: wrap into common Box base class
1265
1266our @ISA = CFClient::UI::Container::; 1475our @ISA = CFClient::UI::Box::;
1267 1476
1268sub size_request { 1477sub new {
1269 my ($self) = @_; 1478 my $class = shift;
1270 1479
1271 my @alloc = map [$_->size_request], @{$self->{children}}; 1480 $class->SUPER::new (
1272 1481 vertical => 1,
1273 ( 1482 @_,
1274 (List::Util::max map $_->[0], @alloc),
1275 (List::Util::sum map $_->[1], @alloc),
1276 ) 1483 )
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} 1484}
1317 1485
1318############################################################################# 1486#############################################################################
1319 1487
1320package CFClient::UI::Label; 1488package CFClient::UI::Label;
… …
1337 ellipsise => 3, # end 1505 ellipsise => 3, # end
1338 layout => (new CFClient::Layout), 1506 layout => (new CFClient::Layout),
1339 fontsize => 1, 1507 fontsize => 1,
1340 align => -1, 1508 align => -1,
1341 valign => -1, 1509 valign => -1,
1342 padding => 2, 1510 padding_x => 2,
1511 padding_y => 2,
1343 can_events => 0, 1512 can_events => 0,
1344 %arg 1513 %arg
1345 ); 1514 );
1346 1515
1347 if (exists $self->{template}) { 1516 if (exists $self->{template}) {
… …
1374 1543
1375 delete $self->{texture}; 1544 delete $self->{texture};
1376 $self->SUPER::update; 1545 $self->SUPER::update;
1377} 1546}
1378 1547
1548sub realloc {
1549 my ($self) = @_;
1550
1551 delete $self->{ox};
1552 $self->SUPER::realloc;
1553}
1554
1379sub set_text { 1555sub set_text {
1380 my ($self, $text) = @_; 1556 my ($self, $text) = @_;
1381 1557
1382 return if $self->{text} eq "T$text"; 1558 return if $self->{text} eq "T$text";
1383 $self->{text} = "T$text"; 1559 $self->{text} = "T$text";
1384 1560
1385 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1386 $self->{layout}->set_text ($text); 1562 $self->{layout}->set_text ($text);
1387 1563
1564 delete $self->{req_h};
1565 $self->realloc;
1388 $self->update; 1566 $self->update;
1389 $self->check_size;
1390} 1567}
1391 1568
1392sub set_markup { 1569sub set_markup {
1393 my ($self, $markup) = @_; 1570 my ($self, $markup) = @_;
1394 1571
… …
1398 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1575 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1399 1576
1400 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1401 $self->{layout}->set_markup ($markup); 1578 $self->{layout}->set_markup ($markup);
1402 1579
1580 delete $self->{req_h};
1581 $self->realloc;
1403 $self->update; 1582 $self->update;
1404 $self->check_size;
1405} 1583}
1406 1584
1407sub size_request { 1585sub size_request {
1408 my ($self) = @_; 1586 my ($self) = @_;
1409 1587
1588 if (exists $self->{req_h}) {
1589 @$self{qw(req_w req_h)}
1590 } else {
1410 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1591 $self->{layout}->set_font ($self->{font}) if $self->{font};
1411 $self->{layout}->set_width ($self->{max_w} || -1); 1592 $self->{layout}->set_width ($self->{max_w} || -1);
1412 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1593 $self->{layout}->set_ellipsise ($self->{ellipsise});
1413 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1414 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1415 1596
1416 my ($w, $h) = $self->{layout}->size; 1597 my ($w, $h) = $self->{layout}->size;
1417 1598
1418 if (exists $self->{template}) { 1599 if (exists $self->{template}) {
1419 $self->{template}->set_font ($self->{font}) if $self->{font}; 1600 $self->{template}->set_font ($self->{font}) if $self->{font};
1420 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1421 1602
1422 my ($w2, $h2) = $self->{template}->size; 1603 my ($w2, $h2) = $self->{template}->size;
1423 1604
1424 $w = List::Util::max $w, $w2; 1605 $w = List::Util::max $w, $w2;
1425 $h = List::Util::max $h, $h2; 1606 $h = List::Util::max $h, $h2;
1426 } 1607 }
1427 1608
1609 ($w, $h)
1428 ( 1610 }
1429 $w + $self->{padding} * 2,
1430 $h + $self->{padding} * 2,
1431 )
1432} 1611}
1433 1612
1434sub size_allocate { 1613sub size_allocate {
1435 my ($self, $w, $h) = @_; 1614 my ($self, $w, $h) = @_;
1436 1615
1616 delete $self->{ox};
1617
1437 delete $self->{texture}; 1618 delete $self->{texture}
1619 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1438} 1620}
1439 1621
1440sub set_fontsize { 1622sub set_fontsize {
1441 my ($self, $fontsize) = @_; 1623 my ($self, $fontsize) = @_;
1442 1624
1443 $self->{fontsize} = $fontsize; 1625 $self->{fontsize} = $fontsize;
1444 delete $self->{texture}; 1626 delete $self->{texture};
1445 1627
1446 $self->update; 1628 $self->realloc;
1447 $self->check_size;
1448} 1629}
1449 1630
1450sub _draw { 1631sub _draw {
1451 my ($self) = @_; 1632 my ($self) = @_;
1452 1633
… …
1458 $self->{layout}->set_width ($self->{w}); 1639 $self->{layout}->set_width ($self->{w});
1459 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1640 $self->{layout}->set_ellipsise ($self->{ellipsise});
1460 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1461 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1462 1643
1463 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1644 new_from_layout CFClient::Texture $self->{layout}
1645 };
1464 1646
1647 unless (exists $self->{ox}) {
1465 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1466 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1467 : ($self->{w} - $tex->{w}) * 0.5); 1650 : ($self->{w} - $tex->{w}) * 0.5);
1468 1651
1469 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1470 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1471 : ($self->{h} - $tex->{h}) * 0.5); 1654 : ($self->{h} - $tex->{h}) * 0.5);
1472
1473 $tex
1474 }; 1655 };
1475 1656
1476 glEnable GL_TEXTURE_2D; 1657 glEnable GL_TEXTURE_2D;
1477 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1478 1658
1479 if ($tex->{format} == GL_ALPHA) { 1659 if ($tex->{format} == GL_ALPHA) {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1480 glColor @{$self->{fg}}; 1661 glColor @{$self->{fg}};
1481 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1482 } else { 1663 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1483 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1484 } 1666 }
1485 1667
1486 glDisable GL_TEXTURE_2D; 1668 glDisable GL_TEXTURE_2D;
1487} 1669}
… …
1516 1698
1517 delete $self->{cur_h}; 1699 delete $self->{cur_h};
1518 1700
1519 return if $self->{text} eq $text; 1701 return if $self->{text} eq $text;
1520 1702
1521 delete $self->{texture};
1522
1523 $self->{last_activity} = $::NOW; 1703 $self->{last_activity} = $::NOW;
1524 $self->{text} = $text; 1704 $self->{text} = $text;
1525 1705
1526 $text =~ s/./*/g if $self->{hidden}; 1706 $text =~ s/./*/g if $self->{hidden};
1527 $self->{layout}->set_text ("$text "); 1707 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h};
1528 1709
1529 $self->emit (changed => $self->{text}); 1710 $self->_emit (changed => $self->{text});
1711
1712 $self->realloc;
1713 $self->update;
1530} 1714}
1531 1715
1532sub set_text { 1716sub set_text {
1533 my ($self, $text) = @_; 1717 my ($self, $text) = @_;
1534 1718
1535 $self->{cursor} = length $text; 1719 $self->{cursor} = length $text;
1536 $self->_set_text ($text); 1720 $self->_set_text ($text);
1537 $self->update;
1538 $self->check_size;
1539} 1721}
1540 1722
1541sub get_text { 1723sub get_text {
1542 $_[0]{text} 1724 $_[0]{text}
1543} 1725}
… …
1546 my ($self) = @_; 1728 my ($self) = @_;
1547 1729
1548 my ($w, $h) = $self->SUPER::size_request; 1730 my ($w, $h) = $self->SUPER::size_request;
1549 1731
1550 ($w + 1, $h) # add 1 for cursor 1732 ($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} 1733}
1558 1734
1559sub key_down { 1735sub key_down {
1560 my ($self, $ev) = @_; 1736 my ($self, $ev) = @_;
1561 1737
… …
1576 } elsif ($sym == CFClient::SDLK_HOME) { 1752 } elsif ($sym == CFClient::SDLK_HOME) {
1577 $self->{cursor} = 0; 1753 $self->{cursor} = 0;
1578 } elsif ($sym == CFClient::SDLK_END) { 1754 } elsif ($sym == CFClient::SDLK_END) {
1579 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1580 } elsif ($uni == 27) { 1756 } elsif ($uni == 27) {
1581 $self->emit ('escape'); 1757 $self->_emit ('escape');
1582 } elsif ($uni) { 1758 } elsif ($uni) {
1583 substr $text, $self->{cursor}++, 0, chr $uni; 1759 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else {
1761 return 0;
1584 } 1762 }
1585 1763
1586 $self->_set_text ($text); 1764 $self->_set_text ($text);
1587 $self->update; 1765
1588 $self->check_size; 1766 $self->realloc;
1767
1768 1
1589} 1769}
1590 1770
1591sub focus_in { 1771sub focus_in {
1592 my ($self) = @_; 1772 my ($self) = @_;
1593 1773
… …
1608 utf8::encode $text; 1788 utf8::encode $text;
1609 $self->{cursor} = length substr $text, 0, $idx; 1789 $self->{cursor} = length substr $text, 0, $idx;
1610 1790
1611 $self->_set_text ($self->{text}); 1791 $self->_set_text ($self->{text});
1612 $self->update; 1792 $self->update;
1793
1794 1
1613} 1795}
1614 1796
1615sub mouse_motion { 1797sub mouse_motion {
1616 my ($self, $ev, $x, $y) = @_; 1798 my ($self, $ev, $x, $y) = @_;
1617# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1799# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1800
1801 0
1618} 1802}
1619 1803
1620sub _draw { 1804sub _draw {
1621 my ($self) = @_; 1805 my ($self) = @_;
1622 1806
1623 local $self->{fg} = $self->{fg}; 1807 local $self->{fg} = $self->{fg};
1624 1808
1625 if ($FOCUS == $self) { 1809 if ($FOCUS == $self) {
1626 glColor @{$self->{active_bg}}; 1810 glColor_premultiply @{$self->{active_bg}};
1627 $self->{fg} = $self->{active_fg}; 1811 $self->{fg} = $self->{active_fg};
1628 } else { 1812 } else {
1629 glColor @{$self->{bg}}; 1813 glColor_premultiply @{$self->{bg}};
1630 } 1814 }
1631 1815
1632 glEnable GL_BLEND; 1816 glEnable GL_BLEND;
1633 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1817 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1634 glBegin GL_QUADS; 1818 glBegin GL_QUADS;
1635 glVertex 0 , 0; 1819 glVertex 0 , 0;
1636 glVertex 0 , $self->{h}; 1820 glVertex 0 , $self->{h};
1637 glVertex $self->{w}, $self->{h}; 1821 glVertex $self->{w}, $self->{h};
1638 glVertex $self->{w}, 0; 1822 glVertex $self->{w}, 0;
… …
1673 if ($sym == 13) { 1857 if ($sym == 13) {
1674 unshift @{$self->{history}}, 1858 unshift @{$self->{history}},
1675 my $txt = $self->get_text; 1859 my $txt = $self->get_text;
1676 $self->{history_pointer} = -1; 1860 $self->{history_pointer} = -1;
1677 $self->{history_saveback} = ''; 1861 $self->{history_saveback} = '';
1678 $self->emit (activate => $txt); 1862 $self->_emit (activate => $txt);
1679 $self->update; 1863 $self->update;
1680 1864
1681 } elsif ($sym == CFClient::SDLK_UP) { 1865 } elsif ($sym == CFClient::SDLK_UP) {
1682 if ($self->{history_pointer} < 0) { 1866 if ($self->{history_pointer} < 0) {
1683 $self->{history_saveback} = $self->get_text; 1867 $self->{history_saveback} = $self->get_text;
… …
1699 } else { 1883 } else {
1700 $self->set_text ($self->{history_saveback}); 1884 $self->set_text ($self->{history_saveback});
1701 } 1885 }
1702 1886
1703 } else { 1887 } else {
1704 $self->SUPER::key_down ($ev); 1888 return $self->SUPER::key_down ($ev)
1889 }
1890
1705 } 1891 1
1706
1707} 1892}
1708 1893
1709############################################################################# 1894#############################################################################
1710 1895
1711package CFClient::UI::Button; 1896package CFClient::UI::Button;
… …
1720 1905
1721sub new { 1906sub new {
1722 my $class = shift; 1907 my $class = shift;
1723 1908
1724 $class->SUPER::new ( 1909 $class->SUPER::new (
1725 padding => 4, 1910 padding_x => 4,
1911 padding_y => 4,
1726 fg => [1, 1, 1], 1912 fg => [1, 1, 1],
1727 active_fg => [0, 0, 1], 1913 active_fg => [0, 0, 1],
1728 can_hover => 1, 1914 can_hover => 1,
1729 align => 0, 1915 align => 0,
1730 valign => 0, 1916 valign => 0,
1731 can_events => 1, 1917 can_events => 1,
1732 @_ 1918 @_
1733 ) 1919 )
1734} 1920}
1735 1921
1922sub activate { }
1923
1736sub button_up { 1924sub button_up {
1737 my ($self, $ev, $x, $y) = @_; 1925 my ($self, $ev, $x, $y) = @_;
1738 1926
1927 $self->emit ("activate")
1739 if ($x >= 0 && $x < $self->{w} 1928 if $x >= 0 && $x < $self->{w}
1740 && $y >= 0 && $y < $self->{h}) { 1929 && $y >= 0 && $y < $self->{h};
1741 $self->emit ("activate"); 1930
1742 } 1931 1
1743} 1932}
1744 1933
1745sub _draw { 1934sub _draw {
1746 my ($self) = @_; 1935 my ($self) = @_;
1747 1936
1748 local $self->{fg} = $self->{fg}; 1937 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1749
1750 if ($GRAB == $self) {
1751 $self->{fg} = $self->{active_fg};
1752 }
1753 1938
1754 glEnable GL_TEXTURE_2D; 1939 glEnable GL_TEXTURE_2D;
1755 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1940 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1756 glColor 0, 0, 0, 1; 1941 glColor 0, 0, 0, 1;
1757 1942
… …
1776 1961
1777sub new { 1962sub new {
1778 my $class = shift; 1963 my $class = shift;
1779 1964
1780 $class->SUPER::new ( 1965 $class->SUPER::new (
1781 padding => 2, 1966 padding_x => 2,
1967 padding_y => 2,
1782 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1783 active_fg => [1, 1, 0], 1969 active_fg => [1, 1, 0],
1784 bg => [0, 0, 0, 0.2], 1970 bg => [0, 0, 0, 0.2],
1785 active_bg => [1, 1, 1, 0.5], 1971 active_bg => [1, 1, 1, 0.5],
1786 state => 0, 1972 state => 0,
… …
1790} 1976}
1791 1977
1792sub size_request { 1978sub size_request {
1793 my ($self) = @_; 1979 my ($self) = @_;
1794 1980
1795 ($self->{padding} * 2 + 6) x 2 1981 (6) x 2
1796} 1982}
1797 1983
1798sub button_down { 1984sub button_down {
1799 my ($self, $ev, $x, $y) = @_; 1985 my ($self, $ev, $x, $y) = @_;
1800 1986
1801 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1802 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1803 $self->{state} = !$self->{state}; 1989 $self->{state} = !$self->{state};
1804 $self->emit (changed => $self->{state}); 1990 $self->_emit (changed => $self->{state});
1991 } else {
1992 return 0
1993 }
1994
1805 } 1995 1
1806} 1996}
1807 1997
1808sub _draw { 1998sub _draw {
1809 my ($self) = @_; 1999 my ($self) = @_;
1810 2000
1811 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
1812 2002
1813 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2003 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1814 2004
1815 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2005 my ($w, $h) = @$self{qw(w h)};
2006
2007 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1816 2008
1817 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2009 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1818 2010
1819 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2011 my $tex = $self->{state} ? $tex[1] : $tex[0];
1820 2012
… …
1975 2167
1976 my $h1 = $self->{h} * (1 - $ycut1); 2168 my $h1 = $self->{h} * (1 - $ycut1);
1977 my $h2 = $self->{h} * (1 - $ycut2); 2169 my $h2 = $self->{h} * (1 - $ycut2);
1978 2170
1979 glEnable GL_BLEND; 2171 glEnable GL_BLEND;
1980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1981 glEnable GL_TEXTURE_2D; 2174 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2175 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983 2176
1984 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2177 glBindTexture GL_TEXTURE_2D, $t1->{name};
1985 glBegin GL_QUADS; 2178 glBegin GL_QUADS;
… …
2085 fg => [1, 1, 1], 2278 fg => [1, 1, 1],
2086 active_fg => [0, 0, 0], 2279 active_fg => [0, 0, 0],
2087 bg => [0, 0, 0, 0.2], 2280 bg => [0, 0, 0, 0.2],
2088 active_bg => [1, 1, 1, 0.5], 2281 active_bg => [1, 1, 1, 0.5],
2089 range => [0, 0, 100, 10, 0], 2282 range => [0, 0, 100, 10, 0],
2090 req_w => $::WIDTH / 80, 2283 min_w => $::WIDTH / 80,
2091 req_h => $::WIDTH / 80, 2284 min_h => $::WIDTH / 80,
2092 vertical => 0, 2285 vertical => 0,
2093 can_hover => 1, 2286 can_hover => 1,
2094 inner_pad => 0.02, 2287 inner_pad => 0.02,
2095 @_ 2288 @_
2096 ); 2289 );
… …
2099 $self->update; 2292 $self->update;
2100 2293
2101 $self 2294 $self
2102} 2295}
2103 2296
2297sub changed { }
2298
2104sub set_range { 2299sub set_range {
2105 my ($self, $range) = @_; 2300 my ($self, $range) = @_;
2106 2301
2107 $self->{range} = $range; 2302 ($range, $self->{range}) = ($self->{range}, $range);
2108 2303
2109 $self->update; 2304 $self->update
2305 if "@$range" ne "@{$self->{range}}";
2110} 2306}
2111 2307
2112sub set_value { 2308sub set_value {
2113 my ($self, $value) = @_; 2309 my ($self, $value) = @_;
2114 2310
… …
2125 if $unit; 2321 if $unit;
2126 2322
2127 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2323 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2128 2324
2129 if ($value != $old_value) { 2325 if ($value != $old_value) {
2130 $self->emit (changed => $value); 2326 $self->_emit (changed => $value);
2131 $self->update; 2327 $self->update;
2132 } 2328 }
2133} 2329}
2134 2330
2135sub size_request { 2331sub size_request {
2136 my ($self) = @_; 2332 my ($self) = @_;
2137 2333
2138 my $w = $self->{req_w}; 2334 ($self->{req_w}, $self->{req_h})
2139 my $h = $self->{req_h};
2140
2141 $self->{vertical} ? ($h, $w) : ($w, $h)
2142} 2335}
2143 2336
2144sub button_down { 2337sub button_down {
2145 my ($self, $ev, $x, $y) = @_; 2338 my ($self, $ev, $x, $y) = @_;
2146 2339
2147 $self->SUPER::button_down ($ev, $x, $y); 2340 $self->SUPER::button_down ($ev, $x, $y);
2148 2341
2149 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2150 2343
2151 $self->mouse_motion ($ev, $x, $y); 2344 $self->mouse_motion ($ev, $x, $y)
2152} 2345}
2153 2346
2154sub mouse_motion { 2347sub mouse_motion {
2155 my ($self, $ev, $x, $y) = @_; 2348 my ($self, $ev, $x, $y) = @_;
2156 2349
… …
2160 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2353 my (undef, $lo, $hi, $page) = @{$self->{range}};
2161 2354
2162 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2355 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2163 2356
2164 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2357 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2358 } else {
2359 return 0;
2360 }
2361
2165 } 2362 1
2166} 2363}
2167 2364
2168sub update { 2365sub update {
2169 my ($self) = @_; 2366 my ($self) = @_;
2170 2367
2171 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2368 delete $self->{knob_w};
2369 $self->SUPER::update;
2370}
2371
2372sub _draw {
2373 my ($self) = @_;
2374
2375 unless ($self->{knob_w}) {
2172 $self->set_value ($self->{range}[0]); 2376 $self->set_value ($self->{range}[0]);
2173 2377
2174 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2378 my ($value, $lo, $hi, $page) = @{$self->{range}};
2175 my $range = ($hi - $page - $lo) || 1e-100; 2379 my $range = ($hi - $page - $lo) || 1e-100;
2176 2380
… …
2182 $value = ($value - $lo) / $range; 2386 $value = ($value - $lo) / $range;
2183 $value = $value * $self->{scale} + $self->{offset}; 2387 $value = $value * $self->{scale} + $self->{offset};
2184 2388
2185 $self->{knob_x} = $value - $knob_w * 0.5; 2389 $self->{knob_x} = $value - $knob_w * 0.5;
2186 $self->{knob_w} = $knob_w; 2390 $self->{knob_w} = $knob_w;
2187 }); 2391 }
2188
2189 $self->SUPER::update;
2190}
2191
2192sub _draw {
2193 my ($self) = @_;
2194 2392
2195 $self->SUPER::_draw (); 2393 $self->SUPER::_draw ();
2196 2394
2197 glScale $self->{w}, $self->{h}; 2395 glScale $self->{w}, $self->{h};
2198 2396
… …
2392 2590
2393 delete $self->{texture}; 2591 delete $self->{texture};
2394 } 2592 }
2395 2593
2396 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2397 glClearColor 0.5, 0.5, 0.5, 0; 2595 glClearColor 0, 0, 0, 0;
2398 glClear GL_COLOR_BUFFER_BIT; 2596 glClear GL_COLOR_BUFFER_BIT;
2399 2597
2400 my $top = int $self->{children}[1]{range}[0]; 2598 my $top = int $self->{children}[1]{range}[0];
2401 2599
2402 my $y0 = $top; 2600 my $y0 = $top;
… …
2437sub _draw { 2635sub _draw {
2438 my ($self) = @_; 2636 my ($self) = @_;
2439 2637
2440 glEnable GL_TEXTURE_2D; 2638 glEnable GL_TEXTURE_2D;
2441 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2442 glColor 1, 1, 1, 1; 2640 glColor 0, 0, 0, 1;
2443 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2641 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2444 glDisable GL_TEXTURE_2D; 2642 glDisable GL_TEXTURE_2D;
2445 2643
2446 $self->{children}[1]->draw; 2644 $self->{children}[1]->draw;
2447 2645
2448} 2646}
… …
2497 2695
2498sub new { 2696sub new {
2499 my $class = shift; 2697 my $class = shift;
2500 2698
2501 my $self = $class->SUPER::new ( 2699 my $self = $class->SUPER::new (
2502 state => 0, 2700 state => 0,
2503 connect_activate => \&toggle_flopper, 2701 on_activate => \&toggle_flopper,
2504 @_ 2702 @_
2505 ); 2703 );
2506 2704
2507 if ($self->{state}) {
2508 $self->{state} = 0;
2509 $self->toggle_flopper;
2510 }
2511
2512 $self 2705 $self
2513} 2706}
2514 2707
2515sub toggle_flopper { 2708sub toggle_flopper {
2516 my ($self) = @_; 2709 my ($self) = @_;
2517 2710
2518 # TODO: use animation 2711 $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} 2712}
2530 2713
2531############################################################################# 2714#############################################################################
2532 2715
2533package CFClient::UI::Tooltip; 2716package CFClient::UI::Tooltip;
… …
2546} 2729}
2547 2730
2548sub set_tooltip_from { 2731sub set_tooltip_from {
2549 my ($self, $widget) = @_; 2732 my ($self, $widget) = @_;
2550 2733
2734 my $tooltip = $widget->{tooltip};
2735
2736 if ($ENV{CFPLUS_DEBUG} & 2) {
2737 $tooltip .= "\n\n" . (ref $widget) . "\n"
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}";
2741 }
2742
2551 $self->add (new CFClient::UI::Label 2743 $self->add (new CFClient::UI::Label
2552 markup => $widget->{tooltip}, 2744 markup => $tooltip,
2553 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2554 fontsize => 0.8, 2746 fontsize => 0.8,
2555 fg => [0, 0, 0, 1], 2747 fg => [0, 0, 0, 1],
2556 ellipsise => 0, 2748 ellipsise => 0,
2557 font => ($widget->{tooltip_font} || $::FONT_PROP), 2749 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2568 2760
2569sub size_allocate { 2761sub size_allocate {
2570 my ($self, $w, $h) = @_; 2762 my ($self, $w, $h) = @_;
2571 2763
2572 $self->SUPER::size_allocate ($w - 4, $h - 4); 2764 $self->SUPER::size_allocate ($w - 4, $h - 4);
2765}
2766
2767sub visibility_change {
2768 my ($self, $visible) = @_;
2769
2770 return unless $visible;
2771
2772 $self->{root}->on_post_alloc ("move_$self" => sub {
2773 my $widget = $self->{owner}
2774 or return;
2775
2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777
2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779 if $x + $self->{w} > $::WIDTH;
2780
2781 $self->move_abs ($x, $y);
2782 });
2573} 2783}
2574 2784
2575sub _draw { 2785sub _draw {
2576 my ($self) = @_; 2786 my ($self) = @_;
2577 2787
… …
2594 glVertex $w, $h; 2804 glVertex $w, $h;
2595 glVertex $w, 0; 2805 glVertex $w, 0;
2596 glEnd; 2806 glEnd;
2597 2807
2598 glTranslate 2 - 0.375, 2 - 0.375; 2808 glTranslate 2 - 0.375, 2 - 0.375;
2809
2599 $self->SUPER::_draw; 2810 $self->SUPER::_draw;
2600} 2811}
2601 2812
2602############################################################################# 2813#############################################################################
2603 2814
… …
2609 2820
2610sub new { 2821sub new {
2611 my $class = shift; 2822 my $class = shift;
2612 2823
2613 my $self = $class->SUPER::new ( 2824 my $self = $class->SUPER::new (
2614 aspect => 1, 2825 aspect => 1,
2826 can_events => 0,
2615 @_, 2827 @_,
2616 ); 2828 );
2617 2829
2618 if ($self->{anim} && $self->{animspeed}) { 2830 if ($self->{anim} && $self->{animspeed}) {
2619 Scalar::Util::weaken (my $widget = $self); 2831 Scalar::Util::weaken (my $widget = $self);
… …
2661 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2873 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2662 2874
2663 if ($tex) { 2875 if ($tex) {
2664 glEnable GL_TEXTURE_2D; 2876 glEnable GL_TEXTURE_2D;
2665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2877 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2666 glColor 1, 1, 1, 1; 2878 glColor 0, 0, 0, 1;
2667 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2668 glDisable GL_TEXTURE_2D; 2880 glDisable GL_TEXTURE_2D;
2669 } 2881 }
2670} 2882}
2671 2883
… …
2678 $self->SUPER::DESTROY; 2890 $self->SUPER::DESTROY;
2679} 2891}
2680 2892
2681############################################################################# 2893#############################################################################
2682 2894
2683package CFClient::UI::InventoryItem; 2895package CFClient::UI::Buttonbar;
2684 2896
2685our @ISA = CFClient::UI::HBox::; 2897our @ISA = CFClient::UI::HBox::;
2686 2898
2687sub _item_to_desc { 2899# 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 2900
2844############################################################################# 2901#############################################################################
2845 2902
2846package CFClient::UI::Menu; 2903package CFClient::UI::Menu;
2847 2904
… …
2881 2938
2882# popup given the event (must be a mouse button down event currently) 2939# popup given the event (must be a mouse button down event currently)
2883sub popup { 2940sub popup {
2884 my ($self, $ev) = @_; 2941 my ($self, $ev) = @_;
2885 2942
2886 $self->emit ("popdown"); 2943 $self->_emit ("popdown");
2887 2944
2888 # maybe save $GRAB? must be careful about events... 2945 # maybe save $GRAB? must be careful about events...
2889 $GRAB = $self; 2946 $GRAB = $self;
2890 $self->{button} = $ev->{button}; 2947 $self->{button} = $ev->{button};
2891 2948
2892 $self->show; 2949 $self->show;
2893 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2950 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2894} 2951}
2895 2952
2896sub mouse_motion { 2953sub mouse_motion {
2897 my ($self, $ev, $x, $y) = @_; 2954 my ($self, $ev, $x, $y) = @_;
2898 2955
2899 # TODO: should use vbox->find_widget or so 2956 # TODO: should use vbox->find_widget or so
2900 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2901 $self->{hover} = $self->{item}{$HOVER}; 2958 $self->{hover} = $self->{item}{$HOVER};
2959
2960 0
2902} 2961}
2903 2962
2904sub button_up { 2963sub button_up {
2905 my ($self, $ev, $x, $y) = @_; 2964 my ($self, $ev, $x, $y) = @_;
2906 2965
2907 if ($ev->{button} == $self->{button}) { 2966 if ($ev->{button} == $self->{button}) {
2908 undef $GRAB; 2967 undef $GRAB;
2909 $self->hide; 2968 $self->hide;
2910 2969
2911 $self->emit ("popdown"); 2970 $self->_emit ("popdown");
2912 $self->{hover}[1]->() if $self->{hover}; 2971 $self->{hover}[1]->() if $self->{hover};
2972 } else {
2973 return 0
2974 }
2975
2913 } 2976 1
2914} 2977}
2915 2978
2916############################################################################# 2979#############################################################################
2917 2980
2918package CFClient::UI::Statusbox; 2981package CFClient::UI::Multiplexer;
2919 2982
2920our @ISA = CFClient::UI::VBox::; 2983our @ISA = CFClient::UI::Container::;
2921 2984
2922sub new { 2985sub new {
2923 my $class = shift; 2986 my $class = shift;
2924 2987
2925 $class->SUPER::new ( 2988 my $self = $class->SUPER::new (
2989 @_,
2990 );
2991
2992 $self->{current} = $self->{children}[0]
2993 if @{ $self->{children} };
2994
2995 $self
2996}
2997
2998sub add {
2999 my ($self, @widgets) = @_;
3000
3001 $self->SUPER::add (@widgets);
3002
3003 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} };
3005}
3006
3007sub set_current_page {
3008 my ($self, $page_or_widget) = @_;
3009
3010 my $widget = ref $page_or_widget
3011 ? $page_or_widget
3012 : $self->{children}[$page_or_widget];
3013
3014 $self->{current} = $widget;
3015 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016
3017 $self->_emit (page_changed => $self->{current});
3018
3019 $self->realloc;
3020}
3021
3022sub visible_children {
3023 $_[0]{current}
3024}
3025
3026sub size_request {
3027 my ($self) = @_;
3028
3029 $self->{current}->size_request
3030}
3031
3032sub size_allocate {
3033 my ($self, $w, $h) = @_;
3034
3035 $self->{current}->configure (0, 0, $w, $h);
3036}
3037
3038sub _draw {
3039 my ($self) = @_;
3040
3041 $self->{current}->draw;
3042}
3043
3044#############################################################################
3045
3046package CFClient::UI::Notebook;
3047
3048our @ISA = CFClient::UI::VBox::;
3049
3050sub new {
3051 my $class = shift;
3052
3053 my $self = $class->SUPER::new (
3054 buttonbar => (new CFClient::UI::Buttonbar),
3055 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3056 # filter => # will be put between multiplexer and $self
3057 @_,
3058 );
3059
3060 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3061 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3062
3063 $self
3064}
3065
3066sub add {
3067 my ($self, $title, $widget, $tooltip) = @_;
3068
3069 Scalar::Util::weaken $self;
3070
3071 $self->{buttonbar}->add (new CFClient::UI::Button
3072 markup => $title,
3073 tooltip => $tooltip,
3074 on_activate => sub { $self->set_current_page ($widget) },
3075 );
3076
3077 $self->{multiplexer}->add ($widget);
3078}
3079
3080sub set_current_page {
3081 my ($self, $page) = @_;
3082
3083 $self->{multiplexer}->set_current_page ($page);
3084 $self->_emit (page_changed => $self->{multiplexer}{current});
3085}
3086
3087#############################################################################
3088
3089package CFClient::UI::Statusbox;
3090
3091our @ISA = CFClient::UI::VBox::;
3092
3093sub new {
3094 my $class = shift;
3095
3096 my $self = $class->SUPER::new (
2926 fontsize => 0.8, 3097 fontsize => 0.8,
2927 @_, 3098 @_,
2928 ) 3099 );
3100
3101 Scalar::Util::weaken (my $this = $self);
3102
3103 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3104
3105 $self
2929} 3106}
2930 3107
2931sub reorder { 3108sub reorder {
2932 my ($self) = @_; 3109 my ($self) = @_;
2933 my $NOW = time; 3110 my $NOW = Time::HiRes::time;
3111
3112 # freeze display when hovering over any label
3113 return if $CFClient::UI::TOOLTIP->{owner}
3114 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3115 values %{ $self->{item} };
2934 3116
2935 while (my ($k, $v) = each %{ $self->{item} }) { 3117 while (my ($k, $v) = each %{ $self->{item} }) {
2936 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3118 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2937 } 3119 }
2938 3120
… …
2941 my @items = sort { 3123 my @items = sort {
2942 $a->{pri} <=> $b->{pri} 3124 $a->{pri} <=> $b->{pri}
2943 or $b->{id} <=> $a->{id} 3125 or $b->{id} <=> $a->{id}
2944 } values %{ $self->{item} }; 3126 } values %{ $self->{item} };
2945 3127
3128 $self->{timer}->interval (1);
3129
2946 my $count = 10 + 1; 3130 my $count = 10 + 1;
2947 for my $item (@items) { 3131 for my $item (@items) {
2948 last unless --$count; 3132 last unless --$count;
2949 3133
2950 push @widgets, $item->{label} ||= do { 3134 my $label = $item->{label} ||= do {
2951 # TODO: doesn't handle markup well (read as: at all) 3135 # TODO: doesn't handle markup well (read as: at all)
2952 my $short = $item->{count} > 1 3136 my $short = $item->{count} > 1
2953 ? "<b>$item->{count} ×</b> $item->{text}" 3137 ? "<b>$item->{count} ×</b> $item->{text}"
2954 : $item->{text}; 3138 : $item->{text};
2955 3139
… …
2963 tooltip => $item->{tooltip}, 3147 tooltip => $item->{tooltip},
2964 tooltip_font => $::FONT_PROP, 3148 tooltip_font => $::FONT_PROP,
2965 tooltip_width => 0.67, 3149 tooltip_width => 0.67,
2966 fontsize => $item->{fontsize} || $self->{fontsize}, 3150 fontsize => $item->{fontsize} || $self->{fontsize},
2967 max_w => $::WIDTH * 0.44, 3151 max_w => $::WIDTH * 0.44,
2968 fg => $item->{fg}, 3152 fg => [@{ $item->{fg} }],
2969 can_events => 1, 3153 can_events => 1,
2970 can_hover => 1 3154 can_hover => 1
2971 }; 3155 };
3156
3157 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3158 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3159 $label->update;
3160 $label->set_max_size (undef, $label->{req_h} * $diff)
3161 if $diff < 1;
3162 $self->{timer}->interval (1/30);
3163 } else {
3164 $label->{fg}[3] = $item->{fg}[3] || 1;
3165 }
3166
3167 push @widgets, $label;
2972 } 3168 }
2973 3169
2974 $self->clear; 3170 $self->clear;
2975 $self->SUPER::add (reverse @widgets); 3171 $self->SUPER::add (reverse @widgets);
2976} 3172}
… …
2979 my ($self, $text, %arg) = @_; 3175 my ($self, $text, %arg) = @_;
2980 3176
2981 $text =~ s/^\s+//; 3177 $text =~ s/^\s+//;
2982 $text =~ s/\s+$//; 3178 $text =~ s/\s+$//;
2983 3179
3180 return unless $text;
3181
2984 my $timeout = time + ((delete $arg{timeout}) || 60); 3182 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2985 3183
2986 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3184 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2987 3185
2988 if (my $item = $self->{item}{$group}) { 3186 if (my $item = $self->{item}{$group}) {
2989 if ($item->{text} eq $text) { 3187 if ($item->{text} eq $text) {
… …
3019 3217
3020 $self->reorder; 3218 $self->reorder;
3021 $self->SUPER::reconfigure; 3219 $self->SUPER::reconfigure;
3022} 3220}
3023 3221
3222sub DESTROY {
3223 my ($self) = @_;
3224
3225 $self->{timer}->cancel;
3226
3227 $self->SUPER::DESTROY;
3228}
3229
3024############################################################################# 3230#############################################################################
3025 3231
3026package CFClient::UI::Root; 3232package CFClient::UI::Inventory;
3027 3233
3028our @ISA = CFClient::UI::Container::; 3234our @ISA = CFClient::UI::ScrolledWindow::;
3029
3030use CFClient::OpenGL;
3031 3235
3032sub new { 3236sub new {
3033 my $class = shift; 3237 my $class = shift;
3034 3238
3035 $class->SUPER::new ( 3239 my $self = $class->SUPER::new (
3240 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3241 @_,
3242 );
3243
3244 $self
3245}
3246
3247sub set_items {
3248 my ($self, $items) = @_;
3249
3250 $self->{child}->clear;
3251 return unless $items;
3252
3253 my @items = sort {
3254 ($a->{type} <=> $b->{type})
3255 or ($a->{name} cmp $b->{name})
3256 } @$items;
3257
3258 $self->{real_items} = \@items;
3259
3260 my $row = 0;
3261 for my $item (@items) {
3262 CFClient::Item::update_widgets $item;
3263
3264 $self->{child}->add (0, $row, $item->{face_widget});
3265 $self->{child}->add (1, $row, $item->{desc_widget});
3266 $self->{child}->add (2, $row, $item->{weight_widget});
3267
3268 $row++;
3269 }
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::BindEditor;
3275
3276our @ISA = CFClient::UI::FancyFrame::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3282
3283 $self->add (my $vb = new CFClient::UI::VBox);
3284
3285
3286 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3287 text => "start recording",
3288 tooltip => "Start/Stops recording of actions."
3289 ."All subsequent actions after the recording started will be captured."
3290 ."The actions are displayed after the record was stopped."
3291 ."To bind the action you have to click on the 'Bind' button",
3292 on_activate => sub {
3293 unless ($self->{recording}) {
3294 $self->start;
3295 } else {
3296 $self->stop;
3297 }
3298 });
3299
3300 $vb->add (new CFClient::UI::Label text => "Actions:");
3301 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3302
3303 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3304 $vb->add (my $hb = new CFClient::UI::HBox);
3305 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3306 $hb->add (new CFClient::UI::Button
3307 text => "bind",
3308 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3309 on_activate => sub {
3310 $self->ask_for_bind;
3311 });
3312
3313 $vb->add (my $hb = new CFClient::UI::HBox);
3314 $hb->add (new CFClient::UI::Button
3315 text => "ok",
3316 expand => 1,
3317 tooltip => "This closes the binding editor and saves the binding",
3318 on_activate => sub {
3319 $self->hide;
3320 $self->commit;
3321 });
3322
3323 $hb->add (new CFClient::UI::Button
3324 text => "cancel",
3325 expand => 1,
3326 tooltip => "This closes the binding editor without saving",
3327 on_activate => sub {
3328 $self->hide;
3329 $self->{binding_cancel}->()
3330 if $self->{binding_cancel};
3331 });
3332
3333 $self->update_binding_widgets;
3334
3335 $self
3336}
3337
3338sub commit {
3339 my ($self) = @_;
3340 my ($mod, $sym, $cmds) = $self->get_binding;
3341 if ($sym != 0 && @$cmds > 0) {
3342 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3343 ."'. Don't forget 'Save Config'!");
3344 $self->{binding_change}->($mod, $sym, $cmds)
3345 if $self->{binding_change};
3346 } else {
3347 $::STATUSBOX->add ("No action bound, no key or action specified!");
3348 $self->{binding_cancel}->()
3349 if $self->{binding_cancel};
3350 }
3351}
3352
3353sub start {
3354 my ($self) = @_;
3355
3356 $self->{rec_btn}->set_text ("stop recording");
3357 $self->{recording} = 1;
3358 $self->clear_command_list;
3359 $::CONN->start_record if $::CONN;
3360}
3361
3362sub stop {
3363 my ($self) = @_;
3364
3365 $self->{rec_btn}->set_text ("start recording");
3366 $self->{recording} = 0;
3367
3368 my $rec;
3369 $rec = $::CONN->stop_record if $::CONN;
3370 return unless ref $rec eq 'ARRAY';
3371 $self->set_command_list ($rec);
3372}
3373
3374
3375sub ask_for_bind_and_commit {
3376 my ($self) = @_;
3377 $self->ask_for_bind (1);
3378}
3379
3380sub ask_for_bind {
3381 my ($self, $commit) = @_;
3382
3383 CFClient::Binder::open_binding_dialog (sub {
3384 my ($mod, $sym) = @_;
3385 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3386 $self->update_binding_widgets;
3387 $self->commit if $commit;
3388 });
3389}
3390
3391# $mod and $sym are the modifiers and key symbol
3392# $cmds is a array ref of strings (the commands)
3393# $cb is the callback that is executed on OK
3394# $ccb is the callback that is executed on CANCEL and
3395# when the binding was unsuccessful on OK
3396sub set_binding {
3397 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3398
3399 $self->clear_command_list;
3400 $self->{recording} = 0;
3401 $self->{rec_btn}->set_text ("start recording");
3402
3403 $self->{binding} = [$mod, $sym];
3404 $self->{commands} = $cmds;
3405
3406 $self->{binding_change} = $cb;
3407 $self->{binding_cancel} = $ccb;
3408
3409 $self->update_binding_widgets;
3410}
3411
3412# this is a shortcut method that asks for a binding
3413# and then just binds it.
3414sub do_quick_binding {
3415 my ($self, $cmds) = @_;
3416 $self->set_binding (undef, undef, $cmds, sub {
3417 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3418 });
3419 $self->ask_for_bind (1);
3420}
3421
3422sub update_binding_widgets {
3423 my ($self) = @_;
3424 my ($mod, $sym, $cmds) = $self->get_binding;
3425 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3426 $self->set_command_list ($cmds);
3427}
3428
3429sub get_binding {
3430 my ($self) = @_;
3431 return (
3432 $self->{binding}->[0],
3433 $self->{binding}->[1],
3434 [ grep { defined $_ } @{$self->{commands}} ]
3435 );
3436}
3437
3438sub clear_command_list {
3439 my ($self) = @_;
3440 $self->{cmdbox}->clear ();
3441}
3442
3443sub set_command_list {
3444 my ($self, $cmds) = @_;
3445
3446 $self->{cmdbox}->clear ();
3447 $self->{commands} = $cmds;
3448
3449 my $idx = 0;
3450
3451 for (@$cmds) {
3452 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3453
3454 my $i = $idx;
3455 $hb->add (new CFClient::UI::Label text => $_);
3456 $hb->add (new CFClient::UI::Button
3457 text => "delete",
3458 tooltip => "Deletes the action from the record",
3459 on_activate => sub {
3460 $self->{cmdbox}->remove ($hb);
3461 $cmds->[$i] = undef;
3462 });
3463
3464
3465 $idx++
3466 }
3467}
3468
3469#############################################################################
3470
3471package CFClient::UI::SpellList;
3472
3473our @ISA = CFClient::UI::Table::;
3474
3475sub new {
3476 my $class = shift;
3477
3478 my $self = $class->SUPER::new (
3479 binding => [],
3480 commands => [],
3036 @_, 3481 @_,
3037 ) 3482 )
3038} 3483}
3039 3484
3040sub configure { 3485# XXX: Do sorting? Argl...
3041 my ($self, $x, $y, $w, $h) = @_; 3486sub add_spell {
3042
3043 $self->{w} = $w;
3044 $self->{h} = $h;
3045}
3046
3047sub check_size {
3048 my ($self) = @_; 3487 my ($self, $spell) = @_;
3488 $self->{spells}->{$spell->{name}} = $spell;
3049 3489
3050 $self->size_allocate ($self->{w}, $self->{h}) 3490 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3051 if $self->{w}; 3491 face => $spell->{face},
3492 can_hover => 1,
3493 can_events => 1,
3494 tooltip => $spell->{message});
3495
3496 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => $spell->{name},
3498 can_hover => 1,
3499 can_events => 1,
3500 tooltip => $spell->{message},
3501 expand => 1);
3502
3503 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3504 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3505 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3506 expand => 1);
3507
3508 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3509 text => "bind to key",
3510 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3511}
3512
3513sub rebuild_spell_list {
3514 my ($self) = @_;
3515 $self->{tbl_idx} = 0;
3516 $self->add_spell ($_) for values %{$self->{spells}};
3517}
3518
3519sub remove_spell {
3520 my ($self, $spell) = @_;
3521 delete $self->{spells}->{$spell->{name}};
3522 $self->rebuild_spell_list;
3523}
3524
3525#############################################################################
3526
3527package CFClient::UI::Root;
3528
3529our @ISA = CFClient::UI::Container::;
3530
3531use List::Util qw(min max);
3532
3533use CFClient::OpenGL;
3534
3535sub new {
3536 my $class = shift;
3537
3538 my $self = $class->SUPER::new (
3539 visible => 1,
3540 @_,
3541 );
3542
3543 Scalar::Util::weaken ($self->{root} = $self);
3544
3545 $self
3052} 3546}
3053 3547
3054sub size_request { 3548sub size_request {
3055 my ($self) = @_; 3549 my ($self) = @_;
3056 3550
3057 ($self->{w}, $self->{h}) 3551 ($self->{w}, $self->{h})
3552}
3553
3554sub _to_pixel {
3555 my ($coord, $size, $max) = @_;
3556
3557 $coord =
3558 $coord eq "center" ? ($max - $size) * 0.5
3559 : $coord eq "max" ? $max
3560 : $coord;
3561
3562 $coord = 0 if $coord < 0;
3563 $coord = $max - $size if $coord > $max - $size;
3564
3565 int $coord + 0.5
3058} 3566}
3059 3567
3060sub size_allocate { 3568sub size_allocate {
3061 my ($self, $w, $h) = @_; 3569 my ($self, $w, $h) = @_;
3062 3570
3063 for my $child ($self->children) { 3571 for my $child ($self->children) {
3064 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3572 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3065 3573
3066 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3574 $X = $child->{force_x} if exists $child->{force_x};
3067 if exists $child->{req_x}; 3575 $Y = $child->{force_y} if exists $child->{force_y};
3068 3576
3069 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3577 $X = _to_pixel $X, $W, $self->{w};
3070 if exists $child->{req_y}; 3578 $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 3579
3075 $child->configure ($X, $Y, $W, $H); 3580 $child->configure ($X, $Y, $W, $H);
3076 } 3581 }
3077} 3582}
3078 3583
… …
3089} 3594}
3090 3595
3091sub update { 3596sub update {
3092 my ($self) = @_; 3597 my ($self) = @_;
3093 3598
3094 $self->check_size;
3095 $::WANT_REFRESH++; 3599 $::WANT_REFRESH++;
3096} 3600}
3097 3601
3098sub add { 3602sub add {
3099 my ($self, @children) = @_; 3603 my ($self, @children) = @_;
3100 3604
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; 3605 $_->{is_toplevel} = 1
3109 3606 for @children;
3110 # integerise window positions
3111 $child->{x} = int $child->{x};
3112 $child->{y} = int $child->{y};
3113 }
3114 3607
3115 $self->SUPER::add (@children); 3608 $self->SUPER::add (@children);
3116} 3609}
3117 3610
3118sub remove { 3611sub remove {
3119 my ($self, @children) = @_; 3612 my ($self, @children) = @_;
3120 3613
3121 $self->SUPER::remove (@children); 3614 $self->SUPER::remove (@children);
3615
3616 delete $self->{is_toplevel}
3617 for @children;
3122 3618
3123 while (@children) { 3619 while (@children) {
3124 my $w = pop @children; 3620 my $w = pop @children;
3125 push @children, $w->children; 3621 push @children, $w->children;
3126 delete $w->{visible}; 3622 $w->set_invisible;
3127 } 3623 }
3128} 3624}
3129 3625
3130sub on_refresh { 3626sub on_refresh {
3131 my ($self, $id, $cb) = @_; 3627 my ($self, $id, $cb) = @_;
… …
3145 while ($self->{refresh_hook}) { 3641 while ($self->{refresh_hook}) {
3146 $_->() 3642 $_->()
3147 for values %{delete $self->{refresh_hook}}; 3643 for values %{delete $self->{refresh_hook}};
3148 } 3644 }
3149 3645
3150 if ($self->{check_size}) { 3646 if ($self->{realloc}) {
3151 my @queue = ([], []); 3647 my %queue;
3648 my @queue;
3649 my $widget;
3152 3650
3153 for (;;) { 3651 outer:
3154 if ($self->{check_size}) { 3652 while () {
3155 # heuristic: check containers last 3653 if (my $realloc = delete $self->{realloc}) {
3156 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3654 for $widget (values %$realloc) {
3157 for values %{delete $self->{check_size}} 3655 $widget->{visible} or next; # do not resize invisible widgets
3656
3657 $queue{$widget+0}++ and next; # duplicates are common
3658
3659 push @{ $queue[$widget->{visible}] }, $widget;
3660 }
3158 } 3661 }
3159 3662
3160 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3663 while () {
3664 @queue or last outer;
3161 3665
3162 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3666 $widget = pop @{ $queue[-1] || [] }
3163 ? @$widget{qw(user_w user_h)} 3667 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 3668
3669 pop @queue;
3670 }
3671
3672 delete $queue{$widget+0};
3673
3674 my ($w, $h) = $widget->size_request;
3675
3676 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3677 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3678
3679 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3680 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3681
3682 $w = $widget->{force_w} if exists $widget->{force_w};
3683 $h = $widget->{force_h} if exists $widget->{force_h};
3684
3685 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3686 || delete $widget->{force_realloc}) {
3170 $widget->{req_w} = $w; 3687 $widget->{req_w} = $w;
3171 $widget->{req_h} = $h; 3688 $widget->{req_h} = $h;
3172 3689
3173 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3690 $self->{size_alloc}{$widget+0} = $widget;
3174 3691
3175 $widget->{parent}->check_size
3176 if $widget->{parent}; 3692 if (my $parent = $widget->{parent}) {
3693 $self->{realloc}{$parent+0} = $parent
3694 unless $queue{$parent+0};
3695
3696 $parent->{force_size_alloc} = 1;
3697 $self->{size_alloc}{$parent+0} = $parent;
3698 }
3177 } 3699 }
3700
3701 delete $self->{realloc}{$widget+0};
3178 } 3702 }
3179 } 3703 }
3180 3704
3181 while ($self->{size_alloc}) { 3705 while (my $size_alloc = delete $self->{size_alloc}) {
3182 for (values %{delete $self->{size_alloc}}) { 3706 my @queue = sort { $b->{visible} <=> $a->{visible} }
3183 my ($widget, $w, $h) = @$_; 3707 values %$size_alloc;
3708
3709 while () {
3710 my $widget = pop @queue || last;
3711
3712 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3184 3713
3185 $w = 0 if $w < 0; 3714 $w = 0 if $w < 0;
3186 $h = 0 if $h < 0; 3715 $h = 0 if $h < 0;
3187 3716
3717 $w = int $w + 0.5;
3718 $h = int $h + 0.5;
3719
3720 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3721 $widget->{old_w} = $widget->{w};
3722 $widget->{old_h} = $widget->{h};
3723
3188 $widget->{w} = $w; 3724 $widget->{w} = $w;
3189 $widget->{h} = $h; 3725 $widget->{h} = $h;
3190 $widget->size_allocate ($w, $h); 3726
3191 $widget->emit (size_allocate => $w, $h); 3727 $widget->emit (size_allocate => $w, $h);
3728 }
3192 } 3729 }
3193 } 3730 }
3194 3731
3195 while ($self->{post_alloc_hook}) { 3732 while ($self->{post_alloc_hook}) {
3196 $_->() 3733 $_->()
3197 for values %{delete $self->{post_alloc_hook}}; 3734 for values %{delete $self->{post_alloc_hook}};
3198 } 3735 }
3736
3199 3737
3200 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3738 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3739 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3202 glClear GL_COLOR_BUFFER_BIT; 3740 glClear GL_COLOR_BUFFER_BIT;
3203 3741
… …
3205 glLoadIdentity; 3743 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 3745 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 3746 glLoadIdentity;
3209 3747
3748 {
3749 package CFClient::UI::Base;
3750
3751 ($draw_x, $draw_y, $draw_w, $draw_h) =
3752 (0, 0, $self->{w}, $self->{h});
3753 }
3754
3210 $self->_draw; 3755 $self->_draw;
3211} 3756}
3212 3757
3213############################################################################# 3758#############################################################################
3214 3759

Diff Legend

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