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.222 by root, Mon May 22 03:59:51 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 {
… …
206 %$self = (); 243 %$self = ();
207} 244}
208 245
209sub show { 246sub show {
210 my ($self) = @_; 247 my ($self) = @_;
248
211 return if $self->{parent}; 249 return if $self->{parent};
212 250
213 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
214} 252}
215 253
216sub hide { 254sub set_visible {
217 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};
218 278
219 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
220 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
221 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
222 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
223 if $self->{parent}; 313 if $self->{parent};
224} 314}
225 315
226sub move { 316sub move_abs {
227 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
228 318
229 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
230 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
231 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
232 322
233 $self->update; 323 $self->update;
234} 324}
235 325
236sub set_size { 326sub set_size {
237 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
238 328
239 $self->{user_w} = $w; 329 $self->{force_w} = $w;
240 $self->{user_h} = $h; 330 $self->{force_h} = $h;
241 331
242 $self->check_size; 332 $self->realloc;
243} 333}
244 334
245sub size_request { 335sub size_request {
246 require Carp; 336 require Carp;
247 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
249 339
250sub configure { 340sub configure {
251 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
252 342
253 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
254 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
255 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
256 348
257 # use alignment to adjust x, y 349 # use alignment to adjust x, y
258 350
259 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
260 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
261
262 ($w, $h) = ($w2, $h2);
263 } 353 }
264 354
265 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
266 $self->{x} = $x; 356 $self->{x} = $x;
267 $self->{y} = $y; 357 $self->{y} = $y;
268 $self->update; 358 $self->update;
269 } 359 }
270 360
271 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
272 $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;
273 } 368 }
274} 369}
275 370
276sub size_allocate { 371sub size_allocate {
277 # nothing to be done 372 # nothing to be done
278} 373}
279 374
280sub reconfigure {
281 my ($self) = @_;
282
283 $self->check_size (1);
284 $self->update;
285}
286
287sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
288} 381}
289 382
290sub set_max_size { 383sub set_max_size {
291 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
292 385
… …
294 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
295} 388}
296 389
297sub set_tooltip { 390sub set_tooltip {
298 my ($self, $tooltip) = @_; 391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
299 397
300 $self->{tooltip} = $tooltip; 398 $self->{tooltip} = $tooltip;
301 399
302 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
303 delete $CFClient::UI::TOOLTIP->{owner}; 401 delete $CFClient::UI::TOOLTIP->{owner};
… …
325 return if $FOCUS == $self; 423 return if $FOCUS == $self;
326 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
327 425
328 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
329 427
330 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
331 429
332 $focus->update if $focus; 430 $focus->update if $focus;
333 $FOCUS->update; 431 $FOCUS->update;
334} 432}
335 433
… …
338 436
339 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
340 438
341 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
342 440
343 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
344 442
345 $focus->update if $focus; #? 443 $focus->update if $focus; #?
346}
347 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
348sub mouse_motion { } 449sub mouse_motion { 0 }
349sub button_up { } 450sub button_up { 0 }
350sub key_down { } 451sub key_down { 0 }
351sub key_up { } 452sub key_up { 0 }
352 453
353sub button_down { 454sub button_down {
354 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
355 456
356 $self->focus_in; 457 $self->focus_in;
357}
358 458
359sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
360sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
361sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
362sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
363sub 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
364 535
365sub draw { 536sub draw {
366 my ($self) = @_; 537 my ($self) = @_;
367 538
368 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);
369 550
370 glPushMatrix; 551 glPushMatrix;
371 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
372 $self->_draw; 553 $self->_draw;
373 glPopMatrix; 554 glPopMatrix;
… …
385 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
386 glEnd; 567 glEnd;
387 glDisable GL_BLEND; 568 glDisable GL_BLEND;
388 } 569 }
389 570
390 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
391 glPushMatrix; 572 glPushMatrix;
392 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
393 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
394 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
395 glVertex 0 , 0; 576 glVertex 0 , 0;
396 glVertex $self->{w}, 0; 577 glVertex $self->{w} - 1, 0;
397 glVertex $self->{w}, $self->{h}; 578 glVertex $self->{w} - 1, $self->{h} - 1;
398 glVertex 0 , $self->{h}; 579 glVertex 0 , $self->{h} - 1;
399 glEnd; 580 glEnd;
400 glPopMatrix; 581 glPopMatrix;
401 #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;
402 } 583 }
403} 584}
404 585
405sub _draw { 586sub _draw {
406 my ($self) = @_; 587 my ($self) = @_;
407 588
408 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
409}
410
411sub find_widget {
412 my ($self, $x, $y) = @_;
413
414 return () unless $self->{can_events};
415
416 return $self
417 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
418 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
419
420 ()
421}
422
423sub set_parent {
424 my ($self, $parent) = @_;
425
426 Scalar::Util::weaken ($self->{parent} = $parent);
427
428 # TODO: req_w _does_change after ->reconfigure
429 $self->check_size
430 unless exists $self->{req_w};
431
432 $self->show;
433}
434
435sub check_size {
436 my ($self, $forced) = @_;
437
438 $self->{force_alloc} = 1 if $forced;
439 $CFClient::UI::ROOT->{check_size}{$self} = $self;
440}
441
442sub update {
443 my ($self) = @_;
444
445 $self->{parent}->update
446 if $self->{parent};
447}
448
449sub connect {
450 my ($self, $signal, $cb) = @_;
451
452 push @{ $self->{signal_cb}{$signal} }, $cb;
453}
454
455sub emit {
456 my ($self, $signal, @args) = @_;
457
458 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
459} 590}
460 591
461sub DESTROY { 592sub DESTROY {
462 my ($self) = @_; 593 my ($self) = @_;
463 594
… …
521 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
522 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
523} 654}
524 655
525sub size_request { 656sub size_request {
526 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
527} 660}
528 661
529sub draw { } 662sub draw { }
530 663
531############################################################################# 664#############################################################################
… …
535our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
536 669
537sub new { 670sub new {
538 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
539 672
540 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
541 674
542 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
543 children => [], 676 children => [],
544 can_events => 0, 677 can_events => 0,
545 %arg, 678 %arg,
546 ); 679 );
680
547 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
548 683
549 $self 684 $self
550} 685}
551 686
552sub add { 687sub add {
… …
560 $self->{children} = [ 695 $self->{children} = [
561 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
562 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
563 ]; 698 ];
564 699
565 $self->check_size (1); 700 $self->realloc;
566 $self->update;
567} 701}
568 702
569sub children { 703sub children {
570 @{ $_[0]{children} } 704 @{ $_[0]{children} }
571} 705}
… …
576 delete $child->{parent}; 710 delete $child->{parent};
577 $child->hide; 711 $child->hide;
578 712
579 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
580 714
581 $self->check_size; 715 $self->realloc;
582 $self->update;
583} 716}
584 717
585sub clear { 718sub clear {
586 my ($self) = @_; 719 my ($self) = @_;
587 720
… …
591 for (@$children) { 724 for (@$children) {
592 delete $_->{parent}; 725 delete $_->{parent};
593 $_->hide; 726 $_->hide;
594 } 727 }
595 728
596 $self->check_size; 729 $self->realloc;
597 $self->update;
598} 730}
599 731
600sub find_widget { 732sub find_widget {
601 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
602 734
603 $x -= $self->{x}; 735 $x -= $self->{x};
604 $y -= $self->{y}; 736 $y -= $self->{y};
605 737
606 my $res; 738 my $res;
607 739
608 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
609 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
610 and return $res; 742 and return $res;
611 } 743 }
612 744
613 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
689 $self->SUPER::size_allocate ($w, $h); 821 $self->SUPER::size_allocate ($w, $h);
690 $self->update; 822 $self->update;
691} 823}
692 824
693sub _render { 825sub _render {
826 my ($self) = @_;
827
694 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
695} 829}
696 830
697sub render_child { 831sub render_child {
698 my ($self) = @_; 832 my ($self) = @_;
699 833
700 $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 {
701 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
702 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
703 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
704 $self->_render; 845 $self->_render;
705 }; 846 };
706} 847}
707 848
708sub _draw { 849sub _draw {
709 my ($self) = @_; 850 my ($self) = @_;
710 851
711 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
712 853
713 my $tex = $self->{texture} 854 my $tex = $self->{texture}
714 or return; 855 or return;
715 856
716 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
… …
726 867
727package CFClient::UI::ViewPort; 868package CFClient::UI::ViewPort;
728 869
729our @ISA = CFClient::UI::Window::; 870our @ISA = CFClient::UI::Window::;
730 871
872sub new {
873 my $class = shift;
874
875 $class->SUPER::new (
876 scroll_x => 0,
877 scroll_y => 1,
878 @_,
879 )
880}
881
731sub size_request { 882sub size_request {
732 my ($self) = @_; 883 my ($self) = @_;
733 884
734 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
735 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
736 886
737 @$self{qw(child_w child_h)} 887 $w = 10 if $self->{scroll_x};
888 $h = 10 if $self->{scroll_y};
889
890 ($w, $h)
738} 891}
739 892
740sub size_allocate { 893sub size_allocate {
741 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
742 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);
743 $self->update; 902 $self->update;
744} 903}
745 904
746sub set_offset { 905sub set_offset {
747 my ($self, $x, $y) = @_; 906 my ($self, $x, $y) = @_;
… …
781} 940}
782 941
783sub _render { 942sub _render {
784 my ($self) = @_; 943 my ($self) = @_;
785 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
786 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
787 949
788 $self->SUPER::_render; 950 $self->SUPER::_render;
789} 951}
790 952
… …
798 my $class = shift; 960 my $class = shift;
799 961
800 my $self; 962 my $self;
801 963
802 my $slider = new CFClient::UI::Slider 964 my $slider = new CFClient::UI::Slider
803 vertical => 1, 965 vertical => 1,
804 range => [0, 0, 1, 0.01], # HACK fix 966 range => [0, 0, 1, 0.01], # HACK fix
805 connect_changed => sub { 967 on_changed => sub {
806 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 968 $self->{vp}->set_offset (0, $_[1]);
807 }, 969 },
808 ; 970 ;
809 971
810 $self = $class->SUPER::new ( 972 $self = $class->SUPER::new (
811 vp => (new CFClient::UI::ViewPort expand => 1), 973 vp => (new CFClient::UI::ViewPort expand => 1),
… …
816 $self->{vp}->add ($self->{scrolled}); 978 $self->{vp}->add ($self->{scrolled});
817 $self->add ($self->{vp}); 979 $self->add ($self->{vp});
818 $self->add ($self->{slider}); 980 $self->add ($self->{slider});
819 981
820 $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]);
821} 1002}
822 1003
823#TODO# update range on size_allocate depending on child 1004#TODO# update range on size_allocate depending on child
824# update viewport offset on scroll 1005# update viewport offset on scroll
825 1006
… …
869 1050
870our @ISA = CFClient::UI::Bin::; 1051our @ISA = CFClient::UI::Bin::;
871 1052
872use CFClient::OpenGL; 1053use CFClient::OpenGL;
873 1054
874my @tex = 1055my $bg =
1056 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1057 mipmap => 1, wrap => 1;
1058
1059my @border =
875 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1060 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
876 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);
877 1062
878sub new { 1063sub new {
879 my $class = shift; 1064 my ($class, %arg) = @_;
880 1065
881 # TODO: user_x, user_y, overwrite moveto? 1066 my $title = delete $arg{title};
882 1067
883 my $self = $class->SUPER::new ( 1068 my $self = $class->SUPER::new (
884 bg => [1, 1, 1, 1], 1069 bg => [1, 1, 1, 1],
885 border_bg => [1, 1, 1, 1], 1070 border_bg => [1, 1, 1, 1],
886 border => 0.6, 1071 border => 0.6,
887 toplevel => 1,
888 can_events => 1, 1072 can_events => 1,
889 @_ 1073 min_w => 16,
1074 min_h => 16,
1075 %arg,
890 ); 1076 );
891 1077
892 $self->{title} &&= new CFClient::UI::Label 1078 $self->{title} = new CFClient::UI::Label
893 align => 0, 1079 align => 0,
894 valign => 1, 1080 valign => 1,
895 text => $self->{title}, 1081 text => $title,
896 fontsize => $self->{border}; 1082 fontsize => $self->{border}
1083 if defined $title;
897 1084
898 $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};
899} 1093}
900 1094
901sub border { 1095sub border {
902 int $_[0]{border} * $::FONTSIZE 1096 int $_[0]{border} * $::FONTSIZE
903} 1097}
904 1098
905sub size_request { 1099sub size_request {
906 my ($self) = @_; 1100 my ($self) = @_;
1101
1102 $self->{title}->size_request
1103 if $self->{title};
907 1104
908 my ($w, $h) = $self->SUPER::size_request; 1105 my ($w, $h) = $self->SUPER::size_request;
909 1106
910 ( 1107 (
911 $w + $self->border * 2, 1108 $w + $self->border * 2,
… …
914} 1111}
915 1112
916sub size_allocate { 1113sub size_allocate {
917 my ($self, $w, $h) = @_; 1114 my ($self, $w, $h) = @_;
918 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
919 $h -= List::Util::max 0, $self->border * 2; 1124 $h -= List::Util::max 0, $border * 2;
920 $w -= List::Util::max 0, $self->border * 2; 1125 $w -= List::Util::max 0, $border * 2;
921 1126
922 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
923 if $self->{title};
924
925 $self->child->configure ($self->border, $self->border, $w, $h); 1127 $self->child->configure ($border, $border, $w, $h);
926} 1128}
927 1129
928sub button_down { 1130sub button_down {
929 my ($self, $ev, $x, $y) = @_; 1131 my ($self, $ev, $x, $y) = @_;
930 1132
… …
946 my ($ev, $x, $y) = @_; 1148 my ($ev, $x, $y) = @_;
947 1149
948 my $dx = $ev->{x} - $ox; 1150 my $dx = $ev->{x} - $ox;
949 my $dy = $ev->{y} - $oy; 1151 my $dy = $ev->{y} - $oy;
950 1152
951 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
952 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155
1156 $self->realloc;
953 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
954 $self->check_size;
955 }; 1158 };
956 1159
957 } elsif ($lr ^ $td) { 1160 } elsif ($lr ^ $td) {
958 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1161 my ($ox, $oy) = ($ev->{x}, $ev->{y});
959 my ($bx, $by) = ($self->{x}, $self->{y}); 1162 my ($bx, $by) = ($self->{x}, $self->{y});
… …
961 $self->{motion} = sub { 1164 $self->{motion} = sub {
962 my ($ev, $x, $y) = @_; 1165 my ($ev, $x, $y) = @_;
963 1166
964 ($x, $y) = ($ev->{x}, $ev->{y}); 1167 ($x, $y) = ($ev->{x}, $ev->{y});
965 1168
966 $self->move ($bx + $x - $ox, $by + $y - $oy); 1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
967 $self->update;
968 }; 1170 };
1171 } else {
1172 return 0;
1173 }
1174
969 } 1175 1
970} 1176}
971 1177
972sub button_up { 1178sub button_up {
973 my ($self, $ev, $x, $y) = @_; 1179 my ($self, $ev, $x, $y) = @_;
974 1180
975 delete $self->{motion}; 1181 !!delete $self->{motion}
976} 1182}
977 1183
978sub mouse_motion { 1184sub mouse_motion {
979 my ($self, $ev, $x, $y) = @_; 1185 my ($self, $ev, $x, $y) = @_;
980 1186
981 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1187 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188
1189 !!$self->{motion}
982} 1190}
983 1191
984sub _draw { 1192sub _draw {
985 my ($self) = @_; 1193 my ($self) = @_;
986 1194
1195 my $child = $self->{children}[0];
1196
987 my ($w, $h ) = ($self->{w}, $self->{h}); 1197 my ($w, $h ) = ($self->{w}, $self->{h});
988 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1198 my ($cw, $ch) = ($child->{w}, $child->{h});
989 1199
990 glEnable GL_TEXTURE_2D; 1200 glEnable GL_TEXTURE_2D;
991 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1201 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
992 1202
993 my $border = $self->border; 1203 my $border = $self->border;
994 1204
995 glColor @{ $self->{border_bg} }; 1205 glColor @{ $self->{border_bg} };
996 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1206 $border[0]->draw_quad_alpha (0, 0, $w, $border);
997 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1207 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
998 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1208 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
999 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1209 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1000 1210
1001 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1211 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1002 my $bg = $tex[0]; 1212 glColor @{ $self->{bg} };
1003 1213
1004 # TODO: repeat texture not scale 1214 # TODO: repeat texture not scale
1215 # solve this better(?)
1005 my $rep_x = $cw / $bg->{w}; 1216 $bg->{s} = $cw / $bg->{w};
1006 my $rep_y = $ch / $bg->{h}; 1217 $bg->{t} = $ch / $bg->{h};
1007
1008 glColor @{ $self->{bg} };
1009
1010 $bg->{s} = $rep_x;
1011 $bg->{t} = $rep_y;
1012 $bg->{wrap_mode} = 1;
1013 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1218 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1014 } 1219 }
1015 1220
1016 glDisable GL_TEXTURE_2D; 1221 glDisable GL_TEXTURE_2D;
1017 1222
1018 $self->{title}->draw if $self->{title};
1019
1020 $self->child->draw; 1223 $child->draw;
1224
1225 if ($self->{title}) {
1226 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw;
1228 }
1021} 1229}
1022 1230
1023############################################################################# 1231#############################################################################
1024 1232
1025package CFClient::UI::Table; 1233package CFClient::UI::Table;
… …
1033sub new { 1241sub new {
1034 my $class = shift; 1242 my $class = shift;
1035 1243
1036 $class->SUPER::new ( 1244 $class->SUPER::new (
1037 col_expand => [], 1245 col_expand => [],
1038 @_ 1246 @_,
1039 ) 1247 )
1248}
1249
1250sub children {
1251 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1040} 1252}
1041 1253
1042sub add { 1254sub add {
1043 my ($self, $x, $y, $child) = @_; 1255 my ($self, $x, $y, $child) = @_;
1044 1256
1045 $child->set_parent ($self); 1257 $child->set_parent ($self);
1046 $self->{children}[$y][$x] = $child; 1258 $self->{children}[$y][$x] = $child;
1047 1259
1048 $child->check_size; 1260 $self->realloc;
1049} 1261}
1050 1262
1051sub children {
1052 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053}
1054
1055# 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?
1056sub clear { 1264sub clear {
1057 my ($self) = @_; 1265 my ($self) = @_;
1058 1266
1059 my @children = $self->children; 1267 my @children = $self->children;
1060 delete $self->{children}; 1268 delete $self->{children};
… …
1062 for (@children) { 1270 for (@children) {
1063 delete $_->{parent}; 1271 delete $_->{parent};
1064 $_->hide; 1272 $_->hide;
1065 } 1273 }
1066 1274
1067 $self->update; 1275 $self->realloc;
1068} 1276}
1069 1277
1070sub get_wh { 1278sub get_wh {
1071 my ($self) = @_; 1279 my ($self) = @_;
1072 1280
… …
1103sub size_allocate { 1311sub size_allocate {
1104 my ($self, $w, $h) = @_; 1312 my ($self, $w, $h) = @_;
1105 1313
1106 my ($ws, $hs) = $self->get_wh; 1314 my ($ws, $hs) = $self->get_wh;
1107 1315
1108 my $req_w = sum @$ws; 1316 my $req_w = (sum @$ws) || 1;
1109 my $req_h = sum @$hs; 1317 my $req_h = (sum @$hs) || 1;
1110 1318
1111 # TODO: nicer code && do row_expand 1319 # TODO: nicer code && do row_expand
1112 my @col_expand = @{$self->{col_expand}}; 1320 my @col_expand = @{$self->{col_expand}};
1113 @col_expand = (1) x @$ws unless @col_expand; 1321 @col_expand = (1) x @$ws unless @col_expand;
1114 my $col_expand = (sum @col_expand) || 1; 1322 my $col_expand = (sum @col_expand) || 1;
… …
1168 } 1376 }
1169} 1377}
1170 1378
1171############################################################################# 1379#############################################################################
1172 1380
1173package CFClient::UI::HBox; 1381package CFClient::UI::Box;
1174
1175# TODO: wrap into common Box base class
1176 1382
1177our @ISA = CFClient::UI::Container::; 1383our @ISA = CFClient::UI::Container::;
1178 1384
1179sub size_request { 1385sub size_request {
1180 my ($self) = @_; 1386 my ($self) = @_;
1181 1387
1182 my @alloc = map [$_->size_request], @{$self->{children}}; 1388 $self->{vertical}
1183 1389 ? (
1184 ( 1390 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1185 (List::Util::sum map $_->[0], @alloc), 1391 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1186 (List::Util::max map $_->[1], @alloc), 1392 )
1187 ) 1393 : (
1394 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1395 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1396 )
1188} 1397}
1189 1398
1190sub size_allocate { 1399sub size_allocate {
1191 my ($self, $w, $h) = @_; 1400 my ($self, $w, $h) = @_;
1192 1401
1193 ($h, $w) = ($w, $h); 1402 my $space = $self->{vertical} ? $h : $w;
1194
1195 my $children = $self->{children}; 1403 my $children = $self->{children};
1196 1404
1197 my @h = map $_->{req_w}, @$children; 1405 my @req;
1198 1406
1199 my $req_h = List::Util::sum @h; 1407 if ($self->{homogeneous}) {
1200 1408 @req = ($space / (@$children || 1)) x @$children;
1201 if ($req_h > $h) {
1202 # ah well, not enough space
1203 $_ *= $h / $req_h for @h;
1204 } 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 {
1205 my $exp = List::Util::sum map $_->{expand}, @$children; 1417 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1206 $exp ||= 1;
1207 1418
1419 $space = ($space - $req) / $expand; # remaining space to give away
1420
1421 $req[$_] += $space * $children->[$_]{expand}
1208 for (0 .. $#$children) { 1422 for 0 .. $#$children;
1209 my $child = $children->[$_];
1210
1211 my $alloc_h = $h[$_];
1212 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1213 $h[$_] = $alloc_h;
1214 } 1423 }
1215 } 1424 }
1216 1425
1217 CFClient::UI::harmonize \@h; 1426 CFClient::UI::harmonize \@req;
1218 1427
1219 my $y = 0; 1428 my $pos = 0;
1220 for (0 .. $#$children) { 1429 for (0 .. $#$children) {
1221 my $child = $children->[$_];
1222 my $h = $h[$_]; 1430 my $alloc = $req[$_];
1223 $child->configure ($y, 0, $h, $w); 1431 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1224 1432
1225 $y += $h; 1433 $pos += $alloc;
1226 } 1434 }
1227 1435
1228 1 1436 1
1229} 1437}
1230 1438
1231############################################################################# 1439#############################################################################
1232 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
1233package CFClient::UI::VBox; 1456package CFClient::UI::VBox;
1234 1457
1235# TODO: wrap into common Box base class
1236
1237our @ISA = CFClient::UI::Container::; 1458our @ISA = CFClient::UI::Box::;
1238 1459
1239sub size_request { 1460sub new {
1240 my ($self) = @_; 1461 my $class = shift;
1241 1462
1242 my @alloc = map [$_->size_request], @{$self->{children}}; 1463 $class->SUPER::new (
1243 1464 vertical => 1,
1244 ( 1465 @_,
1245 (List::Util::max map $_->[0], @alloc),
1246 (List::Util::sum map $_->[1], @alloc),
1247 ) 1466 )
1248}
1249
1250sub size_allocate {
1251 my ($self, $w, $h) = @_;
1252
1253 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1254
1255 my $children = $self->{children};
1256
1257 my @h = map $_->{req_h}, @$children;
1258
1259 my $req_h = List::Util::sum @h;
1260
1261 if ($req_h > $h) {
1262 # ah well, not enough space
1263 $_ *= $h / $req_h for @h;
1264 } else {
1265 my $exp = List::Util::sum map $_->{expand}, @$children;
1266 $exp ||= 1;
1267
1268 for (0 .. $#$children) {
1269 my $child = $children->[$_];
1270
1271 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1272 }
1273 }
1274
1275 CFClient::UI::harmonize \@h;
1276
1277 my $y = 0;
1278 for (0 .. $#$children) {
1279 my $child = $children->[$_];
1280 my $h = $h[$_];
1281 $child->configure (0, $y, $w, $h);
1282
1283 $y += $h;
1284 }
1285
1286 1
1287} 1467}
1288 1468
1289############################################################################# 1469#############################################################################
1290 1470
1291package CFClient::UI::Label; 1471package CFClient::UI::Label;
… …
1308 ellipsise => 3, # end 1488 ellipsise => 3, # end
1309 layout => (new CFClient::Layout), 1489 layout => (new CFClient::Layout),
1310 fontsize => 1, 1490 fontsize => 1,
1311 align => -1, 1491 align => -1,
1312 valign => -1, 1492 valign => -1,
1313 padding => 2, 1493 padding_x => 2,
1494 padding_y => 2,
1314 can_events => 0, 1495 can_events => 0,
1315 %arg 1496 %arg
1316 ); 1497 );
1317 1498
1318 if (exists $self->{template}) { 1499 if (exists $self->{template}) {
… …
1354 $self->{text} = "T$text"; 1535 $self->{text} = "T$text";
1355 1536
1356 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1357 $self->{layout}->set_text ($text); 1538 $self->{layout}->set_text ($text);
1358 1539
1540 $self->realloc;
1359 $self->update; 1541 $self->update;
1360 $self->check_size;
1361} 1542}
1362 1543
1363sub set_markup { 1544sub set_markup {
1364 my ($self, $markup) = @_; 1545 my ($self, $markup) = @_;
1365 1546
… …
1369 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1550 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1370 1551
1371 $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;
1372 $self->{layout}->set_markup ($markup); 1553 $self->{layout}->set_markup ($markup);
1373 1554
1555 $self->realloc;
1374 $self->update; 1556 $self->update;
1375 $self->check_size;
1376} 1557}
1377 1558
1378sub size_request { 1559sub size_request {
1379 my ($self) = @_; 1560 my ($self) = @_;
1380 1561
… …
1394 1575
1395 $w = List::Util::max $w, $w2; 1576 $w = List::Util::max $w, $w2;
1396 $h = List::Util::max $h, $h2; 1577 $h = List::Util::max $h, $h2;
1397 } 1578 }
1398 1579
1399 ( 1580 ($w, $h)
1400 $w + $self->{padding} * 2,
1401 $h + $self->{padding} * 2,
1402 )
1403} 1581}
1404 1582
1405sub size_allocate { 1583sub size_allocate {
1406 my ($self, $w, $h) = @_; 1584 my ($self, $w, $h) = @_;
1407 1585
1586 delete $self->{ox};
1587
1408 delete $self->{texture}; 1588 delete $self->{texture}
1589 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1409} 1590}
1410 1591
1411sub set_fontsize { 1592sub set_fontsize {
1412 my ($self, $fontsize) = @_; 1593 my ($self, $fontsize) = @_;
1413 1594
1414 $self->{fontsize} = $fontsize; 1595 $self->{fontsize} = $fontsize;
1415 delete $self->{texture}; 1596 delete $self->{texture};
1416 1597
1417 $self->update; 1598 $self->realloc;
1418 $self->check_size;
1419} 1599}
1420 1600
1421sub _draw { 1601sub _draw {
1422 my ($self) = @_; 1602 my ($self) = @_;
1423 1603
… …
1429 $self->{layout}->set_width ($self->{w}); 1609 $self->{layout}->set_width ($self->{w});
1430 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1610 $self->{layout}->set_ellipsise ($self->{ellipsise});
1431 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1611 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1432 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1433 1613
1434 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1614 new_from_layout CFClient::Texture $self->{layout}
1615 };
1435 1616
1617 unless (exists $self->{ox}) {
1436 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1618 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1437 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1619 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1438 : ($self->{w} - $tex->{w}) * 0.5); 1620 : ($self->{w} - $tex->{w}) * 0.5);
1439 1621
1440 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1622 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1441 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1442 : ($self->{h} - $tex->{h}) * 0.5); 1624 : ($self->{h} - $tex->{h}) * 0.5);
1443
1444 $tex
1445 }; 1625 };
1446 1626
1447 glEnable GL_TEXTURE_2D; 1627 glEnable GL_TEXTURE_2D;
1448 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1449 1629
… …
1475 active_fg => [0, 0, 0], 1655 active_fg => [0, 0, 0],
1476 can_hover => 1, 1656 can_hover => 1,
1477 can_focus => 1, 1657 can_focus => 1,
1478 valign => 0, 1658 valign => 0,
1479 can_events => 1, 1659 can_events => 1,
1660 #text => ...
1480 @_ 1661 @_
1481 ) 1662 )
1482} 1663}
1483 1664
1484sub _set_text { 1665sub _set_text {
… …
1494 $self->{text} = $text; 1675 $self->{text} = $text;
1495 1676
1496 $text =~ s/./*/g if $self->{hidden}; 1677 $text =~ s/./*/g if $self->{hidden};
1497 $self->{layout}->set_text ("$text "); 1678 $self->{layout}->set_text ("$text ");
1498 1679
1499 $self->emit (changed => $self->{text}); 1680 $self->_emit (changed => $self->{text});
1500} 1681}
1501 1682
1502sub set_text { 1683sub set_text {
1503 my ($self, $text) = @_; 1684 my ($self, $text) = @_;
1504 1685
1505 $self->{cursor} = length $text; 1686 $self->{cursor} = length $text;
1506 $self->_set_text ($text); 1687 $self->_set_text ($text);
1507 $self->update; 1688
1508 $self->check_size; 1689 $self->realloc;
1509} 1690}
1510 1691
1511sub get_text { 1692sub get_text {
1512 $_[0]{text} 1693 $_[0]{text}
1513} 1694}
… …
1516 my ($self) = @_; 1697 my ($self) = @_;
1517 1698
1518 my ($w, $h) = $self->SUPER::size_request; 1699 my ($w, $h) = $self->SUPER::size_request;
1519 1700
1520 ($w + 1, $h) # add 1 for cursor 1701 ($w + 1, $h) # add 1 for cursor
1521}
1522
1523sub size_allocate {
1524 my ($self, $w, $h) = @_;
1525
1526 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1527} 1702}
1528 1703
1529sub key_down { 1704sub key_down {
1530 my ($self, $ev) = @_; 1705 my ($self, $ev) = @_;
1531 1706
… …
1546 } elsif ($sym == CFClient::SDLK_HOME) { 1721 } elsif ($sym == CFClient::SDLK_HOME) {
1547 $self->{cursor} = 0; 1722 $self->{cursor} = 0;
1548 } elsif ($sym == CFClient::SDLK_END) { 1723 } elsif ($sym == CFClient::SDLK_END) {
1549 $self->{cursor} = length $text; 1724 $self->{cursor} = length $text;
1550 } elsif ($uni == 27) { 1725 } elsif ($uni == 27) {
1551 $self->emit ('escape'); 1726 $self->_emit ('escape');
1552 } elsif ($uni) { 1727 } elsif ($uni) {
1553 substr $text, $self->{cursor}++, 0, chr $uni; 1728 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else {
1730 return 0;
1554 } 1731 }
1555 1732
1556 $self->_set_text ($text); 1733 $self->_set_text ($text);
1557 $self->update; 1734
1558 $self->check_size; 1735 $self->realloc;
1736
1737 1
1559} 1738}
1560 1739
1561sub focus_in { 1740sub focus_in {
1562 my ($self) = @_; 1741 my ($self) = @_;
1563 1742
… …
1578 utf8::encode $text; 1757 utf8::encode $text;
1579 $self->{cursor} = length substr $text, 0, $idx; 1758 $self->{cursor} = length substr $text, 0, $idx;
1580 1759
1581 $self->_set_text ($self->{text}); 1760 $self->_set_text ($self->{text});
1582 $self->update; 1761 $self->update;
1762
1763 1
1583} 1764}
1584 1765
1585sub mouse_motion { 1766sub mouse_motion {
1586 my ($self, $ev, $x, $y) = @_; 1767 my ($self, $ev, $x, $y) = @_;
1587# 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
1588} 1771}
1589 1772
1590sub _draw { 1773sub _draw {
1591 my ($self) = @_; 1774 my ($self) = @_;
1592 1775
… …
1643 if ($sym == 13) { 1826 if ($sym == 13) {
1644 unshift @{$self->{history}}, 1827 unshift @{$self->{history}},
1645 my $txt = $self->get_text; 1828 my $txt = $self->get_text;
1646 $self->{history_pointer} = -1; 1829 $self->{history_pointer} = -1;
1647 $self->{history_saveback} = ''; 1830 $self->{history_saveback} = '';
1648 $self->emit (activate => $txt); 1831 $self->_emit (activate => $txt);
1649 $self->update; 1832 $self->update;
1650 1833
1651 } elsif ($sym == CFClient::SDLK_UP) { 1834 } elsif ($sym == CFClient::SDLK_UP) {
1652 if ($self->{history_pointer} < 0) { 1835 if ($self->{history_pointer} < 0) {
1653 $self->{history_saveback} = $self->get_text; 1836 $self->{history_saveback} = $self->get_text;
… …
1669 } else { 1852 } else {
1670 $self->set_text ($self->{history_saveback}); 1853 $self->set_text ($self->{history_saveback});
1671 } 1854 }
1672 1855
1673 } else { 1856 } else {
1674 $self->SUPER::key_down ($ev); 1857 return $self->SUPER::key_down ($ev)
1858 }
1859
1675 } 1860 1
1676
1677} 1861}
1678 1862
1679############################################################################# 1863#############################################################################
1680 1864
1681package CFClient::UI::Button; 1865package CFClient::UI::Button;
… …
1690 1874
1691sub new { 1875sub new {
1692 my $class = shift; 1876 my $class = shift;
1693 1877
1694 $class->SUPER::new ( 1878 $class->SUPER::new (
1695 padding => 4, 1879 padding_x => 4,
1880 padding_y => 4,
1696 fg => [1, 1, 1], 1881 fg => [1, 1, 1],
1697 active_fg => [0, 0, 1], 1882 active_fg => [0, 0, 1],
1698 can_hover => 1, 1883 can_hover => 1,
1699 align => 0, 1884 align => 0,
1700 valign => 0, 1885 valign => 0,
1701 can_events => 1, 1886 can_events => 1,
1702 @_ 1887 @_
1703 ) 1888 )
1704} 1889}
1705 1890
1891sub activate { }
1892
1706sub button_up { 1893sub button_up {
1707 my ($self, $ev, $x, $y) = @_; 1894 my ($self, $ev, $x, $y) = @_;
1708 1895
1896 $self->emit ("activate")
1709 if ($x >= 0 && $x < $self->{w} 1897 if $x >= 0 && $x < $self->{w}
1710 && $y >= 0 && $y < $self->{h}) { 1898 && $y >= 0 && $y < $self->{h};
1711 $self->emit ("activate"); 1899
1712 } 1900 1
1713} 1901}
1714 1902
1715sub _draw { 1903sub _draw {
1716 my ($self) = @_; 1904 my ($self) = @_;
1717 1905
… …
1746 1934
1747sub new { 1935sub new {
1748 my $class = shift; 1936 my $class = shift;
1749 1937
1750 $class->SUPER::new ( 1938 $class->SUPER::new (
1751 padding => 2, 1939 padding_x => 2,
1940 padding_y => 2,
1752 fg => [1, 1, 1], 1941 fg => [1, 1, 1],
1753 active_fg => [1, 1, 0], 1942 active_fg => [1, 1, 0],
1754 bg => [0, 0, 0, 0.2], 1943 bg => [0, 0, 0, 0.2],
1755 active_bg => [1, 1, 1, 0.5], 1944 active_bg => [1, 1, 1, 0.5],
1756 state => 0, 1945 state => 0,
… …
1760} 1949}
1761 1950
1762sub size_request { 1951sub size_request {
1763 my ($self) = @_; 1952 my ($self) = @_;
1764 1953
1765 ($self->{padding} * 2 + 6) x 2 1954 (6) x 2
1766} 1955}
1767 1956
1768sub button_down { 1957sub button_down {
1769 my ($self, $ev, $x, $y) = @_; 1958 my ($self, $ev, $x, $y) = @_;
1770 1959
1771 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1772 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1773 $self->{state} = !$self->{state}; 1962 $self->{state} = !$self->{state};
1774 $self->emit (changed => $self->{state}); 1963 $self->_emit (changed => $self->{state});
1964 } else {
1965 return 0
1966 }
1967
1775 } 1968 1
1776} 1969}
1777 1970
1778sub _draw { 1971sub _draw {
1779 my ($self) = @_; 1972 my ($self) = @_;
1780 1973
1781 $self->SUPER::_draw; 1974 $self->SUPER::_draw;
1782 1975
1783 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1976 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1784 1977
1785 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;
1786 1981
1787 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1982 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1788 1983
1789 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1984 my $tex = $self->{state} ? $tex[1] : $tex[0];
1790 1985
… …
2054 my $self = $class->SUPER::new ( 2249 my $self = $class->SUPER::new (
2055 fg => [1, 1, 1], 2250 fg => [1, 1, 1],
2056 active_fg => [0, 0, 0], 2251 active_fg => [0, 0, 0],
2057 bg => [0, 0, 0, 0.2], 2252 bg => [0, 0, 0, 0.2],
2058 active_bg => [1, 1, 1, 0.5], 2253 active_bg => [1, 1, 1, 0.5],
2059 range => [0, 0, 100, 10], 2254 range => [0, 0, 100, 10, 0],
2060 req_w => $::WIDTH / 80, 2255 min_w => $::WIDTH / 80,
2061 req_h => $::WIDTH / 80, 2256 min_h => $::WIDTH / 80,
2062 vertical => 0, 2257 vertical => 0,
2063 can_hover => 1, 2258 can_hover => 1,
2064 inner_pad => 0.02, 2259 inner_pad => 0.02,
2065 @_ 2260 @_
2066 ); 2261 );
… …
2069 $self->update; 2264 $self->update;
2070 2265
2071 $self 2266 $self
2072} 2267}
2073 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
2074sub set_value { 2280sub set_value {
2075 my ($self, $value) = @_; 2281 my ($self, $value) = @_;
2076 2282
2077 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2283 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2078 2284
2079 $hi = $lo + 1 if $hi <= $lo; 2285 $hi = $lo + 1 if $hi <= $lo;
2080 2286
2287 $page = $hi - $lo if $page > $hi - $lo;
2288
2081 $value = $lo if $value < $lo; 2289 $value = $lo if $value < $lo;
2082 $value = $hi if $value > $hi; 2290 $value = $hi - $page if $value > $hi - $page;
2083 2291
2084 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2292 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2085 if $unit; 2293 if $unit;
2086 2294
2087 $page = $hi - $lo if $page > $hi - $lo;
2088
2089 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2295 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2090 2296
2091 if ($value != $old_value) { 2297 if ($value != $old_value) {
2092 $self->emit (changed => $value); 2298 $self->_emit (changed => $value);
2093 $self->update; 2299 $self->update;
2094 } 2300 }
2095} 2301}
2096 2302
2097sub size_request { 2303sub size_request {
2098 my ($self) = @_; 2304 my ($self) = @_;
2099 2305
2100 my $w = $self->{req_w}; 2306 ($self->{req_w}, $self->{req_h})
2101 my $h = $self->{req_h};
2102
2103 $self->{vertical} ? ($h, $w) : ($w, $h)
2104} 2307}
2105 2308
2106sub button_down { 2309sub button_down {
2107 my ($self, $ev, $x, $y) = @_; 2310 my ($self, $ev, $x, $y) = @_;
2108 2311
2109 $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
2110 $self->mouse_motion ($ev, $x, $y); 2316 $self->mouse_motion ($ev, $x, $y)
2111} 2317}
2112 2318
2113sub mouse_motion { 2319sub mouse_motion {
2114 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
2115 2321
2116 if ($GRAB == $self) { 2322 if ($GRAB == $self) {
2117 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2323 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2118 2324
2119 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2325 my (undef, $lo, $hi, $page) = @{$self->{range}};
2120 2326
2121 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2327 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2122 2328
2123 $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
2124 } 2334 1
2125} 2335}
2126 2336
2127sub update { 2337sub update {
2128 my ($self) = @_; 2338 my ($self) = @_;
2129 2339
2130 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2131 $self->set_value ($self->{range}[0]); 2341 $self->set_value ($self->{range}[0]);
2132 2342
2133 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2343 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100;
2134 2345
2135 my $inner_w = 1 - 2 * $self->{inner_pad}; 2346 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2136 2347
2137 $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;
2138 2350
2139 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2351 $value = ($value - $lo) / $range;
2140 $value = $self->{scale} * ($value - $lo); 2352 $value = $value * $self->{scale} + $self->{offset};
2141 2353
2142 $value = $self->{inner_pad} + ($value - $page * 0.5);
2143
2144 $value = 0 if $value < 0;
2145 $page = 1 - $value if $value + $page > 1;
2146
2147 $self->{knob_x} = $value; 2354 $self->{knob_x} = $value - $knob_w * 0.5;
2148 $self->{knob_w} = $page; 2355 $self->{knob_w} = $knob_w;
2149 }); 2356 });
2150 2357
2151 $self->SUPER::update; 2358 $self->SUPER::update;
2152} 2359}
2153 2360
… …
2177 # draw handle 2384 # draw handle
2178 $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);
2179 2386
2180 glDisable GL_TEXTURE_2D; 2387 glDisable GL_TEXTURE_2D;
2181} 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 (@_) }
2182 2430
2183############################################################################# 2431#############################################################################
2184 2432
2185package CFClient::UI::TextView; 2433package CFClient::UI::TextView;
2186 2434
… …
2228 $self->{layout}->set_width ($self->{children}[0]{w}); 2476 $self->{layout}->set_width ($self->{children}[0]{w});
2229 2477
2230 $self->reflow; 2478 $self->reflow;
2231} 2479}
2232 2480
2233sub text_height { 2481sub text_size {
2234 my ($self, $text, $indent) = @_; 2482 my ($self, $text, $indent) = @_;
2235 2483
2236 my $layout = $self->{layout}; 2484 my $layout = $self->{layout};
2237 2485
2238 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2486 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2239 $layout->set_width ($self->{children}[0]{w} - $indent); 2487 $layout->set_width ($self->{children}[0]{w} - $indent);
2240 $layout->set_markup ($text); 2488 $layout->set_markup ($text);
2241 2489
2242 ($layout->size)[1] 2490 $layout->size
2243} 2491}
2244 2492
2245sub reflow { 2493sub reflow {
2246 my ($self) = @_; 2494 my ($self) = @_;
2247 2495
2248 $self->{need_reflow}++; 2496 $self->{need_reflow}++;
2249 $self->update; 2497 $self->update;
2250} 2498}
2251 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
2252sub add_paragraph { 2515sub add_paragraph {
2253 my ($self, $color, $text, $indent) = @_; 2516 my ($self, $color, $text, $indent) = @_;
2254 2517
2255 #TODO: intelligently "reformat" paragraph
2256
2257 for my $line (split /\n/, $text) { 2518 for my $line (split /\n/, $text) {
2258 my $height = $self->text_height ($line); 2519 my ($w, $h) = $self->text_size ($line);
2259 $self->{height} += $height; 2520 $self->{height} += $h;
2260 push @{$self->{par}}, [$height, $color, $indent, $line]; 2521 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2261 } 2522 }
2262 2523
2263 $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]);
2264 $self->{children}[1]->update;
2265} 2525}
2266 2526
2267sub update { 2527sub update {
2268 my ($self) = @_; 2528 my ($self) = @_;
2269 2529
… …
2272 return unless $self->{h} > 0; 2532 return unless $self->{h} > 0;
2273 2533
2274 delete $self->{texture}; 2534 delete $self->{texture};
2275 2535
2276 $ROOT->on_post_alloc ($self, sub { 2536 $ROOT->on_post_alloc ($self, sub {
2537 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538
2277 if (delete $self->{need_reflow}) { 2539 if (delete $self->{need_reflow}) {
2278 my $height = 0; 2540 my $height = 0;
2279 2541
2280 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2542 my $layout = $self->{layout};
2543
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545
2281 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 }
2282 2557
2283 $self->{height} = $height; 2558 $self->{height} = $height;
2284 2559
2285 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2560 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2286 $self->{children}[1]->update;
2287 2561
2288 delete $self->{texture}; 2562 delete $self->{texture};
2289 } 2563 }
2290 2564
2291 $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 {
2292 glClearColor 0.5, 0.5, 0.5, 0; 2566 glClearColor 0.5, 0.5, 0.5, 0;
2293 glClear GL_COLOR_BUFFER_BIT; 2567 glClear GL_COLOR_BUFFER_BIT;
2294 2568
2295 my $top = int $self->{children}[1]{range}[0]; 2569 my $top = int $self->{children}[1]{range}[0];
2296 2570
2297 my $y0 = $top; 2571 my $y0 = $top;
2298 my $y1 = $top + $self->{h}; 2572 my $y1 = $top + $H;
2299 2573
2300 my $y = 0; 2574 my $y = 0;
2301 2575
2302 my $layout = $self->{layout}; 2576 my $layout = $self->{layout};
2303 2577
2304 $layout->set_font ($self->{font}) if $self->{font}; 2578 $layout->set_font ($self->{font}) if $self->{font};
2305 2579
2306 glEnable GL_BLEND; 2580 glEnable GL_BLEND;
2581 #TODO# not correct in windows where rgba is forced off
2307 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2582 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2308 2583
2309 for my $par (@{$self->{par}}) { 2584 for my $par (@{$self->{par}}) {
2310 my $h = $par->[0]; 2585 my $h = $par->[1];
2311 2586
2312 if ($y0 < $y + $h && $y < $y1) { 2587 if ($y0 < $y + $h && $y < $y1) {
2313 $layout->set_foreground (@{ $par->[1] }); 2588 $layout->set_foreground (@{ $par->[2] });
2314 $layout->set_width ($self->{w} - $par->[2]); 2589 $layout->set_width ($W - $par->[3]);
2315 $layout->set_markup ($par->[3]); 2590 $layout->set_markup ($par->[4]);
2316 2591
2317 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2592 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2318 2593
2319 glRasterPos $par->[2], $y - $y0; 2594 glRasterPos $par->[3], $y - $y0;
2320 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2595 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2321 } 2596 }
2322 2597
2323 $y += $h; 2598 $y += $h;
2324 } 2599 }
… …
2391 2666
2392sub new { 2667sub new {
2393 my $class = shift; 2668 my $class = shift;
2394 2669
2395 my $self = $class->SUPER::new ( 2670 my $self = $class->SUPER::new (
2396 state => 0, 2671 state => 0,
2397 connect_activate => \&toggle_flopper, 2672 on_activate => \&toggle_flopper,
2398 @_ 2673 @_
2399 ); 2674 );
2400 2675
2401 if ($self->{state}) {
2402 $self->{state} = 0;
2403 $self->toggle_flopper;
2404 }
2405
2406 $self 2676 $self
2407} 2677}
2408 2678
2409sub toggle_flopper { 2679sub toggle_flopper {
2410 my ($self) = @_; 2680 my ($self) = @_;
2411 2681
2412 # TODO: use animation 2682 $self->{other}->toggle_visibility;
2413 if ($self->{state} = !$self->{state}) {
2414 $CFClient::UI::ROOT->add ($self->{other});
2415 $self->{other}->move ($self->coord2global (0, $self->{h}));
2416 $self->emit ("open");
2417 } else {
2418 $CFClient::UI::ROOT->remove ($self->{other});
2419 $self->emit ("close");
2420 }
2421
2422 $self->emit (changed => $self->{state});
2423} 2683}
2424 2684
2425############################################################################# 2685#############################################################################
2426 2686
2427package CFClient::UI::Tooltip; 2687package CFClient::UI::Tooltip;
… …
2440} 2700}
2441 2701
2442sub set_tooltip_from { 2702sub set_tooltip_from {
2443 my ($self, $widget) = @_; 2703 my ($self, $widget) = @_;
2444 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
2445 $self->add (new CFClient::UI::Label 2714 $self->add (new CFClient::UI::Label
2446 markup => $widget->{tooltip}, 2715 markup => $tooltip,
2447 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2448 fontsize => 0.8, 2717 fontsize => 0.8,
2449 fg => [0, 0, 0, 1], 2718 fg => [0, 0, 0, 1],
2450 ellipsise => 0, 2719 ellipsise => 0,
2451 font => ($widget->{tooltip_font} || $::FONT_PROP), 2720 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2462 2731
2463sub size_allocate { 2732sub size_allocate {
2464 my ($self, $w, $h) = @_; 2733 my ($self, $w, $h) = @_;
2465 2734
2466 $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 });
2467} 2754}
2468 2755
2469sub _draw { 2756sub _draw {
2470 my ($self) = @_; 2757 my ($self) = @_;
2471 2758
… …
2488 glVertex $w, $h; 2775 glVertex $w, $h;
2489 glVertex $w, 0; 2776 glVertex $w, 0;
2490 glEnd; 2777 glEnd;
2491 2778
2492 glTranslate 2 - 0.375, 2 - 0.375; 2779 glTranslate 2 - 0.375, 2 - 0.375;
2780
2493 $self->SUPER::_draw; 2781 $self->SUPER::_draw;
2494} 2782}
2495 2783
2496############################################################################# 2784#############################################################################
2497 2785
… …
2503 2791
2504sub new { 2792sub new {
2505 my $class = shift; 2793 my $class = shift;
2506 2794
2507 my $self = $class->SUPER::new ( 2795 my $self = $class->SUPER::new (
2508 aspect => 1, 2796 aspect => 1,
2797 can_events => 0,
2509 @_, 2798 @_,
2510 ); 2799 );
2511 2800
2512 if ($self->{anim} && $self->{animspeed}) { 2801 if ($self->{anim} && $self->{animspeed}) {
2513 Scalar::Util::weaken (my $widget = $self); 2802 Scalar::Util::weaken (my $widget = $self);
… …
2539} 2828}
2540 2829
2541sub _draw { 2830sub _draw {
2542 my ($self) = @_; 2831 my ($self) = @_;
2543 2832
2544 return unless $::CONN;#d# manage and cache textures differently 2833 return unless $::CONN;
2545 2834
2546 my $face; 2835 my $face;
2547 2836
2548 if ($self->{frame}) { 2837 if ($self->{frame}) {
2549 my $anim = $::CONN->{anim}[$self->{anim}]; 2838 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2572 $self->SUPER::DESTROY; 2861 $self->SUPER::DESTROY;
2573} 2862}
2574 2863
2575############################################################################# 2864#############################################################################
2576 2865
2577package CFClient::UI::InventoryItem; 2866package CFClient::UI::Buttonbar;
2578 2867
2579our @ISA = CFClient::UI::HBox::; 2868our @ISA = CFClient::UI::HBox::;
2580 2869
2581sub _item_to_desc { 2870# TODO: should actualyl wrap buttons and other goodies.
2582 my ($item) = @_;
2583
2584 my $desc =
2585 $item->{nrof} < 2
2586 ? $item->{name}
2587 : "$item->{nrof} × $item->{name_pl}";
2588
2589 $item->{flags} & Crossfire::Protocol::F_OPEN
2590 and $desc .= " (open)";
2591 $item->{flags} & Crossfire::Protocol::F_APPLIED
2592 and $desc .= " (applied)";
2593 $item->{flags} & Crossfire::Protocol::F_UNPAID
2594 and $desc .= " (unpaid)";
2595 $item->{flags} & Crossfire::Protocol::F_MAGIC
2596 and $desc .= " (magic)";
2597 $item->{flags} & Crossfire::Protocol::F_CURSED
2598 and $desc .= " (cursed)";
2599 $item->{flags} & Crossfire::Protocol::F_DAMNED
2600 and $desc .= " (damned)";
2601 $item->{flags} & Crossfire::Protocol::F_LOCKED
2602 and $desc .= " *";
2603
2604 $desc
2605}
2606
2607sub new {
2608 my $class = shift;
2609
2610 my %args = @_;
2611
2612 my $item = delete $args{item};
2613
2614 my $desc = _item_to_desc ($item);
2615
2616 my $self = $class->SUPER::new (
2617 can_hover => 1,
2618 can_events => 1,
2619 tooltip => ((CFClient::UI::Label::escape $desc)
2620 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2621 connect_button_down => sub {
2622 my ($self, $ev, $x, $y) = @_;
2623
2624 # todo: maybe put examine on 1? but should just be a tooltip :(
2625 if ($ev->{button} == 1) {
2626 my $targ = $::CONN->{player}{tag};
2627
2628 if ($item->{container} == $::CONN->{player}{tag}) {
2629 $targ = $main::OPENCONT;
2630 }
2631
2632 $::CONN->send ("move $targ $item->{tag} 0");
2633 } elsif ($ev->{button} == 2) {
2634 $::CONN->send ("apply $item->{tag}");
2635 } elsif ($ev->{button} == 3) {
2636 my @menu_items = (
2637 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2638 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2639 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2640 (
2641 $item->{flags} & Crossfire::Protocol::F_LOCKED
2642 ? (
2643 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2644 )
2645 : (
2646 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2647 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2648 )
2649 ),
2650 );
2651
2652 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2653 }
2654
2655 1
2656 },
2657 %args
2658 );
2659
2660
2661 $self->add (new CFClient::UI::Face
2662 can_events => 0,
2663 face => $item->{face},
2664 anim => $item->{anim},
2665 animspeed => $item->{animspeed},
2666 );
2667
2668 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2669
2670 $self->{item} = $item;
2671
2672 $self->update_item;
2673
2674 $self
2675}
2676
2677sub update_item {
2678 my ($self) = @_;
2679
2680 my $desc = _item_to_desc ($self->{item});
2681
2682 $self->{name_lbl}->set_text ($desc);
2683}
2684
2685#############################################################################
2686
2687package CFClient::UI::Inventory;
2688
2689our @ISA = CFClient::UI::ScrolledWindow::;
2690
2691sub new {
2692 my $class = shift;
2693
2694 my $self = $class->SUPER::new (
2695 scrolled => (new CFClient::UI::VBox),
2696 @_,
2697 );
2698
2699 $self
2700}
2701
2702sub set_items {
2703 my ($self, $items) = @_;
2704
2705 $self->{scrolled}->clear;
2706 return unless $items;
2707
2708 my @items = sort {
2709 ($a->{type} <=> $b->{type})
2710 or ($a->{name} cmp $b->{name})
2711 } @$items;
2712
2713 $self->{real_items} = \@items;
2714
2715 for my $item (@items) {
2716 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2717 $item->update_item ();
2718 }
2719
2720 $self->{scrolled}->add (@items);
2721
2722# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2723}
2724
2725sub size_request {
2726 my ($self) = @_;
2727 ($self->{req_w}, $self->{req_h});
2728}
2729 2871
2730############################################################################# 2872#############################################################################
2731 2873
2732package CFClient::UI::Menu; 2874package CFClient::UI::Menu;
2733 2875
… …
2767 2909
2768# 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)
2769sub popup { 2911sub popup {
2770 my ($self, $ev) = @_; 2912 my ($self, $ev) = @_;
2771 2913
2772 $self->emit ("popdown"); 2914 $self->_emit ("popdown");
2773 2915
2774 # maybe save $GRAB? must be careful about events... 2916 # maybe save $GRAB? must be careful about events...
2775 $GRAB = $self; 2917 $GRAB = $self;
2776 $self->{button} = $ev->{button}; 2918 $self->{button} = $ev->{button};
2777 2919
2778 $self->show; 2920 $self->show;
2779 $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);
2780} 2922}
2781 2923
2782sub mouse_motion { 2924sub mouse_motion {
2783 my ($self, $ev, $x, $y) = @_; 2925 my ($self, $ev, $x, $y) = @_;
2784 2926
2785 # TODO: should use vbox->find_widget or so 2927 # TODO: should use vbox->find_widget or so
2786 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2787 $self->{hover} = $self->{item}{$HOVER}; 2929 $self->{hover} = $self->{item}{$HOVER};
2930
2931 0
2788} 2932}
2789 2933
2790sub button_up { 2934sub button_up {
2791 my ($self, $ev, $x, $y) = @_; 2935 my ($self, $ev, $x, $y) = @_;
2792 2936
2793 if ($ev->{button} == $self->{button}) { 2937 if ($ev->{button} == $self->{button}) {
2794 undef $GRAB; 2938 undef $GRAB;
2795 $self->hide; 2939 $self->hide;
2796 2940
2797 $self->emit ("popdown"); 2941 $self->_emit ("popdown");
2798 $self->{hover}[1]->() if $self->{hover}; 2942 $self->{hover}[1]->() if $self->{hover};
2943 } else {
2944 return 0
2945 }
2946
2799 } 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});
2800} 3054}
2801 3055
2802############################################################################# 3056#############################################################################
2803 3057
2804package CFClient::UI::Statusbox; 3058package CFClient::UI::Statusbox;
… …
2864sub add { 3118sub add {
2865 my ($self, $text, %arg) = @_; 3119 my ($self, $text, %arg) = @_;
2866 3120
2867 $text =~ s/^\s+//; 3121 $text =~ s/^\s+//;
2868 $text =~ s/\s+$//; 3122 $text =~ s/\s+$//;
3123
3124 return unless $text;
2869 3125
2870 my $timeout = time + ((delete $arg{timeout}) || 60); 3126 my $timeout = time + ((delete $arg{timeout}) || 60);
2871 3127
2872 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2873 3129
… …
2907 $self->SUPER::reconfigure; 3163 $self->SUPER::reconfigure;
2908} 3164}
2909 3165
2910############################################################################# 3166#############################################################################
2911 3167
2912package CFClient::UI::Root; 3168package CFClient::UI::Inventory;
2913 3169
2914our @ISA = CFClient::UI::Container::; 3170our @ISA = CFClient::UI::ScrolledWindow::;
2915
2916use CFClient::OpenGL;
2917 3171
2918sub new { 3172sub new {
2919 my $class = shift; 3173 my $class = shift;
2920 3174
2921 $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),
2922 @_, 3418 @_,
2923 ) 3419 )
2924} 3420}
2925 3421
2926sub configure { 3422# XXX: Do sorting? Argl...
2927 my ($self, $x, $y, $w, $h) = @_; 3423sub add_spell {
2928
2929 $self->{w} = $w;
2930 $self->{h} = $h;
2931}
2932
2933sub check_size {
2934 my ($self) = @_; 3424 my ($self, $spell) = @_;
3425 $self->{spells}->{$spell->{name}} = $spell;
2935 3426
2936 $self->size_allocate ($self->{w}, $self->{h}) 3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2937 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
2938} 3481}
2939 3482
2940sub size_request { 3483sub size_request {
2941 my ($self) = @_; 3484 my ($self) = @_;
2942 3485
2943 ($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
2944} 3501}
2945 3502
2946sub size_allocate { 3503sub size_allocate {
2947 my ($self, $w, $h) = @_; 3504 my ($self, $w, $h) = @_;
2948 3505
2949 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2950 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2951
2952 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2953 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2954
2955 for my $child ($self->children) { 3506 for my $child ($self->children) {
2956 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)};
2957 3508
2958 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3509 $X = $child->{force_x} if exists $child->{force_x};
2959 if exists $child->{req_x}; 3510 $Y = $child->{force_y} if exists $child->{force_y};
2960 3511
2961 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3512 $X = _to_pixel $X, $W, $self->{w};
2962 if exists $child->{req_y}; 3513 $Y = _to_pixel $Y, $H, $self->{h};
2963
2964 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2965 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2966 3514
2967 $child->configure ($X, $Y, $W, $H); 3515 $child->configure ($X, $Y, $W, $H);
2968 } 3516 }
2969} 3517}
2970 3518
… …
2981} 3529}
2982 3530
2983sub update { 3531sub update {
2984 my ($self) = @_; 3532 my ($self) = @_;
2985 3533
2986 $self->check_size;
2987 $::WANT_REFRESH++; 3534 $::WANT_REFRESH++;
2988} 3535}
2989 3536
2990sub add { 3537sub add {
2991 my ($self, @children) = @_; 3538 my ($self, @children) = @_;
2992 3539
2993 for my $child (@children) {
2994 $child->{toplevel} = 1; 3540 $_->{is_toplevel} = 1
2995 3541 for @children;
2996 # integerise window positions
2997 $child->{x} = int $child->{x};
2998 $child->{y} = int $child->{y};
2999 }
3000 3542
3001 $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;
3002 3553
3003 while (@children) { 3554 while (@children) {
3004 my $w = pop @children; 3555 my $w = pop @children;
3005 push @children, $w->children; 3556 push @children, $w->children;
3006 $w->{visible} = 1; 3557 $w->set_invisible;
3007 }
3008}
3009
3010sub remove {
3011 my ($self, @children) = @_;
3012
3013 $self->SUPER::remove (@children);
3014
3015 while (@children) {
3016 my $w = pop @children;
3017 push @children, $w->children;
3018 delete $w->{visible};
3019 } 3558 }
3020} 3559}
3021 3560
3022sub on_refresh { 3561sub on_refresh {
3023 my ($self, $id, $cb) = @_; 3562 my ($self, $id, $cb) = @_;
… …
3037 while ($self->{refresh_hook}) { 3576 while ($self->{refresh_hook}) {
3038 $_->() 3577 $_->()
3039 for values %{delete $self->{refresh_hook}}; 3578 for values %{delete $self->{refresh_hook}};
3040 } 3579 }
3041 3580
3042 if ($self->{check_size}) { 3581 if ($self->{realloc}) {
3043 my @queue = ([], []); 3582 my %queue;
3583 my @queue;
3584 my $widget;
3044 3585
3045 for (;;) { 3586 outer:
3046 if ($self->{check_size}) { 3587 while () {
3047 # heuristic: check containers last 3588 if (my $realloc = delete $self->{realloc}) {
3048 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3589 for $widget (values %$realloc) {
3049 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 }
3050 } 3596 }
3051 3597
3052 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3598 while () {
3599 @queue or last outer;
3053 3600
3054 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3601 $widget = pop @{ $queue[-1] || [] }
3055 ? @$widget{qw(user_w user_h)} 3602 and last;
3056 : $widget->size_request;
3057
3058 if (delete $widget->{force_alloc}
3059 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3060 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3061 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}) {
3062 $widget->{req_w} = $w; 3619 $widget->{req_w} = $w;
3063 $widget->{req_h} = $h; 3620 $widget->{req_h} = $h;
3064 3621
3065 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3622 $self->{size_alloc}{$widget+0} = $widget;
3066 3623
3067 $widget->{parent}->check_size
3068 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 }
3069 } 3631 }
3632
3633 delete $self->{realloc}{$widget+0};
3070 } 3634 }
3071 } 3635 }
3072 3636
3073 while ($self->{size_alloc}) { 3637 while (my $size_alloc = delete $self->{size_alloc}) {
3074 for (values %{delete $self->{size_alloc}}) { 3638 my @queue = sort { $b->{visible} <=> $a->{visible} }
3075 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)};
3076 3645
3077 $w = 0 if $w < 0; 3646 $w = 0 if $w < 0;
3078 $h = 0 if $h < 0; 3647 $h = 0 if $h < 0;
3079 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
3080 $widget->{w} = $w; 3656 $widget->{w} = $w;
3081 $widget->{h} = $h; 3657 $widget->{h} = $h;
3082 $widget->size_allocate ($w, $h); 3658
3083 $widget->emit (size_allocate => $w, $h); 3659 $widget->emit (size_allocate => $w, $h);
3660 }
3084 } 3661 }
3085 } 3662 }
3086 3663
3087 while ($self->{post_alloc_hook}) { 3664 while ($self->{post_alloc_hook}) {
3088 $_->() 3665 $_->()
3089 for values %{delete $self->{post_alloc_hook}}; 3666 for values %{delete $self->{post_alloc_hook}};
3090 } 3667 }
3668
3091 3669
3092 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3670 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3093 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3671 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3094 glClear GL_COLOR_BUFFER_BIT; 3672 glClear GL_COLOR_BUFFER_BIT;
3095 3673
… …
3097 glLoadIdentity; 3675 glLoadIdentity;
3098 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3676 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3099 glMatrixMode GL_MODELVIEW; 3677 glMatrixMode GL_MODELVIEW;
3100 glLoadIdentity; 3678 glLoadIdentity;
3101 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
3102 $self->_draw; 3687 $self->_draw;
3103} 3688}
3104 3689
3105############################################################################# 3690#############################################################################
3106 3691

Diff Legend

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