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.272 by root, Sat Jun 3 01:47:14 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})
… …
688 $self->SUPER::size_allocate ($w, $h); 821 $self->SUPER::size_allocate ($w, $h);
689 $self->update; 822 $self->update;
690} 823}
691 824
692sub _render { 825sub _render {
826 my ($self) = @_;
827
693 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
694} 829}
695 830
696sub render_child { 831sub render_child {
697 my ($self) = @_; 832 my ($self) = @_;
698 833
699 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
700 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
701 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
702 837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
703 $self->_render; 845 $self->_render;
704 }; 846 };
705} 847}
706 848
707sub _draw { 849sub _draw {
708 my ($self) = @_; 850 my ($self) = @_;
709 851
710 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
711 853
712 my $tex = $self->{texture} 854 my $tex = $self->{texture}
713 or return; 855 or return;
714 856
715 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
… …
725 867
726package CFClient::UI::ViewPort; 868package CFClient::UI::ViewPort;
727 869
728our @ISA = CFClient::UI::Window::; 870our @ISA = CFClient::UI::Window::;
729 871
872sub new {
873 my $class = shift;
874
875 $class->SUPER::new (
876 scroll_x => 0,
877 scroll_y => 1,
878 @_,
879 )
880}
881
730sub size_request { 882sub size_request {
731 my ($self) = @_; 883 my ($self) = @_;
732 884
733 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
734 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
735 886
736 @$self{qw(child_w child_h)} 887 $w = 10 if $self->{scroll_x};
888 $h = 10 if $self->{scroll_y};
889
890 ($w, $h)
737} 891}
738 892
739sub size_allocate { 893sub size_allocate {
740 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
741 895
896 my $child = $self->child;
897
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900
901 $self->child->configure (0, 0, $w, $h);
742 $self->update; 902 $self->update;
743} 903}
744 904
745sub set_offset { 905sub set_offset {
746 my ($self, $x, $y) = @_; 906 my ($self, $x, $y) = @_;
… …
780} 940}
781 941
782sub _render { 942sub _render {
783 my ($self) = @_; 943 my ($self) = @_;
784 944
945 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
946 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
947
785 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
786 949
787 $self->SUPER::_render; 950 $self->SUPER::_render;
788} 951}
789 952
… …
797 my $class = shift; 960 my $class = shift;
798 961
799 my $self; 962 my $self;
800 963
801 my $slider = new CFClient::UI::Slider 964 my $slider = new CFClient::UI::Slider
802 vertical => 1, 965 vertical => 1,
803 range => [0, 0, 1, 0.01], # HACK fix 966 range => [0, 0, 1, 0.01], # HACK fix
804 connect_changed => sub { 967 on_changed => sub {
805 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 968 $self->{vp}->set_offset (0, $_[1]);
806 }, 969 },
807 ; 970 ;
808 971
809 $self = $class->SUPER::new ( 972 $self = $class->SUPER::new (
810 vp => (new CFClient::UI::ViewPort expand => 1), 973 vp => (new CFClient::UI::ViewPort expand => 1),
… …
815 $self->{vp}->add ($self->{scrolled}); 978 $self->{vp}->add ($self->{scrolled});
816 $self->add ($self->{vp}); 979 $self->add ($self->{vp});
817 $self->add ($self->{slider}); 980 $self->add ($self->{slider});
818 981
819 $self 982 $self
983}
984
985sub update {
986 my ($self) = @_;
987
988 $self->SUPER::update;
989
990 # todo: overwrite size_allocate of child
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
993}
994
995sub size_allocate {
996 my ($self, $w, $h) = @_;
997
998 $self->SUPER::size_allocate ($w, $h);
999
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
820} 1002}
821 1003
822#TODO# update range on size_allocate depending on child 1004#TODO# update range on size_allocate depending on child
823# update viewport offset on scroll 1005# update viewport offset on scroll
824 1006
… …
868 1050
869our @ISA = CFClient::UI::Bin::; 1051our @ISA = CFClient::UI::Bin::;
870 1052
871use CFClient::OpenGL; 1053use CFClient::OpenGL;
872 1054
873my @tex = 1055my $bg =
1056 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1057 mipmap => 1, wrap => 1;
1058
1059my @border =
874 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1060 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); 1061 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
876 1062
877sub new { 1063sub new {
878 my $class = shift; 1064 my ($class, %arg) = @_;
879 1065
880 # TODO: user_x, user_y, overwrite moveto? 1066 my $title = delete $arg{title};
881 1067
882 my $self = $class->SUPER::new ( 1068 my $self = $class->SUPER::new (
883 bg => [1, 1, 1, 1], 1069 bg => [1, 1, 1, 1],
884 border_bg => [1, 1, 1, 1], 1070 border_bg => [1, 1, 1, 1],
885 border => 0.6, 1071 border => 0.6,
886 toplevel => 1,
887 can_events => 1, 1072 can_events => 1,
888 @_ 1073 min_w => 16,
1074 min_h => 16,
1075 %arg,
889 ); 1076 );
890 1077
891 $self->{title} &&= new CFClient::UI::Label 1078 $self->{title} = new CFClient::UI::Label
892 align => 0, 1079 align => 0,
893 valign => 1, 1080 valign => 1,
894 text => $self->{title}, 1081 text => $title,
895 fontsize => $self->{border}; 1082 fontsize => $self->{border}
1083 if defined $title;
896 1084
897 $self 1085 $self
1086}
1087
1088sub add {
1089 my ($self, @widgets) = @_;
1090
1091 $self->SUPER::add (@widgets);
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
898} 1093}
899 1094
900sub border { 1095sub border {
901 int $_[0]{border} * $::FONTSIZE 1096 int $_[0]{border} * $::FONTSIZE
902} 1097}
903 1098
904sub size_request { 1099sub size_request {
905 my ($self) = @_; 1100 my ($self) = @_;
1101
1102 $self->{title}->size_request
1103 if $self->{title};
906 1104
907 my ($w, $h) = $self->SUPER::size_request; 1105 my ($w, $h) = $self->SUPER::size_request;
908 1106
909 ( 1107 (
910 $w + $self->border * 2, 1108 $w + $self->border * 2,
… …
913} 1111}
914 1112
915sub size_allocate { 1113sub size_allocate {
916 my ($self, $w, $h) = @_; 1114 my ($self, $w, $h) = @_;
917 1115
1116 if ($self->{title}) {
1117 $self->{title}{w} = $w;
1118 $self->{title}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h);
1120 }
1121
1122 my $border = $self->border;
1123
918 $h -= List::Util::max 0, $self->border * 2; 1124 $h -= List::Util::max 0, $border * 2;
919 $w -= List::Util::max 0, $self->border * 2; 1125 $w -= List::Util::max 0, $border * 2;
920 1126
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); 1127 $self->child->configure ($border, $border, $w, $h);
925} 1128}
926 1129
927sub button_down { 1130sub button_down {
928 my ($self, $ev, $x, $y) = @_; 1131 my ($self, $ev, $x, $y) = @_;
929 1132
… …
945 my ($ev, $x, $y) = @_; 1148 my ($ev, $x, $y) = @_;
946 1149
947 my $dx = $ev->{x} - $ox; 1150 my $dx = $ev->{x} - $ox;
948 my $dy = $ev->{y} - $oy; 1151 my $dy = $ev->{y} - $oy;
949 1152
950 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
951 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155
1156 $self->realloc;
952 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
953 $self->check_size;
954 }; 1158 };
955 1159
956 } elsif ($lr ^ $td) { 1160 } elsif ($lr ^ $td) {
957 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1161 my ($ox, $oy) = ($ev->{x}, $ev->{y});
958 my ($bx, $by) = ($self->{x}, $self->{y}); 1162 my ($bx, $by) = ($self->{x}, $self->{y});
… …
960 $self->{motion} = sub { 1164 $self->{motion} = sub {
961 my ($ev, $x, $y) = @_; 1165 my ($ev, $x, $y) = @_;
962 1166
963 ($x, $y) = ($ev->{x}, $ev->{y}); 1167 ($x, $y) = ($ev->{x}, $ev->{y});
964 1168
965 $self->move ($bx + $x - $ox, $by + $y - $oy); 1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
966 $self->update;
967 }; 1170 };
1171 } else {
1172 return 0;
1173 }
1174
968 } 1175 1
969} 1176}
970 1177
971sub button_up { 1178sub button_up {
972 my ($self, $ev, $x, $y) = @_; 1179 my ($self, $ev, $x, $y) = @_;
973 1180
974 delete $self->{motion}; 1181 !!delete $self->{motion}
975} 1182}
976 1183
977sub mouse_motion { 1184sub mouse_motion {
978 my ($self, $ev, $x, $y) = @_; 1185 my ($self, $ev, $x, $y) = @_;
979 1186
980 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1187 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188
1189 !!$self->{motion}
981} 1190}
982 1191
983sub _draw { 1192sub _draw {
984 my ($self) = @_; 1193 my ($self) = @_;
985 1194
1195 my $child = $self->{children}[0];
1196
986 my ($w, $h ) = ($self->{w}, $self->{h}); 1197 my ($w, $h ) = ($self->{w}, $self->{h});
987 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1198 my ($cw, $ch) = ($child->{w}, $child->{h});
988 1199
989 glEnable GL_TEXTURE_2D; 1200 glEnable GL_TEXTURE_2D;
990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1201 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
991 1202
992 my $border = $self->border; 1203 my $border = $self->border;
993 1204
994 glColor @{ $self->{border_bg} }; 1205 glColor @{ $self->{border_bg} };
995 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1206 $border[0]->draw_quad_alpha (0, 0, $w, $border);
996 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1207 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
997 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1208 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
998 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1209 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
999 1210
1000 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1211 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1001 my $bg = $tex[0]; 1212 glColor @{ $self->{bg} };
1002 1213
1003 # TODO: repeat texture not scale 1214 # TODO: repeat texture not scale
1215 # solve this better(?)
1004 my $rep_x = $cw / $bg->{w}; 1216 $bg->{s} = $cw / $bg->{w};
1005 my $rep_y = $ch / $bg->{h}; 1217 $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); 1218 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1013 } 1219 }
1014 1220
1015 glDisable GL_TEXTURE_2D; 1221 glDisable GL_TEXTURE_2D;
1016 1222
1017 $self->{title}->draw if $self->{title};
1018
1019 $self->child->draw; 1223 $child->draw;
1224
1225 if ($self->{title}) {
1226 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw;
1228 }
1020} 1229}
1021 1230
1022############################################################################# 1231#############################################################################
1023 1232
1024package CFClient::UI::Table; 1233package CFClient::UI::Table;
… …
1032sub new { 1241sub new {
1033 my $class = shift; 1242 my $class = shift;
1034 1243
1035 $class->SUPER::new ( 1244 $class->SUPER::new (
1036 col_expand => [], 1245 col_expand => [],
1037 @_ 1246 @_,
1038 ) 1247 )
1248}
1249
1250sub children {
1251 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1039} 1252}
1040 1253
1041sub add { 1254sub add {
1042 my ($self, $x, $y, $child) = @_; 1255 my ($self, $x, $y, $child) = @_;
1043 1256
1044 $child->set_parent ($self); 1257 $child->set_parent ($self);
1045 $self->{children}[$y][$x] = $child; 1258 $self->{children}[$y][$x] = $child;
1046 1259
1047 $child->check_size; 1260 $self->realloc;
1048} 1261}
1049 1262
1050sub children {
1051 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1052}
1053
1054# TODO: move to container class maybe? send childs a signal on removal? 1263# TODO: move to container class maybe? send children a signal on removal?
1055sub clear { 1264sub clear {
1056 my ($self) = @_; 1265 my ($self) = @_;
1057 1266
1058 my @children = $self->children; 1267 my @children = $self->children;
1059 delete $self->{children}; 1268 delete $self->{children};
… …
1061 for (@children) { 1270 for (@children) {
1062 delete $_->{parent}; 1271 delete $_->{parent};
1063 $_->hide; 1272 $_->hide;
1064 } 1273 }
1065 1274
1066 $self->update; 1275 $self->realloc;
1067} 1276}
1068 1277
1069sub get_wh { 1278sub get_wh {
1070 my ($self) = @_; 1279 my ($self) = @_;
1071 1280
… …
1102sub size_allocate { 1311sub size_allocate {
1103 my ($self, $w, $h) = @_; 1312 my ($self, $w, $h) = @_;
1104 1313
1105 my ($ws, $hs) = $self->get_wh; 1314 my ($ws, $hs) = $self->get_wh;
1106 1315
1107 my $req_w = sum @$ws; 1316 my $req_w = (sum @$ws) || 1;
1108 my $req_h = sum @$hs; 1317 my $req_h = (sum @$hs) || 1;
1109 1318
1110 # TODO: nicer code && do row_expand 1319 # TODO: nicer code && do row_expand
1111 my @col_expand = @{$self->{col_expand}}; 1320 my @col_expand = @{$self->{col_expand}};
1112 @col_expand = (1) x @$ws unless @col_expand; 1321 @col_expand = (1) x @$ws unless @col_expand;
1113 my $col_expand = (sum @col_expand) || 1; 1322 my $col_expand = (sum @col_expand) || 1;
… …
1167 } 1376 }
1168} 1377}
1169 1378
1170############################################################################# 1379#############################################################################
1171 1380
1172package CFClient::UI::HBox; 1381package CFClient::UI::Box;
1173
1174# TODO: wrap into common Box base class
1175 1382
1176our @ISA = CFClient::UI::Container::; 1383our @ISA = CFClient::UI::Container::;
1177 1384
1178sub size_request { 1385sub size_request {
1179 my ($self) = @_; 1386 my ($self) = @_;
1180 1387
1181 my @alloc = map [$_->size_request], @{$self->{children}}; 1388 $self->{vertical}
1182 1389 ? (
1183 ( 1390 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1184 (List::Util::sum map $_->[0], @alloc), 1391 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1185 (List::Util::max map $_->[1], @alloc), 1392 )
1186 ) 1393 : (
1394 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1395 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1396 )
1187} 1397}
1188 1398
1189sub size_allocate { 1399sub size_allocate {
1190 my ($self, $w, $h) = @_; 1400 my ($self, $w, $h) = @_;
1191 1401
1192 ($h, $w) = ($w, $h); 1402 my $space = $self->{vertical} ? $h : $w;
1193
1194 my $children = $self->{children}; 1403 my $children = $self->{children};
1195 1404
1196 my @h = map $_->{req_w}, @$children; 1405 my @req;
1197 1406
1198 my $req_h = List::Util::sum @h; 1407 if ($self->{homogeneous}) {
1199 1408 @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 { 1409 } else {
1410 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1411 my $req = List::Util::sum @req;
1412
1413 if ($req > $space) {
1414 # ah well, not enough space
1415 $_ *= $space / $req for @req;
1416 } else {
1204 my $exp = List::Util::sum map $_->{expand}, @$children; 1417 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1205 $exp ||= 1;
1206 1418
1419 $space = ($space - $req) / $expand; # remaining space to give away
1420
1421 $req[$_] += $space * $children->[$_]{expand}
1207 for (0 .. $#$children) { 1422 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 } 1423 }
1214 } 1424 }
1215 1425
1216 CFClient::UI::harmonize \@h; 1426 CFClient::UI::harmonize \@req;
1217 1427
1218 my $y = 0; 1428 my $pos = 0;
1219 for (0 .. $#$children) { 1429 for (0 .. $#$children) {
1220 my $child = $children->[$_];
1221 my $h = $h[$_]; 1430 my $alloc = $req[$_];
1222 $child->configure ($y, 0, $h, $w); 1431 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1223 1432
1224 $y += $h; 1433 $pos += $alloc;
1225 } 1434 }
1226 1435
1227 1 1436 1
1228} 1437}
1229 1438
1230############################################################################# 1439#############################################################################
1231 1440
1441package CFClient::UI::HBox;
1442
1443our @ISA = CFClient::UI::Box::;
1444
1445sub new {
1446 my $class = shift;
1447
1448 $class->SUPER::new (
1449 vertical => 0,
1450 @_,
1451 )
1452}
1453
1454#############################################################################
1455
1232package CFClient::UI::VBox; 1456package CFClient::UI::VBox;
1233 1457
1234# TODO: wrap into common Box base class
1235
1236our @ISA = CFClient::UI::Container::; 1458our @ISA = CFClient::UI::Box::;
1237 1459
1238sub size_request { 1460sub new {
1239 my ($self) = @_; 1461 my $class = shift;
1240 1462
1241 my @alloc = map [$_->size_request], @{$self->{children}}; 1463 $class->SUPER::new (
1242 1464 vertical => 1,
1243 ( 1465 @_,
1244 (List::Util::max map $_->[0], @alloc),
1245 (List::Util::sum map $_->[1], @alloc),
1246 ) 1466 )
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} 1467}
1287 1468
1288############################################################################# 1469#############################################################################
1289 1470
1290package CFClient::UI::Label; 1471package CFClient::UI::Label;
… …
1307 ellipsise => 3, # end 1488 ellipsise => 3, # end
1308 layout => (new CFClient::Layout), 1489 layout => (new CFClient::Layout),
1309 fontsize => 1, 1490 fontsize => 1,
1310 align => -1, 1491 align => -1,
1311 valign => -1, 1492 valign => -1,
1312 padding => 2, 1493 padding_x => 2,
1494 padding_y => 2,
1313 can_events => 0, 1495 can_events => 0,
1314 %arg 1496 %arg
1315 ); 1497 );
1316 1498
1317 if (exists $self->{template}) { 1499 if (exists $self->{template}) {
… …
1353 $self->{text} = "T$text"; 1535 $self->{text} = "T$text";
1354 1536
1355 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1356 $self->{layout}->set_text ($text); 1538 $self->{layout}->set_text ($text);
1357 1539
1540 $self->realloc;
1358 $self->update; 1541 $self->update;
1359 $self->check_size;
1360} 1542}
1361 1543
1362sub set_markup { 1544sub set_markup {
1363 my ($self, $markup) = @_; 1545 my ($self, $markup) = @_;
1364 1546
… …
1368 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1550 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1369 1551
1370 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1371 $self->{layout}->set_markup ($markup); 1553 $self->{layout}->set_markup ($markup);
1372 1554
1555 $self->realloc;
1373 $self->update; 1556 $self->update;
1374 $self->check_size;
1375} 1557}
1376 1558
1377sub size_request { 1559sub size_request {
1378 my ($self) = @_; 1560 my ($self) = @_;
1379 1561
… …
1393 1575
1394 $w = List::Util::max $w, $w2; 1576 $w = List::Util::max $w, $w2;
1395 $h = List::Util::max $h, $h2; 1577 $h = List::Util::max $h, $h2;
1396 } 1578 }
1397 1579
1398 ( 1580 ($w, $h)
1399 $w + $self->{padding} * 2,
1400 $h + $self->{padding} * 2,
1401 )
1402} 1581}
1403 1582
1404sub size_allocate { 1583sub size_allocate {
1405 my ($self, $w, $h) = @_; 1584 my ($self, $w, $h) = @_;
1406 1585
1586 delete $self->{ox};
1587
1407 delete $self->{texture}; 1588 delete $self->{texture}
1589 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1408} 1590}
1409 1591
1410sub set_fontsize { 1592sub set_fontsize {
1411 my ($self, $fontsize) = @_; 1593 my ($self, $fontsize) = @_;
1412 1594
1413 $self->{fontsize} = $fontsize; 1595 $self->{fontsize} = $fontsize;
1414 delete $self->{texture}; 1596 delete $self->{texture};
1415 1597
1416 $self->update; 1598 $self->realloc;
1417 $self->check_size;
1418} 1599}
1419 1600
1420sub _draw { 1601sub _draw {
1421 my ($self) = @_; 1602 my ($self) = @_;
1422 1603
… …
1428 $self->{layout}->set_width ($self->{w}); 1609 $self->{layout}->set_width ($self->{w});
1429 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1610 $self->{layout}->set_ellipsise ($self->{ellipsise});
1430 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1611 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1431 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1432 1613
1433 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1614 new_from_layout CFClient::Texture $self->{layout}
1615 };
1434 1616
1617 unless (exists $self->{ox}) {
1435 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1618 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1436 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1619 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1437 : ($self->{w} - $tex->{w}) * 0.5); 1620 : ($self->{w} - $tex->{w}) * 0.5);
1438 1621
1439 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1622 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1440 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1441 : ($self->{h} - $tex->{h}) * 0.5); 1624 : ($self->{h} - $tex->{h}) * 0.5);
1442
1443 $tex
1444 }; 1625 };
1445 1626
1446 glEnable GL_TEXTURE_2D; 1627 glEnable GL_TEXTURE_2D;
1447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1448 1629
… …
1474 active_fg => [0, 0, 0], 1655 active_fg => [0, 0, 0],
1475 can_hover => 1, 1656 can_hover => 1,
1476 can_focus => 1, 1657 can_focus => 1,
1477 valign => 0, 1658 valign => 0,
1478 can_events => 1, 1659 can_events => 1,
1660 #text => ...
1479 @_ 1661 @_
1480 ) 1662 )
1481} 1663}
1482 1664
1483sub _set_text { 1665sub _set_text {
… …
1493 $self->{text} = $text; 1675 $self->{text} = $text;
1494 1676
1495 $text =~ s/./*/g if $self->{hidden}; 1677 $text =~ s/./*/g if $self->{hidden};
1496 $self->{layout}->set_text ("$text "); 1678 $self->{layout}->set_text ("$text ");
1497 1679
1498 $self->emit (changed => $self->{text}); 1680 $self->_emit (changed => $self->{text});
1499} 1681}
1500 1682
1501sub set_text { 1683sub set_text {
1502 my ($self, $text) = @_; 1684 my ($self, $text) = @_;
1503 1685
1504 $self->{cursor} = length $text; 1686 $self->{cursor} = length $text;
1505 $self->_set_text ($text); 1687 $self->_set_text ($text);
1506 $self->update; 1688
1507 $self->check_size; 1689 $self->realloc;
1508} 1690}
1509 1691
1510sub get_text { 1692sub get_text {
1511 $_[0]{text} 1693 $_[0]{text}
1512} 1694}
… …
1515 my ($self) = @_; 1697 my ($self) = @_;
1516 1698
1517 my ($w, $h) = $self->SUPER::size_request; 1699 my ($w, $h) = $self->SUPER::size_request;
1518 1700
1519 ($w + 1, $h) # add 1 for cursor 1701 ($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} 1702}
1527 1703
1528sub key_down { 1704sub key_down {
1529 my ($self, $ev) = @_; 1705 my ($self, $ev) = @_;
1530 1706
… …
1545 } elsif ($sym == CFClient::SDLK_HOME) { 1721 } elsif ($sym == CFClient::SDLK_HOME) {
1546 $self->{cursor} = 0; 1722 $self->{cursor} = 0;
1547 } elsif ($sym == CFClient::SDLK_END) { 1723 } elsif ($sym == CFClient::SDLK_END) {
1548 $self->{cursor} = length $text; 1724 $self->{cursor} = length $text;
1549 } elsif ($uni == 27) { 1725 } elsif ($uni == 27) {
1550 $self->emit ('escape'); 1726 $self->_emit ('escape');
1551 } elsif ($uni) { 1727 } elsif ($uni) {
1552 substr $text, $self->{cursor}++, 0, chr $uni; 1728 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else {
1730 return 0;
1553 } 1731 }
1554 1732
1555 $self->_set_text ($text); 1733 $self->_set_text ($text);
1556 $self->update; 1734
1557 $self->check_size; 1735 $self->realloc;
1736
1737 1
1558} 1738}
1559 1739
1560sub focus_in { 1740sub focus_in {
1561 my ($self) = @_; 1741 my ($self) = @_;
1562 1742
… …
1577 utf8::encode $text; 1757 utf8::encode $text;
1578 $self->{cursor} = length substr $text, 0, $idx; 1758 $self->{cursor} = length substr $text, 0, $idx;
1579 1759
1580 $self->_set_text ($self->{text}); 1760 $self->_set_text ($self->{text});
1581 $self->update; 1761 $self->update;
1762
1763 1
1582} 1764}
1583 1765
1584sub mouse_motion { 1766sub mouse_motion {
1585 my ($self, $ev, $x, $y) = @_; 1767 my ($self, $ev, $x, $y) = @_;
1586# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1768# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1769
1770 0
1587} 1771}
1588 1772
1589sub _draw { 1773sub _draw {
1590 my ($self) = @_; 1774 my ($self) = @_;
1591 1775
… …
1642 if ($sym == 13) { 1826 if ($sym == 13) {
1643 unshift @{$self->{history}}, 1827 unshift @{$self->{history}},
1644 my $txt = $self->get_text; 1828 my $txt = $self->get_text;
1645 $self->{history_pointer} = -1; 1829 $self->{history_pointer} = -1;
1646 $self->{history_saveback} = ''; 1830 $self->{history_saveback} = '';
1647 $self->emit (activate => $txt); 1831 $self->_emit (activate => $txt);
1648 $self->update; 1832 $self->update;
1649 1833
1650 } elsif ($sym == CFClient::SDLK_UP) { 1834 } elsif ($sym == CFClient::SDLK_UP) {
1651 if ($self->{history_pointer} < 0) { 1835 if ($self->{history_pointer} < 0) {
1652 $self->{history_saveback} = $self->get_text; 1836 $self->{history_saveback} = $self->get_text;
… …
1668 } else { 1852 } else {
1669 $self->set_text ($self->{history_saveback}); 1853 $self->set_text ($self->{history_saveback});
1670 } 1854 }
1671 1855
1672 } else { 1856 } else {
1673 $self->SUPER::key_down ($ev); 1857 return $self->SUPER::key_down ($ev)
1858 }
1859
1674 } 1860 1
1675
1676} 1861}
1677 1862
1678############################################################################# 1863#############################################################################
1679 1864
1680package CFClient::UI::Button; 1865package CFClient::UI::Button;
… …
1689 1874
1690sub new { 1875sub new {
1691 my $class = shift; 1876 my $class = shift;
1692 1877
1693 $class->SUPER::new ( 1878 $class->SUPER::new (
1694 padding => 4, 1879 padding_x => 4,
1880 padding_y => 4,
1695 fg => [1, 1, 1], 1881 fg => [1, 1, 1],
1696 active_fg => [0, 0, 1], 1882 active_fg => [0, 0, 1],
1697 can_hover => 1, 1883 can_hover => 1,
1698 align => 0, 1884 align => 0,
1699 valign => 0, 1885 valign => 0,
1700 can_events => 1, 1886 can_events => 1,
1701 @_ 1887 @_
1702 ) 1888 )
1703} 1889}
1704 1890
1891sub activate { }
1892
1705sub button_up { 1893sub button_up {
1706 my ($self, $ev, $x, $y) = @_; 1894 my ($self, $ev, $x, $y) = @_;
1707 1895
1896 $self->emit ("activate")
1708 if ($x >= 0 && $x < $self->{w} 1897 if $x >= 0 && $x < $self->{w}
1709 && $y >= 0 && $y < $self->{h}) { 1898 && $y >= 0 && $y < $self->{h};
1710 $self->emit ("activate"); 1899
1711 } 1900 1
1712} 1901}
1713 1902
1714sub _draw { 1903sub _draw {
1715 my ($self) = @_; 1904 my ($self) = @_;
1716 1905
… …
1745 1934
1746sub new { 1935sub new {
1747 my $class = shift; 1936 my $class = shift;
1748 1937
1749 $class->SUPER::new ( 1938 $class->SUPER::new (
1750 padding => 2, 1939 padding_x => 2,
1940 padding_y => 2,
1751 fg => [1, 1, 1], 1941 fg => [1, 1, 1],
1752 active_fg => [1, 1, 0], 1942 active_fg => [1, 1, 0],
1753 bg => [0, 0, 0, 0.2], 1943 bg => [0, 0, 0, 0.2],
1754 active_bg => [1, 1, 1, 0.5], 1944 active_bg => [1, 1, 1, 0.5],
1755 state => 0, 1945 state => 0,
… …
1759} 1949}
1760 1950
1761sub size_request { 1951sub size_request {
1762 my ($self) = @_; 1952 my ($self) = @_;
1763 1953
1764 ($self->{padding} * 2 + 6) x 2 1954 (6) x 2
1765} 1955}
1766 1956
1767sub button_down { 1957sub button_down {
1768 my ($self, $ev, $x, $y) = @_; 1958 my ($self, $ev, $x, $y) = @_;
1769 1959
1770 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1771 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1772 $self->{state} = !$self->{state}; 1962 $self->{state} = !$self->{state};
1773 $self->emit (changed => $self->{state}); 1963 $self->_emit (changed => $self->{state});
1964 } else {
1965 return 0
1966 }
1967
1774 } 1968 1
1775} 1969}
1776 1970
1777sub _draw { 1971sub _draw {
1778 my ($self) = @_; 1972 my ($self) = @_;
1779 1973
1780 $self->SUPER::_draw; 1974 $self->SUPER::_draw;
1781 1975
1782 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1976 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1783 1977
1784 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1978 my ($w, $h) = @$self{qw(w h)};
1979
1980 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1785 1981
1786 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1982 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1787 1983
1788 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1984 my $tex = $self->{state} ? $tex[1] : $tex[0];
1789 1985
… …
2053 my $self = $class->SUPER::new ( 2249 my $self = $class->SUPER::new (
2054 fg => [1, 1, 1], 2250 fg => [1, 1, 1],
2055 active_fg => [0, 0, 0], 2251 active_fg => [0, 0, 0],
2056 bg => [0, 0, 0, 0.2], 2252 bg => [0, 0, 0, 0.2],
2057 active_bg => [1, 1, 1, 0.5], 2253 active_bg => [1, 1, 1, 0.5],
2058 range => [0, 0, 100, 10], 2254 range => [0, 0, 100, 10, 0],
2059 req_w => $::WIDTH / 80, 2255 min_w => $::WIDTH / 80,
2060 req_h => $::WIDTH / 80, 2256 min_h => $::WIDTH / 80,
2061 vertical => 0, 2257 vertical => 0,
2062 can_hover => 1, 2258 can_hover => 1,
2063 inner_pad => 0.02, 2259 inner_pad => 0.02,
2064 @_ 2260 @_
2065 ); 2261 );
… …
2068 $self->update; 2264 $self->update;
2069 2265
2070 $self 2266 $self
2071} 2267}
2072 2268
2269sub changed { }
2270
2271sub set_range {
2272 my ($self, $range) = @_;
2273
2274 ($range, $self->{range}) = ($self->{range}, $range);
2275
2276 $self->update
2277 if "@$range" ne "@{$self->{range}}";
2278}
2279
2073sub set_value { 2280sub set_value {
2074 my ($self, $value) = @_; 2281 my ($self, $value) = @_;
2075 2282
2076 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2283 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2077 2284
2078 $hi = $lo + 1 if $hi <= $lo; 2285 $hi = $lo + 1 if $hi <= $lo;
2079 2286
2287 $page = $hi - $lo if $page > $hi - $lo;
2288
2080 $value = $lo if $value < $lo; 2289 $value = $lo if $value < $lo;
2081 $value = $hi if $value > $hi; 2290 $value = $hi - $page if $value > $hi - $page;
2082 2291
2083 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2292 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2084 if $unit; 2293 if $unit;
2085 2294
2086 $page = $hi - $lo if $page > $hi - $lo;
2087
2088 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2295 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2089 2296
2090 if ($value != $old_value) { 2297 if ($value != $old_value) {
2091 $self->emit (changed => $value); 2298 $self->_emit (changed => $value);
2092 $self->update; 2299 $self->update;
2093 } 2300 }
2094} 2301}
2095 2302
2096sub size_request { 2303sub size_request {
2097 my ($self) = @_; 2304 my ($self) = @_;
2098 2305
2099 my $w = $self->{req_w}; 2306 ($self->{req_w}, $self->{req_h})
2100 my $h = $self->{req_h};
2101
2102 $self->{vertical} ? ($h, $w) : ($w, $h)
2103} 2307}
2104 2308
2105sub button_down { 2309sub button_down {
2106 my ($self, $ev, $x, $y) = @_; 2310 my ($self, $ev, $x, $y) = @_;
2107 2311
2108 $self->SUPER::button_down ($ev, $x, $y); 2312 $self->SUPER::button_down ($ev, $x, $y);
2313
2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2315
2109 $self->mouse_motion ($ev, $x, $y); 2316 $self->mouse_motion ($ev, $x, $y)
2110} 2317}
2111 2318
2112sub mouse_motion { 2319sub mouse_motion {
2113 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
2114 2321
2115 if ($GRAB == $self) { 2322 if ($GRAB == $self) {
2116 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2323 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2117 2324
2118 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2325 my (undef, $lo, $hi, $page) = @{$self->{range}};
2119 2326
2120 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2327 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2121 2328
2122 $self->set_value ($x * ($hi - $lo) + $lo); 2329 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2330 } else {
2331 return 0;
2332 }
2333
2123 } 2334 1
2124} 2335}
2125 2336
2126sub update { 2337sub update {
2127 my ($self) = @_; 2338 my ($self) = @_;
2128 2339
2129 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2130 $self->set_value ($self->{range}[0]); 2341 $self->set_value ($self->{range}[0]);
2131 2342
2132 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2343 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100;
2133 2345
2134 my $inner_w = 1 - 2 * $self->{inner_pad}; 2346 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2135 2347
2136 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2348 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2349 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2137 2350
2138 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2351 $value = ($value - $lo) / $range;
2139 $value = $self->{scale} * ($value - $lo); 2352 $value = $value * $self->{scale} + $self->{offset};
2140 2353
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; 2354 $self->{knob_x} = $value - $knob_w * 0.5;
2147 $self->{knob_w} = $page; 2355 $self->{knob_w} = $knob_w;
2148 }); 2356 });
2149 2357
2150 $self->SUPER::update; 2358 $self->SUPER::update;
2151} 2359}
2152 2360
… …
2176 # draw handle 2384 # draw handle
2177 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2385 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2178 2386
2179 glDisable GL_TEXTURE_2D; 2387 glDisable GL_TEXTURE_2D;
2180} 2388}
2389
2390#############################################################################
2391
2392package CFClient::UI::ValSlider;
2393
2394our @ISA = CFClient::UI::HBox::;
2395
2396sub new {
2397 my ($class, %arg) = @_;
2398
2399 my $range = delete $arg{range};
2400
2401 my $self = $class->SUPER::new (
2402 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2403 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2404 to_value => sub { shift },
2405 from_value => sub { shift },
2406 %arg,
2407 );
2408
2409 $self->{slider}->connect (changed => sub {
2410 my ($self, $value) = @_;
2411 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2412 $self->{parent}->emit (changed => $value);
2413 });
2414
2415# $self->{entry}->connect (changed => sub {
2416# my ($self, $value) = @_;
2417# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2418# $self->{parent}->emit (changed => $value);
2419# });
2420
2421 $self->add ($self->{slider}, $self->{entry});
2422
2423 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2424
2425 $self
2426}
2427
2428sub set_range { shift->{slider}->set_range (@_) }
2429sub set_value { shift->{slider}->set_value (@_) }
2181 2430
2182############################################################################# 2431#############################################################################
2183 2432
2184package CFClient::UI::TextView; 2433package CFClient::UI::TextView;
2185 2434
… …
2227 $self->{layout}->set_width ($self->{children}[0]{w}); 2476 $self->{layout}->set_width ($self->{children}[0]{w});
2228 2477
2229 $self->reflow; 2478 $self->reflow;
2230} 2479}
2231 2480
2232sub text_height { 2481sub text_size {
2233 my ($self, $text, $indent) = @_; 2482 my ($self, $text, $indent) = @_;
2234 2483
2235 my $layout = $self->{layout}; 2484 my $layout = $self->{layout};
2236 2485
2237 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2486 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2238 $layout->set_width ($self->{children}[0]{w} - $indent); 2487 $layout->set_width ($self->{children}[0]{w} - $indent);
2239 $layout->set_markup ($text); 2488 $layout->set_markup ($text);
2240 2489
2241 ($layout->size)[1] 2490 $layout->size
2242} 2491}
2243 2492
2244sub reflow { 2493sub reflow {
2245 my ($self) = @_; 2494 my ($self) = @_;
2246 2495
2247 $self->{need_reflow}++; 2496 $self->{need_reflow}++;
2248 $self->update; 2497 $self->update;
2249} 2498}
2250 2499
2500sub set_offset {
2501 my ($self, $offset) = @_;
2502
2503 # todo: base offset on lines or so, not on pixels
2504 $self->{children}[1]->set_value ($offset);
2505}
2506
2507sub clear {
2508 my ($self) = @_;
2509
2510 $self->{par} = [];
2511 $self->{height} = 0;
2512 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2513}
2514
2251sub add_paragraph { 2515sub add_paragraph {
2252 my ($self, $color, $text, $indent) = @_; 2516 my ($self, $color, $text, $indent) = @_;
2253 2517
2254 #TODO: intelligently "reformat" paragraph
2255
2256 for my $line (split /\n/, $text) { 2518 for my $line (split /\n/, $text) {
2257 my $height = $self->text_height ($line); 2519 my ($w, $h) = $self->text_size ($line);
2258 $self->{height} += $height; 2520 $self->{height} += $h;
2259 push @{$self->{par}}, [$height, $color, $indent, $line]; 2521 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2260 } 2522 }
2261 2523
2262 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2524 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2263 $self->{children}[1]->update;
2264} 2525}
2265 2526
2266sub update { 2527sub update {
2267 my ($self) = @_; 2528 my ($self) = @_;
2268 2529
… …
2271 return unless $self->{h} > 0; 2532 return unless $self->{h} > 0;
2272 2533
2273 delete $self->{texture}; 2534 delete $self->{texture};
2274 2535
2275 $ROOT->on_post_alloc ($self, sub { 2536 $ROOT->on_post_alloc ($self, sub {
2537 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538
2276 if (delete $self->{need_reflow}) { 2539 if (delete $self->{need_reflow}) {
2277 my $height = 0; 2540 my $height = 0;
2278 2541
2279 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2542 my $layout = $self->{layout};
2543
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545
2280 for @{$self->{par}}; 2546 for (@{$self->{par}}) {
2547 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2548 $layout->set_width ($W - $_->[3]);
2549 $layout->set_markup ($_->[4]);
2550 my ($w, $h) = $layout->size;
2551 $_->[0] = $w + $_->[3];
2552 $_->[1] = $h;
2553 }
2554
2555 $height += $_->[1];
2556 }
2281 2557
2282 $self->{height} = $height; 2558 $self->{height} = $height;
2283 2559
2284 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2560 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2285 $self->{children}[1]->update;
2286 2561
2287 delete $self->{texture}; 2562 delete $self->{texture};
2288 } 2563 }
2289 2564
2290 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2291 glClearColor 0.5, 0.5, 0.5, 0; 2566 glClearColor 0.5, 0.5, 0.5, 0;
2292 glClear GL_COLOR_BUFFER_BIT; 2567 glClear GL_COLOR_BUFFER_BIT;
2293 2568
2294 my $top = int $self->{children}[1]{range}[0]; 2569 my $top = int $self->{children}[1]{range}[0];
2295 2570
2296 my $y0 = $top; 2571 my $y0 = $top;
2297 my $y1 = $top + $self->{h}; 2572 my $y1 = $top + $H;
2298 2573
2299 my $y = 0; 2574 my $y = 0;
2300 2575
2301 my $layout = $self->{layout}; 2576 my $layout = $self->{layout};
2302 2577
2303 $layout->set_font ($self->{font}) if $self->{font}; 2578 $layout->set_font ($self->{font}) if $self->{font};
2304 2579
2305 glEnable GL_BLEND; 2580 glEnable GL_BLEND;
2581 #TODO# not correct in windows where rgba is forced off
2306 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2582 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307 2583
2308 for my $par (@{$self->{par}}) { 2584 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2585 my $h = $par->[1];
2310 2586
2311 if ($y0 < $y + $h && $y < $y1) { 2587 if ($y0 < $y + $h && $y < $y1) {
2312 $layout->set_foreground (@{ $par->[1] }); 2588 $layout->set_foreground (@{ $par->[2] });
2313 $layout->set_width ($self->{w} - $par->[2]); 2589 $layout->set_width ($W - $par->[3]);
2314 $layout->set_markup ($par->[3]); 2590 $layout->set_markup ($par->[4]);
2315 2591
2316 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2592 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2317 2593
2318 glRasterPos $par->[2], $y - $y0; 2594 glRasterPos $par->[3], $y - $y0;
2319 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2595 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2320 } 2596 }
2321 2597
2322 $y += $h; 2598 $y += $h;
2323 } 2599 }
… …
2390 2666
2391sub new { 2667sub new {
2392 my $class = shift; 2668 my $class = shift;
2393 2669
2394 my $self = $class->SUPER::new ( 2670 my $self = $class->SUPER::new (
2395 state => 0, 2671 state => 0,
2396 connect_activate => \&toggle_flopper, 2672 on_activate => \&toggle_flopper,
2397 @_ 2673 @_
2398 ); 2674 );
2399 2675
2400 if ($self->{state}) {
2401 $self->{state} = 0;
2402 $self->toggle_flopper;
2403 }
2404
2405 $self 2676 $self
2406} 2677}
2407 2678
2408sub toggle_flopper { 2679sub toggle_flopper {
2409 my ($self) = @_; 2680 my ($self) = @_;
2410 2681
2411 # TODO: use animation 2682 $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} 2683}
2423 2684
2424############################################################################# 2685#############################################################################
2425 2686
2426package CFClient::UI::Tooltip; 2687package CFClient::UI::Tooltip;
… …
2439} 2700}
2440 2701
2441sub set_tooltip_from { 2702sub set_tooltip_from {
2442 my ($self, $widget) = @_; 2703 my ($self, $widget) = @_;
2443 2704
2705 my $tooltip = $widget->{tooltip};
2706
2707 if ($ENV{CFPLUS_DEBUG} & 2) {
2708 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}";
2712 }
2713
2444 $self->add (new CFClient::UI::Label 2714 $self->add (new CFClient::UI::Label
2445 markup => $widget->{tooltip}, 2715 markup => $tooltip,
2446 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2447 fontsize => 0.8, 2717 fontsize => 0.8,
2448 fg => [0, 0, 0, 1], 2718 fg => [0, 0, 0, 1],
2449 ellipsise => 0, 2719 ellipsise => 0,
2450 font => ($widget->{tooltip_font} || $::FONT_PROP), 2720 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2461 2731
2462sub size_allocate { 2732sub size_allocate {
2463 my ($self, $w, $h) = @_; 2733 my ($self, $w, $h) = @_;
2464 2734
2465 $self->SUPER::size_allocate ($w - 4, $h - 4); 2735 $self->SUPER::size_allocate ($w - 4, $h - 4);
2736}
2737
2738sub visibility_change {
2739 my ($self, $visible) = @_;
2740
2741 return unless $visible;
2742
2743 $self->{root}->on_post_alloc ("move_$self" => sub {
2744 my $widget = $self->{owner}
2745 or return;
2746
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH;
2751
2752 $self->move_abs ($x, $y);
2753 });
2466} 2754}
2467 2755
2468sub _draw { 2756sub _draw {
2469 my ($self) = @_; 2757 my ($self) = @_;
2470 2758
… …
2487 glVertex $w, $h; 2775 glVertex $w, $h;
2488 glVertex $w, 0; 2776 glVertex $w, 0;
2489 glEnd; 2777 glEnd;
2490 2778
2491 glTranslate 2 - 0.375, 2 - 0.375; 2779 glTranslate 2 - 0.375, 2 - 0.375;
2780
2492 $self->SUPER::_draw; 2781 $self->SUPER::_draw;
2493} 2782}
2494 2783
2495############################################################################# 2784#############################################################################
2496 2785
… …
2502 2791
2503sub new { 2792sub new {
2504 my $class = shift; 2793 my $class = shift;
2505 2794
2506 my $self = $class->SUPER::new ( 2795 my $self = $class->SUPER::new (
2507 aspect => 1, 2796 aspect => 1,
2797 can_events => 0,
2508 @_, 2798 @_,
2509 ); 2799 );
2510 2800
2511 if ($self->{anim} && $self->{animspeed}) { 2801 if ($self->{anim} && $self->{animspeed}) {
2512 Scalar::Util::weaken (my $widget = $self); 2802 Scalar::Util::weaken (my $widget = $self);
… …
2527 2817
2528sub size_request { 2818sub size_request {
2529 (32, 8) 2819 (32, 8)
2530} 2820}
2531 2821
2822sub update {
2823 my ($self) = @_;
2824
2825 return unless $self->{visible};
2826
2827 $self->SUPER::update;
2828}
2829
2532sub _draw { 2830sub _draw {
2533 my ($self) = @_; 2831 my ($self) = @_;
2534 2832
2535 return unless $::CONN;#d# manage and cache textures differently 2833 return unless $::CONN;
2536 2834
2537 my $face; 2835 my $face;
2538 2836
2539 if ($self->{frame}) { 2837 if ($self->{frame}) {
2540 my $anim = $::CONN->{anim}[$self->{anim}]; 2838 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2563 $self->SUPER::DESTROY; 2861 $self->SUPER::DESTROY;
2564} 2862}
2565 2863
2566############################################################################# 2864#############################################################################
2567 2865
2568package CFClient::UI::InventoryItem; 2866package CFClient::UI::Buttonbar;
2569 2867
2570our @ISA = CFClient::UI::HBox::; 2868our @ISA = CFClient::UI::HBox::;
2571 2869
2572sub _item_to_desc { 2870# 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 2871
2721############################################################################# 2872#############################################################################
2722 2873
2723package CFClient::UI::Menu; 2874package CFClient::UI::Menu;
2724 2875
… …
2758 2909
2759# popup given the event (must be a mouse button down event currently) 2910# popup given the event (must be a mouse button down event currently)
2760sub popup { 2911sub popup {
2761 my ($self, $ev) = @_; 2912 my ($self, $ev) = @_;
2762 2913
2763 $self->emit ("popdown"); 2914 $self->_emit ("popdown");
2764 2915
2765 # maybe save $GRAB? must be careful about events... 2916 # maybe save $GRAB? must be careful about events...
2766 $GRAB = $self; 2917 $GRAB = $self;
2767 $self->{button} = $ev->{button}; 2918 $self->{button} = $ev->{button};
2768 2919
2769 $self->show; 2920 $self->show;
2770 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2921 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2771} 2922}
2772 2923
2773sub mouse_motion { 2924sub mouse_motion {
2774 my ($self, $ev, $x, $y) = @_; 2925 my ($self, $ev, $x, $y) = @_;
2775 2926
2776 # TODO: should use vbox->find_widget or so 2927 # TODO: should use vbox->find_widget or so
2777 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2778 $self->{hover} = $self->{item}{$HOVER}; 2929 $self->{hover} = $self->{item}{$HOVER};
2930
2931 0
2779} 2932}
2780 2933
2781sub button_up { 2934sub button_up {
2782 my ($self, $ev, $x, $y) = @_; 2935 my ($self, $ev, $x, $y) = @_;
2783 2936
2784 if ($ev->{button} == $self->{button}) { 2937 if ($ev->{button} == $self->{button}) {
2785 undef $GRAB; 2938 undef $GRAB;
2786 $self->hide; 2939 $self->hide;
2787 2940
2788 $self->emit ("popdown"); 2941 $self->_emit ("popdown");
2789 $self->{hover}[1]->() if $self->{hover}; 2942 $self->{hover}[1]->() if $self->{hover};
2943 } else {
2944 return 0
2945 }
2946
2790 } 2947 1
2948}
2949
2950#############################################################################
2951
2952package CFClient::UI::Multiplexer;
2953
2954our @ISA = CFClient::UI::Container::;
2955
2956sub new {
2957 my $class = shift;
2958
2959 my $self = $class->SUPER::new (
2960 @_,
2961 );
2962
2963 $self->{current} = $self->{children}[0]
2964 if @{ $self->{children} };
2965
2966 $self
2967}
2968
2969sub add {
2970 my ($self, @widgets) = @_;
2971
2972 $self->SUPER::add (@widgets);
2973
2974 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} };
2976}
2977
2978sub set_current_page {
2979 my ($self, $page_or_widget) = @_;
2980
2981 my $widget = ref $page_or_widget
2982 ? $page_or_widget
2983 : $self->{children}[$page_or_widget];
2984
2985 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987
2988 $self->_emit (page_changed => $self->{current});
2989
2990 $self->realloc;
2991}
2992
2993sub visible_children {
2994 $_[0]{current}
2995}
2996
2997sub size_request {
2998 my ($self) = @_;
2999
3000 $self->{current}->size_request
3001}
3002
3003sub size_allocate {
3004 my ($self, $w, $h) = @_;
3005
3006 $self->{current}->configure (0, 0, $w, $h);
3007}
3008
3009sub _draw {
3010 my ($self) = @_;
3011
3012 $self->{current}->draw;
3013}
3014
3015#############################################################################
3016
3017package CFClient::UI::Notebook;
3018
3019our @ISA = CFClient::UI::VBox::;
3020
3021sub new {
3022 my $class = shift;
3023
3024 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3027 @_,
3028 );
3029
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer});
3031
3032 $self
3033}
3034
3035sub add {
3036 my ($self, $title, $widget, $tooltip) = @_;
3037
3038 Scalar::Util::weaken $self;
3039
3040 $self->{buttonbar}->add (new CFClient::UI::Button
3041 markup => $title,
3042 tooltip => $tooltip,
3043 on_activate => sub { $self->set_current_page ($widget) },
3044 );
3045
3046 $self->{multiplexer}->add ($widget);
3047}
3048
3049sub set_current_page {
3050 my ($self, $page) = @_;
3051
3052 $self->{multiplexer}->set_current_page ($page);
3053 $self->_emit (page_changed => $self->{multiplexer}{current});
2791} 3054}
2792 3055
2793############################################################################# 3056#############################################################################
2794 3057
2795package CFClient::UI::Statusbox; 3058package CFClient::UI::Statusbox;
… …
2855sub add { 3118sub add {
2856 my ($self, $text, %arg) = @_; 3119 my ($self, $text, %arg) = @_;
2857 3120
2858 $text =~ s/^\s+//; 3121 $text =~ s/^\s+//;
2859 $text =~ s/\s+$//; 3122 $text =~ s/\s+$//;
3123
3124 return unless $text;
2860 3125
2861 my $timeout = time + ((delete $arg{timeout}) || 60); 3126 my $timeout = time + ((delete $arg{timeout}) || 60);
2862 3127
2863 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2864 3129
… …
2898 $self->SUPER::reconfigure; 3163 $self->SUPER::reconfigure;
2899} 3164}
2900 3165
2901############################################################################# 3166#############################################################################
2902 3167
2903package CFClient::UI::Root; 3168package CFClient::UI::Inventory;
2904 3169
2905our @ISA = CFClient::UI::Container::; 3170our @ISA = CFClient::UI::ScrolledWindow::;
2906
2907use CFClient::OpenGL;
2908 3171
2909sub new { 3172sub new {
2910 my $class = shift; 3173 my $class = shift;
2911 3174
2912 $class->SUPER::new ( 3175 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177 @_,
3178 );
3179
3180 $self
3181}
3182
3183sub set_items {
3184 my ($self, $items) = @_;
3185
3186 $self->{scrolled}->clear;
3187 return unless $items;
3188
3189 my @items = sort {
3190 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name})
3192 } @$items;
3193
3194 $self->{real_items} = \@items;
3195
3196 my $row = 0;
3197 for my $item (@items) {
3198 CFClient::Item::update_widgets $item;
3199
3200 $self->{scrolled}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3203
3204 $row++;
3205 }
3206}
3207
3208#############################################################################
3209
3210package CFClient::UI::BindEditor;
3211
3212our @ISA = CFClient::UI::FancyFrame::;
3213
3214sub new {
3215 my $class = shift;
3216
3217 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3218
3219 $self->add (my $vb = new CFClient::UI::VBox);
3220
3221
3222 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3223 text => "start recording",
3224 tooltip => "Start/Stops recording of actions."
3225 ."All subsequent actions after the recording started will be captured."
3226 ."The actions are displayed after the record was stopped."
3227 ."To bind the action you have to click on the 'Bind' button",
3228 on_activate => sub {
3229 unless ($self->{recording}) {
3230 $self->start;
3231 } else {
3232 $self->stop;
3233 }
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3238
3239 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3240 $vb->add (my $hb = new CFClient::UI::HBox);
3241 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3242 $hb->add (new CFClient::UI::Button
3243 text => "bind",
3244 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3245 on_activate => sub {
3246 $self->ask_for_bind;
3247 });
3248
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add (new CFClient::UI::Button
3251 text => "ok",
3252 expand => 1,
3253 tooltip => "This closes the binding editor and saves the binding",
3254 on_activate => sub {
3255 $self->hide;
3256 $self->commit;
3257 });
3258
3259 $hb->add (new CFClient::UI::Button
3260 text => "cancel",
3261 expand => 1,
3262 tooltip => "This closes the binding editor without saving",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->{binding_cancel}->()
3266 if $self->{binding_cancel};
3267 });
3268
3269 $self->update_binding_widgets;
3270
3271 $self
3272}
3273
3274sub commit {
3275 my ($self) = @_;
3276 my ($mod, $sym, $cmds) = $self->get_binding;
3277 if ($sym != 0 && @$cmds > 0) {
3278 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3279 ."'. Don't forget 'Save Config'!");
3280 $self->{binding_change}->($mod, $sym, $cmds)
3281 if $self->{binding_change};
3282 } else {
3283 $::STATUSBOX->add ("No action bound, no key or action specified!");
3284 $self->{binding_cancel}->()
3285 if $self->{binding_cancel};
3286 }
3287}
3288
3289sub start {
3290 my ($self) = @_;
3291
3292 $self->{rec_btn}->set_text ("stop recording");
3293 $self->{recording} = 1;
3294 $self->clear_command_list;
3295 $::CONN->start_record if $::CONN;
3296}
3297
3298sub stop {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("start recording");
3302 $self->{recording} = 0;
3303
3304 my $rec;
3305 $rec = $::CONN->stop_record if $::CONN;
3306 return unless ref $rec eq 'ARRAY';
3307 $self->set_command_list ($rec);
3308}
3309
3310
3311sub ask_for_bind_and_commit {
3312 my ($self) = @_;
3313 $self->ask_for_bind (1);
3314}
3315
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Label text => $_);
3392 $hb->add (new CFClient::UI::Button
3393 text => "delete",
3394 tooltip => "Deletes the action from the record",
3395 on_activate => sub {
3396 $self->{cmdbox}->remove ($hb);
3397 $cmds->[$i] = undef;
3398 });
3399
3400
3401 $idx++
3402 }
3403}
3404
3405#############################################################################
3406
3407package CFClient::UI::SpellList;
3408
3409our @ISA = CFClient::UI::ScrolledWindow::;
3410
3411sub new {
3412 my $class = shift;
3413
3414 my $self = $class->SUPER::new (
3415 binding => [],
3416 commands => [],
3417 scrolled => (new CFClient::UI::Table),
2913 @_, 3418 @_,
2914 ) 3419 )
2915} 3420}
2916 3421
2917sub configure { 3422# XXX: Do sorting? Argl...
2918 my ($self, $x, $y, $w, $h) = @_; 3423sub add_spell {
2919
2920 $self->{w} = $w;
2921 $self->{h} = $h;
2922}
2923
2924sub check_size {
2925 my ($self) = @_; 3424 my ($self, $spell) = @_;
3425 $self->{spells}->{$spell->{name}} = $spell;
2926 3426
2927 $self->size_allocate ($self->{w}, $self->{h}) 3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2928 if $self->{w}; 3428 face => $spell->{face},
3429 can_hover => 1,
3430 can_events => 1,
3431 tooltip => $spell->{message});
3432
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message},
3438 expand => 1);
3439
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1);
3444
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448}
3449
3450sub rebuild_spell_list {
3451 my ($self) = @_;
3452 $self->{tbl_idx} = 0;
3453 $self->add_spell ($_) for values %{$self->{spells}};
3454}
3455
3456sub remove_spell {
3457 my ($self, $spell) = @_;
3458 delete $self->{spells}->{$spell->{name}};
3459 $self->rebuild_spell_list;
3460}
3461
3462#############################################################################
3463
3464package CFClient::UI::Root;
3465
3466our @ISA = CFClient::UI::Container::;
3467
3468use CFClient::OpenGL;
3469
3470sub new {
3471 my $class = shift;
3472
3473 my $self = $class->SUPER::new (
3474 visible => 1,
3475 @_,
3476 );
3477
3478 Scalar::Util::weaken ($self->{root} = $self);
3479
3480 $self
2929} 3481}
2930 3482
2931sub size_request { 3483sub size_request {
2932 my ($self) = @_; 3484 my ($self) = @_;
2933 3485
2934 ($self->{w}, $self->{h}) 3486 ($self->{w}, $self->{h})
3487}
3488
3489sub _to_pixel {
3490 my ($coord, $size, $max) = @_;
3491
3492 $coord =
3493 $coord eq "center" ? ($max - $size) * 0.5
3494 : $coord eq "max" ? $max
3495 : $coord;
3496
3497 $coord = 0 if $coord < 0;
3498 $coord = $max - $size if $coord > $max - $size;
3499
3500 int $coord + 0.5
2935} 3501}
2936 3502
2937sub size_allocate { 3503sub size_allocate {
2938 my ($self, $w, $h) = @_; 3504 my ($self, $w, $h) = @_;
2939 3505
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) { 3506 for my $child ($self->children) {
2947 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3507 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2948 3508
2949 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3509 $X = $child->{force_x} if exists $child->{force_x};
2950 if exists $child->{req_x}; 3510 $Y = $child->{force_y} if exists $child->{force_y};
2951 3511
2952 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3512 $X = _to_pixel $X, $W, $self->{w};
2953 if exists $child->{req_y}; 3513 $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 3514
2958 $child->configure ($X, $Y, $W, $H); 3515 $child->configure ($X, $Y, $W, $H);
2959 } 3516 }
2960} 3517}
2961 3518
… …
2972} 3529}
2973 3530
2974sub update { 3531sub update {
2975 my ($self) = @_; 3532 my ($self) = @_;
2976 3533
2977 $self->check_size;
2978 $::WANT_REFRESH++; 3534 $::WANT_REFRESH++;
2979} 3535}
2980 3536
2981sub add { 3537sub add {
2982 my ($self, @children) = @_; 3538 my ($self, @children) = @_;
2983 3539
2984 for my $child (@children) {
2985 $child->{toplevel} = 1; 3540 $_->{is_toplevel} = 1
2986 3541 for @children;
2987 # integerise window positions
2988 $child->{x} = int $child->{x};
2989 $child->{y} = int $child->{y};
2990 }
2991 3542
2992 $self->SUPER::add (@children); 3543 $self->SUPER::add (@children);
3544}
3545
3546sub remove {
3547 my ($self, @children) = @_;
3548
3549 $self->SUPER::remove (@children);
3550
3551 delete $self->{is_toplevel}
3552 for @children;
3553
3554 while (@children) {
3555 my $w = pop @children;
3556 push @children, $w->children;
3557 $w->set_invisible;
3558 }
2993} 3559}
2994 3560
2995sub on_refresh { 3561sub on_refresh {
2996 my ($self, $id, $cb) = @_; 3562 my ($self, $id, $cb) = @_;
2997 3563
… …
3010 while ($self->{refresh_hook}) { 3576 while ($self->{refresh_hook}) {
3011 $_->() 3577 $_->()
3012 for values %{delete $self->{refresh_hook}}; 3578 for values %{delete $self->{refresh_hook}};
3013 } 3579 }
3014 3580
3015 if ($self->{check_size}) { 3581 if ($self->{realloc}) {
3016 my @queue = ([], []); 3582 my %queue;
3583 my @queue;
3584 my $widget;
3017 3585
3018 for (;;) { 3586 outer:
3019 if ($self->{check_size}) { 3587 while () {
3020 # heuristic: check containers last 3588 if (my $realloc = delete $self->{realloc}) {
3021 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3589 for $widget (values %$realloc) {
3022 for values %{delete $self->{check_size}} 3590 $widget->{visible} or next; # do not resize invisible widgets
3591
3592 $queue{$widget+0}++ and next; # duplicates are common
3593
3594 push @{ $queue[$widget->{visible}] }, $widget;
3595 }
3023 } 3596 }
3024 3597
3025 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3598 while () {
3599 @queue or last outer;
3026 3600
3027 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3601 $widget = pop @{ $queue[-1] || [] }
3028 ? @$widget{qw(user_w user_h)} 3602 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 3603
3604 pop @queue;
3605 }
3606
3607 delete $queue{$widget+0};
3608
3609 my ($w, $h) = $widget->size_request;
3610
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3613
3614 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h};
3616
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3618 || delete $widget->{force_realloc}) {
3035 $widget->{req_w} = $w; 3619 $widget->{req_w} = $w;
3036 $widget->{req_h} = $h; 3620 $widget->{req_h} = $h;
3037 3621
3038 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3622 $self->{size_alloc}{$widget+0} = $widget;
3039 3623
3040 $widget->{parent}->check_size
3041 if $widget->{parent}; 3624 if (my $parent = $widget->{parent}) {
3625 $self->{realloc}{$parent+0} = $parent
3626 unless $queue{$parent+0};
3627
3628 $parent->{force_size_alloc} = 1;
3629 $self->{size_alloc}{$parent+0} = $parent;
3630 }
3042 } 3631 }
3632
3633 delete $self->{realloc}{$widget+0};
3043 } 3634 }
3044 } 3635 }
3045 3636
3046 while ($self->{size_alloc}) { 3637 while (my $size_alloc = delete $self->{size_alloc}) {
3047 for (values %{delete $self->{size_alloc}}) { 3638 my @queue = sort { $b->{visible} <=> $a->{visible} }
3048 my ($widget, $w, $h) = @$_; 3639 values %$size_alloc;
3640
3641 while () {
3642 my $widget = pop @queue || last;
3643
3644 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3049 3645
3050 $w = 0 if $w < 0; 3646 $w = 0 if $w < 0;
3051 $h = 0 if $h < 0; 3647 $h = 0 if $h < 0;
3052 3648
3649 $w = int $w + 0.5;
3650 $h = int $h + 0.5;
3651
3652 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3653 $widget->{old_w} = $widget->{w};
3654 $widget->{old_h} = $widget->{h};
3655
3053 $widget->{w} = $w; 3656 $widget->{w} = $w;
3054 $widget->{h} = $h; 3657 $widget->{h} = $h;
3055 $widget->size_allocate ($w, $h); 3658
3056 $widget->emit (size_allocate => $w, $h); 3659 $widget->emit (size_allocate => $w, $h);
3660 }
3057 } 3661 }
3058 } 3662 }
3059 3663
3060 while ($self->{post_alloc_hook}) { 3664 while ($self->{post_alloc_hook}) {
3061 $_->() 3665 $_->()
3062 for values %{delete $self->{post_alloc_hook}}; 3666 for values %{delete $self->{post_alloc_hook}};
3063 } 3667 }
3668
3064 3669
3065 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3670 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3066 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3671 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3067 glClear GL_COLOR_BUFFER_BIT; 3672 glClear GL_COLOR_BUFFER_BIT;
3068 3673
… …
3070 glLoadIdentity; 3675 glLoadIdentity;
3071 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3676 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3072 glMatrixMode GL_MODELVIEW; 3677 glMatrixMode GL_MODELVIEW;
3073 glLoadIdentity; 3678 glLoadIdentity;
3074 3679
3680 {
3681 package CFClient::UI::Base;
3682
3683 ($draw_x, $draw_y, $draw_w, $draw_h) =
3684 (0, 0, $self->{w}, $self->{h});
3685 }
3686
3075 $self->_draw; 3687 $self->_draw;
3076} 3688}
3077 3689
3078############################################################################# 3690#############################################################################
3079 3691

Diff Legend

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