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.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.275 by root, Sat Jun 3 22:50:48 2006 UTC

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

Diff Legend

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