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.212 by elmex, Wed May 17 14:55:14 2006 UTC vs.
Revision 1.273 by root, Sat Jun 3 02:32:35 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) = @_;
… …
136 $rem += $_ - $i; 149 $rem += $_ - $i;
137 $_ = $i; 150 $_ = $i;
138 } 151 }
139} 152}
140 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
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
141# call when resolution changes etc. 170# call when resolution changes etc.
142sub rescale_widgets { 171sub rescale_widgets {
143 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
144 173
145 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
146 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
147 $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.]+$/;
148 $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};
149 $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};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $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.]+$/;
152 $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};
153 $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};
154 $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
155 } 189 }
156
157 $widget->reconfigure;
158 } 190 }
191
192 reconfigure_widgets;
159} 193}
160 194
161############################################################################# 195#############################################################################
162 196
163package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
168 202
169sub new { 203sub new {
170 my $class = shift; 204 my $class = shift;
171 205
172 my $self = bless { 206 my $self = bless {
173 x => 0, 207 x => "center",
174 y => 0, 208 y => "center",
175 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
176 can_events => 1, 212 can_events => 1,
177 @_ 213 @_
178 }, $class; 214 }, $class;
179 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
180 for (keys %$self) { 218 for (keys %$self) {
181 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
182 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
183 } 221 }
184 } 222 }
185 223
186 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 }
187 235
188 $self 236 $self
189} 237}
190 238
191sub destroy { 239sub destroy {
… …
201 return if $self->{parent}; 249 return if $self->{parent};
202 250
203 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
204} 252}
205 253
206sub hide { 254sub set_visible {
207 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
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};
208 278
209 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
211 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
212 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
213 if $self->{parent}; 313 if $self->{parent};
214} 314}
215 315
216sub move { 316sub move_abs {
217 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
218 318
219 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
220 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
221 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
222 322
223 $self->update; 323 $self->update;
224} 324}
225 325
226sub set_size { 326sub set_size {
227 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
228 328
229 $self->{user_w} = $w; 329 $self->{force_w} = $w;
230 $self->{user_h} = $h; 330 $self->{force_h} = $h;
231 331
232 $self->check_size; 332 $self->realloc;
233} 333}
234 334
235sub size_request { 335sub size_request {
236 require Carp; 336 require Carp;
237 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
239 339
240sub configure { 340sub configure {
241 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
242 342
243 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
244 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
245 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
246 348
247 # use alignment to adjust x, y 349 # use alignment to adjust x, y
248 350
249 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
250 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
251
252 ($w, $h) = ($w2, $h2);
253 } 353 }
254 354
255 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
256 $self->{x} = $x; 356 $self->{x} = $x;
257 $self->{y} = $y; 357 $self->{y} = $y;
258 $self->update; 358 $self->update;
259 } 359 }
260 360
261 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
262 $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;
263 } 368 }
264} 369}
265 370
266sub size_allocate { 371sub size_allocate {
267 # nothing to be done 372 # nothing to be done
268} 373}
269 374
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
277sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
278} 381}
279 382
280sub set_max_size { 383sub set_max_size {
281 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
282 385
… …
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
285} 388}
286 389
287sub set_tooltip { 390sub set_tooltip {
288 my ($self, $tooltip) = @_; 391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
289 397
290 $self->{tooltip} = $tooltip; 398 $self->{tooltip} = $tooltip;
291 399
292 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293 delete $CFClient::UI::TOOLTIP->{owner}; 401 delete $CFClient::UI::TOOLTIP->{owner};
… …
315 return if $FOCUS == $self; 423 return if $FOCUS == $self;
316 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
317 425
318 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
319 427
320 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
321 429
322 $focus->update if $focus; 430 $focus->update if $focus;
323 $FOCUS->update; 431 $FOCUS->update;
324} 432}
325 433
… …
328 436
329 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
330 438
331 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
332 440
333 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
334 442
335 $focus->update if $focus; #? 443 $focus->update if $focus; #?
336}
337 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
338sub mouse_motion { } 449sub mouse_motion { 0 }
339sub button_up { } 450sub button_up { 0 }
340sub key_down { } 451sub key_down { 0 }
341sub key_up { } 452sub key_up { 0 }
342 453
343sub button_down { 454sub button_down {
344 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
345 456
346 $self->focus_in; 457 $self->focus_in;
347}
348 458
349sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
350sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
351sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
352sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
353sub 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
354 535
355sub draw { 536sub draw {
356 my ($self) = @_; 537 my ($self) = @_;
357 538
358 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);
359 550
360 glPushMatrix; 551 glPushMatrix;
361 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
362 $self->_draw; 553 $self->_draw;
363 glPopMatrix; 554 glPopMatrix;
… …
375 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
376 glEnd; 567 glEnd;
377 glDisable GL_BLEND; 568 glDisable GL_BLEND;
378 } 569 }
379 570
380 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
381 glPushMatrix; 572 glPushMatrix;
382 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
383 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
384 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
385 glVertex 0 , 0; 576 glVertex 0 , 0;
386 glVertex $self->{w}, 0; 577 glVertex $self->{w} - 1, 0;
387 glVertex $self->{w}, $self->{h}; 578 glVertex $self->{w} - 1, $self->{h} - 1;
388 glVertex 0 , $self->{h}; 579 glVertex 0 , $self->{h} - 1;
389 glEnd; 580 glEnd;
390 glPopMatrix; 581 glPopMatrix;
391 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
392 } 583 }
393} 584}
394 585
395sub _draw { 586sub _draw {
396 my ($self) = @_; 587 my ($self) = @_;
397 588
398 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
399}
400
401sub find_widget {
402 my ($self, $x, $y) = @_;
403
404 return () unless $self->{can_events};
405
406 return $self
407 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
408 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
409
410 ()
411}
412
413sub set_parent {
414 my ($self, $parent) = @_;
415
416 Scalar::Util::weaken ($self->{parent} = $parent);
417
418 # TODO: req_w _does_change after ->reconfigure
419 $self->check_size
420 unless exists $self->{req_w};
421}
422
423sub check_size {
424 my ($self, $forced) = @_;
425
426 $self->{force_alloc} = 1 if $forced;
427 $CFClient::UI::ROOT->{check_size}{$self} = $self;
428}
429
430sub update {
431 my ($self) = @_;
432
433 $self->{parent}->update
434 if $self->{parent};
435}
436
437sub connect {
438 my ($self, $signal, $cb) = @_;
439
440 push @{ $self->{signal_cb}{$signal} }, $cb;
441}
442
443sub emit {
444 my ($self, $signal, @args) = @_;
445
446 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
447} 590}
448 591
449sub DESTROY { 592sub DESTROY {
450 my ($self) = @_; 593 my ($self) = @_;
451 594
… …
509 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
510 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
511} 654}
512 655
513sub size_request { 656sub size_request {
514 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
515} 660}
516 661
517sub draw { } 662sub draw { }
518 663
519############################################################################# 664#############################################################################
… …
523our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
524 669
525sub new { 670sub new {
526 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
527 672
528 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
529 674
530 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
531 children => [], 676 children => [],
532 can_events => 0, 677 can_events => 0,
533 %arg, 678 %arg,
534 ); 679 );
680
535 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
536 683
537 $self 684 $self
538} 685}
539 686
540sub add { 687sub add {
… …
548 $self->{children} = [ 695 $self->{children} = [
549 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
550 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
551 ]; 698 ];
552 699
553 $self->check_size (1); 700 $self->realloc;
554 $self->update;
555} 701}
556 702
557sub children { 703sub children {
558 @{ $_[0]{children} } 704 @{ $_[0]{children} }
559} 705}
… …
564 delete $child->{parent}; 710 delete $child->{parent};
565 $child->hide; 711 $child->hide;
566 712
567 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
568 714
569 $self->check_size; 715 $self->realloc;
570 $self->update;
571} 716}
572 717
573sub clear { 718sub clear {
574 my ($self) = @_; 719 my ($self) = @_;
575 720
… …
579 for (@$children) { 724 for (@$children) {
580 delete $_->{parent}; 725 delete $_->{parent};
581 $_->hide; 726 $_->hide;
582 } 727 }
583 728
584 $self->check_size; 729 $self->realloc;
585 $self->update;
586} 730}
587 731
588sub find_widget { 732sub find_widget {
589 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
590 734
591 $x -= $self->{x}; 735 $x -= $self->{x};
592 $y -= $self->{y}; 736 $y -= $self->{y};
593 737
594 my $res; 738 my $res;
595 739
596 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
597 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
598 and return $res; 742 and return $res;
599 } 743 }
600 744
601 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
677 $self->SUPER::size_allocate ($w, $h); 821 $self->SUPER::size_allocate ($w, $h);
678 $self->update; 822 $self->update;
679} 823}
680 824
681sub _render { 825sub _render {
826 my ($self) = @_;
827
682 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
683} 829}
684 830
685sub render_child { 831sub render_child {
686 my ($self) = @_; 832 my ($self) = @_;
687 833
688 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
689 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
690 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
691 837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
692 $self->_render; 845 $self->_render;
693# glColorMask 1, 1, 1, 0;
694# glEnable GL_BLEND;
695# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
696# glRasterPos 0, 0;
697# glCopyPixels 0, 0, $self->{w}, $self->{h};
698# glDisable GL_BLEND;
699# glColorMask 1, 1, 1, 1;
700 }; 846 };
701} 847}
702 848
703sub _draw { 849sub _draw {
704 my ($self) = @_; 850 my ($self) = @_;
705 851
706 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
707 853
708 my $tex = $self->{texture} 854 my $tex = $self->{texture}
709 or return; 855 or return;
710 856
711 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713 glColor 0, 0, 0, 1; 859 glColor 1, 1, 1, 1;
714 860
715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
716 862
717 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
718} 864}
… …
721 867
722package CFClient::UI::ViewPort; 868package CFClient::UI::ViewPort;
723 869
724our @ISA = CFClient::UI::Window::; 870our @ISA = CFClient::UI::Window::;
725 871
872sub new {
873 my $class = shift;
874
875 $class->SUPER::new (
876 scroll_x => 0,
877 scroll_y => 1,
878 @_,
879 )
880}
881
726sub size_request { 882sub size_request {
727 my ($self) = @_; 883 my ($self) = @_;
728 884
729 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
730 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
731 886
732 @$self{qw(child_w child_h)} 887 $w = 10 if $self->{scroll_x};
888 $h = 10 if $self->{scroll_y};
889
890 ($w, $h)
733} 891}
734 892
735sub size_allocate { 893sub size_allocate {
736 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
737 895
896 my $child = $self->child;
897
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900
901 $self->child->configure (0, 0, $w, $h);
738 $self->update; 902 $self->update;
739} 903}
740 904
741sub set_offset { 905sub set_offset {
742 my ($self, $x, $y) = @_; 906 my ($self, $x, $y) = @_;
… …
776} 940}
777 941
778sub _render { 942sub _render {
779 my ($self) = @_; 943 my ($self) = @_;
780 944
945 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
946 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
947
781 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
782 949
783 $self->SUPER::_render; 950 $self->SUPER::_render;
784} 951}
785 952
… …
788package CFClient::UI::ScrolledWindow; 955package CFClient::UI::ScrolledWindow;
789 956
790our @ISA = CFClient::UI::HBox::; 957our @ISA = CFClient::UI::HBox::;
791 958
792sub new { 959sub new {
793 my $class = shift; 960 my ($class, %arg) = @_;
961
962 my $child = delete $arg{child};
794 963
795 my $self; 964 my $self;
796 965
797 my $slider = new CFClient::UI::Slider 966 my $slider = new CFClient::UI::Slider
798 vertical => 1, 967 vertical => 1,
799 range => [0, 0, 1, 0.01], # HACK fix 968 range => [0, 0, 1, 0.01], # HACK fix
800 connect_changed => sub { 969 on_changed => sub {
801 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 970 $self->{vp}->set_offset (0, $_[1]);
802 }, 971 },
803 ; 972 ;
804 973
805 $self = $class->SUPER::new ( 974 $self = $class->SUPER::new (
806 vp => (new CFClient::UI::ViewPort), 975 vp => (new CFClient::UI::ViewPort expand => 1),
807 slider => $slider, 976 slider => $slider,
808 @_, 977 %arg,
809 ); 978 );
810 979
811 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp});
813 $self->add ($self->{slider}); 980 $self->SUPER::add ($self->{vp}, $self->{slider});
981 $self->add ($child) if $child;
814 982
815 $self 983 $self
984}
985
986sub add {
987 my ($self, $widget) = @_;
988
989 $self->{vp}->add ($self->{child} = $widget);
990}
991
992sub update {
993 my ($self) = @_;
994
995 $self->SUPER::update;
996
997 # todo: overwrite size_allocate of child
998 my $child = $self->{vp}->child;
999 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1000}
1001
1002sub size_allocate {
1003 my ($self, $w, $h) = @_;
1004
1005 $self->SUPER::size_allocate ($w, $h);
1006
1007 my $child = $self->{vp}->child;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
816} 1009}
817 1010
818#TODO# update range on size_allocate depending on child 1011#TODO# update range on size_allocate depending on child
819# update viewport offset on scroll 1012# update viewport offset on scroll
820 1013
… …
864 1057
865our @ISA = CFClient::UI::Bin::; 1058our @ISA = CFClient::UI::Bin::;
866 1059
867use CFClient::OpenGL; 1060use CFClient::OpenGL;
868 1061
869my @tex = 1062my $bg =
1063 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1064 mipmap => 1, wrap => 1;
1065
1066my @border =
870 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1067 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
871 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1068 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
872 1069
873sub new { 1070sub new {
874 my $class = shift; 1071 my ($class, %arg) = @_;
875 1072
876 # TODO: user_x, user_y, overwrite moveto? 1073 my $title = delete $arg{title};
877 1074
878 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
879 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
880 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
881 border => 0.6, 1078 border => 0.6,
882 toplevel => 1,
883 can_events => 1, 1079 can_events => 1,
884 @_ 1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
885 ); 1083 );
886 1084
887 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title} = new CFClient::UI::Label
888 align => 0, 1086 align => 0,
889 valign => 1, 1087 valign => 1,
890 text => $self->{title}, 1088 text => $title,
891 fontsize => $self->{border}; 1089 fontsize => $self->{border}
1090 if defined $title;
892 1091
893 $self 1092 $self
1093}
1094
1095sub add {
1096 my ($self, @widgets) = @_;
1097
1098 $self->SUPER::add (@widgets);
1099 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
894} 1100}
895 1101
896sub border { 1102sub border {
897 int $_[0]{border} * $::FONTSIZE 1103 int $_[0]{border} * $::FONTSIZE
898} 1104}
899 1105
900sub size_request { 1106sub size_request {
901 my ($self) = @_; 1107 my ($self) = @_;
1108
1109 $self->{title}->size_request
1110 if $self->{title};
902 1111
903 my ($w, $h) = $self->SUPER::size_request; 1112 my ($w, $h) = $self->SUPER::size_request;
904 1113
905 ( 1114 (
906 $w + $self->border * 2, 1115 $w + $self->border * 2,
… …
909} 1118}
910 1119
911sub size_allocate { 1120sub size_allocate {
912 my ($self, $w, $h) = @_; 1121 my ($self, $w, $h) = @_;
913 1122
1123 if ($self->{title}) {
1124 $self->{title}{w} = $w;
1125 $self->{title}{h} = $h;
1126 $self->{title}->size_allocate ($w, $h);
1127 }
1128
1129 my $border = $self->border;
1130
914 $h -= List::Util::max 0, $self->border * 2; 1131 $h -= List::Util::max 0, $border * 2;
915 $w -= List::Util::max 0, $self->border * 2; 1132 $w -= List::Util::max 0, $border * 2;
916 1133
917 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
918 if $self->{title};
919
920 $self->child->configure ($self->border, $self->border, $w, $h); 1134 $self->child->configure ($border, $border, $w, $h);
921} 1135}
922 1136
923sub button_down { 1137sub button_down {
924 my ($self, $ev, $x, $y) = @_; 1138 my ($self, $ev, $x, $y) = @_;
925 1139
… …
941 my ($ev, $x, $y) = @_; 1155 my ($ev, $x, $y) = @_;
942 1156
943 my $dx = $ev->{x} - $ox; 1157 my $dx = $ev->{x} - $ox;
944 my $dy = $ev->{y} - $oy; 1158 my $dy = $ev->{y} - $oy;
945 1159
946 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
947 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162
1163 $self->realloc;
948 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
949 $self->check_size;
950 }; 1165 };
951 1166
952 } elsif ($lr ^ $td) { 1167 } elsif ($lr ^ $td) {
953 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1168 my ($ox, $oy) = ($ev->{x}, $ev->{y});
954 my ($bx, $by) = ($self->{x}, $self->{y}); 1169 my ($bx, $by) = ($self->{x}, $self->{y});
… …
956 $self->{motion} = sub { 1171 $self->{motion} = sub {
957 my ($ev, $x, $y) = @_; 1172 my ($ev, $x, $y) = @_;
958 1173
959 ($x, $y) = ($ev->{x}, $ev->{y}); 1174 ($x, $y) = ($ev->{x}, $ev->{y});
960 1175
961 $self->move ($bx + $x - $ox, $by + $y - $oy); 1176 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
962 $self->update;
963 }; 1177 };
1178 } else {
1179 return 0;
1180 }
1181
964 } 1182 1
965} 1183}
966 1184
967sub button_up { 1185sub button_up {
968 my ($self, $ev, $x, $y) = @_; 1186 my ($self, $ev, $x, $y) = @_;
969 1187
970 delete $self->{motion}; 1188 !!delete $self->{motion}
971} 1189}
972 1190
973sub mouse_motion { 1191sub mouse_motion {
974 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
975 1193
976 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1194 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195
1196 !!$self->{motion}
977} 1197}
978 1198
979sub _draw { 1199sub _draw {
980 my ($self) = @_; 1200 my ($self) = @_;
981 1201
1202 my $child = $self->{children}[0];
1203
982 my ($w, $h ) = ($self->{w}, $self->{h}); 1204 my ($w, $h ) = ($self->{w}, $self->{h});
983 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1205 my ($cw, $ch) = ($child->{w}, $child->{h});
984 1206
985 glEnable GL_TEXTURE_2D; 1207 glEnable GL_TEXTURE_2D;
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1208 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
987 1209
988 my $border = $self->border; 1210 my $border = $self->border;
989 1211
990 glColor @{ $self->{border_bg} }; 1212 glColor @{ $self->{border_bg} };
991 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1213 $border[0]->draw_quad_alpha (0, 0, $w, $border);
992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1214 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1215 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1216 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
995 1217
996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1218 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
997 my $bg = $tex[0]; 1219 glColor @{ $self->{bg} };
998 1220
999 # TODO: repeat texture not scale 1221 # TODO: repeat texture not scale
1222 # solve this better(?)
1000 my $rep_x = $cw / $bg->{w}; 1223 $bg->{s} = $cw / $bg->{w};
1001 my $rep_y = $ch / $bg->{h}; 1224 $bg->{t} = $ch / $bg->{h};
1002
1003 glColor @{ $self->{bg} };
1004
1005 $bg->{s} = $rep_x;
1006 $bg->{t} = $rep_y;
1007 $bg->{wrap_mode} = 1;
1008 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1225 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 } 1226 }
1010 1227
1011 glDisable GL_TEXTURE_2D; 1228 glDisable GL_TEXTURE_2D;
1012 1229
1013 $self->{title}->draw if $self->{title};
1014
1015 $self->child->draw; 1230 $child->draw;
1231
1232 if ($self->{title}) {
1233 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw;
1235 }
1016} 1236}
1017 1237
1018############################################################################# 1238#############################################################################
1019 1239
1020package CFClient::UI::Table; 1240package CFClient::UI::Table;
… …
1028sub new { 1248sub new {
1029 my $class = shift; 1249 my $class = shift;
1030 1250
1031 $class->SUPER::new ( 1251 $class->SUPER::new (
1032 col_expand => [], 1252 col_expand => [],
1033 @_ 1253 @_,
1034 ) 1254 )
1255}
1256
1257sub children {
1258 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035} 1259}
1036 1260
1037sub add { 1261sub add {
1038 my ($self, $x, $y, $child) = @_; 1262 my ($self, $x, $y, $child) = @_;
1039 1263
1040 $child->set_parent ($self); 1264 $child->set_parent ($self);
1041 $self->{children}[$y][$x] = $child; 1265 $self->{children}[$y][$x] = $child;
1042 1266
1043 $child->check_size; 1267 $self->realloc;
1044} 1268}
1045 1269
1046sub children {
1047 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048}
1049
1050# TODO: move to container class maybe? send childs a signal on removal? 1270# TODO: move to container class maybe? send children a signal on removal?
1051sub clear { 1271sub clear {
1052 my ($self) = @_; 1272 my ($self) = @_;
1053 1273
1054 my @children = $self->children; 1274 my @children = $self->children;
1055 delete $self->{children}; 1275 delete $self->{children};
… …
1057 for (@children) { 1277 for (@children) {
1058 delete $_->{parent}; 1278 delete $_->{parent};
1059 $_->hide; 1279 $_->hide;
1060 } 1280 }
1061 1281
1062 $self->update; 1282 $self->realloc;
1063} 1283}
1064 1284
1065sub get_wh { 1285sub get_wh {
1066 my ($self) = @_; 1286 my ($self) = @_;
1067 1287
… …
1098sub size_allocate { 1318sub size_allocate {
1099 my ($self, $w, $h) = @_; 1319 my ($self, $w, $h) = @_;
1100 1320
1101 my ($ws, $hs) = $self->get_wh; 1321 my ($ws, $hs) = $self->get_wh;
1102 1322
1103 my $req_w = sum @$ws; 1323 my $req_w = (sum @$ws) || 1;
1104 my $req_h = sum @$hs; 1324 my $req_h = (sum @$hs) || 1;
1105 1325
1106 # TODO: nicer code && do row_expand 1326 # TODO: nicer code && do row_expand
1107 my @col_expand = @{$self->{col_expand}}; 1327 my @col_expand = @{$self->{col_expand}};
1108 @col_expand = (1) x @$ws unless @col_expand; 1328 @col_expand = (1) x @$ws unless @col_expand;
1109 my $col_expand = (sum @col_expand) || 1; 1329 my $col_expand = (sum @col_expand) || 1;
… …
1163 } 1383 }
1164} 1384}
1165 1385
1166############################################################################# 1386#############################################################################
1167 1387
1168package CFClient::UI::HBox; 1388package CFClient::UI::Box;
1169
1170# TODO: wrap into common Box base class
1171 1389
1172our @ISA = CFClient::UI::Container::; 1390our @ISA = CFClient::UI::Container::;
1173 1391
1174sub size_request { 1392sub size_request {
1175 my ($self) = @_; 1393 my ($self) = @_;
1176 1394
1177 my @alloc = map [$_->size_request], @{$self->{children}}; 1395 $self->{vertical}
1178 1396 ? (
1179 ( 1397 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1180 (List::Util::sum map $_->[0], @alloc), 1398 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1181 (List::Util::max map $_->[1], @alloc), 1399 )
1182 ) 1400 : (
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1403 )
1183} 1404}
1184 1405
1185sub size_allocate { 1406sub size_allocate {
1186 my ($self, $w, $h) = @_; 1407 my ($self, $w, $h) = @_;
1187 1408
1188 ($h, $w) = ($w, $h); 1409 my $space = $self->{vertical} ? $h : $w;
1189
1190 my $children = $self->{children}; 1410 my $children = $self->{children};
1191 1411
1192 my @h = map $_->{req_w}, @$children; 1412 my @req;
1193 1413
1194 my $req_h = List::Util::sum @h; 1414 if ($self->{homogeneous}) {
1195 1415 @req = ($space / (@$children || 1)) x @$children;
1196 if ($req_h > $h) {
1197 # ah well, not enough space
1198 $_ *= $h / $req_h for @h;
1199 } else { 1416 } else {
1417 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1418 my $req = List::Util::sum @req;
1419
1420 if ($req > $space) {
1421 # ah well, not enough space
1422 $_ *= $space / $req for @req;
1423 } else {
1200 my $exp = List::Util::sum map $_->{expand}, @$children; 1424 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1201 $exp ||= 1;
1202 1425
1426 $space = ($space - $req) / $expand; # remaining space to give away
1427
1428 $req[$_] += $space * $children->[$_]{expand}
1203 for (0 .. $#$children) { 1429 for 0 .. $#$children;
1204 my $child = $children->[$_];
1205
1206 my $alloc_h = $h[$_];
1207 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1208 $h[$_] = $alloc_h;
1209 } 1430 }
1210 } 1431 }
1211 1432
1212 CFClient::UI::harmonize \@h; 1433 CFClient::UI::harmonize \@req;
1213 1434
1214 my $y = 0; 1435 my $pos = 0;
1215 for (0 .. $#$children) { 1436 for (0 .. $#$children) {
1216 my $child = $children->[$_];
1217 my $h = $h[$_]; 1437 my $alloc = $req[$_];
1218 $child->configure ($y, 0, $h, $w); 1438 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1219 1439
1220 $y += $h; 1440 $pos += $alloc;
1221 } 1441 }
1222 1442
1223 1 1443 1
1224} 1444}
1225 1445
1226############################################################################# 1446#############################################################################
1227 1447
1448package CFClient::UI::HBox;
1449
1450our @ISA = CFClient::UI::Box::;
1451
1452sub new {
1453 my $class = shift;
1454
1455 $class->SUPER::new (
1456 vertical => 0,
1457 @_,
1458 )
1459}
1460
1461#############################################################################
1462
1228package CFClient::UI::VBox; 1463package CFClient::UI::VBox;
1229 1464
1230# TODO: wrap into common Box base class
1231
1232our @ISA = CFClient::UI::Container::; 1465our @ISA = CFClient::UI::Box::;
1233 1466
1234sub size_request { 1467sub new {
1235 my ($self) = @_; 1468 my $class = shift;
1236 1469
1237 my @alloc = map [$_->size_request], @{$self->{children}}; 1470 $class->SUPER::new (
1238 1471 vertical => 1,
1239 ( 1472 @_,
1240 (List::Util::max map $_->[0], @alloc),
1241 (List::Util::sum map $_->[1], @alloc),
1242 ) 1473 )
1243}
1244
1245sub size_allocate {
1246 my ($self, $w, $h) = @_;
1247
1248 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1250 my $children = $self->{children};
1251
1252 my @h = map $_->{req_h}, @$children;
1253
1254 my $req_h = List::Util::sum @h;
1255
1256 if ($req_h > $h) {
1257 # ah well, not enough space
1258 $_ *= $h / $req_h for @h;
1259 } else {
1260 my $exp = List::Util::sum map $_->{expand}, @$children;
1261 $exp ||= 1;
1262
1263 for (0 .. $#$children) {
1264 my $child = $children->[$_];
1265
1266 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1267 }
1268 }
1269
1270 CFClient::UI::harmonize \@h;
1271
1272 my $y = 0;
1273 for (0 .. $#$children) {
1274 my $child = $children->[$_];
1275 my $h = $h[$_];
1276 $child->configure (0, $y, $w, $h);
1277
1278 $y += $h;
1279 }
1280
1281 1
1282} 1474}
1283 1475
1284############################################################################# 1476#############################################################################
1285 1477
1286package CFClient::UI::Label; 1478package CFClient::UI::Label;
… …
1297 #bg => none 1489 #bg => none
1298 #active_bg => none 1490 #active_bg => none
1299 #font => default_font 1491 #font => default_font
1300 #text => initial text 1492 #text => initial text
1301 #markup => initial narkup 1493 #markup => initial narkup
1494 #max_w => maximum pixel width
1495 ellipsise => 3, # end
1302 layout => (new CFClient::Layout), 1496 layout => (new CFClient::Layout),
1303 fontsize => 1, 1497 fontsize => 1,
1304 align => -1, 1498 align => -1,
1305 valign => -1, 1499 valign => -1,
1306 padding => 2, 1500 padding_x => 2,
1501 padding_y => 2,
1307 can_events => 0, 1502 can_events => 0,
1308 %arg 1503 %arg
1309 ); 1504 );
1310 1505
1311 if (exists $self->{template}) { 1506 if (exists $self->{template}) {
… …
1347 $self->{text} = "T$text"; 1542 $self->{text} = "T$text";
1348 1543
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1350 $self->{layout}->set_text ($text); 1545 $self->{layout}->set_text ($text);
1351 1546
1547 $self->realloc;
1352 $self->update; 1548 $self->update;
1353 $self->check_size;
1354} 1549}
1355 1550
1356sub set_markup { 1551sub set_markup {
1357 my ($self, $markup) = @_; 1552 my ($self, $markup) = @_;
1358 1553
… …
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1557 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363 1558
1364 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1559 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1365 $self->{layout}->set_markup ($markup); 1560 $self->{layout}->set_markup ($markup);
1366 1561
1562 $self->realloc;
1367 $self->update; 1563 $self->update;
1368 $self->check_size;
1369} 1564}
1370 1565
1371sub size_request { 1566sub size_request {
1372 my ($self) = @_; 1567 my ($self) = @_;
1373 1568
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1569 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{max_w} || -1); 1570 $self->{layout}->set_width ($self->{max_w} || -1);
1571 $self->{layout}->set_ellipsise ($self->{ellipsise});
1572 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1574
1378 my ($w, $h) = $self->{layout}->size; 1575 my ($w, $h) = $self->{layout}->size;
1379 1576
1380 if (exists $self->{template}) { 1577 if (exists $self->{template}) {
… …
1385 1582
1386 $w = List::Util::max $w, $w2; 1583 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1584 $h = List::Util::max $h, $h2;
1388 } 1585 }
1389 1586
1390 ( 1587 ($w, $h)
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1588}
1395 1589
1396sub size_allocate { 1590sub size_allocate {
1397 my ($self, $w, $h) = @_; 1591 my ($self, $w, $h) = @_;
1398 1592
1593 delete $self->{ox};
1594
1399 delete $self->{texture}; 1595 delete $self->{texture}
1596 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1400} 1597}
1401 1598
1402sub set_fontsize { 1599sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1600 my ($self, $fontsize) = @_;
1404 1601
1405 $self->{fontsize} = $fontsize; 1602 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1603 delete $self->{texture};
1407 1604
1408 $self->update; 1605 $self->realloc;
1409 $self->check_size;
1410} 1606}
1411 1607
1412sub _draw { 1608sub _draw {
1413 my ($self) = @_; 1609 my ($self) = @_;
1414 1610
… …
1416 1612
1417 my $tex = $self->{texture} ||= do { 1613 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1614 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1615 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 1616 $self->{layout}->set_width ($self->{w});
1617 $self->{layout}->set_ellipsise ($self->{ellipsise});
1618 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1619 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422 1620
1423 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1621 new_from_layout CFClient::Texture $self->{layout}
1622 };
1424 1623
1624 unless (exists $self->{ox}) {
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1625 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1626 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1427 : ($self->{w} - $tex->{w}) * 0.5); 1627 : ($self->{w} - $tex->{w}) * 0.5);
1428 1628
1429 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1629 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1430 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1431 : ($self->{h} - $tex->{h}) * 0.5); 1631 : ($self->{h} - $tex->{h}) * 0.5);
1432
1433 $tex
1434 }; 1632 };
1435 1633
1436 glEnable GL_TEXTURE_2D; 1634 glEnable GL_TEXTURE_2D;
1437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1438 1636
… …
1464 active_fg => [0, 0, 0], 1662 active_fg => [0, 0, 0],
1465 can_hover => 1, 1663 can_hover => 1,
1466 can_focus => 1, 1664 can_focus => 1,
1467 valign => 0, 1665 valign => 0,
1468 can_events => 1, 1666 can_events => 1,
1667 #text => ...
1469 @_ 1668 @_
1470 ) 1669 )
1471} 1670}
1472 1671
1473sub _set_text { 1672sub _set_text {
… …
1483 $self->{text} = $text; 1682 $self->{text} = $text;
1484 1683
1485 $text =~ s/./*/g if $self->{hidden}; 1684 $text =~ s/./*/g if $self->{hidden};
1486 $self->{layout}->set_text ("$text "); 1685 $self->{layout}->set_text ("$text ");
1487 1686
1488 $self->emit (changed => $self->{text}); 1687 $self->_emit (changed => $self->{text});
1489} 1688}
1490 1689
1491sub set_text { 1690sub set_text {
1492 my ($self, $text) = @_; 1691 my ($self, $text) = @_;
1493 1692
1494 $self->{cursor} = length $text; 1693 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1694 $self->_set_text ($text);
1496 $self->update; 1695
1497 $self->check_size; 1696 $self->realloc;
1498} 1697}
1499 1698
1500sub get_text { 1699sub get_text {
1501 $_[0]{text} 1700 $_[0]{text}
1502} 1701}
… …
1505 my ($self) = @_; 1704 my ($self) = @_;
1506 1705
1507 my ($w, $h) = $self->SUPER::size_request; 1706 my ($w, $h) = $self->SUPER::size_request;
1508 1707
1509 ($w + 1, $h) # add 1 for cursor 1708 ($w + 1, $h) # add 1 for cursor
1510}
1511
1512sub size_allocate {
1513 my ($self, $w, $h) = @_;
1514
1515 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1516} 1709}
1517 1710
1518sub key_down { 1711sub key_down {
1519 my ($self, $ev) = @_; 1712 my ($self, $ev) = @_;
1520 1713
… …
1535 } elsif ($sym == CFClient::SDLK_HOME) { 1728 } elsif ($sym == CFClient::SDLK_HOME) {
1536 $self->{cursor} = 0; 1729 $self->{cursor} = 0;
1537 } elsif ($sym == CFClient::SDLK_END) { 1730 } elsif ($sym == CFClient::SDLK_END) {
1538 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1539 } elsif ($uni == 27) { 1732 } elsif ($uni == 27) {
1540 $self->emit ('escape'); 1733 $self->_emit ('escape');
1541 } elsif ($uni) { 1734 } elsif ($uni) {
1542 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1543 } 1738 }
1544 1739
1545 $self->_set_text ($text); 1740 $self->_set_text ($text);
1546 $self->update; 1741
1547 $self->check_size; 1742 $self->realloc;
1743
1744 1
1548} 1745}
1549 1746
1550sub focus_in { 1747sub focus_in {
1551 my ($self) = @_; 1748 my ($self) = @_;
1552 1749
… …
1567 utf8::encode $text; 1764 utf8::encode $text;
1568 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1569 1766
1570 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1571 $self->update; 1768 $self->update;
1769
1770 1
1572} 1771}
1573 1772
1574sub mouse_motion { 1773sub mouse_motion {
1575 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1576# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776
1777 0
1577} 1778}
1578 1779
1579sub _draw { 1780sub _draw {
1580 my ($self) = @_; 1781 my ($self) = @_;
1581 1782
… …
1632 if ($sym == 13) { 1833 if ($sym == 13) {
1633 unshift @{$self->{history}}, 1834 unshift @{$self->{history}},
1634 my $txt = $self->get_text; 1835 my $txt = $self->get_text;
1635 $self->{history_pointer} = -1; 1836 $self->{history_pointer} = -1;
1636 $self->{history_saveback} = ''; 1837 $self->{history_saveback} = '';
1637 $self->emit (activate => $txt); 1838 $self->_emit (activate => $txt);
1638 $self->update; 1839 $self->update;
1639 1840
1640 } elsif ($sym == CFClient::SDLK_UP) { 1841 } elsif ($sym == CFClient::SDLK_UP) {
1641 if ($self->{history_pointer} < 0) { 1842 if ($self->{history_pointer} < 0) {
1642 $self->{history_saveback} = $self->get_text; 1843 $self->{history_saveback} = $self->get_text;
… …
1658 } else { 1859 } else {
1659 $self->set_text ($self->{history_saveback}); 1860 $self->set_text ($self->{history_saveback});
1660 } 1861 }
1661 1862
1662 } else { 1863 } else {
1663 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1664 } 1867 1
1665
1666} 1868}
1667 1869
1668############################################################################# 1870#############################################################################
1669 1871
1670package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1679 1881
1680sub new { 1882sub new {
1681 my $class = shift; 1883 my $class = shift;
1682 1884
1683 $class->SUPER::new ( 1885 $class->SUPER::new (
1684 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1685 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1686 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1687 can_hover => 1, 1890 can_hover => 1,
1688 align => 0, 1891 align => 0,
1689 valign => 0, 1892 valign => 0,
1690 can_events => 1, 1893 can_events => 1,
1691 @_ 1894 @_
1692 ) 1895 )
1693} 1896}
1694 1897
1898sub activate { }
1899
1695sub button_up { 1900sub button_up {
1696 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1697 1902
1903 $self->emit ("activate")
1698 if ($x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1699 && $y >= 0 && $y < $self->{h}) { 1905 && $y >= 0 && $y < $self->{h};
1700 $self->emit ("activate"); 1906
1701 } 1907 1
1702} 1908}
1703 1909
1704sub _draw { 1910sub _draw {
1705 my ($self) = @_; 1911 my ($self) = @_;
1706 1912
… …
1735 1941
1736sub new { 1942sub new {
1737 my $class = shift; 1943 my $class = shift;
1738 1944
1739 $class->SUPER::new ( 1945 $class->SUPER::new (
1740 padding => 2, 1946 padding_x => 2,
1947 padding_y => 2,
1741 fg => [1, 1, 1], 1948 fg => [1, 1, 1],
1742 active_fg => [1, 1, 0], 1949 active_fg => [1, 1, 0],
1743 bg => [0, 0, 0, 0.2], 1950 bg => [0, 0, 0, 0.2],
1744 active_bg => [1, 1, 1, 0.5], 1951 active_bg => [1, 1, 1, 0.5],
1745 state => 0, 1952 state => 0,
… …
1749} 1956}
1750 1957
1751sub size_request { 1958sub size_request {
1752 my ($self) = @_; 1959 my ($self) = @_;
1753 1960
1754 ($self->{padding} * 2 + 6) x 2 1961 (6) x 2
1755} 1962}
1756 1963
1757sub button_down { 1964sub button_down {
1758 my ($self, $ev, $x, $y) = @_; 1965 my ($self, $ev, $x, $y) = @_;
1759 1966
1760 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1761 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1762 $self->{state} = !$self->{state}; 1969 $self->{state} = !$self->{state};
1763 $self->emit (changed => $self->{state}); 1970 $self->_emit (changed => $self->{state});
1971 } else {
1972 return 0
1973 }
1974
1764 } 1975 1
1765} 1976}
1766 1977
1767sub _draw { 1978sub _draw {
1768 my ($self) = @_; 1979 my ($self) = @_;
1769 1980
1770 $self->SUPER::_draw; 1981 $self->SUPER::_draw;
1771 1982
1772 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1983 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1773 1984
1774 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1985 my ($w, $h) = @$self{qw(w h)};
1986
1987 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1775 1988
1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1989 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1777 1990
1778 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1991 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779 1992
… …
2043 my $self = $class->SUPER::new ( 2256 my $self = $class->SUPER::new (
2044 fg => [1, 1, 1], 2257 fg => [1, 1, 1],
2045 active_fg => [0, 0, 0], 2258 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2], 2259 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5], 2260 active_bg => [1, 1, 1, 0.5],
2048 range => [0, 0, 100, 10], 2261 range => [0, 0, 100, 10, 0],
2049 req_w => $::WIDTH / 80, 2262 min_w => $::WIDTH / 80,
2050 req_h => $::WIDTH / 80, 2263 min_h => $::WIDTH / 80,
2051 vertical => 0, 2264 vertical => 0,
2052 can_hover => 1, 2265 can_hover => 1,
2053 inner_pad => .05, 2266 inner_pad => 0.02,
2054 @_ 2267 @_
2055 ); 2268 );
2056 2269
2057 $self->set_value ($self->{range}[0]); 2270 $self->set_value ($self->{range}[0]);
2058 $self->update; 2271 $self->update;
2059 2272
2060 $self 2273 $self
2061} 2274}
2062 2275
2276sub changed { }
2277
2278sub set_range {
2279 my ($self, $range) = @_;
2280
2281 ($range, $self->{range}) = ($self->{range}, $range);
2282
2283 $self->update
2284 if "@$range" ne "@{$self->{range}}";
2285}
2286
2063sub set_value { 2287sub set_value {
2064 my ($self, $value) = @_; 2288 my ($self, $value) = @_;
2065 2289
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2290 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067 2291
2068 $hi = $lo + 1 if $hi <= $lo; 2292 $hi = $lo + 1 if $hi <= $lo;
2069 2293
2294 $page = $hi - $lo if $page > $hi - $lo;
2295
2070 $value = $lo if $value < $lo; 2296 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi; 2297 $value = $hi - $page if $value > $hi - $page;
2072 2298
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2299 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit; 2300 if $unit;
2075 2301
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2302 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079 2303
2080 if ($value != $old_value) { 2304 if ($value != $old_value) {
2081 $self->emit (changed => $value); 2305 $self->_emit (changed => $value);
2082 $self->update; 2306 $self->update;
2083 } 2307 }
2084} 2308}
2085 2309
2086sub size_request { 2310sub size_request {
2087 my ($self) = @_; 2311 my ($self) = @_;
2088 2312
2089 my $w = $self->{req_w}; 2313 ($self->{req_w}, $self->{req_h})
2090 my $h = $self->{req_h};
2091
2092 $self->{vertical} ? ($h, $w) : ($w, $h)
2093} 2314}
2094 2315
2095sub button_down { 2316sub button_down {
2096 my ($self, $ev, $x, $y) = @_; 2317 my ($self, $ev, $x, $y) = @_;
2097 2318
2098 $self->SUPER::button_down ($ev, $x, $y); 2319 $self->SUPER::button_down ($ev, $x, $y);
2320
2321 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2322
2099 $self->mouse_motion ($ev, $x, $y); 2323 $self->mouse_motion ($ev, $x, $y)
2100} 2324}
2101 2325
2102sub mouse_motion { 2326sub mouse_motion {
2103 my ($self, $ev, $x, $y) = @_; 2327 my ($self, $ev, $x, $y) = @_;
2104 2328
2105 if ($GRAB == $self) { 2329 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2330 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107 2331
2108 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2332 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109 2333
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2334 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111 2335
2112 $self->set_value ($x * ($hi - $lo) + $lo); 2336 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2337 } else {
2338 return 0;
2339 }
2340
2113 } 2341 1
2114} 2342}
2115 2343
2116sub update { 2344sub update {
2117 my ($self) = @_; 2345 my ($self) = @_;
2118 2346
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2347 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120 $self->set_value ($self->{range}[0]); 2348 $self->set_value ($self->{range}[0]);
2121 2349
2122 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2350 my ($value, $lo, $hi, $page) = @{$self->{range}};
2351 my $range = ($hi - $page - $lo) || 1e-100;
2123 2352
2124 my $inner_w = 1 - 2 * $self->{inner_pad}; 2353 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125 2354
2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2355 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2356 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127 2357
2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2358 $value = ($value - $lo) / $range;
2129 $value = $self->{scale} * ($value - $lo); 2359 $value = $value * $self->{scale} + $self->{offset};
2130 2360
2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
2132
2133 $value = 0 if $value < 0;
2134 $page = 1 - $value if $value + $page > 1;
2135
2136 $self->{knob_x} = $value; 2361 $self->{knob_x} = $value - $knob_w * 0.5;
2137 $self->{knob_w} = $page; 2362 $self->{knob_w} = $knob_w;
2138 }); 2363 });
2139 2364
2140 $self->SUPER::update; 2365 $self->SUPER::update;
2141} 2366}
2142 2367
… …
2148 glScale $self->{w}, $self->{h}; 2373 glScale $self->{w}, $self->{h};
2149 2374
2150 if ($self->{vertical}) { 2375 if ($self->{vertical}) {
2151 # draw a vertical slider like a rotated horizontal slider 2376 # draw a vertical slider like a rotated horizontal slider
2152 2377
2378 glTranslate 1, 0, 0;
2153 glRotate 90, 0, 0, 1; 2379 glRotate 90, 0, 0, 1;
2154 glTranslate 0, 1, 0;
2155 } 2380 }
2156 2381
2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2382 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2383 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159 2384
… …
2166 # draw handle 2391 # draw handle
2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2392 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168 2393
2169 glDisable GL_TEXTURE_2D; 2394 glDisable GL_TEXTURE_2D;
2170} 2395}
2396
2397#############################################################################
2398
2399package CFClient::UI::ValSlider;
2400
2401our @ISA = CFClient::UI::HBox::;
2402
2403sub new {
2404 my ($class, %arg) = @_;
2405
2406 my $range = delete $arg{range};
2407
2408 my $self = $class->SUPER::new (
2409 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2410 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2411 to_value => sub { shift },
2412 from_value => sub { shift },
2413 %arg,
2414 );
2415
2416 $self->{slider}->connect (changed => sub {
2417 my ($self, $value) = @_;
2418 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2419 $self->{parent}->emit (changed => $value);
2420 });
2421
2422# $self->{entry}->connect (changed => sub {
2423# my ($self, $value) = @_;
2424# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2425# $self->{parent}->emit (changed => $value);
2426# });
2427
2428 $self->add ($self->{slider}, $self->{entry});
2429
2430 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2431
2432 $self
2433}
2434
2435sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) }
2171 2437
2172############################################################################# 2438#############################################################################
2173 2439
2174package CFClient::UI::TextView; 2440package CFClient::UI::TextView;
2175 2441
… …
2205 2471
2206 $self->{fontsize} = $fontsize; 2472 $self->{fontsize} = $fontsize;
2207 $self->reflow; 2473 $self->reflow;
2208} 2474}
2209 2475
2210sub text_height {
2211 my ($self, $text) = @_;
2212
2213 my $layout = $self->{layout};
2214
2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2216 $layout->set_width ($self->{children}[0]{w});
2217 $layout->set_markup ($text);
2218
2219 ($layout->size)[1]
2220}
2221
2222sub reflow {
2223 my ($self) = @_;
2224
2225 $self->{need_reflow}++;
2226 $self->update;
2227}
2228
2229sub size_allocate { 2476sub size_allocate {
2230 my ($self, $w, $h) = @_; 2477 my ($self, $w, $h) = @_;
2231 2478
2232 $self->SUPER::size_allocate ($w, $h); 2479 $self->SUPER::size_allocate ($w, $h);
2233 2480
… …
2236 $self->{layout}->set_width ($self->{children}[0]{w}); 2483 $self->{layout}->set_width ($self->{children}[0]{w});
2237 2484
2238 $self->reflow; 2485 $self->reflow;
2239} 2486}
2240 2487
2488sub text_size {
2489 my ($self, $text, $indent) = @_;
2490
2491 my $layout = $self->{layout};
2492
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $layout->set_width ($self->{children}[0]{w} - $indent);
2495 $layout->set_markup ($text);
2496
2497 $layout->size
2498}
2499
2500sub reflow {
2501 my ($self) = @_;
2502
2503 $self->{need_reflow}++;
2504 $self->update;
2505}
2506
2507sub set_offset {
2508 my ($self, $offset) = @_;
2509
2510 # todo: base offset on lines or so, not on pixels
2511 $self->{children}[1]->set_value ($offset);
2512}
2513
2514sub clear {
2515 my ($self) = @_;
2516
2517 $self->{par} = [];
2518 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520}
2521
2241sub add_paragraph { 2522sub add_paragraph {
2242 my ($self, $color, $text) = @_; 2523 my ($self, $color, $text, $indent) = @_;
2243 2524
2244 #TODO: intelligently "reformat" paragraph 2525 for my $line (split /\n/, $text) {
2245 2526 my ($w, $h) = $self->text_size ($line);
2246 my $height = $self->text_height ($text);
2247
2248 $self->{height} += $height; 2527 $self->{height} += $h;
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2529 }
2249 2530
2250 push @{$self->{par}}, [$height, $color, $text];
2251
2252 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2531 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2253 $self->{children}[1]->update;
2254} 2532}
2255 2533
2256sub update { 2534sub update {
2257 my ($self) = @_; 2535 my ($self) = @_;
2258 2536
… …
2261 return unless $self->{h} > 0; 2539 return unless $self->{h} > 0;
2262 2540
2263 delete $self->{texture}; 2541 delete $self->{texture};
2264 2542
2265 $ROOT->on_post_alloc ($self, sub { 2543 $ROOT->on_post_alloc ($self, sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545
2266 if (delete $self->{need_reflow}) { 2546 if (delete $self->{need_reflow}) {
2267 my $height = 0; 2547 my $height = 0;
2268 2548
2269 $height += $_->[0] = $self->text_height ($_->[2]) 2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2270 for @{$self->{par}}; 2553 for (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2555 $layout->set_width ($W - $_->[3]);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3];
2559 $_->[1] = $h;
2560 }
2561
2562 $height += $_->[1];
2563 }
2271 2564
2272 $self->{height} = $height; 2565 $self->{height} = $height;
2273 2566
2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275 2568
2276 delete $self->{texture}; 2569 delete $self->{texture};
2277 } 2570 }
2278 2571
2279 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2280 glClearColor 0, 0, 0, 0; 2573 glClearColor 0.5, 0.5, 0.5, 0;
2281 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2282 2575
2283 glEnable GL_TEXTURE_2D;
2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2285
2286 my $top = int $self->{children}[1]{range}[0]; 2576 my $top = int $self->{children}[1]{range}[0];
2287 2577
2288 my $y0 = $top; 2578 my $y0 = $top;
2289 my $y1 = $top + $self->{h}; 2579 my $y1 = $top + $H;
2290 2580
2291 my $y = 0; 2581 my $y = 0;
2292 2582
2293 my $layout = $self->{layout}; 2583 my $layout = $self->{layout};
2294 2584
2295 $layout->set_font ($self->{font}) if $self->{font}; 2585 $layout->set_font ($self->{font}) if $self->{font};
2296 2586
2587 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off
2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2590
2297 for my $par (@{$self->{par}}) { 2591 for my $par (@{$self->{par}}) {
2298 my $h = $par->[0]; 2592 my $h = $par->[1];
2299 2593
2300 if ($y0 < $y + $h && $y < $y1) { 2594 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] }); 2595 $layout->set_foreground (@{ $par->[2] });
2596 $layout->set_width ($W - $par->[3]);
2302 $layout->set_markup ($par->[2]); 2597 $layout->set_markup ($par->[4]);
2303 2598
2304 my ($W, $H) = $layout->size; 2599 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2600
2601 glRasterPos $par->[3], $y - $y0;
2602 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2306 } 2603 }
2307 2604
2308 $y += $h; 2605 $y += $h;
2309 } 2606 }
2310 2607
2311 glDisable GL_TEXTURE_2D; 2608 glDisable GL_BLEND;
2312 }; 2609 };
2313 }); 2610 });
2314} 2611}
2315 2612
2316sub _draw { 2613sub _draw {
2317 my ($self) = @_; 2614 my ($self) = @_;
2318 2615
2319 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321 glColor 1, 1, 1, 1; 2618 glColor 1, 1, 1, 1;
2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2619 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2324 2621
2325 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2326 2623
2327} 2624}
… …
2376 2673
2377sub new { 2674sub new {
2378 my $class = shift; 2675 my $class = shift;
2379 2676
2380 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2381 state => 0, 2678 state => 0,
2382 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2383 @_ 2680 @_
2384 ); 2681 );
2385 2682
2386 if ($self->{state}) {
2387 $self->{state} = 0;
2388 $self->toggle_flopper;
2389 }
2390
2391 $self 2683 $self
2392} 2684}
2393 2685
2394sub toggle_flopper { 2686sub toggle_flopper {
2395 my ($self) = @_; 2687 my ($self) = @_;
2396 2688
2397 # TODO: use animation 2689 $self->{other}->toggle_visibility;
2398 if ($self->{state} = !$self->{state}) {
2399 $CFClient::UI::ROOT->add ($self->{other});
2400 $self->{other}->move ($self->coord2global (0, $self->{h}));
2401 $self->emit ("open");
2402 } else {
2403 $CFClient::UI::ROOT->remove ($self->{other});
2404 $self->emit ("close");
2405 }
2406
2407 $self->emit (changed => $self->{state});
2408} 2690}
2409 2691
2410############################################################################# 2692#############################################################################
2411 2693
2412package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
… …
2425} 2707}
2426 2708
2427sub set_tooltip_from { 2709sub set_tooltip_from {
2428 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2429 2711
2712 my $tooltip = $widget->{tooltip};
2713
2714 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}";
2719 }
2720
2430 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2431 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8, 2724 fontsize => 0.8,
2434 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2726 ellipsise => 0,
2435 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 ); 2728 );
2437} 2729}
2438 2730
2439sub size_request { 2731sub size_request {
2440 my ($self) = @_; 2732 my ($self) = @_;
… …
2446 2738
2447sub size_allocate { 2739sub size_allocate {
2448 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2449 2741
2450 $self->SUPER::size_allocate ($w - 4, $h - 4); 2742 $self->SUPER::size_allocate ($w - 4, $h - 4);
2743}
2744
2745sub visibility_change {
2746 my ($self, $visible) = @_;
2747
2748 return unless $visible;
2749
2750 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner}
2752 or return;
2753
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH;
2758
2759 $self->move_abs ($x, $y);
2760 });
2451} 2761}
2452 2762
2453sub _draw { 2763sub _draw {
2454 my ($self) = @_; 2764 my ($self) = @_;
2455 2765
… …
2472 glVertex $w, $h; 2782 glVertex $w, $h;
2473 glVertex $w, 0; 2783 glVertex $w, 0;
2474 glEnd; 2784 glEnd;
2475 2785
2476 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2477 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2478} 2789}
2479 2790
2480############################################################################# 2791#############################################################################
2481 2792
… …
2486use CFClient::OpenGL; 2797use CFClient::OpenGL;
2487 2798
2488sub new { 2799sub new {
2489 my $class = shift; 2800 my $class = shift;
2490 2801
2491 $class->SUPER::new ( 2802 my $self = $class->SUPER::new (
2492 aspect => 1, 2803 aspect => 1,
2804 can_events => 0,
2493 @_, 2805 @_,
2494 ) 2806 );
2807
2808 if ($self->{anim} && $self->{animspeed}) {
2809 Scalar::Util::weaken (my $widget = $self);
2810
2811 $self->{timer} = Event->timer (
2812 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2813 hard => 1,
2814 interval => $self->{animspeed},
2815 cb => sub {
2816 ++$widget->{frame};
2817 $widget->update;
2818 },
2819 );
2820 }
2821
2822 $self
2495} 2823}
2496 2824
2497sub size_request { 2825sub size_request {
2498 (32, 8) 2826 (32, 8)
2499} 2827}
2500 2828
2829sub update {
2830 my ($self) = @_;
2831
2832 return unless $self->{visible};
2833
2834 $self->SUPER::update;
2835}
2836
2501sub _draw { 2837sub _draw {
2502 my ($self) = @_; 2838 my ($self) = @_;
2503 2839
2504 return unless $::CONN;#d# manage and cache textures differently 2840 return unless $::CONN;
2841
2842 my $face;
2843
2844 if ($self->{frame}) {
2845 my $anim = $::CONN->{anim}[$self->{anim}];
2846
2847 $face = $anim->[ $self->{frame} % @$anim ]
2848 if $anim && @$anim;
2849 }
2850
2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506 2852
2507 # TODO animation
2508 if ($tex) { 2853 if ($tex) {
2509 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511 glColor 1, 1, 1, 1; 2856 glColor 1, 1, 1, 1;
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2514 } 2859 }
2515} 2860}
2516 2861
2862sub DESTROY {
2863 my ($self) = @_;
2864
2865 $self->{timer}->cancel
2866 if $self->{timer};
2867
2868 $self->SUPER::DESTROY;
2869}
2870
2517############################################################################# 2871#############################################################################
2518 2872
2519package CFClient::UI::InventoryItem; 2873package CFClient::UI::Buttonbar;
2520 2874
2521our @ISA = CFClient::UI::HBox::; 2875our @ISA = CFClient::UI::HBox::;
2522 2876
2523sub _item_to_desc { 2877# TODO: should actualyl wrap buttons and other goodies.
2524 my ($item) = @_;
2525
2526 my $desc =
2527 $item->{nrof} < 2
2528 ? $item->{name}
2529 : "$item->{nrof} $item->{name_pl}";
2530
2531 $item->{flags} & Crossfire::Protocol::F_OPEN
2532 and $desc .= " (open)";
2533 $item->{flags} & Crossfire::Protocol::F_APPLIED
2534 and $desc .= " (applied)";
2535 $item->{flags} & Crossfire::Protocol::F_UNPAID
2536 and $desc .= " (unpaid)";
2537 $item->{flags} & Crossfire::Protocol::F_MAGIC
2538 and $desc .= " (magic)";
2539 $item->{flags} & Crossfire::Protocol::F_CURSED
2540 and $desc .= " (cursed)";
2541 $item->{flags} & Crossfire::Protocol::F_DAMNED
2542 and $desc .= " (damned)";
2543 $item->{flags} & Crossfire::Protocol::F_LOCKED
2544 and $desc .= " *";
2545
2546 $desc
2547}
2548
2549sub new {
2550 my $class = shift;
2551
2552 my %args = @_;
2553
2554 my $item = delete $args{item};
2555
2556 my $desc = _item_to_desc ($item);
2557
2558 my $self = $class->SUPER::new (
2559 can_hover => 1,
2560 can_events => 1,
2561 tooltip => ((CFClient::UI::Label::escape $desc)
2562 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2563 connect_button_down => sub {
2564 my ($self, $ev, $x, $y) = @_;
2565
2566 # todo: maybe put examine on 1? but should just be a tooltip :(
2567 if ($ev->{button} == 1) {
2568 my $targ = $::CONN->{player}{tag};
2569
2570 if ($item->{container} == $::CONN->{player}{tag}) {
2571 $targ = $main::OPENCONT;
2572 }
2573
2574 $::CONN->send ("move $targ $item->{tag} 0");
2575 } elsif ($ev->{button} == 2) {
2576 $::CONN->send ("apply $item->{tag}");
2577 } elsif ($ev->{button} == 3) {
2578 my @menu_items = (
2579 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2580 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2581 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2582 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2583 [
2584 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2585 sub { $::CONN->send ("lock $item->{tag}") },
2586 ],
2587 );
2588
2589 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2590 }
2591
2592 1
2593 },
2594 %args
2595 );
2596
2597
2598 $self->add (new CFClient::UI::Face
2599 can_events => 0,
2600 face => $item->{face},
2601 anim => $item->{anim},
2602 animspeed => $item->{animspeed},
2603 );
2604
2605 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2606
2607 $self->{item} = $item;
2608
2609 $self->update_item;
2610
2611 $self
2612}
2613
2614sub update_item {
2615 my ($self) = @_;
2616
2617 my $desc = _item_to_desc ($self->{item});
2618
2619 $self->{name_lbl}->set_text ($desc);
2620}
2621
2622#############################################################################
2623
2624package CFClient::UI::Inventory;
2625
2626our @ISA = CFClient::UI::ScrolledWindow::;
2627
2628sub new {
2629 my $class = shift;
2630
2631 my $self = $class->SUPER::new (
2632 scrolled => (new CFClient::UI::VBox),
2633 @_,
2634 );
2635
2636 $self
2637}
2638
2639sub set_items {
2640 my ($self, $items) = @_;
2641
2642 $self->{scrolled}->clear;
2643 return unless $items;
2644
2645 my @items = sort {
2646 ($a->{type} <=> $b->{type})
2647 or ($a->{name} cmp $b->{name})
2648 } @$items;
2649
2650 $self->{real_items} = \@items;
2651
2652 for my $item (@items) {
2653 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2654 $item->update_item ();
2655 }
2656
2657 $self->{scrolled}->add (@items);
2658
2659# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2660}
2661
2662sub size_request {
2663 my ($self) = @_;
2664 ($self->{req_w}, $self->{req_h});
2665}
2666 2878
2667############################################################################# 2879#############################################################################
2668 2880
2669package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2670 2882
… …
2704 2916
2705# popup given the event (must be a mouse button down event currently) 2917# popup given the event (must be a mouse button down event currently)
2706sub popup { 2918sub popup {
2707 my ($self, $ev) = @_; 2919 my ($self, $ev) = @_;
2708 2920
2709 $self->emit ("popdown"); 2921 $self->_emit ("popdown");
2710 2922
2711 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2712 $GRAB = $self; 2924 $GRAB = $self;
2713 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2714 2926
2715 $self->show; 2927 $self->show;
2716 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2717} 2929}
2718 2930
2719sub mouse_motion { 2931sub mouse_motion {
2720 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2721 2933
2722 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2723 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2724 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2725} 2939}
2726 2940
2727sub button_up { 2941sub button_up {
2728 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2729 2943
2730 if ($ev->{button} == $self->{button}) { 2944 if ($ev->{button} == $self->{button}) {
2731 undef $GRAB; 2945 undef $GRAB;
2732 $self->hide; 2946 $self->hide;
2733 2947
2734 $self->emit ("popdown"); 2948 $self->_emit ("popdown");
2735 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2954 1
2955}
2956
2957#############################################################################
2958
2959package CFClient::UI::Multiplexer;
2960
2961our @ISA = CFClient::UI::Container::;
2962
2963sub new {
2964 my $class = shift;
2965
2966 my $self = $class->SUPER::new (
2967 @_,
2968 );
2969
2970 $self->{current} = $self->{children}[0]
2971 if @{ $self->{children} };
2972
2973 $self
2974}
2975
2976sub add {
2977 my ($self, @widgets) = @_;
2978
2979 $self->SUPER::add (@widgets);
2980
2981 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} };
2983}
2984
2985sub set_current_page {
2986 my ($self, $page_or_widget) = @_;
2987
2988 my $widget = ref $page_or_widget
2989 ? $page_or_widget
2990 : $self->{children}[$page_or_widget];
2991
2992 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994
2995 $self->_emit (page_changed => $self->{current});
2996
2997 $self->realloc;
2998}
2999
3000sub visible_children {
3001 $_[0]{current}
3002}
3003
3004sub size_request {
3005 my ($self) = @_;
3006
3007 $self->{current}->size_request
3008}
3009
3010sub size_allocate {
3011 my ($self, $w, $h) = @_;
3012
3013 $self->{current}->configure (0, 0, $w, $h);
3014}
3015
3016sub _draw {
3017 my ($self) = @_;
3018
3019 $self->{current}->draw;
3020}
3021
3022#############################################################################
3023
3024package CFClient::UI::Notebook;
3025
3026our @ISA = CFClient::UI::VBox::;
3027
3028sub new {
3029 my $class = shift;
3030
3031 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self
3035 @_,
3036 );
2736 } 3037
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040
3041 $self
3042}
3043
3044sub add {
3045 my ($self, $title, $widget, $tooltip) = @_;
3046
3047 Scalar::Util::weaken $self;
3048
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget);
3056}
3057
3058sub set_current_page {
3059 my ($self, $page) = @_;
3060
3061 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current});
2737} 3063}
2738 3064
2739############################################################################# 3065#############################################################################
2740 3066
2741package CFClient::UI::Statusbox; 3067package CFClient::UI::Statusbox;
… …
2774 # TODO: doesn't handle markup well (read as: at all) 3100 # TODO: doesn't handle markup well (read as: at all)
2775 my $short = $item->{count} > 1 3101 my $short = $item->{count} > 1
2776 ? "<b>$item->{count} ×</b> $item->{text}" 3102 ? "<b>$item->{count} ×</b> $item->{text}"
2777 : $item->{text}; 3103 : $item->{text};
2778 3104
2779 my $fontsize = $item->{fontsize} || $self->{fontsize};
2780
2781 for ($short) { 3105 for ($short) {
2782 s/^\s+//; 3106 s/^\s+//;
2783 s/\s+/ /g; 3107 s/\s+/ /g;
2784 my $len = int 40 / $fontsize;
2785 substr $_, $len, length, "…" if $len < length;
2786 } 3108 }
2787 3109
2788 new CFClient::UI::Label 3110 new CFClient::UI::Label
2789 markup => $short, 3111 markup => $short,
2790 tooltip => $item->{tooltip}, 3112 tooltip => $item->{tooltip},
2791 tooltip_font => $::FONT_PROP, 3113 tooltip_font => $::FONT_PROP,
2792 tooltip_width => 0.67, 3114 tooltip_width => 0.67,
2793 fontsize => $fontsize, 3115 fontsize => $item->{fontsize} || $self->{fontsize},
3116 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg}, 3117 fg => $item->{fg},
2795 can_events => 1, 3118 can_events => 1,
2796 can_hover => 1 3119 can_hover => 1
2797 }; 3120 };
2798 } 3121 }
… …
2804sub add { 3127sub add {
2805 my ($self, $text, %arg) = @_; 3128 my ($self, $text, %arg) = @_;
2806 3129
2807 $text =~ s/^\s+//; 3130 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 3131 $text =~ s/\s+$//;
3132
3133 return unless $text;
2809 3134
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 3135 my $timeout = time + ((delete $arg{timeout}) || 60);
2811 3136
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3137 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 3138
… …
2835 } 3160 }
2836 3161
2837 $self->reorder; 3162 $self->reorder;
2838} 3163}
2839 3164
3165sub reconfigure {
3166 my ($self) = @_;
3167
3168 delete $_->{label}
3169 for values %{ $self->{item} || {} };
3170
3171 $self->reorder;
3172 $self->SUPER::reconfigure;
3173}
3174
2840############################################################################# 3175#############################################################################
2841 3176
2842package CFClient::UI::Root; 3177package CFClient::UI::Inventory;
2843 3178
2844our @ISA = CFClient::UI::Container::; 3179our @ISA = CFClient::UI::ScrolledWindow::;
2845
2846use CFClient::OpenGL;
2847 3180
2848sub new { 3181sub new {
2849 my $class = shift; 3182 my $class = shift;
2850 3183
2851 $class->SUPER::new ( 3184 my $self = $class->SUPER::new (
3185 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3186 @_,
3187 );
3188
3189 $self
3190}
3191
3192sub set_items {
3193 my ($self, $items) = @_;
3194
3195 $self->{child}->clear;
3196 return unless $items;
3197
3198 my @items = sort {
3199 ($a->{type} <=> $b->{type})
3200 or ($a->{name} cmp $b->{name})
3201 } @$items;
3202
3203 $self->{real_items} = \@items;
3204
3205 my $row = 0;
3206 for my $item (@items) {
3207 CFClient::Item::update_widgets $item;
3208
3209 $self->{child}->add (0, $row, $item->{face_widget});
3210 $self->{child}->add (1, $row, $item->{desc_widget});
3211 $self->{child}->add (2, $row, $item->{weight_widget});
3212
3213 $row++;
3214 }
3215}
3216
3217#############################################################################
3218
3219package CFClient::UI::BindEditor;
3220
3221our @ISA = CFClient::UI::FancyFrame::;
3222
3223sub new {
3224 my $class = shift;
3225
3226 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3227
3228 $self->add (my $vb = new CFClient::UI::VBox);
3229
3230
3231 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3232 text => "start recording",
3233 tooltip => "Start/Stops recording of actions."
3234 ."All subsequent actions after the recording started will be captured."
3235 ."The actions are displayed after the record was stopped."
3236 ."To bind the action you have to click on the 'Bind' button",
3237 on_activate => sub {
3238 unless ($self->{recording}) {
3239 $self->start;
3240 } else {
3241 $self->stop;
3242 }
3243 });
3244
3245 $vb->add (new CFClient::UI::Label text => "Actions:");
3246 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3247
3248 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3251 $hb->add (new CFClient::UI::Button
3252 text => "bind",
3253 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3254 on_activate => sub {
3255 $self->ask_for_bind;
3256 });
3257
3258 $vb->add (my $hb = new CFClient::UI::HBox);
3259 $hb->add (new CFClient::UI::Button
3260 text => "ok",
3261 expand => 1,
3262 tooltip => "This closes the binding editor and saves the binding",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->commit;
3266 });
3267
3268 $hb->add (new CFClient::UI::Button
3269 text => "cancel",
3270 expand => 1,
3271 tooltip => "This closes the binding editor without saving",
3272 on_activate => sub {
3273 $self->hide;
3274 $self->{binding_cancel}->()
3275 if $self->{binding_cancel};
3276 });
3277
3278 $self->update_binding_widgets;
3279
3280 $self
3281}
3282
3283sub commit {
3284 my ($self) = @_;
3285 my ($mod, $sym, $cmds) = $self->get_binding;
3286 if ($sym != 0 && @$cmds > 0) {
3287 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3288 ."'. Don't forget 'Save Config'!");
3289 $self->{binding_change}->($mod, $sym, $cmds)
3290 if $self->{binding_change};
3291 } else {
3292 $::STATUSBOX->add ("No action bound, no key or action specified!");
3293 $self->{binding_cancel}->()
3294 if $self->{binding_cancel};
3295 }
3296}
3297
3298sub start {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("stop recording");
3302 $self->{recording} = 1;
3303 $self->clear_command_list;
3304 $::CONN->start_record if $::CONN;
3305}
3306
3307sub stop {
3308 my ($self) = @_;
3309
3310 $self->{rec_btn}->set_text ("start recording");
3311 $self->{recording} = 0;
3312
3313 my $rec;
3314 $rec = $::CONN->stop_record if $::CONN;
3315 return unless ref $rec eq 'ARRAY';
3316 $self->set_command_list ($rec);
3317}
3318
3319
3320sub ask_for_bind_and_commit {
3321 my ($self) = @_;
3322 $self->ask_for_bind (1);
3323}
3324
3325sub ask_for_bind {
3326 my ($self, $commit) = @_;
3327
3328 CFClient::Binder::open_binding_dialog (sub {
3329 my ($mod, $sym) = @_;
3330 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3331 $self->update_binding_widgets;
3332 $self->commit if $commit;
3333 });
3334}
3335
3336# $mod and $sym are the modifiers and key symbol
3337# $cmds is a array ref of strings (the commands)
3338# $cb is the callback that is executed on OK
3339# $ccb is the callback that is executed on CANCEL and
3340# when the binding was unsuccessful on OK
3341sub set_binding {
3342 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3343
3344 $self->clear_command_list;
3345 $self->{recording} = 0;
3346 $self->{rec_btn}->set_text ("start recording");
3347
3348 $self->{binding} = [$mod, $sym];
3349 $self->{commands} = $cmds;
3350
3351 $self->{binding_change} = $cb;
3352 $self->{binding_cancel} = $ccb;
3353
3354 $self->update_binding_widgets;
3355}
3356
3357# this is a shortcut method that asks for a binding
3358# and then just binds it.
3359sub do_quick_binding {
3360 my ($self, $cmds) = @_;
3361 $self->set_binding (undef, undef, $cmds, sub {
3362 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3363 });
3364 $self->ask_for_bind (1);
3365}
3366
3367sub update_binding_widgets {
3368 my ($self) = @_;
3369 my ($mod, $sym, $cmds) = $self->get_binding;
3370 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3371 $self->set_command_list ($cmds);
3372}
3373
3374sub get_binding {
3375 my ($self) = @_;
3376 return (
3377 $self->{binding}->[0],
3378 $self->{binding}->[1],
3379 [ grep { defined $_ } @{$self->{commands}} ]
3380 );
3381}
3382
3383sub clear_command_list {
3384 my ($self) = @_;
3385 $self->{cmdbox}->clear ();
3386}
3387
3388sub set_command_list {
3389 my ($self, $cmds) = @_;
3390
3391 $self->{cmdbox}->clear ();
3392 $self->{commands} = $cmds;
3393
3394 my $idx = 0;
3395
3396 for (@$cmds) {
3397 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3398
3399 my $i = $idx;
3400 $hb->add (new CFClient::UI::Label text => $_);
3401 $hb->add (new CFClient::UI::Button
3402 text => "delete",
3403 tooltip => "Deletes the action from the record",
3404 on_activate => sub {
3405 $self->{cmdbox}->remove ($hb);
3406 $cmds->[$i] = undef;
3407 });
3408
3409
3410 $idx++
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::SpellList;
3417
3418our @ISA = CFClient::UI::Table::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (
3424 binding => [],
3425 commands => [],
2852 @_, 3426 @_,
2853 ) 3427 )
2854} 3428}
2855 3429
2856sub configure { 3430# XXX: Do sorting? Argl...
2857 my ($self, $x, $y, $w, $h) = @_; 3431sub add_spell {
2858
2859 $self->{w} = $w;
2860 $self->{h} = $h;
2861}
2862
2863sub check_size {
2864 my ($self) = @_; 3432 my ($self, $spell) = @_;
3433 $self->{spells}->{$spell->{name}} = $spell;
2865 3434
2866 $self->size_allocate ($self->{w}, $self->{h}) 3435 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2867 if $self->{w}; 3436 face => $spell->{face},
3437 can_hover => 1,
3438 can_events => 1,
3439 tooltip => $spell->{message});
3440
3441 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => $spell->{name},
3443 can_hover => 1,
3444 can_events => 1,
3445 tooltip => $spell->{message},
3446 expand => 1);
3447
3448 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3450 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3451 expand => 1);
3452
3453 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3454 text => "bind to key",
3455 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3456}
3457
3458sub rebuild_spell_list {
3459 my ($self) = @_;
3460 $self->{tbl_idx} = 0;
3461 $self->add_spell ($_) for values %{$self->{spells}};
3462}
3463
3464sub remove_spell {
3465 my ($self, $spell) = @_;
3466 delete $self->{spells}->{$spell->{name}};
3467 $self->rebuild_spell_list;
3468}
3469
3470#############################################################################
3471
3472package CFClient::UI::Root;
3473
3474our @ISA = CFClient::UI::Container::;
3475
3476use CFClient::OpenGL;
3477
3478sub new {
3479 my $class = shift;
3480
3481 my $self = $class->SUPER::new (
3482 visible => 1,
3483 @_,
3484 );
3485
3486 Scalar::Util::weaken ($self->{root} = $self);
3487
3488 $self
2868} 3489}
2869 3490
2870sub size_request { 3491sub size_request {
2871 my ($self) = @_; 3492 my ($self) = @_;
2872 3493
2873 ($self->{w}, $self->{h}) 3494 ($self->{w}, $self->{h})
3495}
3496
3497sub _to_pixel {
3498 my ($coord, $size, $max) = @_;
3499
3500 $coord =
3501 $coord eq "center" ? ($max - $size) * 0.5
3502 : $coord eq "max" ? $max
3503 : $coord;
3504
3505 $coord = 0 if $coord < 0;
3506 $coord = $max - $size if $coord > $max - $size;
3507
3508 int $coord + 0.5
2874} 3509}
2875 3510
2876sub size_allocate { 3511sub size_allocate {
2877 my ($self, $w, $h) = @_; 3512 my ($self, $w, $h) = @_;
2878 3513
2879 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2880 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2881
2882 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2883 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2884
2885 for my $child ($self->children) { 3514 for my $child ($self->children) {
2886 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3515 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2887 3516
2888 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3517 $X = $child->{force_x} if exists $child->{force_x};
2889 if exists $child->{req_x}; 3518 $Y = $child->{force_y} if exists $child->{force_y};
2890 3519
2891 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3520 $X = _to_pixel $X, $W, $self->{w};
2892 if exists $child->{req_y}; 3521 $Y = _to_pixel $Y, $H, $self->{h};
2893
2894 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2895 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2896 3522
2897 $child->configure ($X, $Y, $W, $H); 3523 $child->configure ($X, $Y, $W, $H);
2898 } 3524 }
2899} 3525}
2900 3526
… …
2911} 3537}
2912 3538
2913sub update { 3539sub update {
2914 my ($self) = @_; 3540 my ($self) = @_;
2915 3541
2916 $self->check_size;
2917 $::WANT_REFRESH++; 3542 $::WANT_REFRESH++;
2918} 3543}
2919 3544
2920sub add { 3545sub add {
2921 my ($self, @children) = @_; 3546 my ($self, @children) = @_;
2922 3547
2923 for my $child (@children) {
2924 $child->{toplevel} = 1; 3548 $_->{is_toplevel} = 1
2925 3549 for @children;
2926 # integerise window positions
2927 $child->{x} = int $child->{x};
2928 $child->{y} = int $child->{y};
2929 }
2930 3550
2931 $self->SUPER::add (@children); 3551 $self->SUPER::add (@children);
3552}
3553
3554sub remove {
3555 my ($self, @children) = @_;
3556
3557 $self->SUPER::remove (@children);
3558
3559 delete $self->{is_toplevel}
3560 for @children;
3561
3562 while (@children) {
3563 my $w = pop @children;
3564 push @children, $w->children;
3565 $w->set_invisible;
3566 }
2932} 3567}
2933 3568
2934sub on_refresh { 3569sub on_refresh {
2935 my ($self, $id, $cb) = @_; 3570 my ($self, $id, $cb) = @_;
2936 3571
… …
2949 while ($self->{refresh_hook}) { 3584 while ($self->{refresh_hook}) {
2950 $_->() 3585 $_->()
2951 for values %{delete $self->{refresh_hook}}; 3586 for values %{delete $self->{refresh_hook}};
2952 } 3587 }
2953 3588
2954 if ($self->{check_size}) { 3589 if ($self->{realloc}) {
2955 my @queue = ([], []); 3590 my %queue;
3591 my @queue;
3592 my $widget;
2956 3593
2957 for (;;) { 3594 outer:
2958 if ($self->{check_size}) { 3595 while () {
2959 # heuristic: check containers last 3596 if (my $realloc = delete $self->{realloc}) {
2960 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3597 for $widget (values %$realloc) {
2961 for values %{delete $self->{check_size}} 3598 $widget->{visible} or next; # do not resize invisible widgets
3599
3600 $queue{$widget+0}++ and next; # duplicates are common
3601
3602 push @{ $queue[$widget->{visible}] }, $widget;
3603 }
2962 } 3604 }
2963 3605
2964 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3606 while () {
3607 @queue or last outer;
2965 3608
2966 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3609 $widget = pop @{ $queue[-1] || [] }
2967 ? @$widget{qw(user_w user_h)} 3610 and last;
2968 : $widget->size_request;
2969
2970 if (delete $widget->{force_alloc}
2971 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2972 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2973 3611
3612 pop @queue;
3613 }
3614
3615 delete $queue{$widget+0};
3616
3617 my ($w, $h) = $widget->size_request;
3618
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3621
3622 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h};
3624
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3626 || delete $widget->{force_realloc}) {
2974 $widget->{req_w} = $w; 3627 $widget->{req_w} = $w;
2975 $widget->{req_h} = $h; 3628 $widget->{req_h} = $h;
2976 3629
2977 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3630 $self->{size_alloc}{$widget+0} = $widget;
2978 3631
2979 $widget->{parent}->check_size
2980 if $widget->{parent}; 3632 if (my $parent = $widget->{parent}) {
3633 $self->{realloc}{$parent+0} = $parent
3634 unless $queue{$parent+0};
3635
3636 $parent->{force_size_alloc} = 1;
3637 $self->{size_alloc}{$parent+0} = $parent;
3638 }
2981 } 3639 }
3640
3641 delete $self->{realloc}{$widget+0};
2982 } 3642 }
2983 } 3643 }
2984 3644
2985 while ($self->{size_alloc}) { 3645 while (my $size_alloc = delete $self->{size_alloc}) {
2986 for (values %{delete $self->{size_alloc}}) { 3646 my @queue = sort { $b->{visible} <=> $a->{visible} }
2987 my ($widget, $w, $h) = @$_; 3647 values %$size_alloc;
3648
3649 while () {
3650 my $widget = pop @queue || last;
3651
3652 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2988 3653
2989 $w = 0 if $w < 0; 3654 $w = 0 if $w < 0;
2990 $h = 0 if $h < 0; 3655 $h = 0 if $h < 0;
2991 3656
3657 $w = int $w + 0.5;
3658 $h = int $h + 0.5;
3659
3660 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3661 $widget->{old_w} = $widget->{w};
3662 $widget->{old_h} = $widget->{h};
3663
2992 $widget->{w} = $w; 3664 $widget->{w} = $w;
2993 $widget->{h} = $h; 3665 $widget->{h} = $h;
2994 $widget->size_allocate ($w, $h); 3666
2995 $widget->emit (size_allocate => $w, $h); 3667 $widget->emit (size_allocate => $w, $h);
3668 }
2996 } 3669 }
2997 } 3670 }
2998 3671
2999 while ($self->{post_alloc_hook}) { 3672 while ($self->{post_alloc_hook}) {
3000 $_->() 3673 $_->()
3001 for values %{delete $self->{post_alloc_hook}}; 3674 for values %{delete $self->{post_alloc_hook}};
3002 } 3675 }
3003 3676
3677
3004 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3678 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3005 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3679 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3006 glClear GL_COLOR_BUFFER_BIT; 3680 glClear GL_COLOR_BUFFER_BIT;
3007 3681
3008 glMatrixMode GL_PROJECTION; 3682 glMatrixMode GL_PROJECTION;
3009 glLoadIdentity; 3683 glLoadIdentity;
3010 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3684 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3011 glMatrixMode GL_MODELVIEW; 3685 glMatrixMode GL_MODELVIEW;
3012 glLoadIdentity; 3686 glLoadIdentity;
3013 3687
3688 {
3689 package CFClient::UI::Base;
3690
3691 ($draw_x, $draw_y, $draw_w, $draw_h) =
3692 (0, 0, $self->{w}, $self->{h});
3693 }
3694
3014 $self->_draw; 3695 $self->_draw;
3015} 3696}
3016 3697
3017############################################################################# 3698#############################################################################
3018 3699
3019package CFClient::UI; 3700package CFClient::UI;
3020 3701
3021$ROOT = new CFClient::UI::Root; 3702$ROOT = new CFClient::UI::Root;
3022$TOOLTIP = new CFClient::UI::Tooltip; 3703$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3023 3704
30241 37051
3025 3706

Diff Legend

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