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.221 by root, Mon May 22 03:48:50 2006 UTC vs.
Revision 1.278 by root, Sun Jun 4 23:05:06 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 {
… …
207} 244}
208 245
209sub show { 246sub show {
210 my ($self) = @_; 247 my ($self) = @_;
211 248
212 for (my @w = $self; @w; ) {
213 my $w = pop @w;
214 push @w, $w->children;
215 $w->{visible} = 1;
216 }
217
218 return if $self->{parent}; 249 return if $self->{parent};
219 250
220 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
221} 252}
222 253
223sub hide { 254sub set_visible {
224 my ($self) = @_; 255 my ($self) = @_;
225 256
226 for (my @w = $self; @w; ) { 257 return if $self->{visible};
227 my $w = pop @w; 258
228 push @w, $w->children; 259 $self->{root} = $self->{parent}{root};
229 $w->{visible} = 1; 260 $self->{visible} = $self->{parent}{visible} + 1;
230 } 261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
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
… …
307 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
308} 388}
309 389
310sub set_tooltip { 390sub set_tooltip {
311 my ($self, $tooltip) = @_; 391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
312 397
313 $self->{tooltip} = $tooltip; 398 $self->{tooltip} = $tooltip;
314 399
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 401 delete $CFClient::UI::TOOLTIP->{owner};
… …
338 return if $FOCUS == $self; 423 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
340 425
341 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
342 427
343 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
344 429
345 $focus->update if $focus; 430 $focus->update if $focus;
346 $FOCUS->update; 431 $FOCUS->update;
347} 432}
348 433
… …
351 436
352 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
353 438
354 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
355 440
356 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
357 442
358 $focus->update if $focus; #? 443 $focus->update if $focus; #?
359}
360 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
361sub mouse_motion { } 449sub mouse_motion { 0 }
362sub button_up { } 450sub button_up { 0 }
363sub key_down { } 451sub key_down { 0 }
364sub key_up { } 452sub key_up { 0 }
365 453
366sub button_down { 454sub button_down {
367 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
368 456
369 $self->focus_in; 457 $self->focus_in;
370}
371 458
372sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
373sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
374sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
375sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
376sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
377 535
378sub draw { 536sub draw {
379 my ($self) = @_; 537 my ($self) = @_;
380 538
381 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
382 550
383 glPushMatrix; 551 glPushMatrix;
384 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
385 $self->_draw;
386 glPopMatrix;
387 553
388 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
389 my ($x, $y) = @$self{qw(x y)};
390
391 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
392 glEnable GL_BLEND; 556 glEnable GL_BLEND;
393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
394 glBegin GL_QUADS; 558 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; 559 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 560 glVertex $self->{w}, 0;
410 glVertex $self->{w}, $self->{h}; 561 glVertex $self->{w}, $self->{h};
411 glVertex 0 , $self->{h}; 562 glVertex 0 , $self->{h};
412 glEnd; 563 glEnd;
564 glDisable GL_BLEND;
565 }
566
567 if ($ENV{CFPLUS_DEBUG} & 1) {
568 glPushMatrix;
569 glColor 1, 1, 0, 1;
570 glTranslate 0.375, 0.375;
571 glBegin GL_LINE_LOOP;
572 glVertex 0 , 0;
573 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1;
576 glEnd;
413 glPopMatrix; 577 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
416} 583}
417 584
418sub _draw { 585sub _draw {
419 my ($self) = @_; 586 my ($self) = @_;
420 587
421 warn "no draw defined for $self\n"; 588 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} 589}
473 590
474sub DESTROY { 591sub DESTROY {
475 my ($self) = @_; 592 my ($self) = @_;
476 593
… …
508 625
509 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
510 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
511 628
512 glEnable GL_BLEND; 629 glEnable GL_BLEND;
513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
514 glColor @$color; 631 glColor_premultiply @$color;
515 632
516 glBegin GL_QUADS; 633 glBegin GL_QUADS;
517 glVertex 0 , 0; 634 glVertex 0 , 0;
518 glVertex 0 , $h; 635 glVertex 0 , $h;
519 glVertex $w, $h; 636 glVertex $w, $h;
… …
534 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
536} 653}
537 654
538sub size_request { 655sub size_request {
539 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
540} 659}
541 660
542sub draw { } 661sub draw { }
543 662
544############################################################################# 663#############################################################################
… …
548our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
549 668
550sub new { 669sub new {
551 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
552 671
553 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
554 673
555 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
556 children => [], 675 children => [],
557 can_events => 0, 676 can_events => 0,
558 %arg, 677 %arg,
559 ); 678 );
679
560 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
561 682
562 $self 683 $self
563} 684}
564 685
565sub add { 686sub add {
… …
573 $self->{children} = [ 694 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
576 ]; 697 ];
577 698
578 $self->check_size (1); 699 $self->realloc;
579 $self->update;
580} 700}
581 701
582sub children { 702sub children {
583 @{ $_[0]{children} } 703 @{ $_[0]{children} }
584} 704}
… …
589 delete $child->{parent}; 709 delete $child->{parent};
590 $child->hide; 710 $child->hide;
591 711
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 713
594 $self->check_size; 714 $self->realloc;
595 $self->update;
596} 715}
597 716
598sub clear { 717sub clear {
599 my ($self) = @_; 718 my ($self) = @_;
600 719
… …
604 for (@$children) { 723 for (@$children) {
605 delete $_->{parent}; 724 delete $_->{parent};
606 $_->hide; 725 $_->hide;
607 } 726 }
608 727
609 $self->check_size; 728 $self->realloc;
610 $self->update;
611} 729}
612 730
613sub find_widget { 731sub find_widget {
614 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
615 733
616 $x -= $self->{x}; 734 $x -= $self->{x};
617 $y -= $self->{y}; 735 $y -= $self->{y};
618 736
619 my $res; 737 my $res;
620 738
621 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
622 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
623 and return $res; 741 and return $res;
624 } 742 }
625 743
626 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
675 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
676} 794}
677 795
678############################################################################# 796#############################################################################
679 797
798# back-buffered drawing area
799
680package CFClient::UI::Window; 800package CFClient::UI::Window;
681 801
682our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
683 803
684use CFClient::OpenGL; 804use CFClient::OpenGL;
… …
702 $self->SUPER::size_allocate ($w, $h); 822 $self->SUPER::size_allocate ($w, $h);
703 $self->update; 823 $self->update;
704} 824}
705 825
706sub _render { 826sub _render {
827 my ($self) = @_;
828
707 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
708} 830}
709 831
710sub render_child { 832sub render_child {
711 my ($self) = @_; 833 my ($self) = @_;
712 834
713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
714 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
716 838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
717 $self->_render; 846 $self->_render;
718 }; 847 };
719} 848}
720 849
721sub _draw { 850sub _draw {
722 my ($self) = @_; 851 my ($self) = @_;
723 852
724 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
725 854
726 my $tex = $self->{texture} 855 my $tex = $self->{texture}
727 or return; 856 or return;
728 857
729 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glEnable GL_BLEND;
861 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
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 (0, 0, $w, $h);
734 865
866 glDisable GL_BLEND;
735 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
736} 868}
737 869
738############################################################################# 870#############################################################################
739 871
740package CFClient::UI::ViewPort; 872package CFClient::UI::ViewPort;
741 873
742our @ISA = CFClient::UI::Window::; 874our @ISA = CFClient::UI::Window::;
743 875
876sub new {
877 my $class = shift;
878
879 $class->SUPER::new (
880 scroll_x => 0,
881 scroll_y => 1,
882 @_,
883 )
884}
885
744sub size_request { 886sub size_request {
745 my ($self) = @_; 887 my ($self) = @_;
746 888
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
749 890
750 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
751} 895}
752 896
753sub size_allocate { 897sub size_allocate {
754 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
755 899
900 my $child = $self->child;
901
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904
905 $self->child->configure (0, 0, $w, $h);
756 $self->update; 906 $self->update;
757} 907}
758 908
759sub set_offset { 909sub set_offset {
760 my ($self, $x, $y) = @_; 910 my ($self, $x, $y) = @_;
… …
794} 944}
795 945
796sub _render { 946sub _render {
797 my ($self) = @_; 947 my ($self) = @_;
798 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
799 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
800 953
801 $self->SUPER::_render; 954 $self->SUPER::_render;
802} 955}
803 956
… …
806package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
807 960
808our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
809 962
810sub new { 963sub new {
811 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
812 967
813 my $self; 968 my $self;
814 969
815 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
816 vertical => 1, 971 vertical => 1,
817 range => [0, 0, 1, 0.01], # HACK fix 972 range => [0, 0, 1, 0.01], # HACK fix
818 connect_changed => sub { 973 on_changed => sub {
819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 974 $self->{vp}->set_offset (0, $_[1]);
820 }, 975 },
821 ; 976 ;
822 977
823 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
824 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
825 slider => $slider, 980 slider => $slider,
826 @_, 981 %arg,
827 ); 982 );
828 983
829 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp});
831 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
832 986
833 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
994}
995
996sub update {
997 my ($self) = @_;
998
999 $self->SUPER::update;
1000
1001 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004}
1005
1006sub size_allocate {
1007 my ($self, $w, $h) = @_;
1008
1009 $self->SUPER::size_allocate ($w, $h);
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
834} 1013}
835 1014
836#TODO# update range on size_allocate depending on child 1015#TODO# update range on size_allocate depending on child
837# update viewport offset on scroll 1016# update viewport offset on scroll
838 1017
… …
858 1037
859 if ($self->{bg}) { 1038 if ($self->{bg}) {
860 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
861 1040
862 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
863 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
864 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
865 1044
866 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
867 glVertex 0 , 0; 1046 glVertex 0 , 0;
868 glVertex 0 , $h; 1047 glVertex 0 , $h;
869 glVertex $w, $h; 1048 glVertex $w, $h;
… …
882 1061
883our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
884 1063
885use CFClient::OpenGL; 1064use CFClient::OpenGL;
886 1065
887my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
888 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
889 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
890 1073
891sub new { 1074sub new {
892 my $class = shift; 1075 my ($class, %arg) = @_;
893 1076
894 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
895 1078
896 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
897 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
898 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
899 border => 0.6, 1082 border => 0.6,
900 toplevel => 1,
901 can_events => 1, 1083 can_events => 1,
902 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
903 ); 1087 );
904 1088
905 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
906 align => 0, 1090 align => 0,
907 valign => 1, 1091 valign => 1,
908 text => $self->{title}, 1092 text => $title,
909 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
910 1095
911 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
912} 1104}
913 1105
914sub border { 1106sub border {
915 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
916} 1108}
917 1109
918sub size_request { 1110sub size_request {
919 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
920 1115
921 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
922 1117
923 ( 1118 (
924 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
927} 1122}
928 1123
929sub size_allocate { 1124sub size_allocate {
930 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
931 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
932 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
933 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
934 1137
935 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
936 if $self->{title};
937
938 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
939} 1139}
940 1140
941sub button_down { 1141sub button_down {
942 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
943 1143
… …
959 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
960 1160
961 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
962 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
963 1163
964 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
965 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1166
966 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
967 $self->check_size; 1168 $self->realloc;
968 }; 1169 };
969 1170
970 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
971 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
972 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
974 $self->{motion} = sub { 1175 $self->{motion} = sub {
975 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
976 1177
977 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
978 1179
979 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
980 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
981 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
982 } 1188 1
983} 1189}
984 1190
985sub button_up { 1191sub button_up {
986 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
987 1193
988 delete $self->{motion}; 1194 !!delete $self->{motion}
989} 1195}
990 1196
991sub mouse_motion { 1197sub mouse_motion {
992 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
993 1199
994 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
995} 1203}
996 1204
997sub _draw { 1205sub _draw {
998 my ($self) = @_; 1206 my ($self) = @_;
999 1207
1208 my $child = $self->{children}[0];
1209
1000 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1001 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1002 1212
1003 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1005 1215
1006 my $border = $self->border; 1216 my $border = $self->border;
1007 1217
1008 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1009 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1010 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1011 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1012 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1013 1223
1014 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1015 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1016 1226
1017 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1018 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1019 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1020
1021 glColor @{ $self->{bg} };
1022
1023 $bg->{s} = $rep_x;
1024 $bg->{t} = $rep_y;
1025 $bg->{wrap_mode} = 1;
1026 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027 } 1232 }
1028 1233
1029 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1030 1235
1031 $self->{title}->draw if $self->{title};
1032
1033 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1034} 1242}
1035 1243
1036############################################################################# 1244#############################################################################
1037 1245
1038package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1046sub new { 1254sub new {
1047 my $class = shift; 1255 my $class = shift;
1048 1256
1049 $class->SUPER::new ( 1257 $class->SUPER::new (
1050 col_expand => [], 1258 col_expand => [],
1051 @_ 1259 @_,
1052 ) 1260 )
1261}
1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053} 1265}
1054 1266
1055sub add { 1267sub add {
1056 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1057 1269
1058 $child->set_parent ($self); 1270 $child->set_parent ($self);
1059 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1060 1272
1061 $child->check_size; 1273 $self->realloc;
1062} 1274}
1063 1275
1064sub children {
1065 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066}
1067
1068# TODO: move to container class maybe? send childs a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
1069sub clear { 1277sub clear {
1070 my ($self) = @_; 1278 my ($self) = @_;
1071 1279
1072 my @children = $self->children; 1280 my @children = $self->children;
1073 delete $self->{children}; 1281 delete $self->{children};
… …
1075 for (@children) { 1283 for (@children) {
1076 delete $_->{parent}; 1284 delete $_->{parent};
1077 $_->hide; 1285 $_->hide;
1078 } 1286 }
1079 1287
1080 $self->update; 1288 $self->realloc;
1081} 1289}
1082 1290
1083sub get_wh { 1291sub get_wh {
1084 my ($self) = @_; 1292 my ($self) = @_;
1085 1293
… …
1116sub size_allocate { 1324sub size_allocate {
1117 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
1118 1326
1119 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1120 1328
1121 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
1122 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
1123 1331
1124 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
1125 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
1126 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
1127 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
1181 } 1389 }
1182} 1390}
1183 1391
1184############################################################################# 1392#############################################################################
1185 1393
1186package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1187
1188# TODO: wrap into common Box base class
1189 1395
1190our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1191 1397
1192sub size_request { 1398sub size_request {
1193 my ($self) = @_; 1399 my ($self) = @_;
1194 1400
1195 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1196 1402 ? (
1197 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1198 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1199 (List::Util::max map $_->[1], @alloc), 1405 )
1200 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1201} 1410}
1202 1411
1203sub size_allocate { 1412sub size_allocate {
1204 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1205 1414
1206 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1207
1208 my $children = $self->{children}; 1416 my $children = $self->{children};
1209 1417
1210 my @h = map $_->{req_w}, @$children; 1418 my @req;
1211 1419
1212 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1213 1421 @req = ($space / (@$children || 1)) x @$children;
1214 if ($req_h > $h) {
1215 # ah well, not enough space
1216 $_ *= $h / $req_h for @h;
1217 } else { 1422 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1424 my $req = List::Util::sum @req;
1425
1426 if ($req > $space) {
1427 # ah well, not enough space
1428 $_ *= $space / $req for @req;
1429 } else {
1218 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1219 $exp ||= 1;
1220 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1221 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1222 my $child = $children->[$_];
1223
1224 my $alloc_h = $h[$_];
1225 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1226 $h[$_] = $alloc_h;
1227 } 1436 }
1228 } 1437 }
1229 1438
1230 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1231 1440
1232 my $y = 0; 1441 my $pos = 0;
1233 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1234 my $child = $children->[$_];
1235 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1236 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1237 1445
1238 $y += $h; 1446 $pos += $alloc;
1239 } 1447 }
1240 1448
1241 1 1449 1
1242} 1450}
1243 1451
1244############################################################################# 1452#############################################################################
1245 1453
1454package CFClient::UI::HBox;
1455
1456our @ISA = CFClient::UI::Box::;
1457
1458sub new {
1459 my $class = shift;
1460
1461 $class->SUPER::new (
1462 vertical => 0,
1463 @_,
1464 )
1465}
1466
1467#############################################################################
1468
1246package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1247 1470
1248# TODO: wrap into common Box base class
1249
1250our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1251 1472
1252sub size_request { 1473sub new {
1253 my ($self) = @_; 1474 my $class = shift;
1254 1475
1255 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1256 1477 vertical => 1,
1257 ( 1478 @_,
1258 (List::Util::max map $_->[0], @alloc),
1259 (List::Util::sum map $_->[1], @alloc),
1260 ) 1479 )
1261}
1262
1263sub size_allocate {
1264 my ($self, $w, $h) = @_;
1265
1266 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1267
1268 my $children = $self->{children};
1269
1270 my @h = map $_->{req_h}, @$children;
1271
1272 my $req_h = List::Util::sum @h;
1273
1274 if ($req_h > $h) {
1275 # ah well, not enough space
1276 $_ *= $h / $req_h for @h;
1277 } else {
1278 my $exp = List::Util::sum map $_->{expand}, @$children;
1279 $exp ||= 1;
1280
1281 for (0 .. $#$children) {
1282 my $child = $children->[$_];
1283
1284 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1285 }
1286 }
1287
1288 CFClient::UI::harmonize \@h;
1289
1290 my $y = 0;
1291 for (0 .. $#$children) {
1292 my $child = $children->[$_];
1293 my $h = $h[$_];
1294 $child->configure (0, $y, $w, $h);
1295
1296 $y += $h;
1297 }
1298
1299 1
1300} 1480}
1301 1481
1302############################################################################# 1482#############################################################################
1303 1483
1304package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1321 ellipsise => 3, # end 1501 ellipsise => 3, # end
1322 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1323 fontsize => 1, 1503 fontsize => 1,
1324 align => -1, 1504 align => -1,
1325 valign => -1, 1505 valign => -1,
1326 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1327 can_events => 0, 1508 can_events => 0,
1328 %arg 1509 %arg
1329 ); 1510 );
1330 1511
1331 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1367 $self->{text} = "T$text"; 1548 $self->{text} = "T$text";
1368 1549
1369 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1551 $self->{layout}->set_text ($text);
1371 1552
1553 $self->realloc;
1372 $self->update; 1554 $self->update;
1373 $self->check_size;
1374} 1555}
1375 1556
1376sub set_markup { 1557sub set_markup {
1377 my ($self, $markup) = @_; 1558 my ($self, $markup) = @_;
1378 1559
… …
1382 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1563 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1383 1564
1384 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1565 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1385 $self->{layout}->set_markup ($markup); 1566 $self->{layout}->set_markup ($markup);
1386 1567
1568 $self->realloc;
1387 $self->update; 1569 $self->update;
1388 $self->check_size;
1389} 1570}
1390 1571
1391sub size_request { 1572sub size_request {
1392 my ($self) = @_; 1573 my ($self) = @_;
1393 1574
… …
1407 1588
1408 $w = List::Util::max $w, $w2; 1589 $w = List::Util::max $w, $w2;
1409 $h = List::Util::max $h, $h2; 1590 $h = List::Util::max $h, $h2;
1410 } 1591 }
1411 1592
1412 ( 1593 ($w, $h)
1413 $w + $self->{padding} * 2,
1414 $h + $self->{padding} * 2,
1415 )
1416} 1594}
1417 1595
1418sub size_allocate { 1596sub size_allocate {
1419 my ($self, $w, $h) = @_; 1597 my ($self, $w, $h) = @_;
1420 1598
1599 delete $self->{ox};
1600
1421 delete $self->{texture}; 1601 delete $self->{texture}
1602 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1422} 1603}
1423 1604
1424sub set_fontsize { 1605sub set_fontsize {
1425 my ($self, $fontsize) = @_; 1606 my ($self, $fontsize) = @_;
1426 1607
1427 $self->{fontsize} = $fontsize; 1608 $self->{fontsize} = $fontsize;
1428 delete $self->{texture}; 1609 delete $self->{texture};
1429 1610
1430 $self->update; 1611 $self->realloc;
1431 $self->check_size;
1432} 1612}
1433 1613
1434sub _draw { 1614sub _draw {
1435 my ($self) = @_; 1615 my ($self) = @_;
1436 1616
… …
1442 $self->{layout}->set_width ($self->{w}); 1622 $self->{layout}->set_width ($self->{w});
1443 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1623 $self->{layout}->set_ellipsise ($self->{ellipsise});
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1624 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1625 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1446 1626
1447 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1627 new_from_layout CFClient::Texture $self->{layout}
1628 };
1448 1629
1630 unless (exists $self->{ox}) {
1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1631 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1632 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1451 : ($self->{w} - $tex->{w}) * 0.5); 1633 : ($self->{w} - $tex->{w}) * 0.5);
1452 1634
1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1635 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1455 : ($self->{h} - $tex->{h}) * 0.5); 1637 : ($self->{h} - $tex->{h}) * 0.5);
1456
1457 $tex
1458 }; 1638 };
1459 1639
1460 glEnable GL_TEXTURE_2D; 1640 glEnable GL_TEXTURE_2D;
1461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1462 1642
… …
1488 active_fg => [0, 0, 0], 1668 active_fg => [0, 0, 0],
1489 can_hover => 1, 1669 can_hover => 1,
1490 can_focus => 1, 1670 can_focus => 1,
1491 valign => 0, 1671 valign => 0,
1492 can_events => 1, 1672 can_events => 1,
1673 #text => ...
1493 @_ 1674 @_
1494 ) 1675 )
1495} 1676}
1496 1677
1497sub _set_text { 1678sub _set_text {
… …
1499 1680
1500 delete $self->{cur_h}; 1681 delete $self->{cur_h};
1501 1682
1502 return if $self->{text} eq $text; 1683 return if $self->{text} eq $text;
1503 1684
1504 delete $self->{texture};
1505
1506 $self->{last_activity} = $::NOW; 1685 $self->{last_activity} = $::NOW;
1507 $self->{text} = $text; 1686 $self->{text} = $text;
1508 1687
1509 $text =~ s/./*/g if $self->{hidden}; 1688 $text =~ s/./*/g if $self->{hidden};
1510 $self->{layout}->set_text ("$text "); 1689 $self->{layout}->set_text ("$text ");
1511 1690
1512 $self->emit (changed => $self->{text}); 1691 $self->_emit (changed => $self->{text});
1692 $self->update;
1513} 1693}
1514 1694
1515sub set_text { 1695sub set_text {
1516 my ($self, $text) = @_; 1696 my ($self, $text) = @_;
1517 1697
1518 $self->{cursor} = length $text; 1698 $self->{cursor} = length $text;
1519 $self->_set_text ($text); 1699 $self->_set_text ($text);
1520 $self->update; 1700
1521 $self->check_size; 1701 $self->realloc;
1522} 1702}
1523 1703
1524sub get_text { 1704sub get_text {
1525 $_[0]{text} 1705 $_[0]{text}
1526} 1706}
… …
1529 my ($self) = @_; 1709 my ($self) = @_;
1530 1710
1531 my ($w, $h) = $self->SUPER::size_request; 1711 my ($w, $h) = $self->SUPER::size_request;
1532 1712
1533 ($w + 1, $h) # add 1 for cursor 1713 ($w + 1, $h) # add 1 for cursor
1534}
1535
1536sub size_allocate {
1537 my ($self, $w, $h) = @_;
1538
1539 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1540} 1714}
1541 1715
1542sub key_down { 1716sub key_down {
1543 my ($self, $ev) = @_; 1717 my ($self, $ev) = @_;
1544 1718
… …
1559 } elsif ($sym == CFClient::SDLK_HOME) { 1733 } elsif ($sym == CFClient::SDLK_HOME) {
1560 $self->{cursor} = 0; 1734 $self->{cursor} = 0;
1561 } elsif ($sym == CFClient::SDLK_END) { 1735 } elsif ($sym == CFClient::SDLK_END) {
1562 $self->{cursor} = length $text; 1736 $self->{cursor} = length $text;
1563 } elsif ($uni == 27) { 1737 } elsif ($uni == 27) {
1564 $self->emit ('escape'); 1738 $self->_emit ('escape');
1565 } elsif ($uni) { 1739 } elsif ($uni) {
1566 substr $text, $self->{cursor}++, 0, chr $uni; 1740 substr $text, $self->{cursor}++, 0, chr $uni;
1741 } else {
1742 return 0;
1567 } 1743 }
1568 1744
1569 $self->_set_text ($text); 1745 $self->_set_text ($text);
1570 $self->update; 1746
1571 $self->check_size; 1747 $self->realloc;
1748
1749 1
1572} 1750}
1573 1751
1574sub focus_in { 1752sub focus_in {
1575 my ($self) = @_; 1753 my ($self) = @_;
1576 1754
… …
1591 utf8::encode $text; 1769 utf8::encode $text;
1592 $self->{cursor} = length substr $text, 0, $idx; 1770 $self->{cursor} = length substr $text, 0, $idx;
1593 1771
1594 $self->_set_text ($self->{text}); 1772 $self->_set_text ($self->{text});
1595 $self->update; 1773 $self->update;
1774
1775 1
1596} 1776}
1597 1777
1598sub mouse_motion { 1778sub mouse_motion {
1599 my ($self, $ev, $x, $y) = @_; 1779 my ($self, $ev, $x, $y) = @_;
1600# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1780# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1781
1782 0
1601} 1783}
1602 1784
1603sub _draw { 1785sub _draw {
1604 my ($self) = @_; 1786 my ($self) = @_;
1605 1787
1606 local $self->{fg} = $self->{fg}; 1788 local $self->{fg} = $self->{fg};
1607 1789
1608 if ($FOCUS == $self) { 1790 if ($FOCUS == $self) {
1609 glColor @{$self->{active_bg}}; 1791 glColor_premultiply @{$self->{active_bg}};
1610 $self->{fg} = $self->{active_fg}; 1792 $self->{fg} = $self->{active_fg};
1611 } else { 1793 } else {
1612 glColor @{$self->{bg}}; 1794 glColor_premultiply @{$self->{bg}};
1613 } 1795 }
1614 1796
1615 glEnable GL_BLEND; 1797 glEnable GL_BLEND;
1616 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1798 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1617 glBegin GL_QUADS; 1799 glBegin GL_QUADS;
1618 glVertex 0 , 0; 1800 glVertex 0 , 0;
1619 glVertex 0 , $self->{h}; 1801 glVertex 0 , $self->{h};
1620 glVertex $self->{w}, $self->{h}; 1802 glVertex $self->{w}, $self->{h};
1621 glVertex $self->{w}, 0; 1803 glVertex $self->{w}, 0;
… …
1656 if ($sym == 13) { 1838 if ($sym == 13) {
1657 unshift @{$self->{history}}, 1839 unshift @{$self->{history}},
1658 my $txt = $self->get_text; 1840 my $txt = $self->get_text;
1659 $self->{history_pointer} = -1; 1841 $self->{history_pointer} = -1;
1660 $self->{history_saveback} = ''; 1842 $self->{history_saveback} = '';
1661 $self->emit (activate => $txt); 1843 $self->_emit (activate => $txt);
1662 $self->update; 1844 $self->update;
1663 1845
1664 } elsif ($sym == CFClient::SDLK_UP) { 1846 } elsif ($sym == CFClient::SDLK_UP) {
1665 if ($self->{history_pointer} < 0) { 1847 if ($self->{history_pointer} < 0) {
1666 $self->{history_saveback} = $self->get_text; 1848 $self->{history_saveback} = $self->get_text;
… …
1682 } else { 1864 } else {
1683 $self->set_text ($self->{history_saveback}); 1865 $self->set_text ($self->{history_saveback});
1684 } 1866 }
1685 1867
1686 } else { 1868 } else {
1687 $self->SUPER::key_down ($ev); 1869 return $self->SUPER::key_down ($ev)
1870 }
1871
1688 } 1872 1
1689
1690} 1873}
1691 1874
1692############################################################################# 1875#############################################################################
1693 1876
1694package CFClient::UI::Button; 1877package CFClient::UI::Button;
… …
1703 1886
1704sub new { 1887sub new {
1705 my $class = shift; 1888 my $class = shift;
1706 1889
1707 $class->SUPER::new ( 1890 $class->SUPER::new (
1708 padding => 4, 1891 padding_x => 4,
1892 padding_y => 4,
1709 fg => [1, 1, 1], 1893 fg => [1, 1, 1],
1710 active_fg => [0, 0, 1], 1894 active_fg => [0, 0, 1],
1711 can_hover => 1, 1895 can_hover => 1,
1712 align => 0, 1896 align => 0,
1713 valign => 0, 1897 valign => 0,
1714 can_events => 1, 1898 can_events => 1,
1715 @_ 1899 @_
1716 ) 1900 )
1717} 1901}
1718 1902
1903sub activate { }
1904
1719sub button_up { 1905sub button_up {
1720 my ($self, $ev, $x, $y) = @_; 1906 my ($self, $ev, $x, $y) = @_;
1721 1907
1908 $self->emit ("activate")
1722 if ($x >= 0 && $x < $self->{w} 1909 if $x >= 0 && $x < $self->{w}
1723 && $y >= 0 && $y < $self->{h}) { 1910 && $y >= 0 && $y < $self->{h};
1724 $self->emit ("activate"); 1911
1725 } 1912 1
1726} 1913}
1727 1914
1728sub _draw { 1915sub _draw {
1729 my ($self) = @_; 1916 my ($self) = @_;
1730 1917
… …
1759 1946
1760sub new { 1947sub new {
1761 my $class = shift; 1948 my $class = shift;
1762 1949
1763 $class->SUPER::new ( 1950 $class->SUPER::new (
1764 padding => 2, 1951 padding_x => 2,
1952 padding_y => 2,
1765 fg => [1, 1, 1], 1953 fg => [1, 1, 1],
1766 active_fg => [1, 1, 0], 1954 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2], 1955 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5], 1956 active_bg => [1, 1, 1, 0.5],
1769 state => 0, 1957 state => 0,
… …
1773} 1961}
1774 1962
1775sub size_request { 1963sub size_request {
1776 my ($self) = @_; 1964 my ($self) = @_;
1777 1965
1778 ($self->{padding} * 2 + 6) x 2 1966 (6) x 2
1779} 1967}
1780 1968
1781sub button_down { 1969sub button_down {
1782 my ($self, $ev, $x, $y) = @_; 1970 my ($self, $ev, $x, $y) = @_;
1783 1971
1784 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1785 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1786 $self->{state} = !$self->{state}; 1974 $self->{state} = !$self->{state};
1787 $self->emit (changed => $self->{state}); 1975 $self->_emit (changed => $self->{state});
1976 } else {
1977 return 0
1978 }
1979
1788 } 1980 1
1789} 1981}
1790 1982
1791sub _draw { 1983sub _draw {
1792 my ($self) = @_; 1984 my ($self) = @_;
1793 1985
1794 $self->SUPER::_draw; 1986 $self->SUPER::_draw;
1795 1987
1796 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1988 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1797 1989
1798 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1990 my ($w, $h) = @$self{qw(w h)};
1991
1992 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1799 1993
1800 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1994 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1801 1995
1802 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1996 my $tex = $self->{state} ? $tex[1] : $tex[0];
1803 1997
… …
1958 2152
1959 my $h1 = $self->{h} * (1 - $ycut1); 2153 my $h1 = $self->{h} * (1 - $ycut1);
1960 my $h2 = $self->{h} * (1 - $ycut2); 2154 my $h2 = $self->{h} * (1 - $ycut2);
1961 2155
1962 glEnable GL_BLEND; 2156 glEnable GL_BLEND;
1963 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2157 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2158 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1964 glEnable GL_TEXTURE_2D; 2159 glEnable GL_TEXTURE_2D;
1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1966 2161
1967 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2162 glBindTexture GL_TEXTURE_2D, $t1->{name};
1968 glBegin GL_QUADS; 2163 glBegin GL_QUADS;
… …
2067 my $self = $class->SUPER::new ( 2262 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2263 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2264 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2], 2265 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5], 2266 active_bg => [1, 1, 1, 0.5],
2072 range => [0, 0, 100, 10], 2267 range => [0, 0, 100, 10, 0],
2073 req_w => $::WIDTH / 80, 2268 min_w => $::WIDTH / 80,
2074 req_h => $::WIDTH / 80, 2269 min_h => $::WIDTH / 80,
2075 vertical => 0, 2270 vertical => 0,
2076 can_hover => 1, 2271 can_hover => 1,
2077 inner_pad => 0.02, 2272 inner_pad => 0.02,
2078 @_ 2273 @_
2079 ); 2274 );
… …
2082 $self->update; 2277 $self->update;
2083 2278
2084 $self 2279 $self
2085} 2280}
2086 2281
2282sub changed { }
2283
2284sub set_range {
2285 my ($self, $range) = @_;
2286
2287 ($range, $self->{range}) = ($self->{range}, $range);
2288
2289 $self->update
2290 if "@$range" ne "@{$self->{range}}";
2291}
2292
2087sub set_value { 2293sub set_value {
2088 my ($self, $value) = @_; 2294 my ($self, $value) = @_;
2089 2295
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2296 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091 2297
2092 $hi = $lo + 1 if $hi <= $lo; 2298 $hi = $lo + 1 if $hi <= $lo;
2093 2299
2300 $page = $hi - $lo if $page > $hi - $lo;
2301
2094 $value = $lo if $value < $lo; 2302 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi; 2303 $value = $hi - $page if $value > $hi - $page;
2096 2304
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2305 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit; 2306 if $unit;
2099 2307
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2308 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103 2309
2104 if ($value != $old_value) { 2310 if ($value != $old_value) {
2105 $self->emit (changed => $value); 2311 $self->_emit (changed => $value);
2106 $self->update; 2312 $self->update;
2107 } 2313 }
2108} 2314}
2109 2315
2110sub size_request { 2316sub size_request {
2111 my ($self) = @_; 2317 my ($self) = @_;
2112 2318
2113 my $w = $self->{req_w}; 2319 ($self->{req_w}, $self->{req_h})
2114 my $h = $self->{req_h};
2115
2116 $self->{vertical} ? ($h, $w) : ($w, $h)
2117} 2320}
2118 2321
2119sub button_down { 2322sub button_down {
2120 my ($self, $ev, $x, $y) = @_; 2323 my ($self, $ev, $x, $y) = @_;
2121 2324
2122 $self->SUPER::button_down ($ev, $x, $y); 2325 $self->SUPER::button_down ($ev, $x, $y);
2326
2327 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2328
2123 $self->mouse_motion ($ev, $x, $y); 2329 $self->mouse_motion ($ev, $x, $y)
2124} 2330}
2125 2331
2126sub mouse_motion { 2332sub mouse_motion {
2127 my ($self, $ev, $x, $y) = @_; 2333 my ($self, $ev, $x, $y) = @_;
2128 2334
2129 if ($GRAB == $self) { 2335 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2336 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131 2337
2132 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2338 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133 2339
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2340 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135 2341
2136 $self->set_value ($x * ($hi - $lo) + $lo); 2342 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2343 } else {
2344 return 0;
2345 }
2346
2137 } 2347 1
2138} 2348}
2139 2349
2140sub update { 2350sub update {
2141 my ($self) = @_; 2351 my ($self) = @_;
2142 2352
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2353 delete $self->{knob_w};
2354 $self->SUPER::update;
2355}
2356
2357sub _draw {
2358 my ($self) = @_;
2359
2360 unless ($self->{knob_w}) {
2144 $self->set_value ($self->{range}[0]); 2361 $self->set_value ($self->{range}[0]);
2145 2362
2146 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2363 my ($value, $lo, $hi, $page) = @{$self->{range}};
2364 my $range = ($hi - $page - $lo) || 1e-100;
2147 2365
2148 my $inner_w = 1 - 2 * $self->{inner_pad}; 2366 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149 2367
2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2368 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2369 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2151 2370
2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2371 $value = ($value - $lo) / $range;
2153 $value = $self->{scale} * ($value - $lo); 2372 $value = $value * $self->{scale} + $self->{offset};
2154 2373
2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value; 2374 $self->{knob_x} = $value - $knob_w * 0.5;
2161 $self->{knob_w} = $page; 2375 $self->{knob_w} = $knob_w;
2162 }); 2376 }
2163
2164 $self->SUPER::update;
2165}
2166
2167sub _draw {
2168 my ($self) = @_;
2169 2377
2170 $self->SUPER::_draw (); 2378 $self->SUPER::_draw ();
2171 2379
2172 glScale $self->{w}, $self->{h}; 2380 glScale $self->{w}, $self->{h};
2173 2381
… …
2190 # draw handle 2398 # draw handle
2191 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2399 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2192 2400
2193 glDisable GL_TEXTURE_2D; 2401 glDisable GL_TEXTURE_2D;
2194} 2402}
2403
2404#############################################################################
2405
2406package CFClient::UI::ValSlider;
2407
2408our @ISA = CFClient::UI::HBox::;
2409
2410sub new {
2411 my ($class, %arg) = @_;
2412
2413 my $range = delete $arg{range};
2414
2415 my $self = $class->SUPER::new (
2416 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2417 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2418 to_value => sub { shift },
2419 from_value => sub { shift },
2420 %arg,
2421 );
2422
2423 $self->{slider}->connect (changed => sub {
2424 my ($self, $value) = @_;
2425 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2426 $self->{parent}->emit (changed => $value);
2427 });
2428
2429# $self->{entry}->connect (changed => sub {
2430# my ($self, $value) = @_;
2431# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2432# $self->{parent}->emit (changed => $value);
2433# });
2434
2435 $self->add ($self->{slider}, $self->{entry});
2436
2437 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2438
2439 $self
2440}
2441
2442sub set_range { shift->{slider}->set_range (@_) }
2443sub set_value { shift->{slider}->set_value (@_) }
2195 2444
2196############################################################################# 2445#############################################################################
2197 2446
2198package CFClient::UI::TextView; 2447package CFClient::UI::TextView;
2199 2448
… …
2241 $self->{layout}->set_width ($self->{children}[0]{w}); 2490 $self->{layout}->set_width ($self->{children}[0]{w});
2242 2491
2243 $self->reflow; 2492 $self->reflow;
2244} 2493}
2245 2494
2246sub text_height { 2495sub text_size {
2247 my ($self, $text, $indent) = @_; 2496 my ($self, $text, $indent) = @_;
2248 2497
2249 my $layout = $self->{layout}; 2498 my $layout = $self->{layout};
2250 2499
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2500 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $layout->set_width ($self->{children}[0]{w} - $indent); 2501 $layout->set_width ($self->{children}[0]{w} - $indent);
2253 $layout->set_markup ($text); 2502 $layout->set_markup ($text);
2254 2503
2255 ($layout->size)[1] 2504 $layout->size
2256} 2505}
2257 2506
2258sub reflow { 2507sub reflow {
2259 my ($self) = @_; 2508 my ($self) = @_;
2260 2509
2261 $self->{need_reflow}++; 2510 $self->{need_reflow}++;
2262 $self->update; 2511 $self->update;
2263} 2512}
2264 2513
2514sub set_offset {
2515 my ($self, $offset) = @_;
2516
2517 # todo: base offset on lines or so, not on pixels
2518 $self->{children}[1]->set_value ($offset);
2519}
2520
2521sub clear {
2522 my ($self) = @_;
2523
2524 $self->{par} = [];
2525 $self->{height} = 0;
2526 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2527}
2528
2265sub add_paragraph { 2529sub add_paragraph {
2266 my ($self, $color, $text, $indent) = @_; 2530 my ($self, $color, $text, $indent) = @_;
2267 2531
2268 #TODO: intelligently "reformat" paragraph
2269
2270 for my $line (split /\n/, $text) { 2532 for my $line (split /\n/, $text) {
2271 my $height = $self->text_height ($line); 2533 my ($w, $h) = $self->text_size ($line);
2272 $self->{height} += $height; 2534 $self->{height} += $h;
2273 push @{$self->{par}}, [$height, $color, $indent, $line]; 2535 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274 } 2536 }
2275 2537
2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2538 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2277 $self->{children}[1]->update;
2278} 2539}
2279 2540
2280sub update { 2541sub update {
2281 my ($self) = @_; 2542 my ($self) = @_;
2282 2543
… …
2285 return unless $self->{h} > 0; 2546 return unless $self->{h} > 0;
2286 2547
2287 delete $self->{texture}; 2548 delete $self->{texture};
2288 2549
2289 $ROOT->on_post_alloc ($self, sub { 2550 $ROOT->on_post_alloc ($self, sub {
2551 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2552
2290 if (delete $self->{need_reflow}) { 2553 if (delete $self->{need_reflow}) {
2291 my $height = 0; 2554 my $height = 0;
2292 2555
2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2556 my $layout = $self->{layout};
2557
2558 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2559
2294 for @{$self->{par}}; 2560 for (@{$self->{par}}) {
2561 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2562 $layout->set_width ($W - $_->[3]);
2563 $layout->set_markup ($_->[4]);
2564 my ($w, $h) = $layout->size;
2565 $_->[0] = $w + $_->[3];
2566 $_->[1] = $h;
2567 }
2568
2569 $height += $_->[1];
2570 }
2295 2571
2296 $self->{height} = $height; 2572 $self->{height} = $height;
2297 2573
2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2574 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299 $self->{children}[1]->update;
2300 2575
2301 delete $self->{texture}; 2576 delete $self->{texture};
2302 } 2577 }
2303 2578
2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2579 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2305 glClearColor 0.5, 0.5, 0.5, 0; 2580 glClearColor 0.5, 0.5, 0.5, 0;
2306 glClear GL_COLOR_BUFFER_BIT; 2581 glClear GL_COLOR_BUFFER_BIT;
2307 2582
2308 my $top = int $self->{children}[1]{range}[0]; 2583 my $top = int $self->{children}[1]{range}[0];
2309 2584
2310 my $y0 = $top; 2585 my $y0 = $top;
2311 my $y1 = $top + $self->{h}; 2586 my $y1 = $top + $H;
2312 2587
2313 my $y = 0; 2588 my $y = 0;
2314 2589
2315 my $layout = $self->{layout}; 2590 my $layout = $self->{layout};
2316 2591
2317 $layout->set_font ($self->{font}) if $self->{font}; 2592 $layout->set_font ($self->{font}) if $self->{font};
2318 2593
2319 glEnable GL_BLEND; 2594 glEnable GL_BLEND;
2595 #TODO# not correct in windows where rgba is forced off
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2596 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321 2597
2322 for my $par (@{$self->{par}}) { 2598 for my $par (@{$self->{par}}) {
2323 my $h = $par->[0]; 2599 my $h = $par->[1];
2324 2600
2325 if ($y0 < $y + $h && $y < $y1) { 2601 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] }); 2602 $layout->set_foreground (@{ $par->[2] });
2327 $layout->set_width ($self->{w} - $par->[2]); 2603 $layout->set_width ($W - $par->[3]);
2328 $layout->set_markup ($par->[3]); 2604 $layout->set_markup ($par->[4]);
2329 2605
2330 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2606 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331 2607
2332 glRasterPos $par->[2], $y - $y0; 2608 glRasterPos $par->[3], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2609 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334 } 2610 }
2335 2611
2336 $y += $h; 2612 $y += $h;
2337 } 2613 }
… …
2404 2680
2405sub new { 2681sub new {
2406 my $class = shift; 2682 my $class = shift;
2407 2683
2408 my $self = $class->SUPER::new ( 2684 my $self = $class->SUPER::new (
2409 state => 0, 2685 state => 0,
2410 connect_activate => \&toggle_flopper, 2686 on_activate => \&toggle_flopper,
2411 @_ 2687 @_
2412 ); 2688 );
2413 2689
2414 if ($self->{state}) {
2415 $self->{state} = 0;
2416 $self->toggle_flopper;
2417 }
2418
2419 $self 2690 $self
2420} 2691}
2421 2692
2422sub toggle_flopper { 2693sub toggle_flopper {
2423 my ($self) = @_; 2694 my ($self) = @_;
2424 2695
2425 # TODO: use animation 2696 $self->{other}->toggle_visibility;
2426 if ($self->{state} = !$self->{state}) {
2427 $CFClient::UI::ROOT->add ($self->{other});
2428 $self->{other}->move ($self->coord2global (0, $self->{h}));
2429 $self->emit ("open");
2430 } else {
2431 $CFClient::UI::ROOT->remove ($self->{other});
2432 $self->emit ("close");
2433 }
2434
2435 $self->emit (changed => $self->{state});
2436} 2697}
2437 2698
2438############################################################################# 2699#############################################################################
2439 2700
2440package CFClient::UI::Tooltip; 2701package CFClient::UI::Tooltip;
… …
2453} 2714}
2454 2715
2455sub set_tooltip_from { 2716sub set_tooltip_from {
2456 my ($self, $widget) = @_; 2717 my ($self, $widget) = @_;
2457 2718
2719 my $tooltip = $widget->{tooltip};
2720
2721 if ($ENV{CFPLUS_DEBUG} & 2) {
2722 $tooltip .= "\n\n" . (ref $widget) . "\n"
2723 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2724 . "req $widget->{req_w} $widget->{req_h}\n"
2725 . "visible $widget->{visible}";
2726 }
2727
2458 $self->add (new CFClient::UI::Label 2728 $self->add (new CFClient::UI::Label
2459 markup => $widget->{tooltip}, 2729 markup => $tooltip,
2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2461 fontsize => 0.8, 2731 fontsize => 0.8,
2462 fg => [0, 0, 0, 1], 2732 fg => [0, 0, 0, 1],
2463 ellipsise => 0, 2733 ellipsise => 0,
2464 font => ($widget->{tooltip_font} || $::FONT_PROP), 2734 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2475 2745
2476sub size_allocate { 2746sub size_allocate {
2477 my ($self, $w, $h) = @_; 2747 my ($self, $w, $h) = @_;
2478 2748
2479 $self->SUPER::size_allocate ($w - 4, $h - 4); 2749 $self->SUPER::size_allocate ($w - 4, $h - 4);
2750}
2751
2752sub visibility_change {
2753 my ($self, $visible) = @_;
2754
2755 return unless $visible;
2756
2757 $self->{root}->on_post_alloc ("move_$self" => sub {
2758 my $widget = $self->{owner}
2759 or return;
2760
2761 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2762
2763 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2764 if $x + $self->{w} > $::WIDTH;
2765
2766 $self->move_abs ($x, $y);
2767 });
2480} 2768}
2481 2769
2482sub _draw { 2770sub _draw {
2483 my ($self) = @_; 2771 my ($self) = @_;
2484 2772
… …
2501 glVertex $w, $h; 2789 glVertex $w, $h;
2502 glVertex $w, 0; 2790 glVertex $w, 0;
2503 glEnd; 2791 glEnd;
2504 2792
2505 glTranslate 2 - 0.375, 2 - 0.375; 2793 glTranslate 2 - 0.375, 2 - 0.375;
2794
2506 $self->SUPER::_draw; 2795 $self->SUPER::_draw;
2507} 2796}
2508 2797
2509############################################################################# 2798#############################################################################
2510 2799
… …
2516 2805
2517sub new { 2806sub new {
2518 my $class = shift; 2807 my $class = shift;
2519 2808
2520 my $self = $class->SUPER::new ( 2809 my $self = $class->SUPER::new (
2521 aspect => 1, 2810 aspect => 1,
2811 can_events => 0,
2522 @_, 2812 @_,
2523 ); 2813 );
2524 2814
2525 if ($self->{anim} && $self->{animspeed}) { 2815 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self); 2816 Scalar::Util::weaken (my $widget = $self);
… …
2541 2831
2542sub size_request { 2832sub size_request {
2543 (32, 8) 2833 (32, 8)
2544} 2834}
2545 2835
2836sub update {
2837 my ($self) = @_;
2838
2839 return unless $self->{visible};
2840
2841 $self->SUPER::update;
2842}
2843
2546sub _draw { 2844sub _draw {
2547 my ($self) = @_; 2845 my ($self) = @_;
2548 2846
2549 return unless $::CONN;#d# manage and cache textures differently 2847 return unless $::CONN;
2550 2848
2551 my $face; 2849 my $face;
2552 2850
2553 if ($self->{frame}) { 2851 if ($self->{frame}) {
2554 my $anim = $::CONN->{anim}[$self->{anim}]; 2852 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2577 $self->SUPER::DESTROY; 2875 $self->SUPER::DESTROY;
2578} 2876}
2579 2877
2580############################################################################# 2878#############################################################################
2581 2879
2582package CFClient::UI::InventoryItem; 2880package CFClient::UI::Buttonbar;
2583 2881
2584our @ISA = CFClient::UI::HBox::; 2882our @ISA = CFClient::UI::HBox::;
2585 2883
2586sub _item_to_desc { 2884# TODO: should actualyl wrap buttons and other goodies.
2587 my ($item) = @_;
2588
2589 my $desc =
2590 $item->{nrof} < 2
2591 ? $item->{name}
2592 : "$item->{nrof} × $item->{name_pl}";
2593
2594 $item->{flags} & Crossfire::Protocol::F_OPEN
2595 and $desc .= " (open)";
2596 $item->{flags} & Crossfire::Protocol::F_APPLIED
2597 and $desc .= " (applied)";
2598 $item->{flags} & Crossfire::Protocol::F_UNPAID
2599 and $desc .= " (unpaid)";
2600 $item->{flags} & Crossfire::Protocol::F_MAGIC
2601 and $desc .= " (magic)";
2602 $item->{flags} & Crossfire::Protocol::F_CURSED
2603 and $desc .= " (cursed)";
2604 $item->{flags} & Crossfire::Protocol::F_DAMNED
2605 and $desc .= " (damned)";
2606 $item->{flags} & Crossfire::Protocol::F_LOCKED
2607 and $desc .= " *";
2608
2609 $desc
2610}
2611
2612sub new {
2613 my $class = shift;
2614
2615 my %args = @_;
2616
2617 my $item = delete $args{item};
2618
2619 my $desc = _item_to_desc ($item);
2620
2621 my $self = $class->SUPER::new (
2622 can_hover => 1,
2623 can_events => 1,
2624 tooltip => ((CFClient::UI::Label::escape $desc)
2625 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2626 connect_button_down => sub {
2627 my ($self, $ev, $x, $y) = @_;
2628
2629 # todo: maybe put examine on 1? but should just be a tooltip :(
2630 if ($ev->{button} == 1) {
2631 my $targ = $::CONN->{player}{tag};
2632
2633 if ($item->{container} == $::CONN->{player}{tag}) {
2634 $targ = $main::OPENCONT;
2635 }
2636
2637 $::CONN->send ("move $targ $item->{tag} 0");
2638 } elsif ($ev->{button} == 2) {
2639 $::CONN->send ("apply $item->{tag}");
2640 } elsif ($ev->{button} == 3) {
2641 my @menu_items = (
2642 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2643 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2644 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2645 (
2646 $item->{flags} & Crossfire::Protocol::F_LOCKED
2647 ? (
2648 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2649 )
2650 : (
2651 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2652 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2653 )
2654 ),
2655 );
2656
2657 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2658 }
2659
2660 1
2661 },
2662 %args
2663 );
2664
2665
2666 $self->add (new CFClient::UI::Face
2667 can_events => 0,
2668 face => $item->{face},
2669 anim => $item->{anim},
2670 animspeed => $item->{animspeed},
2671 );
2672
2673 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2674
2675 $self->{item} = $item;
2676
2677 $self->update_item;
2678
2679 $self
2680}
2681
2682sub update_item {
2683 my ($self) = @_;
2684
2685 my $desc = _item_to_desc ($self->{item});
2686
2687 $self->{name_lbl}->set_text ($desc);
2688}
2689
2690#############################################################################
2691
2692package CFClient::UI::Inventory;
2693
2694our @ISA = CFClient::UI::ScrolledWindow::;
2695
2696sub new {
2697 my $class = shift;
2698
2699 my $self = $class->SUPER::new (
2700 scrolled => (new CFClient::UI::VBox),
2701 @_,
2702 );
2703
2704 $self
2705}
2706
2707sub set_items {
2708 my ($self, $items) = @_;
2709
2710 $self->{scrolled}->clear;
2711 return unless $items;
2712
2713 my @items = sort {
2714 ($a->{type} <=> $b->{type})
2715 or ($a->{name} cmp $b->{name})
2716 } @$items;
2717
2718 $self->{real_items} = \@items;
2719
2720 for my $item (@items) {
2721 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2722 $item->update_item ();
2723 }
2724
2725 $self->{scrolled}->add (@items);
2726
2727# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2728}
2729
2730sub size_request {
2731 my ($self) = @_;
2732 ($self->{req_w}, $self->{req_h});
2733}
2734 2885
2735############################################################################# 2886#############################################################################
2736 2887
2737package CFClient::UI::Menu; 2888package CFClient::UI::Menu;
2738 2889
… …
2772 2923
2773# popup given the event (must be a mouse button down event currently) 2924# popup given the event (must be a mouse button down event currently)
2774sub popup { 2925sub popup {
2775 my ($self, $ev) = @_; 2926 my ($self, $ev) = @_;
2776 2927
2777 $self->emit ("popdown"); 2928 $self->_emit ("popdown");
2778 2929
2779 # maybe save $GRAB? must be careful about events... 2930 # maybe save $GRAB? must be careful about events...
2780 $GRAB = $self; 2931 $GRAB = $self;
2781 $self->{button} = $ev->{button}; 2932 $self->{button} = $ev->{button};
2782 2933
2783 $self->show; 2934 $self->show;
2784 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2935 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2785} 2936}
2786 2937
2787sub mouse_motion { 2938sub mouse_motion {
2788 my ($self, $ev, $x, $y) = @_; 2939 my ($self, $ev, $x, $y) = @_;
2789 2940
2790 # TODO: should use vbox->find_widget or so 2941 # TODO: should use vbox->find_widget or so
2791 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2942 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2792 $self->{hover} = $self->{item}{$HOVER}; 2943 $self->{hover} = $self->{item}{$HOVER};
2944
2945 0
2793} 2946}
2794 2947
2795sub button_up { 2948sub button_up {
2796 my ($self, $ev, $x, $y) = @_; 2949 my ($self, $ev, $x, $y) = @_;
2797 2950
2798 if ($ev->{button} == $self->{button}) { 2951 if ($ev->{button} == $self->{button}) {
2799 undef $GRAB; 2952 undef $GRAB;
2800 $self->hide; 2953 $self->hide;
2801 2954
2802 $self->emit ("popdown"); 2955 $self->_emit ("popdown");
2803 $self->{hover}[1]->() if $self->{hover}; 2956 $self->{hover}[1]->() if $self->{hover};
2957 } else {
2958 return 0
2959 }
2960
2961 1
2962}
2963
2964#############################################################################
2965
2966package CFClient::UI::Multiplexer;
2967
2968our @ISA = CFClient::UI::Container::;
2969
2970sub new {
2971 my $class = shift;
2972
2973 my $self = $class->SUPER::new (
2974 @_,
2975 );
2976
2977 $self->{current} = $self->{children}[0]
2978 if @{ $self->{children} };
2979
2980 $self
2981}
2982
2983sub add {
2984 my ($self, @widgets) = @_;
2985
2986 $self->SUPER::add (@widgets);
2987
2988 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} };
2990}
2991
2992sub set_current_page {
2993 my ($self, $page_or_widget) = @_;
2994
2995 my $widget = ref $page_or_widget
2996 ? $page_or_widget
2997 : $self->{children}[$page_or_widget];
2998
2999 $self->{current} = $widget;
3000 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3001
3002 $self->_emit (page_changed => $self->{current});
3003
3004 $self->realloc;
3005}
3006
3007sub visible_children {
3008 $_[0]{current}
3009}
3010
3011sub size_request {
3012 my ($self) = @_;
3013
3014 $self->{current}->size_request
3015}
3016
3017sub size_allocate {
3018 my ($self, $w, $h) = @_;
3019
3020 $self->{current}->configure (0, 0, $w, $h);
3021}
3022
3023sub _draw {
3024 my ($self) = @_;
3025
3026 $self->{current}->draw;
3027}
3028
3029#############################################################################
3030
3031package CFClient::UI::Notebook;
3032
3033our @ISA = CFClient::UI::VBox::;
3034
3035sub new {
3036 my $class = shift;
3037
3038 my $self = $class->SUPER::new (
3039 buttonbar => (new CFClient::UI::Buttonbar),
3040 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3041 # filter => # will be put between multiplexer and $self
3042 @_,
3043 );
2804 } 3044
3045 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3046 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3047
3048 $self
3049}
3050
3051sub add {
3052 my ($self, $title, $widget, $tooltip) = @_;
3053
3054 Scalar::Util::weaken $self;
3055
3056 $self->{buttonbar}->add (new CFClient::UI::Button
3057 markup => $title,
3058 tooltip => $tooltip,
3059 on_activate => sub { $self->set_current_page ($widget) },
3060 );
3061
3062 $self->{multiplexer}->add ($widget);
3063}
3064
3065sub set_current_page {
3066 my ($self, $page) = @_;
3067
3068 $self->{multiplexer}->set_current_page ($page);
3069 $self->_emit (page_changed => $self->{multiplexer}{current});
2805} 3070}
2806 3071
2807############################################################################# 3072#############################################################################
2808 3073
2809package CFClient::UI::Statusbox; 3074package CFClient::UI::Statusbox;
… …
2869sub add { 3134sub add {
2870 my ($self, $text, %arg) = @_; 3135 my ($self, $text, %arg) = @_;
2871 3136
2872 $text =~ s/^\s+//; 3137 $text =~ s/^\s+//;
2873 $text =~ s/\s+$//; 3138 $text =~ s/\s+$//;
3139
3140 return unless $text;
2874 3141
2875 my $timeout = time + ((delete $arg{timeout}) || 60); 3142 my $timeout = time + ((delete $arg{timeout}) || 60);
2876 3143
2877 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3144 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2878 3145
… …
2912 $self->SUPER::reconfigure; 3179 $self->SUPER::reconfigure;
2913} 3180}
2914 3181
2915############################################################################# 3182#############################################################################
2916 3183
2917package CFClient::UI::Root; 3184package CFClient::UI::Inventory;
2918 3185
2919our @ISA = CFClient::UI::Container::; 3186our @ISA = CFClient::UI::ScrolledWindow::;
2920
2921use CFClient::OpenGL;
2922 3187
2923sub new { 3188sub new {
2924 my $class = shift; 3189 my $class = shift;
2925 3190
2926 $class->SUPER::new ( 3191 my $self = $class->SUPER::new (
3192 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3193 @_,
3194 );
3195
3196 $self
3197}
3198
3199sub set_items {
3200 my ($self, $items) = @_;
3201
3202 $self->{child}->clear;
3203 return unless $items;
3204
3205 my @items = sort {
3206 ($a->{type} <=> $b->{type})
3207 or ($a->{name} cmp $b->{name})
3208 } @$items;
3209
3210 $self->{real_items} = \@items;
3211
3212 my $row = 0;
3213 for my $item (@items) {
3214 CFClient::Item::update_widgets $item;
3215
3216 $self->{child}->add (0, $row, $item->{face_widget});
3217 $self->{child}->add (1, $row, $item->{desc_widget});
3218 $self->{child}->add (2, $row, $item->{weight_widget});
3219
3220 $row++;
3221 }
3222}
3223
3224#############################################################################
3225
3226package CFClient::UI::BindEditor;
3227
3228our @ISA = CFClient::UI::FancyFrame::;
3229
3230sub new {
3231 my $class = shift;
3232
3233 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3234
3235 $self->add (my $vb = new CFClient::UI::VBox);
3236
3237
3238 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3239 text => "start recording",
3240 tooltip => "Start/Stops recording of actions."
3241 ."All subsequent actions after the recording started will be captured."
3242 ."The actions are displayed after the record was stopped."
3243 ."To bind the action you have to click on the 'Bind' button",
3244 on_activate => sub {
3245 unless ($self->{recording}) {
3246 $self->start;
3247 } else {
3248 $self->stop;
3249 }
3250 });
3251
3252 $vb->add (new CFClient::UI::Label text => "Actions:");
3253 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3254
3255 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3258 $hb->add (new CFClient::UI::Button
3259 text => "bind",
3260 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3261 on_activate => sub {
3262 $self->ask_for_bind;
3263 });
3264
3265 $vb->add (my $hb = new CFClient::UI::HBox);
3266 $hb->add (new CFClient::UI::Button
3267 text => "ok",
3268 expand => 1,
3269 tooltip => "This closes the binding editor and saves the binding",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->commit;
3273 });
3274
3275 $hb->add (new CFClient::UI::Button
3276 text => "cancel",
3277 expand => 1,
3278 tooltip => "This closes the binding editor without saving",
3279 on_activate => sub {
3280 $self->hide;
3281 $self->{binding_cancel}->()
3282 if $self->{binding_cancel};
3283 });
3284
3285 $self->update_binding_widgets;
3286
3287 $self
3288}
3289
3290sub commit {
3291 my ($self) = @_;
3292 my ($mod, $sym, $cmds) = $self->get_binding;
3293 if ($sym != 0 && @$cmds > 0) {
3294 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3295 ."'. Don't forget 'Save Config'!");
3296 $self->{binding_change}->($mod, $sym, $cmds)
3297 if $self->{binding_change};
3298 } else {
3299 $::STATUSBOX->add ("No action bound, no key or action specified!");
3300 $self->{binding_cancel}->()
3301 if $self->{binding_cancel};
3302 }
3303}
3304
3305sub start {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("stop recording");
3309 $self->{recording} = 1;
3310 $self->clear_command_list;
3311 $::CONN->start_record if $::CONN;
3312}
3313
3314sub stop {
3315 my ($self) = @_;
3316
3317 $self->{rec_btn}->set_text ("start recording");
3318 $self->{recording} = 0;
3319
3320 my $rec;
3321 $rec = $::CONN->stop_record if $::CONN;
3322 return unless ref $rec eq 'ARRAY';
3323 $self->set_command_list ($rec);
3324}
3325
3326
3327sub ask_for_bind_and_commit {
3328 my ($self) = @_;
3329 $self->ask_for_bind (1);
3330}
3331
3332sub ask_for_bind {
3333 my ($self, $commit) = @_;
3334
3335 CFClient::Binder::open_binding_dialog (sub {
3336 my ($mod, $sym) = @_;
3337 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3338 $self->update_binding_widgets;
3339 $self->commit if $commit;
3340 });
3341}
3342
3343# $mod and $sym are the modifiers and key symbol
3344# $cmds is a array ref of strings (the commands)
3345# $cb is the callback that is executed on OK
3346# $ccb is the callback that is executed on CANCEL and
3347# when the binding was unsuccessful on OK
3348sub set_binding {
3349 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3350
3351 $self->clear_command_list;
3352 $self->{recording} = 0;
3353 $self->{rec_btn}->set_text ("start recording");
3354
3355 $self->{binding} = [$mod, $sym];
3356 $self->{commands} = $cmds;
3357
3358 $self->{binding_change} = $cb;
3359 $self->{binding_cancel} = $ccb;
3360
3361 $self->update_binding_widgets;
3362}
3363
3364# this is a shortcut method that asks for a binding
3365# and then just binds it.
3366sub do_quick_binding {
3367 my ($self, $cmds) = @_;
3368 $self->set_binding (undef, undef, $cmds, sub {
3369 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3370 });
3371 $self->ask_for_bind (1);
3372}
3373
3374sub update_binding_widgets {
3375 my ($self) = @_;
3376 my ($mod, $sym, $cmds) = $self->get_binding;
3377 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3378 $self->set_command_list ($cmds);
3379}
3380
3381sub get_binding {
3382 my ($self) = @_;
3383 return (
3384 $self->{binding}->[0],
3385 $self->{binding}->[1],
3386 [ grep { defined $_ } @{$self->{commands}} ]
3387 );
3388}
3389
3390sub clear_command_list {
3391 my ($self) = @_;
3392 $self->{cmdbox}->clear ();
3393}
3394
3395sub set_command_list {
3396 my ($self, $cmds) = @_;
3397
3398 $self->{cmdbox}->clear ();
3399 $self->{commands} = $cmds;
3400
3401 my $idx = 0;
3402
3403 for (@$cmds) {
3404 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3405
3406 my $i = $idx;
3407 $hb->add (new CFClient::UI::Label text => $_);
3408 $hb->add (new CFClient::UI::Button
3409 text => "delete",
3410 tooltip => "Deletes the action from the record",
3411 on_activate => sub {
3412 $self->{cmdbox}->remove ($hb);
3413 $cmds->[$i] = undef;
3414 });
3415
3416
3417 $idx++
3418 }
3419}
3420
3421#############################################################################
3422
3423package CFClient::UI::SpellList;
3424
3425our @ISA = CFClient::UI::Table::;
3426
3427sub new {
3428 my $class = shift;
3429
3430 my $self = $class->SUPER::new (
3431 binding => [],
3432 commands => [],
2927 @_, 3433 @_,
2928 ) 3434 )
2929} 3435}
2930 3436
2931sub configure { 3437# XXX: Do sorting? Argl...
2932 my ($self, $x, $y, $w, $h) = @_; 3438sub add_spell {
2933
2934 $self->{w} = $w;
2935 $self->{h} = $h;
2936}
2937
2938sub check_size {
2939 my ($self) = @_; 3439 my ($self, $spell) = @_;
3440 $self->{spells}->{$spell->{name}} = $spell;
2940 3441
2941 $self->size_allocate ($self->{w}, $self->{h}) 3442 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2942 if $self->{w}; 3443 face => $spell->{face},
3444 can_hover => 1,
3445 can_events => 1,
3446 tooltip => $spell->{message});
3447
3448 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => $spell->{name},
3450 can_hover => 1,
3451 can_events => 1,
3452 tooltip => $spell->{message},
3453 expand => 1);
3454
3455 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3456 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3457 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3458 expand => 1);
3459
3460 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3461 text => "bind to key",
3462 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3463}
3464
3465sub rebuild_spell_list {
3466 my ($self) = @_;
3467 $self->{tbl_idx} = 0;
3468 $self->add_spell ($_) for values %{$self->{spells}};
3469}
3470
3471sub remove_spell {
3472 my ($self, $spell) = @_;
3473 delete $self->{spells}->{$spell->{name}};
3474 $self->rebuild_spell_list;
3475}
3476
3477#############################################################################
3478
3479package CFClient::UI::Root;
3480
3481our @ISA = CFClient::UI::Container::;
3482
3483use CFClient::OpenGL;
3484
3485sub new {
3486 my $class = shift;
3487
3488 my $self = $class->SUPER::new (
3489 visible => 1,
3490 @_,
3491 );
3492
3493 Scalar::Util::weaken ($self->{root} = $self);
3494
3495 $self
2943} 3496}
2944 3497
2945sub size_request { 3498sub size_request {
2946 my ($self) = @_; 3499 my ($self) = @_;
2947 3500
2948 ($self->{w}, $self->{h}) 3501 ($self->{w}, $self->{h})
3502}
3503
3504sub _to_pixel {
3505 my ($coord, $size, $max) = @_;
3506
3507 $coord =
3508 $coord eq "center" ? ($max - $size) * 0.5
3509 : $coord eq "max" ? $max
3510 : $coord;
3511
3512 $coord = 0 if $coord < 0;
3513 $coord = $max - $size if $coord > $max - $size;
3514
3515 int $coord + 0.5
2949} 3516}
2950 3517
2951sub size_allocate { 3518sub size_allocate {
2952 my ($self, $w, $h) = @_; 3519 my ($self, $w, $h) = @_;
2953 3520
2954 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2955 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2956
2957 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2958 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2959
2960 for my $child ($self->children) { 3521 for my $child ($self->children) {
2961 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3522 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2962 3523
2963 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3524 $X = $child->{force_x} if exists $child->{force_x};
2964 if exists $child->{req_x}; 3525 $Y = $child->{force_y} if exists $child->{force_y};
2965 3526
2966 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3527 $X = _to_pixel $X, $W, $self->{w};
2967 if exists $child->{req_y}; 3528 $Y = _to_pixel $Y, $H, $self->{h};
2968
2969 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2970 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2971 3529
2972 $child->configure ($X, $Y, $W, $H); 3530 $child->configure ($X, $Y, $W, $H);
2973 } 3531 }
2974} 3532}
2975 3533
… …
2986} 3544}
2987 3545
2988sub update { 3546sub update {
2989 my ($self) = @_; 3547 my ($self) = @_;
2990 3548
2991 $self->check_size;
2992 $::WANT_REFRESH++; 3549 $::WANT_REFRESH++;
2993} 3550}
2994 3551
2995sub add { 3552sub add {
2996 my ($self, @children) = @_; 3553 my ($self, @children) = @_;
2997 3554
2998 for my $child (@children) {
2999 $child->{toplevel} = 1; 3555 $_->{is_toplevel} = 1
3000 3556 for @children;
3001 # integerise window positions
3002 $child->{x} = int $child->{x};
3003 $child->{y} = int $child->{y};
3004 }
3005 3557
3006 $self->SUPER::add (@children); 3558 $self->SUPER::add (@children);
3559}
3560
3561sub remove {
3562 my ($self, @children) = @_;
3563
3564 $self->SUPER::remove (@children);
3565
3566 delete $self->{is_toplevel}
3567 for @children;
3568
3569 while (@children) {
3570 my $w = pop @children;
3571 push @children, $w->children;
3572 $w->set_invisible;
3573 }
3007} 3574}
3008 3575
3009sub on_refresh { 3576sub on_refresh {
3010 my ($self, $id, $cb) = @_; 3577 my ($self, $id, $cb) = @_;
3011 3578
… …
3024 while ($self->{refresh_hook}) { 3591 while ($self->{refresh_hook}) {
3025 $_->() 3592 $_->()
3026 for values %{delete $self->{refresh_hook}}; 3593 for values %{delete $self->{refresh_hook}};
3027 } 3594 }
3028 3595
3029 if ($self->{check_size}) { 3596 if ($self->{realloc}) {
3030 my @queue = ([], []); 3597 my %queue;
3598 my @queue;
3599 my $widget;
3031 3600
3032 for (;;) { 3601 outer:
3033 if ($self->{check_size}) { 3602 while () {
3034 # heuristic: check containers last 3603 if (my $realloc = delete $self->{realloc}) {
3035 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3604 for $widget (values %$realloc) {
3036 for values %{delete $self->{check_size}} 3605 $widget->{visible} or next; # do not resize invisible widgets
3606
3607 $queue{$widget+0}++ and next; # duplicates are common
3608
3609 push @{ $queue[$widget->{visible}] }, $widget;
3610 }
3037 } 3611 }
3038 3612
3039 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3613 while () {
3614 @queue or last outer;
3040 3615
3041 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3616 $widget = pop @{ $queue[-1] || [] }
3042 ? @$widget{qw(user_w user_h)} 3617 and last;
3043 : $widget->size_request;
3044
3045 if (delete $widget->{force_alloc}
3046 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3047 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3048 3618
3619 pop @queue;
3620 }
3621
3622 delete $queue{$widget+0};
3623
3624 my ($w, $h) = $widget->size_request;
3625
3626 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3628
3629 $w = $widget->{force_w} if exists $widget->{force_w};
3630 $h = $widget->{force_h} if exists $widget->{force_h};
3631
3632 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3633 || delete $widget->{force_realloc}) {
3049 $widget->{req_w} = $w; 3634 $widget->{req_w} = $w;
3050 $widget->{req_h} = $h; 3635 $widget->{req_h} = $h;
3051 3636
3052 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3637 $self->{size_alloc}{$widget+0} = $widget;
3053 3638
3054 $widget->{parent}->check_size
3055 if $widget->{parent}; 3639 if (my $parent = $widget->{parent}) {
3640 $self->{realloc}{$parent+0} = $parent
3641 unless $queue{$parent+0};
3642
3643 $parent->{force_size_alloc} = 1;
3644 $self->{size_alloc}{$parent+0} = $parent;
3645 }
3056 } 3646 }
3647
3648 delete $self->{realloc}{$widget+0};
3057 } 3649 }
3058 } 3650 }
3059 3651
3060 while ($self->{size_alloc}) { 3652 while (my $size_alloc = delete $self->{size_alloc}) {
3061 for (values %{delete $self->{size_alloc}}) { 3653 my @queue = sort { $b->{visible} <=> $a->{visible} }
3062 my ($widget, $w, $h) = @$_; 3654 values %$size_alloc;
3655
3656 while () {
3657 my $widget = pop @queue || last;
3658
3659 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3063 3660
3064 $w = 0 if $w < 0; 3661 $w = 0 if $w < 0;
3065 $h = 0 if $h < 0; 3662 $h = 0 if $h < 0;
3066 3663
3664 $w = int $w + 0.5;
3665 $h = int $h + 0.5;
3666
3667 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3668 $widget->{old_w} = $widget->{w};
3669 $widget->{old_h} = $widget->{h};
3670
3067 $widget->{w} = $w; 3671 $widget->{w} = $w;
3068 $widget->{h} = $h; 3672 $widget->{h} = $h;
3069 $widget->size_allocate ($w, $h); 3673
3070 $widget->emit (size_allocate => $w, $h); 3674 $widget->emit (size_allocate => $w, $h);
3675 }
3071 } 3676 }
3072 } 3677 }
3073 3678
3074 while ($self->{post_alloc_hook}) { 3679 while ($self->{post_alloc_hook}) {
3075 $_->() 3680 $_->()
3076 for values %{delete $self->{post_alloc_hook}}; 3681 for values %{delete $self->{post_alloc_hook}};
3077 } 3682 }
3683
3078 3684
3079 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3685 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3080 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3686 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3081 glClear GL_COLOR_BUFFER_BIT; 3687 glClear GL_COLOR_BUFFER_BIT;
3082 3688
… …
3084 glLoadIdentity; 3690 glLoadIdentity;
3085 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3691 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3086 glMatrixMode GL_MODELVIEW; 3692 glMatrixMode GL_MODELVIEW;
3087 glLoadIdentity; 3693 glLoadIdentity;
3088 3694
3695 {
3696 package CFClient::UI::Base;
3697
3698 ($draw_x, $draw_y, $draw_w, $draw_h) =
3699 (0, 0, $self->{w}, $self->{h});
3700 }
3701
3089 $self->_draw; 3702 $self->_draw;
3090} 3703}
3091 3704
3092############################################################################# 3705#############################################################################
3093 3706

Diff Legend

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