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.228 by root, Wed May 24 03:52:54 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC

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

Diff Legend

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